diff --git a/.gitignore b/.gitignore index 6540de9..0c60c79 100644 --- a/.gitignore +++ b/.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 diff --git a/README.md b/README.md index bc5b8a6..3d795d9 100644 --- a/README.md +++ b/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**，谢谢！ diff --git a/deploy/nacos.tar.gz b/deploy/nacos.tar.gz new file mode 100644 index 0000000..cab706f Binary files /dev/null and b/deploy/nacos.tar.gz differ diff --git a/deploy/script.tar.gz b/deploy/script.tar.gz new file mode 100644 index 0000000..949d4d3 Binary files /dev/null and b/deploy/script.tar.gz differ diff --git a/deploy/seata.tar.gz b/deploy/seata.tar.gz new file mode 100644 index 0000000..0ced1ad Binary files /dev/null and b/deploy/seata.tar.gz differ diff --git a/doc/base/nacos.sql b/doc/base/nacos.sql index 4e22108..0379fb5 100644 --- a/doc/base/nacos.sql +++ b/doc/base/nacos.sql @@ -1,17 +1,17 @@ /* Navicat Premium Data Transfer - Source Server : dev + Source Server : prod Source Server Type : MySQL - Source Server Version : 50724 - Source Host : localhost + Source Server Version : 50646 + Source Host : 101.132.121.178 Source Database : nacos Target Server Type : MySQL - Target Server Version : 50724 + Target Server Version : 50646 File Encoding : utf-8 - Date: 12/22/2019 15:53:24 PM + Date: 09/04/2020 15:27:15 PM */ SET NAMES utf8; @@ -27,8 +27,8 @@ CREATE TABLE `config_info` ( `group_id` varchar(255) COLLATE utf8_bin DEFAULT NULL, `content` longtext COLLATE utf8_bin NOT NULL COMMENT 'content', `md5` varchar(32) COLLATE utf8_bin DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '修改时间', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COLLATE utf8_bin COMMENT 'source user', `src_ip` varchar(20) COLLATE utf8_bin DEFAULT NULL COMMENT 'source ip', `app_name` varchar(128) COLLATE utf8_bin DEFAULT NULL, @@ -40,13 +40,14 @@ CREATE TABLE `config_info` ( `c_schema` text COLLATE utf8_bin, PRIMARY KEY (`id`), UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) -) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; +) ENGINE=InnoDB AUTO_INCREMENT=129 DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; -- ---------------------------- -- Records of `config_info` -- ---------------------------- BEGIN; -INSERT INTO `config_info` VALUES ('2', 'shop-manage.properties', 'DEFAULT_GROUP', 0x71696e69752e6163636573735f6b6579203d203347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b6574203d207374617469630a71696e69752e7365637265745f6b6579203d20366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d65203d20636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f70657274696573203d2064727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c74657273203d20737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a65203d20350a737072696e672e64617461736f757263652e64727569642e6d6178416374697665203d2032300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a65203d2032300a737072696e672e64617461736f757263652e64727569642e6d617857616974203d2036303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c65203d20350a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c6973203d203330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e7473203d20747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f77203d203137322e31362e31312e35392c6c6f63616c686f73742c3132372e302e302e310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e79203d203139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f7264203d206e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d65203d206e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c65203d2066616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e203d202f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f77203d2066616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e203d2066616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c6973203d2036303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e5175657279203d2053454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c6564203d20747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e73203d202a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e203d202f2a0a737072696e672e64617461736f757263652e70617373776f7264203d20726f6f740a737072696e672e64617461736f757263652e74797065203d20636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c203d206a6462633a6d7973716c3a2f2f6c6f63616c686f73743a333330362f70616765725f73686f703f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d65203d20726f6f740a737072696e672e7261626269746d712e686f7374203d206c6f63616c686f73740a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e61636b6e6f776c656467652d6d6f6465203d206d616e75616c0a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e636f6e63757272656e6379203d20310a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e6d61782d636f6e63757272656e6379203d20310a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e72657472792e656e61626c6564203d20747275650a737072696e672e7261626269746d712e70617373776f7264203d2067756573740a737072696e672e7261626269746d712e706f7274203d20353637320a737072696e672e7261626269746d712e7075626c69736865722d636f6e6669726d73203d20747275650a737072696e672e7261626269746d712e7075626c69736865722d72657475726e73203d20747275650a737072696e672e7261626269746d712e757365726e616d65203d206775657374, 'f861f12ca03037936c32f84e9cdefe77', '2019-07-21 10:54:07', '2019-07-21 10:54:07', null, '0:0:0:0:0:0:0:1', '', '', null, null, null, 'properties', null), ('3', 'shop-activity.properties', 'DEFAULT_GROUP', 0x71696e69752e6163636573735f6b6579203d203347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b6574203d207374617469630a71696e69752e7365637265745f6b6579203d20366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d65203d20636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f70657274696573203d2064727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c74657273203d20737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a65203d20350a737072696e672e64617461736f757263652e64727569642e6d6178416374697665203d2032300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a65203d2032300a737072696e672e64617461736f757263652e64727569642e6d617857616974203d2036303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c65203d20350a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c6973203d203330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e7473203d20747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f77203d203137322e31362e31312e35392c6c6f63616c686f73740a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e79203d203139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f7264203d203131313131310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d65203d2061646d696e0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c65203d2066616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e203d202f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f77203d2066616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e203d2066616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c6973203d2036303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e5175657279203d2053454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c6564203d20747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e73203d202a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e203d202f2a0a737072696e672e64617461736f757263652e70617373776f7264203d20726f6f740a737072696e672e64617461736f757263652e74797065203d20636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c203d206a6462633a6d7973716c3a2f2f6c6f63616c686f73743a333330362f70616765725f61637469766974793f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d65203d20726f6f740a737072696e672e7261626269746d712e686f7374203d206c6f63616c686f73740a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e61636b6e6f776c656467652d6d6f6465203d206d616e75616c0a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e636f6e63757272656e6379203d20310a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e6d61782d636f6e63757272656e6379203d20310a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e72657472792e656e61626c6564203d20747275650a737072696e672e7261626269746d712e70617373776f7264203d2067756573740a737072696e672e7261626269746d712e706f7274203d20353637320a737072696e672e7261626269746d712e7075626c69736865722d636f6e6669726d73203d20747275650a737072696e672e7261626269746d712e7075626c69736865722d72657475726e73203d20747275650a737072696e672e7261626269746d712e757365726e616d65203d2067756573740a, 'dfb5eabe671be96a032ac86d6fd7e77c', '2019-07-21 11:04:12', '2019-07-21 11:04:12', null, '0:0:0:0:0:0:0:1', '', '', null, null, null, 'properties', null), ('4', 'shop-goods.properties', 'DEFAULT_GROUP', 0x71696e69752e6163636573735f6b6579203d203347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b6574203d207374617469630a71696e69752e7365637265745f6b6579203d20366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d65203d20636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f70657274696573203d2064727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c74657273203d20737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a65203d20350a737072696e672e64617461736f757263652e64727569642e6d6178416374697665203d2032300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a65203d2032300a737072696e672e64617461736f757263652e64727569642e6d617857616974203d2036303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c65203d20350a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c6973203d203330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e7473203d20747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f77203d203137322e31362e31312e35392c6c6f63616c686f73740a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e79203d203139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f7264203d203131313131310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d65203d2061646d696e0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c65203d2066616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e203d202f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f77203d2066616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e203d2066616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c6973203d2036303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e5175657279203d2053454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c6564203d20747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e73203d202a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e203d202f2a0a737072696e672e64617461736f757263652e70617373776f7264203d20726f6f740a737072696e672e64617461736f757263652e74797065203d20636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c203d206a6462633a6d7973716c3a2f2f6c6f63616c686f73743a333330362f70616765725f676f6f64733f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d65203d20726f6f740a737072696e672e7261626269746d712e686f7374203d206c6f63616c686f73740a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e61636b6e6f776c656467652d6d6f6465203d206d616e75616c0a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e636f6e63757272656e6379203d20310a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e6d61782d636f6e63757272656e6379203d20310a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e72657472792e656e61626c6564203d20747275650a737072696e672e7261626269746d712e70617373776f7264203d2067756573740a737072696e672e7261626269746d712e706f7274203d20353637320a737072696e672e7261626269746d712e7075626c69736865722d636f6e6669726d73203d20747275650a737072696e672e7261626269746d712e7075626c69736865722d72657475726e73203d20747275650a737072696e672e7261626269746d712e757365726e616d65203d2067756573740a, '73f24762f36afc2bcfa3335bfaa58d92', '2019-07-21 11:05:53', '2019-07-21 11:05:53', null, '0:0:0:0:0:0:0:1', '', '', null, null, null, 'properties', null), ('5', 'shop-order.properties', 'DEFAULT_GROUP', 0x71696e69752e6163636573735f6b6579203d203347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b6574203d207374617469630a71696e69752e7365637265745f6b6579203d20366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d65203d20636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f70657274696573203d2064727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c74657273203d20737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a65203d20350a737072696e672e64617461736f757263652e64727569642e6d6178416374697665203d2032300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a65203d2032300a737072696e672e64617461736f757263652e64727569642e6d617857616974203d2036303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c65203d20350a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c6973203d203330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e7473203d20747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f77203d203137322e31362e31312e35392c6c6f63616c686f73740a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e79203d203139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f7264203d203131313131310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d65203d2061646d696e0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c65203d2066616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e203d202f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f77203d2066616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e203d2066616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c6973203d2036303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e5175657279203d2053454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c6564203d20747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e73203d202a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e203d202f2a0a737072696e672e64617461736f757263652e70617373776f7264203d20726f6f740a737072696e672e64617461736f757263652e74797065203d20636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c203d206a6462633a6d7973716c3a2f2f6c6f63616c686f73743a333330362f70616765725f6f726465723f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d65203d20726f6f740a737072696e672e7261626269746d712e686f7374203d206c6f63616c686f73740a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e61636b6e6f776c656467652d6d6f6465203d206d616e75616c0a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e636f6e63757272656e6379203d20310a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e6d61782d636f6e63757272656e6379203d20310a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e72657472792e656e61626c6564203d20747275650a737072696e672e7261626269746d712e70617373776f7264203d2067756573740a737072696e672e7261626269746d712e706f7274203d20353637320a737072696e672e7261626269746d712e7075626c69736865722d636f6e6669726d73203d20747275650a737072696e672e7261626269746d712e7075626c69736865722d72657475726e73203d20747275650a737072696e672e7261626269746d712e757365726e616d65203d2067756573740a, 'd5bafadc9835af876b3e7329772ad8c8', '2019-07-21 11:06:38', '2019-07-21 11:06:38', null, '0:0:0:0:0:0:0:1', '', '', null, null, null, 'properties', null), ('6', 'shop-risk.properties', 'DEFAULT_GROUP', 0x71696e69752e6163636573735f6b6579203d203347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b6574203d207374617469630a71696e69752e7365637265745f6b6579203d20366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d65203d20636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f70657274696573203d2064727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c74657273203d20737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a65203d20350a737072696e672e64617461736f757263652e64727569642e6d6178416374697665203d2032300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a65203d2032300a737072696e672e64617461736f757263652e64727569642e6d617857616974203d2036303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c65203d20350a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c6973203d203330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e7473203d20747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f77203d203137322e31362e31312e35392c6c6f63616c686f73740a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e79203d203139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f7264203d203131313131310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d65203d2061646d696e0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c65203d2066616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e203d202f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f77203d2066616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e203d2066616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c6973203d2036303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e5175657279203d2053454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c6564203d20747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e73203d202a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e203d202f2a0a737072696e672e64617461736f757263652e70617373776f7264203d20726f6f740a737072696e672e64617461736f757263652e74797065203d20636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c203d206a6462633a6d7973716c3a2f2f6c6f63616c686f73743a333330362f70616765725f7269736b3f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d65203d20726f6f740a737072696e672e7261626269746d712e686f7374203d206c6f63616c686f73740a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e61636b6e6f776c656467652d6d6f6465203d206d616e75616c0a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e636f6e63757272656e6379203d20310a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e6d61782d636f6e63757272656e6379203d20310a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e72657472792e656e61626c6564203d20747275650a737072696e672e7261626269746d712e70617373776f7264203d2067756573740a737072696e672e7261626269746d712e706f7274203d20353637320a737072696e672e7261626269746d712e7075626c69736865722d636f6e6669726d73203d20747275650a737072696e672e7261626269746d712e7075626c69736865722d72657475726e73203d20747275650a737072696e672e7261626269746d712e757365726e616d65203d2067756573740a, '4a991949ebe8e21cc512bed9a86d8240', '2019-07-21 11:07:27', '2019-07-21 11:07:27', null, '0:0:0:0:0:0:0:1', '', '', null, null, null, 'properties', null), ('7', 'shop-seller.properties', 'DEFAULT_GROUP', 0x71696e69752e6163636573735f6b6579203d203347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b6574203d207374617469630a71696e69752e7365637265745f6b6579203d20366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d65203d20636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f70657274696573203d2064727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c74657273203d20737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a65203d20350a737072696e672e64617461736f757263652e64727569642e6d6178416374697665203d2032300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a65203d2032300a737072696e672e64617461736f757263652e64727569642e6d617857616974203d2036303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c65203d20350a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c6973203d203330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e7473203d20747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f77203d203137322e31362e31312e35392c6c6f63616c686f73740a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e79203d203139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f7264203d203131313131310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d73656c6c65726e616d65203d2061646d696e0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c65203d2066616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e203d202f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f77203d2066616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e203d2066616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c6973203d2036303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e5175657279203d2053454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c6564203d20747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e73203d202a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e203d202f2a0a737072696e672e64617461736f757263652e70617373776f7264203d20726f6f740a737072696e672e64617461736f757263652e74797065203d20636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c203d206a6462633a6d7973716c3a2f2f6c6f63616c686f73743a333330362f70616765725f73686f703f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d65203d20726f6f740a737072696e672e7261626269746d712e686f7374203d206c6f63616c686f73740a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e61636b6e6f776c656467652d6d6f6465203d206d616e75616c0a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e636f6e63757272656e6379203d20310a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e6d61782d636f6e63757272656e6379203d20310a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e72657472792e656e61626c6564203d20747275650a737072696e672e7261626269746d712e70617373776f7264203d2067756573740a737072696e672e7261626269746d712e706f7274203d20353637320a737072696e672e7261626269746d712e7075626c69736865722d636f6e6669726d73203d20747275650a737072696e672e7261626269746d712e7075626c69736865722d72657475726e73203d20747275650a737072696e672e7261626269746d712e757365726e616d65203d2067756573740a, 'f0c395be9e1ac506fd0cbbee41ba0c3c', '2019-07-21 11:08:14', '2019-07-21 11:08:14', null, '0:0:0:0:0:0:0:1', '', '', null, null, null, 'properties', null), ('8', 'shop-user.properties', 'DEFAULT_GROUP', 0x71696e69752e6163636573735f6b6579203d203347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b6574203d207374617469630a71696e69752e7365637265745f6b6579203d20366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d65203d20636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f70657274696573203d2064727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c74657273203d20737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a65203d20350a737072696e672e64617461736f757263652e64727569642e6d6178416374697665203d2032300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a65203d2032300a737072696e672e64617461736f757263652e64727569642e6d617857616974203d2036303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c65203d20350a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c6973203d203330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e7473203d20747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f77203d203137322e31362e31312e35392c6c6f63616c686f73740a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e79203d203139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f7264203d203131313131310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d65203d2061646d696e0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c65203d2066616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e203d202f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f77203d2066616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e203d2066616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c6973203d2036303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e5175657279203d2053454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c6564203d20747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e73203d202a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e203d202f2a0a737072696e672e64617461736f757263652e70617373776f7264203d20726f6f740a737072696e672e64617461736f757263652e74797065203d20636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c203d206a6462633a6d7973716c3a2f2f6c6f63616c686f73743a333330362f70616765725f73686f703f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d65203d20726f6f740a737072696e672e7261626269746d712e686f7374203d206c6f63616c686f73740a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e61636b6e6f776c656467652d6d6f6465203d206d616e75616c0a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e636f6e63757272656e6379203d20310a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e6d61782d636f6e63757272656e6379203d20310a737072696e672e7261626269746d712e6c697374656e65722e73696d706c652e72657472792e656e61626c6564203d20747275650a737072696e672e7261626269746d712e70617373776f7264203d2067756573740a737072696e672e7261626269746d712e706f7274203d20353637320a737072696e672e7261626269746d712e7075626c69736865722d636f6e6669726d73203d20747275650a737072696e672e7261626269746d712e7075626c69736865722d72657475726e73203d20747275650a737072696e672e7261626269746d712e757365726e616d65203d2067756573740a, 'ce27ac537c9f1a50f890b3d8cd2cdd25', '2019-07-21 11:08:47', '2019-07-21 11:08:47', null, '0:0:0:0:0:0:0:1', '', '', null, null, null, 'properties', null), ('9', 'shop-gateway.properties', 'DEFAULT_GROUP', 0x737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d65203d20636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e70617373776f7264203d20726f6f740a737072696e672e64617461736f757263652e74797065203d20636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c203d206a6462633a6d7973716c3a2f2f6c6f63616c686f73743a333330362f70616765725f73686f703f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d65203d20726f6f74, '2a0d767c92018c4a1ab04fa7b108b3c6', '2019-08-31 15:48:13', '2019-08-31 15:55:24', null, '0:0:0:0:0:0:0:1', '', '', '网关层配置', 'null', 'null', 'properties', 0x6e756c6c); +INSERT INTO `config_info` VALUES ('1', 'transport.type', 'SEATA_GROUP', 0x544350, 'b136ef5f6a01d816991fe3cf7a6ac763', '2020-09-04 00:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', '', '', null, null, null, null, null), ('2', 'transport.server', 'SEATA_GROUP', 0x4e494f, 'b6d9dfc0fb54277321cebc0fff55df2f', '2020-09-04 00:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', '', '', null, null, null, null, null), ('3', 'transport.heartbeat', 'SEATA_GROUP', 0x74727565, 'b326b5062b2f0e69046810717534cb09', '2020-09-04 00:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', '', '', null, null, null, null, null), ('4', 'transport.enableClientBatchSendRequest', 'SEATA_GROUP', 0x66616c7365, '68934a3e9455fa72420237eb05902327', '2020-09-04 00:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', '', '', null, null, null, null, null), ('5', 'transport.threadFactory.bossThreadPrefix', 'SEATA_GROUP', 0x4e65747479426f7373, '0f8db59a3b7f2823f38a70c308361836', '2020-09-04 00:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', '', '', null, null, null, null, null), ('6', 'transport.threadFactory.workerThreadPrefix', 'SEATA_GROUP', 0x4e657474795365727665724e494f576f726b6572, 'a78ec7ef5d1631754c4e72ae8a3e9205', '2020-09-04 00:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', '', '', null, null, null, null, null), ('7', 'transport.threadFactory.serverExecutorThreadPrefix', 'SEATA_GROUP', 0x4e6574747953657276657242697a48616e646c6572, '11a36309f3d9df84fa8b59cf071fa2da', '2020-09-04 00:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', '', '', null, null, null, null, null), ('8', 'transport.threadFactory.shareBossWorker', 'SEATA_GROUP', 0x66616c7365, '68934a3e9455fa72420237eb05902327', '2020-09-04 00:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', '', '', null, null, null, null, null), ('9', 'transport.threadFactory.clientSelectorThreadPrefix', 'SEATA_GROUP', 0x4e65747479436c69656e7453656c6563746f72, 'cd7ec5a06541e75f5a7913752322c3af', '2020-09-04 00:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', '', '', null, null, null, null, null), ('10', 'transport.threadFactory.clientSelectorThreadSize', 'SEATA_GROUP', 0x31, 'c4ca4238a0b923820dcc509a6f75849b', '2020-09-04 00:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', '', '', null, null, null, null, null), ('11', 'transport.threadFactory.clientWorkerThreadPrefix', 'SEATA_GROUP', 0x4e65747479436c69656e74576f726b6572546872656164, '61cf4e69a56354cf72f46dc86414a57e', '2020-09-04 00:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', '', '', null, null, null, null, null), ('12', 'transport.threadFactory.bossThreadSize', 'SEATA_GROUP', 0x31, 'c4ca4238a0b923820dcc509a6f75849b', '2020-09-04 00:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', '', '', null, null, null, null, null), ('13', 'transport.threadFactory.workerThreadSize', 'SEATA_GROUP', 0x64656661756c74, 'c21f969b5f03d33d43e04f8f136e7682', '2020-09-04 00:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', '', '', null, null, null, null, null), ('14', 'transport.shutdown.wait', 'SEATA_GROUP', 0x33, 'eccbc87e4b5ce2fe28308fd9f2a7baf3', '2020-09-04 00:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', '', '', null, null, null, null, null), ('15', 'service.vgroupMapping.my_test_tx_group', 'SEATA_GROUP', 0x64656661756c74, 'c21f969b5f03d33d43e04f8f136e7682', '2020-09-04 00:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', '', '', null, null, null, null, null), ('16', 'service.default.grouplist', 'SEATA_GROUP', 0x3132372e302e302e313a38303931, 'c32ce0d3e264525dcdada751f98143a3', '2020-09-04 00:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', '', '', null, null, null, null, null), ('17', 'service.enableDegrade', 'SEATA_GROUP', 0x66616c7365, '68934a3e9455fa72420237eb05902327', '2020-09-04 00:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', '', '', null, null, null, null, null), ('18', 'service.disableGlobalTransaction', 'SEATA_GROUP', 0x66616c7365, '68934a3e9455fa72420237eb05902327', '2020-09-04 00:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', '', '', null, null, null, null, null), ('19', 'client.rm.asyncCommitBufferLimit', 'SEATA_GROUP', 0x3130303030, 'b7a782741f667201b54880c925faec4b', '2020-09-04 00:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', '', '', null, null, null, null, null), ('20', 'client.rm.lock.retryInterval', 'SEATA_GROUP', 0x3130, 'd3d9446802a44259755d38e6d163e820', '2020-09-04 00:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', '', '', null, null, null, null, null), ('21', 'client.rm.lock.retryTimes', 'SEATA_GROUP', 0x3330, '34173cb38f07f89ddbebc2ac9128303f', '2020-09-04 00:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', '', '', null, null, null, null, null), ('22', 'client.rm.lock.retryPolicyBranchRollbackOnConflict', 'SEATA_GROUP', 0x74727565, 'b326b5062b2f0e69046810717534cb09', '2020-09-04 00:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', '', '', null, null, null, null, null), ('23', 'client.rm.reportRetryCount', 'SEATA_GROUP', 0x35, 'e4da3b7fbbce2345d7772b0674a318d5', '2020-09-04 00:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', '', '', null, null, null, null, null), ('24', 'client.rm.tableMetaCheckEnable', 'SEATA_GROUP', 0x66616c7365, '68934a3e9455fa72420237eb05902327', '2020-09-04 00:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', '', '', null, null, null, null, null), ('25', 'client.rm.sqlParserType', 'SEATA_GROUP', 0x6472756964, '3d650fb8a5df01600281d48c47c9fa60', '2020-09-04 00:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', '', '', null, null, null, null, null), ('26', 'client.rm.reportSuccessEnable', 'SEATA_GROUP', 0x66616c7365, '68934a3e9455fa72420237eb05902327', '2020-09-04 00:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', '', '', null, null, null, null, null), ('27', 'client.rm.sagaBranchRegisterEnable', 'SEATA_GROUP', 0x66616c7365, '68934a3e9455fa72420237eb05902327', '2020-09-04 00:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', '', '', null, null, null, null, null), ('28', 'client.tm.commitRetryCount', 'SEATA_GROUP', 0x35, 'e4da3b7fbbce2345d7772b0674a318d5', '2020-09-04 00:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', '', '', null, null, null, null, null), ('29', 'client.tm.rollbackRetryCount', 'SEATA_GROUP', 0x35, 'e4da3b7fbbce2345d7772b0674a318d5', '2020-09-04 00:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', '', '', null, null, null, null, null), ('30', 'client.tm.degradeCheck', 'SEATA_GROUP', 0x66616c7365, '68934a3e9455fa72420237eb05902327', '2020-09-04 00:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', '', '', null, null, null, null, null), ('31', 'client.tm.degradeCheckAllowTimes', 'SEATA_GROUP', 0x3130, 'd3d9446802a44259755d38e6d163e820', '2020-09-04 00:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', '', '', null, null, null, null, null), ('32', 'client.tm.degradeCheckPeriod', 'SEATA_GROUP', 0x32303030, '08f90c1a417155361a5c4b8d297e0d78', '2020-09-04 00:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', '', '', null, null, null, null, null), ('33', 'store.mode', 'SEATA_GROUP', 0x6462, 'd77d5e503ad1439f585ac494268b351b', '2020-09-04 00:58:02', '2020-09-04 00:58:22', null, '124.78.173.62', '', '', '', '', '', '', ''), ('34', 'store.file.dir', 'SEATA_GROUP', 0x66696c655f73746f72652f64617461, '6a8dec07c44c33a8a9247cba5710bbb2', '2020-09-04 00:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', '', '', null, null, null, null, null), ('35', 'store.file.maxBranchSessionSize', 'SEATA_GROUP', 0x3136333834, 'c76fe1d8e08462434d800487585be217', '2020-09-04 00:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', '', '', null, null, null, null, null), ('36', 'store.file.maxGlobalSessionSize', 'SEATA_GROUP', 0x353132, '10a7cdd970fe135cf4f7bb55c0e3b59f', '2020-09-04 00:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', '', '', null, null, null, null, null), ('37', 'store.file.fileWriteBufferCacheSize', 'SEATA_GROUP', 0x3136333834, 'c76fe1d8e08462434d800487585be217', '2020-09-04 00:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', '', '', null, null, null, null, null), ('38', 'store.file.flushDiskMode', 'SEATA_GROUP', 0x6173796e63, '0df93e34273b367bb63bad28c94c78d5', '2020-09-04 00:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', '', '', null, null, null, null, null), ('39', 'store.file.sessionReloadReadSize', 'SEATA_GROUP', 0x313030, 'f899139df5e1059396431415e770c6dd', '2020-09-04 00:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', '', '', null, null, null, null, null), ('40', 'store.db.datasource', 'SEATA_GROUP', 0x6472756964, '3d650fb8a5df01600281d48c47c9fa60', '2020-09-04 00:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', '', '', null, null, null, null, null), ('41', 'store.db.dbType', 'SEATA_GROUP', 0x6d7973716c, '81c3b080dad537de7e10e0987a4bf52e', '2020-09-04 00:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', '', '', null, null, null, null, null), ('42', 'store.db.driverClassName', 'SEATA_GROUP', 0x636f6d2e6d7973716c2e636a2e6a6462632e447269766572, '33763409bb7f4838bde4fae9540433e4', '2020-09-04 00:58:03', '2020-09-04 01:00:12', null, '124.78.173.62', '', '', '', '', '', '', ''), ('43', 'store.db.url', 'SEATA_GROUP', 0x6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f73656174613f757365556e69636f64653d747275652675736553534c3d66616c7365, 'c8bb0634c24d5ba4006755d4eba845c8', '2020-09-04 00:58:03', '2020-09-04 01:01:11', null, '124.78.173.62', '', '', '', '', '', '', ''), ('44', 'store.db.user', 'SEATA_GROUP', 0x726f6f74, '63a9f0ea7bb98050796b649e85481845', '2020-09-04 00:58:03', '2020-09-04 00:58:41', null, '124.78.173.62', '', '', '', '', '', '', ''), ('45', 'store.db.password', 'SEATA_GROUP', 0x7061676572726f6f74, '7a0b8d7d2223fc0726844fd871cb781d', '2020-09-04 00:58:03', '2020-09-04 01:01:23', null, '124.78.173.62', '', '', '', '', '', '', ''), ('46', 'store.db.minConn', 'SEATA_GROUP', 0x35, 'e4da3b7fbbce2345d7772b0674a318d5', '2020-09-04 00:58:03', '2020-09-04 00:58:03', null, '127.0.0.1', '', '', null, null, null, null, null), ('47', 'store.db.maxConn', 'SEATA_GROUP', 0x3330, '34173cb38f07f89ddbebc2ac9128303f', '2020-09-04 00:58:03', '2020-09-04 00:58:03', null, '127.0.0.1', '', '', null, null, null, null, null), ('48', 'store.db.globalTable', 'SEATA_GROUP', 0x676c6f62616c5f7461626c65, '8b28fb6bb4c4f984df2709381f8eba2b', '2020-09-04 00:58:03', '2020-09-04 00:58:03', null, '127.0.0.1', '', '', null, null, null, null, null), ('49', 'store.db.branchTable', 'SEATA_GROUP', 0x6272616e63685f7461626c65, '54bcdac38cf62e103fe115bcf46a660c', '2020-09-04 00:58:03', '2020-09-04 00:58:03', null, '127.0.0.1', '', '', null, null, null, null, null), ('50', 'store.db.queryLimit', 'SEATA_GROUP', 0x313030, 'f899139df5e1059396431415e770c6dd', '2020-09-04 00:58:03', '2020-09-04 00:58:03', null, '127.0.0.1', '', '', null, null, null, null, null), ('51', 'store.db.lockTable', 'SEATA_GROUP', 0x6c6f636b5f7461626c65, '55e0cae3b6dc6696b768db90098b8f2f', '2020-09-04 00:58:03', '2020-09-04 00:58:03', null, '127.0.0.1', '', '', null, null, null, null, null), ('52', 'store.db.maxWait', 'SEATA_GROUP', 0x35303030, 'a35fe7f7fe8217b4369a0af4244d1fca', '2020-09-04 00:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', '', '', null, null, null, null, null), ('53', 'store.redis.host', 'SEATA_GROUP', 0x3132372e302e302e31, 'f528764d624db129b32c21fbca0cb8d6', '2020-09-04 00:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', '', '', null, null, null, null, null), ('54', 'store.redis.port', 'SEATA_GROUP', 0x36333739, '92c3b916311a5517d9290576e3ea37ad', '2020-09-04 00:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', '', '', null, null, null, null, null), ('55', 'store.redis.maxConn', 'SEATA_GROUP', 0x3130, 'd3d9446802a44259755d38e6d163e820', '2020-09-04 00:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', '', '', null, null, null, null, null), ('56', 'store.redis.minConn', 'SEATA_GROUP', 0x31, 'c4ca4238a0b923820dcc509a6f75849b', '2020-09-04 00:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', '', '', null, null, null, null, null), ('57', 'store.redis.database', 'SEATA_GROUP', 0x30, 'cfcd208495d565ef66e7dff9f98764da', '2020-09-04 00:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', '', '', null, null, null, null, null), ('58', 'store.redis.password', 'SEATA_GROUP', 0x6e756c6c, '37a6259cc0c1dae299a7866489dff0bd', '2020-09-04 00:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', '', '', null, null, null, null, null), ('59', 'store.redis.queryLimit', 'SEATA_GROUP', 0x313030, 'f899139df5e1059396431415e770c6dd', '2020-09-04 00:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', '', '', null, null, null, null, null), ('60', 'server.recovery.committingRetryPeriod', 'SEATA_GROUP', 0x31303030, 'a9b7ba70783b617e9998dc4dd82eb3c5', '2020-09-04 00:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', '', '', null, null, null, null, null), ('61', 'server.recovery.asynCommittingRetryPeriod', 'SEATA_GROUP', 0x31303030, 'a9b7ba70783b617e9998dc4dd82eb3c5', '2020-09-04 00:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', '', '', null, null, null, null, null), ('62', 'server.recovery.rollbackingRetryPeriod', 'SEATA_GROUP', 0x31303030, 'a9b7ba70783b617e9998dc4dd82eb3c5', '2020-09-04 00:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', '', '', null, null, null, null, null), ('63', 'server.recovery.timeoutRetryPeriod', 'SEATA_GROUP', 0x31303030, 'a9b7ba70783b617e9998dc4dd82eb3c5', '2020-09-04 00:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', '', '', null, null, null, null, null), ('64', 'server.maxCommitRetryTimeout', 'SEATA_GROUP', 0x2d31, '6bb61e3b7bce0931da574d19d1d82c88', '2020-09-04 00:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', '', '', null, null, null, null, null), ('65', 'server.maxRollbackRetryTimeout', 'SEATA_GROUP', 0x2d31, '6bb61e3b7bce0931da574d19d1d82c88', '2020-09-04 00:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', '', '', null, null, null, null, null), ('66', 'server.rollbackRetryTimeoutUnlockEnable', 'SEATA_GROUP', 0x66616c7365, '68934a3e9455fa72420237eb05902327', '2020-09-04 00:58:05', '2020-09-04 00:58:05', null, '127.0.0.1', '', '', null, null, null, null, null), ('67', 'client.undo.dataValidation', 'SEATA_GROUP', 0x74727565, 'b326b5062b2f0e69046810717534cb09', '2020-09-04 00:58:05', '2020-09-04 00:58:05', null, '127.0.0.1', '', '', null, null, null, null, null), ('68', 'client.undo.logSerialization', 'SEATA_GROUP', 0x6a61636b736f6e, 'b41779690b83f182acc67d6388c7bac9', '2020-09-04 00:58:05', '2020-09-04 00:58:05', null, '127.0.0.1', '', '', null, null, null, null, null), ('69', 'client.undo.onlyCareUpdateColumns', 'SEATA_GROUP', 0x74727565, 'b326b5062b2f0e69046810717534cb09', '2020-09-04 00:58:05', '2020-09-04 00:58:05', null, '127.0.0.1', '', '', null, null, null, null, null), ('70', 'server.undo.logSaveDays', 'SEATA_GROUP', 0x37, '8f14e45fceea167a5a36dedd4bea2543', '2020-09-04 00:58:05', '2020-09-04 00:58:05', null, '127.0.0.1', '', '', null, null, null, null, null), ('71', 'server.undo.logDeletePeriod', 'SEATA_GROUP', 0x3836343030303030, 'f4c122804fe9076cb2710f55c3c6e346', '2020-09-04 00:58:05', '2020-09-04 00:58:05', null, '127.0.0.1', '', '', null, null, null, null, null), ('72', 'client.undo.logTable', 'SEATA_GROUP', 0x756e646f5f6c6f67, '2842d229c24afe9e61437135e8306614', '2020-09-04 00:58:05', '2020-09-04 00:58:05', null, '127.0.0.1', '', '', null, null, null, null, null), ('73', 'client.log.exceptionRate', 'SEATA_GROUP', 0x313030, 'f899139df5e1059396431415e770c6dd', '2020-09-04 00:58:05', '2020-09-04 00:58:05', null, '127.0.0.1', '', '', null, null, null, null, null), ('74', 'transport.serialization', 'SEATA_GROUP', 0x7365617461, 'b943081c423b9a5416a706524ee05d40', '2020-09-04 00:58:05', '2020-09-04 00:58:05', null, '127.0.0.1', '', '', null, null, null, null, null), ('75', 'transport.compressor', 'SEATA_GROUP', 0x6e6f6e65, '334c4a4c42fdb79d7ebc3e73b517e6f8', '2020-09-04 00:58:05', '2020-09-04 00:58:05', null, '127.0.0.1', '', '', null, null, null, null, null), ('76', 'metrics.enabled', 'SEATA_GROUP', 0x66616c7365, '68934a3e9455fa72420237eb05902327', '2020-09-04 00:58:05', '2020-09-04 00:58:05', null, '127.0.0.1', '', '', null, null, null, null, null), ('77', 'metrics.registryType', 'SEATA_GROUP', 0x636f6d70616374, '7cf74ca49c304df8150205fc915cd465', '2020-09-04 00:58:05', '2020-09-04 00:58:05', null, '127.0.0.1', '', '', null, null, null, null, null), ('78', 'metrics.exporterList', 'SEATA_GROUP', 0x70726f6d657468657573, 'e4f00638b8a10e6994e67af2f832d51c', '2020-09-04 00:58:05', '2020-09-04 00:58:05', null, '127.0.0.1', '', '', null, null, null, null, null), ('79', 'metrics.exporterPrometheusPort', 'SEATA_GROUP', 0x39383938, '7b9dc501afe4ee11c56a4831e20cee71', '2020-09-04 00:58:05', '2020-09-04 00:58:05', null, '127.0.0.1', '', '', null, null, null, null, null), ('87', 'education-manage.properties', 'education', 0x71696e69752e6163636573735f6b65793d3347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b65743d7374617469630a71696e69752e7365637265745f6b65793d366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d653d636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f706572746965733d64727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c746572733d737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a653d31300a737072696e672e64617461736f757263652e64727569642e6d61784163746976653d32300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a653d32300a737072696e672e64617461736f757263652e64727569642e6d6178576169743d36303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c653d31300a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c69733d3330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e74733d747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f773d3137322e31362e31312e35392c6c6f63616c686f73742c3132372e302e302e310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e793d3139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f72643d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d653d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c653d66616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e3d2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f773d66616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e3d66616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c69733d36303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e51756572793d53454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c65643d747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e733d2a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e3d2f2a0a737072696e672e64617461736f757263652e70617373776f72643d7061676572726f6f740a737072696e672e64617461736f757263652e747970653d636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c3d6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f656475636174696f6e3f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d653d726f6f740a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, '5ddbe23be6d29e7e216645449bf5b540', '2020-09-04 01:20:30', '2020-09-04 01:20:30', null, '124.78.173.62', '在线教育', '0759bc76-60b5-4f32-acd5-e5095cf2b93d', null, null, null, 'properties', null), ('88', 'education-report.properties', 'education', 0x71696e69752e6163636573735f6b65793d3347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b65743d7374617469630a71696e69752e7365637265745f6b65793d366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d653d636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f706572746965733d64727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c746572733d737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a653d31300a737072696e672e64617461736f757263652e64727569642e6d61784163746976653d32300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a653d32300a737072696e672e64617461736f757263652e64727569642e6d6178576169743d36303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c653d31300a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c69733d3330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e74733d747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f773d3137322e31362e31312e35392c6c6f63616c686f73742c3132372e302e302e310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e793d3139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f72643d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d653d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c653d66616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e3d2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f773d66616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e3d66616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c653d747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c69733d36303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e51756572793d53454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c65643d747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e733d2a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e3d2f2a0a737072696e672e64617461736f757263652e70617373776f72643d7061676572726f6f740a737072696e672e64617461736f757263652e747970653d636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c3d6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f656475636174696f6e3f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d653d726f6f740a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, 'dd0750b993eff3907ad0a594f565c57f', '2020-09-04 01:21:34', '2020-09-04 01:21:34', null, '124.78.173.62', '在线教育', '0759bc76-60b5-4f32-acd5-e5095cf2b93d', null, null, null, 'properties', null), ('89', 'education-gateway.properties', 'education', 0x737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b3132330a656475636174696f6e2e66696c7465722e75726c3d6578706f72742c75706c6f6164, 'd3c7821ee14cdda22c6c16e9af77f3fb', '2020-09-04 01:22:16', '2020-09-04 01:22:16', null, '124.78.173.62', '在线教育', '0759bc76-60b5-4f32-acd5-e5095cf2b93d', null, null, null, 'properties', null), ('90', 'education-portal.properties', 'education', 0x71696e69752e6163636573735f6b65793d3347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b65743d7374617469630a71696e69752e7365637265745f6b65793d366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d653d636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f706572746965733d64727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c746572733d737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a653d31300a737072696e672e64617461736f757263652e64727569642e6d61784163746976653d32300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a653d32300a737072696e672e64617461736f757263652e64727569642e6d6178576169743d36303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c653d31300a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c69733d3330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e74733d747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f773d3137322e31362e31312e35392c6c6f63616c686f73742c3132372e302e302e310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e793d3139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f72643d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d653d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c653d66616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e3d2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f773d66616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e3d66616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c653d747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c69733d36303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e51756572793d53454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c65643d747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e733d2a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e3d2f2a0a737072696e672e64617461736f757263652e70617373776f72643d7061676572726f6f740a737072696e672e64617461736f757263652e747970653d636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c3d6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f656475636174696f6e3f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d653d726f6f740a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, 'dd0750b993eff3907ad0a594f565c57f', '2020-09-04 01:23:08', '2020-09-04 01:23:08', null, '124.78.173.62', '在线教育', '0759bc76-60b5-4f32-acd5-e5095cf2b93d', null, null, null, 'properties', null), ('91', 'education-sso.properties', 'education', 0x737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, 'f7b2a40ff74090d6eb74483f278d9112', '2020-09-04 01:23:49', '2020-09-04 01:23:49', null, '124.78.173.62', '在线教育', '0759bc76-60b5-4f32-acd5-e5095cf2b93d', null, null, null, 'properties', null), ('92', 'shop-activity.properties', 'shop', 0x71696e69752e6163636573735f6b65793d3347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b65743d7374617469630a71696e69752e7365637265745f6b65793d366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d653d636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f706572746965733d64727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c746572733d737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a653d31300a737072696e672e64617461736f757263652e64727569642e6d61784163746976653d32300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a653d32300a737072696e672e64617461736f757263652e64727569642e6d6178576169743d36303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c653d31300a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c69733d3330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e74733d747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f773d3137322e31362e31312e35392c6c6f63616c686f73742c3132372e302e302e310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e793d3139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f72643d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d653d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c653d66616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e3d2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f773d66616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e3d66616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c69733d36303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e51756572793d53454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c65643d747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e733d2a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e3d2f2a0a737072696e672e64617461736f757263652e70617373776f72643d7061676572726f6f740a737072696e672e64617461736f757263652e747970653d636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c3d6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f70616765725f61637469766974793f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d653d726f6f740a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, 'b561dc52fe7855263d34d47582b0d9e2', '2020-09-04 01:47:20', '2020-09-04 02:11:10', null, '124.78.173.62', '电商系统', '0759bc76-60b5-4f32-acd5-e5095cf2b93d', '', '', '', 'properties', ''), ('93', 'shop-auth.properties', 'shop', 0x71696e69752e6163636573735f6b65793d3347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b65743d7374617469630a71696e69752e7365637265745f6b65793d366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d653d636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f706572746965733d64727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c746572733d737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a653d31300a737072696e672e64617461736f757263652e64727569642e6d61784163746976653d32300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a653d32300a737072696e672e64617461736f757263652e64727569642e6d6178576169743d36303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c653d31300a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c69733d3330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e74733d747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f773d3137322e31362e31312e35392c6c6f63616c686f73742c3132372e302e302e310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e793d3139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f72643d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d653d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c653d66616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e3d2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f773d66616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e3d66616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c69733d36303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e51756572793d53454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c65643d747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e733d2a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e3d2f2a0a737072696e672e64617461736f757263652e70617373776f72643d7061676572726f6f740a737072696e672e64617461736f757263652e747970653d636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c3d6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f70616765725f617574683f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d653d726f6f740a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, 'bc93a1b2a26e777cf81cca833b12bff0', '2020-09-04 02:02:58', '2020-09-04 02:11:25', null, '124.78.173.62', '电商系统', '0759bc76-60b5-4f32-acd5-e5095cf2b93d', '', '', '', 'properties', ''), ('94', 'shop-cart.properties', 'shop', 0x737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d653d636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f706572746965733d64727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c746572733d737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a653d31300a737072696e672e64617461736f757263652e64727569642e6d61784163746976653d32300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a653d32300a737072696e672e64617461736f757263652e64727569642e6d6178576169743d36303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c653d31300a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c69733d3330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e74733d747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f773d3137322e31362e31312e35392c6c6f63616c686f73742c3132372e302e302e310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e793d3139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f72643d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d653d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c653d66616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e3d2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f773d66616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e3d66616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c69733d36303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e51756572793d53454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c65643d747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e733d2a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e3d2f2a0a737072696e672e64617461736f757263652e70617373776f72643d7061676572726f6f740a737072696e672e64617461736f757263652e747970653d636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c3d6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f70616765725f676f6f64733f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d653d726f6f740a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, '8a56cbf1fef91520431c04e011af2683', '2020-09-04 02:03:39', '2020-09-04 03:47:16', null, '124.78.173.62', '电商系统', '0759bc76-60b5-4f32-acd5-e5095cf2b93d', '', '', '', 'properties', ''), ('95', 'shop-gateway.properties', 'shop', 0x737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, 'f7b2a40ff74090d6eb74483f278d9112', '2020-09-04 02:03:54', '2020-09-04 02:11:54', null, '124.78.173.62', '电商系统', '0759bc76-60b5-4f32-acd5-e5095cf2b93d', '', '', '', 'properties', ''), ('96', 'shop-goods.properties', 'shop', 0x71696e69752e6163636573735f6b65793d3347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b65743d7374617469630a71696e69752e7365637265745f6b65793d366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d653d636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f706572746965733d64727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c746572733d737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a653d31300a737072696e672e64617461736f757263652e64727569642e6d61784163746976653d32300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a653d32300a737072696e672e64617461736f757263652e64727569642e6d6178576169743d36303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c653d31300a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c69733d3330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e74733d747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f773d3137322e31362e31312e35392c6c6f63616c686f73742c3132372e302e302e310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e793d3139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f72643d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d653d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c653d66616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e3d2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f773d66616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e3d66616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c69733d36303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e51756572793d53454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c65643d747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e733d2a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e3d2f2a0a737072696e672e64617461736f757263652e70617373776f72643d7061676572726f6f740a737072696e672e64617461736f757263652e747970653d636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c3d6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f70616765725f676f6f64733f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d653d726f6f740a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, '46184e607fb4c7393290fa9d5d1c03f9', '2020-09-04 02:04:09', '2020-09-04 02:12:08', null, '124.78.173.62', '电商系统', '0759bc76-60b5-4f32-acd5-e5095cf2b93d', '', '', '', 'properties', ''), ('97', 'shop-job.properties', 'shop', 0x737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d653d636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f706572746965733d64727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c746572733d737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a653d31300a737072696e672e64617461736f757263652e64727569642e6d61784163746976653d32300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a653d32300a737072696e672e64617461736f757263652e64727569642e6d6178576169743d36303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c653d31300a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c69733d3330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e74733d747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f773d3137322e31362e31312e35392c6c6f63616c686f73742c3132372e302e302e310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e793d3139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f72643d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d653d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c653d66616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e3d2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f773d66616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e3d66616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c69733d36303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e51756572793d53454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c65643d747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e733d2a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e3d2f2a0a737072696e672e64617461736f757263652e70617373776f72643d7061676572726f6f740a737072696e672e64617461736f757263652e747970653d636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c3d6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f70616765725f6a6f623f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d653d726f6f740a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, 'a468ffa9f928beffc56c0c25c11b9363', '2020-09-04 02:04:20', '2020-09-04 03:38:30', null, '124.78.173.62', '电商系统', '0759bc76-60b5-4f32-acd5-e5095cf2b93d', '', '', '', 'properties', ''), ('98', 'shop-manage.properties', 'shop', 0x737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d653d636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f706572746965733d64727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c746572733d737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a653d31300a737072696e672e64617461736f757263652e64727569642e6d61784163746976653d32300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a653d32300a737072696e672e64617461736f757263652e64727569642e6d6178576169743d36303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c653d31300a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c69733d3330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e74733d747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f773d3137322e31362e31312e35392c6c6f63616c686f73742c3132372e302e302e310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e793d3139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f72643d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d653d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c653d66616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e3d2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f773d66616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e3d66616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c69733d36303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e51756572793d53454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c65643d747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e733d2a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e3d2f2a0a737072696e672e64617461736f757263652e70617373776f72643d7061676572726f6f740a737072696e672e64617461736f757263652e747970653d636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c3d6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f70616765725f73686f703f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d653d726f6f740a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, '90385ae883830fedd6b694a159be7c75', '2020-09-04 02:04:28', '2020-09-04 03:37:32', null, '124.78.173.62', '电商系统', '0759bc76-60b5-4f32-acd5-e5095cf2b93d', '', '', '', 'properties', ''), ('99', 'shop-order.properties', 'shop', 0x71696e69752e6163636573735f6b65793d3347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b65743d7374617469630a71696e69752e7365637265745f6b65793d366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d653d636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f706572746965733d64727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c746572733d737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a653d31300a737072696e672e64617461736f757263652e64727569642e6d61784163746976653d32300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a653d32300a737072696e672e64617461736f757263652e64727569642e6d6178576169743d36303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c653d31300a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c69733d3330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e74733d747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f773d3137322e31362e31312e35392c6c6f63616c686f73742c3132372e302e302e310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e793d3139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f72643d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d653d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c653d66616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e3d2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f773d66616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e3d66616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c69733d36303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e51756572793d53454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c65643d747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e733d2a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e3d2f2a0a737072696e672e64617461736f757263652e70617373776f72643d7061676572726f6f740a737072696e672e64617461736f757263652e747970653d636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c3d6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f70616765725f6f726465723f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d653d726f6f740a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, '5fb962b8383e3b6db38f2a6cf247291a', '2020-09-04 02:04:38', '2020-09-04 02:07:57', null, '124.78.173.62', '电商系统', '0759bc76-60b5-4f32-acd5-e5095cf2b93d', '', '', '', 'properties', ''), ('100', 'shop-oss.properties', 'shop', 0x71696e69752e6163636573735f6b65793d3347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b65743d7374617469630a71696e69752e7365637265745f6b65793d366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a616c69626162612e636c6f75642e6275636b65743d70616765722d7374617469630a616c69626162612e636c6f75642e6163636573732d6b65793d4c5441493447325a4b6f586a714a70485a717a46473363440a616c69626162612e636c6f75642e7365637265742d6b65793d554f50326931595a73373553674347775454737a574f3730454a4b48726e0a616c69626162612e636c6f75642e6f73732e656e64706f696e743d6f73732d636e2d7368616e676861692e616c6979756e63732e636f6d0a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, '43b21074201962e6d3acf9d73a24d10e', '2020-09-04 02:04:58', '2020-09-04 03:05:15', null, '124.78.173.62', '电商系统', '0759bc76-60b5-4f32-acd5-e5095cf2b93d', '', '', '', 'properties', ''), ('101', 'shop-platform.properties', 'shop', 0x71696e69752e6163636573735f6b65793d3347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b65743d7374617469630a71696e69752e7365637265745f6b65793d366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d653d636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f706572746965733d64727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c746572733d737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a653d31300a737072696e672e64617461736f757263652e64727569642e6d61784163746976653d32300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a653d32300a737072696e672e64617461736f757263652e64727569642e6d6178576169743d36303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c653d31300a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c69733d3330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e74733d747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f773d3137322e31362e31312e35392c6c6f63616c686f73742c3132372e302e302e310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e793d3139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f72643d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d653d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c653d66616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e3d2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f773d66616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e3d66616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c69733d36303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e51756572793d53454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c65643d747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e733d2a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e3d2f2a0a737072696e672e64617461736f757263652e70617373776f72643d7061676572726f6f740a737072696e672e64617461736f757263652e747970653d636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c3d6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f70616765725f706c6174666f726d3f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d653d726f6f740a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, '98ad416ac5e801548dc783554156943b', '2020-09-04 02:05:09', '2020-09-04 02:08:26', null, '124.78.173.62', '电商系统', '0759bc76-60b5-4f32-acd5-e5095cf2b93d', '', '', '', 'properties', ''), ('102', 'shop-risk.properties', 'shop', 0x71696e69752e6163636573735f6b65793d3347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b65743d7374617469630a71696e69752e7365637265745f6b65793d366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d653d636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f706572746965733d64727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c746572733d737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a653d31300a737072696e672e64617461736f757263652e64727569642e6d61784163746976653d32300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a653d32300a737072696e672e64617461736f757263652e64727569642e6d6178576169743d36303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c653d31300a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c69733d3330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e74733d747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f773d3137322e31362e31312e35392c6c6f63616c686f73742c3132372e302e302e310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e793d3139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f72643d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d653d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c653d66616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e3d2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f773d66616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e3d66616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c69733d36303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e51756572793d53454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c65643d747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e733d2a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e3d2f2a0a737072696e672e64617461736f757263652e70617373776f72643d7061676572726f6f740a737072696e672e64617461736f757263652e747970653d636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c3d6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f70616765725f7269736b3f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d653d726f6f740a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, 'd6b4848d2874c3b916af55309e520ea2', '2020-09-04 02:05:22', '2020-09-04 02:08:43', null, '124.78.173.62', '电商系统', '0759bc76-60b5-4f32-acd5-e5095cf2b93d', '', '', '', 'properties', ''); +INSERT INTO `config_info` VALUES ('103', 'shop-seller.properties', 'shop', 0x71696e69752e6163636573735f6b65793d3347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b65743d7374617469630a71696e69752e7365637265745f6b65793d366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d653d636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f706572746965733d64727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c746572733d737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a653d31300a737072696e672e64617461736f757263652e64727569642e6d61784163746976653d32300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a653d32300a737072696e672e64617461736f757263652e64727569642e6d6178576169743d36303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c653d31300a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c69733d3330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e74733d747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f773d3137322e31362e31312e35392c6c6f63616c686f73742c3132372e302e302e310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e793d3139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f72643d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d653d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c653d66616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e3d2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f773d66616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e3d66616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c69733d36303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e51756572793d53454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c65643d747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e733d2a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e3d2f2a0a737072696e672e64617461736f757263652e70617373776f72643d7061676572726f6f740a737072696e672e64617461736f757263652e747970653d636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c3d6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f70616765725f73686f703f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d653d726f6f740a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, '927810d09ca5ae72d1f27a5d55d3502b', '2020-09-04 02:05:31', '2020-09-04 02:09:00', null, '124.78.173.62', '电商系统', '0759bc76-60b5-4f32-acd5-e5095cf2b93d', '', '', '', 'properties', ''), ('104', 'shop-settlement.properties', 'shop', 0x737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, 'f7b2a40ff74090d6eb74483f278d9112', '2020-09-04 02:05:41', '2020-09-04 02:10:11', null, '124.78.173.62', '电商系统', '0759bc76-60b5-4f32-acd5-e5095cf2b93d', '', '', '', 'properties', ''), ('105', 'shop-user.properties', 'shop', 0x71696e69752e6163636573735f6b65793d3347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b65743d7374617469630a71696e69752e7365637265745f6b65793d366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d653d636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f706572746965733d64727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c746572733d737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a653d31300a737072696e672e64617461736f757263652e64727569642e6d61784163746976653d32300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a653d32300a737072696e672e64617461736f757263652e64727569642e6d6178576169743d36303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c653d31300a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c69733d3330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e74733d747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f773d3137322e31362e31312e35392c6c6f63616c686f73742c3132372e302e302e310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e793d3139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f72643d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d653d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c653d66616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e3d2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f773d66616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e3d66616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c69733d36303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e51756572793d53454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c65643d747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e733d2a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e3d2f2a0a737072696e672e64617461736f757263652e70617373776f72643d7061676572726f6f740a737072696e672e64617461736f757263652e747970653d636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c3d6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f70616765725f73686f703f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d653d726f6f740a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, '927810d09ca5ae72d1f27a5d55d3502b', '2020-09-04 02:05:51', '2020-09-04 02:10:24', null, '124.78.173.62', '电商系统', '0759bc76-60b5-4f32-acd5-e5095cf2b93d', '', '', '', 'properties', ''); COMMIT; -- ---------------------------- @@ -78,8 +79,8 @@ CREATE TABLE `config_info_beta` ( `content` longtext COLLATE utf8_bin NOT NULL COMMENT 'content', `beta_ips` varchar(1024) COLLATE utf8_bin DEFAULT NULL COMMENT 'betaIps', `md5` varchar(32) COLLATE utf8_bin DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '修改时间', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COLLATE utf8_bin COMMENT 'source user', `src_ip` varchar(20) COLLATE utf8_bin DEFAULT NULL COMMENT 'source ip', `tenant_id` varchar(128) COLLATE utf8_bin DEFAULT '' COMMENT '租户字段', @@ -100,8 +101,8 @@ CREATE TABLE `config_info_tag` ( `app_name` varchar(128) COLLATE utf8_bin DEFAULT NULL COMMENT 'app_name', `content` longtext COLLATE utf8_bin NOT NULL COMMENT 'content', `md5` varchar(32) COLLATE utf8_bin DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '修改时间', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COLLATE utf8_bin COMMENT 'source user', `src_ip` varchar(20) COLLATE utf8_bin DEFAULT NULL COMMENT 'source ip', PRIMARY KEY (`id`), @@ -138,8 +139,8 @@ CREATE TABLE `group_capacity` ( `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数，，0表示使用默认值', `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值', `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量', - `gmt_create` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '修改时间', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', PRIMARY KEY (`id`), UNIQUE KEY `uk_group_id` (`group_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='集群、各Group容量信息表'; @@ -156,8 +157,8 @@ CREATE TABLE `his_config_info` ( `app_name` varchar(128) COLLATE utf8_bin DEFAULT NULL COMMENT 'app_name', `content` longtext COLLATE utf8_bin NOT NULL, `md5` varchar(32) COLLATE utf8_bin DEFAULT NULL, - `gmt_create` datetime NOT NULL DEFAULT '2010-05-05 00:00:00', - `gmt_modified` datetime NOT NULL DEFAULT '2010-05-05 00:00:00', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `src_user` text COLLATE utf8_bin, `src_ip` varchar(20) COLLATE utf8_bin DEFAULT NULL, `op_type` char(10) COLLATE utf8_bin DEFAULT NULL, @@ -166,16 +167,35 @@ CREATE TABLE `his_config_info` ( KEY `idx_gmt_create` (`gmt_create`), KEY `idx_gmt_modified` (`gmt_modified`), KEY `idx_did` (`data_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='多租户改造'; +) ENGINE=InnoDB AUTO_INCREMENT=129 DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='多租户改造'; + +-- ---------------------------- +-- Records of `his_config_info` +-- ---------------------------- +BEGIN; +INSERT INTO `his_config_info` VALUES ('0', '1', 'transport.type', 'SEATA_GROUP', '', 0x544350, 'b136ef5f6a01d816991fe3cf7a6ac763', '2020-09-04 08:58:00', '2020-09-04 00:58:01', null, '127.0.0.1', 'I', ''), ('0', '2', 'transport.server', 'SEATA_GROUP', '', 0x4e494f, 'b6d9dfc0fb54277321cebc0fff55df2f', '2020-09-04 08:58:00', '2020-09-04 00:58:01', null, '127.0.0.1', 'I', ''), ('0', '3', 'transport.heartbeat', 'SEATA_GROUP', '', 0x74727565, 'b326b5062b2f0e69046810717534cb09', '2020-09-04 08:58:00', '2020-09-04 00:58:01', null, '127.0.0.1', 'I', ''), ('0', '4', 'transport.enableClientBatchSendRequest', 'SEATA_GROUP', '', 0x66616c7365, '68934a3e9455fa72420237eb05902327', '2020-09-04 08:58:00', '2020-09-04 00:58:01', null, '127.0.0.1', 'I', ''), ('0', '5', 'transport.threadFactory.bossThreadPrefix', 'SEATA_GROUP', '', 0x4e65747479426f7373, '0f8db59a3b7f2823f38a70c308361836', '2020-09-04 08:58:00', '2020-09-04 00:58:01', null, '127.0.0.1', 'I', ''), ('0', '6', 'transport.threadFactory.workerThreadPrefix', 'SEATA_GROUP', '', 0x4e657474795365727665724e494f576f726b6572, 'a78ec7ef5d1631754c4e72ae8a3e9205', '2020-09-04 08:58:00', '2020-09-04 00:58:01', null, '127.0.0.1', 'I', ''), ('0', '7', 'transport.threadFactory.serverExecutorThreadPrefix', 'SEATA_GROUP', '', 0x4e6574747953657276657242697a48616e646c6572, '11a36309f3d9df84fa8b59cf071fa2da', '2020-09-04 08:58:00', '2020-09-04 00:58:01', null, '127.0.0.1', 'I', ''), ('0', '8', 'transport.threadFactory.shareBossWorker', 'SEATA_GROUP', '', 0x66616c7365, '68934a3e9455fa72420237eb05902327', '2020-09-04 08:58:00', '2020-09-04 00:58:01', null, '127.0.0.1', 'I', ''), ('0', '9', 'transport.threadFactory.clientSelectorThreadPrefix', 'SEATA_GROUP', '', 0x4e65747479436c69656e7453656c6563746f72, 'cd7ec5a06541e75f5a7913752322c3af', '2020-09-04 08:58:00', '2020-09-04 00:58:01', null, '127.0.0.1', 'I', ''), ('0', '10', 'transport.threadFactory.clientSelectorThreadSize', 'SEATA_GROUP', '', 0x31, 'c4ca4238a0b923820dcc509a6f75849b', '2020-09-04 08:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', 'I', ''), ('0', '11', 'transport.threadFactory.clientWorkerThreadPrefix', 'SEATA_GROUP', '', 0x4e65747479436c69656e74576f726b6572546872656164, '61cf4e69a56354cf72f46dc86414a57e', '2020-09-04 08:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', 'I', ''), ('0', '12', 'transport.threadFactory.bossThreadSize', 'SEATA_GROUP', '', 0x31, 'c4ca4238a0b923820dcc509a6f75849b', '2020-09-04 08:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', 'I', ''), ('0', '13', 'transport.threadFactory.workerThreadSize', 'SEATA_GROUP', '', 0x64656661756c74, 'c21f969b5f03d33d43e04f8f136e7682', '2020-09-04 08:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', 'I', ''), ('0', '14', 'transport.shutdown.wait', 'SEATA_GROUP', '', 0x33, 'eccbc87e4b5ce2fe28308fd9f2a7baf3', '2020-09-04 08:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', 'I', ''), ('0', '15', 'service.vgroupMapping.my_test_tx_group', 'SEATA_GROUP', '', 0x64656661756c74, 'c21f969b5f03d33d43e04f8f136e7682', '2020-09-04 08:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', 'I', ''), ('0', '16', 'service.default.grouplist', 'SEATA_GROUP', '', 0x3132372e302e302e313a38303931, 'c32ce0d3e264525dcdada751f98143a3', '2020-09-04 08:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', 'I', ''), ('0', '17', 'service.enableDegrade', 'SEATA_GROUP', '', 0x66616c7365, '68934a3e9455fa72420237eb05902327', '2020-09-04 08:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', 'I', ''), ('0', '18', 'service.disableGlobalTransaction', 'SEATA_GROUP', '', 0x66616c7365, '68934a3e9455fa72420237eb05902327', '2020-09-04 08:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', 'I', ''), ('0', '19', 'client.rm.asyncCommitBufferLimit', 'SEATA_GROUP', '', 0x3130303030, 'b7a782741f667201b54880c925faec4b', '2020-09-04 08:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', 'I', ''), ('0', '20', 'client.rm.lock.retryInterval', 'SEATA_GROUP', '', 0x3130, 'd3d9446802a44259755d38e6d163e820', '2020-09-04 08:58:01', '2020-09-04 00:58:01', null, '127.0.0.1', 'I', ''), ('0', '21', 'client.rm.lock.retryTimes', 'SEATA_GROUP', '', 0x3330, '34173cb38f07f89ddbebc2ac9128303f', '2020-09-04 08:58:01', '2020-09-04 00:58:02', null, '127.0.0.1', 'I', ''), ('0', '22', 'client.rm.lock.retryPolicyBranchRollbackOnConflict', 'SEATA_GROUP', '', 0x74727565, 'b326b5062b2f0e69046810717534cb09', '2020-09-04 08:58:01', '2020-09-04 00:58:02', null, '127.0.0.1', 'I', ''), ('0', '23', 'client.rm.reportRetryCount', 'SEATA_GROUP', '', 0x35, 'e4da3b7fbbce2345d7772b0674a318d5', '2020-09-04 08:58:01', '2020-09-04 00:58:02', null, '127.0.0.1', 'I', ''), ('0', '24', 'client.rm.tableMetaCheckEnable', 'SEATA_GROUP', '', 0x66616c7365, '68934a3e9455fa72420237eb05902327', '2020-09-04 08:58:01', '2020-09-04 00:58:02', null, '127.0.0.1', 'I', ''), ('0', '25', 'client.rm.sqlParserType', 'SEATA_GROUP', '', 0x6472756964, '3d650fb8a5df01600281d48c47c9fa60', '2020-09-04 08:58:01', '2020-09-04 00:58:02', null, '127.0.0.1', 'I', ''), ('0', '26', 'client.rm.reportSuccessEnable', 'SEATA_GROUP', '', 0x66616c7365, '68934a3e9455fa72420237eb05902327', '2020-09-04 08:58:01', '2020-09-04 00:58:02', null, '127.0.0.1', 'I', ''), ('0', '27', 'client.rm.sagaBranchRegisterEnable', 'SEATA_GROUP', '', 0x66616c7365, '68934a3e9455fa72420237eb05902327', '2020-09-04 08:58:01', '2020-09-04 00:58:02', null, '127.0.0.1', 'I', ''), ('0', '28', 'client.tm.commitRetryCount', 'SEATA_GROUP', '', 0x35, 'e4da3b7fbbce2345d7772b0674a318d5', '2020-09-04 08:58:01', '2020-09-04 00:58:02', null, '127.0.0.1', 'I', ''), ('0', '29', 'client.tm.rollbackRetryCount', 'SEATA_GROUP', '', 0x35, 'e4da3b7fbbce2345d7772b0674a318d5', '2020-09-04 08:58:01', '2020-09-04 00:58:02', null, '127.0.0.1', 'I', ''), ('0', '30', 'client.tm.degradeCheck', 'SEATA_GROUP', '', 0x66616c7365, '68934a3e9455fa72420237eb05902327', '2020-09-04 08:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', 'I', ''), ('0', '31', 'client.tm.degradeCheckAllowTimes', 'SEATA_GROUP', '', 0x3130, 'd3d9446802a44259755d38e6d163e820', '2020-09-04 08:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', 'I', ''), ('0', '32', 'client.tm.degradeCheckPeriod', 'SEATA_GROUP', '', 0x32303030, '08f90c1a417155361a5c4b8d297e0d78', '2020-09-04 08:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', 'I', ''), ('0', '33', 'store.mode', 'SEATA_GROUP', '', 0x66696c65, '8c7dd922ad47494fc02c388e12c00eac', '2020-09-04 08:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', 'I', ''), ('0', '34', 'store.file.dir', 'SEATA_GROUP', '', 0x66696c655f73746f72652f64617461, '6a8dec07c44c33a8a9247cba5710bbb2', '2020-09-04 08:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', 'I', ''), ('0', '35', 'store.file.maxBranchSessionSize', 'SEATA_GROUP', '', 0x3136333834, 'c76fe1d8e08462434d800487585be217', '2020-09-04 08:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', 'I', ''), ('0', '36', 'store.file.maxGlobalSessionSize', 'SEATA_GROUP', '', 0x353132, '10a7cdd970fe135cf4f7bb55c0e3b59f', '2020-09-04 08:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', 'I', ''), ('0', '37', 'store.file.fileWriteBufferCacheSize', 'SEATA_GROUP', '', 0x3136333834, 'c76fe1d8e08462434d800487585be217', '2020-09-04 08:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', 'I', ''), ('0', '38', 'store.file.flushDiskMode', 'SEATA_GROUP', '', 0x6173796e63, '0df93e34273b367bb63bad28c94c78d5', '2020-09-04 08:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', 'I', ''), ('0', '39', 'store.file.sessionReloadReadSize', 'SEATA_GROUP', '', 0x313030, 'f899139df5e1059396431415e770c6dd', '2020-09-04 08:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', 'I', ''), ('0', '40', 'store.db.datasource', 'SEATA_GROUP', '', 0x6472756964, '3d650fb8a5df01600281d48c47c9fa60', '2020-09-04 08:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', 'I', ''), ('0', '41', 'store.db.dbType', 'SEATA_GROUP', '', 0x6d7973716c, '81c3b080dad537de7e10e0987a4bf52e', '2020-09-04 08:58:02', '2020-09-04 00:58:02', null, '127.0.0.1', 'I', ''), ('0', '42', 'store.db.driverClassName', 'SEATA_GROUP', '', 0x636f6d2e6d7973716c2e6a6462632e447269766572, '683cf0c3a5a56cec94dfac94ca16d760', '2020-09-04 08:58:02', '2020-09-04 00:58:03', null, '127.0.0.1', 'I', ''), ('0', '43', 'store.db.url', 'SEATA_GROUP', '', 0x6a6462633a6d7973716c3a2f2f3132372e302e302e313a333330362f73656174613f757365556e69636f64653d74727565, 'cbb3bd573704f125fb4f2489208abaec', '2020-09-04 08:58:02', '2020-09-04 00:58:03', null, '127.0.0.1', 'I', ''), ('0', '44', 'store.db.user', 'SEATA_GROUP', '', 0x757365726e616d65, '14c4b06b824ec593239362517f538b29', '2020-09-04 08:58:02', '2020-09-04 00:58:03', null, '127.0.0.1', 'I', ''), ('0', '45', 'store.db.password', 'SEATA_GROUP', '', 0x70617373776f7264, '5f4dcc3b5aa765d61d8327deb882cf99', '2020-09-04 08:58:02', '2020-09-04 00:58:03', null, '127.0.0.1', 'I', ''), ('0', '46', 'store.db.minConn', 'SEATA_GROUP', '', 0x35, 'e4da3b7fbbce2345d7772b0674a318d5', '2020-09-04 08:58:02', '2020-09-04 00:58:03', null, '127.0.0.1', 'I', ''), ('0', '47', 'store.db.maxConn', 'SEATA_GROUP', '', 0x3330, '34173cb38f07f89ddbebc2ac9128303f', '2020-09-04 08:58:03', '2020-09-04 00:58:03', null, '127.0.0.1', 'I', ''), ('0', '48', 'store.db.globalTable', 'SEATA_GROUP', '', 0x676c6f62616c5f7461626c65, '8b28fb6bb4c4f984df2709381f8eba2b', '2020-09-04 08:58:03', '2020-09-04 00:58:03', null, '127.0.0.1', 'I', ''), ('0', '49', 'store.db.branchTable', 'SEATA_GROUP', '', 0x6272616e63685f7461626c65, '54bcdac38cf62e103fe115bcf46a660c', '2020-09-04 08:58:03', '2020-09-04 00:58:03', null, '127.0.0.1', 'I', ''), ('0', '50', 'store.db.queryLimit', 'SEATA_GROUP', '', 0x313030, 'f899139df5e1059396431415e770c6dd', '2020-09-04 08:58:03', '2020-09-04 00:58:03', null, '127.0.0.1', 'I', ''), ('0', '51', 'store.db.lockTable', 'SEATA_GROUP', '', 0x6c6f636b5f7461626c65, '55e0cae3b6dc6696b768db90098b8f2f', '2020-09-04 08:58:03', '2020-09-04 00:58:03', null, '127.0.0.1', 'I', ''), ('0', '52', 'store.db.maxWait', 'SEATA_GROUP', '', 0x35303030, 'a35fe7f7fe8217b4369a0af4244d1fca', '2020-09-04 08:58:03', '2020-09-04 00:58:04', null, '127.0.0.1', 'I', ''), ('0', '53', 'store.redis.host', 'SEATA_GROUP', '', 0x3132372e302e302e31, 'f528764d624db129b32c21fbca0cb8d6', '2020-09-04 08:58:03', '2020-09-04 00:58:04', null, '127.0.0.1', 'I', ''), ('0', '54', 'store.redis.port', 'SEATA_GROUP', '', 0x36333739, '92c3b916311a5517d9290576e3ea37ad', '2020-09-04 08:58:03', '2020-09-04 00:58:04', null, '127.0.0.1', 'I', ''), ('0', '55', 'store.redis.maxConn', 'SEATA_GROUP', '', 0x3130, 'd3d9446802a44259755d38e6d163e820', '2020-09-04 08:58:03', '2020-09-04 00:58:04', null, '127.0.0.1', 'I', ''), ('0', '56', 'store.redis.minConn', 'SEATA_GROUP', '', 0x31, 'c4ca4238a0b923820dcc509a6f75849b', '2020-09-04 08:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', 'I', ''), ('0', '57', 'store.redis.database', 'SEATA_GROUP', '', 0x30, 'cfcd208495d565ef66e7dff9f98764da', '2020-09-04 08:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', 'I', ''), ('0', '58', 'store.redis.password', 'SEATA_GROUP', '', 0x6e756c6c, '37a6259cc0c1dae299a7866489dff0bd', '2020-09-04 08:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', 'I', ''), ('0', '59', 'store.redis.queryLimit', 'SEATA_GROUP', '', 0x313030, 'f899139df5e1059396431415e770c6dd', '2020-09-04 08:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', 'I', ''), ('0', '60', 'server.recovery.committingRetryPeriod', 'SEATA_GROUP', '', 0x31303030, 'a9b7ba70783b617e9998dc4dd82eb3c5', '2020-09-04 08:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', 'I', ''), ('0', '61', 'server.recovery.asynCommittingRetryPeriod', 'SEATA_GROUP', '', 0x31303030, 'a9b7ba70783b617e9998dc4dd82eb3c5', '2020-09-04 08:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', 'I', ''), ('0', '62', 'server.recovery.rollbackingRetryPeriod', 'SEATA_GROUP', '', 0x31303030, 'a9b7ba70783b617e9998dc4dd82eb3c5', '2020-09-04 08:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', 'I', ''), ('0', '63', 'server.recovery.timeoutRetryPeriod', 'SEATA_GROUP', '', 0x31303030, 'a9b7ba70783b617e9998dc4dd82eb3c5', '2020-09-04 08:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', 'I', ''), ('0', '64', 'server.maxCommitRetryTimeout', 'SEATA_GROUP', '', 0x2d31, '6bb61e3b7bce0931da574d19d1d82c88', '2020-09-04 08:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', 'I', ''), ('0', '65', 'server.maxRollbackRetryTimeout', 'SEATA_GROUP', '', 0x2d31, '6bb61e3b7bce0931da574d19d1d82c88', '2020-09-04 08:58:04', '2020-09-04 00:58:04', null, '127.0.0.1', 'I', ''), ('0', '66', 'server.rollbackRetryTimeoutUnlockEnable', 'SEATA_GROUP', '', 0x66616c7365, '68934a3e9455fa72420237eb05902327', '2020-09-04 08:58:04', '2020-09-04 00:58:05', null, '127.0.0.1', 'I', ''), ('0', '67', 'client.undo.dataValidation', 'SEATA_GROUP', '', 0x74727565, 'b326b5062b2f0e69046810717534cb09', '2020-09-04 08:58:04', '2020-09-04 00:58:05', null, '127.0.0.1', 'I', ''), ('0', '68', 'client.undo.logSerialization', 'SEATA_GROUP', '', 0x6a61636b736f6e, 'b41779690b83f182acc67d6388c7bac9', '2020-09-04 08:58:04', '2020-09-04 00:58:05', null, '127.0.0.1', 'I', ''), ('0', '69', 'client.undo.onlyCareUpdateColumns', 'SEATA_GROUP', '', 0x74727565, 'b326b5062b2f0e69046810717534cb09', '2020-09-04 08:58:04', '2020-09-04 00:58:05', null, '127.0.0.1', 'I', ''), ('0', '70', 'server.undo.logSaveDays', 'SEATA_GROUP', '', 0x37, '8f14e45fceea167a5a36dedd4bea2543', '2020-09-04 08:58:04', '2020-09-04 00:58:05', null, '127.0.0.1', 'I', ''), ('0', '71', 'server.undo.logDeletePeriod', 'SEATA_GROUP', '', 0x3836343030303030, 'f4c122804fe9076cb2710f55c3c6e346', '2020-09-04 08:58:04', '2020-09-04 00:58:05', null, '127.0.0.1', 'I', ''), ('0', '72', 'client.undo.logTable', 'SEATA_GROUP', '', 0x756e646f5f6c6f67, '2842d229c24afe9e61437135e8306614', '2020-09-04 08:58:04', '2020-09-04 00:58:05', null, '127.0.0.1', 'I', ''), ('0', '73', 'client.log.exceptionRate', 'SEATA_GROUP', '', 0x313030, 'f899139df5e1059396431415e770c6dd', '2020-09-04 08:58:04', '2020-09-04 00:58:05', null, '127.0.0.1', 'I', ''), ('0', '74', 'transport.serialization', 'SEATA_GROUP', '', 0x7365617461, 'b943081c423b9a5416a706524ee05d40', '2020-09-04 08:58:04', '2020-09-04 00:58:05', null, '127.0.0.1', 'I', ''), ('0', '75', 'transport.compressor', 'SEATA_GROUP', '', 0x6e6f6e65, '334c4a4c42fdb79d7ebc3e73b517e6f8', '2020-09-04 08:58:04', '2020-09-04 00:58:05', null, '127.0.0.1', 'I', ''), ('0', '76', 'metrics.enabled', 'SEATA_GROUP', '', 0x66616c7365, '68934a3e9455fa72420237eb05902327', '2020-09-04 08:58:04', '2020-09-04 00:58:05', null, '127.0.0.1', 'I', ''), ('0', '77', 'metrics.registryType', 'SEATA_GROUP', '', 0x636f6d70616374, '7cf74ca49c304df8150205fc915cd465', '2020-09-04 08:58:04', '2020-09-04 00:58:05', null, '127.0.0.1', 'I', ''), ('0', '78', 'metrics.exporterList', 'SEATA_GROUP', '', 0x70726f6d657468657573, 'e4f00638b8a10e6994e67af2f832d51c', '2020-09-04 08:58:04', '2020-09-04 00:58:05', null, '127.0.0.1', 'I', ''), ('0', '79', 'metrics.exporterPrometheusPort', 'SEATA_GROUP', '', 0x39383938, '7b9dc501afe4ee11c56a4831e20cee71', '2020-09-04 08:58:04', '2020-09-04 00:58:05', null, '127.0.0.1', 'I', ''), ('33', '80', 'store.mode', 'SEATA_GROUP', '', 0x66696c65, '8c7dd922ad47494fc02c388e12c00eac', '2020-09-04 08:58:22', '2020-09-04 00:58:22', null, '124.78.173.62', 'U', ''), ('44', '81', 'store.db.user', 'SEATA_GROUP', '', 0x757365726e616d65, '14c4b06b824ec593239362517f538b29', '2020-09-04 08:58:41', '2020-09-04 00:58:41', null, '124.78.173.62', 'U', ''), ('45', '82', 'store.db.password', 'SEATA_GROUP', '', 0x70617373776f7264, '5f4dcc3b5aa765d61d8327deb882cf99', '2020-09-04 08:58:50', '2020-09-04 00:58:50', null, '124.78.173.62', 'U', ''), ('42', '83', 'store.db.driverClassName', 'SEATA_GROUP', '', 0x636f6d2e6d7973716c2e6a6462632e447269766572, '683cf0c3a5a56cec94dfac94ca16d760', '2020-09-04 09:00:12', '2020-09-04 01:00:12', null, '124.78.173.62', 'U', ''), ('43', '84', 'store.db.url', 'SEATA_GROUP', '', 0x6a6462633a6d7973716c3a2f2f3132372e302e302e313a333330362f73656174613f757365556e69636f64653d74727565, 'cbb3bd573704f125fb4f2489208abaec', '2020-09-04 09:01:00', '2020-09-04 01:01:00', null, '124.78.173.62', 'U', ''), ('43', '85', 'store.db.url', 'SEATA_GROUP', '', 0x6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f73656174613f757365556e69636f64653d74727565, '7418c3b2002fce1cf8c7b652483aea0b', '2020-09-04 09:01:10', '2020-09-04 01:01:11', null, '124.78.173.62', 'U', ''), ('45', '86', 'store.db.password', 'SEATA_GROUP', '', 0x726f6f74, '63a9f0ea7bb98050796b649e85481845', '2020-09-04 09:01:22', '2020-09-04 01:01:23', null, '124.78.173.62', 'U', ''), ('0', '87', 'education-manage.properties', 'education', '在线教育', 0x71696e69752e6163636573735f6b65793d3347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b65743d7374617469630a71696e69752e7365637265745f6b65793d366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d653d636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f706572746965733d64727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c746572733d737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a653d31300a737072696e672e64617461736f757263652e64727569642e6d61784163746976653d32300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a653d32300a737072696e672e64617461736f757263652e64727569642e6d6178576169743d36303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c653d31300a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c69733d3330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e74733d747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f773d3137322e31362e31312e35392c6c6f63616c686f73742c3132372e302e302e310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e793d3139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f72643d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d653d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c653d66616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e3d2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f773d66616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e3d66616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c69733d36303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e51756572793d53454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c65643d747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e733d2a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e3d2f2a0a737072696e672e64617461736f757263652e70617373776f72643d7061676572726f6f740a737072696e672e64617461736f757263652e747970653d636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c3d6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f656475636174696f6e3f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d653d726f6f740a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, '5ddbe23be6d29e7e216645449bf5b540', '2020-09-04 09:20:29', '2020-09-04 01:20:30', null, '124.78.173.62', 'I', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('0', '88', 'education-report.properties', 'education', '在线教育', 0x71696e69752e6163636573735f6b65793d3347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b65743d7374617469630a71696e69752e7365637265745f6b65793d366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d653d636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f706572746965733d64727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c746572733d737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a653d31300a737072696e672e64617461736f757263652e64727569642e6d61784163746976653d32300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a653d32300a737072696e672e64617461736f757263652e64727569642e6d6178576169743d36303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c653d31300a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c69733d3330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e74733d747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f773d3137322e31362e31312e35392c6c6f63616c686f73742c3132372e302e302e310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e793d3139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f72643d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d653d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c653d66616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e3d2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f773d66616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e3d66616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c653d747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c69733d36303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e51756572793d53454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c65643d747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e733d2a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e3d2f2a0a737072696e672e64617461736f757263652e70617373776f72643d7061676572726f6f740a737072696e672e64617461736f757263652e747970653d636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c3d6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f656475636174696f6e3f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d653d726f6f740a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, 'dd0750b993eff3907ad0a594f565c57f', '2020-09-04 09:21:33', '2020-09-04 01:21:34', null, '124.78.173.62', 'I', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('0', '89', 'education-gateway.properties', 'education', '在线教育', 0x737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b3132330a656475636174696f6e2e66696c7465722e75726c3d6578706f72742c75706c6f6164, 'd3c7821ee14cdda22c6c16e9af77f3fb', '2020-09-04 09:22:16', '2020-09-04 01:22:16', null, '124.78.173.62', 'I', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('0', '90', 'education-portal.properties', 'education', '在线教育', 0x71696e69752e6163636573735f6b65793d3347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b65743d7374617469630a71696e69752e7365637265745f6b65793d366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d653d636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f706572746965733d64727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c746572733d737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a653d31300a737072696e672e64617461736f757263652e64727569642e6d61784163746976653d32300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a653d32300a737072696e672e64617461736f757263652e64727569642e6d6178576169743d36303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c653d31300a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c69733d3330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e74733d747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f773d3137322e31362e31312e35392c6c6f63616c686f73742c3132372e302e302e310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e793d3139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f72643d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d653d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c653d66616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e3d2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f773d66616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e3d66616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c653d747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c69733d36303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e51756572793d53454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c65643d747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e733d2a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e3d2f2a0a737072696e672e64617461736f757263652e70617373776f72643d7061676572726f6f740a737072696e672e64617461736f757263652e747970653d636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c3d6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f656475636174696f6e3f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d653d726f6f740a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, 'dd0750b993eff3907ad0a594f565c57f', '2020-09-04 09:23:07', '2020-09-04 01:23:08', null, '124.78.173.62', 'I', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('0', '91', 'education-sso.properties', 'education', '在线教育', 0x737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, 'f7b2a40ff74090d6eb74483f278d9112', '2020-09-04 09:23:49', '2020-09-04 01:23:49', null, '124.78.173.62', 'I', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('0', '92', 'shop-activity.properties', 'shop', '电商系统', 0x64643d313231, 'ef00b5ec9ee4de67395fa1fa4e7385d9', '2020-09-04 09:47:20', '2020-09-04 01:47:20', null, '124.78.173.62', 'I', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('0', '93', 'shop-auth.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:02:57', '2020-09-04 02:02:58', null, '124.78.173.62', 'I', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('0', '94', 'shop-cart.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:03:39', '2020-09-04 02:03:39', null, '124.78.173.62', 'I', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('0', '95', 'shop-gateway.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:03:54', '2020-09-04 02:03:54', null, '124.78.173.62', 'I', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('0', '96', 'shop-goods.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:04:08', '2020-09-04 02:04:09', null, '124.78.173.62', 'I', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('0', '97', 'shop-job.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:04:19', '2020-09-04 02:04:20', null, '124.78.173.62', 'I', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('0', '98', 'shop-manage.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:04:27', '2020-09-04 02:04:28', null, '124.78.173.62', 'I', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('0', '99', 'shop-order.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:04:38', '2020-09-04 02:04:38', null, '124.78.173.62', 'I', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('0', '100', 'shop-oss.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:04:57', '2020-09-04 02:04:58', null, '124.78.173.62', 'I', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('0', '101', 'shop-platform.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:05:09', '2020-09-04 02:05:09', null, '124.78.173.62', 'I', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('0', '102', 'shop-risk.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:05:21', '2020-09-04 02:05:22', null, '124.78.173.62', 'I', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('0', '103', 'shop-seller.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:05:31', '2020-09-04 02:05:31', null, '124.78.173.62', 'I', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('0', '104', 'shop-settlement.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:05:41', '2020-09-04 02:05:41', null, '124.78.173.62', 'I', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('0', '105', 'shop-user.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:05:51', '2020-09-04 02:05:51', null, '124.78.173.62', 'I', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('98', '106', 'shop-manage.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:07:35', '2020-09-04 02:07:35', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('99', '107', 'shop-order.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:07:57', '2020-09-04 02:07:57', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('101', '108', 'shop-platform.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:08:26', '2020-09-04 02:08:26', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('102', '109', 'shop-risk.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:08:42', '2020-09-04 02:08:43', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('103', '110', 'shop-seller.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:08:59', '2020-09-04 02:09:00', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('104', '111', 'shop-settlement.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:10:10', '2020-09-04 02:10:11', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('105', '112', 'shop-user.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:10:23', '2020-09-04 02:10:24', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('97', '113', 'shop-job.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:10:44', '2020-09-04 02:10:45', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('92', '114', 'shop-activity.properties', 'shop', '电商系统', 0x64643d313231, 'ef00b5ec9ee4de67395fa1fa4e7385d9', '2020-09-04 10:11:09', '2020-09-04 02:11:10', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('93', '115', 'shop-auth.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:11:24', '2020-09-04 02:11:25', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('94', '116', 'shop-cart.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:11:40', '2020-09-04 02:11:40', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('95', '117', 'shop-gateway.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:11:53', '2020-09-04 02:11:54', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('96', '118', 'shop-goods.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:12:07', '2020-09-04 02:12:08', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('100', '119', 'shop-oss.properties', 'shop', '电商系统', 0x313d32, '7b2fb106352b24c6dd644a8cdf200295', '2020-09-04 10:12:30', '2020-09-04 02:12:30', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('100', '120', 'shop-oss.properties', 'shop', '电商系统', 0x71696e69752e6163636573735f6b65793d3347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b65743d7374617469630a71696e69752e7365637265745f6b65793d366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, 'ce2c1e16c53a47eab824cf26886229b5', '2020-09-04 10:18:50', '2020-09-04 02:18:51', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('100', '121', 'shop-oss.properties', 'shop', '电商系统', 0x71696e69752e6163636573735f6b65793d3347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b65743d7374617469630a71696e69752e7365637265745f6b65793d366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a616c69626162612e636c6f75642e6163636573732d6b65793d414b0a616c69626162612e636c6f75642e7365637265742d6b65793d534b0a616c69626162612e636c6f75642e6f73732e656e64706f696e743d2a2a2a2e616c6979756e63732e636f6d0a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, '6c8bebcd9075c55e2cae55394b2f8890', '2020-09-04 10:24:04', '2020-09-04 02:24:05', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('100', '122', 'shop-oss.properties', 'shop', '电商系统', 0x71696e69752e6163636573735f6b65793d3347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b65743d7374617469630a71696e69752e7365637265745f6b65793d366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a616c69626162612e636c6f75642e6275636b65743d636c6f75642d73686f700a616c69626162612e636c6f75642e6163636573732d6b65793d414b0a616c69626162612e636c6f75642e7365637265742d6b65793d534b0a616c69626162612e636c6f75642e6f73732e656e64706f696e743d2a2a2a2e616c6979756e63732e636f6d0a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, '7d3e7b3b6b94e91ddf931537ec2d6328', '2020-09-04 11:01:39', '2020-09-04 03:01:39', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('100', '123', 'shop-oss.properties', 'shop', '电商系统', 0x71696e69752e6163636573735f6b65793d3347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b65743d7374617469630a71696e69752e7365637265745f6b65793d366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a616c69626162612e636c6f75642e6275636b65743d636c6f75642d73686f700a616c69626162612e636c6f75642e6163636573732d6b65793d4c5441493447325a4b6f586a714a70485a717a46473363440a616c69626162612e636c6f75642e7365637265742d6b65793d554f50326931595a73373553674347775454737a574f3730454a4b48726e0a616c69626162612e636c6f75642e6f73732e656e64706f696e743d2a2a2a2e616c6979756e63732e636f6d0a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, '895b1d517321221693d2b7c70eb2624c', '2020-09-04 11:05:15', '2020-09-04 03:05:15', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('98', '124', 'shop-manage.properties', 'shop', '电商系统', 0x71696e69752e6163636573735f6b65793d3347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b65743d7374617469630a71696e69752e7365637265745f6b65793d366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d653d636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f706572746965733d64727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c746572733d737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a653d31300a737072696e672e64617461736f757263652e64727569642e6d61784163746976653d32300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a653d32300a737072696e672e64617461736f757263652e64727569642e6d6178576169743d36303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c653d31300a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c69733d3330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e74733d747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f773d3137322e31362e31312e35392c6c6f63616c686f73742c3132372e302e302e310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e793d3139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f72643d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d653d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c653d66616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e3d2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f773d66616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e3d66616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c69733d36303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e51756572793d53454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c65643d747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e733d2a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e3d2f2a0a737072696e672e64617461736f757263652e70617373776f72643d7061676572726f6f740a737072696e672e64617461736f757263652e747970653d636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c3d6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f70616765725f73686f703f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d653d726f6f740a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, '927810d09ca5ae72d1f27a5d55d3502b', '2020-09-04 11:37:31', '2020-09-04 03:37:32', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('97', '125', 'shop-job.properties', 'shop', '电商系统', 0x737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, 'f7b2a40ff74090d6eb74483f278d9112', '2020-09-04 11:37:43', '2020-09-04 03:37:44', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('97', '126', 'shop-job.properties', 'shop', '电商系统', 0x737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d653d636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f706572746965733d64727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c746572733d737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a653d31300a737072696e672e64617461736f757263652e64727569642e6d61784163746976653d32300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a653d32300a737072696e672e64617461736f757263652e64727569642e6d6178576169743d36303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c653d31300a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c69733d3330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e74733d747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f773d3137322e31362e31312e35392c6c6f63616c686f73742c3132372e302e302e310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e793d3139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f72643d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d653d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c653d66616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e3d2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f773d66616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e3d66616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c69733d36303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e51756572793d53454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c65643d747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e733d2a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e3d2f2a0a737072696e672e64617461736f757263652e70617373776f72643d7061676572726f6f740a737072696e672e64617461736f757263652e747970653d636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c3d6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f70616765725f73686f703f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d653d726f6f740a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, '90385ae883830fedd6b694a159be7c75', '2020-09-04 11:38:30', '2020-09-04 03:38:30', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('94', '127', 'shop-cart.properties', 'shop', '电商系统', 0x71696e69752e6163636573735f6b65793d3347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b65743d7374617469630a71696e69752e7365637265745f6b65793d366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d653d636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f706572746965733d64727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c746572733d737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a653d31300a737072696e672e64617461736f757263652e64727569642e6d61784163746976653d32300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a653d32300a737072696e672e64617461736f757263652e64727569642e6d6178576169743d36303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c653d31300a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c69733d3330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e74733d747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f773d3137322e31362e31312e35392c6c6f63616c686f73742c3132372e302e302e310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e793d3139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f72643d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d653d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c653d66616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e3d2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f773d66616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e3d66616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c69733d36303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e51756572793d53454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c65643d747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e733d2a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e3d2f2a0a737072696e672e64617461736f757263652e70617373776f72643d7061676572726f6f740a737072696e672e64617461736f757263652e747970653d636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c3d6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f70616765725f636172743f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d653d726f6f740a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, 'e950001ceff43409b4b7ac9c1c31446a', '2020-09-04 11:47:06', '2020-09-04 03:47:06', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'), ('94', '128', 'shop-cart.properties', 'shop', '电商系统', 0x71696e69752e6163636573735f6b65793d3347464d2d52726b57464b6b346a4e4c5378576c4e3432686d5948794475345444436132352d687a0a71696e69752e6275636b65743d7374617469630a71696e69752e7365637265745f6b65793d366d51656a394c764e3853764a545a6e44726f53553366515931545739567937484534576138616d0a737072696e672e64617461736f757263652e6472697665722d636c6173732d6e616d653d636f6d2e6d7973716c2e636a2e6a6462632e4472697665720a737072696e672e64617461736f757263652e64727569642e636f6e6e656374696f6e50726f706572746965733d64727569642e737461742e6d6572676553716c3d747275653b64727569642e737461742e736c6f7753716c4d696c6c69733d353030300a737072696e672e64617461736f757263652e64727569642e66696c746572733d737461742c77616c6c2c736c66346a0a737072696e672e64617461736f757263652e64727569642e696e697469616c2d73697a653d31300a737072696e672e64617461736f757263652e64727569642e6d61784163746976653d32300a737072696e672e64617461736f757263652e64727569642e6d6178506f6f6c507265706172656453746174656d656e74506572436f6e6e656374696f6e53697a653d32300a737072696e672e64617461736f757263652e64727569642e6d6178576169743d36303030300a737072696e672e64617461736f757263652e64727569642e6d696e2d69646c653d31300a737072696e672e64617461736f757263652e64727569642e6d696e457669637461626c6549646c6554696d654d696c6c69733d3330303030300a737072696e672e64617461736f757263652e64727569642e706f6f6c507265706172656453746174656d656e74733d747275650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e616c6c6f773d3137322e31362e31312e35392c6c6f63616c686f73742c3132372e302e302e310a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e64656e793d3139322e3136382e312e37330a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d70617373776f72643d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e6c6f67696e2d757365726e616d653d6e756c6c0a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e72657365742d656e61626c653d66616c73650a737072696e672e64617461736f757263652e64727569642e737461742d766965772d736572766c65742e75726c2d7061747465726e3d2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e746573744f6e426f72726f773d66616c73650a737072696e672e64617461736f757263652e64727569642e746573744f6e52657475726e3d66616c73650a737072696e672e64617461736f757263652e64727569642e746573745768696c6549646c65203d20747275650a737072696e672e64617461736f757263652e64727569642e74696d654265747765656e4576696374696f6e52756e734d696c6c69733d36303030300a737072696e672e64617461736f757263652e64727569642e76616c69646174696f6e51756572793d53454c45435420310a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e656e61626c65643d747275650a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e6578636c7573696f6e733d2a2e6a732c2a2e6769662c2a2e6a70672c2a2e626d702c2a2e706e672c2a2e6373732c2a2e69636f2c2f64727569642f2a0a737072696e672e64617461736f757263652e64727569642e7765622d737461742d66696c7465722e75726c2d7061747465726e3d2f2a0a737072696e672e64617461736f757263652e70617373776f72643d7061676572726f6f740a737072696e672e64617461736f757263652e747970653d636f6d2e616c69626162612e64727569642e706f6f6c2e447275696444617461536f757263650a737072696e672e64617461736f757263652e75726c3d6a6462633a6d7973716c3a2f2f3130312e3133322e3132312e3137383a333330362f70616765725f676f6f64733f73657276657254696d657a6f6e653d417369612f5368616e6768616926757365556e69636f64653d7472756526636861726163746572456e636f64696e673d5554462d382675736553534c3d66616c73650a737072696e672e64617461736f757263652e757365726e616d653d726f6f740a737072696e672e72656469732e686f73743d3130312e3133322e3132312e3137380a737072696e672e72656469732e706f72743d363337390a737072696e672e72656469732e70617373776f72643d6162632b313233, '46184e607fb4c7393290fa9d5d1c03f9', '2020-09-04 11:47:16', '2020-09-04 03:47:16', null, '124.78.173.62', 'U', '0759bc76-60b5-4f32-acd5-e5095cf2b93d'); +COMMIT; + +-- ---------------------------- +-- Table structure for `permissions` +-- ---------------------------- +DROP TABLE IF EXISTS `permissions`; +CREATE TABLE `permissions` ( + `role` varchar(50) NOT NULL, + `resource` varchar(255) NOT NULL, + `action` varchar(8) NOT NULL, + UNIQUE KEY `uk_role_permission` (`role`,`resource`,`action`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=latin1; -- ---------------------------- -- Table structure for `roles` -- ---------------------------- DROP TABLE IF EXISTS `roles`; CREATE TABLE `roles` ( - `username` varchar(50) COLLATE utf8mb4_bin NOT NULL, - `role` varchar(50) COLLATE utf8mb4_bin NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; + `username` varchar(50) NOT NULL, + `role` varchar(50) NOT NULL, + UNIQUE KEY `idx_user_role` (`username`,`role`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=latin1; -- ---------------------------- -- Records of `roles` @@ -197,8 +217,8 @@ CREATE TABLE `tenant_capacity` ( `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数', `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值', `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量', - `gmt_create` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '修改时间', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', PRIMARY KEY (`id`), UNIQUE KEY `uk_tenant_id` (`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='租户容量信息表'; @@ -219,13 +239,13 @@ CREATE TABLE `tenant_info` ( PRIMARY KEY (`id`), UNIQUE KEY `uk_tenant_info_kptenantid` (`kp`,`tenant_id`), KEY `idx_tenant_id` (`tenant_id`) -) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='tenant_info'; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='tenant_info'; -- ---------------------------- -- Records of `tenant_info` -- ---------------------------- BEGIN; -INSERT INTO `tenant_info` VALUES ('1', '1', '4e2b2e1a-52d5-4597-ae4b-9068e4a84707', 'private(私有空间)', '私有空间', 'nacos', '1563678130558', '1563678130558'), ('2', '1', 'cf906857-6823-41b4-a60e-5eaf1719fd8f', 'dev', '开发环境', 'nacos', '1564493086378', '1564493086378'), ('3', '1', '5b6b4689-dcb8-4e74-ad4f-9ec47a167875', 'test', '测试环境', 'nacos', '1564493097384', '1564493097384'), ('4', '1', '7f899468-9ccc-4cf2-a4cf-4967ec1e4501', 'uat', '灰度环境', 'nacos', '1564493112719', '1564493112719'), ('5', '1', '05c143bf-ac70-408e-a31f-5dee940418b6', 'prod', '生成环境', 'nacos', '1564493125885', '1564493125885'); +INSERT INTO `tenant_info` VALUES ('1', '1', '0759bc76-60b5-4f32-acd5-e5095cf2b93d', 'dev', '开发环境', 'nacos', '1599182359703', '1599182359703'); COMMIT; -- ---------------------------- @@ -233,11 +253,11 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `users`; CREATE TABLE `users` ( - `username` varchar(50) COLLATE utf8mb4_bin NOT NULL, - `password` varchar(500) COLLATE utf8mb4_bin NOT NULL, + `username` varchar(50) NOT NULL, + `password` varchar(500) NOT NULL, `enabled` tinyint(1) NOT NULL, PRIMARY KEY (`username`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; +) ENGINE=InnoDB DEFAULT CHARSET=latin1; -- ---------------------------- -- Records of `users` diff --git a/doc/base/pager_activity.sql b/doc/base/pager_activity.sql index 35c6634..7e8a783 100644 --- a/doc/base/pager_activity.sql +++ b/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; -- ---------------------------- diff --git a/doc/base/pager_auth.sql b/doc/base/pager_auth.sql index a4a92d2..6f61833 100644 --- a/doc/base/pager_auth.sql +++ b/doc/base/pager_auth.sql @@ -1,17 +1,17 @@ /* Navicat Premium Data Transfer - Source Server : dev + Source Server : prod Source Server Type : MySQL - Source Server Version : 50724 - Source Host : localhost + Source Server Version : 50646 + Source Host : 101.132.121.178 Source Database : pager_auth Target Server Type : MySQL - Target Server Version : 50724 + Target Server Version : 50646 File Encoding : utf-8 - Date: 12/22/2019 15:53:38 PM + Date: 09/04/2020 15:27:39 PM */ SET NAMES utf8; @@ -54,7 +54,7 @@ CREATE TABLE `oauth_access_token` ( -- Records of `oauth_access_token` -- ---------------------------- BEGIN; -INSERT INTO `oauth_access_token` VALUES ('fd8bf2713f3e48df6a74128e8b866e5f', 0xaced0005737200436f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744f4175746832416363657373546f6b656e0cb29e361b24face0200064c00156164646974696f6e616c496e666f726d6174696f6e74000f4c6a6176612f7574696c2f4d61703b4c000a65787069726174696f6e7400104c6a6176612f7574696c2f446174653b4c000c72656672657368546f6b656e74003f4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f636f6d6d6f6e2f4f417574683252656672657368546f6b656e3b4c000573636f706574000f4c6a6176612f7574696c2f5365743b4c0009746f6b656e547970657400124c6a6176612f6c616e672f537472696e673b4c000576616c756571007e000578707372001e6a6176612e7574696c2e436f6c6c656374696f6e7324456d7074794d6170593614855adce7d002000078707372000e6a6176612e7574696c2e44617465686a81014b5974190300007870770800000169c05d3fc0787372004c6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744578706972696e674f417574683252656672657368546f6b656e2fdf47639dd0c9b70200014c000a65787069726174696f6e71007e0002787200446f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744f417574683252656672657368546f6b656e73e10e0a6354d45e0200014c000576616c756571007e0005787074002432313864333735312d633236642d343265322d623266622d6330323636333331636330307371007e000977080000016a5848d9be78737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000023f400000000000017400067365727665727874000662656172657274002461613837313837382d316433642d346464362d393438352d346637363765653639633566, '75be461feeb74022df4fb77a4667c936', 'admin', 'service-hi', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000002770400000002737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b787074000a524f4c455f41444d494e7371007e000d740009524f4c455f555345527871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0016787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00144c000573636f706571007e0016787074000a736572766963652d6869737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00147870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c77080000001000000007740013757365725f6f617574685f617070726f76616c74000474727565740004636f64657400064b636331717074000a6772616e745f74797065740012617574686f72697a6174696f6e5f636f646574000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a3830393574000d636c69656e745f736563726574740006313233343536740009636c69656e745f696474000a736572766963652d686978737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000673657276657278017371007e002f770c000000103f40000000000000787371007e001c3f400000000000007708000000100000000078740015687474703a2f2f3132372e302e302e313a38303935707371007e002f770c000000103f40000000000000787371007e002f770c000000103f4000000000000171007e0025787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000277040000000271007e000f71007e00117871007e003a737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020364233314639423435433534393943393533304441444336453942384643303470737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00164c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e002c737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000271007e000f71007e0011787074000561646d696e, '080fcb6895d57b819938defa9b96409d'), ('d6a85d30558f266bfff77ea9c26fe76d', 0xaced0005737200436f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744f4175746832416363657373546f6b656e0cb29e361b24face0200064c00156164646974696f6e616c496e666f726d6174696f6e74000f4c6a6176612f7574696c2f4d61703b4c000a65787069726174696f6e7400104c6a6176612f7574696c2f446174653b4c000c72656672657368546f6b656e74003f4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f636f6d6d6f6e2f4f417574683252656672657368546f6b656e3b4c000573636f706574000f4c6a6176612f7574696c2f5365743b4c0009746f6b656e547970657400124c6a6176612f6c616e672f537472696e673b4c000576616c756571007e000578707372001e6a6176612e7574696c2e436f6c6c656374696f6e7324456d7074794d6170593614855adce7d002000078707372000e6a6176612e7574696c2e44617465686a81014b5974190300007870770800000169d51bb4727870737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f400000000000017400036170707874000662656172657274002435656363353539642d373836392d343132332d613832652d316264383730326431346531, '0b68621a7fd2513d1f46374271a1c5c9', 'test', 'client4', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000001770400000001737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b7870740015524f6c455f4f5045524154494f4e5f4d414e4147457871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0014787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00124c000573636f706571007e00147870740007636c69656e7434737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00127870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000037708000000040000000274000a6772616e745f7479706574000870617373776f7264740008757365726e616d657400047465737478737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e0023770c000000103f40000000000000787371007e001a3f40000000000000770800000010000000007870707371007e0023770c000000103f40000000000000787371007e0023770c000000103f40000000000000787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000177040000000171007e000f7871007e002d737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f726465727871007e001a3f400000000000067708000000080000000271007e001c71007e001d71007e001e71007e001f780070737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00144c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0020737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000171007e000f787071007e001f, null), ('97e3a140b4292ca33c5d56e8021ff03b', 0xaced0005737200436f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744f4175746832416363657373546f6b656e0cb29e361b24face0200064c00156164646974696f6e616c496e666f726d6174696f6e74000f4c6a6176612f7574696c2f4d61703b4c000a65787069726174696f6e7400104c6a6176612f7574696c2f446174653b4c000c72656672657368546f6b656e74003f4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f636f6d6d6f6e2f4f417574683252656672657368546f6b656e3b4c000573636f706574000f4c6a6176612f7574696c2f5365743b4c0009746f6b656e547970657400124c6a6176612f6c616e672f537472696e673b4c000576616c756571007e000578707372001e6a6176612e7574696c2e436f6c6c656374696f6e7324456d7074794d6170593614855adce7d002000078707372000e6a6176612e7574696c2e44617465686a81014b597419030000787077080000016b058fde507870737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000023f400000000000017400036170707874000662656172657274002439613435626636302d663864622d346633342d393861632d313831656631303731343132, 'e28b947495dc9d0b1a3cdaae711cfa4b', 'coding', 'client4', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000001770400000001737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b7870740010524f4c455f53555045525f41444d494e7871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0014787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00124c000573636f706571007e00147870740007636c69656e7434737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00127870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000037708000000040000000274000a6772616e745f7479706574000870617373776f7264740008757365726e616d65740006636f64696e6778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e0023770c000000103f40000000000000787371007e001a3f40000000000000770800000010000000007870707371007e0023770c000000103f40000000000000787371007e0023770c000000103f40000000000000787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000177040000000171007e000f7871007e002d737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f726465727871007e001a3f400000000000067708000000080000000271007e001c71007e001d71007e001e71007e001f780070737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00144c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0020737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000171007e000f787071007e001f, null), ('8ec05f3f82e60414c15b93eb0e9ade3e', 0xaced0005737200436f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744f4175746832416363657373546f6b656e0cb29e361b24face0200064c00156164646974696f6e616c496e666f726d6174696f6e74000f4c6a6176612f7574696c2f4d61703b4c000a65787069726174696f6e7400104c6a6176612f7574696c2f446174653b4c000c72656672657368546f6b656e74003f4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f636f6d6d6f6e2f4f417574683252656672657368546f6b656e3b4c000573636f706574000f4c6a6176612f7574696c2f5365743b4c0009746f6b656e547970657400124c6a6176612f6c616e672f537472696e673b4c000576616c756571007e000578707372001e6a6176612e7574696c2e436f6c6c656374696f6e7324456d7074794d6170593614855adce7d002000078707372000e6a6176612e7574696c2e44617465686a81014b597419030000787077080000016b08e572857870737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f400000000000017400036170707874000662656172657274002464336561633538372d646533312d346534362d623765342d323931663237623630613234, '57704ce00aa474d115c5081e4816fe2b', 'admin', 'client4', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000001770400000001737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b7870740010524f4c455f53555045525f41444d494e7871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0014787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00124c000573636f706571007e00147870740007636c69656e7434737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00127870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000037708000000040000000274000a6772616e745f7479706574000870617373776f7264740008757365726e616d6574000561646d696e78737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e0023770c000000103f40000000000000787371007e001a3f40000000000000770800000010000000007870707371007e0023770c000000103f40000000000000787371007e0023770c000000103f40000000000000787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000177040000000171007e000f7871007e002d737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f726465727871007e001a3f400000000000067708000000080000000271007e001c71007e001d71007e001e71007e001f780070737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00144c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0020737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000171007e000f787071007e001f, null), ('e10588a1228f2f961099f3bf44aff370', 0xaced0005737200436f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744f4175746832416363657373546f6b656e0cb29e361b24face0200064c00156164646974696f6e616c496e666f726d6174696f6e74000f4c6a6176612f7574696c2f4d61703b4c000a65787069726174696f6e7400104c6a6176612f7574696c2f446174653b4c000c72656672657368546f6b656e74003f4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f636f6d6d6f6e2f4f417574683252656672657368546f6b656e3b4c000573636f706574000f4c6a6176612f7574696c2f5365743b4c0009746f6b656e547970657400124c6a6176612f6c616e672f537472696e673b4c000576616c756571007e000578707372001e6a6176612e7574696c2e436f6c6c656374696f6e7324456d7074794d6170593614855adce7d002000078707372000e6a6176612e7574696c2e44617465686a81014b597419030000787077080000016dc6a8cef27870737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000023f400000000000017400036170707874000662656172657274002438326636643061652d633135612d346232352d393532612d383233343031333866376237, '7999ded3cff1d2237e92b4d3a5a37e11', 'admin', 'client7', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000001770400000001737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b7870740010524f4c455f53555045525f41444d494e7871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0014787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00124c000573636f706571007e00147870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00127870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000037708000000040000000274000a6772616e745f7479706574000870617373776f7264740008757365726e616d6574000561646d696e78737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e0023770c000000103f40000000000000787371007e001a3f40000000000000770800000010000000007870707371007e0023770c000000103f40000000000000787371007e0023770c000000103f40000000000000787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000177040000000171007e000f7871007e002d737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f726465727871007e001a3f400000000000067708000000080000000271007e001c71007e001d71007e001e71007e001f780070737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00144c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0020737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000171007e000f787071007e001f, null), ('63a2dee8fdaf18893cf91cb3ba2148a1', 0xaced0005737200436f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744f4175746832416363657373546f6b656e0cb29e361b24face0200064c00156164646974696f6e616c496e666f726d6174696f6e74000f4c6a6176612f7574696c2f4d61703b4c000a65787069726174696f6e7400104c6a6176612f7574696c2f446174653b4c000c72656672657368546f6b656e74003f4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f636f6d6d6f6e2f4f417574683252656672657368546f6b656e3b4c000573636f706574000f4c6a6176612f7574696c2f5365743b4c0009746f6b656e547970657400124c6a6176612f6c616e672f537472696e673b4c000576616c756571007e000578707372001e6a6176612e7574696c2e436f6c6c656374696f6e7324456d7074794d6170593614855adce7d002000078707372000e6a6176612e7574696c2e44617465686a81014b597419030000787077080000016f2e20f0d67870737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000023f400000000000017400036170707874000662656172657274002466356339626534322d343937392d346639642d393162322d336531313739343366323939, '6ce13d94e8f6405b9654ffd86c787f76', '13813145021', 'client7', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000001770400000001737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b7870740010524f4c455f53555045525f41444d494e7871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0014787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00124c000573636f706571007e00147870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00127870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000037708000000040000000274000a6772616e745f7479706574000870617373776f7264740008757365726e616d6574000b313338313331343530323178737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e0023770c000000103f40000000000000787371007e001a3f40000000000000770800000010000000007870707371007e0023770c000000103f40000000000000787371007e0023770c000000103f40000000000000787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000177040000000171007e000f7871007e002d737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f726465727871007e001a3f400000000000067708000000080000000271007e001c71007e001d71007e001e71007e001f780070737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00144c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0020737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000171007e000f787071007e001f, null); +INSERT INTO `oauth_access_token` VALUES ('fd8bf2713f3e48df6a74128e8b866e5f', 0xaced0005737200436f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744f4175746832416363657373546f6b656e0cb29e361b24face0200064c00156164646974696f6e616c496e666f726d6174696f6e74000f4c6a6176612f7574696c2f4d61703b4c000a65787069726174696f6e7400104c6a6176612f7574696c2f446174653b4c000c72656672657368546f6b656e74003f4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f636f6d6d6f6e2f4f417574683252656672657368546f6b656e3b4c000573636f706574000f4c6a6176612f7574696c2f5365743b4c0009746f6b656e547970657400124c6a6176612f6c616e672f537472696e673b4c000576616c756571007e000578707372001e6a6176612e7574696c2e436f6c6c656374696f6e7324456d7074794d6170593614855adce7d002000078707372000e6a6176612e7574696c2e44617465686a81014b5974190300007870770800000169c05d3fc0787372004c6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744578706972696e674f417574683252656672657368546f6b656e2fdf47639dd0c9b70200014c000a65787069726174696f6e71007e0002787200446f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744f417574683252656672657368546f6b656e73e10e0a6354d45e0200014c000576616c756571007e0005787074002432313864333735312d633236642d343265322d623266622d6330323636333331636330307371007e000977080000016a5848d9be78737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000023f400000000000017400067365727665727874000662656172657274002461613837313837382d316433642d346464362d393438352d346637363765653639633566, '75be461feeb74022df4fb77a4667c936', 'admin', 'service-hi', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000002770400000002737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b787074000a524f4c455f41444d494e7371007e000d740009524f4c455f555345527871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0016787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00144c000573636f706571007e0016787074000a736572766963652d6869737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00147870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c77080000001000000007740013757365725f6f617574685f617070726f76616c74000474727565740004636f64657400064b636331717074000a6772616e745f74797065740012617574686f72697a6174696f6e5f636f646574000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a3830393574000d636c69656e745f736563726574740006313233343536740009636c69656e745f696474000a736572766963652d686978737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000673657276657278017371007e002f770c000000103f40000000000000787371007e001c3f400000000000007708000000100000000078740015687474703a2f2f3132372e302e302e313a38303935707371007e002f770c000000103f40000000000000787371007e002f770c000000103f4000000000000171007e0025787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000277040000000271007e000f71007e00117871007e003a737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020364233314639423435433534393943393533304441444336453942384643303470737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00164c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e002c737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000271007e000f71007e0011787074000561646d696e, '080fcb6895d57b819938defa9b96409d'), ('d6a85d30558f266bfff77ea9c26fe76d', 0xaced0005737200436f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744f4175746832416363657373546f6b656e0cb29e361b24face0200064c00156164646974696f6e616c496e666f726d6174696f6e74000f4c6a6176612f7574696c2f4d61703b4c000a65787069726174696f6e7400104c6a6176612f7574696c2f446174653b4c000c72656672657368546f6b656e74003f4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f636f6d6d6f6e2f4f417574683252656672657368546f6b656e3b4c000573636f706574000f4c6a6176612f7574696c2f5365743b4c0009746f6b656e547970657400124c6a6176612f6c616e672f537472696e673b4c000576616c756571007e000578707372001e6a6176612e7574696c2e436f6c6c656374696f6e7324456d7074794d6170593614855adce7d002000078707372000e6a6176612e7574696c2e44617465686a81014b5974190300007870770800000169d51bb4727870737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f400000000000017400036170707874000662656172657274002435656363353539642d373836392d343132332d613832652d316264383730326431346531, '0b68621a7fd2513d1f46374271a1c5c9', 'test', 'client4', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000001770400000001737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b7870740015524f6c455f4f5045524154494f4e5f4d414e4147457871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0014787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00124c000573636f706571007e00147870740007636c69656e7434737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00127870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000037708000000040000000274000a6772616e745f7479706574000870617373776f7264740008757365726e616d657400047465737478737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e0023770c000000103f40000000000000787371007e001a3f40000000000000770800000010000000007870707371007e0023770c000000103f40000000000000787371007e0023770c000000103f40000000000000787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000177040000000171007e000f7871007e002d737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f726465727871007e001a3f400000000000067708000000080000000271007e001c71007e001d71007e001e71007e001f780070737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00144c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0020737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000171007e000f787071007e001f, null), ('97e3a140b4292ca33c5d56e8021ff03b', 0xaced0005737200436f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744f4175746832416363657373546f6b656e0cb29e361b24face0200064c00156164646974696f6e616c496e666f726d6174696f6e74000f4c6a6176612f7574696c2f4d61703b4c000a65787069726174696f6e7400104c6a6176612f7574696c2f446174653b4c000c72656672657368546f6b656e74003f4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f636f6d6d6f6e2f4f417574683252656672657368546f6b656e3b4c000573636f706574000f4c6a6176612f7574696c2f5365743b4c0009746f6b656e547970657400124c6a6176612f6c616e672f537472696e673b4c000576616c756571007e000578707372001e6a6176612e7574696c2e436f6c6c656374696f6e7324456d7074794d6170593614855adce7d002000078707372000e6a6176612e7574696c2e44617465686a81014b597419030000787077080000016b058fde507870737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000023f400000000000017400036170707874000662656172657274002439613435626636302d663864622d346633342d393861632d313831656631303731343132, 'e28b947495dc9d0b1a3cdaae711cfa4b', 'coding', 'client4', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000001770400000001737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b7870740010524f4c455f53555045525f41444d494e7871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0014787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00124c000573636f706571007e00147870740007636c69656e7434737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00127870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000037708000000040000000274000a6772616e745f7479706574000870617373776f7264740008757365726e616d65740006636f64696e6778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e0023770c000000103f40000000000000787371007e001a3f40000000000000770800000010000000007870707371007e0023770c000000103f40000000000000787371007e0023770c000000103f40000000000000787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000177040000000171007e000f7871007e002d737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f726465727871007e001a3f400000000000067708000000080000000271007e001c71007e001d71007e001e71007e001f780070737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00144c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0020737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000171007e000f787071007e001f, null), ('8ec05f3f82e60414c15b93eb0e9ade3e', 0xaced0005737200436f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744f4175746832416363657373546f6b656e0cb29e361b24face0200064c00156164646974696f6e616c496e666f726d6174696f6e74000f4c6a6176612f7574696c2f4d61703b4c000a65787069726174696f6e7400104c6a6176612f7574696c2f446174653b4c000c72656672657368546f6b656e74003f4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f636f6d6d6f6e2f4f417574683252656672657368546f6b656e3b4c000573636f706574000f4c6a6176612f7574696c2f5365743b4c0009746f6b656e547970657400124c6a6176612f6c616e672f537472696e673b4c000576616c756571007e000578707372001e6a6176612e7574696c2e436f6c6c656374696f6e7324456d7074794d6170593614855adce7d002000078707372000e6a6176612e7574696c2e44617465686a81014b597419030000787077080000016b08e572857870737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f400000000000017400036170707874000662656172657274002464336561633538372d646533312d346534362d623765342d323931663237623630613234, '57704ce00aa474d115c5081e4816fe2b', 'admin', 'client4', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000001770400000001737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b7870740010524f4c455f53555045525f41444d494e7871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0014787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00124c000573636f706571007e00147870740007636c69656e7434737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00127870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000037708000000040000000274000a6772616e745f7479706574000870617373776f7264740008757365726e616d6574000561646d696e78737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e0023770c000000103f40000000000000787371007e001a3f40000000000000770800000010000000007870707371007e0023770c000000103f40000000000000787371007e0023770c000000103f40000000000000787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000177040000000171007e000f7871007e002d737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f726465727871007e001a3f400000000000067708000000080000000271007e001c71007e001d71007e001e71007e001f780070737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00144c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0020737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000171007e000f787071007e001f, null), ('e10588a1228f2f961099f3bf44aff370', 0xaced0005737200436f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744f4175746832416363657373546f6b656e0cb29e361b24face0200064c00156164646974696f6e616c496e666f726d6174696f6e74000f4c6a6176612f7574696c2f4d61703b4c000a65787069726174696f6e7400104c6a6176612f7574696c2f446174653b4c000c72656672657368546f6b656e74003f4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f636f6d6d6f6e2f4f417574683252656672657368546f6b656e3b4c000573636f706574000f4c6a6176612f7574696c2f5365743b4c0009746f6b656e547970657400124c6a6176612f6c616e672f537472696e673b4c000576616c756571007e000578707372001e6a6176612e7574696c2e436f6c6c656374696f6e7324456d7074794d6170593614855adce7d002000078707372000e6a6176612e7574696c2e44617465686a81014b597419030000787077080000016dc6a8cef27870737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000023f400000000000017400036170707874000662656172657274002438326636643061652d633135612d346232352d393532612d383233343031333866376237, '7999ded3cff1d2237e92b4d3a5a37e11', 'admin', 'client7', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000001770400000001737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b7870740010524f4c455f53555045525f41444d494e7871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0014787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00124c000573636f706571007e00147870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00127870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000037708000000040000000274000a6772616e745f7479706574000870617373776f7264740008757365726e616d6574000561646d696e78737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e0023770c000000103f40000000000000787371007e001a3f40000000000000770800000010000000007870707371007e0023770c000000103f40000000000000787371007e0023770c000000103f40000000000000787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000177040000000171007e000f7871007e002d737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f726465727871007e001a3f400000000000067708000000080000000271007e001c71007e001d71007e001e71007e001f780070737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00144c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0020737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000171007e000f787071007e001f, null), ('f1f599d3d9ef5bec350be7be8ddda8b5', 0xaced0005737200436f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744f4175746832416363657373546f6b656e0cb29e361b24face0200064c00156164646974696f6e616c496e666f726d6174696f6e74000f4c6a6176612f7574696c2f4d61703b4c000a65787069726174696f6e7400104c6a6176612f7574696c2f446174653b4c000c72656672657368546f6b656e74003f4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f636f6d6d6f6e2f4f417574683252656672657368546f6b656e3b4c000573636f706574000f4c6a6176612f7574696c2f5365743b4c0009746f6b656e547970657400124c6a6176612f6c616e672f537472696e673b4c000576616c756571007e000578707372001e6a6176612e7574696c2e436f6c6c656374696f6e7324456d7074794d6170593614855adce7d002000078707372000e6a6176612e7574696c2e44617465686a81014b597419030000787077080000017197e1a96b7870737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f400000000000017400036170707874000662656172657274002437333562396464342d363533612d346536662d616337392d613037643665643035386430, '6ce13d94e8f6405b9654ffd86c787f76', '13813145021', 'client7', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000063770400000063737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b787074000e50414745525f41435449564954597371007e000d74001750414745525f41435449564954595f415353454d424c597371007e000d74001e50414745525f41435449564954595f415353454d424c595f4352454154457371007e000d74001d50414745525f41435449564954595f415353454d424c595f474f4f44537371007e000d74002450414745525f41435449564954595f415353454d424c595f474f4f44535f44455441494c7371007e000d74002550414745525f41435449564954595f415353454d424c595f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f415353454d424c595f4d4f444946597371007e000d74001e50414745525f41435449564954595f415353454d424c595f5245434f52447371007e000d74001c50414745525f41435449564954595f415353454d424c595f52554c457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4d4f444946597371007e000d74001550414745525f41435449564954595f42414e4e45527371007e000d74001c50414745525f41435449564954595f42414e4e45525f4352454154457371007e000d74001c50414745525f41435449564954595f42414e4e45525f4d4f444946597371007e000d74001550414745525f41435449564954595f434f55504f4e7371007e000d74001d50414745525f41435449564954595f434f55504f4e5f5055424c4953487371007e000d74001e50414745525f41435449564954595f434f55504f4e5f54454d504c4154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4352454154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4d4f444946597371007e000d74001a50414745525f41435449564954595f434f55504f4e5f555345527371007e000d74001750414745525f41435449564954595f45584348414e47457371007e000d74001e50414745525f41435449564954595f45584348414e47455f4352454154457371007e000d74001d50414745525f41435449564954595f45584348414e47455f474f4f44537371007e000d74002550414745525f41435449564954595f45584348414e47455f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f45584348414e47455f4d4f444946597371007e000d74001e50414745525f41435449564954595f45584348414e47455f5245434f52447371007e000d74001c50414745525f41435449564954595f45584348414e47455f52554c457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4d4f444946597371007e000d74001a50414745525f41435449564954595f474f4f44535f4252414e447371007e000d74002150414745525f41435449564954595f474f4f44535f4252414e445f4352454154457371007e000d74002150414745525f41435449564954595f474f4f44535f4252414e445f4d4f444946597371007e000d74001a50414745525f41435449564954595f474f4f44535f47524f55507371007e000d74002150414745525f41435449564954595f474f4f44535f47524f55505f4352454154457371007e000d74002150414745525f41435449564954595f474f4f44535f47524f55505f4d4f444946597371007e000d74002350414745525f41435449564954595f474f4f44535f47524f55505f50524f50455254597371007e000d74002a50414745525f41435449564954595f474f4f44535f47524f55505f50524f50455254595f4352454154457371007e000d74002a50414745525f41435449564954595f474f4f44535f47524f55505f50524f50455254595f4d4f444946597371007e000d74001d50414745525f41435449564954595f474f4f44535f50524f50455254597371007e000d74002450414745525f41435449564954595f474f4f44535f50524f50455254595f4352454154457371007e000d74002450414745525f41435449564954595f474f4f44535f50524f50455254595f4d4f444946597371007e000d74001850414745525f41435449564954595f474f4f44535f534b557371007e000d74001f50414745525f41435449564954595f474f4f44535f534b555f4d4f444946597371007e000d74001850414745525f41435449564954595f474f4f44535f5350557371007e000d74001f50414745525f41435449564954595f474f4f44535f5350555f4352454154457371007e000d74001f50414745525f41435449564954595f474f4f44535f5350555f4d4f444946597371007e000d74001750414745525f41435449564954595f494e54454752414c7371007e000d74001350414745525f41435449564954595f4b494c4c7371007e000d74000f50414745525f44415348424f4152447371007e000d74000d50414745525f46494e414e43457371007e000d74001250414745525f46494e414e43455f46554e447371007e000d74001350414745525f46494e414e43455f54524144457371007e000d74000f50414745525f47454e455241544f527371007e000d74000b50414745525f474f4f44537371007e000d74001a50414745525f474f4f44535f434c415353494649434154494f4e7371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4352454154457371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4d4f444946597371007e000d74000d50414745525f4d4f4e49544f527371007e000d74001650414745525f4d4f4e49544f525f41435449564954597371007e000d74001650414745525f4d4f4e49544f525f44415441424153457371007e000d74001350414745525f4d4f4e49544f525f474f4f44537371007e000d74001450414745525f4d4f4e49544f525f4d414e4147457371007e000d74001350414745525f4d4f4e49544f525f4f524445527371007e000d74000b50414745525f4f524445527371007e000d74001050414745525f4f524445525f53414c457371007e000d74001250414745525f4f524445525f53454c4c45527371007e000d74001050414745525f4f524445525f555345527371007e000d74000e50414745525f504c4154464f524d7371007e000d74001550414745525f504c4154464f524d5f53454c4c45527371007e000d74001350414745525f504c4154464f524d5f555345527371007e000d74000a50414745525f5249534b7371007e000d74001450414745525f5249534b5f424c41434b4c4953547371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4352454154457371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4d4f444946597371007e000d74000f50414745525f5249534b5f52554c457371007e000d74001150414745525f524f4c455f53595354454d7371007e000d74001050414745525f535441544953544943537371007e000d74001950414745525f535441544953544943535f415353454d424c457371007e000d74001750414745525f535441544953544943535f434f55504f4e7371007e000d74001950414745525f535441544953544943535f494e54454752414c7371007e000d74001350414745525f53595354454d5f434f4e4649477371007e000d74001a50414745525f53595354454d5f434f4e4649475f4352454154457371007e000d74001a50414745525f53595354454d5f434f4e4649475f454e41424c457371007e000d74001a50414745525f53595354454d5f434f4e4649475f4d4f444946597371007e000d74001450414745525f53595354454d5f44594e414d49437371007e000d74001550414745525f53595354454d5f47454e45524154457371007e000d74001150414745525f53595354454d5f4d454e557371007e000d74001850414745525f53595354454d5f4d454e555f4352454154457371007e000d74001850414745525f53595354454d5f4d454e555f4d4f444946597371007e000d74001150414745525f53595354454d5f524f4c457371007e000d74001850414745525f53595354454d5f524f4c455f4352454154457371007e000d74001850414745525f53595354454d5f524f4c455f44454c4554457371007e000d74001750414745525f53595354454d5f524f4c455f4752414e547371007e000d74001850414745525f53595354454d5f524f4c455f4d4f444946597371007e000d74001c50414745525f53595354454d5f524f4c455f5045524d495353494f4e7371007e000d74001150414745525f53595354454d5f555345527371007e000d74001850414745525f53595354454d5f555345525f4352454154457371007e000d74001850414745525f53595354454d5f555345525f454e41424c457371007e000d74001850414745525f53595354454d5f555345525f4d4f444946597871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e00d8787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00d64c000573636f706571007e00d87870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00d67870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000037708000000040000000274000a6772616e745f7479706574000870617373776f7264740008757365726e616d6574000b313338313331343530323178737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e00e7770c000000103f40000000000000787371007e00de3f40000000000000770800000010000000007870707371007e00e7770c000000103f40000000000000787371007e00e7770c000000103f40000000000000787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000006377040000006371007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf71007e00d171007e00d37871007e00f1737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f726465727871007e00de3f400000000000067708000000080000000271007e00e071007e00e171007e00e271007e00e3780070737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00d84c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e00e4737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000006371007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf71007e00d171007e00d3787071007e00e3, null); COMMIT; -- ---------------------------- @@ -93,7 +93,7 @@ CREATE TABLE `oauth_client_details` ( -- Records of `oauth_client_details` -- ---------------------------- BEGIN; -INSERT INTO `oauth_client_details` VALUES ('client', null, 'secret', 'app', 'authorization_code', 'http://172.16.11.55:8095', null, null, null, null, null), ('client2', null, '{bcrypt}secret', 'app', 'authorization_code', 'http://172.16.11.55:9527', null, null, null, null, null), ('client3', null, '{bcrypt}secret', 'app', 'authorization_code', 'http://127.0.0.1:8099/oauth/home', null, null, null, null, null), ('client4', null, '$2a$10$5l0.t/a4oc9hmd92OQLQLe/ZgDaFF22PwrCitlblVeyXibiPGeVQ6', 'app', 'authorization_code,password', 'http://127.0.0.1:8095', null, null, null, null, null), ('client5', null, '{bcrypt}secret', 'app', 'authorization_code', 'http://127.0.0.1:9527', null, null, null, null, null), ('client6', null, '{bcrypt}secret', 'app', 'password', 'http://127.0.0.1:9527', null, null, null, null, null), ('client7', null, '$2a$10$5l0.t/a4oc9hmd92OQLQLe/ZgDaFF22PwrCitlblVeyXibiPGeVQ6', 'app', 'authorization_code,password', 'http://127.0.0.1:9527', null, null, null, null, null); +INSERT INTO `oauth_client_details` VALUES ('client', null, 'secret', 'app', 'authorization_code', 'http://172.16.11.55:8095', null, null, null, null, null), ('client2', null, '{bcrypt}secret', 'app', 'authorization_code', 'http://172.16.11.55:9527', null, null, null, null, null), ('client3', null, '{bcrypt}secret', 'app', 'authorization_code', 'http://127.0.0.1:8099/oauth/home', null, null, null, null, null), ('client4', null, '$2a$10$5l0.t/a4oc9hmd92OQLQLe/ZgDaFF22PwrCitlblVeyXibiPGeVQ6', 'app', 'authorization_code,password', 'http://127.0.0.1:8095', null, null, null, null, null), ('client5', null, '{bcrypt}secret', 'app', 'authorization_code', 'http://127.0.0.1:9527', null, null, null, null, null), ('client6', null, '{bcrypt}secret', 'app', 'password', 'http://127.0.0.1:9527', null, null, null, null, null), ('client7', null, '$2a$10$5l0.t/a4oc9hmd92OQLQLe/ZgDaFF22PwrCitlblVeyXibiPGeVQ6', 'app', 'authorization_code,password,sms,refresh_token', 'http://106.54.251.32', null, null, null, null, null), ('client8', null, '$2a$10$5l0.t/a4oc9hmd92OQLQLe/ZgDaFF22PwrCitlblVeyXibiPGeVQ6', 'app', 'authorization_code,password,client_credentials,refresh_token', 'http://106.54.251.32:8080', null, null, null, null, null); COMMIT; -- ---------------------------- @@ -121,7 +121,9 @@ CREATE TABLE `oauth_code` ( -- Records of `oauth_code` -- ---------------------------- BEGIN; -INSERT INTO `oauth_code` VALUES ('R9sJQB', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000001770400000001737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b7870740010524f4c455f53555045525f41444d494e7871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0014787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00124c000573636f706571007e00147870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00127870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a39353237740009636c69656e745f696471007e001778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e0024770c000000103f40000000000000787371007e001a3f40000000000000770800000010000000007871007e001f707371007e0024770c000000103f40000000000000787371007e0024770c000000103f4000000000000171007e001d787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000177040000000171007e000f7871007e002e737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020433442413245394144363332314530354439343144433638443233343837423270737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00144c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0021737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000171007e000f787074000561646d696e), ('g277ya', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000001770400000001737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b7870740010524f4c455f53555045525f41444d494e7871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0014787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00124c000573636f706571007e00147870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00127870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a39353237740009636c69656e745f696471007e001778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e0024770c000000103f40000000000000787371007e001a3f40000000000000770800000010000000007871007e001f707371007e0024770c000000103f40000000000000787371007e0024770c000000103f4000000000000171007e001d787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000177040000000171007e000f7871007e002e737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020413938453843363833454339393843393635343234303738333138444546313170737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00144c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0021737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000171007e000f787074000561646d696e), ('fY6j7p', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000001770400000001737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b7870740010524f4c455f53555045525f41444d494e7871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0014787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00124c000573636f706571007e00147870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00127870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a39353237740009636c69656e745f696471007e001778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e0024770c000000103f40000000000000787371007e001a3f40000000000000770800000010000000007871007e001f707371007e0024770c000000103f40000000000000787371007e0024770c000000103f4000000000000171007e001d787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000177040000000171007e000f7871007e002e737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020363934323036343138313044343341343743444530353137414143344433313470737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00144c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0021737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000171007e000f787074000561646d696e), ('vR6uTZ', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000001770400000001737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b7870740010524f4c455f53555045525f41444d494e7871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0014787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00124c000573636f706571007e00147870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00127870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a39353237740009636c69656e745f696471007e001778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e0024770c000000103f40000000000000787371007e001a3f40000000000000770800000010000000007871007e001f707371007e0024770c000000103f40000000000000787371007e0024770c000000103f4000000000000171007e001d787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000177040000000171007e000f7871007e002e737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020363934323036343138313044343341343743444530353137414143344433313470737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00144c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0021737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000171007e000f787074000561646d696e); +INSERT INTO `oauth_code` VALUES ('R9sJQB', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000001770400000001737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b7870740010524f4c455f53555045525f41444d494e7871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0014787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00124c000573636f706571007e00147870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00127870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a39353237740009636c69656e745f696471007e001778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e0024770c000000103f40000000000000787371007e001a3f40000000000000770800000010000000007871007e001f707371007e0024770c000000103f40000000000000787371007e0024770c000000103f4000000000000171007e001d787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000177040000000171007e000f7871007e002e737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020433442413245394144363332314530354439343144433638443233343837423270737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00144c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0021737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000171007e000f787074000561646d696e), ('g277ya', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000001770400000001737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b7870740010524f4c455f53555045525f41444d494e7871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0014787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00124c000573636f706571007e00147870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00127870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a39353237740009636c69656e745f696471007e001778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e0024770c000000103f40000000000000787371007e001a3f40000000000000770800000010000000007871007e001f707371007e0024770c000000103f40000000000000787371007e0024770c000000103f4000000000000171007e001d787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000177040000000171007e000f7871007e002e737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020413938453843363833454339393843393635343234303738333138444546313170737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00144c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0021737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000171007e000f787074000561646d696e), ('fY6j7p', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000001770400000001737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b7870740010524f4c455f53555045525f41444d494e7871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0014787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00124c000573636f706571007e00147870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00127870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a39353237740009636c69656e745f696471007e001778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e0024770c000000103f40000000000000787371007e001a3f40000000000000770800000010000000007871007e001f707371007e0024770c000000103f40000000000000787371007e0024770c000000103f4000000000000171007e001d787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000177040000000171007e000f7871007e002e737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020363934323036343138313044343341343743444530353137414143344433313470737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00144c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0021737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000171007e000f787074000561646d696e), ('vR6uTZ', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000001770400000001737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b7870740010524f4c455f53555045525f41444d494e7871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0014787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00124c000573636f706571007e00147870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00127870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a39353237740009636c69656e745f696471007e001778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e0024770c000000103f40000000000000787371007e001a3f40000000000000770800000010000000007871007e001f707371007e0024770c000000103f40000000000000787371007e0024770c000000103f4000000000000171007e001d787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000177040000000171007e000f7871007e002e737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020363934323036343138313044343341343743444530353137414143344433313470737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00144c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0021737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000171007e000f787074000561646d696e), ('rRHPog', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000061770400000061737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b787074000e50414745525f41435449564954597371007e000d74001750414745525f41435449564954595f415353454d424c597371007e000d74001e50414745525f41435449564954595f415353454d424c595f4352454154457371007e000d74001c50414745525f41435449564954595f415353454d424c595f444154417371007e000d74001d50414745525f41435449564954595f415353454d424c595f474f4f44537371007e000d74002450414745525f41435449564954595f415353454d424c595f474f4f44535f44455441494c7371007e000d74002550414745525f41435449564954595f415353454d424c595f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f415353454d424c595f4d4f444946597371007e000d74001e50414745525f41435449564954595f415353454d424c595f5245434f52447371007e000d74001c50414745525f41435449564954595f415353454d424c595f52554c457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4d4f444946597371007e000d74001550414745525f41435449564954595f42414e4e45527371007e000d74001c50414745525f41435449564954595f42414e4e45525f4352454154457371007e000d74001c50414745525f41435449564954595f42414e4e45525f4d4f444946597371007e000d74001550414745525f41435449564954595f434f55504f4e7371007e000d74001d50414745525f41435449564954595f434f55504f4e5f5055424c4953487371007e000d74001e50414745525f41435449564954595f434f55504f4e5f54454d504c4154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4352454154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4d4f444946597371007e000d74001a50414745525f41435449564954595f434f55504f4e5f555345527371007e000d74001750414745525f41435449564954595f45584348414e47457371007e000d74001e50414745525f41435449564954595f45584348414e47455f4352454154457371007e000d74001c50414745525f41435449564954595f45584348414e47455f444154417371007e000d74001d50414745525f41435449564954595f45584348414e47455f474f4f44537371007e000d74002550414745525f41435449564954595f45584348414e47455f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f45584348414e47455f4d4f444946597371007e000d74001e50414745525f41435449564954595f45584348414e47455f5245434f52447371007e000d74001c50414745525f41435449564954595f45584348414e47455f52554c457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4d4f444946597371007e000d74001750414745525f41435449564954595f494e54454752414c7371007e000d74001350414745525f41435449564954595f4b494c4c7371007e000d74000f50414745525f44415348424f4152447371007e000d74001550414745525f44415348424f4152445f4f524445527371007e000d74001850414745525f44415348424f4152445f52454749535445527371007e000d74001650414745525f44415348424f4152445f53454c4c45527371007e000d74001850414745525f44415348424f4152445f5455524e4f5645527371007e000d74000d50414745525f46494e414e43457371007e000d74001250414745525f46494e414e43455f46554e447371007e000d74001350414745525f46494e414e43455f54524144457371007e000d74000f50414745525f47454e455241544f527371007e000d74000b50414745525f474f4f44537371007e000d74001150414745525f474f4f44535f4252414e447371007e000d74001a50414745525f474f4f44535f434c415353494649434154494f4e7371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4352454154457371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4d4f444946597371007e000d74001150414745525f474f4f44535f47524f55507371007e000d74001a50414745525f474f4f44535f47524f55505f50524f50455254597371007e000d74001050414745525f474f4f44535f494e464f7371007e000d74001450414745525f474f4f44535f50524f50455254597371007e000d74000f50414745525f474f4f44535f534b557371007e000d74001650414745525f474f4f44535f534b555f4352454154457371007e000d74001650414745525f474f4f44535f534b555f4d4f444946597371007e000d74000f50414745525f474f4f44535f5350557371007e000d74000d50414745525f4d4f4e49544f527371007e000d74001650414745525f4d4f4e49544f525f41435449564954597371007e000d74001650414745525f4d4f4e49544f525f44415441424153457371007e000d74001350414745525f4d4f4e49544f525f474f4f44537371007e000d74001450414745525f4d4f4e49544f525f4d414e4147457371007e000d74001350414745525f4d4f4e49544f525f4f524445527371007e000d74000b50414745525f4f524445527371007e000d74001050414745525f4f524445525f53414c457371007e000d74001250414745525f4f524445525f53454c4c45527371007e000d74001050414745525f4f524445525f555345527371007e000d74000e50414745525f504c4154464f524d7371007e000d74001550414745525f504c4154464f524d5f53454c4c45527371007e000d74001350414745525f504c4154464f524d5f555345527371007e000d74000a50414745525f5249534b7371007e000d74001450414745525f5249534b5f424c41434b4c4953547371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4352454154457371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4d4f444946597371007e000d74000f50414745525f5249534b5f52554c457371007e000d74001150414745525f524f4c455f53595354454d7371007e000d74001050414745525f535441544953544943537371007e000d74001950414745525f535441544953544943535f415353454d424c457371007e000d74001750414745525f535441544953544943535f434f55504f4e7371007e000d74001950414745525f535441544953544943535f494e54454752414c7371007e000d74001350414745525f53595354454d5f434f4e4649477371007e000d74001a50414745525f53595354454d5f434f4e4649475f4352454154457371007e000d74001a50414745525f53595354454d5f434f4e4649475f454e41424c457371007e000d74001a50414745525f53595354454d5f434f4e4649475f4d4f444946597371007e000d74001450414745525f53595354454d5f44594e414d49437371007e000d74001550414745525f53595354454d5f47454e45524154457371007e000d74001150414745525f53595354454d5f4d454e557371007e000d74001850414745525f53595354454d5f4d454e555f4352454154457371007e000d74001850414745525f53595354454d5f4d454e555f4d4f444946597371007e000d74001150414745525f53595354454d5f524f4c457371007e000d74001850414745525f53595354454d5f524f4c455f4352454154457371007e000d74001850414745525f53595354454d5f524f4c455f44454c4554457371007e000d74001750414745525f53595354454d5f524f4c455f4752414e547371007e000d74001850414745525f53595354454d5f524f4c455f4d4f444946597371007e000d74001c50414745525f53595354454d5f524f4c455f5045524d495353494f4e7371007e000d74001150414745525f53595354454d5f555345527371007e000d74001850414745525f53595354454d5f555345525f4352454154457371007e000d74001850414745525f53595354454d5f555345525f454e41424c457371007e000d74001850414745525f53595354454d5f555345525f4d4f444946597871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e00d4787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00d24c000573636f706571007e00d47870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00d27870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000d726573706f6e73655f74797065740004636f646574000d636c69656e745f736563726574740006313131313131740009636c69656e745f696471007e00d778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e00e4770c000000103f40000000000000787371007e00da3f400000000000007708000000100000000078740019687474703a2f2f3130362e35342e3235312e33323a38303830707371007e00e4770c000000103f40000000000000787371007e00e4770c000000103f4000000000000171007e00dd787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000006177040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf7871007e00ef737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020453837393836313132454238344438434635464133343432453044453133323170737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00d44c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e00e1737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf787074000b3133383133313435303231), ('PqqmHl', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000061770400000061737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b787074000e50414745525f41435449564954597371007e000d74001750414745525f41435449564954595f415353454d424c597371007e000d74001e50414745525f41435449564954595f415353454d424c595f4352454154457371007e000d74001c50414745525f41435449564954595f415353454d424c595f444154417371007e000d74001d50414745525f41435449564954595f415353454d424c595f474f4f44537371007e000d74002450414745525f41435449564954595f415353454d424c595f474f4f44535f44455441494c7371007e000d74002550414745525f41435449564954595f415353454d424c595f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f415353454d424c595f4d4f444946597371007e000d74001e50414745525f41435449564954595f415353454d424c595f5245434f52447371007e000d74001c50414745525f41435449564954595f415353454d424c595f52554c457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4d4f444946597371007e000d74001550414745525f41435449564954595f42414e4e45527371007e000d74001c50414745525f41435449564954595f42414e4e45525f4352454154457371007e000d74001c50414745525f41435449564954595f42414e4e45525f4d4f444946597371007e000d74001550414745525f41435449564954595f434f55504f4e7371007e000d74001d50414745525f41435449564954595f434f55504f4e5f5055424c4953487371007e000d74001e50414745525f41435449564954595f434f55504f4e5f54454d504c4154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4352454154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4d4f444946597371007e000d74001a50414745525f41435449564954595f434f55504f4e5f555345527371007e000d74001750414745525f41435449564954595f45584348414e47457371007e000d74001e50414745525f41435449564954595f45584348414e47455f4352454154457371007e000d74001c50414745525f41435449564954595f45584348414e47455f444154417371007e000d74001d50414745525f41435449564954595f45584348414e47455f474f4f44537371007e000d74002550414745525f41435449564954595f45584348414e47455f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f45584348414e47455f4d4f444946597371007e000d74001e50414745525f41435449564954595f45584348414e47455f5245434f52447371007e000d74001c50414745525f41435449564954595f45584348414e47455f52554c457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4d4f444946597371007e000d74001750414745525f41435449564954595f494e54454752414c7371007e000d74001350414745525f41435449564954595f4b494c4c7371007e000d74000f50414745525f44415348424f4152447371007e000d74001550414745525f44415348424f4152445f4f524445527371007e000d74001850414745525f44415348424f4152445f52454749535445527371007e000d74001650414745525f44415348424f4152445f53454c4c45527371007e000d74001850414745525f44415348424f4152445f5455524e4f5645527371007e000d74000d50414745525f46494e414e43457371007e000d74001250414745525f46494e414e43455f46554e447371007e000d74001350414745525f46494e414e43455f54524144457371007e000d74000f50414745525f47454e455241544f527371007e000d74000b50414745525f474f4f44537371007e000d74001150414745525f474f4f44535f4252414e447371007e000d74001a50414745525f474f4f44535f434c415353494649434154494f4e7371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4352454154457371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4d4f444946597371007e000d74001150414745525f474f4f44535f47524f55507371007e000d74001a50414745525f474f4f44535f47524f55505f50524f50455254597371007e000d74001050414745525f474f4f44535f494e464f7371007e000d74001450414745525f474f4f44535f50524f50455254597371007e000d74000f50414745525f474f4f44535f534b557371007e000d74001650414745525f474f4f44535f534b555f4352454154457371007e000d74001650414745525f474f4f44535f534b555f4d4f444946597371007e000d74000f50414745525f474f4f44535f5350557371007e000d74000d50414745525f4d4f4e49544f527371007e000d74001650414745525f4d4f4e49544f525f41435449564954597371007e000d74001650414745525f4d4f4e49544f525f44415441424153457371007e000d74001350414745525f4d4f4e49544f525f474f4f44537371007e000d74001450414745525f4d4f4e49544f525f4d414e4147457371007e000d74001350414745525f4d4f4e49544f525f4f524445527371007e000d74000b50414745525f4f524445527371007e000d74001050414745525f4f524445525f53414c457371007e000d74001250414745525f4f524445525f53454c4c45527371007e000d74001050414745525f4f524445525f555345527371007e000d74000e50414745525f504c4154464f524d7371007e000d74001550414745525f504c4154464f524d5f53454c4c45527371007e000d74001350414745525f504c4154464f524d5f555345527371007e000d74000a50414745525f5249534b7371007e000d74001450414745525f5249534b5f424c41434b4c4953547371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4352454154457371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4d4f444946597371007e000d74000f50414745525f5249534b5f52554c457371007e000d74001150414745525f524f4c455f53595354454d7371007e000d74001050414745525f535441544953544943537371007e000d74001950414745525f535441544953544943535f415353454d424c457371007e000d74001750414745525f535441544953544943535f434f55504f4e7371007e000d74001950414745525f535441544953544943535f494e54454752414c7371007e000d74001350414745525f53595354454d5f434f4e4649477371007e000d74001a50414745525f53595354454d5f434f4e4649475f4352454154457371007e000d74001a50414745525f53595354454d5f434f4e4649475f454e41424c457371007e000d74001a50414745525f53595354454d5f434f4e4649475f4d4f444946597371007e000d74001450414745525f53595354454d5f44594e414d49437371007e000d74001550414745525f53595354454d5f47454e45524154457371007e000d74001150414745525f53595354454d5f4d454e557371007e000d74001850414745525f53595354454d5f4d454e555f4352454154457371007e000d74001850414745525f53595354454d5f4d454e555f4d4f444946597371007e000d74001150414745525f53595354454d5f524f4c457371007e000d74001850414745525f53595354454d5f524f4c455f4352454154457371007e000d74001850414745525f53595354454d5f524f4c455f44454c4554457371007e000d74001750414745525f53595354454d5f524f4c455f4752414e547371007e000d74001850414745525f53595354454d5f524f4c455f4d4f444946597371007e000d74001c50414745525f53595354454d5f524f4c455f5045524d495353494f4e7371007e000d74001150414745525f53595354454d5f555345527371007e000d74001850414745525f53595354454d5f555345525f4352454154457371007e000d74001850414745525f53595354454d5f555345525f454e41424c457371007e000d74001850414745525f53595354454d5f555345525f4d4f444946597871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e00d4787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00d24c000573636f706571007e00d47870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00d27870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000474000d726573706f6e73655f74797065740004636f646574000d636c69656e745f73656372657474000631313131313174000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a39353237740009636c69656e745f696471007e00d778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e00e6770c000000103f40000000000000787371007e00da3f40000000000000770800000010000000007871007e00e1707371007e00e6770c000000103f40000000000000787371007e00e6770c000000103f4000000000000171007e00dd787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000006177040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf7871007e00f0737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020453837393836313132454238344438434635464133343432453044453133323170737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00d44c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e00e3737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf787074000b3133383133313435303231), ('BHFRG6', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000061770400000061737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b787074000e50414745525f41435449564954597371007e000d74001750414745525f41435449564954595f415353454d424c597371007e000d74001e50414745525f41435449564954595f415353454d424c595f4352454154457371007e000d74001c50414745525f41435449564954595f415353454d424c595f444154417371007e000d74001d50414745525f41435449564954595f415353454d424c595f474f4f44537371007e000d74002450414745525f41435449564954595f415353454d424c595f474f4f44535f44455441494c7371007e000d74002550414745525f41435449564954595f415353454d424c595f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f415353454d424c595f4d4f444946597371007e000d74001e50414745525f41435449564954595f415353454d424c595f5245434f52447371007e000d74001c50414745525f41435449564954595f415353454d424c595f52554c457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4d4f444946597371007e000d74001550414745525f41435449564954595f42414e4e45527371007e000d74001c50414745525f41435449564954595f42414e4e45525f4352454154457371007e000d74001c50414745525f41435449564954595f42414e4e45525f4d4f444946597371007e000d74001550414745525f41435449564954595f434f55504f4e7371007e000d74001d50414745525f41435449564954595f434f55504f4e5f5055424c4953487371007e000d74001e50414745525f41435449564954595f434f55504f4e5f54454d504c4154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4352454154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4d4f444946597371007e000d74001a50414745525f41435449564954595f434f55504f4e5f555345527371007e000d74001750414745525f41435449564954595f45584348414e47457371007e000d74001e50414745525f41435449564954595f45584348414e47455f4352454154457371007e000d74001c50414745525f41435449564954595f45584348414e47455f444154417371007e000d74001d50414745525f41435449564954595f45584348414e47455f474f4f44537371007e000d74002550414745525f41435449564954595f45584348414e47455f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f45584348414e47455f4d4f444946597371007e000d74001e50414745525f41435449564954595f45584348414e47455f5245434f52447371007e000d74001c50414745525f41435449564954595f45584348414e47455f52554c457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4d4f444946597371007e000d74001750414745525f41435449564954595f494e54454752414c7371007e000d74001350414745525f41435449564954595f4b494c4c7371007e000d74000f50414745525f44415348424f4152447371007e000d74001550414745525f44415348424f4152445f4f524445527371007e000d74001850414745525f44415348424f4152445f52454749535445527371007e000d74001650414745525f44415348424f4152445f53454c4c45527371007e000d74001850414745525f44415348424f4152445f5455524e4f5645527371007e000d74000d50414745525f46494e414e43457371007e000d74001250414745525f46494e414e43455f46554e447371007e000d74001350414745525f46494e414e43455f54524144457371007e000d74000f50414745525f47454e455241544f527371007e000d74000b50414745525f474f4f44537371007e000d74001150414745525f474f4f44535f4252414e447371007e000d74001a50414745525f474f4f44535f434c415353494649434154494f4e7371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4352454154457371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4d4f444946597371007e000d74001150414745525f474f4f44535f47524f55507371007e000d74001a50414745525f474f4f44535f47524f55505f50524f50455254597371007e000d74001050414745525f474f4f44535f494e464f7371007e000d74001450414745525f474f4f44535f50524f50455254597371007e000d74000f50414745525f474f4f44535f534b557371007e000d74001650414745525f474f4f44535f534b555f4352454154457371007e000d74001650414745525f474f4f44535f534b555f4d4f444946597371007e000d74000f50414745525f474f4f44535f5350557371007e000d74000d50414745525f4d4f4e49544f527371007e000d74001650414745525f4d4f4e49544f525f41435449564954597371007e000d74001650414745525f4d4f4e49544f525f44415441424153457371007e000d74001350414745525f4d4f4e49544f525f474f4f44537371007e000d74001450414745525f4d4f4e49544f525f4d414e4147457371007e000d74001350414745525f4d4f4e49544f525f4f524445527371007e000d74000b50414745525f4f524445527371007e000d74001050414745525f4f524445525f53414c457371007e000d74001250414745525f4f524445525f53454c4c45527371007e000d74001050414745525f4f524445525f555345527371007e000d74000e50414745525f504c4154464f524d7371007e000d74001550414745525f504c4154464f524d5f53454c4c45527371007e000d74001350414745525f504c4154464f524d5f555345527371007e000d74000a50414745525f5249534b7371007e000d74001450414745525f5249534b5f424c41434b4c4953547371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4352454154457371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4d4f444946597371007e000d74000f50414745525f5249534b5f52554c457371007e000d74001150414745525f524f4c455f53595354454d7371007e000d74001050414745525f535441544953544943537371007e000d74001950414745525f535441544953544943535f415353454d424c457371007e000d74001750414745525f535441544953544943535f434f55504f4e7371007e000d74001950414745525f535441544953544943535f494e54454752414c7371007e000d74001350414745525f53595354454d5f434f4e4649477371007e000d74001a50414745525f53595354454d5f434f4e4649475f4352454154457371007e000d74001a50414745525f53595354454d5f434f4e4649475f454e41424c457371007e000d74001a50414745525f53595354454d5f434f4e4649475f4d4f444946597371007e000d74001450414745525f53595354454d5f44594e414d49437371007e000d74001550414745525f53595354454d5f47454e45524154457371007e000d74001150414745525f53595354454d5f4d454e557371007e000d74001850414745525f53595354454d5f4d454e555f4352454154457371007e000d74001850414745525f53595354454d5f4d454e555f4d4f444946597371007e000d74001150414745525f53595354454d5f524f4c457371007e000d74001850414745525f53595354454d5f524f4c455f4352454154457371007e000d74001850414745525f53595354454d5f524f4c455f44454c4554457371007e000d74001750414745525f53595354454d5f524f4c455f4752414e547371007e000d74001850414745525f53595354454d5f524f4c455f4d4f444946597371007e000d74001c50414745525f53595354454d5f524f4c455f5045524d495353494f4e7371007e000d74001150414745525f53595354454d5f555345527371007e000d74001850414745525f53595354454d5f555345525f4352454154457371007e000d74001850414745525f53595354454d5f555345525f454e41424c457371007e000d74001850414745525f53595354454d5f555345525f4d4f444946597871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e00d4787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00d24c000573636f706571007e00d47870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00d27870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a39353237740009636c69656e745f696471007e00d778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e00e4770c000000103f40000000000000787371007e00da3f40000000000000770800000010000000007871007e00df707371007e00e4770c000000103f40000000000000787371007e00e4770c000000103f4000000000000171007e00dd787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000006177040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf7871007e00ee737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020453837393836313132454238344438434635464133343432453044453133323170737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00d44c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e00e1737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf787074000b3133383133313435303231), ('PAZYei', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000061770400000061737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b787074000e50414745525f41435449564954597371007e000d74001750414745525f41435449564954595f415353454d424c597371007e000d74001e50414745525f41435449564954595f415353454d424c595f4352454154457371007e000d74001c50414745525f41435449564954595f415353454d424c595f444154417371007e000d74001d50414745525f41435449564954595f415353454d424c595f474f4f44537371007e000d74002450414745525f41435449564954595f415353454d424c595f474f4f44535f44455441494c7371007e000d74002550414745525f41435449564954595f415353454d424c595f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f415353454d424c595f4d4f444946597371007e000d74001e50414745525f41435449564954595f415353454d424c595f5245434f52447371007e000d74001c50414745525f41435449564954595f415353454d424c595f52554c457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4d4f444946597371007e000d74001550414745525f41435449564954595f42414e4e45527371007e000d74001c50414745525f41435449564954595f42414e4e45525f4352454154457371007e000d74001c50414745525f41435449564954595f42414e4e45525f4d4f444946597371007e000d74001550414745525f41435449564954595f434f55504f4e7371007e000d74001d50414745525f41435449564954595f434f55504f4e5f5055424c4953487371007e000d74001e50414745525f41435449564954595f434f55504f4e5f54454d504c4154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4352454154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4d4f444946597371007e000d74001a50414745525f41435449564954595f434f55504f4e5f555345527371007e000d74001750414745525f41435449564954595f45584348414e47457371007e000d74001e50414745525f41435449564954595f45584348414e47455f4352454154457371007e000d74001c50414745525f41435449564954595f45584348414e47455f444154417371007e000d74001d50414745525f41435449564954595f45584348414e47455f474f4f44537371007e000d74002550414745525f41435449564954595f45584348414e47455f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f45584348414e47455f4d4f444946597371007e000d74001e50414745525f41435449564954595f45584348414e47455f5245434f52447371007e000d74001c50414745525f41435449564954595f45584348414e47455f52554c457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4d4f444946597371007e000d74001750414745525f41435449564954595f494e54454752414c7371007e000d74001350414745525f41435449564954595f4b494c4c7371007e000d74000f50414745525f44415348424f4152447371007e000d74001550414745525f44415348424f4152445f4f524445527371007e000d74001850414745525f44415348424f4152445f52454749535445527371007e000d74001650414745525f44415348424f4152445f53454c4c45527371007e000d74001850414745525f44415348424f4152445f5455524e4f5645527371007e000d74000d50414745525f46494e414e43457371007e000d74001250414745525f46494e414e43455f46554e447371007e000d74001350414745525f46494e414e43455f54524144457371007e000d74000f50414745525f47454e455241544f527371007e000d74000b50414745525f474f4f44537371007e000d74001150414745525f474f4f44535f4252414e447371007e000d74001a50414745525f474f4f44535f434c415353494649434154494f4e7371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4352454154457371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4d4f444946597371007e000d74001150414745525f474f4f44535f47524f55507371007e000d74001a50414745525f474f4f44535f47524f55505f50524f50455254597371007e000d74001050414745525f474f4f44535f494e464f7371007e000d74001450414745525f474f4f44535f50524f50455254597371007e000d74000f50414745525f474f4f44535f534b557371007e000d74001650414745525f474f4f44535f534b555f4352454154457371007e000d74001650414745525f474f4f44535f534b555f4d4f444946597371007e000d74000f50414745525f474f4f44535f5350557371007e000d74000d50414745525f4d4f4e49544f527371007e000d74001650414745525f4d4f4e49544f525f41435449564954597371007e000d74001650414745525f4d4f4e49544f525f44415441424153457371007e000d74001350414745525f4d4f4e49544f525f474f4f44537371007e000d74001450414745525f4d4f4e49544f525f4d414e4147457371007e000d74001350414745525f4d4f4e49544f525f4f524445527371007e000d74000b50414745525f4f524445527371007e000d74001050414745525f4f524445525f53414c457371007e000d74001250414745525f4f524445525f53454c4c45527371007e000d74001050414745525f4f524445525f555345527371007e000d74000e50414745525f504c4154464f524d7371007e000d74001550414745525f504c4154464f524d5f53454c4c45527371007e000d74001350414745525f504c4154464f524d5f555345527371007e000d74000a50414745525f5249534b7371007e000d74001450414745525f5249534b5f424c41434b4c4953547371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4352454154457371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4d4f444946597371007e000d74000f50414745525f5249534b5f52554c457371007e000d74001150414745525f524f4c455f53595354454d7371007e000d74001050414745525f535441544953544943537371007e000d74001950414745525f535441544953544943535f415353454d424c457371007e000d74001750414745525f535441544953544943535f434f55504f4e7371007e000d74001950414745525f535441544953544943535f494e54454752414c7371007e000d74001350414745525f53595354454d5f434f4e4649477371007e000d74001a50414745525f53595354454d5f434f4e4649475f4352454154457371007e000d74001a50414745525f53595354454d5f434f4e4649475f454e41424c457371007e000d74001a50414745525f53595354454d5f434f4e4649475f4d4f444946597371007e000d74001450414745525f53595354454d5f44594e414d49437371007e000d74001550414745525f53595354454d5f47454e45524154457371007e000d74001150414745525f53595354454d5f4d454e557371007e000d74001850414745525f53595354454d5f4d454e555f4352454154457371007e000d74001850414745525f53595354454d5f4d454e555f4d4f444946597371007e000d74001150414745525f53595354454d5f524f4c457371007e000d74001850414745525f53595354454d5f524f4c455f4352454154457371007e000d74001850414745525f53595354454d5f524f4c455f44454c4554457371007e000d74001750414745525f53595354454d5f524f4c455f4752414e547371007e000d74001850414745525f53595354454d5f524f4c455f4d4f444946597371007e000d74001c50414745525f53595354454d5f524f4c455f5045524d495353494f4e7371007e000d74001150414745525f53595354454d5f555345527371007e000d74001850414745525f53595354454d5f555345525f4352454154457371007e000d74001850414745525f53595354454d5f555345525f454e41424c457371007e000d74001850414745525f53595354454d5f555345525f4d4f444946597871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e00d4787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00d24c000573636f706571007e00d47870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00d27870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a39353237740009636c69656e745f696471007e00d778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e00e4770c000000103f40000000000000787371007e00da3f40000000000000770800000010000000007871007e00df707371007e00e4770c000000103f40000000000000787371007e00e4770c000000103f4000000000000171007e00dd787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000006177040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf7871007e00ee737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020453837393836313132454238344438434635464133343432453044453133323170737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00d44c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e00e1737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf787074000b3133383133313435303231); +INSERT INTO `oauth_code` VALUES ('GvAQ0V', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000061770400000061737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b787074000e50414745525f41435449564954597371007e000d74001750414745525f41435449564954595f415353454d424c597371007e000d74001e50414745525f41435449564954595f415353454d424c595f4352454154457371007e000d74001c50414745525f41435449564954595f415353454d424c595f444154417371007e000d74001d50414745525f41435449564954595f415353454d424c595f474f4f44537371007e000d74002450414745525f41435449564954595f415353454d424c595f474f4f44535f44455441494c7371007e000d74002550414745525f41435449564954595f415353454d424c595f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f415353454d424c595f4d4f444946597371007e000d74001e50414745525f41435449564954595f415353454d424c595f5245434f52447371007e000d74001c50414745525f41435449564954595f415353454d424c595f52554c457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4d4f444946597371007e000d74001550414745525f41435449564954595f42414e4e45527371007e000d74001c50414745525f41435449564954595f42414e4e45525f4352454154457371007e000d74001c50414745525f41435449564954595f42414e4e45525f4d4f444946597371007e000d74001550414745525f41435449564954595f434f55504f4e7371007e000d74001d50414745525f41435449564954595f434f55504f4e5f5055424c4953487371007e000d74001e50414745525f41435449564954595f434f55504f4e5f54454d504c4154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4352454154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4d4f444946597371007e000d74001a50414745525f41435449564954595f434f55504f4e5f555345527371007e000d74001750414745525f41435449564954595f45584348414e47457371007e000d74001e50414745525f41435449564954595f45584348414e47455f4352454154457371007e000d74001c50414745525f41435449564954595f45584348414e47455f444154417371007e000d74001d50414745525f41435449564954595f45584348414e47455f474f4f44537371007e000d74002550414745525f41435449564954595f45584348414e47455f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f45584348414e47455f4d4f444946597371007e000d74001e50414745525f41435449564954595f45584348414e47455f5245434f52447371007e000d74001c50414745525f41435449564954595f45584348414e47455f52554c457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4d4f444946597371007e000d74001750414745525f41435449564954595f494e54454752414c7371007e000d74001350414745525f41435449564954595f4b494c4c7371007e000d74000f50414745525f44415348424f4152447371007e000d74001550414745525f44415348424f4152445f4f524445527371007e000d74001850414745525f44415348424f4152445f52454749535445527371007e000d74001650414745525f44415348424f4152445f53454c4c45527371007e000d74001850414745525f44415348424f4152445f5455524e4f5645527371007e000d74000d50414745525f46494e414e43457371007e000d74001250414745525f46494e414e43455f46554e447371007e000d74001350414745525f46494e414e43455f54524144457371007e000d74000f50414745525f47454e455241544f527371007e000d74000b50414745525f474f4f44537371007e000d74001150414745525f474f4f44535f4252414e447371007e000d74001a50414745525f474f4f44535f434c415353494649434154494f4e7371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4352454154457371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4d4f444946597371007e000d74001150414745525f474f4f44535f47524f55507371007e000d74001a50414745525f474f4f44535f47524f55505f50524f50455254597371007e000d74001050414745525f474f4f44535f494e464f7371007e000d74001450414745525f474f4f44535f50524f50455254597371007e000d74000f50414745525f474f4f44535f534b557371007e000d74001650414745525f474f4f44535f534b555f4352454154457371007e000d74001650414745525f474f4f44535f534b555f4d4f444946597371007e000d74000f50414745525f474f4f44535f5350557371007e000d74000d50414745525f4d4f4e49544f527371007e000d74001650414745525f4d4f4e49544f525f41435449564954597371007e000d74001650414745525f4d4f4e49544f525f44415441424153457371007e000d74001350414745525f4d4f4e49544f525f474f4f44537371007e000d74001450414745525f4d4f4e49544f525f4d414e4147457371007e000d74001350414745525f4d4f4e49544f525f4f524445527371007e000d74000b50414745525f4f524445527371007e000d74001050414745525f4f524445525f53414c457371007e000d74001250414745525f4f524445525f53454c4c45527371007e000d74001050414745525f4f524445525f555345527371007e000d74000e50414745525f504c4154464f524d7371007e000d74001550414745525f504c4154464f524d5f53454c4c45527371007e000d74001350414745525f504c4154464f524d5f555345527371007e000d74000a50414745525f5249534b7371007e000d74001450414745525f5249534b5f424c41434b4c4953547371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4352454154457371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4d4f444946597371007e000d74000f50414745525f5249534b5f52554c457371007e000d74001150414745525f524f4c455f53595354454d7371007e000d74001050414745525f535441544953544943537371007e000d74001950414745525f535441544953544943535f415353454d424c457371007e000d74001750414745525f535441544953544943535f434f55504f4e7371007e000d74001950414745525f535441544953544943535f494e54454752414c7371007e000d74001350414745525f53595354454d5f434f4e4649477371007e000d74001a50414745525f53595354454d5f434f4e4649475f4352454154457371007e000d74001a50414745525f53595354454d5f434f4e4649475f454e41424c457371007e000d74001a50414745525f53595354454d5f434f4e4649475f4d4f444946597371007e000d74001450414745525f53595354454d5f44594e414d49437371007e000d74001550414745525f53595354454d5f47454e45524154457371007e000d74001150414745525f53595354454d5f4d454e557371007e000d74001850414745525f53595354454d5f4d454e555f4352454154457371007e000d74001850414745525f53595354454d5f4d454e555f4d4f444946597371007e000d74001150414745525f53595354454d5f524f4c457371007e000d74001850414745525f53595354454d5f524f4c455f4352454154457371007e000d74001850414745525f53595354454d5f524f4c455f44454c4554457371007e000d74001750414745525f53595354454d5f524f4c455f4752414e547371007e000d74001850414745525f53595354454d5f524f4c455f4d4f444946597371007e000d74001c50414745525f53595354454d5f524f4c455f5045524d495353494f4e7371007e000d74001150414745525f53595354454d5f555345527371007e000d74001850414745525f53595354454d5f555345525f4352454154457371007e000d74001850414745525f53595354454d5f555345525f454e41424c457371007e000d74001850414745525f53595354454d5f555345525f4d4f444946597871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e00d4787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00d24c000573636f706571007e00d47870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00d27870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a39353237740009636c69656e745f696471007e00d778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e00e4770c000000103f40000000000000787371007e00da3f40000000000000770800000010000000007871007e00df707371007e00e4770c000000103f40000000000000787371007e00e4770c000000103f4000000000000171007e00dd787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000006177040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf7871007e00ee737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020453837393836313132454238344438434635464133343432453044453133323170737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00d44c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e00e1737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf787074000b3133383133313435303231), ('wJHBOM', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000061770400000061737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b787074000e50414745525f41435449564954597371007e000d74001750414745525f41435449564954595f415353454d424c597371007e000d74001e50414745525f41435449564954595f415353454d424c595f4352454154457371007e000d74001c50414745525f41435449564954595f415353454d424c595f444154417371007e000d74001d50414745525f41435449564954595f415353454d424c595f474f4f44537371007e000d74002450414745525f41435449564954595f415353454d424c595f474f4f44535f44455441494c7371007e000d74002550414745525f41435449564954595f415353454d424c595f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f415353454d424c595f4d4f444946597371007e000d74001e50414745525f41435449564954595f415353454d424c595f5245434f52447371007e000d74001c50414745525f41435449564954595f415353454d424c595f52554c457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4d4f444946597371007e000d74001550414745525f41435449564954595f42414e4e45527371007e000d74001c50414745525f41435449564954595f42414e4e45525f4352454154457371007e000d74001c50414745525f41435449564954595f42414e4e45525f4d4f444946597371007e000d74001550414745525f41435449564954595f434f55504f4e7371007e000d74001d50414745525f41435449564954595f434f55504f4e5f5055424c4953487371007e000d74001e50414745525f41435449564954595f434f55504f4e5f54454d504c4154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4352454154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4d4f444946597371007e000d74001a50414745525f41435449564954595f434f55504f4e5f555345527371007e000d74001750414745525f41435449564954595f45584348414e47457371007e000d74001e50414745525f41435449564954595f45584348414e47455f4352454154457371007e000d74001c50414745525f41435449564954595f45584348414e47455f444154417371007e000d74001d50414745525f41435449564954595f45584348414e47455f474f4f44537371007e000d74002550414745525f41435449564954595f45584348414e47455f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f45584348414e47455f4d4f444946597371007e000d74001e50414745525f41435449564954595f45584348414e47455f5245434f52447371007e000d74001c50414745525f41435449564954595f45584348414e47455f52554c457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4d4f444946597371007e000d74001750414745525f41435449564954595f494e54454752414c7371007e000d74001350414745525f41435449564954595f4b494c4c7371007e000d74000f50414745525f44415348424f4152447371007e000d74001550414745525f44415348424f4152445f4f524445527371007e000d74001850414745525f44415348424f4152445f52454749535445527371007e000d74001650414745525f44415348424f4152445f53454c4c45527371007e000d74001850414745525f44415348424f4152445f5455524e4f5645527371007e000d74000d50414745525f46494e414e43457371007e000d74001250414745525f46494e414e43455f46554e447371007e000d74001350414745525f46494e414e43455f54524144457371007e000d74000f50414745525f47454e455241544f527371007e000d74000b50414745525f474f4f44537371007e000d74001150414745525f474f4f44535f4252414e447371007e000d74001a50414745525f474f4f44535f434c415353494649434154494f4e7371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4352454154457371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4d4f444946597371007e000d74001150414745525f474f4f44535f47524f55507371007e000d74001a50414745525f474f4f44535f47524f55505f50524f50455254597371007e000d74001050414745525f474f4f44535f494e464f7371007e000d74001450414745525f474f4f44535f50524f50455254597371007e000d74000f50414745525f474f4f44535f534b557371007e000d74001650414745525f474f4f44535f534b555f4352454154457371007e000d74001650414745525f474f4f44535f534b555f4d4f444946597371007e000d74000f50414745525f474f4f44535f5350557371007e000d74000d50414745525f4d4f4e49544f527371007e000d74001650414745525f4d4f4e49544f525f41435449564954597371007e000d74001650414745525f4d4f4e49544f525f44415441424153457371007e000d74001350414745525f4d4f4e49544f525f474f4f44537371007e000d74001450414745525f4d4f4e49544f525f4d414e4147457371007e000d74001350414745525f4d4f4e49544f525f4f524445527371007e000d74000b50414745525f4f524445527371007e000d74001050414745525f4f524445525f53414c457371007e000d74001250414745525f4f524445525f53454c4c45527371007e000d74001050414745525f4f524445525f555345527371007e000d74000e50414745525f504c4154464f524d7371007e000d74001550414745525f504c4154464f524d5f53454c4c45527371007e000d74001350414745525f504c4154464f524d5f555345527371007e000d74000a50414745525f5249534b7371007e000d74001450414745525f5249534b5f424c41434b4c4953547371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4352454154457371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4d4f444946597371007e000d74000f50414745525f5249534b5f52554c457371007e000d74001150414745525f524f4c455f53595354454d7371007e000d74001050414745525f535441544953544943537371007e000d74001950414745525f535441544953544943535f415353454d424c457371007e000d74001750414745525f535441544953544943535f434f55504f4e7371007e000d74001950414745525f535441544953544943535f494e54454752414c7371007e000d74001350414745525f53595354454d5f434f4e4649477371007e000d74001a50414745525f53595354454d5f434f4e4649475f4352454154457371007e000d74001a50414745525f53595354454d5f434f4e4649475f454e41424c457371007e000d74001a50414745525f53595354454d5f434f4e4649475f4d4f444946597371007e000d74001450414745525f53595354454d5f44594e414d49437371007e000d74001550414745525f53595354454d5f47454e45524154457371007e000d74001150414745525f53595354454d5f4d454e557371007e000d74001850414745525f53595354454d5f4d454e555f4352454154457371007e000d74001850414745525f53595354454d5f4d454e555f4d4f444946597371007e000d74001150414745525f53595354454d5f524f4c457371007e000d74001850414745525f53595354454d5f524f4c455f4352454154457371007e000d74001850414745525f53595354454d5f524f4c455f44454c4554457371007e000d74001750414745525f53595354454d5f524f4c455f4752414e547371007e000d74001850414745525f53595354454d5f524f4c455f4d4f444946597371007e000d74001c50414745525f53595354454d5f524f4c455f5045524d495353494f4e7371007e000d74001150414745525f53595354454d5f555345527371007e000d74001850414745525f53595354454d5f555345525f4352454154457371007e000d74001850414745525f53595354454d5f555345525f454e41424c457371007e000d74001850414745525f53595354454d5f555345525f4d4f444946597871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e00d4787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00d24c000573636f706571007e00d47870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00d27870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a39353237740009636c69656e745f696471007e00d778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e00e4770c000000103f40000000000000787371007e00da3f40000000000000770800000010000000007871007e00df707371007e00e4770c000000103f40000000000000787371007e00e4770c000000103f4000000000000171007e00dd787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000006177040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf7871007e00ee737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020453837393836313132454238344438434635464133343432453044453133323170737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00d44c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e00e1737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf787074000b3133383133313435303231), ('M5BG8m', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000061770400000061737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b787074000e50414745525f41435449564954597371007e000d74001750414745525f41435449564954595f415353454d424c597371007e000d74001e50414745525f41435449564954595f415353454d424c595f4352454154457371007e000d74001c50414745525f41435449564954595f415353454d424c595f444154417371007e000d74001d50414745525f41435449564954595f415353454d424c595f474f4f44537371007e000d74002450414745525f41435449564954595f415353454d424c595f474f4f44535f44455441494c7371007e000d74002550414745525f41435449564954595f415353454d424c595f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f415353454d424c595f4d4f444946597371007e000d74001e50414745525f41435449564954595f415353454d424c595f5245434f52447371007e000d74001c50414745525f41435449564954595f415353454d424c595f52554c457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4d4f444946597371007e000d74001550414745525f41435449564954595f42414e4e45527371007e000d74001c50414745525f41435449564954595f42414e4e45525f4352454154457371007e000d74001c50414745525f41435449564954595f42414e4e45525f4d4f444946597371007e000d74001550414745525f41435449564954595f434f55504f4e7371007e000d74001d50414745525f41435449564954595f434f55504f4e5f5055424c4953487371007e000d74001e50414745525f41435449564954595f434f55504f4e5f54454d504c4154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4352454154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4d4f444946597371007e000d74001a50414745525f41435449564954595f434f55504f4e5f555345527371007e000d74001750414745525f41435449564954595f45584348414e47457371007e000d74001e50414745525f41435449564954595f45584348414e47455f4352454154457371007e000d74001c50414745525f41435449564954595f45584348414e47455f444154417371007e000d74001d50414745525f41435449564954595f45584348414e47455f474f4f44537371007e000d74002550414745525f41435449564954595f45584348414e47455f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f45584348414e47455f4d4f444946597371007e000d74001e50414745525f41435449564954595f45584348414e47455f5245434f52447371007e000d74001c50414745525f41435449564954595f45584348414e47455f52554c457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4d4f444946597371007e000d74001750414745525f41435449564954595f494e54454752414c7371007e000d74001350414745525f41435449564954595f4b494c4c7371007e000d74000f50414745525f44415348424f4152447371007e000d74001550414745525f44415348424f4152445f4f524445527371007e000d74001850414745525f44415348424f4152445f52454749535445527371007e000d74001650414745525f44415348424f4152445f53454c4c45527371007e000d74001850414745525f44415348424f4152445f5455524e4f5645527371007e000d74000d50414745525f46494e414e43457371007e000d74001250414745525f46494e414e43455f46554e447371007e000d74001350414745525f46494e414e43455f54524144457371007e000d74000f50414745525f47454e455241544f527371007e000d74000b50414745525f474f4f44537371007e000d74001150414745525f474f4f44535f4252414e447371007e000d74001a50414745525f474f4f44535f434c415353494649434154494f4e7371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4352454154457371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4d4f444946597371007e000d74001150414745525f474f4f44535f47524f55507371007e000d74001a50414745525f474f4f44535f47524f55505f50524f50455254597371007e000d74001050414745525f474f4f44535f494e464f7371007e000d74001450414745525f474f4f44535f50524f50455254597371007e000d74000f50414745525f474f4f44535f534b557371007e000d74001650414745525f474f4f44535f534b555f4352454154457371007e000d74001650414745525f474f4f44535f534b555f4d4f444946597371007e000d74000f50414745525f474f4f44535f5350557371007e000d74000d50414745525f4d4f4e49544f527371007e000d74001650414745525f4d4f4e49544f525f41435449564954597371007e000d74001650414745525f4d4f4e49544f525f44415441424153457371007e000d74001350414745525f4d4f4e49544f525f474f4f44537371007e000d74001450414745525f4d4f4e49544f525f4d414e4147457371007e000d74001350414745525f4d4f4e49544f525f4f524445527371007e000d74000b50414745525f4f524445527371007e000d74001050414745525f4f524445525f53414c457371007e000d74001250414745525f4f524445525f53454c4c45527371007e000d74001050414745525f4f524445525f555345527371007e000d74000e50414745525f504c4154464f524d7371007e000d74001550414745525f504c4154464f524d5f53454c4c45527371007e000d74001350414745525f504c4154464f524d5f555345527371007e000d74000a50414745525f5249534b7371007e000d74001450414745525f5249534b5f424c41434b4c4953547371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4352454154457371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4d4f444946597371007e000d74000f50414745525f5249534b5f52554c457371007e000d74001150414745525f524f4c455f53595354454d7371007e000d74001050414745525f535441544953544943537371007e000d74001950414745525f535441544953544943535f415353454d424c457371007e000d74001750414745525f535441544953544943535f434f55504f4e7371007e000d74001950414745525f535441544953544943535f494e54454752414c7371007e000d74001350414745525f53595354454d5f434f4e4649477371007e000d74001a50414745525f53595354454d5f434f4e4649475f4352454154457371007e000d74001a50414745525f53595354454d5f434f4e4649475f454e41424c457371007e000d74001a50414745525f53595354454d5f434f4e4649475f4d4f444946597371007e000d74001450414745525f53595354454d5f44594e414d49437371007e000d74001550414745525f53595354454d5f47454e45524154457371007e000d74001150414745525f53595354454d5f4d454e557371007e000d74001850414745525f53595354454d5f4d454e555f4352454154457371007e000d74001850414745525f53595354454d5f4d454e555f4d4f444946597371007e000d74001150414745525f53595354454d5f524f4c457371007e000d74001850414745525f53595354454d5f524f4c455f4352454154457371007e000d74001850414745525f53595354454d5f524f4c455f44454c4554457371007e000d74001750414745525f53595354454d5f524f4c455f4752414e547371007e000d74001850414745525f53595354454d5f524f4c455f4d4f444946597371007e000d74001c50414745525f53595354454d5f524f4c455f5045524d495353494f4e7371007e000d74001150414745525f53595354454d5f555345527371007e000d74001850414745525f53595354454d5f555345525f4352454154457371007e000d74001850414745525f53595354454d5f555345525f454e41424c457371007e000d74001850414745525f53595354454d5f555345525f4d4f444946597871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e00d4787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00d24c000573636f706571007e00d47870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00d27870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a39353237740009636c69656e745f696471007e00d778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e00e4770c000000103f40000000000000787371007e00da3f40000000000000770800000010000000007871007e00df707371007e00e4770c000000103f40000000000000787371007e00e4770c000000103f4000000000000171007e00dd787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000006177040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf7871007e00ee737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020453837393836313132454238344438434635464133343432453044453133323170737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00d44c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e00e1737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf787074000b3133383133313435303231), ('ejdVnw', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000061770400000061737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b787074000e50414745525f41435449564954597371007e000d74001750414745525f41435449564954595f415353454d424c597371007e000d74001e50414745525f41435449564954595f415353454d424c595f4352454154457371007e000d74001c50414745525f41435449564954595f415353454d424c595f444154417371007e000d74001d50414745525f41435449564954595f415353454d424c595f474f4f44537371007e000d74002450414745525f41435449564954595f415353454d424c595f474f4f44535f44455441494c7371007e000d74002550414745525f41435449564954595f415353454d424c595f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f415353454d424c595f4d4f444946597371007e000d74001e50414745525f41435449564954595f415353454d424c595f5245434f52447371007e000d74001c50414745525f41435449564954595f415353454d424c595f52554c457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4d4f444946597371007e000d74001550414745525f41435449564954595f42414e4e45527371007e000d74001c50414745525f41435449564954595f42414e4e45525f4352454154457371007e000d74001c50414745525f41435449564954595f42414e4e45525f4d4f444946597371007e000d74001550414745525f41435449564954595f434f55504f4e7371007e000d74001d50414745525f41435449564954595f434f55504f4e5f5055424c4953487371007e000d74001e50414745525f41435449564954595f434f55504f4e5f54454d504c4154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4352454154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4d4f444946597371007e000d74001a50414745525f41435449564954595f434f55504f4e5f555345527371007e000d74001750414745525f41435449564954595f45584348414e47457371007e000d74001e50414745525f41435449564954595f45584348414e47455f4352454154457371007e000d74001c50414745525f41435449564954595f45584348414e47455f444154417371007e000d74001d50414745525f41435449564954595f45584348414e47455f474f4f44537371007e000d74002550414745525f41435449564954595f45584348414e47455f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f45584348414e47455f4d4f444946597371007e000d74001e50414745525f41435449564954595f45584348414e47455f5245434f52447371007e000d74001c50414745525f41435449564954595f45584348414e47455f52554c457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4d4f444946597371007e000d74001750414745525f41435449564954595f494e54454752414c7371007e000d74001350414745525f41435449564954595f4b494c4c7371007e000d74000f50414745525f44415348424f4152447371007e000d74001550414745525f44415348424f4152445f4f524445527371007e000d74001850414745525f44415348424f4152445f52454749535445527371007e000d74001650414745525f44415348424f4152445f53454c4c45527371007e000d74001850414745525f44415348424f4152445f5455524e4f5645527371007e000d74000d50414745525f46494e414e43457371007e000d74001250414745525f46494e414e43455f46554e447371007e000d74001350414745525f46494e414e43455f54524144457371007e000d74000f50414745525f47454e455241544f527371007e000d74000b50414745525f474f4f44537371007e000d74001150414745525f474f4f44535f4252414e447371007e000d74001a50414745525f474f4f44535f434c415353494649434154494f4e7371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4352454154457371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4d4f444946597371007e000d74001150414745525f474f4f44535f47524f55507371007e000d74001a50414745525f474f4f44535f47524f55505f50524f50455254597371007e000d74001050414745525f474f4f44535f494e464f7371007e000d74001450414745525f474f4f44535f50524f50455254597371007e000d74000f50414745525f474f4f44535f534b557371007e000d74001650414745525f474f4f44535f534b555f4352454154457371007e000d74001650414745525f474f4f44535f534b555f4d4f444946597371007e000d74000f50414745525f474f4f44535f5350557371007e000d74000d50414745525f4d4f4e49544f527371007e000d74001650414745525f4d4f4e49544f525f41435449564954597371007e000d74001650414745525f4d4f4e49544f525f44415441424153457371007e000d74001350414745525f4d4f4e49544f525f474f4f44537371007e000d74001450414745525f4d4f4e49544f525f4d414e4147457371007e000d74001350414745525f4d4f4e49544f525f4f524445527371007e000d74000b50414745525f4f524445527371007e000d74001050414745525f4f524445525f53414c457371007e000d74001250414745525f4f524445525f53454c4c45527371007e000d74001050414745525f4f524445525f555345527371007e000d74000e50414745525f504c4154464f524d7371007e000d74001550414745525f504c4154464f524d5f53454c4c45527371007e000d74001350414745525f504c4154464f524d5f555345527371007e000d74000a50414745525f5249534b7371007e000d74001450414745525f5249534b5f424c41434b4c4953547371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4352454154457371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4d4f444946597371007e000d74000f50414745525f5249534b5f52554c457371007e000d74001150414745525f524f4c455f53595354454d7371007e000d74001050414745525f535441544953544943537371007e000d74001950414745525f535441544953544943535f415353454d424c457371007e000d74001750414745525f535441544953544943535f434f55504f4e7371007e000d74001950414745525f535441544953544943535f494e54454752414c7371007e000d74001350414745525f53595354454d5f434f4e4649477371007e000d74001a50414745525f53595354454d5f434f4e4649475f4352454154457371007e000d74001a50414745525f53595354454d5f434f4e4649475f454e41424c457371007e000d74001a50414745525f53595354454d5f434f4e4649475f4d4f444946597371007e000d74001450414745525f53595354454d5f44594e414d49437371007e000d74001550414745525f53595354454d5f47454e45524154457371007e000d74001150414745525f53595354454d5f4d454e557371007e000d74001850414745525f53595354454d5f4d454e555f4352454154457371007e000d74001850414745525f53595354454d5f4d454e555f4d4f444946597371007e000d74001150414745525f53595354454d5f524f4c457371007e000d74001850414745525f53595354454d5f524f4c455f4352454154457371007e000d74001850414745525f53595354454d5f524f4c455f44454c4554457371007e000d74001750414745525f53595354454d5f524f4c455f4752414e547371007e000d74001850414745525f53595354454d5f524f4c455f4d4f444946597371007e000d74001c50414745525f53595354454d5f524f4c455f5045524d495353494f4e7371007e000d74001150414745525f53595354454d5f555345527371007e000d74001850414745525f53595354454d5f555345525f4352454154457371007e000d74001850414745525f53595354454d5f555345525f454e41424c457371007e000d74001850414745525f53595354454d5f555345525f4d4f444946597871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e00d4787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00d24c000573636f706571007e00d47870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00d27870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a39353237740009636c69656e745f696471007e00d778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e00e4770c000000103f40000000000000787371007e00da3f40000000000000770800000010000000007871007e00df707371007e00e4770c000000103f40000000000000787371007e00e4770c000000103f4000000000000171007e00dd787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000006177040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf7871007e00ee737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020453837393836313132454238344438434635464133343432453044453133323170737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00d44c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e00e1737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf787074000b3133383133313435303231), ('6FE5Wg', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000061770400000061737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b787074000e50414745525f41435449564954597371007e000d74001750414745525f41435449564954595f415353454d424c597371007e000d74001e50414745525f41435449564954595f415353454d424c595f4352454154457371007e000d74001c50414745525f41435449564954595f415353454d424c595f444154417371007e000d74001d50414745525f41435449564954595f415353454d424c595f474f4f44537371007e000d74002450414745525f41435449564954595f415353454d424c595f474f4f44535f44455441494c7371007e000d74002550414745525f41435449564954595f415353454d424c595f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f415353454d424c595f4d4f444946597371007e000d74001e50414745525f41435449564954595f415353454d424c595f5245434f52447371007e000d74001c50414745525f41435449564954595f415353454d424c595f52554c457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4d4f444946597371007e000d74001550414745525f41435449564954595f42414e4e45527371007e000d74001c50414745525f41435449564954595f42414e4e45525f4352454154457371007e000d74001c50414745525f41435449564954595f42414e4e45525f4d4f444946597371007e000d74001550414745525f41435449564954595f434f55504f4e7371007e000d74001d50414745525f41435449564954595f434f55504f4e5f5055424c4953487371007e000d74001e50414745525f41435449564954595f434f55504f4e5f54454d504c4154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4352454154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4d4f444946597371007e000d74001a50414745525f41435449564954595f434f55504f4e5f555345527371007e000d74001750414745525f41435449564954595f45584348414e47457371007e000d74001e50414745525f41435449564954595f45584348414e47455f4352454154457371007e000d74001c50414745525f41435449564954595f45584348414e47455f444154417371007e000d74001d50414745525f41435449564954595f45584348414e47455f474f4f44537371007e000d74002550414745525f41435449564954595f45584348414e47455f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f45584348414e47455f4d4f444946597371007e000d74001e50414745525f41435449564954595f45584348414e47455f5245434f52447371007e000d74001c50414745525f41435449564954595f45584348414e47455f52554c457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4d4f444946597371007e000d74001750414745525f41435449564954595f494e54454752414c7371007e000d74001350414745525f41435449564954595f4b494c4c7371007e000d74000f50414745525f44415348424f4152447371007e000d74001550414745525f44415348424f4152445f4f524445527371007e000d74001850414745525f44415348424f4152445f52454749535445527371007e000d74001650414745525f44415348424f4152445f53454c4c45527371007e000d74001850414745525f44415348424f4152445f5455524e4f5645527371007e000d74000d50414745525f46494e414e43457371007e000d74001250414745525f46494e414e43455f46554e447371007e000d74001350414745525f46494e414e43455f54524144457371007e000d74000f50414745525f47454e455241544f527371007e000d74000b50414745525f474f4f44537371007e000d74001150414745525f474f4f44535f4252414e447371007e000d74001a50414745525f474f4f44535f434c415353494649434154494f4e7371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4352454154457371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4d4f444946597371007e000d74001150414745525f474f4f44535f47524f55507371007e000d74001a50414745525f474f4f44535f47524f55505f50524f50455254597371007e000d74001050414745525f474f4f44535f494e464f7371007e000d74001450414745525f474f4f44535f50524f50455254597371007e000d74000f50414745525f474f4f44535f534b557371007e000d74001650414745525f474f4f44535f534b555f4352454154457371007e000d74001650414745525f474f4f44535f534b555f4d4f444946597371007e000d74000f50414745525f474f4f44535f5350557371007e000d74000d50414745525f4d4f4e49544f527371007e000d74001650414745525f4d4f4e49544f525f41435449564954597371007e000d74001650414745525f4d4f4e49544f525f44415441424153457371007e000d74001350414745525f4d4f4e49544f525f474f4f44537371007e000d74001450414745525f4d4f4e49544f525f4d414e4147457371007e000d74001350414745525f4d4f4e49544f525f4f524445527371007e000d74000b50414745525f4f524445527371007e000d74001050414745525f4f524445525f53414c457371007e000d74001250414745525f4f524445525f53454c4c45527371007e000d74001050414745525f4f524445525f555345527371007e000d74000e50414745525f504c4154464f524d7371007e000d74001550414745525f504c4154464f524d5f53454c4c45527371007e000d74001350414745525f504c4154464f524d5f555345527371007e000d74000a50414745525f5249534b7371007e000d74001450414745525f5249534b5f424c41434b4c4953547371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4352454154457371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4d4f444946597371007e000d74000f50414745525f5249534b5f52554c457371007e000d74001150414745525f524f4c455f53595354454d7371007e000d74001050414745525f535441544953544943537371007e000d74001950414745525f535441544953544943535f415353454d424c457371007e000d74001750414745525f535441544953544943535f434f55504f4e7371007e000d74001950414745525f535441544953544943535f494e54454752414c7371007e000d74001350414745525f53595354454d5f434f4e4649477371007e000d74001a50414745525f53595354454d5f434f4e4649475f4352454154457371007e000d74001a50414745525f53595354454d5f434f4e4649475f454e41424c457371007e000d74001a50414745525f53595354454d5f434f4e4649475f4d4f444946597371007e000d74001450414745525f53595354454d5f44594e414d49437371007e000d74001550414745525f53595354454d5f47454e45524154457371007e000d74001150414745525f53595354454d5f4d454e557371007e000d74001850414745525f53595354454d5f4d454e555f4352454154457371007e000d74001850414745525f53595354454d5f4d454e555f4d4f444946597371007e000d74001150414745525f53595354454d5f524f4c457371007e000d74001850414745525f53595354454d5f524f4c455f4352454154457371007e000d74001850414745525f53595354454d5f524f4c455f44454c4554457371007e000d74001750414745525f53595354454d5f524f4c455f4752414e547371007e000d74001850414745525f53595354454d5f524f4c455f4d4f444946597371007e000d74001c50414745525f53595354454d5f524f4c455f5045524d495353494f4e7371007e000d74001150414745525f53595354454d5f555345527371007e000d74001850414745525f53595354454d5f555345525f4352454154457371007e000d74001850414745525f53595354454d5f555345525f454e41424c457371007e000d74001850414745525f53595354454d5f555345525f4d4f444946597871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e00d4787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00d24c000573636f706571007e00d47870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00d27870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a39353237740009636c69656e745f696471007e00d778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e00e4770c000000103f40000000000000787371007e00da3f40000000000000770800000010000000007871007e00df707371007e00e4770c000000103f40000000000000787371007e00e4770c000000103f4000000000000171007e00dd787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000006177040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf7871007e00ee737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020453837393836313132454238344438434635464133343432453044453133323170737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00d44c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e00e1737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf787074000b3133383133313435303231), ('K2nOsL', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000061770400000061737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b787074000e50414745525f41435449564954597371007e000d74001750414745525f41435449564954595f415353454d424c597371007e000d74001e50414745525f41435449564954595f415353454d424c595f4352454154457371007e000d74001c50414745525f41435449564954595f415353454d424c595f444154417371007e000d74001d50414745525f41435449564954595f415353454d424c595f474f4f44537371007e000d74002450414745525f41435449564954595f415353454d424c595f474f4f44535f44455441494c7371007e000d74002550414745525f41435449564954595f415353454d424c595f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f415353454d424c595f4d4f444946597371007e000d74001e50414745525f41435449564954595f415353454d424c595f5245434f52447371007e000d74001c50414745525f41435449564954595f415353454d424c595f52554c457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4d4f444946597371007e000d74001550414745525f41435449564954595f42414e4e45527371007e000d74001c50414745525f41435449564954595f42414e4e45525f4352454154457371007e000d74001c50414745525f41435449564954595f42414e4e45525f4d4f444946597371007e000d74001550414745525f41435449564954595f434f55504f4e7371007e000d74001d50414745525f41435449564954595f434f55504f4e5f5055424c4953487371007e000d74001e50414745525f41435449564954595f434f55504f4e5f54454d504c4154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4352454154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4d4f444946597371007e000d74001a50414745525f41435449564954595f434f55504f4e5f555345527371007e000d74001750414745525f41435449564954595f45584348414e47457371007e000d74001e50414745525f41435449564954595f45584348414e47455f4352454154457371007e000d74001c50414745525f41435449564954595f45584348414e47455f444154417371007e000d74001d50414745525f41435449564954595f45584348414e47455f474f4f44537371007e000d74002550414745525f41435449564954595f45584348414e47455f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f45584348414e47455f4d4f444946597371007e000d74001e50414745525f41435449564954595f45584348414e47455f5245434f52447371007e000d74001c50414745525f41435449564954595f45584348414e47455f52554c457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4d4f444946597371007e000d74001750414745525f41435449564954595f494e54454752414c7371007e000d74001350414745525f41435449564954595f4b494c4c7371007e000d74000f50414745525f44415348424f4152447371007e000d74001550414745525f44415348424f4152445f4f524445527371007e000d74001850414745525f44415348424f4152445f52454749535445527371007e000d74001650414745525f44415348424f4152445f53454c4c45527371007e000d74001850414745525f44415348424f4152445f5455524e4f5645527371007e000d74000d50414745525f46494e414e43457371007e000d74001250414745525f46494e414e43455f46554e447371007e000d74001350414745525f46494e414e43455f54524144457371007e000d74000f50414745525f47454e455241544f527371007e000d74000b50414745525f474f4f44537371007e000d74001150414745525f474f4f44535f4252414e447371007e000d74001a50414745525f474f4f44535f434c415353494649434154494f4e7371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4352454154457371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4d4f444946597371007e000d74001150414745525f474f4f44535f47524f55507371007e000d74001a50414745525f474f4f44535f47524f55505f50524f50455254597371007e000d74001050414745525f474f4f44535f494e464f7371007e000d74001450414745525f474f4f44535f50524f50455254597371007e000d74000f50414745525f474f4f44535f534b557371007e000d74001650414745525f474f4f44535f534b555f4352454154457371007e000d74001650414745525f474f4f44535f534b555f4d4f444946597371007e000d74000f50414745525f474f4f44535f5350557371007e000d74000d50414745525f4d4f4e49544f527371007e000d74001650414745525f4d4f4e49544f525f41435449564954597371007e000d74001650414745525f4d4f4e49544f525f44415441424153457371007e000d74001350414745525f4d4f4e49544f525f474f4f44537371007e000d74001450414745525f4d4f4e49544f525f4d414e4147457371007e000d74001350414745525f4d4f4e49544f525f4f524445527371007e000d74000b50414745525f4f524445527371007e000d74001050414745525f4f524445525f53414c457371007e000d74001250414745525f4f524445525f53454c4c45527371007e000d74001050414745525f4f524445525f555345527371007e000d74000e50414745525f504c4154464f524d7371007e000d74001550414745525f504c4154464f524d5f53454c4c45527371007e000d74001350414745525f504c4154464f524d5f555345527371007e000d74000a50414745525f5249534b7371007e000d74001450414745525f5249534b5f424c41434b4c4953547371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4352454154457371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4d4f444946597371007e000d74000f50414745525f5249534b5f52554c457371007e000d74001150414745525f524f4c455f53595354454d7371007e000d74001050414745525f535441544953544943537371007e000d74001950414745525f535441544953544943535f415353454d424c457371007e000d74001750414745525f535441544953544943535f434f55504f4e7371007e000d74001950414745525f535441544953544943535f494e54454752414c7371007e000d74001350414745525f53595354454d5f434f4e4649477371007e000d74001a50414745525f53595354454d5f434f4e4649475f4352454154457371007e000d74001a50414745525f53595354454d5f434f4e4649475f454e41424c457371007e000d74001a50414745525f53595354454d5f434f4e4649475f4d4f444946597371007e000d74001450414745525f53595354454d5f44594e414d49437371007e000d74001550414745525f53595354454d5f47454e45524154457371007e000d74001150414745525f53595354454d5f4d454e557371007e000d74001850414745525f53595354454d5f4d454e555f4352454154457371007e000d74001850414745525f53595354454d5f4d454e555f4d4f444946597371007e000d74001150414745525f53595354454d5f524f4c457371007e000d74001850414745525f53595354454d5f524f4c455f4352454154457371007e000d74001850414745525f53595354454d5f524f4c455f44454c4554457371007e000d74001750414745525f53595354454d5f524f4c455f4752414e547371007e000d74001850414745525f53595354454d5f524f4c455f4d4f444946597371007e000d74001c50414745525f53595354454d5f524f4c455f5045524d495353494f4e7371007e000d74001150414745525f53595354454d5f555345527371007e000d74001850414745525f53595354454d5f555345525f4352454154457371007e000d74001850414745525f53595354454d5f555345525f454e41424c457371007e000d74001850414745525f53595354454d5f555345525f4d4f444946597871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e00d4787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00d24c000573636f706571007e00d47870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00d27870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a39353237740009636c69656e745f696471007e00d778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e00e4770c000000103f40000000000000787371007e00da3f40000000000000770800000010000000007871007e00df707371007e00e4770c000000103f40000000000000787371007e00e4770c000000103f4000000000000171007e00dd787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000006177040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf7871007e00ee737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020453837393836313132454238344438434635464133343432453044453133323170737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00d44c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e00e1737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf787074000b3133383133313435303231); +INSERT INTO `oauth_code` VALUES ('oBP3e6', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000061770400000061737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b787074000e50414745525f41435449564954597371007e000d74001750414745525f41435449564954595f415353454d424c597371007e000d74001e50414745525f41435449564954595f415353454d424c595f4352454154457371007e000d74001c50414745525f41435449564954595f415353454d424c595f444154417371007e000d74001d50414745525f41435449564954595f415353454d424c595f474f4f44537371007e000d74002450414745525f41435449564954595f415353454d424c595f474f4f44535f44455441494c7371007e000d74002550414745525f41435449564954595f415353454d424c595f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f415353454d424c595f4d4f444946597371007e000d74001e50414745525f41435449564954595f415353454d424c595f5245434f52447371007e000d74001c50414745525f41435449564954595f415353454d424c595f52554c457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4d4f444946597371007e000d74001550414745525f41435449564954595f42414e4e45527371007e000d74001c50414745525f41435449564954595f42414e4e45525f4352454154457371007e000d74001c50414745525f41435449564954595f42414e4e45525f4d4f444946597371007e000d74001550414745525f41435449564954595f434f55504f4e7371007e000d74001d50414745525f41435449564954595f434f55504f4e5f5055424c4953487371007e000d74001e50414745525f41435449564954595f434f55504f4e5f54454d504c4154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4352454154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4d4f444946597371007e000d74001a50414745525f41435449564954595f434f55504f4e5f555345527371007e000d74001750414745525f41435449564954595f45584348414e47457371007e000d74001e50414745525f41435449564954595f45584348414e47455f4352454154457371007e000d74001c50414745525f41435449564954595f45584348414e47455f444154417371007e000d74001d50414745525f41435449564954595f45584348414e47455f474f4f44537371007e000d74002550414745525f41435449564954595f45584348414e47455f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f45584348414e47455f4d4f444946597371007e000d74001e50414745525f41435449564954595f45584348414e47455f5245434f52447371007e000d74001c50414745525f41435449564954595f45584348414e47455f52554c457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4d4f444946597371007e000d74001750414745525f41435449564954595f494e54454752414c7371007e000d74001350414745525f41435449564954595f4b494c4c7371007e000d74000f50414745525f44415348424f4152447371007e000d74001550414745525f44415348424f4152445f4f524445527371007e000d74001850414745525f44415348424f4152445f52454749535445527371007e000d74001650414745525f44415348424f4152445f53454c4c45527371007e000d74001850414745525f44415348424f4152445f5455524e4f5645527371007e000d74000d50414745525f46494e414e43457371007e000d74001250414745525f46494e414e43455f46554e447371007e000d74001350414745525f46494e414e43455f54524144457371007e000d74000f50414745525f47454e455241544f527371007e000d74000b50414745525f474f4f44537371007e000d74001150414745525f474f4f44535f4252414e447371007e000d74001a50414745525f474f4f44535f434c415353494649434154494f4e7371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4352454154457371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4d4f444946597371007e000d74001150414745525f474f4f44535f47524f55507371007e000d74001a50414745525f474f4f44535f47524f55505f50524f50455254597371007e000d74001050414745525f474f4f44535f494e464f7371007e000d74001450414745525f474f4f44535f50524f50455254597371007e000d74000f50414745525f474f4f44535f534b557371007e000d74001650414745525f474f4f44535f534b555f4352454154457371007e000d74001650414745525f474f4f44535f534b555f4d4f444946597371007e000d74000f50414745525f474f4f44535f5350557371007e000d74000d50414745525f4d4f4e49544f527371007e000d74001650414745525f4d4f4e49544f525f41435449564954597371007e000d74001650414745525f4d4f4e49544f525f44415441424153457371007e000d74001350414745525f4d4f4e49544f525f474f4f44537371007e000d74001450414745525f4d4f4e49544f525f4d414e4147457371007e000d74001350414745525f4d4f4e49544f525f4f524445527371007e000d74000b50414745525f4f524445527371007e000d74001050414745525f4f524445525f53414c457371007e000d74001250414745525f4f524445525f53454c4c45527371007e000d74001050414745525f4f524445525f555345527371007e000d74000e50414745525f504c4154464f524d7371007e000d74001550414745525f504c4154464f524d5f53454c4c45527371007e000d74001350414745525f504c4154464f524d5f555345527371007e000d74000a50414745525f5249534b7371007e000d74001450414745525f5249534b5f424c41434b4c4953547371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4352454154457371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4d4f444946597371007e000d74000f50414745525f5249534b5f52554c457371007e000d74001150414745525f524f4c455f53595354454d7371007e000d74001050414745525f535441544953544943537371007e000d74001950414745525f535441544953544943535f415353454d424c457371007e000d74001750414745525f535441544953544943535f434f55504f4e7371007e000d74001950414745525f535441544953544943535f494e54454752414c7371007e000d74001350414745525f53595354454d5f434f4e4649477371007e000d74001a50414745525f53595354454d5f434f4e4649475f4352454154457371007e000d74001a50414745525f53595354454d5f434f4e4649475f454e41424c457371007e000d74001a50414745525f53595354454d5f434f4e4649475f4d4f444946597371007e000d74001450414745525f53595354454d5f44594e414d49437371007e000d74001550414745525f53595354454d5f47454e45524154457371007e000d74001150414745525f53595354454d5f4d454e557371007e000d74001850414745525f53595354454d5f4d454e555f4352454154457371007e000d74001850414745525f53595354454d5f4d454e555f4d4f444946597371007e000d74001150414745525f53595354454d5f524f4c457371007e000d74001850414745525f53595354454d5f524f4c455f4352454154457371007e000d74001850414745525f53595354454d5f524f4c455f44454c4554457371007e000d74001750414745525f53595354454d5f524f4c455f4752414e547371007e000d74001850414745525f53595354454d5f524f4c455f4d4f444946597371007e000d74001c50414745525f53595354454d5f524f4c455f5045524d495353494f4e7371007e000d74001150414745525f53595354454d5f555345527371007e000d74001850414745525f53595354454d5f555345525f4352454154457371007e000d74001850414745525f53595354454d5f555345525f454e41424c457371007e000d74001850414745525f53595354454d5f555345525f4d4f444946597871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e00d4787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00d24c000573636f706571007e00d47870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00d27870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a39353237740009636c69656e745f696471007e00d778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e00e4770c000000103f40000000000000787371007e00da3f40000000000000770800000010000000007871007e00df707371007e00e4770c000000103f40000000000000787371007e00e4770c000000103f4000000000000171007e00dd787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000006177040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf7871007e00ee737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020453837393836313132454238344438434635464133343432453044453133323170737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00d44c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e00e1737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf787074000b3133383133313435303231), ('cRavHQ', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000061770400000061737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b787074000e50414745525f41435449564954597371007e000d74001750414745525f41435449564954595f415353454d424c597371007e000d74001e50414745525f41435449564954595f415353454d424c595f4352454154457371007e000d74001c50414745525f41435449564954595f415353454d424c595f444154417371007e000d74001d50414745525f41435449564954595f415353454d424c595f474f4f44537371007e000d74002450414745525f41435449564954595f415353454d424c595f474f4f44535f44455441494c7371007e000d74002550414745525f41435449564954595f415353454d424c595f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f415353454d424c595f4d4f444946597371007e000d74001e50414745525f41435449564954595f415353454d424c595f5245434f52447371007e000d74001c50414745525f41435449564954595f415353454d424c595f52554c457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4d4f444946597371007e000d74001550414745525f41435449564954595f42414e4e45527371007e000d74001c50414745525f41435449564954595f42414e4e45525f4352454154457371007e000d74001c50414745525f41435449564954595f42414e4e45525f4d4f444946597371007e000d74001550414745525f41435449564954595f434f55504f4e7371007e000d74001d50414745525f41435449564954595f434f55504f4e5f5055424c4953487371007e000d74001e50414745525f41435449564954595f434f55504f4e5f54454d504c4154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4352454154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4d4f444946597371007e000d74001a50414745525f41435449564954595f434f55504f4e5f555345527371007e000d74001750414745525f41435449564954595f45584348414e47457371007e000d74001e50414745525f41435449564954595f45584348414e47455f4352454154457371007e000d74001c50414745525f41435449564954595f45584348414e47455f444154417371007e000d74001d50414745525f41435449564954595f45584348414e47455f474f4f44537371007e000d74002550414745525f41435449564954595f45584348414e47455f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f45584348414e47455f4d4f444946597371007e000d74001e50414745525f41435449564954595f45584348414e47455f5245434f52447371007e000d74001c50414745525f41435449564954595f45584348414e47455f52554c457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4d4f444946597371007e000d74001750414745525f41435449564954595f494e54454752414c7371007e000d74001350414745525f41435449564954595f4b494c4c7371007e000d74000f50414745525f44415348424f4152447371007e000d74001550414745525f44415348424f4152445f4f524445527371007e000d74001850414745525f44415348424f4152445f52454749535445527371007e000d74001650414745525f44415348424f4152445f53454c4c45527371007e000d74001850414745525f44415348424f4152445f5455524e4f5645527371007e000d74000d50414745525f46494e414e43457371007e000d74001250414745525f46494e414e43455f46554e447371007e000d74001350414745525f46494e414e43455f54524144457371007e000d74000f50414745525f47454e455241544f527371007e000d74000b50414745525f474f4f44537371007e000d74001150414745525f474f4f44535f4252414e447371007e000d74001a50414745525f474f4f44535f434c415353494649434154494f4e7371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4352454154457371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4d4f444946597371007e000d74001150414745525f474f4f44535f47524f55507371007e000d74001a50414745525f474f4f44535f47524f55505f50524f50455254597371007e000d74001050414745525f474f4f44535f494e464f7371007e000d74001450414745525f474f4f44535f50524f50455254597371007e000d74000f50414745525f474f4f44535f534b557371007e000d74001650414745525f474f4f44535f534b555f4352454154457371007e000d74001650414745525f474f4f44535f534b555f4d4f444946597371007e000d74000f50414745525f474f4f44535f5350557371007e000d74000d50414745525f4d4f4e49544f527371007e000d74001650414745525f4d4f4e49544f525f41435449564954597371007e000d74001650414745525f4d4f4e49544f525f44415441424153457371007e000d74001350414745525f4d4f4e49544f525f474f4f44537371007e000d74001450414745525f4d4f4e49544f525f4d414e4147457371007e000d74001350414745525f4d4f4e49544f525f4f524445527371007e000d74000b50414745525f4f524445527371007e000d74001050414745525f4f524445525f53414c457371007e000d74001250414745525f4f524445525f53454c4c45527371007e000d74001050414745525f4f524445525f555345527371007e000d74000e50414745525f504c4154464f524d7371007e000d74001550414745525f504c4154464f524d5f53454c4c45527371007e000d74001350414745525f504c4154464f524d5f555345527371007e000d74000a50414745525f5249534b7371007e000d74001450414745525f5249534b5f424c41434b4c4953547371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4352454154457371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4d4f444946597371007e000d74000f50414745525f5249534b5f52554c457371007e000d74001150414745525f524f4c455f53595354454d7371007e000d74001050414745525f535441544953544943537371007e000d74001950414745525f535441544953544943535f415353454d424c457371007e000d74001750414745525f535441544953544943535f434f55504f4e7371007e000d74001950414745525f535441544953544943535f494e54454752414c7371007e000d74001350414745525f53595354454d5f434f4e4649477371007e000d74001a50414745525f53595354454d5f434f4e4649475f4352454154457371007e000d74001a50414745525f53595354454d5f434f4e4649475f454e41424c457371007e000d74001a50414745525f53595354454d5f434f4e4649475f4d4f444946597371007e000d74001450414745525f53595354454d5f44594e414d49437371007e000d74001550414745525f53595354454d5f47454e45524154457371007e000d74001150414745525f53595354454d5f4d454e557371007e000d74001850414745525f53595354454d5f4d454e555f4352454154457371007e000d74001850414745525f53595354454d5f4d454e555f4d4f444946597371007e000d74001150414745525f53595354454d5f524f4c457371007e000d74001850414745525f53595354454d5f524f4c455f4352454154457371007e000d74001850414745525f53595354454d5f524f4c455f44454c4554457371007e000d74001750414745525f53595354454d5f524f4c455f4752414e547371007e000d74001850414745525f53595354454d5f524f4c455f4d4f444946597371007e000d74001c50414745525f53595354454d5f524f4c455f5045524d495353494f4e7371007e000d74001150414745525f53595354454d5f555345527371007e000d74001850414745525f53595354454d5f555345525f4352454154457371007e000d74001850414745525f53595354454d5f555345525f454e41424c457371007e000d74001850414745525f53595354454d5f555345525f4d4f444946597871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e00d4787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00d24c000573636f706571007e00d47870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00d27870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a39353237740009636c69656e745f696471007e00d778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e00e4770c000000103f40000000000000787371007e00da3f40000000000000770800000010000000007871007e00df707371007e00e4770c000000103f40000000000000787371007e00e4770c000000103f4000000000000171007e00dd787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000006177040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf7871007e00ee737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020383938463934393033423042453844323244453538373342333045354438343170737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00d44c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e00e1737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf787074000b3133383133313435303231), ('7mxsnm', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000061770400000061737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b787074000e50414745525f41435449564954597371007e000d74001750414745525f41435449564954595f415353454d424c597371007e000d74001e50414745525f41435449564954595f415353454d424c595f4352454154457371007e000d74001c50414745525f41435449564954595f415353454d424c595f444154417371007e000d74001d50414745525f41435449564954595f415353454d424c595f474f4f44537371007e000d74002450414745525f41435449564954595f415353454d424c595f474f4f44535f44455441494c7371007e000d74002550414745525f41435449564954595f415353454d424c595f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f415353454d424c595f4d4f444946597371007e000d74001e50414745525f41435449564954595f415353454d424c595f5245434f52447371007e000d74001c50414745525f41435449564954595f415353454d424c595f52554c457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4d4f444946597371007e000d74001550414745525f41435449564954595f42414e4e45527371007e000d74001c50414745525f41435449564954595f42414e4e45525f4352454154457371007e000d74001c50414745525f41435449564954595f42414e4e45525f4d4f444946597371007e000d74001550414745525f41435449564954595f434f55504f4e7371007e000d74001d50414745525f41435449564954595f434f55504f4e5f5055424c4953487371007e000d74001e50414745525f41435449564954595f434f55504f4e5f54454d504c4154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4352454154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4d4f444946597371007e000d74001a50414745525f41435449564954595f434f55504f4e5f555345527371007e000d74001750414745525f41435449564954595f45584348414e47457371007e000d74001e50414745525f41435449564954595f45584348414e47455f4352454154457371007e000d74001c50414745525f41435449564954595f45584348414e47455f444154417371007e000d74001d50414745525f41435449564954595f45584348414e47455f474f4f44537371007e000d74002550414745525f41435449564954595f45584348414e47455f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f45584348414e47455f4d4f444946597371007e000d74001e50414745525f41435449564954595f45584348414e47455f5245434f52447371007e000d74001c50414745525f41435449564954595f45584348414e47455f52554c457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4d4f444946597371007e000d74001750414745525f41435449564954595f494e54454752414c7371007e000d74001350414745525f41435449564954595f4b494c4c7371007e000d74000f50414745525f44415348424f4152447371007e000d74001550414745525f44415348424f4152445f4f524445527371007e000d74001850414745525f44415348424f4152445f52454749535445527371007e000d74001650414745525f44415348424f4152445f53454c4c45527371007e000d74001850414745525f44415348424f4152445f5455524e4f5645527371007e000d74000d50414745525f46494e414e43457371007e000d74001250414745525f46494e414e43455f46554e447371007e000d74001350414745525f46494e414e43455f54524144457371007e000d74000f50414745525f47454e455241544f527371007e000d74000b50414745525f474f4f44537371007e000d74001150414745525f474f4f44535f4252414e447371007e000d74001a50414745525f474f4f44535f434c415353494649434154494f4e7371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4352454154457371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4d4f444946597371007e000d74001150414745525f474f4f44535f47524f55507371007e000d74001a50414745525f474f4f44535f47524f55505f50524f50455254597371007e000d74001050414745525f474f4f44535f494e464f7371007e000d74001450414745525f474f4f44535f50524f50455254597371007e000d74000f50414745525f474f4f44535f534b557371007e000d74001650414745525f474f4f44535f534b555f4352454154457371007e000d74001650414745525f474f4f44535f534b555f4d4f444946597371007e000d74000f50414745525f474f4f44535f5350557371007e000d74000d50414745525f4d4f4e49544f527371007e000d74001650414745525f4d4f4e49544f525f41435449564954597371007e000d74001650414745525f4d4f4e49544f525f44415441424153457371007e000d74001350414745525f4d4f4e49544f525f474f4f44537371007e000d74001450414745525f4d4f4e49544f525f4d414e4147457371007e000d74001350414745525f4d4f4e49544f525f4f524445527371007e000d74000b50414745525f4f524445527371007e000d74001050414745525f4f524445525f53414c457371007e000d74001250414745525f4f524445525f53454c4c45527371007e000d74001050414745525f4f524445525f555345527371007e000d74000e50414745525f504c4154464f524d7371007e000d74001550414745525f504c4154464f524d5f53454c4c45527371007e000d74001350414745525f504c4154464f524d5f555345527371007e000d74000a50414745525f5249534b7371007e000d74001450414745525f5249534b5f424c41434b4c4953547371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4352454154457371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4d4f444946597371007e000d74000f50414745525f5249534b5f52554c457371007e000d74001150414745525f524f4c455f53595354454d7371007e000d74001050414745525f535441544953544943537371007e000d74001950414745525f535441544953544943535f415353454d424c457371007e000d74001750414745525f535441544953544943535f434f55504f4e7371007e000d74001950414745525f535441544953544943535f494e54454752414c7371007e000d74001350414745525f53595354454d5f434f4e4649477371007e000d74001a50414745525f53595354454d5f434f4e4649475f4352454154457371007e000d74001a50414745525f53595354454d5f434f4e4649475f454e41424c457371007e000d74001a50414745525f53595354454d5f434f4e4649475f4d4f444946597371007e000d74001450414745525f53595354454d5f44594e414d49437371007e000d74001550414745525f53595354454d5f47454e45524154457371007e000d74001150414745525f53595354454d5f4d454e557371007e000d74001850414745525f53595354454d5f4d454e555f4352454154457371007e000d74001850414745525f53595354454d5f4d454e555f4d4f444946597371007e000d74001150414745525f53595354454d5f524f4c457371007e000d74001850414745525f53595354454d5f524f4c455f4352454154457371007e000d74001850414745525f53595354454d5f524f4c455f44454c4554457371007e000d74001750414745525f53595354454d5f524f4c455f4752414e547371007e000d74001850414745525f53595354454d5f524f4c455f4d4f444946597371007e000d74001c50414745525f53595354454d5f524f4c455f5045524d495353494f4e7371007e000d74001150414745525f53595354454d5f555345527371007e000d74001850414745525f53595354454d5f555345525f4352454154457371007e000d74001850414745525f53595354454d5f555345525f454e41424c457371007e000d74001850414745525f53595354454d5f555345525f4d4f444946597871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e00d4787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00d24c000573636f706571007e00d47870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00d27870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a39353237740009636c69656e745f696471007e00d778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e00e4770c000000103f40000000000000787371007e00da3f40000000000000770800000010000000007871007e00df707371007e00e4770c000000103f40000000000000787371007e00e4770c000000103f4000000000000171007e00dd787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000006177040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf7871007e00ee737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020383938463934393033423042453844323244453538373342333045354438343170737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00d44c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e00e1737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf787074000b3133383133313435303231), ('fy5IWB', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000061770400000061737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b787074000e50414745525f41435449564954597371007e000d74001750414745525f41435449564954595f415353454d424c597371007e000d74001e50414745525f41435449564954595f415353454d424c595f4352454154457371007e000d74001c50414745525f41435449564954595f415353454d424c595f444154417371007e000d74001d50414745525f41435449564954595f415353454d424c595f474f4f44537371007e000d74002450414745525f41435449564954595f415353454d424c595f474f4f44535f44455441494c7371007e000d74002550414745525f41435449564954595f415353454d424c595f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f415353454d424c595f4d4f444946597371007e000d74001e50414745525f41435449564954595f415353454d424c595f5245434f52447371007e000d74001c50414745525f41435449564954595f415353454d424c595f52554c457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f415353454d424c595f52554c455f4d4f444946597371007e000d74001550414745525f41435449564954595f42414e4e45527371007e000d74001c50414745525f41435449564954595f42414e4e45525f4352454154457371007e000d74001c50414745525f41435449564954595f42414e4e45525f4d4f444946597371007e000d74001550414745525f41435449564954595f434f55504f4e7371007e000d74001d50414745525f41435449564954595f434f55504f4e5f5055424c4953487371007e000d74001e50414745525f41435449564954595f434f55504f4e5f54454d504c4154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4352454154457371007e000d74002550414745525f41435449564954595f434f55504f4e5f54454d504c4154455f4d4f444946597371007e000d74001a50414745525f41435449564954595f434f55504f4e5f555345527371007e000d74001750414745525f41435449564954595f45584348414e47457371007e000d74001e50414745525f41435449564954595f45584348414e47455f4352454154457371007e000d74001c50414745525f41435449564954595f45584348414e47455f444154417371007e000d74001d50414745525f41435449564954595f45584348414e47455f474f4f44537371007e000d74002550414745525f41435449564954595f45584348414e47455f474f4f44535f53455454494e477371007e000d74001e50414745525f41435449564954595f45584348414e47455f4d4f444946597371007e000d74001e50414745525f41435449564954595f45584348414e47455f5245434f52447371007e000d74001c50414745525f41435449564954595f45584348414e47455f52554c457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4352454154457371007e000d74002350414745525f41435449564954595f45584348414e47455f52554c455f4d4f444946597371007e000d74001750414745525f41435449564954595f494e54454752414c7371007e000d74001350414745525f41435449564954595f4b494c4c7371007e000d74000f50414745525f44415348424f4152447371007e000d74001550414745525f44415348424f4152445f4f524445527371007e000d74001850414745525f44415348424f4152445f52454749535445527371007e000d74001650414745525f44415348424f4152445f53454c4c45527371007e000d74001850414745525f44415348424f4152445f5455524e4f5645527371007e000d74000d50414745525f46494e414e43457371007e000d74001250414745525f46494e414e43455f46554e447371007e000d74001350414745525f46494e414e43455f54524144457371007e000d74000f50414745525f47454e455241544f527371007e000d74000b50414745525f474f4f44537371007e000d74001150414745525f474f4f44535f4252414e447371007e000d74001a50414745525f474f4f44535f434c415353494649434154494f4e7371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4352454154457371007e000d74002150414745525f474f4f44535f434c415353494649434154494f4e5f4d4f444946597371007e000d74001150414745525f474f4f44535f47524f55507371007e000d74001a50414745525f474f4f44535f47524f55505f50524f50455254597371007e000d74001050414745525f474f4f44535f494e464f7371007e000d74001450414745525f474f4f44535f50524f50455254597371007e000d74000f50414745525f474f4f44535f534b557371007e000d74001650414745525f474f4f44535f534b555f4352454154457371007e000d74001650414745525f474f4f44535f534b555f4d4f444946597371007e000d74000f50414745525f474f4f44535f5350557371007e000d74000d50414745525f4d4f4e49544f527371007e000d74001650414745525f4d4f4e49544f525f41435449564954597371007e000d74001650414745525f4d4f4e49544f525f44415441424153457371007e000d74001350414745525f4d4f4e49544f525f474f4f44537371007e000d74001450414745525f4d4f4e49544f525f4d414e4147457371007e000d74001350414745525f4d4f4e49544f525f4f524445527371007e000d74000b50414745525f4f524445527371007e000d74001050414745525f4f524445525f53414c457371007e000d74001250414745525f4f524445525f53454c4c45527371007e000d74001050414745525f4f524445525f555345527371007e000d74000e50414745525f504c4154464f524d7371007e000d74001550414745525f504c4154464f524d5f53454c4c45527371007e000d74001350414745525f504c4154464f524d5f555345527371007e000d74000a50414745525f5249534b7371007e000d74001450414745525f5249534b5f424c41434b4c4953547371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4352454154457371007e000d74001b50414745525f5249534b5f424c41434b4c4953545f4d4f444946597371007e000d74000f50414745525f5249534b5f52554c457371007e000d74001150414745525f524f4c455f53595354454d7371007e000d74001050414745525f535441544953544943537371007e000d74001950414745525f535441544953544943535f415353454d424c457371007e000d74001750414745525f535441544953544943535f434f55504f4e7371007e000d74001950414745525f535441544953544943535f494e54454752414c7371007e000d74001350414745525f53595354454d5f434f4e4649477371007e000d74001a50414745525f53595354454d5f434f4e4649475f4352454154457371007e000d74001a50414745525f53595354454d5f434f4e4649475f454e41424c457371007e000d74001a50414745525f53595354454d5f434f4e4649475f4d4f444946597371007e000d74001450414745525f53595354454d5f44594e414d49437371007e000d74001550414745525f53595354454d5f47454e45524154457371007e000d74001150414745525f53595354454d5f4d454e557371007e000d74001850414745525f53595354454d5f4d454e555f4352454154457371007e000d74001850414745525f53595354454d5f4d454e555f4d4f444946597371007e000d74001150414745525f53595354454d5f524f4c457371007e000d74001850414745525f53595354454d5f524f4c455f4352454154457371007e000d74001850414745525f53595354454d5f524f4c455f44454c4554457371007e000d74001750414745525f53595354454d5f524f4c455f4752414e547371007e000d74001850414745525f53595354454d5f524f4c455f4d4f444946597371007e000d74001c50414745525f53595354454d5f524f4c455f5045524d495353494f4e7371007e000d74001150414745525f53595354454d5f555345527371007e000d74001850414745525f53595354454d5f555345525f4352454154457371007e000d74001850414745525f53595354454d5f555345525f454e41424c457371007e000d74001850414745525f53595354454d5f555345525f4d4f444946597871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e00d4787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00d24c000573636f706571007e00d47870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00d27870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a39353237740009636c69656e745f696471007e00d778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e00e4770c000000103f40000000000000787371007e00da3f40000000000000770800000010000000007871007e00df707371007e00e4770c000000103f40000000000000787371007e00e4770c000000103f4000000000000171007e00dd787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000006177040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf7871007e00ee737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020383938463934393033423042453844323244453538373342333045354438343170737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00d44c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e00e1737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000006171007e000f71007e001171007e001371007e001571007e001771007e001971007e001b71007e001d71007e001f71007e002171007e002371007e002571007e002771007e002971007e002b71007e002d71007e002f71007e003171007e003371007e003571007e003771007e003971007e003b71007e003d71007e003f71007e004171007e004371007e004571007e004771007e004971007e004b71007e004d71007e004f71007e005171007e005371007e005571007e005771007e005971007e005b71007e005d71007e005f71007e006171007e006371007e006571007e006771007e006971007e006b71007e006d71007e006f71007e007171007e007371007e007571007e007771007e007971007e007b71007e007d71007e007f71007e008171007e008371007e008571007e008771007e008971007e008b71007e008d71007e008f71007e009171007e009371007e009571007e009771007e009971007e009b71007e009d71007e009f71007e00a171007e00a371007e00a571007e00a771007e00a971007e00ab71007e00ad71007e00af71007e00b171007e00b371007e00b571007e00b771007e00b971007e00bb71007e00bd71007e00bf71007e00c171007e00c371007e00c571007e00c771007e00c971007e00cb71007e00cd71007e00cf787074000b3133383133313435303231); COMMIT; -- ---------------------------- diff --git a/doc/base/pager_goods.sql b/doc/base/pager_goods.sql index 63261c5..1172c85 100644 --- a/doc/base/pager_goods.sql +++ b/doc/base/pager_goods.sql @@ -11,7 +11,7 @@ Target Server Version : 50646 File Encoding : utf-8 - Date: 05/05/2020 18:37:53 PM + Date: 09/04/2020 15:27:48 PM */ SET NAMES utf8; @@ -47,7 +47,7 @@ CREATE TABLE `t_goods` ( -- Records of `t_goods` -- ---------------------------- BEGIN; -INSERT INTO `t_goods` VALUES ('37', '1', '5', '2', '1', '12', '1', '4', '0', '0', '

dadasdadadasdasdasfsfsf

fdsfsfsa

fsfsfasff

  1. fsfsafasfsafsafsf
  2. 
', null, 'KG', '2020-05-04 14:02:27', '2020-05-05 13:02:08', 'admin', 'admin', '0'); +INSERT INTO `t_goods` VALUES ('37', '1', '5', '2', '2', '12', '1', '4', '0', '0', '

dadasdadadasdasdasfsfsf

fdsfsfsa

fsfsfasff

  1. fsfsafasfsafsafsf
  2. 
', null, 'KG', '2020-05-04 14:02:27', '2020-05-31 10:40:25', 'admin', 'admin', '0'); COMMIT; -- ---------------------------- @@ -73,7 +73,7 @@ CREATE TABLE `t_goods_brand` ( -- Records of `t_goods_brand` -- ---------------------------- BEGIN; -INSERT INTO `t_goods_brand` VALUES ('1', '3', '宝马', '123', 'http://q5u3r2zhc.bkt.clouddn.com/static/2020-02-18/20a950c5384e4e42acf24733f85d43f3.jpg', '1', 'admin', 'admin', '2020-02-18 22:49:59', '2020-02-18 22:58:31', b'0'), ('2', '10', '奥迪', '456', 'http://q5u3r2zhc.bkt.clouddn.com/static/2020-02-18/092c25c8558c419197fe3287f0a0165a.jpg', '2', 'admin', 'admin', '2020-02-18 22:50:41', '2020-02-18 22:58:35', b'0'); +INSERT INTO `t_goods_brand` VALUES ('1', '3', '宝马', '123', 'http://q5u3r2zhc.bkt.clouddn.com/static/2020-02-18/20a950c5384e4e42acf24733f85d43f3.jpg', '1', 'admin', 'admin', '2020-02-18 22:49:59', '2020-08-16 11:12:06', b'1'), ('2', '10', '奥迪', '456', 'http://q5u3r2zhc.bkt.clouddn.com/static/2020-02-18/092c25c8558c419197fe3287f0a0165a.jpg', '2', 'admin', 'admin', '2020-02-18 22:50:41', '2020-08-16 11:12:08', b'1'); COMMIT; -- ---------------------------- @@ -96,7 +96,7 @@ CREATE TABLE `t_goods_brand_group` ( -- Records of `t_goods_brand_group` -- ---------------------------- BEGIN; -INSERT INTO `t_goods_brand_group` VALUES ('1', '手机', '0', 'admin', 'admin', '2019-11-09 12:55:10', '2019-11-09 12:58:48', b'0'), ('2', '电脑', '1', 'admin', 'admin', '2019-11-09 12:55:19', '2019-11-09 12:58:37', b'0'), ('3', '平板电脑', '2', 'admin', 'admin', '2019-11-09 12:55:50', '2019-11-09 12:58:41', b'0'), ('4', '手环', '4', 'admin', 'admin', '2019-11-09 12:56:09', '2019-11-09 12:58:45', b'0'), ('5', '手表', '5', 'admin', 'admin', '2019-11-09 12:56:53', '2019-11-09 12:56:52', b'0'), ('6', '汽车', '6', 'admin', 'admin', '2019-11-09 12:59:26', '2019-11-09 12:59:26', b'0'), ('7', '苹果电脑', '9', 'admin', 'admin', '2019-11-09 13:00:35', '2019-11-09 13:00:34', b'0'), ('8', '男帽', '7', 'admin', 'admin', '2019-11-09 13:01:40', '2019-11-09 13:00:34', b'0'), ('9', '女帽', '8', 'admin', 'admin', '2019-11-09 13:02:03', '2019-11-09 13:00:34', b'0'), ('10', '男裤', '10', 'admin', 'admin', '2019-11-09 13:02:56', '2019-11-09 13:00:34', b'0'), ('11', '女裤', '11', 'admin', 'admin', '2019-11-09 13:03:04', '2019-11-09 13:00:34', b'0'), ('12', '水果', '12', 'admin', 'admin', '2019-11-09 14:25:31', '2019-11-09 14:25:31', b'0'), ('13', '蔬菜', '13', 'admin', 'admin', '2019-11-09 14:25:41', '2019-11-09 14:25:41', b'0'), ('14', '肉类', '14', 'admin', 'admin', '2019-11-09 14:35:32', '2019-11-09 14:35:32', b'0'); +INSERT INTO `t_goods_brand_group` VALUES ('1', '手机', '0', 'admin', 'admin', '2019-11-09 12:55:10', '2020-08-16 11:11:27', b'1'), ('2', '电脑', '1', 'admin', 'admin', '2019-11-09 12:55:19', '2020-08-16 11:11:29', b'1'), ('3', '平板电脑', '2', 'admin', 'admin', '2019-11-09 12:55:50', '2020-08-16 11:11:32', b'1'), ('4', '手环', '4', 'admin', 'admin', '2019-11-09 12:56:09', '2020-08-16 11:11:35', b'1'), ('5', '手表', '5', 'admin', 'admin', '2019-11-09 12:56:53', '2020-08-16 11:11:37', b'1'), ('6', '汽车', '6', 'admin', 'admin', '2019-11-09 12:59:26', '2020-08-16 11:11:39', b'1'), ('7', '苹果电脑', '9', 'admin', 'admin', '2019-11-09 13:00:35', '2020-08-16 11:11:49', b'1'), ('8', '男帽', '7', 'admin', 'admin', '2019-11-09 13:01:40', '2020-08-16 11:11:44', b'1'), ('9', '女帽', '8', 'admin', 'admin', '2019-11-09 13:02:03', '2020-08-16 11:11:47', b'1'), ('10', '男裤', '10', 'admin', 'admin', '2019-11-09 13:02:56', '2020-08-16 11:11:51', b'1'), ('11', '女裤', '11', 'admin', 'admin', '2019-11-09 13:03:04', '2020-08-16 11:10:57', b'1'), ('12', '水果', '12', 'admin', 'admin', '2019-11-09 14:25:31', '2020-08-16 11:10:54', b'1'), ('13', '蔬菜', '13', 'admin', 'admin', '2019-11-09 14:25:41', '2020-08-16 11:10:52', b'1'), ('14', '肉类', '14', 'admin', 'admin', '2019-11-09 14:35:32', '2020-08-16 11:10:50', b'1'); COMMIT; -- ---------------------------- @@ -123,11 +123,11 @@ CREATE TABLE `t_goods_cart` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `user_id` bigint(20) DEFAULT NULL COMMENT 't_user 用户主键', `sku_id` bigint(20) DEFAULT NULL COMMENT 't_goods_sku 主键', - `purchase_sku_count` int(4) DEFAULT NULL COMMENT '购买商品的数量', + `purchase_quantity` int(4) DEFAULT NULL COMMENT '购买商品的数量', `create_user` varchar(63) COLLATE utf8mb4_bin DEFAULT NULL, `update_user` varchar(63) COLLATE utf8mb4_bin DEFAULT NULL, - `create_time` datetime DEFAULT NULL, - `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `create_time` datetime NOT NULL, + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `delete_status` bit(1) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='购物车'; @@ -154,13 +154,13 @@ CREATE TABLE `t_goods_class` ( `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `delete_status` bit(1) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=36 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='商品分类'; +) ENGINE=InnoDB AUTO_INCREMENT=40 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='商品分类'; -- ---------------------------- -- Records of `t_goods_class` -- ---------------------------- BEGIN; -INSERT INTO `t_goods_class` VALUES ('1', null, '推荐分类', null, 'admin', 'admin', '2019-10-27 13:28:46', '2019-10-27 13:28:55', b'0'), ('2', null, '京东超市', null, 'admin', 'admin', '2019-10-27 13:29:44', '2019-10-27 13:40:30', b'0'), ('3', null, '国际名牌', null, 'admin', 'admin', '2019-10-27 13:40:59', '2019-10-27 13:41:03', b'0'), ('4', null, '奢饰品', null, 'admin', 'admin', '2019-10-27 13:41:04', '2019-10-27 13:41:08', b'0'), ('5', null, '海囤全球', null, 'admin', 'admin', '2019-10-27 13:41:09', '2019-10-27 13:41:13', b'0'), ('6', null, '唯品会', null, 'admin', 'admin', '2019-10-27 13:41:15', '2019-10-27 13:41:17', b'0'), ('7', null, '男装', null, 'admin', 'admin', '2019-10-27 13:42:18', '2019-10-27 13:42:21', b'0'), ('8', null, '女装', null, 'admin', 'admin', '2019-10-27 13:42:22', '2019-10-27 13:42:25', b'0'), ('9', null, '男鞋', null, 'admin', 'admin', '2019-10-27 13:42:26', '2019-10-27 13:42:32', b'0'), ('10', null, '女鞋', null, 'admin', 'admin', '2019-10-27 13:41:19', '2019-10-27 13:41:22', b'0'), ('11', null, '内衣配饰', null, 'admin', 'admin', '2019-10-27 13:42:33', '2019-10-27 13:42:39', b'0'), ('12', null, '箱包手袋', null, 'admin', 'admin', '2019-10-27 13:42:57', '2019-10-27 13:43:00', b'0'), ('13', null, '美妆护肤', null, 'admin', 'admin', '2019-10-27 13:41:34', '2019-10-27 13:41:37', b'0'), ('14', null, '个护清洁', null, 'admin', 'admin', '2019-10-27 13:41:29', '2019-10-27 13:41:33', b'0'), ('15', null, '钟表珠宝', null, 'admin', 'admin', '2019-10-27 13:41:24', '2019-10-27 13:41:27', b'0'), ('16', null, '手机数码', null, 'admin', 'admin', '2019-10-27 13:42:40', '2019-10-27 13:42:42', b'0'), ('17', null, '电脑办公', null, 'admin', 'admin', '2019-10-27 13:43:01', '2019-10-27 13:43:05', b'0'), ('18', null, '家用电器', null, 'admin', 'admin', '2019-10-27 13:41:38', '2019-10-27 13:41:42', b'0'), ('19', null, '食品生鲜', null, 'admin', 'admin', '2019-10-27 13:42:44', '2019-10-27 13:42:47', b'0'), ('20', null, '酒水饮料', null, 'admin', 'admin', '2019-10-27 13:43:07', '2019-10-27 13:43:10', b'0'), ('21', null, '母婴童装', null, 'admin', 'admin', '2019-10-27 13:42:01', '2019-10-27 13:42:05', b'0'), ('22', null, '玩具乐器', null, 'admin', 'admin', '2019-10-27 13:42:49', '2019-10-27 13:42:53', b'0'), ('23', null, '医药保健', null, 'admin', 'admin', '2019-10-27 13:41:44', '2019-10-27 13:41:48', b'0'), ('24', null, '计生情趣', null, 'admin', 'admin', '2019-10-27 13:43:12', '2019-10-27 13:43:15', b'0'), ('25', null, '运动户外', null, 'admin', 'admin', '2019-10-27 13:43:20', '2019-10-27 13:43:23', b'0'), ('26', null, '汽车生活', null, 'admin', 'admin', '2019-10-27 13:41:49', '2019-10-27 13:41:52', b'0'), ('27', null, '家居厨具', null, 'admin', 'admin', '2019-10-27 13:43:16', '2019-10-27 13:43:19', b'0'), ('28', null, '家具家装', null, 'admin', 'admin', '2019-10-27 13:41:53', '2019-10-27 13:41:56', b'0'), ('29', null, '礼品鲜花', null, 'admin', 'admin', '2019-10-27 13:41:57', '2019-10-27 13:42:00', b'0'), ('30', null, '宠物生活', null, 'admin', 'admin', '2019-10-27 13:43:24', '2019-10-27 13:43:29', b'0'), ('31', null, '生活旅行', null, 'admin', 'admin', '2019-10-27 13:42:06', '2019-10-27 13:42:13', b'0'), ('32', '1', '3333', null, 'admin', 'admin', '2019-10-27 14:02:03', '2019-10-27 14:02:22', b'0'), ('33', '2', 'hhh', null, 'admin', 'admin', '2020-04-19 11:34:57', '2020-04-19 11:34:56', b'0'), ('34', '32', 'hhh', null, 'admin', 'admin', '2020-04-19 11:55:07', '2020-04-19 11:55:07', b'0'), ('35', '32', 'hhh', null, 'admin', 'admin', '2020-04-19 14:43:58', '2020-04-19 14:43:58', b'0'); +INSERT INTO `t_goods_class` VALUES ('1', null, '推荐分类', null, 'admin', 'admin', '2019-10-27 13:28:46', '2019-10-27 13:28:55', b'0'), ('2', null, '京东超市', null, 'admin', 'admin', '2019-10-27 13:29:44', '2019-10-27 13:40:30', b'0'), ('3', null, '国际名牌', null, 'admin', 'admin', '2019-10-27 13:40:59', '2019-10-27 13:41:03', b'0'), ('4', null, '奢饰品', null, 'admin', 'admin', '2019-10-27 13:41:04', '2019-10-27 13:41:08', b'0'), ('5', null, '海囤全球', null, 'admin', 'admin', '2019-10-27 13:41:09', '2019-10-27 13:41:13', b'0'), ('6', null, '唯品会', null, 'admin', 'admin', '2019-10-27 13:41:15', '2019-10-27 13:41:17', b'0'), ('7', null, '男装', null, 'admin', 'admin', '2019-10-27 13:42:18', '2019-10-27 13:42:21', b'0'), ('8', null, '女装', null, 'admin', 'admin', '2019-10-27 13:42:22', '2019-10-27 13:42:25', b'0'), ('9', null, '男鞋', null, 'admin', 'admin', '2019-10-27 13:42:26', '2019-10-27 13:42:32', b'0'), ('10', null, '女鞋', null, 'admin', 'admin', '2019-10-27 13:41:19', '2019-10-27 13:41:22', b'0'), ('11', null, '内衣配饰', null, 'admin', 'admin', '2019-10-27 13:42:33', '2019-10-27 13:42:39', b'0'), ('12', null, '箱包手袋', null, 'admin', 'admin', '2019-10-27 13:42:57', '2019-10-27 13:43:00', b'0'), ('13', null, '美妆护肤', null, 'admin', 'admin', '2019-10-27 13:41:34', '2019-10-27 13:41:37', b'0'), ('14', null, '个护清洁', null, 'admin', 'admin', '2019-10-27 13:41:29', '2019-10-27 13:41:33', b'0'), ('15', null, '钟表珠宝', null, 'admin', 'admin', '2019-10-27 13:41:24', '2019-10-27 13:41:27', b'0'), ('16', null, '手机数码', null, 'admin', 'admin', '2019-10-27 13:42:40', '2019-10-27 13:42:42', b'0'), ('17', null, '电脑办公', null, 'admin', 'admin', '2019-10-27 13:43:01', '2019-10-27 13:43:05', b'0'), ('18', null, '家用电器', null, 'admin', 'admin', '2019-10-27 13:41:38', '2019-10-27 13:41:42', b'0'), ('19', null, '食品生鲜', null, 'admin', 'admin', '2019-10-27 13:42:44', '2019-10-27 13:42:47', b'0'), ('20', null, '酒水饮料', null, 'admin', 'admin', '2019-10-27 13:43:07', '2019-10-27 13:43:10', b'0'), ('21', null, '母婴童装', null, 'admin', 'admin', '2019-10-27 13:42:01', '2019-10-27 13:42:05', b'0'), ('22', null, '玩具乐器', null, 'admin', 'admin', '2019-10-27 13:42:49', '2019-10-27 13:42:53', b'0'), ('23', null, '医药保健', null, 'admin', 'admin', '2019-10-27 13:41:44', '2019-10-27 13:41:48', b'0'), ('24', null, '计生情趣', null, 'admin', 'admin', '2019-10-27 13:43:12', '2019-10-27 13:43:15', b'0'), ('25', null, '运动户外', null, 'admin', 'admin', '2019-10-27 13:43:20', '2019-10-27 13:43:23', b'0'), ('26', null, '汽车生活', null, 'admin', 'admin', '2019-10-27 13:41:49', '2019-10-27 13:41:52', b'0'), ('27', null, '家居厨具', null, 'admin', 'admin', '2019-10-27 13:43:16', '2019-10-27 13:43:19', b'0'), ('28', null, '家具家装', null, 'admin', 'admin', '2019-10-27 13:41:53', '2019-10-27 13:41:56', b'0'), ('29', null, '礼品鲜花', null, 'admin', 'admin', '2019-10-27 13:41:57', '2019-10-27 13:42:00', b'0'), ('30', null, '宠物生活', null, 'admin', 'admin', '2019-10-27 13:43:24', '2019-10-27 13:43:29', b'0'), ('31', null, '生活旅行', null, 'admin', 'admin', '2019-10-27 13:42:06', '2019-10-27 13:42:13', b'0'), ('32', '1', '3333', null, 'admin', 'admin', '2019-10-27 14:02:03', '2020-08-16 11:03:34', b'1'), ('33', '2', 'hhh', null, 'admin', 'admin', '2020-04-19 11:34:57', '2020-08-16 11:03:32', b'1'), ('34', '32', 'hhh', null, 'admin', 'admin', '2020-04-19 11:55:07', '2020-08-16 11:03:29', b'1'), ('35', '32', 'hhh', null, 'admin', 'admin', '2020-04-19 14:43:58', '2020-08-16 11:03:27', b'1'), ('36', null, '图书文娱', null, 'admin', 'admin', '2020-08-16 12:36:02', '2020-08-16 12:36:02', b'0'), ('37', null, '艺术邮币', null, 'admin', 'admin', '2020-08-16 12:36:21', '2020-08-16 12:36:21', b'0'), ('38', null, '农资园艺', null, 'admin', 'admin', '2020-08-16 12:36:31', '2020-08-16 12:36:31', b'0'), ('39', null, '特产管', null, 'admin', 'admin', '2020-08-16 12:36:41', '2020-08-16 12:36:41', b'0'); COMMIT; -- ---------------------------- @@ -183,7 +183,7 @@ CREATE TABLE `t_goods_class_banner` ( -- Records of `t_goods_class_banner` -- ---------------------------- BEGIN; -INSERT INTO `t_goods_class_banner` VALUES ('2', '35', '11', 'admin', 'admin', '2020-04-19 15:21:16', '2020-04-19 15:49:54', b'0'), ('3', '34', '6', 'admin', 'admin', '2020-04-19 15:49:40', '2020-04-19 15:49:40', b'0'); +INSERT INTO `t_goods_class_banner` VALUES ('2', '35', '10', 'admin', 'admin', '2020-04-19 15:21:16', '2020-08-16 11:03:01', b'0'), ('3', '34', '6', 'admin', 'admin', '2020-04-19 15:49:40', '2020-04-19 15:49:40', b'0'); COMMIT; -- ---------------------------- @@ -215,7 +215,7 @@ CREATE TABLE `t_goods_property` ( -- Records of `t_goods_property` -- ---------------------------- BEGIN; -INSERT INTO `t_goods_property` VALUES ('1', '1', '白色', 'admin', 'admin', '2020-02-18 18:39:58', '2020-02-18 18:40:01', b'0'), ('2', '1', '红色', 'admin', 'admin', '2020-02-18 21:21:39', '2020-02-18 21:36:12', b'0'), ('3', '1', '灰色', 'admin', 'admin', '2020-02-18 21:30:52', '2020-02-18 21:36:00', b'0'), ('4', '1', '橙色', 'admin', 'admin', '2020-03-01 20:17:16', '2020-02-18 21:36:12', b'0'), ('5', '2', '4X4', 'admin', 'admin', '2020-04-06 18:25:37', '2020-04-06 18:29:12', b'0'), ('6', '2', '4X5', 'admin', 'admin', '2020-04-06 18:30:28', '2020-04-06 18:31:34', b'0'), ('7', '2', '4X6', 'admin', 'admin', '2020-04-06 18:31:49', '2020-04-06 18:34:57', b'0'), ('8', '2', '4X7', 'admin', 'admin', '2020-04-06 18:34:31', '2020-04-06 18:34:31', b'0'); +INSERT INTO `t_goods_property` VALUES ('1', '1', '白色', 'admin', 'admin', '2020-02-18 18:39:58', '2020-08-16 11:14:27', b'1'), ('2', '1', '红色', 'admin', 'admin', '2020-02-18 21:21:39', '2020-08-16 11:14:35', b'1'), ('3', '1', '灰色', 'admin', 'admin', '2020-02-18 21:30:52', '2020-08-16 11:14:30', b'1'), ('4', '1', '橙色', 'admin', 'admin', '2020-03-01 20:17:16', '2020-08-16 11:14:32', b'1'), ('5', '2', '4X4', 'admin', 'admin', '2020-04-06 18:25:37', '2020-08-16 11:14:37', b'1'), ('6', '2', '4X5', 'admin', 'admin', '2020-04-06 18:30:28', '2020-08-16 11:14:40', b'1'), ('7', '2', '4X6', 'admin', 'admin', '2020-04-06 18:31:49', '2020-08-16 11:14:54', b'1'), ('8', '2', '4X7', 'admin', 'admin', '2020-04-06 18:34:31', '2020-08-16 11:14:52', b'1'); COMMIT; -- ---------------------------- @@ -237,7 +237,7 @@ CREATE TABLE `t_goods_property_group` ( -- Records of `t_goods_property_group` -- ---------------------------- BEGIN; -INSERT INTO `t_goods_property_group` VALUES ('1', '颜色', 'admin', 'admin', '2020-02-18 18:56:53', '2020-02-18 21:59:46', b'0'), ('2', '规格', 'admin', 'admin', '2020-02-18 21:59:27', '2020-02-18 21:59:28', b'0'), ('3', '尺寸', 'admin', 'admin', '2020-04-06 18:36:30', '2020-04-06 18:39:38', b'0'), ('4', '内存', 'admin', 'admin', '2020-04-06 18:39:57', '2020-04-06 18:39:57', b'0'); +INSERT INTO `t_goods_property_group` VALUES ('1', '颜色', 'admin', 'admin', '2020-02-18 18:56:53', '2020-08-16 11:14:13', b'1'), ('2', '规格', 'admin', 'admin', '2020-02-18 21:59:27', '2020-08-16 11:14:07', b'1'), ('3', '尺寸', 'admin', 'admin', '2020-04-06 18:36:30', '2020-08-16 11:14:16', b'1'), ('4', '内存', 'admin', 'admin', '2020-04-06 18:39:57', '2020-08-16 11:14:18', b'1'); COMMIT; -- ---------------------------- @@ -260,13 +260,13 @@ CREATE TABLE `t_goods_sku` ( `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `delete_status` bit(1) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COMMENT='商品sku'; +) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COMMENT='商品sku'; -- ---------------------------- -- Records of `t_goods_sku` -- ---------------------------- BEGIN; -INSERT INTO `t_goods_sku` VALUES ('1', '37', 'dsds', 'SKU5eb100114ceaf071a52d35d9', '12', '212', b'0', '222', null, 'admin', 'admin', '2020-05-05 13:56:34', '2020-05-05 13:56:34', b'0'), ('2', '37', 'dsds', 'SKU5eb100134ceaf071a52d35da', '12', '212', b'0', '222', null, 'admin', 'admin', '2020-05-05 13:56:35', '2020-05-05 13:56:35', b'0'), ('3', '37', 'dsds', 'SKU5eb1001d4ceaf071a52d35db', '12', '212', b'0', '222', null, 'admin', 'admin', '2020-05-05 13:56:45', '2020-05-05 13:56:45', b'0'), ('4', '37', 'dsds', 'SKU5eb100394ceaf071a52d35dc', '12', '212', b'0', '222', null, 'admin', 'admin', '2020-05-05 13:57:13', '2020-05-05 13:57:13', b'0'), ('5', '37', 'dsds', 'SKU5eb101ac4ceaf071a52d35dd', '12', '212', b'0', '222', null, 'admin', 'admin', '2020-05-05 14:03:24', '2020-05-05 14:03:24', b'0'), ('6', '37', 'ddasd', 'SKU1257556549916823552', '22', '43', b'0', '1111', null, 'admin', 'admin', '2020-05-05 14:23:40', '2020-05-05 14:23:40', b'0'); +INSERT INTO `t_goods_sku` VALUES ('1', '37', 'dsds', 'SKU5eb100114ceaf071a52d35d9', '12', '212', b'0', '222', null, 'admin', 'admin', '2020-05-05 13:56:34', '2020-05-31 10:12:03', b'1'), ('2', '37', 'dsds', 'SKU5eb100134ceaf071a52d35da', '12', '212', b'0', '222', null, 'admin', 'admin', '2020-05-05 13:56:35', '2020-05-31 10:12:08', b'1'), ('3', '37', 'dsds', 'SKU5eb1001d4ceaf071a52d35db', '12', '212', b'0', '222', null, 'admin', 'admin', '2020-05-05 13:56:45', '2020-05-31 10:12:12', b'1'), ('4', '37', 'dsds', 'SKU5eb100394ceaf071a52d35dc', '12', '212', b'0', '222', null, 'admin', 'admin', '2020-05-05 13:57:13', '2020-05-31 10:12:15', b'1'), ('5', '37', 'dsds', 'SKU5eb101ac4ceaf071a52d35dd', '12', '212', b'0', '222', null, 'admin', 'admin', '2020-05-05 14:03:24', '2020-05-31 10:12:18', b'1'), ('6', '37', 'ddasd', 'SKU1257556549916823552', '22', '43', b'0', '1111', null, 'admin', 'admin', '2020-05-05 14:23:40', '2020-08-16 11:22:28', b'1'), ('7', '37', '生姜', 'SKU1266920087634448384', '12', '10', b'0', '100', '

很快就会看见好看好看

', 'admin', 'admin', '2020-05-31 10:31:02', '2020-08-16 11:22:26', b'1'); COMMIT; -- ---------------------------- @@ -284,13 +284,13 @@ CREATE TABLE `t_goods_sku_image` ( `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `delete_status` bit(1) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='商品主图集'; +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COMMENT='商品主图集'; -- ---------------------------- -- Records of `t_goods_sku_image` -- ---------------------------- BEGIN; -INSERT INTO `t_goods_sku_image` VALUES ('1', '37', '5', '[{\"name\":\"41f82e8b05744a6fbf20a9c008a9fd6d.jpg\",\"url\":\"http://pp7x7b2mm.bkt.clouddn.com/static/2020-05-05/41f82e8b05744a6fbf20a9c008a9fd6d.jpg\"},{\"name\":\"108cfb90f64a4267a21106d1f8053c89.jpg\",\"url\":\"http://pp7x7b2mm.bkt.clouddn.com/static/2020-05-05/108cfb90f64a4267a21106d1f8053c89.jpg\"}]', 'admin', 'admin', '2020-05-05 14:03:24', '2020-05-05 14:03:24', b'0'), ('2', '37', '6', '[{\"name\":\"328ddb5849584056b38f0c003313f152.jpg\",\"url\":\"http://pp7x7b2mm.bkt.clouddn.com/static/2020-05-05/328ddb5849584056b38f0c003313f152.jpg\"},{\"name\":\"643359975ce3484a99bcf1e077a67cd7.jpg\",\"url\":\"http://pp7x7b2mm.bkt.clouddn.com/static/2020-05-05/643359975ce3484a99bcf1e077a67cd7.jpg\"}]', 'admin', 'admin', '2020-05-05 14:23:40', '2020-05-05 14:23:40', b'0'); +INSERT INTO `t_goods_sku_image` VALUES ('1', '37', '5', '[{\"name\":\"41f82e8b05744a6fbf20a9c008a9fd6d.jpg\",\"url\":\"http://pp7x7b2mm.bkt.clouddn.com/static/2020-05-05/41f82e8b05744a6fbf20a9c008a9fd6d.jpg\"},{\"name\":\"108cfb90f64a4267a21106d1f8053c89.jpg\",\"url\":\"http://pp7x7b2mm.bkt.clouddn.com/static/2020-05-05/108cfb90f64a4267a21106d1f8053c89.jpg\"}]', 'admin', 'admin', '2020-05-05 14:03:24', '2020-05-05 14:03:24', b'0'), ('2', '37', '6', '[{\"name\":\"328ddb5849584056b38f0c003313f152.jpg\",\"url\":\"http://pp7x7b2mm.bkt.clouddn.com/static/2020-05-05/328ddb5849584056b38f0c003313f152.jpg\"},{\"name\":\"643359975ce3484a99bcf1e077a67cd7.jpg\",\"url\":\"http://pp7x7b2mm.bkt.clouddn.com/static/2020-05-05/643359975ce3484a99bcf1e077a67cd7.jpg\"}]', 'admin', 'admin', '2020-05-05 14:23:40', '2020-05-05 14:23:40', b'0'), ('3', '37', '7', '[{\"name\":\"20a950c5384e4e42acf24733f85d43f3.jpg\",\"url\":\"null/2020-05-31/20a950c5384e4e42acf24733f85d43f3.jpg\"},{\"name\":\"20a950c5384e4e42acf24733f85d43f3.jpg\",\"url\":\"static/2020-05-31/20a950c5384e4e42acf24733f85d43f3.jpg\"},{\"name\":\"8cca633b0b884faea8d6a56a3c7eeb75.jpg\",\"url\":\"static/2020-05-31/8cca633b0b884faea8d6a56a3c7eeb75.jpg\"}]', 'admin', 'admin', '2020-05-31 10:31:02', '2020-05-31 10:31:02', b'0'); COMMIT; -- ---------------------------- @@ -365,7 +365,7 @@ CREATE TABLE `t_goods_spu` ( -- Records of `t_goods_spu` -- ---------------------------- BEGIN; -INSERT INTO `t_goods_spu` VALUES ('1', '1', '水果', null, '1', 'admin', 'admin', '2020-02-17 15:21:51', '2020-02-18 23:01:02', b'0'), ('2', '3', '蔬菜', null, '2', 'admin', 'admin', '2020-04-05 20:16:15', '2020-04-05 20:16:14', b'0'); +INSERT INTO `t_goods_spu` VALUES ('1', '1', '水果', null, '1', 'admin', 'admin', '2020-02-17 15:21:51', '2020-05-31 10:10:57', b'1'), ('2', '3', '蔬菜', null, '2', 'admin', 'admin', '2020-04-05 20:16:15', '2020-08-16 11:20:27', b'1'); COMMIT; SET FOREIGN_KEY_CHECKS = 1; diff --git a/doc/base/pager_job.sql b/doc/base/pager_job.sql index 398f35f..4e4059c 100644 --- a/doc/base/pager_job.sql +++ b/doc/base/pager_job.sql @@ -1,17 +1,17 @@ /* Navicat Premium Data Transfer - Source Server : dev + Source Server : prod Source Server Type : MySQL - Source Server Version : 50724 - Source Host : localhost + Source Server Version : 50646 + Source Host : 101.132.121.178 Source Database : pager_job Target Server Type : MySQL - Target Server Version : 50724 + Target Server Version : 50646 File Encoding : utf-8 - Date: 06/27/2020 16:09:44 PM + Date: 09/04/2020 15:27:59 PM */ SET NAMES utf8; @@ -28,7 +28,7 @@ CREATE TABLE `QUARTZ_BLOB_TRIGGERS` ( `BLOB_DATA` blob, PRIMARY KEY (`SCHED_NAME`,`TRIGGER_NAME`,`TRIGGER_GROUP`), CONSTRAINT `quartz_blob_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `XXL_JOB_QRTZ_TRIGGERS` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Table structure for `QUARTZ_CALENDARS` @@ -39,7 +39,7 @@ CREATE TABLE `QUARTZ_CALENDARS` ( `CALENDAR_NAME` varchar(200) COLLATE utf8_bin NOT NULL, `CALENDAR` blob NOT NULL, PRIMARY KEY (`SCHED_NAME`,`CALENDAR_NAME`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Table structure for `QUARTZ_CRON_TRIGGERS` @@ -53,7 +53,7 @@ CREATE TABLE `QUARTZ_CRON_TRIGGERS` ( `TIME_ZONE_ID` varchar(80) DEFAULT NULL, PRIMARY KEY (`SCHED_NAME`,`TRIGGER_NAME`,`TRIGGER_GROUP`), CONSTRAINT `quartz_cron_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `XXL_JOB_QRTZ_TRIGGERS` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Table structure for `QUARTZ_FIRED_TRIGGERS` @@ -80,7 +80,7 @@ CREATE TABLE `QUARTZ_FIRED_TRIGGERS` ( KEY `IDX_QUARTZ_FT_JG` (`SCHED_NAME`,`JOB_GROUP`), KEY `IDX_QUARTZ_FT_T_G` (`SCHED_NAME`,`TRIGGER_NAME`,`TRIGGER_GROUP`), KEY `IDX_QUARTZ_FT_TG` (`SCHED_NAME`,`TRIGGER_GROUP`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Table structure for `QUARTZ_JOB_DETAILS` @@ -100,7 +100,7 @@ CREATE TABLE `QUARTZ_JOB_DETAILS` ( PRIMARY KEY (`SCHED_NAME`,`JOB_NAME`,`JOB_GROUP`), KEY `IDX_QUARTZ_J_REQ_RECOVERY` (`SCHED_NAME`,`REQUESTS_RECOVERY`), KEY `IDX_QUARTZ_J_GRP` (`SCHED_NAME`,`JOB_GROUP`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Table structure for `QUARTZ_JOB_GROUP` @@ -111,7 +111,7 @@ CREATE TABLE `QUARTZ_JOB_GROUP` ( `group_name` varchar(255) DEFAULT NULL, `sequence` int(11) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of `QUARTZ_JOB_GROUP` @@ -139,7 +139,7 @@ CREATE TABLE `QUARTZ_JOB_INFO` ( `create_time` datetime DEFAULT NULL, `update_user` varchar(63) COLLATE utf8_bin DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of `QUARTZ_JOB_INFO` @@ -167,7 +167,7 @@ CREATE TABLE `QUARTZ_JOB_LOG` ( `handle_msg` varchar(255) DEFAULT NULL, `alarm_status` int(11) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=4694 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=4694 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of `QUARTZ_JOB_LOG` @@ -192,7 +192,7 @@ CREATE TABLE `QUARTZ_LOCKS` ( `SCHED_NAME` varchar(120) COLLATE utf8_bin NOT NULL, `LOCK_NAME` varchar(40) COLLATE utf8_bin NOT NULL, PRIMARY KEY (`SCHED_NAME`,`LOCK_NAME`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Table structure for `QUARTZ_PAUSED_TRIGGER_GRPS` @@ -202,7 +202,7 @@ CREATE TABLE `QUARTZ_PAUSED_TRIGGER_GRPS` ( `SCHED_NAME` varchar(120) COLLATE utf8_bin NOT NULL, `TRIGGER_GROUP` varchar(200) COLLATE utf8_bin NOT NULL, PRIMARY KEY (`SCHED_NAME`,`TRIGGER_GROUP`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Table structure for `QUARTZ_SCHEDULER_STATE` @@ -214,7 +214,7 @@ CREATE TABLE `QUARTZ_SCHEDULER_STATE` ( `LAST_CHECKIN_TIME` bigint(13) NOT NULL, `CHECKIN_INTERVAL` bigint(13) NOT NULL, PRIMARY KEY (`SCHED_NAME`,`INSTANCE_NAME`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Table structure for `QUARTZ_SIMPLE_TRIGGERS` @@ -229,7 +229,7 @@ CREATE TABLE `QUARTZ_SIMPLE_TRIGGERS` ( `TIMES_TRIGGERED` bigint(10) NOT NULL, PRIMARY KEY (`SCHED_NAME`,`TRIGGER_NAME`,`TRIGGER_GROUP`), CONSTRAINT `quartz_simple_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `XXL_JOB_QRTZ_TRIGGERS` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Table structure for `QUARTZ_SIMPROP_TRIGGERS` @@ -252,7 +252,7 @@ CREATE TABLE `QUARTZ_SIMPROP_TRIGGERS` ( `BOOL_PROP_2` varchar(1) DEFAULT NULL, PRIMARY KEY (`SCHED_NAME`,`TRIGGER_NAME`,`TRIGGER_GROUP`), CONSTRAINT `quartz_simprop_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `XXL_JOB_QRTZ_TRIGGERS` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Table structure for `QUARTZ_TRIGGERS` @@ -289,7 +289,7 @@ CREATE TABLE `QUARTZ_TRIGGERS` ( KEY `IDX_QUARTZ_T_NFT_ST_MISFIRE` (`SCHED_NAME`,`MISFIRE_INSTR`,`NEXT_FIRE_TIME`,`TRIGGER_STATE`), KEY `IDX_QUARTZ_T_NFT_ST_MISFIRE_GRP` (`SCHED_NAME`,`MISFIRE_INSTR`,`NEXT_FIRE_TIME`,`TRIGGER_GROUP`,`TRIGGER_STATE`), CONSTRAINT `QUARTZ_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) REFERENCES `quartz_job_details` (`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Table structure for `QUARTZ_TRIGGER_GROUP` @@ -303,7 +303,7 @@ CREATE TABLE `QUARTZ_TRIGGER_GROUP` ( `address_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '执行器地址类型：0=自动注册、1=手动录入', `address_list` varchar(512) DEFAULT NULL COMMENT '执行器地址列表，多地址逗号分隔', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Table structure for `QUARTZ_TRIGGER_INFO` @@ -330,7 +330,7 @@ CREATE TABLE `QUARTZ_TRIGGER_INFO` ( `glue_updatetime` datetime DEFAULT NULL COMMENT 'GLUE更新时间', `child_jobid` varchar(255) DEFAULT NULL COMMENT '子任务ID，多个逗号分隔', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Table structure for `QUARTZ_TRIGGER_LOG` @@ -355,7 +355,7 @@ CREATE TABLE `QUARTZ_TRIGGER_LOG` ( PRIMARY KEY (`id`), KEY `I_trigger_time` (`trigger_time`), KEY `I_handle_code` (`handle_code`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Table structure for `QUARTZ_TRIGGER_LOGGLUE` @@ -370,7 +370,7 @@ CREATE TABLE `QUARTZ_TRIGGER_LOGGLUE` ( `add_time` timestamp NULL DEFAULT NULL, `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Table structure for `QUARTZ_TRIGGER_REGISTRY` @@ -383,6 +383,6 @@ CREATE TABLE `QUARTZ_TRIGGER_REGISTRY` ( `registry_value` varchar(255) NOT NULL, `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; SET FOREIGN_KEY_CHECKS = 1; diff --git a/doc/base/pager_order.sql b/doc/base/pager_order.sql index c8a357b..32aea33 100644 --- a/doc/base/pager_order.sql +++ b/doc/base/pager_order.sql @@ -1,17 +1,17 @@ /* Navicat Premium Data Transfer - Source Server : dev + Source Server : prod Source Server Type : MySQL - Source Server Version : 50724 - Source Host : localhost + Source Server Version : 50646 + Source Host : 101.132.121.178 Source Database : pager_order Target Server Type : MySQL - Target Server Version : 50724 + Target Server Version : 50646 File Encoding : utf-8 - Date: 12/22/2019 15:54:03 PM + Date: 09/04/2020 15:28:10 PM */ SET NAMES utf8; @@ -23,16 +23,17 @@ SET FOREIGN_KEY_CHECKS = 0; DROP TABLE IF EXISTS `t_order_item`; CREATE TABLE `t_order_item` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, + `user_id` bigint(20) DEFAULT NULL COMMENT '用户主键', + `seller_id` bigint(20) DEFAULT NULL COMMENT 't_seller 商户主键', `user_order_id` bigint(20) DEFAULT NULL COMMENT 't_user_order 主键', `seller_order_id` bigint(20) DEFAULT NULL COMMENT 't_seller_order 商户主订单主键', `goods_sku_id` bigint(20) DEFAULT NULL COMMENT 't_goods_sku 主键', - `seller_id` bigint(20) DEFAULT NULL COMMENT 't_seller 商户主键', `purchase_amount` decimal(10,0) DEFAULT NULL COMMENT '购买商品时的价格', - `purchase_count` int(11) DEFAULT NULL COMMENT '购买商品数量', + `purchase_quantity` int(11) DEFAULT NULL COMMENT '购买商品数量', `create_user` varchar(63) DEFAULT NULL, `update_user` varchar(63) DEFAULT NULL, - `create_time` datetime DEFAULT NULL, - `update_time` datetime DEFAULT NULL, + `create_time` datetime NOT NULL, + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `delete_status` bit(1) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='订单明细表'; @@ -47,13 +48,15 @@ CREATE TABLE `t_seller_order` ( `coupon_id` bigint(20) DEFAULT NULL COMMENT 't_discount_coupon 优惠券主键 只有商户型优惠券与折扣券才会有值', `delivery_address_id` bigint(20) DEFAULT NULL COMMENT '配送地址', `order_amount` decimal(10,2) DEFAULT NULL COMMENT '支付给商户的金额', - `discount_amount` decimal(10,0) DEFAULT NULL COMMENT '折扣价格', + `discount_amount` decimal(10,2) DEFAULT NULL COMMENT '折扣价格', + `order_type` int(11) DEFAULT NULL COMMENT '订单类型', + `pay_type` int(11) DEFAULT NULL COMMENT '支付方式', `order_code` varchar(127) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '商户订单号', `order_status` varchar(11) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '商户订单状态', `create_user` varchar(63) COLLATE utf8mb4_bin DEFAULT NULL, `update_user` varchar(63) COLLATE utf8mb4_bin DEFAULT NULL, - `create_time` timestamp NULL DEFAULT NULL COMMENT '下单时间', - `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '下单时间', + `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', `delete_status` bit(1) DEFAULT NULL COMMENT '逻辑删除标志', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='商户主订单表'; @@ -70,8 +73,8 @@ CREATE TABLE `t_seller_order_flow` ( `discount_amount` decimal(10,0) DEFAULT NULL COMMENT '优惠减免金额', `create_user` varchar(63) DEFAULT NULL, `update_user` varchar(63) DEFAULT NULL, - `create_time` datetime DEFAULT NULL, - `update_time` datetime DEFAULT NULL, + `create_time` datetime NOT NULL, + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `delete_status` bit(1) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; @@ -96,8 +99,8 @@ CREATE TABLE `t_user_order` ( `self` tinyint(1) DEFAULT NULL COMMENT '是否自提 1:自提 0:否', `create_user` varchar(63) COLLATE utf8mb4_bin DEFAULT NULL, `update_user` varchar(63) COLLATE utf8mb4_bin DEFAULT NULL, - `create_time` timestamp NULL DEFAULT NULL, - `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `delete_status` bit(1) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='用户订单主表'; @@ -123,8 +126,8 @@ CREATE TABLE `t_user_order_flow` ( `discount_amount` decimal(10,0) DEFAULT NULL COMMENT '优惠减免金额', `create_user` varchar(63) DEFAULT NULL, `update_user` varchar(63) DEFAULT NULL, - `create_time` datetime DEFAULT NULL, - `update_time` datetime DEFAULT NULL, + `create_time` datetime NOT NULL, + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `delete_status` bit(1) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; diff --git a/doc/base/pager_platform.sql b/doc/base/pager_platform.sql index 0fbb8e5..745e93a 100644 --- a/doc/base/pager_platform.sql +++ b/doc/base/pager_platform.sql @@ -1,17 +1,17 @@ /* Navicat Premium Data Transfer - Source Server : dev + Source Server : prod Source Server Type : MySQL - Source Server Version : 50724 - Source Host : localhost + Source Server Version : 50646 + Source Host : 101.132.121.178 Source Database : pager_platform Target Server Type : MySQL - Target Server Version : 50724 + Target Server Version : 50646 File Encoding : utf-8 - Date: 02/07/2020 19:59:31 PM + Date: 09/04/2020 15:28:20 PM */ SET NAMES utf8; @@ -57,14 +57,6 @@ CREATE TABLE `t_area` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; --- ---------------------------- --- Records of `t_area` --- ---------------------------- -BEGIN; -INSERT INTO `t_area` VALUES ('1', '110101', '东城区', '110100'), ('2', '110102', '西城区', '110100'), ('3', '110103', '崇文区', '110100'), ('4', '110104', '宣武区', '110100'), ('5', '110105', '朝阳区', '110100'), ('6', '110106', '丰台区', '110100'), ('7', '110107', '石景山区', '110100'), ('8', '110108', '海淀区', '110100'), ('9', '110109', '门头沟区', '110100'), ('10', '110111', '房山区', '110100'), ('11', '110112', '通州区', '110100'), ('12', '110113', '顺义区', '110100'), ('13', '110114', '昌平区', '110100'), ('14', '110115', '大兴区', '110100'), ('15', '110116', '怀柔区', '110100'), ('16', '110117', '平谷区', '110100'), ('17', '110228', '密云县', '110200'), ('18', '110229', '延庆县', '110200'), ('19', '120101', '和平区', '120100'), ('20', '120102', '河东区', '120100'), ('21', '120103', '河西区', '120100'), ('22', '120104', '南开区', '120100'), ('23', '120105', '河北区', '120100'), ('24', '120106', '红桥区', '120100'), ('25', '120107', '塘沽区', '120100'), ('26', '120108', '汉沽区', '120100'), ('27', '120109', '大港区', '120100'), ('28', '120110', '东丽区', '120100'), ('29', '120111', '西青区', '120100'), ('30', '120112', '津南区', '120100'), ('31', '120113', '北辰区', '120100'), ('32', '120114', '武清区', '120100'), ('33', '120115', '宝坻区', '120100'), ('34', '120221', '宁河县', '120200'), ('35', '120223', '静海县', '120200'), ('36', '120225', '蓟　县', '120200'), ('37', '130101', '市辖区', '130100'), ('38', '130102', '长安区', '130100'), ('39', '130103', '桥东区', '130100'), ('40', '130104', '桥西区', '130100'), ('41', '130105', '新华区', '130100'), ('42', '130107', '井陉矿区', '130100'), ('43', '130108', '裕华区', '130100'), ('44', '130121', '井陉县', '130100'), ('45', '130123', '正定县', '130100'), ('46', '130124', '栾城县', '130100'), ('47', '130125', '行唐县', '130100'), ('48', '130126', '灵寿县', '130100'), ('49', '130127', '高邑县', '130100'), ('50', '130128', '深泽县', '130100'), ('51', '130129', '赞皇县', '130100'), ('52', '130130', '无极县', '130100'), ('53', '130131', '平山县', '130100'), ('54', '130132', '元氏县', '130100'), ('55', '130133', '赵　县', '130100'), ('56', '130181', '辛集市', '130100'), ('57', '130182', '藁城市', '130100'), ('58', '130183', '晋州市', '130100'), ('59', '130184', '新乐市', '130100'), ('60', '130185', '鹿泉市', '130100'), ('61', '130201', '市辖区', '130200'), ('62', '130202', '路南区', '130200'), ('63', '130203', '路北区', '130200'), ('64', '130204', '古冶区', '130200'), ('65', '130205', '开平区', '130200'), ('66', '130207', '丰南区', '130200'), ('67', '130208', '丰润区', '130200'), ('68', '130223', '滦　县', '130200'), ('69', '130224', '滦南县', '130200'), ('70', '130225', '乐亭县', '130200'), ('71', '130227', '迁西县', '130200'), ('72', '130229', '玉田县', '130200'), ('73', '130230', '唐海县', '130200'), ('74', '130281', '遵化市', '130200'), ('75', '130283', '迁安市', '130200'), ('76', '130301', '市辖区', '130300'), ('77', '130302', '海港区', '130300'), ('78', '130303', '山海关区', '130300'), ('79', '130304', '北戴河区', '130300'), ('80', '130321', '青龙满族自治县', '130300'), ('81', '130322', '昌黎县', '130300'), ('82', '130323', '抚宁县', '130300'), ('83', '130324', '卢龙县', '130300'), ('84', '130401', '市辖区', '130400'), ('85', '130402', '邯山区', '130400'), ('86', '130403', '丛台区', '130400'), ('87', '130404', '复兴区', '130400'), ('88', '130406', '峰峰矿区', '130400'), ('89', '130421', '邯郸县', '130400'), ('90', '130423', '临漳县', '130400'), ('91', '130424', '成安县', '130400'), ('92', '130425', '大名县', '130400'), ('93', '130426', '涉　县', '130400'), ('94', '130427', '磁　县', '130400'), ('95', '130428', '肥乡县', '130400'), ('96', '130429', '永年县', '130400'), ('97', '130430', '邱　县', '130400'), ('98', '130431', '鸡泽县', '130400'), ('99', '130432', '广平县', '130400'), ('100', '130433', '馆陶县', '130400'), ('101', '130434', '魏　县', '130400'), ('102', '130435', '曲周县', '130400'), ('103', '130481', '武安市', '130400'), ('104', '130501', '市辖区', '130500'), ('105', '130502', '桥东区', '130500'), ('106', '130503', '桥西区', '130500'), ('107', '130521', '邢台县', '130500'), ('108', '130522', '临城县', '130500'), ('109', '130523', '内丘县', '130500'), ('110', '130524', '柏乡县', '130500'), ('111', '130525', '隆尧县', '130500'), ('112', '130526', '任　县', '130500'), ('113', '130527', '南和县', '130500'), ('114', '130528', '宁晋县', '130500'), ('115', '130529', '巨鹿县', '130500'), ('116', '130530', '新河县', '130500'), ('117', '130531', '广宗县', '130500'), ('118', '130532', '平乡县', '130500'), ('119', '130533', '威　县', '130500'), ('120', '130534', '清河县', '130500'), ('121', '130535', '临西县', '130500'), ('122', '130581', '南宫市', '130500'), ('123', '130582', '沙河市', '130500'), ('124', '130601', '市辖区', '130600'), ('125', '130602', '新市区', '130600'), ('126', '130603', '北市区', '130600'), ('127', '130604', '南市区', '130600'), ('128', '130621', '满城县', '130600'), ('129', '130622', '清苑县', '130600'), ('130', '130623', '涞水县', '130600'), ('131', '130624', '阜平县', '130600'), ('132', '130625', '徐水县', '130600'), ('133', '130626', '定兴县', '130600'), ('134', '130627', '唐　县', '130600'), ('135', '130628', '高阳县', '130600'), ('136', '130629', '容城县', '130600'), ('137', '130630', '涞源县', '130600'), ('138', '130631', '望都县', '130600'), ('139', '130632', '安新县', '130600'), ('140', '130633', '易　县', '130600'), ('141', '130634', '曲阳县', '130600'), ('142', '130635', '蠡　县', '130600'), ('143', '130636', '顺平县', '130600'), ('144', '130637', '博野县', '130600'), ('145', '130638', '雄　县', '130600'), ('146', '130681', '涿州市', '130600'), ('147', '130682', '定州市', '130600'), ('148', '130683', '安国市', '130600'), ('149', '130684', '高碑店市', '130600'), ('150', '130701', '市辖区', '130700'), ('151', '130702', '桥东区', '130700'), ('152', '130703', '桥西区', '130700'), ('153', '130705', '宣化区', '130700'), ('154', '130706', '下花园区', '130700'), ('155', '130721', '宣化县', '130700'), ('156', '130722', '张北县', '130700'), ('157', '130723', '康保县', '130700'), ('158', '130724', '沽源县', '130700'), ('159', '130725', '尚义县', '130700'), ('160', '130726', '蔚　县', '130700'), ('161', '130727', '阳原县', '130700'), ('162', '130728', '怀安县', '130700'), ('163', '130729', '万全县', '130700'), ('164', '130730', '怀来县', '130700'), ('165', '130731', '涿鹿县', '130700'), ('166', '130732', '赤城县', '130700'), ('167', '130733', '崇礼县', '130700'), ('168', '130801', '市辖区', '130800'), ('169', '130802', '双桥区', '130800'), ('170', '130803', '双滦区', '130800'), ('171', '130804', '鹰手营子矿区', '130800'), ('172', '130821', '承德县', '130800'), ('173', '130822', '兴隆县', '130800'), ('174', '130823', '平泉县', '130800'), ('175', '130824', '滦平县', '130800'), ('176', '130825', '隆化县', '130800'), ('177', '130826', '丰宁满族自治县', '130800'), ('178', '130827', '宽城满族自治县', '130800'), ('179', '130828', '围场满族蒙古族自治县', '130800'), ('180', '130901', '市辖区', '130900'), ('181', '130902', '新华区', '130900'), ('182', '130903', '运河区', '130900'), ('183', '130921', '沧　县', '130900'), ('184', '130922', '青　县', '130900'), ('185', '130923', '东光县', '130900'), ('186', '130924', '海兴县', '130900'), ('187', '130925', '盐山县', '130900'), ('188', '130926', '肃宁县', '130900'), ('189', '130927', '南皮县', '130900'), ('190', '130928', '吴桥县', '130900'), ('191', '130929', '献　县', '130900'), ('192', '130930', '孟村回族自治县', '130900'), ('193', '130981', '泊头市', '130900'), ('194', '130982', '任丘市', '130900'), ('195', '130983', '黄骅市', '130900'), ('196', '130984', '河间市', '130900'), ('197', '131001', '市辖区', '131000'), ('198', '131002', '安次区', '131000'), ('199', '131003', '广阳区', '131000'), ('200', '131022', '固安县', '131000'), ('201', '131023', '永清县', '131000'), ('202', '131024', '香河县', '131000'), ('203', '131025', '大城县', '131000'), ('204', '131026', '文安县', '131000'), ('205', '131028', '大厂回族自治县', '131000'), ('206', '131081', '霸州市', '131000'), ('207', '131082', '三河市', '131000'), ('208', '131101', '市辖区', '131100'), ('209', '131102', '桃城区', '131100'), ('210', '131121', '枣强县', '131100'), ('211', '131122', '武邑县', '131100'), ('212', '131123', '武强县', '131100'), ('213', '131124', '饶阳县', '131100'), ('214', '131125', '安平县', '131100'), ('215', '131126', '故城县', '131100'), ('216', '131127', '景　县', '131100'), ('217', '131128', '阜城县', '131100'), ('218', '131181', '冀州市', '131100'), ('219', '131182', '深州市', '131100'), ('220', '140101', '市辖区', '140100'), ('221', '140105', '小店区', '140100'), ('222', '140106', '迎泽区', '140100'), ('223', '140107', '杏花岭区', '140100'), ('224', '140108', '尖草坪区', '140100'), ('225', '140109', '万柏林区', '140100'), ('226', '140110', '晋源区', '140100'), ('227', '140121', '清徐县', '140100'), ('228', '140122', '阳曲县', '140100'), ('229', '140123', '娄烦县', '140100'), ('230', '140181', '古交市', '140100'), ('231', '140201', '市辖区', '140200'), ('232', '140202', '城　区', '140200'), ('233', '140203', '矿　区', '140200'), ('234', '140211', '南郊区', '140200'), ('235', '140212', '新荣区', '140200'), ('236', '140221', '阳高县', '140200'), ('237', '140222', '天镇县', '140200'), ('238', '140223', '广灵县', '140200'), ('239', '140224', '灵丘县', '140200'), ('240', '140225', '浑源县', '140200'), ('241', '140226', '左云县', '140200'), ('242', '140227', '大同县', '140200'), ('243', '140301', '市辖区', '140300'), ('244', '140302', '城　区', '140300'), ('245', '140303', '矿　区', '140300'), ('246', '140311', '郊　区', '140300'), ('247', '140321', '平定县', '140300'), ('248', '140322', '盂　县', '140300'), ('249', '140401', '市辖区', '140400'), ('250', '140402', '城　区', '140400'), ('251', '140411', '郊　区', '140400'), ('252', '140421', '长治县', '140400'), ('253', '140423', '襄垣县', '140400'), ('254', '140424', '屯留县', '140400'), ('255', '140425', '平顺县', '140400'), ('256', '140426', '黎城县', '140400'), ('257', '140427', '壶关县', '140400'), ('258', '140428', '长子县', '140400'), ('259', '140429', '武乡县', '140400'), ('260', '140430', '沁　县', '140400'), ('261', '140431', '沁源县', '140400'), ('262', '140481', '潞城市', '140400'), ('263', '140501', '市辖区', '140500'), ('264', '140502', '城　区', '140500'), ('265', '140521', '沁水县', '140500'), ('266', '140522', '阳城县', '140500'), ('267', '140524', '陵川县', '140500'), ('268', '140525', '泽州县', '140500'), ('269', '140581', '高平市', '140500'), ('270', '140601', '市辖区', '140600'), ('271', '140602', '朔城区', '140600'), ('272', '140603', '平鲁区', '140600'), ('273', '140621', '山阴县', '140600'), ('274', '140622', '应　县', '140600'), ('275', '140623', '右玉县', '140600'), ('276', '140624', '怀仁县', '140600'), ('277', '140701', '市辖区', '140700'), ('278', '140702', '榆次区', '140700'), ('279', '140721', '榆社县', '140700'), ('280', '140722', '左权县', '140700'), ('281', '140723', '和顺县', '140700'), ('282', '140724', '昔阳县', '140700'), ('283', '140725', '寿阳县', '140700'), ('284', '140726', '太谷县', '140700'), ('285', '140727', '祁　县', '140700'), ('286', '140728', '平遥县', '140700'), ('287', '140729', '灵石县', '140700'), ('288', '140781', '介休市', '140700'), ('289', '140801', '市辖区', '140800'), ('290', '140802', '盐湖区', '140800'), ('291', '140821', '临猗县', '140800'), ('292', '140822', '万荣县', '140800'), ('293', '140823', '闻喜县', '140800'), ('294', '140824', '稷山县', '140800'), ('295', '140825', '新绛县', '140800'), ('296', '140826', '绛　县', '140800'), ('297', '140827', '垣曲县', '140800'), ('298', '140828', '夏　县', '140800'), ('299', '140829', '平陆县', '140800'), ('300', '140830', '芮城县', '140800'), ('301', '140881', '永济市', '140800'), ('302', '140882', '河津市', '140800'), ('303', '140901', '市辖区', '140900'), ('304', '140902', '忻府区', '140900'), ('305', '140921', '定襄县', '140900'), ('306', '140922', '五台县', '140900'), ('307', '140923', '代　县', '140900'), ('308', '140924', '繁峙县', '140900'), ('309', '140925', '宁武县', '140900'), ('310', '140926', '静乐县', '140900'), ('311', '140927', '神池县', '140900'), ('312', '140928', '五寨县', '140900'), ('313', '140929', '岢岚县', '140900'), ('314', '140930', '河曲县', '140900'), ('315', '140931', '保德县', '140900'), ('316', '140932', '偏关县', '140900'), ('317', '140981', '原平市', '140900'), ('318', '141001', '市辖区', '141000'), ('319', '141002', '尧都区', '141000'), ('320', '141021', '曲沃县', '141000'), ('321', '141022', '翼城县', '141000'), ('322', '141023', '襄汾县', '141000'), ('323', '141024', '洪洞县', '141000'), ('324', '141025', '古　县', '141000'), ('325', '141026', '安泽县', '141000'), ('326', '141027', '浮山县', '141000'), ('327', '141028', '吉　县', '141000'), ('328', '141029', '乡宁县', '141000'), ('329', '141030', '大宁县', '141000'), ('330', '141031', '隰　县', '141000'), ('331', '141032', '永和县', '141000'), ('332', '141033', '蒲　县', '141000'), ('333', '141034', '汾西县', '141000'), ('334', '141081', '侯马市', '141000'), ('335', '141082', '霍州市', '141000'), ('336', '141101', '市辖区', '141100'), ('337', '141102', '离石区', '141100'), ('338', '141121', '文水县', '141100'), ('339', '141122', '交城县', '141100'), ('340', '141123', '兴　县', '141100'), ('341', '141124', '临　县', '141100'), ('342', '141125', '柳林县', '141100'), ('343', '141126', '石楼县', '141100'), ('344', '141127', '岚　县', '141100'), ('345', '141128', '方山县', '141100'), ('346', '141129', '中阳县', '141100'), ('347', '141130', '交口县', '141100'), ('348', '141181', '孝义市', '141100'), ('349', '141182', '汾阳市', '141100'), ('350', '150101', '市辖区', '150100'), ('351', '150102', '新城区', '150100'), ('352', '150103', '回民区', '150100'), ('353', '150104', '玉泉区', '150100'), ('354', '150105', '赛罕区', '150100'), ('355', '150121', '土默特左旗', '150100'), ('356', '150122', '托克托县', '150100'), ('357', '150123', '和林格尔县', '150100'), ('358', '150124', '清水河县', '150100'), ('359', '150125', '武川县', '150100'), ('360', '150201', '市辖区', '150200'), ('361', '150202', '东河区', '150200'), ('362', '150203', '昆都仑区', '150200'), ('363', '150204', '青山区', '150200'), ('364', '150205', '石拐区', '150200'), ('365', '150206', '白云矿区', '150200'), ('366', '150207', '九原区', '150200'), ('367', '150221', '土默特右旗', '150200'), ('368', '150222', '固阳县', '150200'), ('369', '150223', '达尔罕茂明安联合旗', '150200'), ('370', '150301', '市辖区', '150300'), ('371', '150302', '海勃湾区', '150300'), ('372', '150303', '海南区', '150300'), ('373', '150304', '乌达区', '150300'), ('374', '150401', '市辖区', '150400'), ('375', '150402', '红山区', '150400'), ('376', '150403', '元宝山区', '150400'), ('377', '150404', '松山区', '150400'), ('378', '150421', '阿鲁科尔沁旗', '150400'), ('379', '150422', '巴林左旗', '150400'), ('380', '150423', '巴林右旗', '150400'), ('381', '150424', '林西县', '150400'), ('382', '150425', '克什克腾旗', '150400'), ('383', '150426', '翁牛特旗', '150400'), ('384', '150428', '喀喇沁旗', '150400'), ('385', '150429', '宁城县', '150400'), ('386', '150430', '敖汉旗', '150400'), ('387', '150501', '市辖区', '150500'), ('388', '150502', '科尔沁区', '150500'), ('389', '150521', '科尔沁左翼中旗', '150500'), ('390', '150522', '科尔沁左翼后旗', '150500'), ('391', '150523', '开鲁县', '150500'), ('392', '150524', '库伦旗', '150500'), ('393', '150525', '奈曼旗', '150500'), ('394', '150526', '扎鲁特旗', '150500'), ('395', '150581', '霍林郭勒市', '150500'), ('396', '150602', '东胜区', '150600'), ('397', '150621', '达拉特旗', '150600'), ('398', '150622', '准格尔旗', '150600'), ('399', '150623', '鄂托克前旗', '150600'), ('400', '150624', '鄂托克旗', '150600'), ('401', '150625', '杭锦旗', '150600'), ('402', '150626', '乌审旗', '150600'), ('403', '150627', '伊金霍洛旗', '150600'), ('404', '150701', '市辖区', '150700'), ('405', '150702', '海拉尔区', '150700'), ('406', '150721', '阿荣旗', '150700'), ('407', '150722', '莫力达瓦达斡尔族自治旗', '150700'), ('408', '150723', '鄂伦春自治旗', '150700'), ('409', '150724', '鄂温克族自治旗', '150700'), ('410', '150725', '陈巴尔虎旗', '150700'), ('411', '150726', '新巴尔虎左旗', '150700'), ('412', '150727', '新巴尔虎右旗', '150700'), ('413', '150781', '满洲里市', '150700'), ('414', '150782', '牙克石市', '150700'), ('415', '150783', '扎兰屯市', '150700'), ('416', '150784', '额尔古纳市', '150700'), ('417', '150785', '根河市', '150700'), ('418', '150801', '市辖区', '150800'), ('419', '150802', '临河区', '150800'), ('420', '150821', '五原县', '150800'), ('421', '150822', '磴口县', '150800'), ('422', '150823', '乌拉特前旗', '150800'), ('423', '150824', '乌拉特中旗', '150800'), ('424', '150825', '乌拉特后旗', '150800'), ('425', '150826', '杭锦后旗', '150800'), ('426', '150901', '市辖区', '150900'), ('427', '150902', '集宁区', '150900'), ('428', '150921', '卓资县', '150900'), ('429', '150922', '化德县', '150900'), ('430', '150923', '商都县', '150900'), ('431', '150924', '兴和县', '150900'), ('432', '150925', '凉城县', '150900'), ('433', '150926', '察哈尔右翼前旗', '150900'), ('434', '150927', '察哈尔右翼中旗', '150900'), ('435', '150928', '察哈尔右翼后旗', '150900'), ('436', '150929', '四子王旗', '150900'), ('437', '150981', '丰镇市', '150900'), ('438', '152201', '乌兰浩特市', '152200'), ('439', '152202', '阿尔山市', '152200'), ('440', '152221', '科尔沁右翼前旗', '152200'), ('441', '152222', '科尔沁右翼中旗', '152200'), ('442', '152223', '扎赉特旗', '152200'), ('443', '152224', '突泉县', '152200'), ('444', '152501', '二连浩特市', '152500'), ('445', '152502', '锡林浩特市', '152500'), ('446', '152522', '阿巴嘎旗', '152500'), ('447', '152523', '苏尼特左旗', '152500'), ('448', '152524', '苏尼特右旗', '152500'), ('449', '152525', '东乌珠穆沁旗', '152500'), ('450', '152526', '西乌珠穆沁旗', '152500'), ('451', '152527', '太仆寺旗', '152500'), ('452', '152528', '镶黄旗', '152500'), ('453', '152529', '正镶白旗', '152500'), ('454', '152530', '正蓝旗', '152500'), ('455', '152531', '多伦县', '152500'), ('456', '152921', '阿拉善左旗', '152900'), ('457', '152922', '阿拉善右旗', '152900'), ('458', '152923', '额济纳旗', '152900'), ('459', '210101', '市辖区', '210100'), ('460', '210102', '和平区', '210100'), ('461', '210103', '沈河区', '210100'), ('462', '210104', '大东区', '210100'), ('463', '210105', '皇姑区', '210100'), ('464', '210106', '铁西区', '210100'), ('465', '210111', '苏家屯区', '210100'), ('466', '210112', '东陵区', '210100'), ('467', '210113', '新城子区', '210100'), ('468', '210114', '于洪区', '210100'), ('469', '210122', '辽中县', '210100'), ('470', '210123', '康平县', '210100'), ('471', '210124', '法库县', '210100'), ('472', '210181', '新民市', '210100'), ('473', '210201', '市辖区', '210200'), ('474', '210202', '中山区', '210200'), ('475', '210203', '西岗区', '210200'), ('476', '210204', '沙河口区', '210200'), ('477', '210211', '甘井子区', '210200'), ('478', '210212', '旅顺口区', '210200'), ('479', '210213', '金州区', '210200'), ('480', '210224', '长海县', '210200'), ('481', '210281', '瓦房店市', '210200'), ('482', '210282', '普兰店市', '210200'), ('483', '210283', '庄河市', '210200'), ('484', '210301', '市辖区', '210300'), ('485', '210302', '铁东区', '210300'), ('486', '210303', '铁西区', '210300'), ('487', '210304', '立山区', '210300'), ('488', '210311', '千山区', '210300'), ('489', '210321', '台安县', '210300'), ('490', '210323', '岫岩满族自治县', '210300'), ('491', '210381', '海城市', '210300'), ('492', '210401', '市辖区', '210400'), ('493', '210402', '新抚区', '210400'), ('494', '210403', '东洲区', '210400'), ('495', '210404', '望花区', '210400'), ('496', '210411', '顺城区', '210400'), ('497', '210421', '抚顺县', '210400'), ('498', '210422', '新宾满族自治县', '210400'), ('499', '210423', '清原满族自治县', '210400'), ('500', '210501', '市辖区', '210500'), ('501', '210502', '平山区', '210500'), ('502', '210503', '溪湖区', '210500'), ('503', '210504', '明山区', '210500'), ('504', '210505', '南芬区', '210500'), ('505', '210521', '本溪满族自治县', '210500'), ('506', '210522', '桓仁满族自治县', '210500'), ('507', '210601', '市辖区', '210600'), ('508', '210602', '元宝区', '210600'), ('509', '210603', '振兴区', '210600'), ('510', '210604', '振安区', '210600'), ('511', '210624', '宽甸满族自治县', '210600'), ('512', '210681', '东港市', '210600'), ('513', '210682', '凤城市', '210600'), ('514', '210701', '市辖区', '210700'), ('515', '210702', '古塔区', '210700'), ('516', '210703', '凌河区', '210700'), ('517', '210711', '太和区', '210700'), ('518', '210726', '黑山县', '210700'), ('519', '210727', '义　县', '210700'), ('520', '210781', '凌海市', '210700'), ('521', '210782', '北宁市', '210700'), ('522', '210801', '市辖区', '210800'), ('523', '210802', '站前区', '210800'), ('524', '210803', '西市区', '210800'), ('525', '210804', '鲅鱼圈区', '210800'), ('526', '210811', '老边区', '210800'), ('527', '210881', '盖州市', '210800'), ('528', '210882', '大石桥市', '210800'), ('529', '210901', '市辖区', '210900'), ('530', '210902', '海州区', '210900'), ('531', '210903', '新邱区', '210900'), ('532', '210904', '太平区', '210900'), ('533', '210905', '清河门区', '210900'), ('534', '210911', '细河区', '210900'), ('535', '210921', '阜新蒙古族自治县', '210900'), ('536', '210922', '彰武县', '210900'), ('537', '211001', '市辖区', '211000'), ('538', '211002', '白塔区', '211000'), ('539', '211003', '文圣区', '211000'), ('540', '211004', '宏伟区', '211000'), ('541', '211005', '弓长岭区', '211000'), ('542', '211011', '太子河区', '211000'), ('543', '211021', '辽阳县', '211000'), ('544', '211081', '灯塔市', '211000'), ('545', '211101', '市辖区', '211100'), ('546', '211102', '双台子区', '211100'), ('547', '211103', '兴隆台区', '211100'), ('548', '211121', '大洼县', '211100'), ('549', '211122', '盘山县', '211100'), ('550', '211201', '市辖区', '211200'), ('551', '211202', '银州区', '211200'), ('552', '211204', '清河区', '211200'), ('553', '211221', '铁岭县', '211200'), ('554', '211223', '西丰县', '211200'), ('555', '211224', '昌图县', '211200'), ('556', '211281', '调兵山市', '211200'), ('557', '211282', '开原市', '211200'), ('558', '211301', '市辖区', '211300'), ('559', '211302', '双塔区', '211300'), ('560', '211303', '龙城区', '211300'), ('561', '211321', '朝阳县', '211300'), ('562', '211322', '建平县', '211300'), ('563', '211324', '喀喇沁左翼蒙古族自治县', '211300'), ('564', '211381', '北票市', '211300'), ('565', '211382', '凌源市', '211300'), ('566', '211401', '市辖区', '211400'), ('567', '211402', '连山区', '211400'), ('568', '211403', '龙港区', '211400'), ('569', '211404', '南票区', '211400'), ('570', '211421', '绥中县', '211400'), ('571', '211422', '建昌县', '211400'), ('572', '211481', '兴城市', '211400'), ('573', '220101', '市辖区', '220100'), ('574', '220102', '南关区', '220100'), ('575', '220103', '宽城区', '220100'), ('576', '220104', '朝阳区', '220100'), ('577', '220105', '二道区', '220100'), ('578', '220106', '绿园区', '220100'), ('579', '220112', '双阳区', '220100'), ('580', '220122', '农安县', '220100'), ('581', '220181', '九台市', '220100'), ('582', '220182', '榆树市', '220100'), ('583', '220183', '德惠市', '220100'), ('584', '220201', '市辖区', '220200'), ('585', '220202', '昌邑区', '220200'), ('586', '220203', '龙潭区', '220200'), ('587', '220204', '船营区', '220200'), ('588', '220211', '丰满区', '220200'), ('589', '220221', '永吉县', '220200'), ('590', '220281', '蛟河市', '220200'), ('591', '220282', '桦甸市', '220200'), ('592', '220283', '舒兰市', '220200'), ('593', '220284', '磐石市', '220200'), ('594', '220301', '市辖区', '220300'), ('595', '220302', '铁西区', '220300'), ('596', '220303', '铁东区', '220300'), ('597', '220322', '梨树县', '220300'), ('598', '220323', '伊通满族自治县', '220300'), ('599', '220381', '公主岭市', '220300'), ('600', '220382', '双辽市', '220300'), ('601', '220401', '市辖区', '220400'), ('602', '220402', '龙山区', '220400'), ('603', '220403', '西安区', '220400'), ('604', '220421', '东丰县', '220400'), ('605', '220422', '东辽县', '220400'), ('606', '220501', '市辖区', '220500'), ('607', '220502', '东昌区', '220500'), ('608', '220503', '二道江区', '220500'), ('609', '220521', '通化县', '220500'), ('610', '220523', '辉南县', '220500'), ('611', '220524', '柳河县', '220500'), ('612', '220581', '梅河口市', '220500'), ('613', '220582', '集安市', '220500'), ('614', '220601', '市辖区', '220600'), ('615', '220602', '八道江区', '220600'), ('616', '220621', '抚松县', '220600'), ('617', '220622', '靖宇县', '220600'), ('618', '220623', '长白朝鲜族自治县', '220600'), ('619', '220625', '江源县', '220600'), ('620', '220681', '临江市', '220600'), ('621', '220701', '市辖区', '220700'), ('622', '220702', '宁江区', '220700'), ('623', '220721', '前郭尔罗斯蒙古族自治县', '220700'), ('624', '220722', '长岭县', '220700'), ('625', '220723', '乾安县', '220700'), ('626', '220724', '扶余县', '220700'), ('627', '220801', '市辖区', '220800'), ('628', '220802', '洮北区', '220800'), ('629', '220821', '镇赉县', '220800'), ('630', '220822', '通榆县', '220800'), ('631', '220881', '洮南市', '220800'), ('632', '220882', '大安市', '220800'), ('633', '222401', '延吉市', '222400'), ('634', '222402', '图们市', '222400'), ('635', '222403', '敦化市', '222400'), ('636', '222404', '珲春市', '222400'), ('637', '222405', '龙井市', '222400'), ('638', '222406', '和龙市', '222400'), ('639', '222424', '汪清县', '222400'), ('640', '222426', '安图县', '222400'), ('641', '230101', '市辖区', '230100'), ('642', '230102', '道里区', '230100'), ('643', '230103', '南岗区', '230100'), ('644', '230104', '道外区', '230100'), ('645', '230106', '香坊区', '230100'), ('646', '230107', '动力区', '230100'), ('647', '230108', '平房区', '230100'), ('648', '230109', '松北区', '230100'), ('649', '230111', '呼兰区', '230100'), ('650', '230123', '依兰县', '230100'), ('651', '230124', '方正县', '230100'), ('652', '230125', '宾　县', '230100'), ('653', '230126', '巴彦县', '230100'), ('654', '230127', '木兰县', '230100'), ('655', '230128', '通河县', '230100'), ('656', '230129', '延寿县', '230100'), ('657', '230181', '阿城市', '230100'), ('658', '230182', '双城市', '230100'), ('659', '230183', '尚志市', '230100'), ('660', '230184', '五常市', '230100'), ('661', '230201', '市辖区', '230200'), ('662', '230202', '龙沙区', '230200'), ('663', '230203', '建华区', '230200'), ('664', '230204', '铁锋区', '230200'), ('665', '230205', '昂昂溪区', '230200'), ('666', '230206', '富拉尔基区', '230200'), ('667', '230207', '碾子山区', '230200'), ('668', '230208', '梅里斯达斡尔族区', '230200'), ('669', '230221', '龙江县', '230200'), ('670', '230223', '依安县', '230200'), ('671', '230224', '泰来县', '230200'), ('672', '230225', '甘南县', '230200'), ('673', '230227', '富裕县', '230200'), ('674', '230229', '克山县', '230200'), ('675', '230230', '克东县', '230200'), ('676', '230231', '拜泉县', '230200'), ('677', '230281', '讷河市', '230200'), ('678', '230301', '市辖区', '230300'), ('679', '230302', '鸡冠区', '230300'), ('680', '230303', '恒山区', '230300'), ('681', '230304', '滴道区', '230300'), ('682', '230305', '梨树区', '230300'), ('683', '230306', '城子河区', '230300'), ('684', '230307', '麻山区', '230300'), ('685', '230321', '鸡东县', '230300'), ('686', '230381', '虎林市', '230300'), ('687', '230382', '密山市', '230300'), ('688', '230401', '市辖区', '230400'), ('689', '230402', '向阳区', '230400'), ('690', '230403', '工农区', '230400'), ('691', '230404', '南山区', '230400'), ('692', '230405', '兴安区', '230400'), ('693', '230406', '东山区', '230400'), ('694', '230407', '兴山区', '230400'), ('695', '230421', '萝北县', '230400'), ('696', '230422', '绥滨县', '230400'), ('697', '230501', '市辖区', '230500'), ('698', '230502', '尖山区', '230500'), ('699', '230503', '岭东区', '230500'), ('700', '230505', '四方台区', '230500'), ('701', '230506', '宝山区', '230500'), ('702', '230521', '集贤县', '230500'), ('703', '230522', '友谊县', '230500'), ('704', '230523', '宝清县', '230500'), ('705', '230524', '饶河县', '230500'), ('706', '230601', '市辖区', '230600'), ('707', '230602', '萨尔图区', '230600'), ('708', '230603', '龙凤区', '230600'), ('709', '230604', '让胡路区', '230600'), ('710', '230605', '红岗区', '230600'), ('711', '230606', '大同区', '230600'), ('712', '230621', '肇州县', '230600'), ('713', '230622', '肇源县', '230600'), ('714', '230623', '林甸县', '230600'), ('715', '230624', '杜尔伯特蒙古族自治县', '230600'), ('716', '230701', '市辖区', '230700'), ('717', '230702', '伊春区', '230700'), ('718', '230703', '南岔区', '230700'), ('719', '230704', '友好区', '230700'), ('720', '230705', '西林区', '230700'), ('721', '230706', '翠峦区', '230700'), ('722', '230707', '新青区', '230700'), ('723', '230708', '美溪区', '230700'), ('724', '230709', '金山屯区', '230700'), ('725', '230710', '五营区', '230700'), ('726', '230711', '乌马河区', '230700'), ('727', '230712', '汤旺河区', '230700'), ('728', '230713', '带岭区', '230700'), ('729', '230714', '乌伊岭区', '230700'), ('730', '230715', '红星区', '230700'), ('731', '230716', '上甘岭区', '230700'), ('732', '230722', '嘉荫县', '230700'), ('733', '230781', '铁力市', '230700'), ('734', '230801', '市辖区', '230800'), ('735', '230802', '永红区', '230800'), ('736', '230803', '向阳区', '230800'), ('737', '230804', '前进区', '230800'), ('738', '230805', '东风区', '230800'), ('739', '230811', '郊　区', '230800'), ('740', '230822', '桦南县', '230800'), ('741', '230826', '桦川县', '230800'), ('742', '230828', '汤原县', '230800'), ('743', '230833', '抚远县', '230800'), ('744', '230881', '同江市', '230800'), ('745', '230882', '富锦市', '230800'), ('746', '230901', '市辖区', '230900'), ('747', '230902', '新兴区', '230900'), ('748', '230903', '桃山区', '230900'), ('749', '230904', '茄子河区', '230900'), ('750', '230921', '勃利县', '230900'), ('751', '231001', '市辖区', '231000'), ('752', '231002', '东安区', '231000'), ('753', '231003', '阳明区', '231000'), ('754', '231004', '爱民区', '231000'), ('755', '231005', '西安区', '231000'), ('756', '231024', '东宁县', '231000'), ('757', '231025', '林口县', '231000'), ('758', '231081', '绥芬河市', '231000'), ('759', '231083', '海林市', '231000'), ('760', '231084', '宁安市', '231000'), ('761', '231085', '穆棱市', '231000'), ('762', '231101', '市辖区', '231100'), ('763', '231102', '爱辉区', '231100'), ('764', '231121', '嫩江县', '231100'), ('765', '231123', '逊克县', '231100'), ('766', '231124', '孙吴县', '231100'), ('767', '231181', '北安市', '231100'), ('768', '231182', '五大连池市', '231100'), ('769', '231201', '市辖区', '231200'), ('770', '231202', '北林区', '231200'), ('771', '231221', '望奎县', '231200'), ('772', '231222', '兰西县', '231200'), ('773', '231223', '青冈县', '231200'), ('774', '231224', '庆安县', '231200'), ('775', '231225', '明水县', '231200'), ('776', '231226', '绥棱县', '231200'), ('777', '231281', '安达市', '231200'), ('778', '231282', '肇东市', '231200'), ('779', '231283', '海伦市', '231200'), ('780', '232721', '呼玛县', '232700'), ('781', '232722', '塔河县', '232700'), ('782', '232723', '漠河县', '232700'), ('783', '310101', '黄浦区', '310100'), ('784', '310103', '卢湾区', '310100'), ('785', '310104', '徐汇区', '310100'), ('786', '310105', '长宁区', '310100'), ('787', '310106', '静安区', '310100'), ('788', '310107', '普陀区', '310100'), ('789', '310108', '闸北区', '310100'), ('790', '310109', '虹口区', '310100'), ('791', '310110', '杨浦区', '310100'), ('792', '310112', '闵行区', '310100'), ('793', '310113', '宝山区', '310100'), ('794', '310114', '嘉定区', '310100'), ('795', '310115', '浦东新区', '310100'), ('796', '310116', '金山区', '310100'), ('797', '310117', '松江区', '310100'), ('798', '310118', '青浦区', '310100'), ('799', '310119', '南汇区', '310100'), ('800', '310120', '奉贤区', '310100'), ('801', '310230', '崇明县', '310200'), ('802', '320101', '市辖区', '320100'), ('803', '320102', '玄武区', '320100'), ('804', '320103', '白下区', '320100'), ('805', '320104', '秦淮区', '320100'), ('806', '320105', '建邺区', '320100'), ('807', '320106', '鼓楼区', '320100'), ('808', '320107', '下关区', '320100'), ('809', '320111', '浦口区', '320100'), ('810', '320113', '栖霞区', '320100'), ('811', '320114', '雨花台区', '320100'), ('812', '320115', '江宁区', '320100'), ('813', '320116', '六合区', '320100'), ('814', '320124', '溧水县', '320100'), ('815', '320125', '高淳县', '320100'), ('816', '320201', '市辖区', '320200'), ('817', '320202', '崇安区', '320200'), ('818', '320203', '南长区', '320200'), ('819', '320204', '北塘区', '320200'), ('820', '320205', '锡山区', '320200'), ('821', '320206', '惠山区', '320200'), ('822', '320211', '滨湖区', '320200'), ('823', '320281', '江阴市', '320200'), ('824', '320282', '宜兴市', '320200'), ('825', '320301', '市辖区', '320300'), ('826', '320302', '鼓楼区', '320300'), ('827', '320303', '云龙区', '320300'), ('828', '320304', '九里区', '320300'), ('829', '320305', '贾汪区', '320300'), ('830', '320311', '泉山区', '320300'), ('831', '320321', '丰　县', '320300'), ('832', '320322', '沛　县', '320300'), ('833', '320323', '铜山县', '320300'), ('834', '320324', '睢宁县', '320300'), ('835', '320381', '新沂市', '320300'), ('836', '320382', '邳州市', '320300'), ('837', '320401', '市辖区', '320400'), ('838', '320402', '天宁区', '320400'), ('839', '320404', '钟楼区', '320400'), ('840', '320405', '戚墅堰区', '320400'), ('841', '320411', '新北区', '320400'), ('842', '320412', '武进区', '320400'), ('843', '320481', '溧阳市', '320400'), ('844', '320482', '金坛市', '320400'), ('845', '320501', '市辖区', '320500'), ('846', '320502', '沧浪区', '320500'), ('847', '320503', '平江区', '320500'), ('848', '320504', '金阊区', '320500'), ('849', '320505', '虎丘区', '320500'), ('850', '320506', '吴中区', '320500'), ('851', '320507', '相城区', '320500'), ('852', '320581', '常熟市', '320500'), ('853', '320582', '张家港市', '320500'), ('854', '320583', '昆山市', '320500'), ('855', '320584', '吴江市', '320500'), ('856', '320585', '太仓市', '320500'), ('857', '320601', '市辖区', '320600'), ('858', '320602', '崇川区', '320600'), ('859', '320611', '港闸区', '320600'), ('860', '320621', '海安县', '320600'), ('861', '320623', '如东县', '320600'), ('862', '320681', '启东市', '320600'), ('863', '320682', '如皋市', '320600'), ('864', '320683', '通州市', '320600'), ('865', '320684', '海门市', '320600'), ('866', '320701', '市辖区', '320700'), ('867', '320703', '连云区', '320700'), ('868', '320705', '新浦区', '320700'), ('869', '320706', '海州区', '320700'), ('870', '320721', '赣榆县', '320700'), ('871', '320722', '东海县', '320700'), ('872', '320723', '灌云县', '320700'), ('873', '320724', '灌南县', '320700'), ('874', '320801', '市辖区', '320800'), ('875', '320802', '清河区', '320800'), ('876', '320803', '楚州区', '320800'), ('877', '320804', '淮阴区', '320800'), ('878', '320811', '清浦区', '320800'), ('879', '320826', '涟水县', '320800'), ('880', '320829', '洪泽县', '320800'), ('881', '320830', '盱眙县', '320800'), ('882', '320831', '金湖县', '320800'), ('883', '320901', '市辖区', '320900'), ('884', '320902', '亭湖区', '320900'), ('885', '320903', '盐都区', '320900'), ('886', '320921', '响水县', '320900'), ('887', '320922', '滨海县', '320900'), ('888', '320923', '阜宁县', '320900'), ('889', '320924', '射阳县', '320900'), ('890', '320925', '建湖县', '320900'), ('891', '320981', '东台市', '320900'), ('892', '320982', '大丰市', '320900'), ('893', '321001', '市辖区', '321000'), ('894', '321002', '广陵区', '321000'), ('895', '321003', '邗江区', '321000'), ('896', '321011', '郊　区', '321000'), ('897', '321023', '宝应县', '321000'), ('898', '321081', '仪征市', '321000'), ('899', '321084', '高邮市', '321000'), ('900', '321088', '江都市', '321000'), ('901', '321101', '市辖区', '321100'), ('902', '321102', '京口区', '321100'), ('903', '321111', '润州区', '321100'), ('904', '321112', '丹徒区', '321100'), ('905', '321181', '丹阳市', '321100'), ('906', '321182', '扬中市', '321100'), ('907', '321183', '句容市', '321100'), ('908', '321201', '市辖区', '321200'), ('909', '321202', '海陵区', '321200'), ('910', '321203', '高港区', '321200'), ('911', '321281', '兴化市', '321200'), ('912', '321282', '靖江市', '321200'), ('913', '321283', '泰兴市', '321200'), ('914', '321284', '姜堰市', '321200'), ('915', '321301', '市辖区', '321300'), ('916', '321302', '宿城区', '321300'), ('917', '321311', '宿豫区', '321300'), ('918', '321322', '沭阳县', '321300'), ('919', '321323', '泗阳县', '321300'), ('920', '321324', '泗洪县', '321300'), ('921', '330101', '市辖区', '330100'), ('922', '330102', '上城区', '330100'), ('923', '330103', '下城区', '330100'), ('924', '330104', '江干区', '330100'), ('925', '330105', '拱墅区', '330100'), ('926', '330106', '西湖区', '330100'), ('927', '330108', '滨江区', '330100'), ('928', '330109', '萧山区', '330100'), ('929', '330110', '余杭区', '330100'), ('930', '330122', '桐庐县', '330100'), ('931', '330127', '淳安县', '330100'), ('932', '330182', '建德市', '330100'), ('933', '330183', '富阳市', '330100'), ('934', '330185', '临安市', '330100'), ('935', '330201', '市辖区', '330200'), ('936', '330203', '海曙区', '330200'), ('937', '330204', '江东区', '330200'), ('938', '330205', '江北区', '330200'), ('939', '330206', '北仑区', '330200'), ('940', '330211', '镇海区', '330200'), ('941', '330212', '鄞州区', '330200'), ('942', '330225', '象山县', '330200'), ('943', '330226', '宁海县', '330200'), ('944', '330281', '余姚市', '330200'), ('945', '330282', '慈溪市', '330200'), ('946', '330283', '奉化市', '330200'), ('947', '330301', '市辖区', '330300'), ('948', '330302', '鹿城区', '330300'), ('949', '330303', '龙湾区', '330300'), ('950', '330304', '瓯海区', '330300'), ('951', '330322', '洞头县', '330300'), ('952', '330324', '永嘉县', '330300'), ('953', '330326', '平阳县', '330300'), ('954', '330327', '苍南县', '330300'), ('955', '330328', '文成县', '330300'), ('956', '330329', '泰顺县', '330300'), ('957', '330381', '瑞安市', '330300'), ('958', '330382', '乐清市', '330300'), ('959', '330401', '市辖区', '330400'), ('960', '330402', '秀城区', '330400'), ('961', '330411', '秀洲区', '330400'), ('962', '330421', '嘉善县', '330400'), ('963', '330424', '海盐县', '330400'), ('964', '330481', '海宁市', '330400'), ('965', '330482', '平湖市', '330400'), ('966', '330483', '桐乡市', '330400'), ('967', '330501', '市辖区', '330500'), ('968', '330502', '吴兴区', '330500'), ('969', '330503', '南浔区', '330500'), ('970', '330521', '德清县', '330500'), ('971', '330522', '长兴县', '330500'), ('972', '330523', '安吉县', '330500'), ('973', '330601', '市辖区', '330600'), ('974', '330602', '越城区', '330600'), ('975', '330621', '绍兴县', '330600'), ('976', '330624', '新昌县', '330600'), ('977', '330681', '诸暨市', '330600'), ('978', '330682', '上虞市', '330600'), ('979', '330683', '嵊州市', '330600'), ('980', '330701', '市辖区', '330700'), ('981', '330702', '婺城区', '330700'), ('982', '330703', '金东区', '330700'), ('983', '330723', '武义县', '330700'), ('984', '330726', '浦江县', '330700'), ('985', '330727', '磐安县', '330700'), ('986', '330781', '兰溪市', '330700'), ('987', '330782', '义乌市', '330700'), ('988', '330783', '东阳市', '330700'), ('989', '330784', '永康市', '330700'), ('990', '330801', '市辖区', '330800'), ('991', '330802', '柯城区', '330800'), ('992', '330803', '衢江区', '330800'), ('993', '330822', '常山县', '330800'), ('994', '330824', '开化县', '330800'), ('995', '330825', '龙游县', '330800'), ('996', '330881', '江山市', '330800'), ('997', '330901', '市辖区', '330900'), ('998', '330902', '定海区', '330900'), ('999', '330903', '普陀区', '330900'), ('1000', '330921', '岱山县', '330900'), ('1001', '330922', '嵊泗县', '330900'), ('1002', '331001', '市辖区', '331000'), ('1003', '331002', '椒江区', '331000'), ('1004', '331003', '黄岩区', '331000'), ('1005', '331004', '路桥区', '331000'), ('1006', '331021', '玉环县', '331000'), ('1007', '331022', '三门县', '331000'), ('1008', '331023', '天台县', '331000'), ('1009', '331024', '仙居县', '331000'), ('1010', '331081', '温岭市', '331000'), ('1011', '331082', '临海市', '331000'), ('1012', '331101', '市辖区', '331100'), ('1013', '331102', '莲都区', '331100'), ('1014', '331121', '青田县', '331100'), ('1015', '331122', '缙云县', '331100'), ('1016', '331123', '遂昌县', '331100'), ('1017', '331124', '松阳县', '331100'), ('1018', '331125', '云和县', '331100'), ('1019', '331126', '庆元县', '331100'), ('1020', '331127', '景宁畲族自治县', '331100'), ('1021', '331181', '龙泉市', '331100'), ('1022', '340101', '市辖区', '340100'), ('1023', '340102', '瑶海区', '340100'), ('1024', '340103', '庐阳区', '340100'), ('1025', '340104', '蜀山区', '340100'), ('1026', '340111', '包河区', '340100'), ('1027', '340121', '长丰县', '340100'), ('1028', '340122', '肥东县', '340100'), ('1029', '340123', '肥西县', '340100'), ('1030', '340201', '市辖区', '340200'), ('1031', '340202', '镜湖区', '340200'), ('1032', '340203', '马塘区', '340200'), ('1033', '340204', '新芜区', '340200'), ('1034', '340207', '鸠江区', '340200'), ('1035', '340221', '芜湖县', '340200'), ('1036', '340222', '繁昌县', '340200'), ('1037', '340223', '南陵县', '340200'), ('1038', '340301', '市辖区', '340300'), ('1039', '340302', '龙子湖区', '340300'), ('1040', '340303', '蚌山区', '340300'), ('1041', '340304', '禹会区', '340300'), ('1042', '340311', '淮上区', '340300'), ('1043', '340321', '怀远县', '340300'), ('1044', '340322', '五河县', '340300'), ('1045', '340323', '固镇县', '340300'), ('1046', '340401', '市辖区', '340400'), ('1047', '340402', '大通区', '340400'), ('1048', '340403', '田家庵区', '340400'), ('1049', '340404', '谢家集区', '340400'), ('1050', '340405', '八公山区', '340400'), ('1051', '340406', '潘集区', '340400'), ('1052', '340421', '凤台县', '340400'), ('1053', '340501', '市辖区', '340500'), ('1054', '340502', '金家庄区', '340500'), ('1055', '340503', '花山区', '340500'), ('1056', '340504', '雨山区', '340500'), ('1057', '340521', '当涂县', '340500'), ('1058', '340601', '市辖区', '340600'), ('1059', '340602', '杜集区', '340600'), ('1060', '340603', '相山区', '340600'), ('1061', '340604', '烈山区', '340600'), ('1062', '340621', '濉溪县', '340600'), ('1063', '340701', '市辖区', '340700'), ('1064', '340702', '铜官山区', '340700'), ('1065', '340703', '狮子山区', '340700'), ('1066', '340711', '郊　区', '340700'), ('1067', '340721', '铜陵县', '340700'), ('1068', '340801', '市辖区', '340800'), ('1069', '340802', '迎江区', '340800'), ('1070', '340803', '大观区', '340800'), ('1071', '340811', '郊　区', '340800'), ('1072', '340822', '怀宁县', '340800'), ('1073', '340823', '枞阳县', '340800'), ('1074', '340824', '潜山县', '340800'), ('1075', '340825', '太湖县', '340800'), ('1076', '340826', '宿松县', '340800'), ('1077', '340827', '望江县', '340800'), ('1078', '340828', '岳西县', '340800'), ('1079', '340881', '桐城市', '340800'), ('1080', '341001', '市辖区', '341000'), ('1081', '341002', '屯溪区', '341000'), ('1082', '341003', '黄山区', '341000'), ('1083', '341004', '徽州区', '341000'), ('1084', '341021', '歙　县', '341000'), ('1085', '341022', '休宁县', '341000'), ('1086', '341023', '黟　县', '341000'), ('1087', '341024', '祁门县', '341000'), ('1088', '341101', '市辖区', '341100'), ('1089', '341102', '琅琊区', '341100'), ('1090', '341103', '南谯区', '341100'), ('1091', '341122', '来安县', '341100'), ('1092', '341124', '全椒县', '341100'), ('1093', '341125', '定远县', '341100'), ('1094', '341126', '凤阳县', '341100'), ('1095', '341181', '天长市', '341100'), ('1096', '341182', '明光市', '341100'), ('1097', '341201', '市辖区', '341200'), ('1098', '341202', '颍州区', '341200'), ('1099', '341203', '颍东区', '341200'), ('1100', '341204', '颍泉区', '341200'), ('1101', '341221', '临泉县', '341200'), ('1102', '341222', '太和县', '341200'), ('1103', '341225', '阜南县', '341200'), ('1104', '341226', '颍上县', '341200'), ('1105', '341282', '界首市', '341200'), ('1106', '341301', '市辖区', '341300'), ('1107', '341302', '墉桥区', '341300'), ('1108', '341321', '砀山县', '341300'), ('1109', '341322', '萧　县', '341300'), ('1110', '341323', '灵璧县', '341300'), ('1111', '341324', '泗　县', '341300'), ('1112', '341401', '市辖区', '341400'), ('1113', '341402', '居巢区', '341400'), ('1114', '341421', '庐江县', '341400'), ('1115', '341422', '无为县', '341400'), ('1116', '341423', '含山县', '341400'), ('1117', '341424', '和　县', '341400'), ('1118', '341501', '市辖区', '341500'), ('1119', '341502', '金安区', '341500'), ('1120', '341503', '裕安区', '341500'), ('1121', '341521', '寿　县', '341500'), ('1122', '341522', '霍邱县', '341500'), ('1123', '341523', '舒城县', '341500'), ('1124', '341524', '金寨县', '341500'), ('1125', '341525', '霍山县', '341500'), ('1126', '341601', '市辖区', '341600'), ('1127', '341602', '谯城区', '341600'), ('1128', '341621', '涡阳县', '341600'), ('1129', '341622', '蒙城县', '341600'), ('1130', '341623', '利辛县', '341600'), ('1131', '341701', '市辖区', '341700'), ('1132', '341702', '贵池区', '341700'), ('1133', '341721', '东至县', '341700'), ('1134', '341722', '石台县', '341700'), ('1135', '341723', '青阳县', '341700'), ('1136', '341801', '市辖区', '341800'), ('1137', '341802', '宣州区', '341800'), ('1138', '341821', '郎溪县', '341800'), ('1139', '341822', '广德县', '341800'), ('1140', '341823', '泾　县', '341800'), ('1141', '341824', '绩溪县', '341800'), ('1142', '341825', '旌德县', '341800'), ('1143', '341881', '宁国市', '341800'), ('1144', '350101', '市辖区', '350100'), ('1145', '350102', '鼓楼区', '350100'), ('1146', '350103', '台江区', '350100'), ('1147', '350104', '仓山区', '350100'), ('1148', '350105', '马尾区', '350100'), ('1149', '350111', '晋安区', '350100'), ('1150', '350121', '闽侯县', '350100'), ('1151', '350122', '连江县', '350100'), ('1152', '350123', '罗源县', '350100'), ('1153', '350124', '闽清县', '350100'), ('1154', '350125', '永泰县', '350100'), ('1155', '350128', '平潭县', '350100'), ('1156', '350181', '福清市', '350100'), ('1157', '350182', '长乐市', '350100'), ('1158', '350201', '市辖区', '350200'), ('1159', '350203', '思明区', '350200'), ('1160', '350205', '海沧区', '350200'), ('1161', '350206', '湖里区', '350200'), ('1162', '350211', '集美区', '350200'), ('1163', '350212', '同安区', '350200'), ('1164', '350213', '翔安区', '350200'), ('1165', '350301', '市辖区', '350300'), ('1166', '350302', '城厢区', '350300'), ('1167', '350303', '涵江区', '350300'), ('1168', '350304', '荔城区', '350300'), ('1169', '350305', '秀屿区', '350300'), ('1170', '350322', '仙游县', '350300'), ('1171', '350401', '市辖区', '350400'), ('1172', '350402', '梅列区', '350400'), ('1173', '350403', '三元区', '350400'), ('1174', '350421', '明溪县', '350400'), ('1175', '350423', '清流县', '350400'), ('1176', '350424', '宁化县', '350400'), ('1177', '350425', '大田县', '350400'), ('1178', '350426', '尤溪县', '350400'), ('1179', '350427', '沙　县', '350400'), ('1180', '350428', '将乐县', '350400'), ('1181', '350429', '泰宁县', '350400'), ('1182', '350430', '建宁县', '350400'), ('1183', '350481', '永安市', '350400'), ('1184', '350501', '市辖区', '350500'), ('1185', '350502', '鲤城区', '350500'), ('1186', '350503', '丰泽区', '350500'), ('1187', '350504', '洛江区', '350500'), ('1188', '350505', '泉港区', '350500'), ('1189', '350521', '惠安县', '350500'), ('1190', '350524', '安溪县', '350500'), ('1191', '350525', '永春县', '350500'), ('1192', '350526', '德化县', '350500'), ('1193', '350527', '金门县', '350500'), ('1194', '350581', '石狮市', '350500'), ('1195', '350582', '晋江市', '350500'), ('1196', '350583', '南安市', '350500'), ('1197', '350601', '市辖区', '350600'), ('1198', '350602', '芗城区', '350600'), ('1199', '350603', '龙文区', '350600'), ('1200', '350622', '云霄县', '350600'), ('1201', '350623', '漳浦县', '350600'), ('1202', '350624', '诏安县', '350600'), ('1203', '350625', '长泰县', '350600'), ('1204', '350626', '东山县', '350600'), ('1205', '350627', '南靖县', '350600'), ('1206', '350628', '平和县', '350600'), ('1207', '350629', '华安县', '350600'), ('1208', '350681', '龙海市', '350600'), ('1209', '350701', '市辖区', '350700'), ('1210', '350702', '延平区', '350700'), ('1211', '350721', '顺昌县', '350700'), ('1212', '350722', '浦城县', '350700'), ('1213', '350723', '光泽县', '350700'), ('1214', '350724', '松溪县', '350700'), ('1215', '350725', '政和县', '350700'), ('1216', '350781', '邵武市', '350700'), ('1217', '350782', '武夷山市', '350700'), ('1218', '350783', '建瓯市', '350700'), ('1219', '350784', '建阳市', '350700'), ('1220', '350801', '市辖区', '350800'), ('1221', '350802', '新罗区', '350800'), ('1222', '350821', '长汀县', '350800'), ('1223', '350822', '永定县', '350800'), ('1224', '350823', '上杭县', '350800'), ('1225', '350824', '武平县', '350800'), ('1226', '350825', '连城县', '350800'), ('1227', '350881', '漳平市', '350800'), ('1228', '350901', '市辖区', '350900'), ('1229', '350902', '蕉城区', '350900'), ('1230', '350921', '霞浦县', '350900'), ('1231', '350922', '古田县', '350900'), ('1232', '350923', '屏南县', '350900'), ('1233', '350924', '寿宁县', '350900'), ('1234', '350925', '周宁县', '350900'), ('1235', '350926', '柘荣县', '350900'), ('1236', '350981', '福安市', '350900'), ('1237', '350982', '福鼎市', '350900'), ('1238', '360101', '市辖区', '360100'), ('1239', '360102', '东湖区', '360100'), ('1240', '360103', '西湖区', '360100'), ('1241', '360104', '青云谱区', '360100'), ('1242', '360105', '湾里区', '360100'), ('1243', '360111', '青山湖区', '360100'), ('1244', '360121', '南昌县', '360100'), ('1245', '360122', '新建县', '360100'), ('1246', '360123', '安义县', '360100'), ('1247', '360124', '进贤县', '360100'), ('1248', '360201', '市辖区', '360200'), ('1249', '360202', '昌江区', '360200'), ('1250', '360203', '珠山区', '360200'), ('1251', '360222', '浮梁县', '360200'), ('1252', '360281', '乐平市', '360200'), ('1253', '360301', '市辖区', '360300'), ('1254', '360302', '安源区', '360300'), ('1255', '360313', '湘东区', '360300'), ('1256', '360321', '莲花县', '360300'), ('1257', '360322', '上栗县', '360300'), ('1258', '360323', '芦溪县', '360300'), ('1259', '360401', '市辖区', '360400'), ('1260', '360402', '庐山区', '360400'), ('1261', '360403', '浔阳区', '360400'), ('1262', '360421', '九江县', '360400'), ('1263', '360423', '武宁县', '360400'), ('1264', '360424', '修水县', '360400'), ('1265', '360425', '永修县', '360400'), ('1266', '360426', '德安县', '360400'), ('1267', '360427', '星子县', '360400'), ('1268', '360428', '都昌县', '360400'), ('1269', '360429', '湖口县', '360400'), ('1270', '360430', '彭泽县', '360400'), ('1271', '360481', '瑞昌市', '360400'), ('1272', '360501', '市辖区', '360500'), ('1273', '360502', '渝水区', '360500'), ('1274', '360521', '分宜县', '360500'), ('1275', '360601', '市辖区', '360600'), ('1276', '360602', '月湖区', '360600'), ('1277', '360622', '余江县', '360600'), ('1278', '360681', '贵溪市', '360600'), ('1279', '360701', '市辖区', '360700'), ('1280', '360702', '章贡区', '360700'), ('1281', '360721', '赣　县', '360700'), ('1282', '360722', '信丰县', '360700'), ('1283', '360723', '大余县', '360700'), ('1284', '360724', '上犹县', '360700'), ('1285', '360725', '崇义县', '360700'), ('1286', '360726', '安远县', '360700'), ('1287', '360727', '龙南县', '360700'), ('1288', '360728', '定南县', '360700'), ('1289', '360729', '全南县', '360700'), ('1290', '360730', '宁都县', '360700'), ('1291', '360731', '于都县', '360700'), ('1292', '360732', '兴国县', '360700'), ('1293', '360733', '会昌县', '360700'), ('1294', '360734', '寻乌县', '360700'), ('1295', '360735', '石城县', '360700'), ('1296', '360781', '瑞金市', '360700'), ('1297', '360782', '南康市', '360700'), ('1298', '360801', '市辖区', '360800'), ('1299', '360802', '吉州区', '360800'), ('1300', '360803', '青原区', '360800'), ('1301', '360821', '吉安县', '360800'), ('1302', '360822', '吉水县', '360800'), ('1303', '360823', '峡江县', '360800'), ('1304', '360824', '新干县', '360800'), ('1305', '360825', '永丰县', '360800'), ('1306', '360826', '泰和县', '360800'), ('1307', '360827', '遂川县', '360800'), ('1308', '360828', '万安县', '360800'), ('1309', '360829', '安福县', '360800'), ('1310', '360830', '永新县', '360800'), ('1311', '360881', '井冈山市', '360800'), ('1312', '360901', '市辖区', '360900'), ('1313', '360902', '袁州区', '360900'), ('1314', '360921', '奉新县', '360900'), ('1315', '360922', '万载县', '360900'), ('1316', '360923', '上高县', '360900'), ('1317', '360924', '宜丰县', '360900'), ('1318', '360925', '靖安县', '360900'), ('1319', '360926', '铜鼓县', '360900'), ('1320', '360981', '丰城市', '360900'), ('1321', '360982', '樟树市', '360900'), ('1322', '360983', '高安市', '360900'), ('1323', '361001', '市辖区', '361000'), ('1324', '361002', '临川区', '361000'), ('1325', '361021', '南城县', '361000'), ('1326', '361022', '黎川县', '361000'), ('1327', '361023', '南丰县', '361000'), ('1328', '361024', '崇仁县', '361000'), ('1329', '361025', '乐安县', '361000'), ('1330', '361026', '宜黄县', '361000'), ('1331', '361027', '金溪县', '361000'), ('1332', '361028', '资溪县', '361000'), ('1333', '361029', '东乡县', '361000'), ('1334', '361030', '广昌县', '361000'), ('1335', '361101', '市辖区', '361100'), ('1336', '361102', '信州区', '361100'), ('1337', '361121', '上饶县', '361100'), ('1338', '361122', '广丰县', '361100'), ('1339', '361123', '玉山县', '361100'), ('1340', '361124', '铅山县', '361100'), ('1341', '361125', '横峰县', '361100'), ('1342', '361126', '弋阳县', '361100'), ('1343', '361127', '余干县', '361100'), ('1344', '361128', '鄱阳县', '361100'), ('1345', '361129', '万年县', '361100'), ('1346', '361130', '婺源县', '361100'), ('1347', '361181', '德兴市', '361100'), ('1348', '370101', '市辖区', '370100'), ('1349', '370102', '历下区', '370100'), ('1350', '370103', '市中区', '370100'), ('1351', '370104', '槐荫区', '370100'), ('1352', '370105', '天桥区', '370100'), ('1353', '370112', '历城区', '370100'), ('1354', '370113', '长清区', '370100'), ('1355', '370124', '平阴县', '370100'), ('1356', '370125', '济阳县', '370100'), ('1357', '370126', '商河县', '370100'), ('1358', '370181', '章丘市', '370100'), ('1359', '370201', '市辖区', '370200'), ('1360', '370202', '市南区', '370200'), ('1361', '370203', '市北区', '370200'), ('1362', '370205', '四方区', '370200'), ('1363', '370211', '黄岛区', '370200'), ('1364', '370212', '崂山区', '370200'), ('1365', '370213', '李沧区', '370200'), ('1366', '370214', '城阳区', '370200'), ('1367', '370281', '胶州市', '370200'), ('1368', '370282', '即墨市', '370200'), ('1369', '370283', '平度市', '370200'), ('1370', '370284', '胶南市', '370200'), ('1371', '370285', '莱西市', '370200'), ('1372', '370301', '市辖区', '370300'), ('1373', '370302', '淄川区', '370300'), ('1374', '370303', '张店区', '370300'), ('1375', '370304', '博山区', '370300'), ('1376', '370305', '临淄区', '370300'), ('1377', '370306', '周村区', '370300'), ('1378', '370321', '桓台县', '370300'), ('1379', '370322', '高青县', '370300'), ('1380', '370323', '沂源县', '370300'), ('1381', '370401', '市辖区', '370400'), ('1382', '370402', '市中区', '370400'), ('1383', '370403', '薛城区', '370400'), ('1384', '370404', '峄城区', '370400'), ('1385', '370405', '台儿庄区', '370400'), ('1386', '370406', '山亭区', '370400'), ('1387', '370481', '滕州市', '370400'), ('1388', '370501', '市辖区', '370500'), ('1389', '370502', '东营区', '370500'), ('1390', '370503', '河口区', '370500'), ('1391', '370521', '垦利县', '370500'), ('1392', '370522', '利津县', '370500'), ('1393', '370523', '广饶县', '370500'), ('1394', '370601', '市辖区', '370600'), ('1395', '370602', '芝罘区', '370600'), ('1396', '370611', '福山区', '370600'), ('1397', '370612', '牟平区', '370600'), ('1398', '370613', '莱山区', '370600'), ('1399', '370634', '长岛县', '370600'), ('1400', '370681', '龙口市', '370600'), ('1401', '370682', '莱阳市', '370600'), ('1402', '370683', '莱州市', '370600'), ('1403', '370684', '蓬莱市', '370600'), ('1404', '370685', '招远市', '370600'), ('1405', '370686', '栖霞市', '370600'), ('1406', '370687', '海阳市', '370600'), ('1407', '370701', '市辖区', '370700'), ('1408', '370702', '潍城区', '370700'), ('1409', '370703', '寒亭区', '370700'), ('1410', '370704', '坊子区', '370700'), ('1411', '370705', '奎文区', '370700'), ('1412', '370724', '临朐县', '370700'), ('1413', '370725', '昌乐县', '370700'), ('1414', '370781', '青州市', '370700'), ('1415', '370782', '诸城市', '370700'), ('1416', '370783', '寿光市', '370700'), ('1417', '370784', '安丘市', '370700'), ('1418', '370785', '高密市', '370700'), ('1419', '370786', '昌邑市', '370700'), ('1420', '370801', '市辖区', '370800'), ('1421', '370802', '市中区', '370800'), ('1422', '370811', '任城区', '370800'), ('1423', '370826', '微山县', '370800'), ('1424', '370827', '鱼台县', '370800'), ('1425', '370828', '金乡县', '370800'), ('1426', '370829', '嘉祥县', '370800'), ('1427', '370830', '汶上县', '370800'), ('1428', '370831', '泗水县', '370800'), ('1429', '370832', '梁山县', '370800'), ('1430', '370881', '曲阜市', '370800'), ('1431', '370882', '兖州市', '370800'), ('1432', '370883', '邹城市', '370800'), ('1433', '370901', '市辖区', '370900'), ('1434', '370902', '泰山区', '370900'), ('1435', '370903', '岱岳区', '370900'), ('1436', '370921', '宁阳县', '370900'), ('1437', '370923', '东平县', '370900'), ('1438', '370982', '新泰市', '370900'), ('1439', '370983', '肥城市', '370900'), ('1440', '371001', '市辖区', '371000'), ('1441', '371002', '环翠区', '371000'), ('1442', '371081', '文登市', '371000'), ('1443', '371082', '荣成市', '371000'), ('1444', '371083', '乳山市', '371000'), ('1445', '371101', '市辖区', '371100'), ('1446', '371102', '东港区', '371100'), ('1447', '371103', '岚山区', '371100'), ('1448', '371121', '五莲县', '371100'), ('1449', '371122', '莒　县', '371100'), ('1450', '371201', '市辖区', '371200'), ('1451', '371202', '莱城区', '371200'), ('1452', '371203', '钢城区', '371200'), ('1453', '371301', '市辖区', '371300'), ('1454', '371302', '兰山区', '371300'), ('1455', '371311', '罗庄区', '371300'), ('1456', '371312', '河东区', '371300'), ('1457', '371321', '沂南县', '371300'), ('1458', '371322', '郯城县', '371300'), ('1459', '371323', '沂水县', '371300'), ('1460', '371324', '苍山县', '371300'), ('1461', '371325', '费　县', '371300'), ('1462', '371326', '平邑县', '371300'), ('1463', '371327', '莒南县', '371300'), ('1464', '371328', '蒙阴县', '371300'), ('1465', '371329', '临沭县', '371300'), ('1466', '371401', '市辖区', '371400'), ('1467', '371402', '德城区', '371400'), ('1468', '371421', '陵　县', '371400'), ('1469', '371422', '宁津县', '371400'), ('1470', '371423', '庆云县', '371400'), ('1471', '371424', '临邑县', '371400'), ('1472', '371425', '齐河县', '371400'), ('1473', '371426', '平原县', '371400'), ('1474', '371427', '夏津县', '371400'), ('1475', '371428', '武城县', '371400'), ('1476', '371481', '乐陵市', '371400'), ('1477', '371482', '禹城市', '371400'), ('1478', '371501', '市辖区', '371500'), ('1479', '371502', '东昌府区', '371500'), ('1480', '371521', '阳谷县', '371500'), ('1481', '371522', '莘　县', '371500'), ('1482', '371523', '茌平县', '371500'), ('1483', '371524', '东阿县', '371500'), ('1484', '371525', '冠　县', '371500'), ('1485', '371526', '高唐县', '371500'), ('1486', '371581', '临清市', '371500'), ('1487', '371601', '市辖区', '371600'), ('1488', '371602', '滨城区', '371600'), ('1489', '371621', '惠民县', '371600'), ('1490', '371622', '阳信县', '371600'), ('1491', '371623', '无棣县', '371600'), ('1492', '371624', '沾化县', '371600'), ('1493', '371625', '博兴县', '371600'), ('1494', '371626', '邹平县', '371600'), ('1495', '371701', '市辖区', '371700'), ('1496', '371702', '牡丹区', '371700'), ('1497', '371721', '曹　县', '371700'), ('1498', '371722', '单　县', '371700'), ('1499', '371723', '成武县', '371700'), ('1500', '371724', '巨野县', '371700'), ('1501', '371725', '郓城县', '371700'), ('1502', '371726', '鄄城县', '371700'), ('1503', '371727', '定陶县', '371700'), ('1504', '371728', '东明县', '371700'), ('1505', '410101', '市辖区', '410100'), ('1506', '410102', '中原区', '410100'), ('1507', '410103', '二七区', '410100'), ('1508', '410104', '管城回族区', '410100'), ('1509', '410105', '金水区', '410100'), ('1510', '410106', '上街区', '410100'), ('1511', '410108', '邙山区', '410100'), ('1512', '410122', '中牟县', '410100'), ('1513', '410181', '巩义市', '410100'), ('1514', '410182', '荥阳市', '410100'), ('1515', '410183', '新密市', '410100'), ('1516', '410184', '新郑市', '410100'), ('1517', '410185', '登封市', '410100'), ('1518', '410201', '市辖区', '410200'), ('1519', '410202', '龙亭区', '410200'), ('1520', '410203', '顺河回族区', '410200'), ('1521', '410204', '鼓楼区', '410200'), ('1522', '410205', '南关区', '410200'), ('1523', '410211', '郊　区', '410200'), ('1524', '410221', '杞　县', '410200'), ('1525', '410222', '通许县', '410200'), ('1526', '410223', '尉氏县', '410200'), ('1527', '410224', '开封县', '410200'), ('1528', '410225', '兰考县', '410200'), ('1529', '410301', '市辖区', '410300'), ('1530', '410302', '老城区', '410300'), ('1531', '410303', '西工区', '410300'), ('1532', '410304', '廛河回族区', '410300'), ('1533', '410305', '涧西区', '410300'), ('1534', '410306', '吉利区', '410300'), ('1535', '410307', '洛龙区', '410300'), ('1536', '410322', '孟津县', '410300'), ('1537', '410323', '新安县', '410300'), ('1538', '410324', '栾川县', '410300'), ('1539', '410325', '嵩　县', '410300'), ('1540', '410326', '汝阳县', '410300'), ('1541', '410327', '宜阳县', '410300'), ('1542', '410328', '洛宁县', '410300'), ('1543', '410329', '伊川县', '410300'), ('1544', '410381', '偃师市', '410300'), ('1545', '410401', '市辖区', '410400'), ('1546', '410402', '新华区', '410400'), ('1547', '410403', '卫东区', '410400'), ('1548', '410404', '石龙区', '410400'), ('1549', '410411', '湛河区', '410400'), ('1550', '410421', '宝丰县', '410400'), ('1551', '410422', '叶　县', '410400'), ('1552', '410423', '鲁山县', '410400'), ('1553', '410425', '郏　县', '410400'), ('1554', '410481', '舞钢市', '410400'), ('1555', '410482', '汝州市', '410400'), ('1556', '410501', '市辖区', '410500'), ('1557', '410502', '文峰区', '410500'), ('1558', '410503', '北关区', '410500'), ('1559', '410505', '殷都区', '410500'), ('1560', '410506', '龙安区', '410500'), ('1561', '410522', '安阳县', '410500'), ('1562', '410523', '汤阴县', '410500'), ('1563', '410526', '滑　县', '410500'), ('1564', '410527', '内黄县', '410500'), ('1565', '410581', '林州市', '410500'), ('1566', '410601', '市辖区', '410600'), ('1567', '410602', '鹤山区', '410600'), ('1568', '410603', '山城区', '410600'), ('1569', '410611', '淇滨区', '410600'), ('1570', '410621', '浚　县', '410600'), ('1571', '410622', '淇　县', '410600'), ('1572', '410701', '市辖区', '410700'), ('1573', '410702', '红旗区', '410700'), ('1574', '410703', '卫滨区', '410700'), ('1575', '410704', '凤泉区', '410700'), ('1576', '410711', '牧野区', '410700'), ('1577', '410721', '新乡县', '410700'), ('1578', '410724', '获嘉县', '410700'), ('1579', '410725', '原阳县', '410700'), ('1580', '410726', '延津县', '410700'), ('1581', '410727', '封丘县', '410700'), ('1582', '410728', '长垣县', '410700'), ('1583', '410781', '卫辉市', '410700'), ('1584', '410782', '辉县市', '410700'), ('1585', '410801', '市辖区', '410800'), ('1586', '410802', '解放区', '410800'), ('1587', '410803', '中站区', '410800'), ('1588', '410804', '马村区', '410800'), ('1589', '410811', '山阳区', '410800'), ('1590', '410821', '修武县', '410800'), ('1591', '410822', '博爱县', '410800'), ('1592', '410823', '武陟县', '410800'), ('1593', '410825', '温　县', '410800'), ('1594', '410881', '济源市', '410800'), ('1595', '410882', '沁阳市', '410800'), ('1596', '410883', '孟州市', '410800'), ('1597', '410901', '市辖区', '410900'), ('1598', '410902', '华龙区', '410900'), ('1599', '410922', '清丰县', '410900'), ('1600', '410923', '南乐县', '410900'), ('1601', '410926', '范　县', '410900'), ('1602', '410927', '台前县', '410900'), ('1603', '410928', '濮阳县', '410900'), ('1604', '411001', '市辖区', '411000'), ('1605', '411002', '魏都区', '411000'), ('1606', '411023', '许昌县', '411000'), ('1607', '411024', '鄢陵县', '411000'), ('1608', '411025', '襄城县', '411000'), ('1609', '411081', '禹州市', '411000'), ('1610', '411082', '长葛市', '411000'), ('1611', '411101', '市辖区', '411100'), ('1612', '411102', '源汇区', '411100'), ('1613', '411103', '郾城区', '411100'), ('1614', '411104', '召陵区', '411100'), ('1615', '411121', '舞阳县', '411100'), ('1616', '411122', '临颍县', '411100'), ('1617', '411201', '市辖区', '411200'), ('1618', '411202', '湖滨区', '411200'), ('1619', '411221', '渑池县', '411200'), ('1620', '411222', '陕　县', '411200'), ('1621', '411224', '卢氏县', '411200'), ('1622', '411281', '义马市', '411200'), ('1623', '411282', '灵宝市', '411200'), ('1624', '411301', '市辖区', '411300'), ('1625', '411302', '宛城区', '411300'), ('1626', '411303', '卧龙区', '411300'), ('1627', '411321', '南召县', '411300'), ('1628', '411322', '方城县', '411300'), ('1629', '411323', '西峡县', '411300'), ('1630', '411324', '镇平县', '411300'), ('1631', '411325', '内乡县', '411300'), ('1632', '411326', '淅川县', '411300'), ('1633', '411327', '社旗县', '411300'), ('1634', '411328', '唐河县', '411300'), ('1635', '411329', '新野县', '411300'), ('1636', '411330', '桐柏县', '411300'), ('1637', '411381', '邓州市', '411300'), ('1638', '411401', '市辖区', '411400'), ('1639', '411402', '梁园区', '411400'), ('1640', '411403', '睢阳区', '411400'), ('1641', '411421', '民权县', '411400'), ('1642', '411422', '睢　县', '411400'), ('1643', '411423', '宁陵县', '411400'), ('1644', '411424', '柘城县', '411400'), ('1645', '411425', '虞城县', '411400'), ('1646', '411426', '夏邑县', '411400'), ('1647', '411481', '永城市', '411400'), ('1648', '411501', '市辖区', '411500'), ('1649', '411502', '师河区', '411500'), ('1650', '411503', '平桥区', '411500'), ('1651', '411521', '罗山县', '411500'), ('1652', '411522', '光山县', '411500'), ('1653', '411523', '新　县', '411500'), ('1654', '411524', '商城县', '411500'), ('1655', '411525', '固始县', '411500'), ('1656', '411526', '潢川县', '411500'), ('1657', '411527', '淮滨县', '411500'), ('1658', '411528', '息　县', '411500'), ('1659', '411601', '市辖区', '411600'), ('1660', '411602', '川汇区', '411600'), ('1661', '411621', '扶沟县', '411600'), ('1662', '411622', '西华县', '411600'), ('1663', '411623', '商水县', '411600'), ('1664', '411624', '沈丘县', '411600'), ('1665', '411625', '郸城县', '411600'), ('1666', '411626', '淮阳县', '411600'), ('1667', '411627', '太康县', '411600'), ('1668', '411628', '鹿邑县', '411600'), ('1669', '411681', '项城市', '411600'), ('1670', '411701', '市辖区', '411700'), ('1671', '411702', '驿城区', '411700'), ('1672', '411721', '西平县', '411700'), ('1673', '411722', '上蔡县', '411700'), ('1674', '411723', '平舆县', '411700'), ('1675', '411724', '正阳县', '411700'), ('1676', '411725', '确山县', '411700'), ('1677', '411726', '泌阳县', '411700'), ('1678', '411727', '汝南县', '411700'), ('1679', '411728', '遂平县', '411700'), ('1680', '411729', '新蔡县', '411700'), ('1681', '420101', '市辖区', '420100'), ('1682', '420102', '江岸区', '420100'), ('1683', '420103', '江汉区', '420100'), ('1684', '420104', '乔口区', '420100'), ('1685', '420105', '汉阳区', '420100'), ('1686', '420106', '武昌区', '420100'), ('1687', '420107', '青山区', '420100'), ('1688', '420111', '洪山区', '420100'), ('1689', '420112', '东西湖区', '420100'), ('1690', '420113', '汉南区', '420100'), ('1691', '420114', '蔡甸区', '420100'), ('1692', '420115', '江夏区', '420100'), ('1693', '420116', '黄陂区', '420100'), ('1694', '420117', '新洲区', '420100'), ('1695', '420201', '市辖区', '420200'), ('1696', '420202', '黄石港区', '420200'), ('1697', '420203', '西塞山区', '420200'), ('1698', '420204', '下陆区', '420200'), ('1699', '420205', '铁山区', '420200'), ('1700', '420222', '阳新县', '420200'), ('1701', '420281', '大冶市', '420200'), ('1702', '420301', '市辖区', '420300'), ('1703', '420302', '茅箭区', '420300'), ('1704', '420303', '张湾区', '420300'), ('1705', '420321', '郧　县', '420300'), ('1706', '420322', '郧西县', '420300'), ('1707', '420323', '竹山县', '420300'), ('1708', '420324', '竹溪县', '420300'), ('1709', '420325', '房　县', '420300'), ('1710', '420381', '丹江口市', '420300'), ('1711', '420501', '市辖区', '420500'), ('1712', '420502', '西陵区', '420500'), ('1713', '420503', '伍家岗区', '420500'), ('1714', '420504', '点军区', '420500'), ('1715', '420505', '猇亭区', '420500'), ('1716', '420506', '夷陵区', '420500'), ('1717', '420525', '远安县', '420500'), ('1718', '420526', '兴山县', '420500'), ('1719', '420527', '秭归县', '420500'), ('1720', '420528', '长阳土家族自治县', '420500'), ('1721', '420529', '五峰土家族自治县', '420500'), ('1722', '420581', '宜都市', '420500'), ('1723', '420582', '当阳市', '420500'), ('1724', '420583', '枝江市', '420500'), ('1725', '420601', '市辖区', '420600'), ('1726', '420602', '襄城区', '420600'), ('1727', '420606', '樊城区', '420600'), ('1728', '420607', '襄阳区', '420600'), ('1729', '420624', '南漳县', '420600'), ('1730', '420625', '谷城县', '420600'), ('1731', '420626', '保康县', '420600'), ('1732', '420682', '老河口市', '420600'), ('1733', '420683', '枣阳市', '420600'), ('1734', '420684', '宜城市', '420600'), ('1735', '420701', '市辖区', '420700'), ('1736', '420702', '梁子湖区', '420700'), ('1737', '420703', '华容区', '420700'), ('1738', '420704', '鄂城区', '420700'), ('1739', '420801', '市辖区', '420800'), ('1740', '420802', '东宝区', '420800'), ('1741', '420804', '掇刀区', '420800'), ('1742', '420821', '京山县', '420800'), ('1743', '420822', '沙洋县', '420800'), ('1744', '420881', '钟祥市', '420800'), ('1745', '420901', '市辖区', '420900'), ('1746', '420902', '孝南区', '420900'), ('1747', '420921', '孝昌县', '420900'), ('1748', '420922', '大悟县', '420900'), ('1749', '420923', '云梦县', '420900'), ('1750', '420981', '应城市', '420900'), ('1751', '420982', '安陆市', '420900'), ('1752', '420984', '汉川市', '420900'), ('1753', '421001', '市辖区', '421000'), ('1754', '421002', '沙市区', '421000'), ('1755', '421003', '荆州区', '421000'), ('1756', '421022', '公安县', '421000'), ('1757', '421023', '监利县', '421000'), ('1758', '421024', '江陵县', '421000'), ('1759', '421081', '石首市', '421000'), ('1760', '421083', '洪湖市', '421000'), ('1761', '421087', '松滋市', '421000'), ('1762', '421101', '市辖区', '421100'), ('1763', '421102', '黄州区', '421100'), ('1764', '421121', '团风县', '421100'), ('1765', '421122', '红安县', '421100'), ('1766', '421123', '罗田县', '421100'), ('1767', '421124', '英山县', '421100'), ('1768', '421125', '浠水县', '421100'), ('1769', '421126', '蕲春县', '421100'), ('1770', '421127', '黄梅县', '421100'), ('1771', '421181', '麻城市', '421100'), ('1772', '421182', '武穴市', '421100'), ('1773', '421201', '市辖区', '421200'), ('1774', '421202', '咸安区', '421200'), ('1775', '421221', '嘉鱼县', '421200'), ('1776', '421222', '通城县', '421200'), ('1777', '421223', '崇阳县', '421200'), ('1778', '421224', '通山县', '421200'), ('1779', '421281', '赤壁市', '421200'), ('1780', '421301', '市辖区', '421300'), ('1781', '421302', '曾都区', '421300'), ('1782', '421381', '广水市', '421300'), ('1783', '422801', '恩施市', '422800'), ('1784', '422802', '利川市', '422800'), ('1785', '422822', '建始县', '422800'), ('1786', '422823', '巴东县', '422800'), ('1787', '422825', '宣恩县', '422800'), ('1788', '422826', '咸丰县', '422800'), ('1789', '422827', '来凤县', '422800'), ('1790', '422828', '鹤峰县', '422800'), ('1791', '429004', '仙桃市', '429000'), ('1792', '429005', '潜江市', '429000'), ('1793', '429006', '天门市', '429000'); -INSERT INTO `t_area` VALUES ('1794', '429021', '神农架林区', '429000'), ('1795', '430101', '市辖区', '430100'), ('1796', '430102', '芙蓉区', '430100'), ('1797', '430103', '天心区', '430100'), ('1798', '430104', '岳麓区', '430100'), ('1799', '430105', '开福区', '430100'), ('1800', '430111', '雨花区', '430100'), ('1801', '430121', '长沙县', '430100'), ('1802', '430122', '望城县', '430100'), ('1803', '430124', '宁乡县', '430100'), ('1804', '430181', '浏阳市', '430100'), ('1805', '430201', '市辖区', '430200'), ('1806', '430202', '荷塘区', '430200'), ('1807', '430203', '芦淞区', '430200'), ('1808', '430204', '石峰区', '430200'), ('1809', '430211', '天元区', '430200'), ('1810', '430221', '株洲县', '430200'), ('1811', '430223', '攸　县', '430200'), ('1812', '430224', '茶陵县', '430200'), ('1813', '430225', '炎陵县', '430200'), ('1814', '430281', '醴陵市', '430200'), ('1815', '430301', '市辖区', '430300'), ('1816', '430302', '雨湖区', '430300'), ('1817', '430304', '岳塘区', '430300'), ('1818', '430321', '湘潭县', '430300'), ('1819', '430381', '湘乡市', '430300'), ('1820', '430382', '韶山市', '430300'), ('1821', '430401', '市辖区', '430400'), ('1822', '430405', '珠晖区', '430400'), ('1823', '430406', '雁峰区', '430400'), ('1824', '430407', '石鼓区', '430400'), ('1825', '430408', '蒸湘区', '430400'), ('1826', '430412', '南岳区', '430400'), ('1827', '430421', '衡阳县', '430400'), ('1828', '430422', '衡南县', '430400'), ('1829', '430423', '衡山县', '430400'), ('1830', '430424', '衡东县', '430400'), ('1831', '430426', '祁东县', '430400'), ('1832', '430481', '耒阳市', '430400'), ('1833', '430482', '常宁市', '430400'), ('1834', '430501', '市辖区', '430500'), ('1835', '430502', '双清区', '430500'), ('1836', '430503', '大祥区', '430500'), ('1837', '430511', '北塔区', '430500'), ('1838', '430521', '邵东县', '430500'), ('1839', '430522', '新邵县', '430500'), ('1840', '430523', '邵阳县', '430500'), ('1841', '430524', '隆回县', '430500'), ('1842', '430525', '洞口县', '430500'), ('1843', '430527', '绥宁县', '430500'), ('1844', '430528', '新宁县', '430500'), ('1845', '430529', '城步苗族自治县', '430500'), ('1846', '430581', '武冈市', '430500'), ('1847', '430601', '市辖区', '430600'), ('1848', '430602', '岳阳楼区', '430600'), ('1849', '430603', '云溪区', '430600'), ('1850', '430611', '君山区', '430600'), ('1851', '430621', '岳阳县', '430600'), ('1852', '430623', '华容县', '430600'), ('1853', '430624', '湘阴县', '430600'), ('1854', '430626', '平江县', '430600'), ('1855', '430681', '汨罗市', '430600'), ('1856', '430682', '临湘市', '430600'), ('1857', '430701', '市辖区', '430700'), ('1858', '430702', '武陵区', '430700'), ('1859', '430703', '鼎城区', '430700'), ('1860', '430721', '安乡县', '430700'), ('1861', '430722', '汉寿县', '430700'), ('1862', '430723', '澧　县', '430700'), ('1863', '430724', '临澧县', '430700'), ('1864', '430725', '桃源县', '430700'), ('1865', '430726', '石门县', '430700'), ('1866', '430781', '津市市', '430700'), ('1867', '430801', '市辖区', '430800'), ('1868', '430802', '永定区', '430800'), ('1869', '430811', '武陵源区', '430800'), ('1870', '430821', '慈利县', '430800'), ('1871', '430822', '桑植县', '430800'), ('1872', '430901', '市辖区', '430900'), ('1873', '430902', '资阳区', '430900'), ('1874', '430903', '赫山区', '430900'), ('1875', '430921', '南　县', '430900'), ('1876', '430922', '桃江县', '430900'), ('1877', '430923', '安化县', '430900'), ('1878', '430981', '沅江市', '430900'), ('1879', '431001', '市辖区', '431000'), ('1880', '431002', '北湖区', '431000'), ('1881', '431003', '苏仙区', '431000'), ('1882', '431021', '桂阳县', '431000'), ('1883', '431022', '宜章县', '431000'), ('1884', '431023', '永兴县', '431000'), ('1885', '431024', '嘉禾县', '431000'), ('1886', '431025', '临武县', '431000'), ('1887', '431026', '汝城县', '431000'), ('1888', '431027', '桂东县', '431000'), ('1889', '431028', '安仁县', '431000'), ('1890', '431081', '资兴市', '431000'), ('1891', '431101', '市辖区', '431100'), ('1892', '431102', '芝山区', '431100'), ('1893', '431103', '冷水滩区', '431100'), ('1894', '431121', '祁阳县', '431100'), ('1895', '431122', '东安县', '431100'), ('1896', '431123', '双牌县', '431100'), ('1897', '431124', '道　县', '431100'), ('1898', '431125', '江永县', '431100'), ('1899', '431126', '宁远县', '431100'), ('1900', '431127', '蓝山县', '431100'), ('1901', '431128', '新田县', '431100'), ('1902', '431129', '江华瑶族自治县', '431100'), ('1903', '431201', '市辖区', '431200'), ('1904', '431202', '鹤城区', '431200'), ('1905', '431221', '中方县', '431200'), ('1906', '431222', '沅陵县', '431200'), ('1907', '431223', '辰溪县', '431200'), ('1908', '431224', '溆浦县', '431200'), ('1909', '431225', '会同县', '431200'), ('1910', '431226', '麻阳苗族自治县', '431200'), ('1911', '431227', '新晃侗族自治县', '431200'), ('1912', '431228', '芷江侗族自治县', '431200'), ('1913', '431229', '靖州苗族侗族自治县', '431200'), ('1914', '431230', '通道侗族自治县', '431200'), ('1915', '431281', '洪江市', '431200'), ('1916', '431301', '市辖区', '431300'), ('1917', '431302', '娄星区', '431300'), ('1918', '431321', '双峰县', '431300'), ('1919', '431322', '新化县', '431300'), ('1920', '431381', '冷水江市', '431300'), ('1921', '431382', '涟源市', '431300'), ('1922', '433101', '吉首市', '433100'), ('1923', '433122', '泸溪县', '433100'), ('1924', '433123', '凤凰县', '433100'), ('1925', '433124', '花垣县', '433100'), ('1926', '433125', '保靖县', '433100'), ('1927', '433126', '古丈县', '433100'), ('1928', '433127', '永顺县', '433100'), ('1929', '433130', '龙山县', '433100'), ('1930', '440101', '市辖区', '440100'), ('1931', '440102', '东山区', '440100'), ('1932', '440103', '荔湾区', '440100'), ('1933', '440104', '越秀区', '440100'), ('1934', '440105', '海珠区', '440100'), ('1935', '440106', '天河区', '440100'), ('1936', '440107', '芳村区', '440100'), ('1937', '440111', '白云区', '440100'), ('1938', '440112', '黄埔区', '440100'), ('1939', '440113', '番禺区', '440100'), ('1940', '440114', '花都区', '440100'), ('1941', '440183', '增城市', '440100'), ('1942', '440184', '从化市', '440100'), ('1943', '440201', '市辖区', '440200'), ('1944', '440203', '武江区', '440200'), ('1945', '440204', '浈江区', '440200'), ('1946', '440205', '曲江区', '440200'), ('1947', '440222', '始兴县', '440200'), ('1948', '440224', '仁化县', '440200'), ('1949', '440229', '翁源县', '440200'), ('1950', '440232', '乳源瑶族自治县', '440200'), ('1951', '440233', '新丰县', '440200'), ('1952', '440281', '乐昌市', '440200'), ('1953', '440282', '南雄市', '440200'), ('1954', '440301', '市辖区', '440300'), ('1955', '440303', '罗湖区', '440300'), ('1956', '440304', '福田区', '440300'), ('1957', '440305', '南山区', '440300'), ('1958', '440306', '宝安区', '440300'), ('1959', '440307', '龙岗区', '440300'), ('1960', '440308', '盐田区', '440300'), ('1961', '440401', '市辖区', '440400'), ('1962', '440402', '香洲区', '440400'), ('1963', '440403', '斗门区', '440400'), ('1964', '440404', '金湾区', '440400'), ('1965', '440501', '市辖区', '440500'), ('1966', '440507', '龙湖区', '440500'), ('1967', '440511', '金平区', '440500'), ('1968', '440512', '濠江区', '440500'), ('1969', '440513', '潮阳区', '440500'), ('1970', '440514', '潮南区', '440500'), ('1971', '440515', '澄海区', '440500'), ('1972', '440523', '南澳县', '440500'), ('1973', '440601', '市辖区', '440600'), ('1974', '440604', '禅城区', '440600'), ('1975', '440605', '南海区', '440600'), ('1976', '440606', '顺德区', '440600'), ('1977', '440607', '三水区', '440600'), ('1978', '440608', '高明区', '440600'), ('1979', '440701', '市辖区', '440700'), ('1980', '440703', '蓬江区', '440700'), ('1981', '440704', '江海区', '440700'), ('1982', '440705', '新会区', '440700'), ('1983', '440781', '台山市', '440700'), ('1984', '440783', '开平市', '440700'), ('1985', '440784', '鹤山市', '440700'), ('1986', '440785', '恩平市', '440700'), ('1987', '440801', '市辖区', '440800'), ('1988', '440802', '赤坎区', '440800'), ('1989', '440803', '霞山区', '440800'), ('1990', '440804', '坡头区', '440800'), ('1991', '440811', '麻章区', '440800'), ('1992', '440823', '遂溪县', '440800'), ('1993', '440825', '徐闻县', '440800'), ('1994', '440881', '廉江市', '440800'), ('1995', '440882', '雷州市', '440800'), ('1996', '440883', '吴川市', '440800'), ('1997', '440901', '市辖区', '440900'), ('1998', '440902', '茂南区', '440900'), ('1999', '440903', '茂港区', '440900'), ('2000', '440923', '电白县', '440900'), ('2001', '440981', '高州市', '440900'), ('2002', '440982', '化州市', '440900'), ('2003', '440983', '信宜市', '440900'), ('2004', '441201', '市辖区', '441200'), ('2005', '441202', '端州区', '441200'), ('2006', '441203', '鼎湖区', '441200'), ('2007', '441223', '广宁县', '441200'), ('2008', '441224', '怀集县', '441200'), ('2009', '441225', '封开县', '441200'), ('2010', '441226', '德庆县', '441200'), ('2011', '441283', '高要市', '441200'), ('2012', '441284', '四会市', '441200'), ('2013', '441301', '市辖区', '441300'), ('2014', '441302', '惠城区', '441300'), ('2015', '441303', '惠阳区', '441300'), ('2016', '441322', '博罗县', '441300'), ('2017', '441323', '惠东县', '441300'), ('2018', '441324', '龙门县', '441300'), ('2019', '441401', '市辖区', '441400'), ('2020', '441402', '梅江区', '441400'), ('2021', '441421', '梅　县', '441400'), ('2022', '441422', '大埔县', '441400'), ('2023', '441423', '丰顺县', '441400'), ('2024', '441424', '五华县', '441400'), ('2025', '441426', '平远县', '441400'), ('2026', '441427', '蕉岭县', '441400'), ('2027', '441481', '兴宁市', '441400'), ('2028', '441501', '市辖区', '441500'), ('2029', '441502', '城　区', '441500'), ('2030', '441521', '海丰县', '441500'), ('2031', '441523', '陆河县', '441500'), ('2032', '441581', '陆丰市', '441500'), ('2033', '441601', '市辖区', '441600'), ('2034', '441602', '源城区', '441600'), ('2035', '441621', '紫金县', '441600'), ('2036', '441622', '龙川县', '441600'), ('2037', '441623', '连平县', '441600'), ('2038', '441624', '和平县', '441600'), ('2039', '441625', '东源县', '441600'), ('2040', '441701', '市辖区', '441700'), ('2041', '441702', '江城区', '441700'), ('2042', '441721', '阳西县', '441700'), ('2043', '441723', '阳东县', '441700'), ('2044', '441781', '阳春市', '441700'), ('2045', '441801', '市辖区', '441800'), ('2046', '441802', '清城区', '441800'), ('2047', '441821', '佛冈县', '441800'), ('2048', '441823', '阳山县', '441800'), ('2049', '441825', '连山壮族瑶族自治县', '441800'), ('2050', '441826', '连南瑶族自治县', '441800'), ('2051', '441827', '清新县', '441800'), ('2052', '441881', '英德市', '441800'), ('2053', '441882', '连州市', '441800'), ('2054', '445101', '市辖区', '445100'), ('2055', '445102', '湘桥区', '445100'), ('2056', '445121', '潮安县', '445100'), ('2057', '445122', '饶平县', '445100'), ('2058', '445201', '市辖区', '445200'), ('2059', '445202', '榕城区', '445200'), ('2060', '445221', '揭东县', '445200'), ('2061', '445222', '揭西县', '445200'), ('2062', '445224', '惠来县', '445200'), ('2063', '445281', '普宁市', '445200'), ('2064', '445301', '市辖区', '445300'), ('2065', '445302', '云城区', '445300'), ('2066', '445321', '新兴县', '445300'), ('2067', '445322', '郁南县', '445300'), ('2068', '445323', '云安县', '445300'), ('2069', '445381', '罗定市', '445300'), ('2070', '450101', '市辖区', '450100'), ('2071', '450102', '兴宁区', '450100'), ('2072', '450103', '青秀区', '450100'), ('2073', '450105', '江南区', '450100'), ('2074', '450107', '西乡塘区', '450100'), ('2075', '450108', '良庆区', '450100'), ('2076', '450109', '邕宁区', '450100'), ('2077', '450122', '武鸣县', '450100'), ('2078', '450123', '隆安县', '450100'), ('2079', '450124', '马山县', '450100'), ('2080', '450125', '上林县', '450100'), ('2081', '450126', '宾阳县', '450100'), ('2082', '450127', '横　县', '450100'), ('2083', '450201', '市辖区', '450200'), ('2084', '450202', '城中区', '450200'), ('2085', '450203', '鱼峰区', '450200'), ('2086', '450204', '柳南区', '450200'), ('2087', '450205', '柳北区', '450200'), ('2088', '450221', '柳江县', '450200'), ('2089', '450222', '柳城县', '450200'), ('2090', '450223', '鹿寨县', '450200'), ('2091', '450224', '融安县', '450200'), ('2092', '450225', '融水苗族自治县', '450200'), ('2093', '450226', '三江侗族自治县', '450200'), ('2094', '450301', '市辖区', '450300'), ('2095', '450302', '秀峰区', '450300'), ('2096', '450303', '叠彩区', '450300'), ('2097', '450304', '象山区', '450300'), ('2098', '450305', '七星区', '450300'), ('2099', '450311', '雁山区', '450300'), ('2100', '450321', '阳朔县', '450300'), ('2101', '450322', '临桂县', '450300'), ('2102', '450323', '灵川县', '450300'), ('2103', '450324', '全州县', '450300'), ('2104', '450325', '兴安县', '450300'), ('2105', '450326', '永福县', '450300'), ('2106', '450327', '灌阳县', '450300'), ('2107', '450328', '龙胜各族自治县', '450300'), ('2108', '450329', '资源县', '450300'), ('2109', '450330', '平乐县', '450300'), ('2110', '450331', '荔蒲县', '450300'), ('2111', '450332', '恭城瑶族自治县', '450300'), ('2112', '450401', '市辖区', '450400'), ('2113', '450403', '万秀区', '450400'), ('2114', '450404', '蝶山区', '450400'), ('2115', '450405', '长洲区', '450400'), ('2116', '450421', '苍梧县', '450400'), ('2117', '450422', '藤　县', '450400'), ('2118', '450423', '蒙山县', '450400'), ('2119', '450481', '岑溪市', '450400'), ('2120', '450501', '市辖区', '450500'), ('2121', '450502', '海城区', '450500'), ('2122', '450503', '银海区', '450500'), ('2123', '450512', '铁山港区', '450500'), ('2124', '450521', '合浦县', '450500'), ('2125', '450601', '市辖区', '450600'), ('2126', '450602', '港口区', '450600'), ('2127', '450603', '防城区', '450600'), ('2128', '450621', '上思县', '450600'), ('2129', '450681', '东兴市', '450600'), ('2130', '450701', '市辖区', '450700'), ('2131', '450702', '钦南区', '450700'), ('2132', '450703', '钦北区', '450700'), ('2133', '450721', '灵山县', '450700'), ('2134', '450722', '浦北县', '450700'), ('2135', '450801', '市辖区', '450800'), ('2136', '450802', '港北区', '450800'), ('2137', '450803', '港南区', '450800'), ('2138', '450804', '覃塘区', '450800'), ('2139', '450821', '平南县', '450800'), ('2140', '450881', '桂平市', '450800'), ('2141', '450901', '市辖区', '450900'), ('2142', '450902', '玉州区', '450900'), ('2143', '450921', '容　县', '450900'), ('2144', '450922', '陆川县', '450900'), ('2145', '450923', '博白县', '450900'), ('2146', '450924', '兴业县', '450900'), ('2147', '450981', '北流市', '450900'), ('2148', '451001', '市辖区', '451000'), ('2149', '451002', '右江区', '451000'), ('2150', '451021', '田阳县', '451000'), ('2151', '451022', '田东县', '451000'), ('2152', '451023', '平果县', '451000'), ('2153', '451024', '德保县', '451000'), ('2154', '451025', '靖西县', '451000'), ('2155', '451026', '那坡县', '451000'), ('2156', '451027', '凌云县', '451000'), ('2157', '451028', '乐业县', '451000'), ('2158', '451029', '田林县', '451000'), ('2159', '451030', '西林县', '451000'), ('2160', '451031', '隆林各族自治县', '451000'), ('2161', '451101', '市辖区', '451100'), ('2162', '451102', '八步区', '451100'), ('2163', '451121', '昭平县', '451100'), ('2164', '451122', '钟山县', '451100'), ('2165', '451123', '富川瑶族自治县', '451100'), ('2166', '451201', '市辖区', '451200'), ('2167', '451202', '金城江区', '451200'), ('2168', '451221', '南丹县', '451200'), ('2169', '451222', '天峨县', '451200'), ('2170', '451223', '凤山县', '451200'), ('2171', '451224', '东兰县', '451200'), ('2172', '451225', '罗城仫佬族自治县', '451200'), ('2173', '451226', '环江毛南族自治县', '451200'), ('2174', '451227', '巴马瑶族自治县', '451200'), ('2175', '451228', '都安瑶族自治县', '451200'), ('2176', '451229', '大化瑶族自治县', '451200'), ('2177', '451281', '宜州市', '451200'), ('2178', '451301', '市辖区', '451300'), ('2179', '451302', '兴宾区', '451300'), ('2180', '451321', '忻城县', '451300'), ('2181', '451322', '象州县', '451300'), ('2182', '451323', '武宣县', '451300'), ('2183', '451324', '金秀瑶族自治县', '451300'), ('2184', '451381', '合山市', '451300'), ('2185', '451401', '市辖区', '451400'), ('2186', '451402', '江洲区', '451400'), ('2187', '451421', '扶绥县', '451400'), ('2188', '451422', '宁明县', '451400'), ('2189', '451423', '龙州县', '451400'), ('2190', '451424', '大新县', '451400'), ('2191', '451425', '天等县', '451400'), ('2192', '451481', '凭祥市', '451400'), ('2193', '460101', '市辖区', '460100'), ('2194', '460105', '秀英区', '460100'), ('2195', '460106', '龙华区', '460100'), ('2196', '460107', '琼山区', '460100'), ('2197', '460108', '美兰区', '460100'), ('2198', '460201', '市辖区', '460200'), ('2199', '469001', '五指山市', '469000'), ('2200', '469002', '琼海市', '469000'), ('2201', '469003', '儋州市', '469000'), ('2202', '469005', '文昌市', '469000'), ('2203', '469006', '万宁市', '469000'), ('2204', '469007', '东方市', '469000'), ('2205', '469025', '定安县', '469000'), ('2206', '469026', '屯昌县', '469000'), ('2207', '469027', '澄迈县', '469000'), ('2208', '469028', '临高县', '469000'), ('2209', '469030', '白沙黎族自治县', '469000'), ('2210', '469031', '昌江黎族自治县', '469000'), ('2211', '469033', '乐东黎族自治县', '469000'), ('2212', '469034', '陵水黎族自治县', '469000'), ('2213', '469035', '保亭黎族苗族自治县', '469000'), ('2214', '469036', '琼中黎族苗族自治县', '469000'), ('2215', '469037', '西沙群岛', '469000'), ('2216', '469038', '南沙群岛', '469000'), ('2217', '469039', '中沙群岛的岛礁及其海域', '469000'), ('2218', '500101', '万州区', '500100'), ('2219', '500102', '涪陵区', '500100'), ('2220', '500103', '渝中区', '500100'), ('2221', '500104', '大渡口区', '500100'), ('2222', '500105', '江北区', '500100'), ('2223', '500106', '沙坪坝区', '500100'), ('2224', '500107', '九龙坡区', '500100'), ('2225', '500108', '南岸区', '500100'), ('2226', '500109', '北碚区', '500100'), ('2227', '500110', '万盛区', '500100'), ('2228', '500111', '双桥区', '500100'), ('2229', '500112', '渝北区', '500100'), ('2230', '500113', '巴南区', '500100'), ('2231', '500114', '黔江区', '500100'), ('2232', '500115', '长寿区', '500100'), ('2233', '500222', '綦江县', '500200'), ('2234', '500223', '潼南县', '500200'), ('2235', '500224', '铜梁县', '500200'), ('2236', '500225', '大足县', '500200'), ('2237', '500226', '荣昌县', '500200'), ('2238', '500227', '璧山县', '500200'), ('2239', '500228', '梁平县', '500200'), ('2240', '500229', '城口县', '500200'), ('2241', '500230', '丰都县', '500200'), ('2242', '500231', '垫江县', '500200'), ('2243', '500232', '武隆县', '500200'), ('2244', '500233', '忠　县', '500200'), ('2245', '500234', '开　县', '500200'), ('2246', '500235', '云阳县', '500200'), ('2247', '500236', '奉节县', '500200'), ('2248', '500237', '巫山县', '500200'), ('2249', '500238', '巫溪县', '500200'), ('2250', '500240', '石柱土家族自治县', '500200'), ('2251', '500241', '秀山土家族苗族自治县', '500200'), ('2252', '500242', '酉阳土家族苗族自治县', '500200'), ('2253', '500243', '彭水苗族土家族自治县', '500200'), ('2254', '500381', '江津市', '500300'), ('2255', '500382', '合川市', '500300'), ('2256', '500383', '永川市', '500300'), ('2257', '500384', '南川市', '500300'), ('2258', '510101', '市辖区', '510100'), ('2259', '510104', '锦江区', '510100'), ('2260', '510105', '青羊区', '510100'), ('2261', '510106', '金牛区', '510100'), ('2262', '510107', '武侯区', '510100'), ('2263', '510108', '成华区', '510100'), ('2264', '510112', '龙泉驿区', '510100'), ('2265', '510113', '青白江区', '510100'), ('2266', '510114', '新都区', '510100'), ('2267', '510115', '温江区', '510100'), ('2268', '510121', '金堂县', '510100'), ('2269', '510122', '双流县', '510100'), ('2270', '510124', '郫　县', '510100'), ('2271', '510129', '大邑县', '510100'), ('2272', '510131', '蒲江县', '510100'), ('2273', '510132', '新津县', '510100'), ('2274', '510181', '都江堰市', '510100'), ('2275', '510182', '彭州市', '510100'), ('2276', '510183', '邛崃市', '510100'), ('2277', '510184', '崇州市', '510100'), ('2278', '510301', '市辖区', '510300'), ('2279', '510302', '自流井区', '510300'), ('2280', '510303', '贡井区', '510300'), ('2281', '510304', '大安区', '510300'), ('2282', '510311', '沿滩区', '510300'), ('2283', '510321', '荣　县', '510300'), ('2284', '510322', '富顺县', '510300'), ('2285', '510401', '市辖区', '510400'), ('2286', '510402', '东　区', '510400'), ('2287', '510403', '西　区', '510400'), ('2288', '510411', '仁和区', '510400'), ('2289', '510421', '米易县', '510400'), ('2290', '510422', '盐边县', '510400'), ('2291', '510501', '市辖区', '510500'), ('2292', '510502', '江阳区', '510500'), ('2293', '510503', '纳溪区', '510500'), ('2294', '510504', '龙马潭区', '510500'), ('2295', '510521', '泸　县', '510500'), ('2296', '510522', '合江县', '510500'), ('2297', '510524', '叙永县', '510500'), ('2298', '510525', '古蔺县', '510500'), ('2299', '510601', '市辖区', '510600'), ('2300', '510603', '旌阳区', '510600'), ('2301', '510623', '中江县', '510600'), ('2302', '510626', '罗江县', '510600'), ('2303', '510681', '广汉市', '510600'), ('2304', '510682', '什邡市', '510600'), ('2305', '510683', '绵竹市', '510600'), ('2306', '510701', '市辖区', '510700'), ('2307', '510703', '涪城区', '510700'), ('2308', '510704', '游仙区', '510700'), ('2309', '510722', '三台县', '510700'), ('2310', '510723', '盐亭县', '510700'), ('2311', '510724', '安　县', '510700'), ('2312', '510725', '梓潼县', '510700'), ('2313', '510726', '北川羌族自治县', '510700'), ('2314', '510727', '平武县', '510700'), ('2315', '510781', '江油市', '510700'), ('2316', '510801', '市辖区', '510800'), ('2317', '510802', '市中区', '510800'), ('2318', '510811', '元坝区', '510800'), ('2319', '510812', '朝天区', '510800'), ('2320', '510821', '旺苍县', '510800'), ('2321', '510822', '青川县', '510800'), ('2322', '510823', '剑阁县', '510800'), ('2323', '510824', '苍溪县', '510800'), ('2324', '510901', '市辖区', '510900'), ('2325', '510903', '船山区', '510900'), ('2326', '510904', '安居区', '510900'), ('2327', '510921', '蓬溪县', '510900'), ('2328', '510922', '射洪县', '510900'), ('2329', '510923', '大英县', '510900'), ('2330', '511001', '市辖区', '511000'), ('2331', '511002', '市中区', '511000'), ('2332', '511011', '东兴区', '511000'), ('2333', '511024', '威远县', '511000'), ('2334', '511025', '资中县', '511000'), ('2335', '511028', '隆昌县', '511000'), ('2336', '511101', '市辖区', '511100'), ('2337', '511102', '市中区', '511100'), ('2338', '511111', '沙湾区', '511100'), ('2339', '511112', '五通桥区', '511100'), ('2340', '511113', '金口河区', '511100'), ('2341', '511123', '犍为县', '511100'), ('2342', '511124', '井研县', '511100'), ('2343', '511126', '夹江县', '511100'), ('2344', '511129', '沐川县', '511100'), ('2345', '511132', '峨边彝族自治县', '511100'), ('2346', '511133', '马边彝族自治县', '511100'), ('2347', '511181', '峨眉山市', '511100'), ('2348', '511301', '市辖区', '511300'), ('2349', '511302', '顺庆区', '511300'), ('2350', '511303', '高坪区', '511300'), ('2351', '511304', '嘉陵区', '511300'), ('2352', '511321', '南部县', '511300'), ('2353', '511322', '营山县', '511300'), ('2354', '511323', '蓬安县', '511300'), ('2355', '511324', '仪陇县', '511300'), ('2356', '511325', '西充县', '511300'), ('2357', '511381', '阆中市', '511300'), ('2358', '511401', '市辖区', '511400'), ('2359', '511402', '东坡区', '511400'), ('2360', '511421', '仁寿县', '511400'), ('2361', '511422', '彭山县', '511400'), ('2362', '511423', '洪雅县', '511400'), ('2363', '511424', '丹棱县', '511400'), ('2364', '511425', '青神县', '511400'), ('2365', '511501', '市辖区', '511500'), ('2366', '511502', '翠屏区', '511500'), ('2367', '511521', '宜宾县', '511500'), ('2368', '511522', '南溪县', '511500'), ('2369', '511523', '江安县', '511500'), ('2370', '511524', '长宁县', '511500'), ('2371', '511525', '高　县', '511500'), ('2372', '511526', '珙　县', '511500'), ('2373', '511527', '筠连县', '511500'), ('2374', '511528', '兴文县', '511500'), ('2375', '511529', '屏山县', '511500'), ('2376', '511601', '市辖区', '511600'), ('2377', '511602', '广安区', '511600'), ('2378', '511621', '岳池县', '511600'), ('2379', '511622', '武胜县', '511600'), ('2380', '511623', '邻水县', '511600'), ('2381', '511681', '华莹市', '511600'), ('2382', '511701', '市辖区', '511700'), ('2383', '511702', '通川区', '511700'), ('2384', '511721', '达　县', '511700'), ('2385', '511722', '宣汉县', '511700'), ('2386', '511723', '开江县', '511700'), ('2387', '511724', '大竹县', '511700'), ('2388', '511725', '渠　县', '511700'), ('2389', '511781', '万源市', '511700'), ('2390', '511801', '市辖区', '511800'), ('2391', '511802', '雨城区', '511800'), ('2392', '511821', '名山县', '511800'), ('2393', '511822', '荥经县', '511800'), ('2394', '511823', '汉源县', '511800'), ('2395', '511824', '石棉县', '511800'), ('2396', '511825', '天全县', '511800'), ('2397', '511826', '芦山县', '511800'), ('2398', '511827', '宝兴县', '511800'), ('2399', '511901', '市辖区', '511900'), ('2400', '511902', '巴州区', '511900'), ('2401', '511921', '通江县', '511900'), ('2402', '511922', '南江县', '511900'), ('2403', '511923', '平昌县', '511900'), ('2404', '512001', '市辖区', '512000'), ('2405', '512002', '雁江区', '512000'), ('2406', '512021', '安岳县', '512000'), ('2407', '512022', '乐至县', '512000'), ('2408', '512081', '简阳市', '512000'), ('2409', '513221', '汶川县', '513200'), ('2410', '513222', '理　县', '513200'), ('2411', '513223', '茂　县', '513200'), ('2412', '513224', '松潘县', '513200'), ('2413', '513225', '九寨沟县', '513200'), ('2414', '513226', '金川县', '513200'), ('2415', '513227', '小金县', '513200'), ('2416', '513228', '黑水县', '513200'), ('2417', '513229', '马尔康县', '513200'), ('2418', '513230', '壤塘县', '513200'), ('2419', '513231', '阿坝县', '513200'), ('2420', '513232', '若尔盖县', '513200'), ('2421', '513233', '红原县', '513200'), ('2422', '513321', '康定县', '513300'), ('2423', '513322', '泸定县', '513300'), ('2424', '513323', '丹巴县', '513300'), ('2425', '513324', '九龙县', '513300'), ('2426', '513325', '雅江县', '513300'), ('2427', '513326', '道孚县', '513300'), ('2428', '513327', '炉霍县', '513300'), ('2429', '513328', '甘孜县', '513300'), ('2430', '513329', '新龙县', '513300'), ('2431', '513330', '德格县', '513300'), ('2432', '513331', '白玉县', '513300'), ('2433', '513332', '石渠县', '513300'), ('2434', '513333', '色达县', '513300'), ('2435', '513334', '理塘县', '513300'), ('2436', '513335', '巴塘县', '513300'), ('2437', '513336', '乡城县', '513300'), ('2438', '513337', '稻城县', '513300'), ('2439', '513338', '得荣县', '513300'), ('2440', '513401', '西昌市', '513400'), ('2441', '513422', '木里藏族自治县', '513400'), ('2442', '513423', '盐源县', '513400'), ('2443', '513424', '德昌县', '513400'), ('2444', '513425', '会理县', '513400'), ('2445', '513426', '会东县', '513400'), ('2446', '513427', '宁南县', '513400'), ('2447', '513428', '普格县', '513400'), ('2448', '513429', '布拖县', '513400'), ('2449', '513430', '金阳县', '513400'), ('2450', '513431', '昭觉县', '513400'), ('2451', '513432', '喜德县', '513400'), ('2452', '513433', '冕宁县', '513400'), ('2453', '513434', '越西县', '513400'), ('2454', '513435', '甘洛县', '513400'), ('2455', '513436', '美姑县', '513400'), ('2456', '513437', '雷波县', '513400'), ('2457', '520101', '市辖区', '520100'), ('2458', '520102', '南明区', '520100'), ('2459', '520103', '云岩区', '520100'), ('2460', '520111', '花溪区', '520100'), ('2461', '520112', '乌当区', '520100'), ('2462', '520113', '白云区', '520100'), ('2463', '520114', '小河区', '520100'), ('2464', '520121', '开阳县', '520100'), ('2465', '520122', '息烽县', '520100'), ('2466', '520123', '修文县', '520100'), ('2467', '520181', '清镇市', '520100'), ('2468', '520201', '钟山区', '520200'), ('2469', '520203', '六枝特区', '520200'), ('2470', '520221', '水城县', '520200'), ('2471', '520222', '盘　县', '520200'), ('2472', '520301', '市辖区', '520300'), ('2473', '520302', '红花岗区', '520300'), ('2474', '520303', '汇川区', '520300'), ('2475', '520321', '遵义县', '520300'), ('2476', '520322', '桐梓县', '520300'), ('2477', '520323', '绥阳县', '520300'), ('2478', '520324', '正安县', '520300'), ('2479', '520325', '道真仡佬族苗族自治县', '520300'), ('2480', '520326', '务川仡佬族苗族自治县', '520300'), ('2481', '520327', '凤冈县', '520300'), ('2482', '520328', '湄潭县', '520300'), ('2483', '520329', '余庆县', '520300'), ('2484', '520330', '习水县', '520300'), ('2485', '520381', '赤水市', '520300'), ('2486', '520382', '仁怀市', '520300'), ('2487', '520401', '市辖区', '520400'), ('2488', '520402', '西秀区', '520400'), ('2489', '520421', '平坝县', '520400'), ('2490', '520422', '普定县', '520400'), ('2491', '520423', '镇宁布依族苗族自治县', '520400'), ('2492', '520424', '关岭布依族苗族自治县', '520400'), ('2493', '520425', '紫云苗族布依族自治县', '520400'), ('2494', '522201', '铜仁市', '522200'), ('2495', '522222', '江口县', '522200'), ('2496', '522223', '玉屏侗族自治县', '522200'), ('2497', '522224', '石阡县', '522200'), ('2498', '522225', '思南县', '522200'), ('2499', '522226', '印江土家族苗族自治县', '522200'), ('2500', '522227', '德江县', '522200'), ('2501', '522228', '沿河土家族自治县', '522200'), ('2502', '522229', '松桃苗族自治县', '522200'), ('2503', '522230', '万山特区', '522200'), ('2504', '522301', '兴义市', '522300'), ('2505', '522322', '兴仁县', '522300'), ('2506', '522323', '普安县', '522300'), ('2507', '522324', '晴隆县', '522300'), ('2508', '522325', '贞丰县', '522300'), ('2509', '522326', '望谟县', '522300'), ('2510', '522327', '册亨县', '522300'), ('2511', '522328', '安龙县', '522300'), ('2512', '522401', '毕节市', '522400'), ('2513', '522422', '大方县', '522400'), ('2514', '522423', '黔西县', '522400'), ('2515', '522424', '金沙县', '522400'), ('2516', '522425', '织金县', '522400'), ('2517', '522426', '纳雍县', '522400'), ('2518', '522427', '威宁彝族回族苗族自治县', '522400'), ('2519', '522428', '赫章县', '522400'), ('2520', '522601', '凯里市', '522600'), ('2521', '522622', '黄平县', '522600'), ('2522', '522623', '施秉县', '522600'), ('2523', '522624', '三穗县', '522600'), ('2524', '522625', '镇远县', '522600'), ('2525', '522626', '岑巩县', '522600'), ('2526', '522627', '天柱县', '522600'), ('2527', '522628', '锦屏县', '522600'), ('2528', '522629', '剑河县', '522600'), ('2529', '522630', '台江县', '522600'), ('2530', '522631', '黎平县', '522600'), ('2531', '522632', '榕江县', '522600'), ('2532', '522633', '从江县', '522600'), ('2533', '522634', '雷山县', '522600'), ('2534', '522635', '麻江县', '522600'), ('2535', '522636', '丹寨县', '522600'), ('2536', '522701', '都匀市', '522700'), ('2537', '522702', '福泉市', '522700'), ('2538', '522722', '荔波县', '522700'), ('2539', '522723', '贵定县', '522700'), ('2540', '522725', '瓮安县', '522700'), ('2541', '522726', '独山县', '522700'), ('2542', '522727', '平塘县', '522700'), ('2543', '522728', '罗甸县', '522700'), ('2544', '522729', '长顺县', '522700'), ('2545', '522730', '龙里县', '522700'), ('2546', '522731', '惠水县', '522700'), ('2547', '522732', '三都水族自治县', '522700'), ('2548', '530101', '市辖区', '530100'), ('2549', '530102', '五华区', '530100'), ('2550', '530103', '盘龙区', '530100'), ('2551', '530111', '官渡区', '530100'), ('2552', '530112', '西山区', '530100'), ('2553', '530113', '东川区', '530100'), ('2554', '530121', '呈贡县', '530100'), ('2555', '530122', '晋宁县', '530100'), ('2556', '530124', '富民县', '530100'), ('2557', '530125', '宜良县', '530100'), ('2558', '530126', '石林彝族自治县', '530100'), ('2559', '530127', '嵩明县', '530100'), ('2560', '530128', '禄劝彝族苗族自治县', '530100'), ('2561', '530129', '寻甸回族彝族自治县', '530100'), ('2562', '530181', '安宁市', '530100'), ('2563', '530301', '市辖区', '530300'), ('2564', '530302', '麒麟区', '530300'), ('2565', '530321', '马龙县', '530300'), ('2566', '530322', '陆良县', '530300'), ('2567', '530323', '师宗县', '530300'), ('2568', '530324', '罗平县', '530300'), ('2569', '530325', '富源县', '530300'), ('2570', '530326', '会泽县', '530300'), ('2571', '530328', '沾益县', '530300'), ('2572', '530381', '宣威市', '530300'), ('2573', '530401', '市辖区', '530400'), ('2574', '530402', '红塔区', '530400'), ('2575', '530421', '江川县', '530400'), ('2576', '530422', '澄江县', '530400'), ('2577', '530423', '通海县', '530400'), ('2578', '530424', '华宁县', '530400'), ('2579', '530425', '易门县', '530400'), ('2580', '530426', '峨山彝族自治县', '530400'), ('2581', '530427', '新平彝族傣族自治县', '530400'), ('2582', '530428', '元江哈尼族彝族傣族自治县', '530400'), ('2583', '530501', '市辖区', '530500'), ('2584', '530502', '隆阳区', '530500'), ('2585', '530521', '施甸县', '530500'), ('2586', '530522', '腾冲县', '530500'), ('2587', '530523', '龙陵县', '530500'), ('2588', '530524', '昌宁县', '530500'), ('2589', '530601', '市辖区', '530600'), ('2590', '530602', '昭阳区', '530600'), ('2591', '530621', '鲁甸县', '530600'), ('2592', '530622', '巧家县', '530600'), ('2593', '530623', '盐津县', '530600'), ('2594', '530624', '大关县', '530600'), ('2595', '530625', '永善县', '530600'), ('2596', '530626', '绥江县', '530600'), ('2597', '530627', '镇雄县', '530600'), ('2598', '530628', '彝良县', '530600'), ('2599', '530629', '威信县', '530600'), ('2600', '530630', '水富县', '530600'), ('2601', '530701', '市辖区', '530700'), ('2602', '530702', '古城区', '530700'), ('2603', '530721', '玉龙纳西族自治县', '530700'), ('2604', '530722', '永胜县', '530700'), ('2605', '530723', '华坪县', '530700'), ('2606', '530724', '宁蒗彝族自治县', '530700'), ('2607', '530801', '市辖区', '530800'), ('2608', '530802', '翠云区', '530800'), ('2609', '530821', '普洱哈尼族彝族自治县', '530800'), ('2610', '530822', '墨江哈尼族自治县', '530800'), ('2611', '530823', '景东彝族自治县', '530800'), ('2612', '530824', '景谷傣族彝族自治县', '530800'), ('2613', '530825', '镇沅彝族哈尼族拉祜族自治县', '530800'), ('2614', '530826', '江城哈尼族彝族自治县', '530800'), ('2615', '530827', '孟连傣族拉祜族佤族自治县', '530800'), ('2616', '530828', '澜沧拉祜族自治县', '530800'), ('2617', '530829', '西盟佤族自治县', '530800'), ('2618', '530901', '市辖区', '530900'), ('2619', '530902', '临翔区', '530900'), ('2620', '530921', '凤庆县', '530900'), ('2621', '530922', '云　县', '530900'), ('2622', '530923', '永德县', '530900'), ('2623', '530924', '镇康县', '530900'), ('2624', '530925', '双江拉祜族佤族布朗族傣族自治县', '530900'), ('2625', '530926', '耿马傣族佤族自治县', '530900'), ('2626', '530927', '沧源佤族自治县', '530900'), ('2627', '532301', '楚雄市', '532300'), ('2628', '532322', '双柏县', '532300'), ('2629', '532323', '牟定县', '532300'), ('2630', '532324', '南华县', '532300'), ('2631', '532325', '姚安县', '532300'), ('2632', '532326', '大姚县', '532300'), ('2633', '532327', '永仁县', '532300'), ('2634', '532328', '元谋县', '532300'), ('2635', '532329', '武定县', '532300'), ('2636', '532331', '禄丰县', '532300'), ('2637', '532501', '个旧市', '532500'), ('2638', '532502', '开远市', '532500'), ('2639', '532522', '蒙自县', '532500'), ('2640', '532523', '屏边苗族自治县', '532500'), ('2641', '532524', '建水县', '532500'), ('2642', '532525', '石屏县', '532500'), ('2643', '532526', '弥勒县', '532500'), ('2644', '532527', '泸西县', '532500'), ('2645', '532528', '元阳县', '532500'), ('2646', '532529', '红河县', '532500'), ('2647', '532530', '金平苗族瑶族傣族自治县', '532500'), ('2648', '532531', '绿春县', '532500'), ('2649', '532532', '河口瑶族自治县', '532500'), ('2650', '532621', '文山县', '532600'), ('2651', '532622', '砚山县', '532600'), ('2652', '532623', '西畴县', '532600'), ('2653', '532624', '麻栗坡县', '532600'), ('2654', '532625', '马关县', '532600'), ('2655', '532626', '丘北县', '532600'), ('2656', '532627', '广南县', '532600'), ('2657', '532628', '富宁县', '532600'), ('2658', '532801', '景洪市', '532800'), ('2659', '532822', '勐海县', '532800'), ('2660', '532823', '勐腊县', '532800'), ('2661', '532901', '大理市', '532900'), ('2662', '532922', '漾濞彝族自治县', '532900'), ('2663', '532923', '祥云县', '532900'), ('2664', '532924', '宾川县', '532900'), ('2665', '532925', '弥渡县', '532900'), ('2666', '532926', '南涧彝族自治县', '532900'), ('2667', '532927', '巍山彝族回族自治县', '532900'), ('2668', '532928', '永平县', '532900'), ('2669', '532929', '云龙县', '532900'), ('2670', '532930', '洱源县', '532900'), ('2671', '532931', '剑川县', '532900'), ('2672', '532932', '鹤庆县', '532900'), ('2673', '533102', '瑞丽市', '533100'), ('2674', '533103', '潞西市', '533100'), ('2675', '533122', '梁河县', '533100'), ('2676', '533123', '盈江县', '533100'), ('2677', '533124', '陇川县', '533100'), ('2678', '533321', '泸水县', '533300'), ('2679', '533323', '福贡县', '533300'), ('2680', '533324', '贡山独龙族怒族自治县', '533300'), ('2681', '533325', '兰坪白族普米族自治县', '533300'), ('2682', '533421', '香格里拉县', '533400'), ('2683', '533422', '德钦县', '533400'), ('2684', '533423', '维西傈僳族自治县', '533400'), ('2685', '540101', '市辖区', '540100'), ('2686', '540102', '城关区', '540100'), ('2687', '540121', '林周县', '540100'), ('2688', '540122', '当雄县', '540100'), ('2689', '540123', '尼木县', '540100'), ('2690', '540124', '曲水县', '540100'), ('2691', '540125', '堆龙德庆县', '540100'), ('2692', '540126', '达孜县', '540100'), ('2693', '540127', '墨竹工卡县', '540100'), ('2694', '542121', '昌都县', '542100'), ('2695', '542122', '江达县', '542100'), ('2696', '542123', '贡觉县', '542100'), ('2697', '542124', '类乌齐县', '542100'), ('2698', '542125', '丁青县', '542100'), ('2699', '542126', '察雅县', '542100'), ('2700', '542127', '八宿县', '542100'), ('2701', '542128', '左贡县', '542100'), ('2702', '542129', '芒康县', '542100'), ('2703', '542132', '洛隆县', '542100'), ('2704', '542133', '边坝县', '542100'), ('2705', '542221', '乃东县', '542200'), ('2706', '542222', '扎囊县', '542200'), ('2707', '542223', '贡嘎县', '542200'), ('2708', '542224', '桑日县', '542200'), ('2709', '542225', '琼结县', '542200'), ('2710', '542226', '曲松县', '542200'), ('2711', '542227', '措美县', '542200'), ('2712', '542228', '洛扎县', '542200'), ('2713', '542229', '加查县', '542200'), ('2714', '542231', '隆子县', '542200'), ('2715', '542232', '错那县', '542200'), ('2716', '542233', '浪卡子县', '542200'), ('2717', '542301', '日喀则市', '542300'), ('2718', '542322', '南木林县', '542300'), ('2719', '542323', '江孜县', '542300'), ('2720', '542324', '定日县', '542300'), ('2721', '542325', '萨迦县', '542300'), ('2722', '542326', '拉孜县', '542300'), ('2723', '542327', '昂仁县', '542300'), ('2724', '542328', '谢通门县', '542300'), ('2725', '542329', '白朗县', '542300'), ('2726', '542330', '仁布县', '542300'), ('2727', '542331', '康马县', '542300'), ('2728', '542332', '定结县', '542300'), ('2729', '542333', '仲巴县', '542300'), ('2730', '542334', '亚东县', '542300'), ('2731', '542335', '吉隆县', '542300'), ('2732', '542336', '聂拉木县', '542300'), ('2733', '542337', '萨嘎县', '542300'), ('2734', '542338', '岗巴县', '542300'), ('2735', '542421', '那曲县', '542400'), ('2736', '542422', '嘉黎县', '542400'), ('2737', '542423', '比如县', '542400'), ('2738', '542424', '聂荣县', '542400'), ('2739', '542425', '安多县', '542400'), ('2740', '542426', '申扎县', '542400'), ('2741', '542427', '索　县', '542400'), ('2742', '542428', '班戈县', '542400'), ('2743', '542429', '巴青县', '542400'), ('2744', '542430', '尼玛县', '542400'), ('2745', '542521', '普兰县', '542500'), ('2746', '542522', '札达县', '542500'), ('2747', '542523', '噶尔县', '542500'), ('2748', '542524', '日土县', '542500'), ('2749', '542525', '革吉县', '542500'), ('2750', '542526', '改则县', '542500'), ('2751', '542527', '措勤县', '542500'), ('2752', '542621', '林芝县', '542600'), ('2753', '542622', '工布江达县', '542600'), ('2754', '542623', '米林县', '542600'), ('2755', '542624', '墨脱县', '542600'), ('2756', '542625', '波密县', '542600'), ('2757', '542626', '察隅县', '542600'), ('2758', '542627', '朗　县', '542600'), ('2759', '610101', '市辖区', '610100'), ('2760', '610102', '新城区', '610100'), ('2761', '610103', '碑林区', '610100'), ('2762', '610104', '莲湖区', '610100'), ('2763', '610111', '灞桥区', '610100'), ('2764', '610112', '未央区', '610100'), ('2765', '610113', '雁塔区', '610100'), ('2766', '610114', '阎良区', '610100'), ('2767', '610115', '临潼区', '610100'), ('2768', '610116', '长安区', '610100'), ('2769', '610122', '蓝田县', '610100'), ('2770', '610124', '周至县', '610100'), ('2771', '610125', '户　县', '610100'), ('2772', '610126', '高陵县', '610100'), ('2773', '610201', '市辖区', '610200'), ('2774', '610202', '王益区', '610200'), ('2775', '610203', '印台区', '610200'), ('2776', '610204', '耀州区', '610200'), ('2777', '610222', '宜君县', '610200'), ('2778', '610301', '市辖区', '610300'), ('2779', '610302', '渭滨区', '610300'), ('2780', '610303', '金台区', '610300'), ('2781', '610304', '陈仓区', '610300'), ('2782', '610322', '凤翔县', '610300'), ('2783', '610323', '岐山县', '610300'), ('2784', '610324', '扶风县', '610300'), ('2785', '610326', '眉　县', '610300'), ('2786', '610327', '陇　县', '610300'), ('2787', '610328', '千阳县', '610300'), ('2788', '610329', '麟游县', '610300'), ('2789', '610330', '凤　县', '610300'), ('2790', '610331', '太白县', '610300'), ('2791', '610401', '市辖区', '610400'), ('2792', '610402', '秦都区', '610400'), ('2793', '610403', '杨凌区', '610400'), ('2794', '610404', '渭城区', '610400'), ('2795', '610422', '三原县', '610400'), ('2796', '610423', '泾阳县', '610400'), ('2797', '610424', '乾　县', '610400'), ('2798', '610425', '礼泉县', '610400'), ('2799', '610426', '永寿县', '610400'), ('2800', '610427', '彬　县', '610400'), ('2801', '610428', '长武县', '610400'), ('2802', '610429', '旬邑县', '610400'), ('2803', '610430', '淳化县', '610400'), ('2804', '610431', '武功县', '610400'), ('2805', '610481', '兴平市', '610400'), ('2806', '610501', '市辖区', '610500'), ('2807', '610502', '临渭区', '610500'), ('2808', '610521', '华　县', '610500'), ('2809', '610522', '潼关县', '610500'), ('2810', '610523', '大荔县', '610500'), ('2811', '610524', '合阳县', '610500'), ('2812', '610525', '澄城县', '610500'), ('2813', '610526', '蒲城县', '610500'), ('2814', '610527', '白水县', '610500'), ('2815', '610528', '富平县', '610500'), ('2816', '610581', '韩城市', '610500'), ('2817', '610582', '华阴市', '610500'), ('2818', '610601', '市辖区', '610600'), ('2819', '610602', '宝塔区', '610600'), ('2820', '610621', '延长县', '610600'), ('2821', '610622', '延川县', '610600'), ('2822', '610623', '子长县', '610600'), ('2823', '610624', '安塞县', '610600'), ('2824', '610625', '志丹县', '610600'), ('2825', '610626', '吴旗县', '610600'), ('2826', '610627', '甘泉县', '610600'), ('2827', '610628', '富　县', '610600'), ('2828', '610629', '洛川县', '610600'), ('2829', '610630', '宜川县', '610600'), ('2830', '610631', '黄龙县', '610600'), ('2831', '610632', '黄陵县', '610600'), ('2832', '610701', '市辖区', '610700'), ('2833', '610702', '汉台区', '610700'), ('2834', '610721', '南郑县', '610700'), ('2835', '610722', '城固县', '610700'), ('2836', '610723', '洋　县', '610700'), ('2837', '610724', '西乡县', '610700'), ('2838', '610725', '勉　县', '610700'), ('2839', '610726', '宁强县', '610700'), ('2840', '610727', '略阳县', '610700'), ('2841', '610728', '镇巴县', '610700'), ('2842', '610729', '留坝县', '610700'), ('2843', '610730', '佛坪县', '610700'), ('2844', '610801', '市辖区', '610800'), ('2845', '610802', '榆阳区', '610800'), ('2846', '610821', '神木县', '610800'), ('2847', '610822', '府谷县', '610800'), ('2848', '610823', '横山县', '610800'), ('2849', '610824', '靖边县', '610800'), ('2850', '610825', '定边县', '610800'), ('2851', '610826', '绥德县', '610800'), ('2852', '610827', '米脂县', '610800'), ('2853', '610828', '佳　县', '610800'), ('2854', '610829', '吴堡县', '610800'), ('2855', '610830', '清涧县', '610800'), ('2856', '610831', '子洲县', '610800'), ('2857', '610901', '市辖区', '610900'), ('2858', '610902', '汉滨区', '610900'), ('2859', '610921', '汉阴县', '610900'), ('2860', '610922', '石泉县', '610900'), ('2861', '610923', '宁陕县', '610900'), ('2862', '610924', '紫阳县', '610900'), ('2863', '610925', '岚皋县', '610900'), ('2864', '610926', '平利县', '610900'), ('2865', '610927', '镇坪县', '610900'), ('2866', '610928', '旬阳县', '610900'), ('2867', '610929', '白河县', '610900'), ('2868', '611001', '市辖区', '611000'), ('2869', '611002', '商州区', '611000'), ('2870', '611021', '洛南县', '611000'), ('2871', '611022', '丹凤县', '611000'), ('2872', '611023', '商南县', '611000'), ('2873', '611024', '山阳县', '611000'), ('2874', '611025', '镇安县', '611000'), ('2875', '611026', '柞水县', '611000'), ('2876', '620101', '市辖区', '620100'), ('2877', '620102', '城关区', '620100'), ('2878', '620103', '七里河区', '620100'), ('2879', '620104', '西固区', '620100'), ('2880', '620105', '安宁区', '620100'), ('2881', '620111', '红古区', '620100'), ('2882', '620121', '永登县', '620100'), ('2883', '620122', '皋兰县', '620100'), ('2884', '620123', '榆中县', '620100'), ('2885', '620201', '市辖区', '620200'), ('2886', '620301', '市辖区', '620300'), ('2887', '620302', '金川区', '620300'), ('2888', '620321', '永昌县', '620300'), ('2889', '620401', '市辖区', '620400'), ('2890', '620402', '白银区', '620400'), ('2891', '620403', '平川区', '620400'), ('2892', '620421', '靖远县', '620400'), ('2893', '620422', '会宁县', '620400'), ('2894', '620423', '景泰县', '620400'), ('2895', '620501', '市辖区', '620500'), ('2896', '620502', '秦城区', '620500'), ('2897', '620503', '北道区', '620500'), ('2898', '620521', '清水县', '620500'), ('2899', '620522', '秦安县', '620500'), ('2900', '620523', '甘谷县', '620500'), ('2901', '620524', '武山县', '620500'), ('2902', '620525', '张家川回族自治县', '620500'), ('2903', '620601', '市辖区', '620600'), ('2904', '620602', '凉州区', '620600'), ('2905', '620621', '民勤县', '620600'), ('2906', '620622', '古浪县', '620600'), ('2907', '620623', '天祝藏族自治县', '620600'), ('2908', '620701', '市辖区', '620700'), ('2909', '620702', '甘州区', '620700'), ('2910', '620721', '肃南裕固族自治县', '620700'), ('2911', '620722', '民乐县', '620700'), ('2912', '620723', '临泽县', '620700'), ('2913', '620724', '高台县', '620700'), ('2914', '620725', '山丹县', '620700'), ('2915', '620801', '市辖区', '620800'), ('2916', '620802', '崆峒区', '620800'), ('2917', '620821', '泾川县', '620800'), ('2918', '620822', '灵台县', '620800'), ('2919', '620823', '崇信县', '620800'), ('2920', '620824', '华亭县', '620800'), ('2921', '620825', '庄浪县', '620800'), ('2922', '620826', '静宁县', '620800'), ('2923', '620901', '市辖区', '620900'), ('2924', '620902', '肃州区', '620900'), ('2925', '620921', '金塔县', '620900'), ('2926', '620922', '安西县', '620900'), ('2927', '620923', '肃北蒙古族自治县', '620900'), ('2928', '620924', '阿克塞哈萨克族自治县', '620900'), ('2929', '620981', '玉门市', '620900'), ('2930', '620982', '敦煌市', '620900'), ('2931', '621001', '市辖区', '621000'), ('2932', '621002', '西峰区', '621000'), ('2933', '621021', '庆城县', '621000'), ('2934', '621022', '环　县', '621000'), ('2935', '621023', '华池县', '621000'), ('2936', '621024', '合水县', '621000'), ('2937', '621025', '正宁县', '621000'), ('2938', '621026', '宁　县', '621000'), ('2939', '621027', '镇原县', '621000'), ('2940', '621101', '市辖区', '621100'), ('2941', '621102', '安定区', '621100'), ('2942', '621121', '通渭县', '621100'), ('2943', '621122', '陇西县', '621100'), ('2944', '621123', '渭源县', '621100'), ('2945', '621124', '临洮县', '621100'), ('2946', '621125', '漳　县', '621100'), ('2947', '621126', '岷　县', '621100'), ('2948', '621201', '市辖区', '621200'), ('2949', '621202', '武都区', '621200'), ('2950', '621221', '成　县', '621200'), ('2951', '621222', '文　县', '621200'), ('2952', '621223', '宕昌县', '621200'), ('2953', '621224', '康　县', '621200'), ('2954', '621225', '西和县', '621200'), ('2955', '621226', '礼　县', '621200'), ('2956', '621227', '徽　县', '621200'), ('2957', '621228', '两当县', '621200'), ('2958', '622901', '临夏市', '622900'), ('2959', '622921', '临夏县', '622900'), ('2960', '622922', '康乐县', '622900'), ('2961', '622923', '永靖县', '622900'), ('2962', '622924', '广河县', '622900'), ('2963', '622925', '和政县', '622900'), ('2964', '622926', '东乡族自治县', '622900'), ('2965', '622927', '积石山保安族东乡族撒拉族自治县', '622900'), ('2966', '623001', '合作市', '623000'), ('2967', '623021', '临潭县', '623000'), ('2968', '623022', '卓尼县', '623000'), ('2969', '623023', '舟曲县', '623000'), ('2970', '623024', '迭部县', '623000'), ('2971', '623025', '玛曲县', '623000'), ('2972', '623026', '碌曲县', '623000'), ('2973', '623027', '夏河县', '623000'), ('2974', '630101', '市辖区', '630100'), ('2975', '630102', '城东区', '630100'), ('2976', '630103', '城中区', '630100'), ('2977', '630104', '城西区', '630100'), ('2978', '630105', '城北区', '630100'), ('2979', '630121', '大通回族土族自治县', '630100'), ('2980', '630122', '湟中县', '630100'), ('2981', '630123', '湟源县', '630100'), ('2982', '632121', '平安县', '632100'), ('2983', '632122', '民和回族土族自治县', '632100'), ('2984', '632123', '乐都县', '632100'), ('2985', '632126', '互助土族自治县', '632100'), ('2986', '632127', '化隆回族自治县', '632100'), ('2987', '632128', '循化撒拉族自治县', '632100'), ('2988', '632221', '门源回族自治县', '632200'), ('2989', '632222', '祁连县', '632200'), ('2990', '632223', '海晏县', '632200'), ('2991', '632224', '刚察县', '632200'), ('2992', '632321', '同仁县', '632300'), ('2993', '632322', '尖扎县', '632300'), ('2994', '632323', '泽库县', '632300'), ('2995', '632324', '河南蒙古族自治县', '632300'), ('2996', '632521', '共和县', '632500'), ('2997', '632522', '同德县', '632500'), ('2998', '632523', '贵德县', '632500'), ('2999', '632524', '兴海县', '632500'), ('3000', '632525', '贵南县', '632500'), ('3001', '632621', '玛沁县', '632600'), ('3002', '632622', '班玛县', '632600'), ('3003', '632623', '甘德县', '632600'), ('3004', '632624', '达日县', '632600'), ('3005', '632625', '久治县', '632600'), ('3006', '632626', '玛多县', '632600'), ('3007', '632721', '玉树县', '632700'), ('3008', '632722', '杂多县', '632700'), ('3009', '632723', '称多县', '632700'), ('3010', '632724', '治多县', '632700'), ('3011', '632725', '囊谦县', '632700'), ('3012', '632726', '曲麻莱县', '632700'), ('3013', '632801', '格尔木市', '632800'), ('3014', '632802', '德令哈市', '632800'), ('3015', '632821', '乌兰县', '632800'), ('3016', '632822', '都兰县', '632800'), ('3017', '632823', '天峻县', '632800'), ('3018', '640101', '市辖区', '640100'), ('3019', '640104', '兴庆区', '640100'), ('3020', '640105', '西夏区', '640100'), ('3021', '640106', '金凤区', '640100'), ('3022', '640121', '永宁县', '640100'), ('3023', '640122', '贺兰县', '640100'), ('3024', '640181', '灵武市', '640100'), ('3025', '640201', '市辖区', '640200'), ('3026', '640202', '大武口区', '640200'), ('3027', '640205', '惠农区', '640200'), ('3028', '640221', '平罗县', '640200'), ('3029', '640301', '市辖区', '640300'), ('3030', '640302', '利通区', '640300'), ('3031', '640323', '盐池县', '640300'), ('3032', '640324', '同心县', '640300'), ('3033', '640381', '青铜峡市', '640300'), ('3034', '640401', '市辖区', '640400'), ('3035', '640402', '原州区', '640400'), ('3036', '640422', '西吉县', '640400'), ('3037', '640423', '隆德县', '640400'), ('3038', '640424', '泾源县', '640400'), ('3039', '640425', '彭阳县', '640400'), ('3040', '640501', '市辖区', '640500'), ('3041', '640502', '沙坡头区', '640500'), ('3042', '640521', '中宁县', '640500'), ('3043', '640522', '海原县', '640500'), ('3044', '650101', '市辖区', '650100'), ('3045', '650102', '天山区', '650100'), ('3046', '650103', '沙依巴克区', '650100'), ('3047', '650104', '新市区', '650100'), ('3048', '650105', '水磨沟区', '650100'), ('3049', '650106', '头屯河区', '650100'), ('3050', '650107', '达坂城区', '650100'), ('3051', '650108', '东山区', '650100'), ('3052', '650121', '乌鲁木齐县', '650100'), ('3053', '650201', '市辖区', '650200'), ('3054', '650202', '独山子区', '650200'), ('3055', '650203', '克拉玛依区', '650200'), ('3056', '650204', '白碱滩区', '650200'), ('3057', '650205', '乌尔禾区', '650200'), ('3058', '652101', '吐鲁番市', '652100'), ('3059', '652122', '鄯善县', '652100'), ('3060', '652123', '托克逊县', '652100'), ('3061', '652201', '哈密市', '652200'), ('3062', '652222', '巴里坤哈萨克自治县', '652200'), ('3063', '652223', '伊吾县', '652200'), ('3064', '652301', '昌吉市', '652300'), ('3065', '652302', '阜康市', '652300'), ('3066', '652303', '米泉市', '652300'), ('3067', '652323', '呼图壁县', '652300'), ('3068', '652324', '玛纳斯县', '652300'), ('3069', '652325', '奇台县', '652300'), ('3070', '652327', '吉木萨尔县', '652300'), ('3071', '652328', '木垒哈萨克自治县', '652300'), ('3072', '652701', '博乐市', '652700'), ('3073', '652722', '精河县', '652700'), ('3074', '652723', '温泉县', '652700'), ('3075', '652801', '库尔勒市', '652800'), ('3076', '652822', '轮台县', '652800'), ('3077', '652823', '尉犁县', '652800'), ('3078', '652824', '若羌县', '652800'), ('3079', '652825', '且末县', '652800'), ('3080', '652826', '焉耆回族自治县', '652800'), ('3081', '652827', '和静县', '652800'), ('3082', '652828', '和硕县', '652800'), ('3083', '652829', '博湖县', '652800'), ('3084', '652901', '阿克苏市', '652900'), ('3085', '652922', '温宿县', '652900'), ('3086', '652923', '库车县', '652900'), ('3087', '652924', '沙雅县', '652900'), ('3088', '652925', '新和县', '652900'), ('3089', '652926', '拜城县', '652900'), ('3090', '652927', '乌什县', '652900'), ('3091', '652928', '阿瓦提县', '652900'), ('3092', '652929', '柯坪县', '652900'), ('3093', '653001', '阿图什市', '653000'), ('3094', '653022', '阿克陶县', '653000'), ('3095', '653023', '阿合奇县', '653000'), ('3096', '653024', '乌恰县', '653000'), ('3097', '653101', '喀什市', '653100'), ('3098', '653121', '疏附县', '653100'), ('3099', '653122', '疏勒县', '653100'), ('3100', '653123', '英吉沙县', '653100'), ('3101', '653124', '泽普县', '653100'), ('3102', '653125', '莎车县', '653100'), ('3103', '653126', '叶城县', '653100'), ('3104', '653127', '麦盖提县', '653100'), ('3105', '653128', '岳普湖县', '653100'), ('3106', '653129', '伽师县', '653100'), ('3107', '653130', '巴楚县', '653100'), ('3108', '653131', '塔什库尔干塔吉克自治县', '653100'), ('3109', '653201', '和田市', '653200'), ('3110', '653221', '和田县', '653200'), ('3111', '653222', '墨玉县', '653200'), ('3112', '653223', '皮山县', '653200'), ('3113', '653224', '洛浦县', '653200'), ('3114', '653225', '策勒县', '653200'), ('3115', '653226', '于田县', '653200'), ('3116', '653227', '民丰县', '653200'), ('3117', '654002', '伊宁市', '654000'), ('3118', '654003', '奎屯市', '654000'), ('3119', '654021', '伊宁县', '654000'), ('3120', '654022', '察布查尔锡伯自治县', '654000'), ('3121', '654023', '霍城县', '654000'), ('3122', '654024', '巩留县', '654000'), ('3123', '654025', '新源县', '654000'), ('3124', '654026', '昭苏县', '654000'), ('3125', '654027', '特克斯县', '654000'), ('3126', '654028', '尼勒克县', '654000'), ('3127', '654201', '塔城市', '654200'), ('3128', '654202', '乌苏市', '654200'), ('3129', '654221', '额敏县', '654200'), ('3130', '654223', '沙湾县', '654200'), ('3131', '654224', '托里县', '654200'), ('3132', '654225', '裕民县', '654200'), ('3133', '654226', '和布克赛尔蒙古自治县', '654200'), ('3134', '654301', '阿勒泰市', '654300'), ('3135', '654321', '布尔津县', '654300'), ('3136', '654322', '富蕴县', '654300'), ('3137', '654323', '福海县', '654300'), ('3138', '654324', '哈巴河县', '654300'), ('3139', '654325', '青河县', '654300'), ('3140', '654326', '吉木乃县', '654300'), ('3141', '659001', '石河子市', '659000'), ('3142', '659002', '阿拉尔市', '659000'), ('3143', '659003', '图木舒克市', '659000'), ('3144', '659004', '五家渠市', '659000'); -COMMIT; - -- ---------------------------- -- Table structure for `t_city` -- ---------------------------- @@ -85,52 +77,87 @@ INSERT INTO `t_city` VALUES ('1', '110100', '市辖区', '110000'), ('2', '11020 COMMIT; -- ---------------------------- --- Table structure for `t_dynamic_form` --- ---------------------------- -DROP TABLE IF EXISTS `t_dynamic_form`; -CREATE TABLE `t_dynamic_form` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', - `biz_type` varchar(31) DEFAULT NULL COMMENT '业务类型', - `name` varchar(63) DEFAULT NULL COMMENT '字段名称', - `type` varchar(31) DEFAULT NULL COMMENT '字段类型', - `icon` varchar(31) DEFAULT NULL, - `model` varchar(127) DEFAULT NULL COMMENT '表单模型值', - `default_value` varchar(127) DEFAULT NULL COMMENT '默认值', - `width` varchar(31) DEFAULT NULL COMMENT '宽度', - `remote_url` varchar(63) DEFAULT NULL COMMENT '远程访问地址，用于从服务器拉取数据', - `data_type` varchar(31) DEFAULT NULL, - `pattern` varchar(31) DEFAULT NULL COMMENT '正则表达式', - `placeholder` varchar(31) DEFAULT NULL, - `start_placeholder` varchar(31) DEFAULT NULL, - `end_placeholder` varchar(31) DEFAULT NULL, - `format` varchar(255) DEFAULT NULL COMMENT '日期格式化', - `custom_class` varchar(255) DEFAULT NULL COMMENT '组件css样式的class属性', - `rules` varchar(255) DEFAULT NULL COMMENT '验证规则', - `min` int(11) DEFAULT NULL COMMENT '最小值', - `max` int(11) DEFAULT NULL COMMENT '最大值', - `step` int(11) DEFAULT NULL COMMENT '步长', - `be_range` bit(1) DEFAULT NULL, - `show_input` bit(1) DEFAULT NULL, - `arrow_control` bit(1) DEFAULT NULL, - `disabled` bit(1) DEFAULT NULL COMMENT '是否可用', - `inline` bit(1) DEFAULT NULL, - `readonly` bit(1) DEFAULT NULL, - `editable` bit(1) DEFAULT NULL COMMENT '是否可不编辑', - `clearable` bit(1) DEFAULT NULL, - `timestamp` bit(1) DEFAULT NULL, - `allow_half` bit(1) DEFAULT NULL, - `show_alpha` bit(1) DEFAULT NULL, - `multiple` bit(1) DEFAULT NULL, - `show_label` bit(1) DEFAULT NULL, - `filterable` bit(1) DEFAULT NULL COMMENT '是否过滤', +-- Table structure for `t_field` +-- ---------------------------- +DROP TABLE IF EXISTS `t_field`; +CREATE TABLE `t_field` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `form_id` bigint(20) DEFAULT NULL, + `type` varchar(31) NOT NULL, + `field` varchar(31) NOT NULL, + `title` varchar(31) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL, + `create_time` datetime DEFAULT NULL, + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `create_user` varchar(63) DEFAULT NULL, + `update_user` varchar(63) DEFAULT NULL, + `delete_status` bit(1) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1; + +-- ---------------------------- +-- Records of `t_field` +-- ---------------------------- +BEGIN; +INSERT INTO `t_field` VALUES ('1', '2', 'input', 'configName', '配置项名称', '2020-05-30 14:57:00', '2020-05-30 14:57:05', 'admin', 'admin', b'0'), ('2', '2', 'input', 'configType', '配置项类型', '2020-05-30 14:57:00', '2020-05-30 15:00:01', 'admin', 'admin', b'0'), ('3', '2', 'input', 'description', '配置项描述', '2020-05-30 14:57:00', '2020-05-30 15:01:08', 'admin', 'admin', b'0'); +COMMIT; + +-- ---------------------------- +-- Table structure for `t_field_props` +-- ---------------------------- +DROP TABLE IF EXISTS `t_field_props`; +CREATE TABLE `t_field_props` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `field_id` bigint(20) DEFAULT NULL COMMENT '字段表t_field 主键', + `type` varchar(31) DEFAULT NULL COMMENT '类型', + `max_length` int(11) DEFAULT NULL COMMENT '原生属性，最大输入长度', + `min_length` int(11) DEFAULT NULL COMMENT '原生属性，最小输入长度', + `placeholder` varchar(63) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '输入框占位文本', + `clearable` bit(1) DEFAULT NULL COMMENT '是否可清空', + `disabled` bit(1) DEFAULT NULL COMMENT '禁用', + `size` varchar(31) DEFAULT NULL COMMENT '输入框尺寸，只在 type!="textarea" 时有效', + `prefix_icon` varchar(63) DEFAULT NULL COMMENT '输入框头部图标', + `suffix_icon` varchar(63) DEFAULT NULL COMMENT '输入框尾部图标', + `rows` int(11) DEFAULT NULL COMMENT '输入框行数，只对 type="textarea" 有效', + `autosize` varchar(255) DEFAULT NULL COMMENT '自适应内容高度，只对 type="textarea" 有效，可传入对象，如，{ minRows: 2, maxRows: 6 }', + `step` int(11) DEFAULT NULL COMMENT '计数器步长', + `datasource` varchar(127) DEFAULT NULL, + `create_time` datetime DEFAULT NULL, + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `create_user` varchar(63) DEFAULT NULL, + `update_user` varchar(63) DEFAULT NULL, + `delete_status` bit(1) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1; + +-- ---------------------------- +-- Records of `t_field_props` +-- ---------------------------- +BEGIN; +INSERT INTO `t_field_props` VALUES ('1', '1', 'input', null, null, '请设置', null, null, null, null, null, null, null, null, null, '2020-05-30 15:04:51', '2020-05-30 15:02:50', 'admin', 'admin', b'0'), ('2', '2', 'input', null, null, '请设置', null, null, null, null, null, null, null, null, null, '2020-05-30 15:04:47', '2020-05-30 15:03:16', 'admin', 'admin', b'0'), ('3', '3', 'textarea', null, null, '请设置', null, null, null, null, null, '4', null, null, null, '2020-05-30 15:04:44', '2020-05-30 15:03:21', 'admin', 'admin', b'0'), ('4', null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, '2020-05-30 15:04:23', 'admin', null, null); +COMMIT; + +-- ---------------------------- +-- Table structure for `t_form` +-- ---------------------------- +DROP TABLE IF EXISTS `t_form`; +CREATE TABLE `t_form` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `name` varchar(127) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL, + `biz_type` varchar(63) NOT NULL, + `remark` varchar(255) DEFAULT NULL, + `create_time` datetime DEFAULT NULL, + `update_time` datetime DEFAULT NULL, + `create_user` varchar(63) DEFAULT NULL, + `update_user` varchar(63) DEFAULT NULL, + `delete_status` bit(1) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=1210892321191546882 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1; -- ---------------------------- --- Records of `t_dynamic_form` +-- Records of `t_form` -- ---------------------------- BEGIN; -INSERT INTO `t_dynamic_form` VALUES ('1210892320784699394', 'SYSTEM_CONFIG', '配置项名称', 'input', null, 'configName', null, '100%', null, 'string', null, null, null, null, null, null, '[{\"type\":\"string\",\"message\":\"配置项名称格式不正确\"}]', null, null, null, null, null, null, b'0', null, null, null, null, null, null, null, null, null, null), ('1210892320902139906', 'SYSTEM_CONFIG', '配置项类型', 'input', null, 'configType', null, '100%', null, 'string', null, null, null, null, null, null, '[{\"type\":\"string\",\"message\":\"配置项类型格式不正确\"}]', null, null, null, null, null, null, b'0', null, null, null, null, null, null, null, null, null, null), ('1210892321019580418', 'SYSTEM_CONFIG', '配置项值', 'input', null, 'configValue', null, '100%', null, 'string', null, null, null, null, null, null, '[{\"type\":\"string\",\"message\":\"配置项值格式不正确\"}]', null, null, null, null, null, null, b'0', null, null, null, null, null, null, null, null, null, null), ('1210892321099272193', 'SYSTEM_CONFIG', '所属模块', 'select', null, 'module', null, null, '/admin/config/list', null, null, null, null, null, null, null, '[]', null, null, null, null, null, null, b'0', null, null, null, b'0', null, null, null, b'0', b'0', b'0'), ('1210892321191546881', 'SYSTEM_CONFIG', '说明', 'textarea', null, 'description', null, '100%', null, null, null, null, null, null, null, null, '[]', null, null, null, null, null, null, b'0', null, null, null, null, null, null, null, null, null, null); +INSERT INTO `t_form` VALUES ('1', '用户订单', 'PAGER_USER_ORDER', null, '2020-05-23 14:06:51', '2020-05-23 14:16:16', 'admin', 'admin', b'0'), ('2', '数据字典', 'PAGER_CONFIG_DICTIONARY', null, '2020-05-30 14:48:47', '2020-05-30 14:48:49', 'admin', 'admin', b'0'), ('3', '系统用户', 'PAGER_SYSTEM_USER_TEMPLATE', null, '2020-05-30 14:48:27', '2020-05-30 14:48:27', 'admin', 'admin', b'0'); COMMIT; -- ---------------------------- @@ -160,10 +187,11 @@ COMMIT; DROP TABLE IF EXISTS `t_sms_template`; CREATE TABLE `t_sms_template` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, - `module` varchar(11) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '所属模块', - `sms_template_code` varchar(4) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '短信模板编号', - `sms_template_content` varchar(127) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '短信模板内容', + `template_code` varchar(4) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '短信模板编号', + `template_content` varchar(127) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '短信模板内容', `create_time` timestamp NULL DEFAULT NULL, + `create_user` varchar(63) COLLATE utf8mb4_bin DEFAULT NULL, + `update_user` varchar(63) COLLATE utf8mb4_bin DEFAULT NULL, `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP, `delete_status` bit(1) DEFAULT NULL, PRIMARY KEY (`id`) @@ -173,7 +201,7 @@ CREATE TABLE `t_sms_template` ( -- Records of `t_sms_template` -- ---------------------------- BEGIN; -INSERT INTO `t_sms_template` VALUES ('1', 'user', '1000', '【xxx电商】您的验证码是{0}，在10分钟内有效。如非本人操作请忽略本短信', '2018-12-12 21:13:26', '2018-10-28 12:38:34', b'0'), ('2', 'user', '1001', '【xxx电商】尊敬的{0}客户，您的验证码是{0}，在10分钟内有效。如非本人操作请忽略本短信', '2018-12-12 21:13:30', '2018-10-28 12:38:34', b'0'), ('3', 'user', '1002', '【xxx电商】尊敬的{0}客户，您已修改本产品的密码，密码是{1}。如非本人操作请忽略本短信', '2018-12-12 21:13:34', '2018-10-28 12:38:34', b'0'), ('4', 'user', '1003', '【xxx电商】尊敬的{0}客户，感谢您注册本产品，您的初始密码是{1}。如非本人操作请忽略本短信', '2018-12-12 21:13:37', '2018-10-28 12:38:34', b'0'); +INSERT INTO `t_sms_template` VALUES ('1', '1000', '【xxx电商】您的验证码是%s，在10分钟内有效。如非本人操作请忽略本短信', '2018-12-12 21:13:26', null, null, '2018-10-28 12:38:34', b'0'), ('2', '1001', '【xxx电商】尊敬的%s客户，您的验证码是%s，在10分钟内有效。如非本人操作请忽略本短信', '2018-12-12 21:13:30', null, null, '2018-10-28 12:38:34', b'0'), ('3', '1002', '【xxx电商】尊敬的%s客户，您已修改本产品的密码，密码是%s。如非本人操作请忽略本短信', '2018-12-12 21:13:34', null, null, '2018-10-28 12:38:34', b'0'), ('4', '1003', '【xxx电商】尊敬的%s客户，感谢您注册本产品，您的初始密码是%s。如非本人操作请忽略本短信', '2018-12-12 21:13:37', null, null, '2018-10-28 12:38:34', b'0'); COMMIT; -- ---------------------------- @@ -184,8 +212,6 @@ CREATE TABLE `t_system_config` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `config_name` varchar(63) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '配置项名称', `config_type` varchar(127) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '配置项类型', - `config_value` varchar(127) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '配置项值', - `module` varchar(31) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '配置项所属模块', `config_status` bit(1) DEFAULT NULL COMMENT '0 启用 1 禁用', `description` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '配置项描述', `create_user` varchar(63) COLLATE utf8mb4_bin DEFAULT NULL, @@ -194,13 +220,57 @@ CREATE TABLE `t_system_config` ( `update_time` timestamp NULL DEFAULT NULL, `delete_status` bit(1) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=1124 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; +) ENGINE=InnoDB AUTO_INCREMENT=1129 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; -- ---------------------------- -- Records of `t_system_config` -- ---------------------------- BEGIN; -INSERT INTO `t_system_config` VALUES ('1086', 'BS001', 'order_status', 'BS001', 'admin', b'0', '待付款', '', '13813145021', '2019-05-15 15:52:35', '2019-10-13 19:39:17', b'0'), ('1087', 'BS002', 'order_status', 'BS002', 'admin', b'0', '待发货', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1088', 'BS003', 'order_status', 'BS003', 'admin', b'0', '已发货', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1089', 'BS004', 'order_status', 'BS004', 'admin', b'0', '待收获', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1090', 'BS005', 'order_status', 'BS005', 'admin', b'0', '已签收', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1091', 'BS006', 'order_status', 'BS006', 'admin', b'0', '待评价', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1092', 'BS007', 'order_status', 'BS007', 'admin', b'0', '待自提', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1093', 'BS008', 'order_status', 'BS008', 'admin', b'0', '已完成', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1094', 'BS009', 'order_status', 'BS009', 'admin', b'0', '已取消', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1095', 'BS010', 'order_status', 'BS010', 'admin', b'0', '退款中', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1096', 'BS011', 'order_status', 'BS011', 'admin', b'0', '已退款', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1097', 'BS012', 'order_status', 'BS012', 'admin', b'0', '退货中', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1098', 'BS013', 'order_status', 'BS013', 'admin', b'0', '已关闭', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1099', 'SPECIAL_ORDER', 'order_type', '1', 'admin', b'0', '专区订单', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1100', 'NORMAL_ORDER', 'order_type', '2', 'admin', b'0', '普通订单', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1101', 'SELF_ORDER', 'order_type', '3', 'admin', b'0', '自提订单', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1102', 'SEC_KILL_ORDER', 'order_type', '4', 'admin', b'0', '秒杀订单', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1103', 'INTEGRAL_ORDER', 'order_type', '5', 'admin', b'0', '积分订单', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1109', 'NORMAL_GOODS', 'goods_type', '1', 'admin', b'0', '普通商品', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1110', 'SPECIAL_GOODS', 'goods_type', '2', 'admin', b'0', '特价商品', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1111', 'FIGHT_GROUP_GOODS', 'goods_type', '3', 'admin', b'0', '拼团商品', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1112', 'SEC_KILL_GOODS', 'goods_type', '4', 'admin', b'0', '秒杀商品', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1113', 'EXCHANGE_GOODS', 'goods_type', '5', 'admin', b'0', '满赠换购商品', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1114', 'UPPER_SHELF_GOODS', 'goods_status', '1', 'admin', b'0', '上架', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1115', 'LOWER_SHELF_GOODS', 'goods_status', '2', 'admin', b'0', '下架', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1116', 'COUPON_COUPON', 'coupon_type', '1', 'admin', b'0', '优惠券', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1117', 'DISCOUNT_COUPON', 'coupon_type', '2', 'admin', b'0', '折扣券', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1118', 'module_activity', 'module_type', 'activity', 'admin', b'0', '活动模块', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1119', 'module_goods', 'module_type', 'goods', 'admin', b'0', '商品模块', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1120', 'module_admin', 'module_type', 'admin', 'admin', b'0', '平台模块', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1121', 'module_order', 'module_type', 'order', 'admin', b'0', '订单模块', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1122', 'module_seller', 'module_type', 'activity', 'admin', b'0', '商家模块', null, null, '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1123', 'module_user', 'module_type', 'user', 'admin', b'0', '用户模块', null, null, '2019-05-15 15:52:35', '2019-05-15 17:52:09', b'0'); +INSERT INTO `t_system_config` VALUES ('1086', '订单状态', 'order_status', b'0', '商品订单状态', 'admin', 'admin', '2019-05-15 15:52:35', '2019-10-13 19:39:17', b'0'), ('1099', '订单类型', 'order_type', b'0', '商品订单类型', 'admin', 'admin', '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1109', '商品类型', 'goods_type', b'0', '商品类型', 'admin', 'admin', '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1114', '商品状态', 'goods_status', b'0', '商品状态', 'admin', 'admin', '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1116', '优惠券', 'coupon_type', b'0', '优惠券', 'admin', 'admin', '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1117', '折扣券', 'discount_coupon_type', b'0', '折扣券', 'admin', 'admin', '2019-05-15 15:52:35', '2019-05-15 15:52:35', b'0'), ('1124', 'Pager 模块', 'shop_module', b'0', 'Pager 模块', 'admin', 'admin', '2020-04-11 20:42:21', '2020-04-11 20:42:24', b'0'), ('1126', '优惠类型', 'offer_type', b'0', '优惠类型', 'admin', 'admin', '2020-04-11 21:33:20', '2020-04-11 21:33:24', b'0'), ('1127', 'Banner 类型', 'banner_type', b'0', 'Banner配置项类型', 'admin', 'admin', '2020-04-12 20:25:03', '2020-04-12 20:25:46', b'0'), ('1128', 'Banner 分享渠道', 'share_channel', b'0', 'Banner 分享渠道', 'admin', 'admin', '2020-04-12 20:31:05', '2020-04-12 20:31:05', b'0'); +COMMIT; + +-- ---------------------------- +-- Table structure for `t_system_config_copy` +-- ---------------------------- +DROP TABLE IF EXISTS `t_system_config_copy`; +CREATE TABLE `t_system_config_copy` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `config_name` varchar(63) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '配置项名称', + `config_type` varchar(127) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '配置项类型', + `config_status` bit(1) DEFAULT NULL COMMENT '0 启用 1 禁用', + `description` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '配置项描述', + `create_user` varchar(63) COLLATE utf8mb4_bin DEFAULT NULL, + `update_user` varchar(63) COLLATE utf8mb4_bin DEFAULT NULL, + `create_time` timestamp NULL DEFAULT NULL, + `update_time` timestamp NULL DEFAULT NULL, + `delete_status` bit(1) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; + +-- ---------------------------- +-- Table structure for `t_system_config_detail` +-- ---------------------------- +DROP TABLE IF EXISTS `t_system_config_detail`; +CREATE TABLE `t_system_config_detail` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `config_name` varchar(63) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '配置项名称', + `config_type` varchar(127) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '配置项类型', + `config_value` varchar(127) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '配置项值', + `config_key` varchar(31) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '配置项类型值', + `config_status` bit(1) DEFAULT NULL COMMENT '0 启用 1 禁用', + `create_user` varchar(63) COLLATE utf8mb4_bin DEFAULT NULL, + `update_user` varchar(63) COLLATE utf8mb4_bin DEFAULT NULL, + `create_time` timestamp NULL DEFAULT NULL, + `update_time` timestamp NULL DEFAULT NULL, + `delete_status` bit(1) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=41 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; + +-- ---------------------------- +-- Records of `t_system_config_detail` +-- ---------------------------- +BEGIN; +INSERT INTO `t_system_config_detail` VALUES ('1', '待付款', 'BS001', 'BS001', 'order_status', b'0', 'admin', 'admin', '2020-04-11 19:32:47', '2020-04-11 19:33:35', b'0'), ('2', '待发货', 'BS002', 'BS002', 'order_status', b'0', 'admin', 'admin', '2020-04-11 20:06:11', '2020-04-11 20:06:37', b'0'), ('3', '已发货', 'BS003', 'BS003', 'order_status', b'0', 'admin', 'admin', '2020-04-11 20:25:20', null, b'0'), ('4', '待收获', 'BS004', 'BS004', 'order_status', b'0', 'admin', 'admin', '2020-04-11 20:25:41', null, b'0'), ('5', '已签收', 'BS005', 'BS005', 'order_status', b'0', 'admin', 'admin', '2020-04-11 20:26:09', null, b'0'), ('6', '待评价', 'BS006', 'BS006', 'order_status', b'0', 'admin', 'admin', '2020-04-11 20:26:33', null, b'0'), ('7', '待自提', 'BS007', 'BS007', 'order_status', b'0', 'admin', 'admin', '2020-04-11 20:26:59', null, b'0'), ('8', '已完成', 'BS008', 'BS008', 'order_status', b'0', 'admin', 'admin', '2020-04-11 20:27:23', null, b'0'), ('9', '已取消', 'BS009', 'BS009', 'order_status', b'0', 'admin', 'admin', '2020-04-11 20:27:42', null, b'0'), ('10', '退款中', 'BS010', 'BS010', 'order_status', b'0', 'admin', 'admin', '2020-04-11 20:28:08', null, b'0'), ('11', '已退款', 'BS011', 'BS011', 'order_status', b'0', 'admin', 'admin', '2020-04-11 20:28:42', null, b'0'), ('12', '退货中', 'BS012', 'BS012', 'order_status', b'0', 'admin', 'admin', '2020-04-11 20:29:05', null, b'0'), ('13', '已关闭', 'BS013', 'BS013', 'order_status', b'0', 'admin', 'admin', '2020-04-11 20:29:25', null, b'0'), ('14', '专区订单', 'SPECIAL_ORDER', '1', 'order_type', b'0', 'admin', 'admin', '2020-04-11 20:31:14', null, b'0'), ('15', '普通订单', 'NORMAL_ORDER', '2', 'order_type', b'0', 'admin', 'admin', '2020-04-11 20:32:12', null, b'0'), ('16', '自提订单', 'SELF_ORDER', '3', 'order_type', b'0', 'admin', 'admin', '2020-04-11 20:32:43', null, b'0'), ('17', '秒杀订单', 'SEC_KILL_ORDER', '4', 'order_type', b'0', 'admin', 'admin', '2020-04-11 20:33:05', null, b'0'), ('18', '积分订单', 'INTEGRAL_ORDER', '5', 'order_type', b'0', 'admin', 'admin', '2020-04-11 20:33:28', null, b'0'), ('19', '普通商品', 'NORMAL_GOODS', '1', 'goods_type', b'0', 'admin', 'admin', '2020-04-11 20:36:00', null, b'0'), ('20', '特价商品', 'SPECIAL_GOODS', '2', 'goods_type', b'0', 'admin', 'admin', '2020-04-11 20:36:18', null, b'0'), ('21', '拼团商品', 'ASSEMBLE_GOODS', '3', 'goods_type', b'0', 'admin', 'admin', '2020-04-11 20:37:38', null, b'0'), ('22', '秒杀商品', 'SEC_KILL_GOODS', '4', 'goods_type', b'0', 'admin', 'admin', '2020-04-11 20:37:59', null, b'0'), ('23', '满赠换购商品', 'EXCHANGE_GOODS', '5', 'goods_type', b'0', 'admin', 'admin', '2020-04-11 20:38:18', null, b'0'), ('24', '营销模块', 'module_activity', 'module_activity', 'shop_module', b'0', 'admin', 'admin', '2020-04-11 20:43:24', null, b'0'), ('25', '商品模块', 'module_goods', 'module_goods', 'shop_module', b'0', 'admin', 'admin', '2020-04-11 20:43:49', null, b'0'), ('26', '订单模块', 'module_order', 'module_order', 'shop_module', b'0', 'admin', 'admin', '2020-04-11 20:44:07', null, b'0'), ('27', '商户模块', 'module_seller', 'module_seller', 'shop_module', b'0', 'admin', 'admin', '2020-04-11 20:44:24', null, b'0'), ('28', '用户模块', 'module_user', 'module_user', 'shop_module', b'0', 'admin', 'admin', '2020-04-11 20:44:41', null, b'0'), ('29', '上架', 'UPPER_SHELF_GOODS', '1', 'goods_status', b'0', 'admin', 'admin', '2020-04-11 20:45:50', null, b'0'), ('30', '下架', 'LOWER_SHELF_GOODS', '2', 'goods_status', b'0', 'admin', 'admin', '2020-04-11 20:46:05', null, b'0'), ('31', '待审核', 'PENDING_REVIEW_GOODS', '3', 'goods_status', b'0', 'admin', 'admin', '2020-04-11 20:47:48', null, b'0'), ('32', '系统管理', 'module_admin', 'module_admin', 'shop_module', b'0', 'admin', 'admin', '2020-04-11 20:49:38', null, b'0'), ('33', '优惠券', 'COUPON', '1', 'offer_type', b'0', 'admin', 'admin', '2020-04-12 19:21:14', null, b'0'), ('34', '折扣券', 'DISCOUNT_COUPON', '2', 'offer_type', b'0', 'admin', 'admin', '2020-04-12 19:21:51', null, b'0'), ('35', '首页', 'bannerType', 'home', 'banner_type', b'0', 'admin', 'admin', '2020-04-12 20:29:15', null, b'0'), ('36', '积分商场', 'bannerType', 'integralShop', 'banner_type', b'0', 'admin', 'admin', '2020-04-12 20:29:51', null, b'0'), ('37', '分类', 'bannerType', 'classification', 'banner_type', b'0', 'admin', 'admin', '2020-04-12 20:30:10', null, b'0'), ('38', 'QQ渠道', 'shareChannel', 'qq', 'share_channel', b'0', 'admin', 'admin', '2020-04-12 20:31:45', null, b'0'), ('39', '微信渠道', 'shareChannel', 'wechat', 'share_channel', b'0', 'admin', 'admin', '2020-04-12 20:32:13', null, b'0'), ('40', '微信朋友圈渠道', 'shareChannel', 'wechatFriends', 'share_channel', b'0', 'admin', 'admin', '2020-04-12 20:32:39', null, b'0'); COMMIT; -- ---------------------------- diff --git a/doc/base/pager_risk.sql b/doc/base/pager_risk.sql index 7a69c2a..0c0f9bd 100644 --- a/doc/base/pager_risk.sql +++ b/doc/base/pager_risk.sql @@ -1,17 +1,17 @@ /* Navicat Premium Data Transfer - Source Server : dev + Source Server : prod Source Server Type : MySQL - Source Server Version : 50724 - Source Host : localhost + Source Server Version : 50646 + Source Host : 101.132.121.178 Source Database : pager_risk Target Server Type : MySQL - Target Server Version : 50724 + Target Server Version : 50646 File Encoding : utf-8 - Date: 12/22/2019 15:54:14 PM + Date: 09/04/2020 15:28:32 PM */ SET NAMES utf8; diff --git a/doc/base/pager_shop.sql b/doc/base/pager_shop.sql index 1a8d8fa..d398277 100644 --- a/doc/base/pager_shop.sql +++ b/doc/base/pager_shop.sql @@ -11,136 +11,12 @@ Target Server Version : 50646 File Encoding : utf-8 - Date: 05/05/2020 18:38:10 PM + Date: 09/04/2020 15:28:41 PM */ SET NAMES utf8; SET FOREIGN_KEY_CHECKS = 0; --- ---------------------------- --- Table structure for `ClientDetails` --- ---------------------------- -DROP TABLE IF EXISTS `ClientDetails`; -CREATE TABLE `ClientDetails` ( - `appId` varchar(255) NOT NULL, - `resourceIds` varchar(255) DEFAULT NULL, - `appSecret` varchar(255) DEFAULT NULL, - `scope` varchar(255) DEFAULT NULL, - `grantTypes` varchar(255) DEFAULT NULL, - `redirectUrl` varchar(255) DEFAULT NULL, - `authorities` varchar(255) DEFAULT NULL, - `access_token_validity` int(11) DEFAULT NULL, - `refresh_token_validity` int(11) DEFAULT NULL, - `additionalInformation` varchar(4096) DEFAULT NULL, - `autoApproveScopes` varchar(255) DEFAULT NULL, - PRIMARY KEY (`appId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; - --- ---------------------------- --- Table structure for `oauth_access_token` --- ---------------------------- -DROP TABLE IF EXISTS `oauth_access_token`; -CREATE TABLE `oauth_access_token` ( - `token_id` varchar(255) DEFAULT NULL, - `token` blob, - `authentication_id` varchar(255) DEFAULT NULL, - `user_name` varchar(255) DEFAULT NULL, - `client_id` varchar(255) DEFAULT NULL, - `authentication` blob, - `refresh_token` varchar(255) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1; - --- ---------------------------- --- Records of `oauth_access_token` --- ---------------------------- -BEGIN; -INSERT INTO `oauth_access_token` VALUES ('fd8bf2713f3e48df6a74128e8b866e5f', 0xaced0005737200436f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744f4175746832416363657373546f6b656e0cb29e361b24face0200064c00156164646974696f6e616c496e666f726d6174696f6e74000f4c6a6176612f7574696c2f4d61703b4c000a65787069726174696f6e7400104c6a6176612f7574696c2f446174653b4c000c72656672657368546f6b656e74003f4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f636f6d6d6f6e2f4f417574683252656672657368546f6b656e3b4c000573636f706574000f4c6a6176612f7574696c2f5365743b4c0009746f6b656e547970657400124c6a6176612f6c616e672f537472696e673b4c000576616c756571007e000578707372001e6a6176612e7574696c2e436f6c6c656374696f6e7324456d7074794d6170593614855adce7d002000078707372000e6a6176612e7574696c2e44617465686a81014b5974190300007870770800000169c05d3fc0787372004c6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744578706972696e674f417574683252656672657368546f6b656e2fdf47639dd0c9b70200014c000a65787069726174696f6e71007e0002787200446f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744f417574683252656672657368546f6b656e73e10e0a6354d45e0200014c000576616c756571007e0005787074002432313864333735312d633236642d343265322d623266622d6330323636333331636330307371007e000977080000016a5848d9be78737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000023f400000000000017400067365727665727874000662656172657274002461613837313837382d316433642d346464362d393438352d346637363765653639633566, '75be461feeb74022df4fb77a4667c936', 'admin', 'service-hi', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000002770400000002737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b787074000a524f4c455f41444d494e7371007e000d740009524f4c455f555345527871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0016787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00144c000573636f706571007e0016787074000a736572766963652d6869737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00147870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c77080000001000000007740013757365725f6f617574685f617070726f76616c74000474727565740004636f64657400064b636331717074000a6772616e745f74797065740012617574686f72697a6174696f6e5f636f646574000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a3830393574000d636c69656e745f736563726574740006313233343536740009636c69656e745f696474000a736572766963652d686978737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000673657276657278017371007e002f770c000000103f40000000000000787371007e001c3f400000000000007708000000100000000078740015687474703a2f2f3132372e302e302e313a38303935707371007e002f770c000000103f40000000000000787371007e002f770c000000103f4000000000000171007e0025787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000277040000000271007e000f71007e00117871007e003a737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020364233314639423435433534393943393533304441444336453942384643303470737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00164c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e002c737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000271007e000f71007e0011787074000561646d696e, '080fcb6895d57b819938defa9b96409d'), ('d6a85d30558f266bfff77ea9c26fe76d', 0xaced0005737200436f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744f4175746832416363657373546f6b656e0cb29e361b24face0200064c00156164646974696f6e616c496e666f726d6174696f6e74000f4c6a6176612f7574696c2f4d61703b4c000a65787069726174696f6e7400104c6a6176612f7574696c2f446174653b4c000c72656672657368546f6b656e74003f4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f636f6d6d6f6e2f4f417574683252656672657368546f6b656e3b4c000573636f706574000f4c6a6176612f7574696c2f5365743b4c0009746f6b656e547970657400124c6a6176612f6c616e672f537472696e673b4c000576616c756571007e000578707372001e6a6176612e7574696c2e436f6c6c656374696f6e7324456d7074794d6170593614855adce7d002000078707372000e6a6176612e7574696c2e44617465686a81014b5974190300007870770800000169d51bb4727870737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f400000000000017400036170707874000662656172657274002435656363353539642d373836392d343132332d613832652d316264383730326431346531, '0b68621a7fd2513d1f46374271a1c5c9', 'test', 'client4', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000001770400000001737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b7870740015524f6c455f4f5045524154494f4e5f4d414e4147457871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0014787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00124c000573636f706571007e00147870740007636c69656e7434737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00127870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000037708000000040000000274000a6772616e745f7479706574000870617373776f7264740008757365726e616d657400047465737478737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e0023770c000000103f40000000000000787371007e001a3f40000000000000770800000010000000007870707371007e0023770c000000103f40000000000000787371007e0023770c000000103f40000000000000787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000177040000000171007e000f7871007e002d737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f726465727871007e001a3f400000000000067708000000080000000271007e001c71007e001d71007e001e71007e001f780070737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00144c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0020737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000171007e000f787071007e001f, null), ('97e3a140b4292ca33c5d56e8021ff03b', 0xaced0005737200436f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744f4175746832416363657373546f6b656e0cb29e361b24face0200064c00156164646974696f6e616c496e666f726d6174696f6e74000f4c6a6176612f7574696c2f4d61703b4c000a65787069726174696f6e7400104c6a6176612f7574696c2f446174653b4c000c72656672657368546f6b656e74003f4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f636f6d6d6f6e2f4f417574683252656672657368546f6b656e3b4c000573636f706574000f4c6a6176612f7574696c2f5365743b4c0009746f6b656e547970657400124c6a6176612f6c616e672f537472696e673b4c000576616c756571007e000578707372001e6a6176612e7574696c2e436f6c6c656374696f6e7324456d7074794d6170593614855adce7d002000078707372000e6a6176612e7574696c2e44617465686a81014b597419030000787077080000016b058fde507870737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000023f400000000000017400036170707874000662656172657274002439613435626636302d663864622d346633342d393861632d313831656631303731343132, 'e28b947495dc9d0b1a3cdaae711cfa4b', 'coding', 'client4', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000001770400000001737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b7870740010524f4c455f53555045525f41444d494e7871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0014787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00124c000573636f706571007e00147870740007636c69656e7434737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00127870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000037708000000040000000274000a6772616e745f7479706574000870617373776f7264740008757365726e616d65740006636f64696e6778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e0023770c000000103f40000000000000787371007e001a3f40000000000000770800000010000000007870707371007e0023770c000000103f40000000000000787371007e0023770c000000103f40000000000000787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000177040000000171007e000f7871007e002d737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f726465727871007e001a3f400000000000067708000000080000000271007e001c71007e001d71007e001e71007e001f780070737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00144c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0020737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000171007e000f787071007e001f, null), ('8ec05f3f82e60414c15b93eb0e9ade3e', 0xaced0005737200436f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744f4175746832416363657373546f6b656e0cb29e361b24face0200064c00156164646974696f6e616c496e666f726d6174696f6e74000f4c6a6176612f7574696c2f4d61703b4c000a65787069726174696f6e7400104c6a6176612f7574696c2f446174653b4c000c72656672657368546f6b656e74003f4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f636f6d6d6f6e2f4f417574683252656672657368546f6b656e3b4c000573636f706574000f4c6a6176612f7574696c2f5365743b4c0009746f6b656e547970657400124c6a6176612f6c616e672f537472696e673b4c000576616c756571007e000578707372001e6a6176612e7574696c2e436f6c6c656374696f6e7324456d7074794d6170593614855adce7d002000078707372000e6a6176612e7574696c2e44617465686a81014b597419030000787077080000016b08e572857870737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f400000000000017400036170707874000662656172657274002464336561633538372d646533312d346534362d623765342d323931663237623630613234, '57704ce00aa474d115c5081e4816fe2b', 'admin', 'client4', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000001770400000001737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b7870740010524f4c455f53555045525f41444d494e7871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0014787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00124c000573636f706571007e00147870740007636c69656e7434737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00127870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000037708000000040000000274000a6772616e745f7479706574000870617373776f7264740008757365726e616d6574000561646d696e78737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e0023770c000000103f40000000000000787371007e001a3f40000000000000770800000010000000007870707371007e0023770c000000103f40000000000000787371007e0023770c000000103f40000000000000787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000177040000000171007e000f7871007e002d737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f726465727871007e001a3f400000000000067708000000080000000271007e001c71007e001d71007e001e71007e001f780070737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00144c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0020737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000171007e000f787071007e001f, null), ('13f4a2b61726fee71614e62fbeadd5cc', 0xaced0005737200436f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744f4175746832416363657373546f6b656e0cb29e361b24face0200064c00156164646974696f6e616c496e666f726d6174696f6e74000f4c6a6176612f7574696c2f4d61703b4c000a65787069726174696f6e7400104c6a6176612f7574696c2f446174653b4c000c72656672657368546f6b656e74003f4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f636f6d6d6f6e2f4f417574683252656672657368546f6b656e3b4c000573636f706574000f4c6a6176612f7574696c2f5365743b4c0009746f6b656e547970657400124c6a6176612f6c616e672f537472696e673b4c000576616c756571007e000578707372001e6a6176612e7574696c2e436f6c6c656374696f6e7324456d7074794d6170593614855adce7d002000078707372000e6a6176612e7574696c2e44617465686a81014b597419030000787077080000016ced5c34bb7870737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000023f400000000000017400036170707874000662656172657274002465306364666333642d366436382d343038642d613139372d343230646265383033663364, '7999ded3cff1d2237e92b4d3a5a37e11', 'admin', 'client7', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000001770400000001737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b7870740010524f4c455f53555045525f41444d494e7871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0014787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00124c000573636f706571007e00147870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00127870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000037708000000040000000274000a6772616e745f7479706574000870617373776f7264740008757365726e616d6574000561646d696e78737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e0023770c000000103f40000000000000787371007e001a3f40000000000000770800000010000000007870707371007e0023770c000000103f40000000000000787371007e0023770c000000103f40000000000000787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000177040000000171007e000f7871007e002d737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f726465727871007e001a3f400000000000067708000000080000000271007e001c71007e001d71007e001e71007e001f780070737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00144c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0020737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000171007e000f787071007e001f, null); -COMMIT; - --- ---------------------------- --- Table structure for `oauth_approvals` --- ---------------------------- -DROP TABLE IF EXISTS `oauth_approvals`; -CREATE TABLE `oauth_approvals` ( - `userId` varchar(255) DEFAULT NULL, - `clientId` varchar(255) DEFAULT NULL, - `scope` varchar(255) DEFAULT NULL, - `status` varchar(10) DEFAULT NULL, - `expiresAt` datetime DEFAULT NULL, - `lastModifiedAt` datetime DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1; - --- ---------------------------- --- Table structure for `oauth_client_details` --- ---------------------------- -DROP TABLE IF EXISTS `oauth_client_details`; -CREATE TABLE `oauth_client_details` ( - `client_id` varchar(255) NOT NULL, - `resource_ids` varchar(255) DEFAULT NULL, - `client_secret` varchar(255) DEFAULT NULL, - `scope` varchar(255) DEFAULT NULL, - `authorized_grant_types` varchar(255) DEFAULT NULL, - `web_server_redirect_uri` varchar(255) DEFAULT NULL, - `authorities` varchar(255) DEFAULT NULL, - `access_token_validity` int(11) DEFAULT NULL, - `refresh_token_validity` int(11) DEFAULT NULL, - `additional_information` varchar(4096) DEFAULT NULL, - `autoapprove` varchar(255) DEFAULT NULL, - PRIMARY KEY (`client_id`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; - --- ---------------------------- --- Records of `oauth_client_details` --- ---------------------------- -BEGIN; -INSERT INTO `oauth_client_details` VALUES ('client', null, 'secret', 'app', 'authorization_code', 'http://172.16.11.55:8095', null, null, null, null, null), ('client2', null, '{bcrypt}secret', 'app', 'authorization_code', 'http://172.16.11.55:9527', null, null, null, null, null), ('client3', null, '{bcrypt}secret', 'app', 'authorization_code', 'http://127.0.0.1:8099/oauth/home', null, null, null, null, null), ('client4', null, '$2a$10$5l0.t/a4oc9hmd92OQLQLe/ZgDaFF22PwrCitlblVeyXibiPGeVQ6', 'app', 'authorization_code,password', 'http://127.0.0.1:8095', null, null, null, null, null), ('client5', null, '{bcrypt}secret', 'app', 'authorization_code', 'http://127.0.0.1:9527', null, null, null, null, null), ('client6', null, '{bcrypt}secret', 'app', 'password', 'http://127.0.0.1:9527', null, null, null, null, null), ('client7', null, '$2a$10$5l0.t/a4oc9hmd92OQLQLe/ZgDaFF22PwrCitlblVeyXibiPGeVQ6', 'app', 'authorization_code,password', 'http://127.0.0.1:9527', null, null, null, null, null); -COMMIT; - --- ---------------------------- --- Table structure for `oauth_client_token` --- ---------------------------- -DROP TABLE IF EXISTS `oauth_client_token`; -CREATE TABLE `oauth_client_token` ( - `token_id` varchar(255) DEFAULT NULL, - `token` blob, - `authentication_id` varchar(255) DEFAULT NULL, - `user_name` varchar(255) DEFAULT NULL, - `client_id` varchar(255) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1; - --- ---------------------------- --- Table structure for `oauth_code` --- ---------------------------- -DROP TABLE IF EXISTS `oauth_code`; -CREATE TABLE `oauth_code` ( - `code` varchar(255) DEFAULT NULL, - `authentication` blob -) ENGINE=InnoDB DEFAULT CHARSET=latin1; - --- ---------------------------- --- Records of `oauth_code` --- ---------------------------- -BEGIN; -INSERT INTO `oauth_code` VALUES ('R9sJQB', 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000001770400000001737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b7870740010524f4c455f53555045525f41444d494e7871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0014787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00124c000573636f706571007e00147870740007636c69656e7437737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00127870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000d726573706f6e73655f74797065740004636f646574000c72656469726563745f757269740015687474703a2f2f3132372e302e302e313a39353237740009636c69656e745f696471007e001778737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000174000361707078017371007e0024770c000000103f40000000000000787371007e001a3f40000000000000770800000010000000007871007e001f707371007e0024770c000000103f40000000000000787371007e0024770c000000103f4000000000000171007e001d787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000177040000000171007e000f7871007e002e737200486f72672e737072696e676672616d65776f726b2e73656375726974792e7765622e61757468656e7469636174696f6e2e57656241757468656e7469636174696f6e44657461696c7300000000000001fe0200024c000d72656d6f74654164647265737371007e000e4c000973657373696f6e496471007e000e78707400093132372e302e302e31740020433442413245394144363332314530354439343144433638443233343837423270737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00144c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0021737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000171007e000f787074000561646d696e); -COMMIT; - --- ---------------------------- --- Table structure for `oauth_refresh_token` --- ---------------------------- -DROP TABLE IF EXISTS `oauth_refresh_token`; -CREATE TABLE `oauth_refresh_token` ( - `token_id` varchar(255) DEFAULT NULL, - `token` blob, - `authentication` blob -) ENGINE=InnoDB DEFAULT CHARSET=latin1; - --- ---------------------------- --- Records of `oauth_refresh_token` --- ---------------------------- -BEGIN; -INSERT INTO `oauth_refresh_token` VALUES ('080fcb6895d57b819938defa9b96409d', 0xaced00057372004c6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744578706972696e674f417574683252656672657368546f6b656e2fdf47639dd0c9b70200014c000a65787069726174696f6e7400104c6a6176612f7574696c2f446174653b787200446f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e636f6d6d6f6e2e44656661756c744f417574683252656672657368546f6b656e73e10e0a6354d45e0200014c000576616c75657400124c6a6176612f6c616e672f537472696e673b787074002432313864333735312d633236642d343265322d623266622d6330323636333331636330307372000e6a6176612e7574696c2e44617465686a81014b597419030000787077080000016a5848d9be78, 0xaced0005737200416f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f417574683241757468656e7469636174696f6ebd400b02166252130200024c000d73746f7265645265717565737474003c4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f4f4175746832526571756573743b4c00127573657241757468656e7469636174696f6e7400324c6f72672f737072696e676672616d65776f726b2f73656375726974792f636f72652f41757468656e7469636174696f6e3b787200476f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e416273747261637441757468656e7469636174696f6e546f6b656ed3aa287e6e47640e0200035a000d61757468656e746963617465644c000b617574686f7269746965737400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000764657461696c737400124c6a6176612f6c616e672f4f626a6563743b787000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c6973747400104c6a6176612f7574696c2f4c6973743b7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c00016371007e00047870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a65787000000002770400000002737200426f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e617574686f726974792e53696d706c654772616e746564417574686f7269747900000000000001fe0200014c0004726f6c657400124c6a6176612f6c616e672f537472696e673b787074000a524f4c455f41444d494e7371007e000d740009524f4c455f555345527871007e000c707372003a6f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e4f41757468325265717565737400000000000000010200075a0008617070726f7665644c000b617574686f72697469657371007e00044c000a657874656e73696f6e7374000f4c6a6176612f7574696c2f4d61703b4c000b726564697265637455726971007e000e4c00077265667265736874003b4c6f72672f737072696e676672616d65776f726b2f73656375726974792f6f61757468322f70726f76696465722f546f6b656e526571756573743b4c000b7265736f7572636549647374000f4c6a6176612f7574696c2f5365743b4c000d726573706f6e7365547970657371007e0016787200386f72672e737072696e676672616d65776f726b2e73656375726974792e6f61757468322e70726f76696465722e426173655265717565737436287a3ea37169bd0200034c0008636c69656e74496471007e000e4c001172657175657374506172616d657465727371007e00144c000573636f706571007e0016787074000a736572766963652d6869737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654d6170f1a5a8fe74f507420200014c00016d71007e00147870737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000067708000000080000000374000a6772616e745f7479706574000870617373776f7264740008757365726e616d6574000561646d696e74000573636f706574000673657276657278737200256a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65536574801d92d18f9b80550200007871007e0009737200176a6176612e7574696c2e4c696e6b656448617368536574d86cd75a95dd2a1e020000787200116a6176612e7574696c2e48617368536574ba44859596b8b7340300007870770c000000103f4000000000000171007e002378017371007e0027770c000000103f40000000000000787371007e001c3f40000000000000770800000010000000007870707371007e0027770c000000103f40000000000000787371007e0027770c000000103f40000000000000787372004f6f72672e737072696e676672616d65776f726b2e73656375726974792e61757468656e7469636174696f6e2e557365726e616d6550617373776f726441757468656e7469636174696f6e546f6b656e00000000000001fe0200024c000b63726564656e7469616c7371007e00054c00097072696e636970616c71007e00057871007e0003017371007e00077371007e000b0000000277040000000271007e000f71007e00117871007e0030737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f726465727871007e001c3f400000000000067708000000080000000371007e001e71007e001f71007e002071007e002171007e002271007e0023780070737200326f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657200000000000001fe0200075a00116163636f756e744e6f6e457870697265645a00106163636f756e744e6f6e4c6f636b65645a001563726564656e7469616c734e6f6e457870697265645a0007656e61626c65644c000b617574686f72697469657371007e00164c000870617373776f726471007e000e4c0008757365726e616d6571007e000e7870010101017371007e0024737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007870737200466f72672e737072696e676672616d65776f726b2e73656375726974792e636f72652e7573657264657461696c732e5573657224417574686f72697479436f6d70617261746f7200000000000001fe020000787077040000000271007e000f71007e0011787071007e0021); -COMMIT; - -- ---------------------------- -- Table structure for `t_access_ip` -- ---------------------------- @@ -283,6 +159,23 @@ CREATE TABLE `t_dynamic_form_rules` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +-- ---------------------------- +-- Table structure for `t_feedback` +-- ---------------------------- +DROP TABLE IF EXISTS `t_feedback`; +CREATE TABLE `t_feedback` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `user_id` bigint(20) DEFAULT NULL COMMENT '用户主键', + `content` varchar(255) DEFAULT NULL COMMENT '反馈内容', + `images` varchar(255) DEFAULT NULL, + `create_user` varchar(255) DEFAULT NULL, + `update_user` varchar(255) DEFAULT NULL, + `create_time` datetime DEFAULT NULL, + `update_time` datetime DEFAULT NULL, + `delete_status` bit(1) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + -- ---------------------------- -- Table structure for `t_generator_config` -- ---------------------------- @@ -374,13 +267,36 @@ CREATE TABLE `t_menu` ( `update_time` datetime DEFAULT NULL, `delete_status` bit(1) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=131 DEFAULT CHARSET=utf8mb4 COMMENT='菜单表'; +) ENGINE=InnoDB AUTO_INCREMENT=132 DEFAULT CHARSET=utf8mb4 COMMENT='菜单表'; -- ---------------------------- -- Records of `t_menu` -- ---------------------------- BEGIN; -INSERT INTO `t_menu` VALUES ('1', null, '首页', 'PAGER_DASHBOARD', '1', '0', '/dashboard', b'1', b'0', 'dashboard/index', null, 'dashboard', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('2', null, '营销管理', 'PAGER_ACTIVITY', '1', '2', '/activity', b'1', b'0', '', '/activity/coupon/template', 'table', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('3', null, '商品管理', 'PAGER_GOODS', '1', '3', '/goods', b'1', b'0', '', '/goods/goods', 'nested', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('4', null, '订单管理', 'PAGER_ORDER', '1', '4', '/order', b'1', b'0', '', 'noredirect', 'component', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('5', null, '财务管理', 'PAGER_FINANCE', '1', '5', '/finance', b'1', b'0', '', 'noredirect', 'money', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('6', null, '统计管理', 'PAGER_STATISTICS', '1', '6', '/statistics', b'1', b'0', '', 'noredirect', 'chart', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('7', null, '风控管理', 'PAGER_RISK', '1', '7', '/risk', b'1', b'0', '', '/risk/rule', 'table', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('8', null, '监控管理', 'PAGER_MONITOR', '1', '8', '/monitor', b'1', b'0', '', '/monitor/hystrix', 'table', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('9', null, '系统管理', 'PAGER_ROLE_SYSTEM', '1', '9', '/system', b'1', b'0', '', '/system/user', 'component', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('10', null, '代码管理', 'PAGER_GENERATOR', '1', '10', '/generator', b'1', b'0', '', '/generator/code', 'money', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('11', '2', '优惠券管理', 'PAGER_ACTIVITY_COUPON', '1', '1', 'coupon', b'1', b'0', 'activity/coupon/index', '/activity/coupon/template', null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('12', '11', '优惠券模板管理', 'PAGER_ACTIVITY_COUPON_TEMPLATE', '1', '3', 'template', b'1', b'0', 'activity/coupon/template/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('13', '11', '用户优惠券', 'PAGER_ACTIVITY_COUPON_USER', '1', '4', 'user', b'1', b'0', 'activity/coupon/user/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('14', '2', '满赠换购', 'PAGER_ACTIVITY_EXCHANGE', '1', '2', 'exchange', b'1', b'0', 'activity/exchange/index', '/activity/exchange/data', null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('15', '2', '拼团管理', 'PAGER_ACTIVITY_ASSEMBLY', '1', '5', 'assemble', b'1', b'0', 'activity/assemble/index', '/activity/assemble/data', null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('16', '15', '拼团规则', 'PAGER_ACTIVITY_ASSEMBLY_RULE', '1', '1', 'rule/:id(\\d+)', b'1', b'1', 'activity/assemble/rule/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('17', '15', '成团记录', 'PAGER_ACTIVITY_ASSEMBLY_RECORD', '1', '7', 'record/:id(\\d+)', b'1', b'1', 'activity/assemble/record/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('18', '2', 'Banner 管理', 'PAGER_ACTIVITY_BANNER', '1', '8', 'banner', b'1', b'0', 'activity/banner/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('20', '3', '商品分类', 'PAGER_GOODS_CLASSIFICATION', '1', '1', 'classification', b'1', b'0', 'goods/classification/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('21', '4', '用户订单', 'PAGER_ORDER_USER', '1', '1', 'user', b'1', b'0', 'order/user/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('22', '4', '售后订单', 'PAGER_ORDER_SALE', '1', '2', 'sale', b'1', b'0', 'order/sale/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('23', '4', '商户订单', 'PAGER_ORDER_SELLER', '1', '3', 'seller', b'1', b'0', 'order/seller/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('24', '5', '资金管理', 'PAGER_FINANCE_FUND', '1', '1', 'fund', b'1', b'0', 'finance/fund/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('25', '5', '交易管理', 'PAGER_FINANCE_TRADE', '1', '2', 'trade', b'1', b'0', 'finance/trade/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('26', '6', '优惠券统计', 'PAGER_STATISTICS_COUPON', '1', '1', 'coupon', b'1', b'0', 'statistics/coupon/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('27', '6', '拼团统计', 'PAGER_STATISTICS_ASSEMBLE', '1', '2', 'assemble', b'1', b'0', 'statistics/assemble/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('28', '6', '积分统计', 'PAGER_STATISTICS_INTEGRAL', '1', '3', 'integral', b'1', b'0', 'statistics/integral/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('29', '7', '规则配置', 'PAGER_RISK_RULE', '1', '0', 'rule', b'1', b'0', 'risk/rule/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('30', '7', '黑名单管理', 'PAGER_RISK_BLACKLIST', '1', '0', 'blackList', b'1', b'0', 'risk/blackList/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('33', '8', '数据库监控', 'PAGER_MONITOR_DATABASE', '1', '3', 'database', b'1', b'0', 'monitor/database/index', '/monitor/database/admin', null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('34', '33', '活动数据中心', 'PAGER_MONITOR_ACTIVITY', '1', '1', 'activity', b'1', b'0', 'monitor/database/activity', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('35', '33', '管理数据中心', 'PAGER_MONITOR_MANAGE', '1', '2', 'manage', b'1', b'0', 'monitor/database/admin', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('36', '33', '商品数据中心', 'PAGER_MONITOR_GOODS', '1', '3', 'goods', b'1', b'0', 'monitor/database/goods', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('37', '33', '订单数据中心', 'PAGER_MONITOR_ORDER', '1', '4', 'order', b'1', b'0', 'monitor/database/order', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('38', '9', '用户管理', 'PAGER_SYSTEM_USER', '1', '1', 'user', b'1', b'0', 'system/user/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('39', '9', '菜单管理', 'PAGER_SYSTEM_MENU', '1', '3', 'menu', b'1', b'0', 'system/menu/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('40', '9', '角色管理', 'PAGER_SYSTEM_ROLE', '1', '2', 'role', b'1', b'0', 'system/role/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('41', '9', '配置管理', 'PAGER_SYSTEM_CONFIG', '1', '4', 'config', b'1', b'0', 'system/config/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('42', '3', 'SKU管理', 'PAGER_GOODS_SKU', '1', '8', 'sku', b'1', b'0', 'goods/sku/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('43', '38', '创建', 'PAGER_SYSTEM_USER_CREATE', '2', '1', null, b'0', b'0', null, null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('44', '10', '自动生成代码', 'PAGER_SYSTEM_GENERATE', '1', '1', 'code', b'1', b'0', 'generator/index', '', '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('45', '42', '编辑', 'PAGER_GOODS_SKU_MODIFY', '2', '5', 'goods/edit/:id/:event/:operationType', b'0', b'1', 'goods/goods/edit', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('46', '15', '拼团商品', 'PAGER_ACTIVITY_ASSEMBLY_GOODS', '1', '1', 'goods/:id(\\d+)', b'1', b'1', 'activity/assemble/goods/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('47', '14', '满赠规则', 'PAGER_ACTIVITY_EXCHANGE_RULE', '1', '6', 'rule/:id', b'1', b'1', 'activity/exchange/rule/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('48', '14', '满赠换购购买记录', 'PAGER_ACTIVITY_EXCHANGE_RECORD', '1', '1', 'record/:id', b'1', b'1', 'activity/exchange/record/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('49', '14', '满赠换购商品', 'PAGER_ACTIVITY_EXCHANGE_GOODS', '1', '1', 'goods/:id', b'1', b'1', 'activity/exchange/goods/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('50', null, '平台管理', 'PAGER_PLATFORM', '1', '1', '/platform', b'1', b'0', null, null, 'international', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('51', '50', '会员管理', 'PAGER_PLATFORM_USER', '1', '0', 'user', b'1', b'0', 'platform/user/index', null, 'peoples', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('52', '50', '商家管理', 'PAGER_PLATFORM_SELLER', '1', '1', 'seller', b'1', b'0', 'platform/seller/index', null, 'star', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('53', '3', 'SPU管理', 'PAGER_GOODS_SPU', '1', '6', 'spu', b'1', b'0', 'goods/spu/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('54', '3', '品牌管理', 'PAGER_GOODS_BRAND', '1', '3', 'brand', b'1', b'0', 'goods/brand/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('55', '3', '品牌组管理', 'PAGER_GOODS_GROUP', '1', '2', 'group', b'1', b'0', 'goods/brand/group/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('56', '3', '属性组管理', 'PAGER_GOODS_GROUP_PROPERTY', '1', '4', 'group/property', b'1', b'0', 'goods/property/group/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('57', '3', '属性管理', 'PAGER_GOODS_PROPERTY', '1', '5', 'property', b'1', b'0', 'goods/property/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('58', '2', '秒杀管理', 'PAGER_ACTIVITY_KILL', '1', '10', 'seckill', b'1', b'0', 'activity/seckill/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('59', '2', '积分管理', 'PAGER_ACTIVITY_INTEGRAL', '1', '9', 'integral', b'1', b'0', 'activity/integral/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('60', '10', '动态表单', 'PAGER_SYSTEM_DYNAMIC', '1', '2', 'dynamic', b'1', b'0', 'generator/dynamic/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('61', '41', '创建', 'PAGER_SYSTEM_CONFIG_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, '2019-12-29 11:43:04', '2019-12-29 11:43:09', b'0'), ('62', '41', '编辑', 'PAGER_SYSTEM_CONFIG_MODIFY', '2', '2', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('63', '41', '禁用/启用', 'PAGER_SYSTEM_CONFIG_ENABLE', '2', '3', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('64', '38', '创建', 'PAGER_SYSTEM_USER_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('65', '38', '编辑', 'PAGER_SYSTEM_USER_MODIFY', '2', '2', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('66', '38', '禁用/启用', 'PAGER_SYSTEM_USER_ENABLE', '2', '3', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('67', '39', '创建', 'PAGER_SYSTEM_MENU_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('68', '39', '编辑', 'PAGER_SYSTEM_MENU_MODIFY', '2', '2', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('69', '40', '创建', 'PAGER_SYSTEM_ROLE_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('70', '40', '编辑', 'PAGER_SYSTEM_ROLE_MODIFY', '2', '2', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('71', '40', '删除', 'PAGER_SYSTEM_ROLE_DELETE', '2', '3', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('72', '40', '授权', 'PAGER_SYSTEM_ROLE_GRANT', '2', '4', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('88', '128', '创建', 'PAGER_ACTIVITY_ASSEMBLY_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('89', '128', '编辑', 'PAGER_ACTIVITY_ASSEMBLY_MODIFY', '2', '2', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('90', '46', '商品设置', 'PAGER_ACTIVITY_ASSEMBLY_GOODS_SETTING', '2', '3', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('91', '46', '详情', 'PAGER_ACTIVITY_ASSEMBLY_GOODS_DETAIL', '2', '4', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('92', '18', '创建', 'PAGER_ACTIVITY_BANNER_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('93', '18', '编辑', 'PAGER_ACTIVITY_BANNER_MODIFY', '2', '2', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('94', '12', '发送优惠券', 'PAGER_ACTIVITY_COUPON_PUBLISH', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('95', '12', '创建', 'PAGER_ACTIVITY_COUPON_TEMPLATE_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('96', '12', '编辑', 'PAGER_ACTIVITY_COUPON_TEMPLATE_MODIFY', '2', '2', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('97', '124', '创建', 'PAGER_ACTIVITY_EXCHANGE_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('98', '124', '编辑', 'PAGER_ACTIVITY_EXCHANGE_MODIFY', '2', '2', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('99', '47', '创建', 'PAGER_ACTIVITY_EXCHANGE_RULE_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('100', '47', '编辑', 'PAGER_ACTIVITY_EXCHANGE_RULE_MODIFY', '2', '2', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('101', '49', '设置规则', 'PAGER_ACTIVITY_EXCHANGE_GOODS_SETTING', '2', '3', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('102', '20', '创建', 'PAGER_GOODS_CLASSIFICATION_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('103', '20', '编辑', 'PAGER_GOODS_CLASSIFICATION_MODIFY', '2', '2', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('104', '55', '创建', 'PAGER_ACTIVITY_GOODS_GROUP_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('105', '55', '编辑', 'PAGER_ACTIVITY_GOODS_GROUP_MODIFY', '2', '2', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('106', '54', '创建', 'PAGER_ACTIVITY_GOODS_BRAND_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('107', '54', '编辑', 'PAGER_ACTIVITY_GOODS_BRAND_MODIFY', '2', '2', null, b'0', null, null, null, null, null, null, null, null, b'0'), ('108', '30', '创建', 'PAGER_RISK_BLACKLIST_CREATE', '2', '1', null, b'0', null, null, null, null, null, null, null, null, b'0'), ('109', '30', '编辑', 'PAGER_RISK_BLACKLIST_MODIFY', '2', '2', null, b'0', null, null, null, null, null, null, null, null, b'0'), ('110', '16', '创建', 'PAGER_ACTIVITY_ASSEMBLY_RULE_CREATE', '2', '1', null, b'0', null, null, null, null, null, null, null, null, b'0'), ('111', '16', '编辑', 'PAGER_ACTIVITY_ASSEMBLY_RULE_MODIFY', '2', '2', null, b'0', null, null, null, null, null, null, null, null, b'0'), ('112', '56', '创建', 'PAGER_ACTIVITY_GOODS_GROUP_PROPERTY_CREATE', '2', '1', null, b'0', null, null, null, null, null, null, null, null, b'0'), ('113', '56', '编辑', 'PAGER_ACTIVITY_GOODS_GROUP_PROPERTY_MODIFY', '2', '2', null, b'0', null, null, null, null, null, null, null, null, b'0'), ('114', '57', '创建', 'PAGER_ACTIVITY_GOODS_PROPERTY_CREATE', '2', '1', null, b'0', null, null, null, null, null, null, null, null, b'0'), ('115', '57', '编辑', 'PAGER_ACTIVITY_GOODS_PROPERTY_MODIFY', '2', '2', null, b'0', null, null, null, null, null, null, null, null, b'0'), ('116', '53', '创建', 'PAGER_ACTIVITY_GOODS_SPU_CREATE', '2', '1', null, b'0', null, null, null, null, null, null, '2020-01-05 14:48:16', '2020-01-05 14:48:25', b'0'), ('117', '53', '编辑', 'PAGER_ACTIVITY_GOODS_SPU_MODIFY', '2', '2', null, b'0', null, null, null, null, null, null, '2020-01-05 14:48:21', '2020-01-05 14:48:27', b'0'), ('119', '9', '角色授权', 'PAGER_SYSTEM_ROLE_PERMISSION', '1', '1', 'permission/:id(\\d+)', b'1', b'1', 'system/role/permission', null, null, 'admin', null, '2020-02-02 18:42:49', '2020-02-05 19:48:43', b'0'), ('120', '1', '注册人数', 'PAGER_DASHBOARD_REGISTER', '2', '1', null, b'0', null, null, null, null, null, null, '2020-02-05 19:48:11', '2020-02-05 19:48:39', b'0'), ('121', '1', '商户注册数', 'PAGER_DASHBOARD_SELLER', '2', '2', null, b'0', null, null, null, null, null, null, '2020-02-05 19:48:16', '2020-02-05 19:48:36', b'0'), ('122', '1', '当天营业额', 'PAGER_DASHBOARD_TURNOVER', '2', '3', null, b'0', null, null, null, null, null, null, '2020-02-05 19:48:21', '2020-02-05 19:48:31', b'0'), ('123', '1', '当天订单数', 'PAGER_DASHBOARD_ORDER', '2', '4', null, b'0', null, null, null, null, null, null, '2020-02-05 19:48:25', '2020-02-05 19:48:27', b'0'), ('124', '14', '满赠换购活动', 'PAGER_ACTIVITY_EXCHANGE_DATA', '1', '1', 'data', b'1', b'1', 'activity/exchange/data/index', null, null, 'admin', 'system', '2020-05-02 18:26:47', '2020-05-02 18:31:42', b'0'), ('128', '15', '拼团管理活动', 'PAGER_ACTIVITY_ASSEMBLY_DATA', '1', '1', 'data', b'1', b'1', 'activity/assemble/data/index', null, null, 'admin', null, '2020-05-02 20:12:35', '2020-05-02 20:18:29', b'0'), ('129', '3', '商品信息', 'PAGER_GOODS_INFO', '1', '7', 'object', b'1', b'0', 'goods/object/index', null, null, 'admin', null, '2020-05-03 14:53:40', null, b'0'), ('130', '42', '创建', 'PAGER_GOODS_SKU_CREATE', '2', '4', null, b'0', b'0', null, null, null, 'system', 'system', '2020-05-04 15:13:29', '2020-05-04 15:13:32', b'0'); +INSERT INTO `t_menu` VALUES ('1', null, '首页', 'PAGER_DASHBOARD', '1', '0', '/dashboard', b'1', b'0', 'dashboard/index', null, 'dashboard', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('2', null, '营销管理', 'PAGER_ACTIVITY', '1', '2', '/activity', b'1', b'0', '', '/activity/coupon/template', 'table', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('3', null, '商品管理', 'PAGER_GOODS', '1', '3', '/goods', b'1', b'0', '', '/goods/goods', 'nested', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('4', null, '订单管理', 'PAGER_ORDER', '1', '4', '/order', b'1', b'0', '', 'noredirect', 'component', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('5', null, '财务管理', 'PAGER_FINANCE', '1', '5', '/finance', b'1', b'0', '', 'noredirect', 'money', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('6', null, '统计管理', 'PAGER_STATISTICS', '1', '6', '/statistics', b'1', b'0', '', 'noredirect', 'chart', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('7', null, '风控管理', 'PAGER_RISK', '1', '7', '/risk', b'1', b'0', '', '/risk/rule', 'table', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('8', null, '监控管理', 'PAGER_MONITOR', '1', '8', '/monitor', b'1', b'0', '', '/monitor/hystrix', 'table', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('9', null, '系统管理', 'PAGER_ROLE_SYSTEM', '1', '9', '/system', b'1', b'0', '', '/system/user', 'component', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('10', null, '代码管理', 'PAGER_GENERATOR', '1', '10', '/generator', b'1', b'0', '', '/generator/code', 'money', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('11', '2', '优惠券管理', 'PAGER_ACTIVITY_COUPON', '1', '1', 'coupon', b'1', b'0', 'activity/coupon/index', '/activity/coupon/template', null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('12', '11', '优惠券模板管理', 'PAGER_ACTIVITY_COUPON_TEMPLATE', '1', '3', 'template', b'1', b'0', 'activity/coupon/template/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('13', '11', '用户优惠券', 'PAGER_ACTIVITY_COUPON_USER', '1', '4', 'user', b'1', b'0', 'activity/coupon/user/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('14', '2', '满赠换购', 'PAGER_ACTIVITY_EXCHANGE', '1', '2', 'exchange', b'1', b'0', 'activity/exchange/index', '/activity/exchange/data', null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('15', '2', '拼团管理', 'PAGER_ACTIVITY_ASSEMBLY', '1', '5', 'assemble', b'1', b'0', 'activity/assemble/index', '/activity/assemble/data', null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('16', '15', '拼团规则', 'PAGER_ACTIVITY_ASSEMBLY_RULE', '1', '1', 'rule/:id(\\d+)', b'1', b'1', 'activity/assemble/rule/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('17', '15', '成团记录', 'PAGER_ACTIVITY_ASSEMBLY_RECORD', '1', '7', 'record/:id(\\d+)', b'1', b'1', 'activity/assemble/record/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('18', '2', 'Banner 管理', 'PAGER_ACTIVITY_BANNER', '1', '8', 'banner', b'1', b'0', 'activity/banner/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('20', '3', '商品分类', 'PAGER_GOODS_CLASSIFICATION', '1', '1', 'classification', b'1', b'0', 'goods/classification/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('21', '4', '用户订单', 'PAGER_ORDER_USER', '1', '1', 'user', b'1', b'0', 'order/user/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('22', '4', '售后订单', 'PAGER_ORDER_SALE', '1', '2', 'sale', b'1', b'0', 'order/sale/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('23', '4', '商户订单', 'PAGER_ORDER_SELLER', '1', '3', 'seller', b'1', b'0', 'order/seller/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('24', '5', '资金管理', 'PAGER_FINANCE_FUND', '1', '1', 'fund', b'1', b'0', 'finance/fund/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('25', '5', '交易管理', 'PAGER_FINANCE_TRADE', '1', '2', 'trade', b'1', b'0', 'finance/trade/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('26', '6', '优惠券统计', 'PAGER_STATISTICS_COUPON', '1', '1', 'coupon', b'1', b'0', 'statistics/coupon/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('27', '6', '拼团统计', 'PAGER_STATISTICS_ASSEMBLE', '1', '2', 'assemble', b'1', b'0', 'statistics/assemble/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('28', '6', '积分统计', 'PAGER_STATISTICS_INTEGRAL', '1', '3', 'integral', b'1', b'0', 'statistics/integral/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('29', '7', '规则配置', 'PAGER_RISK_RULE', '1', '0', 'rule', b'1', b'0', 'risk/rule/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('30', '7', '黑名单管理', 'PAGER_RISK_BLACKLIST', '1', '0', 'blackList', b'1', b'0', 'risk/blackList/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('33', '8', '数据库监控', 'PAGER_MONITOR_DATABASE', '1', '3', 'database', b'1', b'0', 'monitor/database/index', '/monitor/database/admin', null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('34', '33', '活动数据中心', 'PAGER_MONITOR_ACTIVITY', '1', '1', 'activity', b'1', b'0', 'monitor/database/activity', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('35', '33', '管理数据中心', 'PAGER_MONITOR_MANAGE', '1', '2', 'manage', b'1', b'0', 'monitor/database/admin', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('36', '33', '商品数据中心', 'PAGER_MONITOR_GOODS', '1', '3', 'goods', b'1', b'0', 'monitor/database/goods', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('37', '33', '订单数据中心', 'PAGER_MONITOR_ORDER', '1', '4', 'order', b'1', b'0', 'monitor/database/order', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('38', '9', '用户管理', 'PAGER_SYSTEM_USER', '1', '1', 'user', b'1', b'0', 'system/user/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('39', '9', '菜单管理', 'PAGER_SYSTEM_MENU', '1', '3', 'menu', b'1', b'0', 'system/menu/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('40', '9', '角色管理', 'PAGER_SYSTEM_ROLE', '1', '2', 'role', b'1', b'0', 'system/role/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('41', '9', '配置管理', 'PAGER_SYSTEM_CONFIG', '1', '4', 'config', b'1', b'0', 'system/config/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('42', '3', 'SKU管理', 'PAGER_GOODS_SKU', '1', '8', 'sku', b'1', b'0', 'goods/sku/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('43', '38', '创建', 'PAGER_SYSTEM_USER_CREATE', '2', '1', null, b'0', b'0', null, null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('44', '10', '自动生成代码', 'PAGER_SYSTEM_GENERATE', '1', '1', 'code', b'1', b'0', 'generator/index', '', '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('45', '42', '编辑', 'PAGER_GOODS_SKU_MODIFY', '2', '5', 'goods/edit/:id/:event/:operationType', b'0', b'1', 'goods/goods/edit', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('46', '15', '拼团商品', 'PAGER_ACTIVITY_ASSEMBLY_GOODS', '1', '1', 'goods/:id(\\d+)', b'1', b'1', 'activity/assemble/goods/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('47', '14', '满赠规则', 'PAGER_ACTIVITY_EXCHANGE_RULE', '1', '6', 'rule/:id', b'1', b'1', 'activity/exchange/rule/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('48', '14', '满赠换购购买记录', 'PAGER_ACTIVITY_EXCHANGE_RECORD', '1', '1', 'record/:id', b'1', b'1', 'activity/exchange/record/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('49', '14', '满赠换购商品', 'PAGER_ACTIVITY_EXCHANGE_GOODS', '1', '1', 'goods/:id', b'1', b'1', 'activity/exchange/goods/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('50', null, '平台管理', 'PAGER_PLATFORM', '1', '1', '/platform', b'1', b'0', null, null, 'international', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('51', '50', '会员管理', 'PAGER_PLATFORM_USER', '1', '0', 'user', b'1', b'0', 'platform/user/index', null, 'peoples', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('52', '50', '商家管理', 'PAGER_PLATFORM_SELLER', '1', '1', 'seller', b'1', b'0', 'platform/seller/index', null, 'star', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('53', '3', 'SPU管理', 'PAGER_GOODS_SPU', '1', '6', 'spu', b'1', b'0', 'goods/spu/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('54', '3', '品牌管理', 'PAGER_GOODS_BRAND', '1', '3', 'brand', b'1', b'0', 'goods/brand/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('55', '3', '品牌组管理', 'PAGER_GOODS_GROUP', '1', '2', 'group', b'1', b'0', 'goods/brand/group/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('56', '3', '属性组管理', 'PAGER_GOODS_GROUP_PROPERTY', '1', '4', 'group/property', b'1', b'0', 'goods/property/group/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('57', '3', '属性管理', 'PAGER_GOODS_PROPERTY', '1', '5', 'property', b'1', b'0', 'goods/property/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('58', '2', '秒杀管理', 'PAGER_ACTIVITY_KILL', '1', '10', 'seckill', b'1', b'0', 'activity/seckill/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('59', '2', '积分管理', 'PAGER_ACTIVITY_INTEGRAL', '1', '9', 'integral', b'1', b'0', 'activity/integral/index', null, '', 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('60', '10', '动态表单', 'PAGER_SYSTEM_DYNAMIC', '1', '2', 'dynamic', b'1', b'0', 'generator/dynamic/index', null, null, 'system', 'system', '2019-12-08 14:20:52', '2019-12-08 14:20:52', b'0'), ('61', '41', '创建', 'PAGER_SYSTEM_CONFIG_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, '2019-12-29 11:43:04', '2019-12-29 11:43:09', b'0'), ('62', '41', '编辑', 'PAGER_SYSTEM_CONFIG_MODIFY', '2', '2', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('63', '41', '禁用/启用', 'PAGER_SYSTEM_CONFIG_ENABLE', '2', '3', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('64', '38', '创建', 'PAGER_SYSTEM_USER_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('65', '38', '编辑', 'PAGER_SYSTEM_USER_MODIFY', '2', '2', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('66', '38', '禁用/启用', 'PAGER_SYSTEM_USER_ENABLE', '2', '3', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('67', '39', '创建', 'PAGER_SYSTEM_MENU_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('68', '39', '编辑', 'PAGER_SYSTEM_MENU_MODIFY', '2', '2', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('69', '40', '创建', 'PAGER_SYSTEM_ROLE_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('70', '40', '编辑', 'PAGER_SYSTEM_ROLE_MODIFY', '2', '2', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('71', '40', '删除', 'PAGER_SYSTEM_ROLE_DELETE', '2', '3', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('72', '40', '授权', 'PAGER_SYSTEM_ROLE_GRANT', '2', '4', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('88', '128', '创建', 'PAGER_ACTIVITY_ASSEMBLY_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('89', '128', '编辑', 'PAGER_ACTIVITY_ASSEMBLY_MODIFY', '2', '2', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('90', '46', '商品设置', 'PAGER_ACTIVITY_ASSEMBLY_GOODS_SETTING', '2', '3', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('91', '46', '详情', 'PAGER_ACTIVITY_ASSEMBLY_GOODS_DETAIL', '2', '4', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('92', '18', '创建', 'PAGER_ACTIVITY_BANNER_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('93', '18', '编辑', 'PAGER_ACTIVITY_BANNER_MODIFY', '2', '2', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('94', '12', '发送优惠券', 'PAGER_ACTIVITY_COUPON_PUBLISH', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('95', '12', '创建', 'PAGER_ACTIVITY_COUPON_TEMPLATE_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('96', '12', '编辑', 'PAGER_ACTIVITY_COUPON_TEMPLATE_MODIFY', '2', '2', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('97', '124', '创建', 'PAGER_ACTIVITY_EXCHANGE_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('98', '124', '编辑', 'PAGER_ACTIVITY_EXCHANGE_MODIFY', '2', '2', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('99', '47', '创建', 'PAGER_ACTIVITY_EXCHANGE_RULE_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('100', '47', '编辑', 'PAGER_ACTIVITY_EXCHANGE_RULE_MODIFY', '2', '2', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('101', '49', '设置规则', 'PAGER_ACTIVITY_EXCHANGE_GOODS_SETTING', '2', '3', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('102', '20', '创建', 'PAGER_GOODS_CLASSIFICATION_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('103', '20', '编辑', 'PAGER_GOODS_CLASSIFICATION_MODIFY', '2', '2', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('104', '55', '创建', 'PAGER_ACTIVITY_GOODS_GROUP_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('105', '55', '编辑', 'PAGER_ACTIVITY_GOODS_GROUP_MODIFY', '2', '2', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('106', '54', '创建', 'PAGER_ACTIVITY_GOODS_BRAND_CREATE', '2', '1', null, b'0', b'0', null, null, null, null, null, null, null, b'0'), ('107', '54', '编辑', 'PAGER_ACTIVITY_GOODS_BRAND_MODIFY', '2', '2', null, b'0', null, null, null, null, null, null, null, null, b'0'), ('108', '30', '创建', 'PAGER_RISK_BLACKLIST_CREATE', '2', '1', null, b'0', null, null, null, null, null, null, null, null, b'0'), ('109', '30', '编辑', 'PAGER_RISK_BLACKLIST_MODIFY', '2', '2', null, b'0', null, null, null, null, null, null, null, null, b'0'), ('110', '16', '创建', 'PAGER_ACTIVITY_ASSEMBLY_RULE_CREATE', '2', '1', null, b'0', null, null, null, null, null, null, null, null, b'0'), ('111', '16', '编辑', 'PAGER_ACTIVITY_ASSEMBLY_RULE_MODIFY', '2', '2', null, b'0', null, null, null, null, null, null, null, null, b'0'), ('112', '56', '创建', 'PAGER_ACTIVITY_GOODS_GROUP_PROPERTY_CREATE', '2', '1', null, b'0', null, null, null, null, null, null, null, null, b'0'), ('113', '56', '编辑', 'PAGER_ACTIVITY_GOODS_GROUP_PROPERTY_MODIFY', '2', '2', null, b'0', null, null, null, null, null, null, null, null, b'0'), ('114', '57', '创建', 'PAGER_ACTIVITY_GOODS_PROPERTY_CREATE', '2', '1', null, b'0', null, null, null, null, null, null, null, null, b'0'), ('115', '57', '编辑', 'PAGER_ACTIVITY_GOODS_PROPERTY_MODIFY', '2', '2', null, b'0', null, null, null, null, null, null, null, null, b'0'), ('116', '53', '创建', 'PAGER_ACTIVITY_GOODS_SPU_CREATE', '2', '1', null, b'0', null, null, null, null, null, null, '2020-01-05 14:48:16', '2020-01-05 14:48:25', b'0'), ('117', '53', '编辑', 'PAGER_ACTIVITY_GOODS_SPU_MODIFY', '2', '2', null, b'0', null, null, null, null, null, null, '2020-01-05 14:48:21', '2020-01-05 14:48:27', b'0'), ('119', '9', '角色授权', 'PAGER_SYSTEM_ROLE_PERMISSION', '1', '1', 'permission/:id(\\d+)', b'1', b'1', 'system/role/permission', null, null, 'admin', null, '2020-02-02 18:42:49', '2020-02-05 19:48:43', b'0'), ('120', '1', '注册人数', 'PAGER_DASHBOARD_REGISTER', '2', '1', null, b'0', null, null, null, null, null, null, '2020-02-05 19:48:11', '2020-02-05 19:48:39', b'0'), ('121', '1', '商户注册数', 'PAGER_DASHBOARD_SELLER', '2', '2', null, b'0', null, null, null, null, null, null, '2020-02-05 19:48:16', '2020-02-05 19:48:36', b'0'), ('122', '1', '当天营业额', 'PAGER_DASHBOARD_TURNOVER', '2', '3', null, b'0', null, null, null, null, null, null, '2020-02-05 19:48:21', '2020-02-05 19:48:31', b'0'), ('123', '1', '当天订单数', 'PAGER_DASHBOARD_ORDER', '2', '4', null, b'0', null, null, null, null, null, null, '2020-02-05 19:48:25', '2020-02-05 19:48:27', b'0'), ('124', '14', '满赠换购活动', 'PAGER_ACTIVITY_EXCHANGE_DATA', '1', '1', 'data', b'1', b'1', 'activity/exchange/data/index', null, null, 'admin', 'system', '2020-05-02 18:26:47', '2020-05-02 18:31:42', b'0'), ('128', '15', '拼团管理活动', 'PAGER_ACTIVITY_ASSEMBLY_DATA', '1', '1', 'data', b'1', b'1', 'activity/assemble/data/index', null, null, 'admin', null, '2020-05-02 20:12:35', '2020-05-02 20:18:29', b'0'), ('129', '3', '商品信息', 'PAGER_GOODS_INFO', '1', '7', 'object', b'1', b'0', 'goods/object/index', null, null, 'admin', null, '2020-05-03 14:53:40', null, b'0'), ('130', '42', '创建', 'PAGER_GOODS_SKU_CREATE', '2', '4', null, b'0', b'0', null, null, null, 'system', 'system', '2020-05-04 15:13:29', '2020-05-04 15:13:32', b'0'), ('131', '9', '任务管理', 'PAGER_JOB', '1', '5', 'job', b'1', b'0', 'system/job/index', null, null, 'admin', 'admin', '2020-06-26 17:31:50', '2020-06-26 17:40:53', b'0'); +COMMIT; + +-- ---------------------------- +-- Table structure for `t_native_message` +-- ---------------------------- +DROP TABLE IF EXISTS `t_native_message`; +CREATE TABLE `t_native_message` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `user_id` bigint(20) DEFAULT NULL, + `phone` varchar(255) DEFAULT NULL, + `content` varchar(255) DEFAULT NULL, + `status` int(1) DEFAULT '0' COMMENT '0 未读 1 已读', + `create_time` timestamp NULL DEFAULT NULL, + `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP, + `delete_status` bit(1) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4; + +-- ---------------------------- +-- Records of `t_native_message` +-- ---------------------------- +BEGIN; +INSERT INTO `t_native_message` VALUES ('1', '1', '138123456789', '33errt54332334rr', '1', '2019-01-15 16:27:35', '2019-01-15 16:27:40', b'0'); COMMIT; -- ---------------------------- @@ -438,13 +354,13 @@ CREATE TABLE `t_role_menu` ( `update_time` datetime DEFAULT NULL, `delete_status` bit(1) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=212 DEFAULT CHARSET=utf8mb4 COMMENT='角色与权限关联关系表'; +) ENGINE=InnoDB AUTO_INCREMENT=608 DEFAULT CHARSET=utf8mb4 COMMENT='角色与权限关联关系表'; -- ---------------------------- -- Records of `t_role_menu` -- ---------------------------- BEGIN; -INSERT INTO `t_role_menu` VALUES ('103', '1', 'PAGER_DASHBOARD', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('104', '1', 'PAGER_ACTIVITY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('105', '1', 'PAGER_GOODS', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('106', '1', 'PAGER_ORDER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('107', '1', 'PAGER_FINANCE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('108', '1', 'PAGER_STATISTICS', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('109', '1', 'PAGER_RISK', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('110', '1', 'PAGER_MONITOR', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('111', '1', 'PAGER_ROLE_SYSTEM', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('112', '1', 'PAGER_GENERATOR', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('113', '1', 'PAGER_ACTIVITY_COUPON', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('114', '1', 'PAGER_ACTIVITY_COUPON_TEMPLATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('115', '1', 'PAGER_ACTIVITY_COUPON_USER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('116', '1', 'PAGER_ACTIVITY_EXCHANGE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('117', '1', 'PAGER_ACTIVITY_ASSEMBLY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('118', '1', 'PAGER_ACTIVITY_ASSEMBLY_RULE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('119', '1', 'PAGER_ACTIVITY_ASSEMBLY_RECORD', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('120', '1', 'PAGER_ACTIVITY_BANNER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('121', '1', 'PAGER_GOODS_CLASSIFICATION', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('122', '1', 'PAGER_ORDER_USER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('123', '1', 'PAGER_ORDER_SALE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('124', '1', 'PAGER_ORDER_SELLER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('125', '1', 'PAGER_FINANCE_FUND', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('126', '1', 'PAGER_FINANCE_TRADE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('127', '1', 'PAGER_STATISTICS_COUPON', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('128', '1', 'PAGER_STATISTICS_ASSEMBLE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('129', '1', 'PAGER_STATISTICS_INTEGRAL', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('130', '1', 'PAGER_RISK_RULE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('131', '1', 'PAGER_RISK_BLACKLIST', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('132', '1', 'PAGER_MONITOR_DATABASE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('133', '1', 'PAGER_MONITOR_ACTIVITY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('134', '1', 'PAGER_MONITOR_MANAGE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('135', '1', 'PAGER_MONITOR_GOODS', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('136', '1', 'PAGER_MONITOR_ORDER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('137', '1', 'PAGER_SYSTEM_USER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('138', '1', 'PAGER_SYSTEM_MENU', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('139', '1', 'PAGER_SYSTEM_ROLE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('140', '1', 'PAGER_SYSTEM_CONFIG', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('141', '1', 'PAGER_GOODS_SKU', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('142', '1', 'PAGER_SYSTEM_USER_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('143', '1', 'PAGER_SYSTEM_GENERATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('144', '1', 'PAGER_GOODS_SKU_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('145', '1', 'PAGER_ACTIVITY_ASSEMBLY_GOODS', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('146', '1', 'PAGER_ACTIVITY_EXCHANGE_RULE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('147', '1', 'PAGER_ACTIVITY_EXCHANGE_RECORD', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('148', '1', 'PAGER_ACTIVITY_EXCHANGE_GOODS', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('149', '1', 'PAGER_PLATFORM', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('150', '1', 'PAGER_PLATFORM_USER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('151', '1', 'PAGER_PLATFORM_SELLER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('152', '1', 'PAGER_GOODS_SPU', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('153', '1', 'PAGER_GOODS_BRAND', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('154', '1', 'PAGER_GOODS_GROUP', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('155', '1', 'PAGER_GOODS_GROUP_PROPERTY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('156', '1', 'PAGER_GOODS_PROPERTY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('157', '1', 'PAGER_ACTIVITY_KILL', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('158', '1', 'PAGER_ACTIVITY_INTEGRAL', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('159', '1', 'PAGER_SYSTEM_DYNAMIC', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('160', '1', 'PAGER_SYSTEM_CONFIG_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('161', '1', 'PAGER_SYSTEM_CONFIG_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('162', '1', 'PAGER_SYSTEM_CONFIG_ENABLE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('163', '1', 'PAGER_SYSTEM_USER_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('164', '1', 'PAGER_SYSTEM_USER_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('165', '1', 'PAGER_SYSTEM_USER_ENABLE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('166', '1', 'PAGER_SYSTEM_MENU_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('167', '1', 'PAGER_SYSTEM_MENU_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('168', '1', 'PAGER_SYSTEM_ROLE_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('169', '1', 'PAGER_SYSTEM_ROLE_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('170', '1', 'PAGER_SYSTEM_ROLE_DELETE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('171', '1', 'PAGER_SYSTEM_ROLE_GRANT', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('172', '1', 'PAGER_ACTIVITY_ASSEMBLY_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('173', '1', 'PAGER_ACTIVITY_ASSEMBLY_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('174', '1', 'PAGER_ACTIVITY_ASSEMBLY_GOODS_SETTING', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('175', '1', 'PAGER_ACTIVITY_ASSEMBLY_GOODS_DETAIL', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('176', '1', 'PAGER_ACTIVITY_BANNER_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('177', '1', 'PAGER_ACTIVITY_BANNER_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('178', '1', 'PAGER_ACTIVITY_COUPON_PUBLISH', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('179', '1', 'PAGER_ACTIVITY_COUPON_TEMPLATE_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('180', '1', 'PAGER_ACTIVITY_COUPON_TEMPLATE_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('181', '1', 'PAGER_ACTIVITY_EXCHANGE_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('182', '1', 'PAGER_ACTIVITY_EXCHANGE_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('183', '1', 'PAGER_ACTIVITY_EXCHANGE_RULE_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('184', '1', 'PAGER_ACTIVITY_EXCHANGE_RULE_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('185', '1', 'PAGER_ACTIVITY_EXCHANGE_GOODS_SETTING', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('186', '1', 'PAGER_GOODS_CLASSIFICATION_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('187', '1', 'PAGER_GOODS_CLASSIFICATION_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('188', '1', 'PAGER_GOODS_GROUP_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('189', '1', 'PAGER_GOODS_GROUP_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('190', '1', 'PAGER_GOODS_BRAND_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('191', '1', 'PAGER_GOODS_BRAND_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('192', '1', 'PAGER_RISK_BLACKLIST_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('193', '1', 'PAGER_RISK_BLACKLIST_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('194', '1', 'PAGER_ACTIVITY_ASSEMBLY_RULE_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('195', '1', 'PAGER_ACTIVITY_ASSEMBLY_RULE_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('196', '1', 'PAGER_GOODS_GROUP_PROPERTY_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('197', '1', 'PAGER_GOODS_GROUP_PROPERTY_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('198', '1', 'PAGER_GOODS_PROPERTY_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('199', '1', 'PAGER_GOODS_PROPERTY_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('200', '1', 'PAGER_GOODS_SPU_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('201', '1', 'PAGER_GOODS_SPU_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('202', '1', 'PAGER_SYSTEM_ROLE_PERMISSION', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('203', '1', 'PAGER_DASHBOARD_REGISTER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('204', '1', 'PAGER_DASHBOARD_SELLER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('205', '1', 'PAGER_DASHBOARD_TURNOVER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('206', '1', 'PAGER_DASHBOARD_ORDER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('207', '1', 'PAGER_ACTIVITY_EXCHANGE_INDEX', 'System', 'System', '2020-05-02 16:40:52', '2020-05-27 16:40:55', b'0'), ('208', '1', 'PAGER_ACTIVITY_EXCHANGE_DATA', 'System', 'System', '2020-05-02 18:30:06', '2020-05-02 18:30:09', b'0'), ('209', '1', 'PAGER_ACTIVITY_ASSEMBLY_DATA', 'System', 'System', '2020-05-02 20:18:57', '2020-05-27 20:19:01', b'0'), ('210', '1', 'PAGER_GOODS_INFO', 'System', 'System', '2020-05-03 14:58:46', '2020-05-03 14:58:49', b'0'), ('211', '1', 'PAGER_GOODS_SKU_CREATE', 'System', 'System', '2020-05-04 15:14:23', '2020-05-04 15:14:26', b'0'); +INSERT INTO `t_role_menu` VALUES ('103', '1', 'PAGER_DASHBOARD', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('104', '1', 'PAGER_ACTIVITY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('105', '1', 'PAGER_GOODS', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('106', '1', 'PAGER_ORDER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('107', '1', 'PAGER_FINANCE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('108', '1', 'PAGER_STATISTICS', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('109', '1', 'PAGER_RISK', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('110', '1', 'PAGER_MONITOR', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('111', '1', 'PAGER_ROLE_SYSTEM', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('112', '1', 'PAGER_GENERATOR', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('113', '1', 'PAGER_ACTIVITY_COUPON', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('114', '1', 'PAGER_ACTIVITY_COUPON_TEMPLATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('115', '1', 'PAGER_ACTIVITY_COUPON_USER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('116', '1', 'PAGER_ACTIVITY_EXCHANGE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('117', '1', 'PAGER_ACTIVITY_ASSEMBLY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('118', '1', 'PAGER_ACTIVITY_ASSEMBLY_RULE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('119', '1', 'PAGER_ACTIVITY_ASSEMBLY_RECORD', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('120', '1', 'PAGER_ACTIVITY_BANNER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('121', '1', 'PAGER_GOODS_CLASSIFICATION', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('122', '1', 'PAGER_ORDER_USER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('123', '1', 'PAGER_ORDER_SALE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('124', '1', 'PAGER_ORDER_SELLER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('125', '1', 'PAGER_FINANCE_FUND', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('126', '1', 'PAGER_FINANCE_TRADE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('127', '1', 'PAGER_STATISTICS_COUPON', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('128', '1', 'PAGER_STATISTICS_ASSEMBLE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('129', '1', 'PAGER_STATISTICS_INTEGRAL', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('130', '1', 'PAGER_RISK_RULE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('131', '1', 'PAGER_RISK_BLACKLIST', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('132', '1', 'PAGER_MONITOR_DATABASE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('133', '1', 'PAGER_MONITOR_ACTIVITY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('134', '1', 'PAGER_MONITOR_MANAGE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('135', '1', 'PAGER_MONITOR_GOODS', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('136', '1', 'PAGER_MONITOR_ORDER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('137', '1', 'PAGER_SYSTEM_USER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('138', '1', 'PAGER_SYSTEM_MENU', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('139', '1', 'PAGER_SYSTEM_ROLE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('140', '1', 'PAGER_SYSTEM_CONFIG', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('141', '1', 'PAGER_GOODS_SKU', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('142', '1', 'PAGER_SYSTEM_USER_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('143', '1', 'PAGER_SYSTEM_GENERATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('144', '1', 'PAGER_GOODS_SKU_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('145', '1', 'PAGER_ACTIVITY_ASSEMBLY_GOODS', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('146', '1', 'PAGER_ACTIVITY_EXCHANGE_RULE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('147', '1', 'PAGER_ACTIVITY_EXCHANGE_RECORD', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('148', '1', 'PAGER_ACTIVITY_EXCHANGE_GOODS', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('149', '1', 'PAGER_PLATFORM', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('150', '1', 'PAGER_PLATFORM_USER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('151', '1', 'PAGER_PLATFORM_SELLER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('152', '1', 'PAGER_GOODS_SPU', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('153', '1', 'PAGER_GOODS_BRAND', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('154', '1', 'PAGER_GOODS_GROUP', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('155', '1', 'PAGER_GOODS_GROUP_PROPERTY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('156', '1', 'PAGER_GOODS_PROPERTY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('157', '1', 'PAGER_ACTIVITY_KILL', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('158', '1', 'PAGER_ACTIVITY_INTEGRAL', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('159', '1', 'PAGER_SYSTEM_DYNAMIC', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('160', '1', 'PAGER_SYSTEM_CONFIG_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('161', '1', 'PAGER_SYSTEM_CONFIG_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('162', '1', 'PAGER_SYSTEM_CONFIG_ENABLE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('163', '1', 'PAGER_SYSTEM_USER_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('164', '1', 'PAGER_SYSTEM_USER_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('165', '1', 'PAGER_SYSTEM_USER_ENABLE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('166', '1', 'PAGER_SYSTEM_MENU_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('167', '1', 'PAGER_SYSTEM_MENU_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('168', '1', 'PAGER_SYSTEM_ROLE_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('169', '1', 'PAGER_SYSTEM_ROLE_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('170', '1', 'PAGER_SYSTEM_ROLE_DELETE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('171', '1', 'PAGER_SYSTEM_ROLE_GRANT', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('172', '1', 'PAGER_ACTIVITY_ASSEMBLY_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('173', '1', 'PAGER_ACTIVITY_ASSEMBLY_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('174', '1', 'PAGER_ACTIVITY_ASSEMBLY_GOODS_SETTING', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('175', '1', 'PAGER_ACTIVITY_ASSEMBLY_GOODS_DETAIL', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('176', '1', 'PAGER_ACTIVITY_BANNER_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('177', '1', 'PAGER_ACTIVITY_BANNER_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('178', '1', 'PAGER_ACTIVITY_COUPON_PUBLISH', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('179', '1', 'PAGER_ACTIVITY_COUPON_TEMPLATE_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('180', '1', 'PAGER_ACTIVITY_COUPON_TEMPLATE_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('181', '1', 'PAGER_ACTIVITY_EXCHANGE_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('182', '1', 'PAGER_ACTIVITY_EXCHANGE_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('183', '1', 'PAGER_ACTIVITY_EXCHANGE_RULE_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('184', '1', 'PAGER_ACTIVITY_EXCHANGE_RULE_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('185', '1', 'PAGER_ACTIVITY_EXCHANGE_GOODS_SETTING', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('186', '1', 'PAGER_GOODS_CLASSIFICATION_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('187', '1', 'PAGER_GOODS_CLASSIFICATION_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('188', '1', 'PAGER_GOODS_GROUP_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('189', '1', 'PAGER_GOODS_GROUP_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('190', '1', 'PAGER_GOODS_BRAND_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('191', '1', 'PAGER_GOODS_BRAND_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('192', '1', 'PAGER_RISK_BLACKLIST_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('193', '1', 'PAGER_RISK_BLACKLIST_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('194', '1', 'PAGER_ACTIVITY_ASSEMBLY_RULE_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('195', '1', 'PAGER_ACTIVITY_ASSEMBLY_RULE_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('196', '1', 'PAGER_GOODS_GROUP_PROPERTY_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('197', '1', 'PAGER_GOODS_GROUP_PROPERTY_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('198', '1', 'PAGER_GOODS_PROPERTY_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('199', '1', 'PAGER_GOODS_PROPERTY_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('200', '1', 'PAGER_GOODS_SPU_CREATE', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('201', '1', 'PAGER_GOODS_SPU_MODIFY', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('202', '1', 'PAGER_SYSTEM_ROLE_PERMISSION', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('203', '1', 'PAGER_DASHBOARD_REGISTER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('204', '1', 'PAGER_DASHBOARD_SELLER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('205', '1', 'PAGER_DASHBOARD_TURNOVER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('206', '1', 'PAGER_DASHBOARD_ORDER', 'System', 'System', '2020-05-02 13:31:23', '2020-05-02 13:31:23', b'0'), ('207', '1', 'PAGER_ACTIVITY_EXCHANGE_INDEX', 'System', 'System', '2020-05-02 16:40:52', '2020-05-27 16:40:55', b'0'), ('208', '1', 'PAGER_ACTIVITY_EXCHANGE_DATA', 'System', 'System', '2020-05-02 18:30:06', '2020-05-02 18:30:09', b'0'), ('209', '1', 'PAGER_ACTIVITY_ASSEMBLY_DATA', 'System', 'System', '2020-05-02 20:18:57', '2020-05-27 20:19:01', b'0'), ('210', '1', 'PAGER_GOODS_INFO', 'System', 'System', '2020-05-03 14:58:46', '2020-05-03 14:58:49', b'0'), ('211', '1', 'PAGER_GOODS_SKU_CREATE', 'System', 'System', '2020-05-04 15:14:23', '2020-05-04 15:14:26', b'0'), ('212', '1', 'PAGER_RISK_RULE', 'System', 'System', '2020-06-26 17:32:08', '2020-06-26 17:32:08', b'0'), ('213', '1', 'PAGER_JOB', 'System', 'System', '2020-06-26 17:38:03', '2020-06-26 17:38:14', b'0'); COMMIT; -- ---------------------------- @@ -514,29 +430,6 @@ BEGIN; INSERT INTO `t_sms_template` VALUES ('1', 'user', '1000', '【xxx电商】您的验证码是{0}，在10分钟内有效。如非本人操作请忽略本短信', '2018-12-12 21:13:26', '2018-10-28 12:38:34', b'0'), ('2', 'user', '1001', '【xxx电商】尊敬的{0}客户，您的验证码是{0}，在10分钟内有效。如非本人操作请忽略本短信', '2018-12-12 21:13:30', '2018-10-28 12:38:34', b'0'), ('3', 'user', '1002', '【xxx电商】尊敬的{0}客户，您已修改本产品的密码，密码是{1}。如非本人操作请忽略本短信', '2018-12-12 21:13:34', '2018-10-28 12:38:34', b'0'), ('4', 'user', '1003', '【xxx电商】尊敬的{0}客户，感谢您注册本产品，您的初始密码是{1}。如非本人操作请忽略本短信', '2018-12-12 21:13:37', '2018-10-28 12:38:34', b'0'); COMMIT; --- ---------------------------- --- Table structure for `t_station_letter` --- ---------------------------- -DROP TABLE IF EXISTS `t_station_letter`; -CREATE TABLE `t_station_letter` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT, - `user_id` bigint(20) DEFAULT NULL, - `phone` varchar(255) DEFAULT NULL, - `content` varchar(255) DEFAULT NULL, - `status` int(1) DEFAULT '0' COMMENT '0 未读 1 已读', - `create_time` timestamp NULL DEFAULT NULL, - `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP, - `delete_status` bit(1) DEFAULT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4; - --- ---------------------------- --- Records of `t_station_letter` --- ---------------------------- -BEGIN; -INSERT INTO `t_station_letter` VALUES ('1', '1', '138123456789', '33errt54332334rr', '1', '2019-01-15 16:27:35', '2019-01-15 16:27:40', b'0'); -COMMIT; - -- ---------------------------- -- Table structure for `t_sys_role` -- ---------------------------- @@ -618,8 +511,10 @@ COMMIT; DROP TABLE IF EXISTS `t_user`; CREATE TABLE `t_user` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '用户表', - `phone` varchar(11) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '手机号码', + `phone` varchar(11) COLLATE utf8mb4_bin NOT NULL COMMENT '手机号码', `password` varchar(127) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '登陆密码', + `create_user` varchar(63) COLLATE utf8mb4_bin DEFAULT NULL, + `update_user` varchar(63) COLLATE utf8mb4_bin DEFAULT NULL, `create_time` timestamp NULL DEFAULT NULL, `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `delete_status` bit(1) DEFAULT NULL, @@ -630,7 +525,7 @@ CREATE TABLE `t_user` ( -- Records of `t_user` -- ---------------------------- BEGIN; -INSERT INTO `t_user` VALUES ('1', '13818471341', '2b1e9477ca3889bac89027b358f94b09', '2018-10-28 19:20:21', '2018-12-16 19:24:12', b'0'), ('2', '13818471343', null, '2019-01-23 16:57:27', '2019-01-23 16:57:30', b'0'), ('3', '13818471342', null, '2019-01-23 16:57:24', '2019-01-23 16:57:26', b'0'); +INSERT INTO `t_user` VALUES ('1', '13818471341', '2b1e9477ca3889bac89027b358f94b09', null, null, '2018-10-28 19:20:21', '2018-12-16 19:24:12', b'0'), ('2', '13818471343', null, null, null, '2019-01-23 16:57:27', '2019-01-23 16:57:30', b'0'), ('3', '13818471342', null, null, null, '2019-01-23 16:57:24', '2019-01-23 16:57:26', b'0'); COMMIT; -- ---------------------------- @@ -639,14 +534,14 @@ COMMIT; DROP TABLE IF EXISTS `t_user_info`; CREATE TABLE `t_user_info` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, - `user_id` bigint(20) DEFAULT NULL COMMENT '对应t_user 表中的id', + `user_id` bigint(20) NOT NULL COMMENT '对应t_user 表中的id', `username` varchar(31) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '用户名', - `gender` tinyint(1) DEFAULT NULL COMMENT '性别', - `age` tinyint(3) DEFAULT NULL COMMENT '年龄', - `email` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '电子邮箱', + `gender` bit(1) DEFAULT NULL COMMENT '性别', `birthday` datetime DEFAULT NULL COMMENT '生日', - `avatar` varchar(100) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '头像', + `avatar` varchar(127) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '头像', `integral` bigint(20) DEFAULT NULL COMMENT '用户积分', + `create_user` varchar(63) COLLATE utf8mb4_bin DEFAULT NULL, + `update_user` varchar(63) COLLATE utf8mb4_bin DEFAULT NULL, `create_time` timestamp NULL DEFAULT NULL, `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `delete_status` bit(1) DEFAULT NULL, @@ -657,7 +552,7 @@ CREATE TABLE `t_user_info` ( -- Records of `t_user_info` -- ---------------------------- BEGIN; -INSERT INTO `t_user_info` VALUES ('1', '1', '白天不懂夜的黑', '1', '18', 'siguiyang1992@outlook.com', '2018-12-16 19:29:24', null, '1000', '2018-12-16 19:29:32', '2018-12-16 19:29:34', b'0'), ('2', '2', '白天不懂夜的黑2', '1', null, null, null, null, null, null, '2019-01-23 16:56:58', null), ('3', '3', '白天不懂夜的黑3', '1', null, null, null, null, null, null, '2019-01-23 16:57:01', null); +INSERT INTO `t_user_info` VALUES ('1', '1', '白天不懂夜的黑', b'1', '2018-12-16 19:29:24', null, '1000', null, null, '2018-12-16 19:29:32', '2018-12-16 19:29:34', b'0'), ('2', '2', '白天不懂夜的黑2', b'1', null, null, null, null, null, null, '2019-01-23 16:56:58', null), ('3', '3', '白天不懂夜的黑3', b'1', null, null, null, null, null, null, '2019-01-23 16:57:01', null); COMMIT; -- ---------------------------- diff --git a/doc/base/seata.sql b/doc/base/seata.sql new file mode 100644 index 0000000..19d780b --- /dev/null +++ b/doc/base/seata.sql @@ -0,0 +1,79 @@ +/* + Navicat Premium Data Transfer + + Source Server : prod + Source Server Type : MySQL + Source Server Version : 50646 + Source Host : 101.132.121.178 + Source Database : seata + + Target Server Type : MySQL + Target Server Version : 50646 + File Encoding : utf-8 + + Date: 09/04/2020 15:28:50 PM +*/ + +SET NAMES utf8; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for `branch_table` +-- ---------------------------- +DROP TABLE IF EXISTS `branch_table`; +CREATE TABLE `branch_table` ( + `branch_id` bigint(20) NOT NULL, + `xid` varchar(128) NOT NULL, + `transaction_id` bigint(20) DEFAULT NULL, + `resource_group_id` varchar(32) DEFAULT NULL, + `resource_id` varchar(256) DEFAULT NULL, + `branch_type` varchar(8) DEFAULT NULL, + `status` tinyint(4) DEFAULT NULL, + `client_id` varchar(64) DEFAULT NULL, + `application_data` varchar(2000) DEFAULT NULL, + `gmt_create` datetime(6) DEFAULT NULL, + `gmt_modified` datetime(6) DEFAULT NULL, + PRIMARY KEY (`branch_id`), + KEY `idx_xid` (`xid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Table structure for `global_table` +-- ---------------------------- +DROP TABLE IF EXISTS `global_table`; +CREATE TABLE `global_table` ( + `xid` varchar(128) NOT NULL, + `transaction_id` bigint(20) DEFAULT NULL, + `status` tinyint(4) NOT NULL, + `application_id` varchar(32) DEFAULT NULL, + `transaction_service_group` varchar(32) DEFAULT NULL, + `transaction_name` varchar(128) DEFAULT NULL, + `timeout` int(11) DEFAULT NULL, + `begin_time` bigint(20) DEFAULT NULL, + `application_data` varchar(2000) DEFAULT NULL, + `gmt_create` datetime DEFAULT NULL, + `gmt_modified` datetime DEFAULT NULL, + PRIMARY KEY (`xid`), + KEY `idx_gmt_modified_status` (`gmt_modified`,`status`), + KEY `idx_transaction_id` (`transaction_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Table structure for `lock_table` +-- ---------------------------- +DROP TABLE IF EXISTS `lock_table`; +CREATE TABLE `lock_table` ( + `row_key` varchar(128) NOT NULL, + `xid` varchar(96) DEFAULT NULL, + `transaction_id` bigint(20) DEFAULT NULL, + `branch_id` bigint(20) NOT NULL, + `resource_id` varchar(256) DEFAULT NULL, + `table_name` varchar(32) DEFAULT NULL, + `pk` varchar(36) DEFAULT NULL, + `gmt_create` datetime DEFAULT NULL, + `gmt_modified` datetime DEFAULT NULL, + PRIMARY KEY (`row_key`), + KEY `idx_branch_id` (`branch_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/doc/properties/shop-activity.properties b/doc/properties/shop-activity.properties new file mode 100644 index 0000000..2aa669e --- /dev/null +++ b/doc/properties/shop-activity.properties @@ -0,0 +1,31 @@ +sspring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 +spring.datasource.druid.filters=stat,wall,slf4j +spring.datasource.druid.initial-size=10 +spring.datasource.druid.maxActive=20 +spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20 +spring.datasource.druid.maxWait=60000 +spring.datasource.druid.min-idle=10 +spring.datasource.druid.minEvictableIdleTimeMillis=300000 +spring.datasource.druid.poolPreparedStatements=true +spring.datasource.druid.stat-view-servlet.allow=172.16.11.59,localhost,127.0.0.1 +spring.datasource.druid.stat-view-servlet.deny=192.168.1.73 +spring.datasource.druid.stat-view-servlet.login-password=null +spring.datasource.druid.stat-view-servlet.login-username=null +spring.datasource.druid.stat-view-servlet.reset-enable=false +spring.datasource.druid.stat-view-servlet.url-pattern=/druid/* +spring.datasource.druid.testOnBorrow=false +spring.datasource.druid.testOnReturn=false +spring.datasource.druid.testWhileIdle = true +spring.datasource.druid.timeBetweenEvictionRunsMillis=60000 +spring.datasource.druid.validationQuery=SELECT 1 +spring.datasource.druid.web-stat-filter.enabled=true +spring.datasource.druid.web-stat-filter.exclusions=*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/* +spring.datasource.druid.web-stat-filter.url-pattern=/* +spring.datasource.password=xxx +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.url=jdbc:mysql://xxx.xxx.xxx.xxx:3306/pager_activity?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false +spring.datasource.username=xxx +spring.redis.host=xxx.xxx.xxx.xxx +spring.redis.port=6379 +spring.redis.password=abc+123 diff --git a/doc/properties/shop-auth.properties b/doc/properties/shop-auth.properties new file mode 100644 index 0000000..6c02691 --- /dev/null +++ b/doc/properties/shop-auth.properties @@ -0,0 +1,31 @@ +sspring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 +spring.datasource.druid.filters=stat,wall,slf4j +spring.datasource.druid.initial-size=10 +spring.datasource.druid.maxActive=20 +spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20 +spring.datasource.druid.maxWait=60000 +spring.datasource.druid.min-idle=10 +spring.datasource.druid.minEvictableIdleTimeMillis=300000 +spring.datasource.druid.poolPreparedStatements=true +spring.datasource.druid.stat-view-servlet.allow=172.16.11.59,localhost,127.0.0.1 +spring.datasource.druid.stat-view-servlet.deny=192.168.1.73 +spring.datasource.druid.stat-view-servlet.login-password=null +spring.datasource.druid.stat-view-servlet.login-username=null +spring.datasource.druid.stat-view-servlet.reset-enable=false +spring.datasource.druid.stat-view-servlet.url-pattern=/druid/* +spring.datasource.druid.testOnBorrow=false +spring.datasource.druid.testOnReturn=false +spring.datasource.druid.testWhileIdle = true +spring.datasource.druid.timeBetweenEvictionRunsMillis=60000 +spring.datasource.druid.validationQuery=SELECT 1 +spring.datasource.druid.web-stat-filter.enabled=true +spring.datasource.druid.web-stat-filter.exclusions=*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/* +spring.datasource.druid.web-stat-filter.url-pattern=/* +spring.datasource.password=xxx +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.url=jdbc:mysql://xxx.xxx.xxx.xxx:3306/pager_auth?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false +spring.datasource.username=xxx +spring.redis.host=xxx.xxx.xxx.xxx +spring.redis.port=6379 +spring.redis.password=abc+123 diff --git a/doc/properties/shop-cart.properties b/doc/properties/shop-cart.properties new file mode 100644 index 0000000..cc7098f --- /dev/null +++ b/doc/properties/shop-cart.properties @@ -0,0 +1,31 @@ +sspring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 +spring.datasource.druid.filters=stat,wall,slf4j +spring.datasource.druid.initial-size=10 +spring.datasource.druid.maxActive=20 +spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20 +spring.datasource.druid.maxWait=60000 +spring.datasource.druid.min-idle=10 +spring.datasource.druid.minEvictableIdleTimeMillis=300000 +spring.datasource.druid.poolPreparedStatements=true +spring.datasource.druid.stat-view-servlet.allow=172.16.11.59,localhost,127.0.0.1 +spring.datasource.druid.stat-view-servlet.deny=192.168.1.73 +spring.datasource.druid.stat-view-servlet.login-password=null +spring.datasource.druid.stat-view-servlet.login-username=null +spring.datasource.druid.stat-view-servlet.reset-enable=false +spring.datasource.druid.stat-view-servlet.url-pattern=/druid/* +spring.datasource.druid.testOnBorrow=false +spring.datasource.druid.testOnReturn=false +spring.datasource.druid.testWhileIdle = true +spring.datasource.druid.timeBetweenEvictionRunsMillis=60000 +spring.datasource.druid.validationQuery=SELECT 1 +spring.datasource.druid.web-stat-filter.enabled=true +spring.datasource.druid.web-stat-filter.exclusions=*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/* +spring.datasource.druid.web-stat-filter.url-pattern=/* +spring.datasource.password=xxx +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.url=jdbc:mysql://xxx.xxx.xxx.xxx:3306/pager_goods?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false +spring.datasource.username=xxx +spring.redis.host=xxx.xxx.xxx.xxx +spring.redis.port=6379 +spring.redis.password=abc+123 diff --git a/doc/properties/shop-gateway.properties b/doc/properties/shop-gateway.properties new file mode 100644 index 0000000..c3a4f29 --- /dev/null +++ b/doc/properties/shop-gateway.properties @@ -0,0 +1,3 @@ +spring.redis.host=xxx.xxx.xxx.xxx +spring.redis.port=6379 +spring.redis.password=abc+123 diff --git a/doc/properties/shop-goods.properties b/doc/properties/shop-goods.properties new file mode 100644 index 0000000..cc7098f --- /dev/null +++ b/doc/properties/shop-goods.properties @@ -0,0 +1,31 @@ +sspring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 +spring.datasource.druid.filters=stat,wall,slf4j +spring.datasource.druid.initial-size=10 +spring.datasource.druid.maxActive=20 +spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20 +spring.datasource.druid.maxWait=60000 +spring.datasource.druid.min-idle=10 +spring.datasource.druid.minEvictableIdleTimeMillis=300000 +spring.datasource.druid.poolPreparedStatements=true +spring.datasource.druid.stat-view-servlet.allow=172.16.11.59,localhost,127.0.0.1 +spring.datasource.druid.stat-view-servlet.deny=192.168.1.73 +spring.datasource.druid.stat-view-servlet.login-password=null +spring.datasource.druid.stat-view-servlet.login-username=null +spring.datasource.druid.stat-view-servlet.reset-enable=false +spring.datasource.druid.stat-view-servlet.url-pattern=/druid/* +spring.datasource.druid.testOnBorrow=false +spring.datasource.druid.testOnReturn=false +spring.datasource.druid.testWhileIdle = true +spring.datasource.druid.timeBetweenEvictionRunsMillis=60000 +spring.datasource.druid.validationQuery=SELECT 1 +spring.datasource.druid.web-stat-filter.enabled=true +spring.datasource.druid.web-stat-filter.exclusions=*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/* +spring.datasource.druid.web-stat-filter.url-pattern=/* +spring.datasource.password=xxx +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.url=jdbc:mysql://xxx.xxx.xxx.xxx:3306/pager_goods?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false +spring.datasource.username=xxx +spring.redis.host=xxx.xxx.xxx.xxx +spring.redis.port=6379 +spring.redis.password=abc+123 diff --git a/doc/properties/shop-job.properties b/doc/properties/shop-job.properties new file mode 100644 index 0000000..2fafa23 --- /dev/null +++ b/doc/properties/shop-job.properties @@ -0,0 +1,31 @@ +sspring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 +spring.datasource.druid.filters=stat,wall,slf4j +spring.datasource.druid.initial-size=10 +spring.datasource.druid.maxActive=20 +spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20 +spring.datasource.druid.maxWait=60000 +spring.datasource.druid.min-idle=10 +spring.datasource.druid.minEvictableIdleTimeMillis=300000 +spring.datasource.druid.poolPreparedStatements=true +spring.datasource.druid.stat-view-servlet.allow=172.16.11.59,localhost,127.0.0.1 +spring.datasource.druid.stat-view-servlet.deny=192.168.1.73 +spring.datasource.druid.stat-view-servlet.login-password=null +spring.datasource.druid.stat-view-servlet.login-username=null +spring.datasource.druid.stat-view-servlet.reset-enable=false +spring.datasource.druid.stat-view-servlet.url-pattern=/druid/* +spring.datasource.druid.testOnBorrow=false +spring.datasource.druid.testOnReturn=false +spring.datasource.druid.testWhileIdle = true +spring.datasource.druid.timeBetweenEvictionRunsMillis=60000 +spring.datasource.druid.validationQuery=SELECT 1 +spring.datasource.druid.web-stat-filter.enabled=true +spring.datasource.druid.web-stat-filter.exclusions=*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/* +spring.datasource.druid.web-stat-filter.url-pattern=/* +spring.datasource.password=xxx +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.url=jdbc:mysql://xxx.xxx.xxx.xxx:3306/pager_job?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false +spring.datasource.username=xxx +spring.redis.host=xxx.xxx.xxx.xxx +spring.redis.port=6379 +spring.redis.password=abc+123 diff --git a/doc/properties/shop-order.properties b/doc/properties/shop-order.properties new file mode 100644 index 0000000..5d75943 --- /dev/null +++ b/doc/properties/shop-order.properties @@ -0,0 +1,31 @@ +sspring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 +spring.datasource.druid.filters=stat,wall,slf4j +spring.datasource.druid.initial-size=10 +spring.datasource.druid.maxActive=20 +spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20 +spring.datasource.druid.maxWait=60000 +spring.datasource.druid.min-idle=10 +spring.datasource.druid.minEvictableIdleTimeMillis=300000 +spring.datasource.druid.poolPreparedStatements=true +spring.datasource.druid.stat-view-servlet.allow=172.16.11.59,localhost,127.0.0.1 +spring.datasource.druid.stat-view-servlet.deny=192.168.1.73 +spring.datasource.druid.stat-view-servlet.login-password=null +spring.datasource.druid.stat-view-servlet.login-username=null +spring.datasource.druid.stat-view-servlet.reset-enable=false +spring.datasource.druid.stat-view-servlet.url-pattern=/druid/* +spring.datasource.druid.testOnBorrow=false +spring.datasource.druid.testOnReturn=false +spring.datasource.druid.testWhileIdle = true +spring.datasource.druid.timeBetweenEvictionRunsMillis=60000 +spring.datasource.druid.validationQuery=SELECT 1 +spring.datasource.druid.web-stat-filter.enabled=true +spring.datasource.druid.web-stat-filter.exclusions=*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/* +spring.datasource.druid.web-stat-filter.url-pattern=/* +spring.datasource.password=xxx +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.url=jdbc:mysql://xxx.xxx.xxx.xxx:3306/pager_order?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false +spring.datasource.username=xxx +spring.redis.host=xxx.xxx.xxx.xxx +spring.redis.port=6379 +spring.redis.password=abc+123 diff --git a/doc/properties/shop-oss.properties b/doc/properties/shop-oss.properties new file mode 100644 index 0000000..41adbea --- /dev/null +++ b/doc/properties/shop-oss.properties @@ -0,0 +1,10 @@ +qiniu.access_key=AK +qiniu.bucket=static +qiniu.secret_key=SK +alibaba.cloud.bucket=pager-static +alibaba.cloud.access-key=AK +alibaba.cloud.secret-key=SK +alibaba.cloud.oss.endpoint=xxx.aliyuncs.com +spring.redis.host=xxx.xxx.xxx.xxx +spring.redis.port=6379 +spring.redis.password=abc+123 diff --git a/doc/properties/shop-platform.properties b/doc/properties/shop-platform.properties new file mode 100644 index 0000000..0b9af39 --- /dev/null +++ b/doc/properties/shop-platform.properties @@ -0,0 +1,31 @@ +sspring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 +spring.datasource.druid.filters=stat,wall,slf4j +spring.datasource.druid.initial-size=10 +spring.datasource.druid.maxActive=20 +spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20 +spring.datasource.druid.maxWait=60000 +spring.datasource.druid.min-idle=10 +spring.datasource.druid.minEvictableIdleTimeMillis=300000 +spring.datasource.druid.poolPreparedStatements=true +spring.datasource.druid.stat-view-servlet.allow=172.16.11.59,localhost,127.0.0.1 +spring.datasource.druid.stat-view-servlet.deny=192.168.1.73 +spring.datasource.druid.stat-view-servlet.login-password=null +spring.datasource.druid.stat-view-servlet.login-username=null +spring.datasource.druid.stat-view-servlet.reset-enable=false +spring.datasource.druid.stat-view-servlet.url-pattern=/druid/* +spring.datasource.druid.testOnBorrow=false +spring.datasource.druid.testOnReturn=false +spring.datasource.druid.testWhileIdle = true +spring.datasource.druid.timeBetweenEvictionRunsMillis=60000 +spring.datasource.druid.validationQuery=SELECT 1 +spring.datasource.druid.web-stat-filter.enabled=true +spring.datasource.druid.web-stat-filter.exclusions=*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/* +spring.datasource.druid.web-stat-filter.url-pattern=/* +spring.datasource.password=xxx +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.url=jdbc:mysql://xxx.xxx.xxx.xxx:3306/pager_platform?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false +spring.datasource.username=xxx +spring.redis.host=xxx.xxx.xxx.xxx +spring.redis.port=6379 +spring.redis.password=abc+123 diff --git a/doc/properties/shop-risk.properties b/doc/properties/shop-risk.properties new file mode 100644 index 0000000..fdb07f3 --- /dev/null +++ b/doc/properties/shop-risk.properties @@ -0,0 +1,31 @@ +sspring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 +spring.datasource.druid.filters=stat,wall,slf4j +spring.datasource.druid.initial-size=10 +spring.datasource.druid.maxActive=20 +spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20 +spring.datasource.druid.maxWait=60000 +spring.datasource.druid.min-idle=10 +spring.datasource.druid.minEvictableIdleTimeMillis=300000 +spring.datasource.druid.poolPreparedStatements=true +spring.datasource.druid.stat-view-servlet.allow=172.16.11.59,localhost,127.0.0.1 +spring.datasource.druid.stat-view-servlet.deny=192.168.1.73 +spring.datasource.druid.stat-view-servlet.login-password=null +spring.datasource.druid.stat-view-servlet.login-username=null +spring.datasource.druid.stat-view-servlet.reset-enable=false +spring.datasource.druid.stat-view-servlet.url-pattern=/druid/* +spring.datasource.druid.testOnBorrow=false +spring.datasource.druid.testOnReturn=false +spring.datasource.druid.testWhileIdle = true +spring.datasource.druid.timeBetweenEvictionRunsMillis=60000 +spring.datasource.druid.validationQuery=SELECT 1 +spring.datasource.druid.web-stat-filter.enabled=true +spring.datasource.druid.web-stat-filter.exclusions=*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/* +spring.datasource.druid.web-stat-filter.url-pattern=/* +spring.datasource.password=xxx +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.url=jdbc:mysql://xxx.xxx.xxx.xxx:3306/pager_risk?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false +spring.datasource.username=xxx +spring.redis.host=xxx.xxx.xxx.xxx +spring.redis.port=6379 +spring.redis.password=abc+123 diff --git a/doc/properties/shop-seller.properties b/doc/properties/shop-seller.properties new file mode 100644 index 0000000..275b8d7 --- /dev/null +++ b/doc/properties/shop-seller.properties @@ -0,0 +1,31 @@ +sspring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 +spring.datasource.druid.filters=stat,wall,slf4j +spring.datasource.druid.initial-size=10 +spring.datasource.druid.maxActive=20 +spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20 +spring.datasource.druid.maxWait=60000 +spring.datasource.druid.min-idle=10 +spring.datasource.druid.minEvictableIdleTimeMillis=300000 +spring.datasource.druid.poolPreparedStatements=true +spring.datasource.druid.stat-view-servlet.allow=172.16.11.59,localhost,127.0.0.1 +spring.datasource.druid.stat-view-servlet.deny=192.168.1.73 +spring.datasource.druid.stat-view-servlet.login-password=null +spring.datasource.druid.stat-view-servlet.login-username=null +spring.datasource.druid.stat-view-servlet.reset-enable=false +spring.datasource.druid.stat-view-servlet.url-pattern=/druid/* +spring.datasource.druid.testOnBorrow=false +spring.datasource.druid.testOnReturn=false +spring.datasource.druid.testWhileIdle = true +spring.datasource.druid.timeBetweenEvictionRunsMillis=60000 +spring.datasource.druid.validationQuery=SELECT 1 +spring.datasource.druid.web-stat-filter.enabled=true +spring.datasource.druid.web-stat-filter.exclusions=*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/* +spring.datasource.druid.web-stat-filter.url-pattern=/* +spring.datasource.password=xxx +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.url=jdbc:mysql://xxx.xxx.xxx.xxx:3306/pager_shop?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false +spring.datasource.username=xxx +spring.redis.host=xxx.xxx.xxx.xxx +spring.redis.port=6379 +spring.redis.password=abc+123 diff --git a/doc/properties/shop-settlement.properties b/doc/properties/shop-settlement.properties new file mode 100644 index 0000000..c3a4f29 --- /dev/null +++ b/doc/properties/shop-settlement.properties @@ -0,0 +1,3 @@ +spring.redis.host=xxx.xxx.xxx.xxx +spring.redis.port=6379 +spring.redis.password=abc+123 diff --git a/doc/properties/shop-user.properties b/doc/properties/shop-user.properties new file mode 100644 index 0000000..818045c --- /dev/null +++ b/doc/properties/shop-user.properties @@ -0,0 +1,31 @@ +sspring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 +spring.datasource.druid.filters=stat,wall,slf4j +spring.datasource.druid.initial-size=10 +spring.datasource.druid.maxActive=20 +spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20 +spring.datasource.druid.maxWait=60000 +spring.datasource.druid.min-idle=10 +spring.datasource.druid.minEvictableIdleTimeMillis=300000 +spring.datasource.druid.poolPreparedStatements=true +spring.datasource.druid.stat-view-servlet.allow=172.16.11.59,localhost,127.0.0.1 +spring.datasource.druid.stat-view-servlet.deny=192.168.1.73 +spring.datasource.druid.stat-view-servlet.login-password=null +spring.datasource.druid.stat-view-servlet.login-username=null +spring.datasource.druid.stat-view-servlet.reset-enable=false +spring.datasource.druid.stat-view-servlet.url-pattern=/druid/* +spring.datasource.druid.testOnBorrow=false +spring.datasource.druid.testOnReturn=false +spring.datasource.druid.testWhileIdle = true +spring.datasource.druid.timeBetweenEvictionRunsMillis=60000 +spring.datasource.druid.validationQuery=SELECT 1 +spring.datasource.druid.web-stat-filter.enabled=true +spring.datasource.druid.web-stat-filter.exclusions=*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/* +spring.datasource.druid.web-stat-filter.url-pattern=/* +spring.datasource.password=xxx +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.url=jdbc:mysql://xxx.xxx.xxx.xxx:3306/pager_user?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false +spring.datasource.username=xxx +spring.redis.host=xxx.xxx.xxx.xxx +spring.redis.port=6379 +spring.redis.password=abc+123 diff --git a/images/nacos-1.png b/images/nacos-1.png new file mode 100644 index 0000000..7dcc9ce Binary files /dev/null and b/images/nacos-1.png differ diff --git a/images/nacos-2.png b/images/nacos-2.png new file mode 100644 index 0000000..a99f781 Binary files /dev/null and b/images/nacos-2.png differ diff --git a/shop-activity/pom.xml b/shop-activity/pom.xml index 7e9729f..6bef384 100644 --- a/shop-activity/pom.xml +++ b/shop-activity/pom.xml @@ -4,8 +4,8 @@ 4.0.0 - shop-activity-client shop-activity-api + shop-activity-client shop-activity-model diff --git a/shop-activity/shop-activity-api/pom.xml b/shop-activity/shop-activity-api/pom.xml index 1496e61..4cf1b5f 100644 --- a/shop-activity/shop-activity-api/pom.xml +++ b/shop-activity/shop-activity-api/pom.xml @@ -12,104 +12,81 @@ shop-activity-api + - org.springframework.boot - spring-boot-starter-web + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config com.alibaba.cloud - spring-cloud-alibaba-nacos-config + spring-cloud-starter-alibaba-nacos-discovery com.alibaba.cloud - spring-cloud-alibaba-nacos-discovery + spring-cloud-starter-alibaba-seata com.alibaba.cloud spring-cloud-starter-alibaba-sentinel + - - org.springframework.boot - spring-boot-starter-actuator - - - - com.baomidou - mybatis-plus-boot-starter - - + org.springframework.cloud spring-cloud-starter-openfeign + + org.springframework.boot - spring-boot-starter-data-redis - - - - org.springframework.cloud - spring-cloud-starter-stream-kafka + spring-boot-starter-web - org.springframework.cloud - spring-cloud-starter-sleuth + org.springframework.boot + spring-boot-starter-data-redis - org.springframework.cloud - spring-cloud-sleuth-zipkin + org.springframework.boot + spring-boot-starter-actuator + + - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - 2.1.2.RELEASE + com.baomidou + mybatis-plus-boot-starter mysql mysql-connector-java + - - redis.clients - jedis - - - - org.springframework.boot - spring-boot-starter-test - test - - + quick.pager - shop-auth-resource + shop-auth-feign ${project.version} - - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - - quick.pager - shop-user-client + shop-auth-resource ${project.version} + quick.pager - shop-user-model + shop-user-client ${project.version} @@ -121,7 +98,7 @@ quick.pager - shop-common + shop-platform-client ${project.version} @@ -132,7 +109,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.1.2.RELEASE + 2.2.9.RELEASE package diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/ActivityApplication.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/ActivityApplication.java new file mode 100644 index 0000000..823c6f0 --- /dev/null +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/ActivityApplication.java @@ -0,0 +1,18 @@ +package quick.pager.shop; + +import org.springframework.boot.SpringApplication; +import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * @author siguiyang + */ +@SpringCloudApplication +@EnableFeignClients +public class ActivityApplication { + + public static void main(String[] args) { + SpringApplication.run(ActivityApplication.class, args); + } + +} diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/ActivityApplication.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/ActivityApplication.java deleted file mode 100644 index 189963b..0000000 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/ActivityApplication.java +++ /dev/null @@ -1,22 +0,0 @@ -package quick.pager.shop.activity; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.openfeign.EnableFeignClients; - -/** - * @author siguiyang - */ -@SpringBootApplication(scanBasePackages = "quick.pager.shop") -@EnableDiscoveryClient -@EnableCircuitBreaker -@EnableFeignClients("quick.pager.shop") -public class ActivityApplication { - - public static void main(String[] args) { - SpringApplication.run(ActivityApplication.class, args); - } - -} diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/app/AppCouponController.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/app/AppCouponController.java deleted file mode 100644 index 0b77ff1..0000000 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/app/AppCouponController.java +++ /dev/null @@ -1,39 +0,0 @@ -package quick.pager.shop.activity.controller.app; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import quick.pager.shop.activity.resp.UserCouponResponse; -import quick.pager.shop.constants.ConstantsClient; -import quick.pager.shop.response.Response; - -/** - * app 优惠券列表 - * - * @author siguiyang - * @version 3.0 - */ -@RestController -@RequestMapping(ConstantsClient.ACTIVITY) -public class AppCouponController { - - - /** - * 用户优惠券列表 - * - * @param userId 用户主键 - * @param page 页码 - * @param useType 使用方式，UNUSED：未使用， USED：已使用，EXPIRE：已过期 - * @return - * @see quick.pager.shop.activity.enums.AppCouponUseTypeEnum - */ - @GetMapping("/app/user/coupons/{userId}/{page}/{useType}") - public Response coupons(@PathVariable("userId") Long userId, - @PathVariable("page") Integer page, - @PathVariable("useType") String useType) { - - return null; - } -} diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/BannerServiceImpl.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/BannerServiceImpl.java deleted file mode 100644 index e77ac3e..0000000 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/BannerServiceImpl.java +++ /dev/null @@ -1,119 +0,0 @@ -package quick.pager.shop.activity.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.google.common.base.Joiner; -import com.google.common.collect.Lists; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import org.apache.commons.beanutils.ConvertUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import quick.pager.shop.activity.mapper.BannerMapper; -import quick.pager.shop.activity.model.Banner; -import quick.pager.shop.activity.request.banner.BannerOtherRequest; -import quick.pager.shop.activity.request.banner.BannerPageRequest; -import quick.pager.shop.activity.request.banner.BannerSaveRequest; -import quick.pager.shop.activity.response.banner.BannerResponse; -import quick.pager.shop.constants.Constants; -import quick.pager.shop.response.Response; -import quick.pager.shop.activity.service.BannerService; -import quick.pager.shop.service.RedisService; -import quick.pager.shop.service.impl.ServiceImpl; -import quick.pager.shop.utils.BeanCopier; -import quick.pager.shop.utils.DateUtils; - -/** - * Banner service impl - * - * @author siguiyang - * @version 3.0 - */ -@Service -public class BannerServiceImpl extends ServiceImpl implements BannerService { - - @Autowired - private RedisService redisService; - - @Override - public Response> queryPage(BannerPageRequest request) { - LambdaQueryWrapper qw = toQuery(request.getTitle(), request.getBannerType(), null); - Response> page = this.toPage(request.getPage(), request.getPageSize(), qw); - return Response.toResponse(page.getData().stream().map(this::convert).collect(Collectors.toList()), page.getTotal()); - } - - @Override - public Response> queryList(BannerOtherRequest request) { - LambdaQueryWrapper qw = toQuery(request.getTitle(), request.getBannerType(), request.getBannerStatus()); - - List banners = this.baseMapper.selectList(qw); - return Response.toResponse(banners.stream().map(this::convert).collect(Collectors.toList()), 0L); - } - - private LambdaQueryWrapper toQuery(String title, String bannerType, Boolean bannerStatus) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - - if (StringUtils.isNotEmpty(title)) { - wrapper.likeRight(Banner::getTitle, title); - } - if (!StringUtils.isEmpty(bannerType)) { - wrapper.eq(Banner::getBannerType, bannerType); - } - - if (Objects.nonNull(bannerStatus)) { - wrapper.eq(Banner::getBannerStatus, bannerStatus); - } - - wrapper.orderByDesc(Banner::getUpdateTime); - - return wrapper; - } - - @Override - public Response create(BannerSaveRequest request) { - Banner banner = new Banner(); - BeanCopier.create(request, banner).copy(); - doChannel(banner, request.getShareChannel()); - banner.setBannerStatus(Boolean.FALSE); - banner.setDeleteStatus(Boolean.FALSE); - banner.setCreateTime(DateUtils.dateTime()); - this.baseMapper.insert(banner); - return new Response<>(banner.getId()); - } - - @Override - public Response modify(BannerSaveRequest request) { - Banner banner = BeanCopier.create(request, new Banner()).copy(); - doChannel(banner, request.getShareChannel()); - this.baseMapper.updateById(banner); - return new Response<>(banner.getId()); - } - - - private void doChannel(Banner banner, List shareChannel) { - if (CollectionUtils.isEmpty(shareChannel)) { - banner.setShareChannel(null); - } else { - banner.setShareChannel(Joiner.on(Constants.COMMA).join(shareChannel)); - } - } - - /** - * Banner -> BannerResponse - */ - private BannerResponse convert(Banner banner) { - BannerResponse response = new BannerResponse(); - BeanCopier.create(banner, response).copy(); - if (StringUtils.isNotBlank(banner.getShareChannel())) { - response.setShareChannel( - Stream.of((String[]) ConvertUtils.convert(banner.getShareChannel().split(Constants.COMMA), String.class)) - .collect(Collectors.toList())); - } else { - response.setShareChannel(Lists.newArrayList()); - } - return response; - } -} diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/CouponTemplateServiceImpl.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/CouponTemplateServiceImpl.java deleted file mode 100644 index f0ae8f2..0000000 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/CouponTemplateServiceImpl.java +++ /dev/null @@ -1,74 +0,0 @@ -package quick.pager.shop.activity.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import java.util.List; -import java.util.Objects; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; -import quick.pager.shop.activity.model.DiscountCouponTemplate; -import quick.pager.shop.activity.request.coupon.DiscountCouponTemplatePageRequest; -import quick.pager.shop.activity.request.coupon.DiscountCouponTemplateSaveRequest; -import quick.pager.shop.activity.mapper.DiscountCouponTemplateMapper; -import quick.pager.shop.response.Response; -import quick.pager.shop.activity.service.CouponTemplateService; -import quick.pager.shop.service.impl.ServiceImpl; -import quick.pager.shop.utils.BeanCopier; -import quick.pager.shop.utils.DateUtils; - -/** - * 优惠券模板 - * - * @author siguiyang - */ -@Service -public class CouponTemplateServiceImpl extends ServiceImpl implements CouponTemplateService { - @Override - public Response> queryPage(DiscountCouponTemplatePageRequest request) { - - LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - - if (!StringUtils.isEmpty(request.getTemplateName())) { - qw.likeRight(DiscountCouponTemplate::getTemplateName, request.getTemplateName()); - } - - if (null != request.getTemplateType()) { - qw.eq(DiscountCouponTemplate::getTemplateType, request.getTemplateType()); - } - - qw.orderByDesc(DiscountCouponTemplate::getUpdateTime); - - return this.toPage(request.getPage(), request.getPageSize(), qw); - } - - - @Override - public Response create(DiscountCouponTemplateSaveRequest request) { - DiscountCouponTemplate template = new DiscountCouponTemplate(); - BeanCopier.create(request, template).copy(); - template.setDeleteStatus(Boolean.FALSE); - template.setCreateTime(DateUtils.dateTime()); - this.baseMapper.insert(template); - - return new Response<>(template.getId()); - } - - @Override - public Response modify(DiscountCouponTemplateSaveRequest request) { - DiscountCouponTemplate template = new DiscountCouponTemplate(); - BeanCopier.create(request, template).copy(); - this.baseMapper.updateById(template); - - return new Response<>(template.getId()); - } - - @Override - public DiscountCouponTemplate info(Long id) { - DiscountCouponTemplate template = this.baseMapper.selectById(id); - - if (Objects.isNull(template)) { - return null; - } - - return template; - } -} diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/AssembleController.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/AssembleController.java similarity index 94% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/AssembleController.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/AssembleController.java index 59aa160..897cda1 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/AssembleController.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/AssembleController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.activity.controller; +package quick.pager.shop.controller; import java.util.List; import java.util.Objects; @@ -15,8 +15,8 @@ import quick.pager.shop.activity.response.assemble.AssembleActivityResponse; import quick.pager.shop.constants.ConstantsClient; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.response.Response; -import quick.pager.shop.activity.service.AssembleService; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.AssembleService; /** * 拼团 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/AssembleRuleController.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/AssembleRuleController.java similarity index 90% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/AssembleRuleController.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/AssembleRuleController.java index 96cfb15..abb5c7d 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/AssembleRuleController.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/AssembleRuleController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.activity.controller; +package quick.pager.shop.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.activity.request.assemble.AssembleRuleSaveRequest; import quick.pager.shop.activity.response.assemble.AssembleActivityRuleResponse; -import quick.pager.shop.activity.service.AssembleRuleService; +import quick.pager.shop.service.AssembleRuleService; import quick.pager.shop.constants.ConstantsClient; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 拼团规则 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/BannerController.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/BannerController.java similarity index 92% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/BannerController.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/BannerController.java index 5fb32ea..bf4deb9 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/BannerController.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/BannerController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.activity.controller; +package quick.pager.shop.controller; import java.util.List; import java.util.Objects; @@ -10,15 +10,15 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import quick.pager.shop.activity.model.Banner; +import quick.pager.shop.model.Banner; import quick.pager.shop.activity.request.banner.BannerOtherRequest; import quick.pager.shop.activity.request.banner.BannerPageRequest; import quick.pager.shop.activity.request.banner.BannerSaveRequest; import quick.pager.shop.activity.response.banner.BannerResponse; import quick.pager.shop.constants.ConstantsClient; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.response.Response; -import quick.pager.shop.activity.service.BannerService; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.BannerService; import quick.pager.shop.utils.BeanCopier; /** diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/CouponController.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/CouponController.java similarity index 91% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/CouponController.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/CouponController.java index 3cf09ae..0d152ab 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/CouponController.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/CouponController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.activity.controller; +package quick.pager.shop.controller; import java.util.List; import lombok.extern.slf4j.Slf4j; @@ -13,8 +13,8 @@ import quick.pager.shop.activity.request.coupon.DiscountCouponPageRequest; import quick.pager.shop.activity.response.coupon.DiscountCouponResponse; import quick.pager.shop.constants.ConstantsClient; -import quick.pager.shop.response.Response; -import quick.pager.shop.activity.service.DiscountCouponService; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.DiscountCouponService; /** * 优惠券接口 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/CouponTemplateController.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/CouponTemplateController.java similarity index 57% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/CouponTemplateController.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/CouponTemplateController.java index 56a95b8..bc1ab42 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/CouponTemplateController.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/CouponTemplateController.java @@ -1,12 +1,9 @@ -package quick.pager.shop.activity.controller; +package quick.pager.shop.controller; import java.math.BigDecimal; import java.math.RoundingMode; -import java.util.Collections; import java.util.List; import java.util.Objects; -import java.util.Optional; -import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -16,16 +13,14 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.activity.enums.CouponTypeEnums; -import quick.pager.shop.activity.model.DiscountCouponTemplate; import quick.pager.shop.activity.request.coupon.DiscountCouponTemplatePageRequest; import quick.pager.shop.activity.request.coupon.DiscountCouponTemplateSaveRequest; import quick.pager.shop.activity.response.coupon.DiscountCouponTemplateResponse; -import quick.pager.shop.constants.Constants; import quick.pager.shop.constants.ConstantsClient; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.response.Response; -import quick.pager.shop.activity.service.CouponTemplateService; -import quick.pager.shop.utils.BeanCopier; +import quick.pager.shop.exception.ShopException; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.CouponTemplateService; /** * 优惠券模板管理 @@ -45,12 +40,7 @@ public class CouponTemplateController { */ @PostMapping("/coupon/template/page") public Response> queryPage(@RequestBody DiscountCouponTemplatePageRequest request) { - Response> response = couponTemplateService.queryPage(request); - - return Response.toResponse(Optional.ofNullable(response.getData()).orElse(Collections.emptyList()).stream() - .map(this::convert) - .collect(Collectors.toList()), - response.getTotal()); + return couponTemplateService.queryPage(request); } /** @@ -58,22 +48,7 @@ public Response> queryPage(@RequestBody Dis */ @PostMapping("/coupon/template/create") public Response create(@RequestBody DiscountCouponTemplateSaveRequest request) { - if (null != request.getTemplateType() && null != request.getDiscountStrength()) { - // 如果是折扣券 - if (CouponTypeEnums.DISCOUNT.getCode().equals(request.getTemplateType())) { - BigDecimal hundred = new BigDecimal("100"); - - if (hundred.compareTo(request.getDiscountStrength()) <= 0) { - return new Response<>(ResponseStatus.Code.FAIL_CODE, "折扣力度不能必须小于100"); - } else if (BigDecimal.ZERO.compareTo(request.getDiscountStrength()) >= 0) { - return new Response<>(ResponseStatus.Code.FAIL_CODE, "折扣力度必须是整数"); - } - - request.setDiscountStrength(request.getDiscountStrength().divide(new BigDecimal("100"), RoundingMode.HALF_UP)); - } - - } - + this.doRequest(request); return couponTemplateService.create(request); } @@ -85,39 +60,38 @@ public Response modify(@RequestBody DiscountCouponTemplateSaveRequest requ if (Objects.isNull(request.getId())) { return new Response<>(ResponseStatus.Code.FAIL_CODE, ResponseStatus.PARAMS_EXCEPTION); } + this.doRequest(request); + return couponTemplateService.modify(request); + } + + /** + * 获取优惠券模板信息 + */ + @GetMapping("/coupon/template/{templateId}") + public Response info(@PathVariable("templateId") Long templateId) { + return new Response<>(couponTemplateService.info(templateId)); + } + + + /** + * 处理模板优惠券和折扣券 + * + * @param request 请求参数 + */ + private void doRequest(DiscountCouponTemplateSaveRequest request) { if (null != request.getTemplateType() && null != request.getDiscountStrength()) { // 如果是折扣券 if (CouponTypeEnums.DISCOUNT.getCode().equals(request.getTemplateType())) { BigDecimal hundred = new BigDecimal("100"); if (hundred.compareTo(request.getDiscountStrength()) <= 0) { - return new Response<>(ResponseStatus.Code.FAIL_CODE, "折扣力度不能必须小于100"); + throw new ShopException(ResponseStatus.Code.FAIL_CODE, "折扣力度不能必须小于100"); } else if (BigDecimal.ZERO.compareTo(request.getDiscountStrength()) >= 0) { - return new Response<>(ResponseStatus.Code.FAIL_CODE, "折扣力度必须是整数"); + throw new ShopException(ResponseStatus.Code.FAIL_CODE, "折扣力度必须是整数"); } - request.setDiscountStrength(request.getDiscountStrength().divide(new BigDecimal("100"), RoundingMode.HALF_UP)); } - } - return couponTemplateService.modify(request); } - /** - * 获取优惠券模板信息 - */ - @GetMapping("/coupon/template/{templateId}") - public Response info(@PathVariable("templateId") Long templateId) { - return new Response<>(convert(couponTemplateService.info(templateId))); - } - - private DiscountCouponTemplateResponse convert(DiscountCouponTemplate template) { - if (Objects.isNull(template)) { - return null; - } - DiscountCouponTemplateResponse response = new DiscountCouponTemplateResponse(); - BeanCopier.create(template, response).copy(); - - return response; - } } diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/ExchangeController.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/ExchangeController.java similarity index 94% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/ExchangeController.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/ExchangeController.java index 30cb9d4..1451649 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/ExchangeController.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/ExchangeController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.activity.controller; +package quick.pager.shop.controller; import java.util.List; import java.util.Objects; @@ -17,8 +17,8 @@ import quick.pager.shop.activity.response.exchange.ExchangeActivityResponse; import quick.pager.shop.constants.ConstantsClient; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.response.Response; -import quick.pager.shop.activity.service.ExchangeService; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.ExchangeService; /** diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/ExchangeRuleController.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/ExchangeRuleController.java similarity index 94% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/ExchangeRuleController.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/ExchangeRuleController.java index 9f3102a..cba166b 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/ExchangeRuleController.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/ExchangeRuleController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.activity.controller; +package quick.pager.shop.controller; import java.util.List; import java.util.Objects; @@ -13,10 +13,10 @@ import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.activity.request.exchange.ExchangeActivityRuleSaveRequest; import quick.pager.shop.activity.response.exchange.ExchangeActivityRuleResponse; -import quick.pager.shop.activity.service.ExchangeActivityRuleService; +import quick.pager.shop.service.ExchangeActivityRuleService; import quick.pager.shop.constants.ConstantsClient; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 满赠换购规则 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/InviteController.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/InviteController.java similarity index 84% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/InviteController.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/InviteController.java index d62675c..66b3079 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/InviteController.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/InviteController.java @@ -1,10 +1,10 @@ -package quick.pager.shop.activity.controller; +package quick.pager.shop.controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.ConstantsClient; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 好友邀请 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/app/AppAssembleController.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/app/AppAssembleController.java similarity index 81% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/app/AppAssembleController.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/app/AppAssembleController.java index 7d95cad..b80d2bb 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/app/AppAssembleController.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/app/AppAssembleController.java @@ -1,10 +1,10 @@ -package quick.pager.shop.activity.controller.app; +package quick.pager.shop.controller.app; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.ConstantsClient; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 拼团 @@ -17,8 +17,6 @@ public class AppAssembleController { /** * 拼团活动列表 - * - * @return */ @GetMapping("/app/assemble/list") public Response list() { diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/app/AppBannerController.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/app/AppBannerController.java similarity index 51% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/app/AppBannerController.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/app/AppBannerController.java index a5d20c9..1276646 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/app/AppBannerController.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/app/AppBannerController.java @@ -1,12 +1,16 @@ -package quick.pager.shop.activity.controller.app; +package quick.pager.shop.controller.app; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import quick.pager.shop.activity.response.banner.BannerResponse; +import quick.pager.shop.service.BannerService; import quick.pager.shop.constants.ConstantsClient; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * app banner列表 @@ -18,6 +22,9 @@ @RequestMapping(ConstantsClient.ACTIVITY) public class AppBannerController { + @Autowired + private BannerService bannerService; + /** * app 首页banner 列表 * @@ -27,11 +34,11 @@ public class AppBannerController { * @return */ @GetMapping("/app/user/banners") - public Response banners(@RequestParam(value = "userId", required = false) Long userId, - @RequestParam(value = "lat", required = false) String lat, - @RequestParam(value = "lng", required = false) String lng) { + public Response> banners(@RequestParam(value = "userId", required = false) Long userId, + @RequestParam(value = "lat", required = false) String lat, + @RequestParam(value = "lng", required = false) String lng) { - return null; + return bannerService.banners(userId, lat, lng); } /** @@ -41,8 +48,8 @@ public Response banners(@RequestParam(value = "userId", required = false) Long u * @return */ @GetMapping("/app/user/banners/channel/{id}") - public Response banners(@PathVariable("id") Long id) { + public Response channel(@PathVariable("id") Long id) { - return null; + return bannerService.channel(id); } } diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/app/AppCouponController.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/app/AppCouponController.java new file mode 100644 index 0000000..7d36d82 --- /dev/null +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/app/AppCouponController.java @@ -0,0 +1,44 @@ +package quick.pager.shop.controller.app; + +import java.util.List; +import org.apache.commons.lang3.EnumUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import quick.pager.shop.activity.enums.AppCouponUseTypeEnum; +import quick.pager.shop.activity.response.coupon.CouponResponse; +import quick.pager.shop.service.AppDiscountCouponService; +import quick.pager.shop.constants.ConstantsClient; +import quick.pager.shop.user.response.Response; + +/** + * app 优惠券列表 + * + * @author siguiyang + * @version 3.0 + */ +@RestController +@RequestMapping(ConstantsClient.ACTIVITY) +public class AppCouponController { + + @Autowired + private AppDiscountCouponService appDiscountCouponService; + + /** + * 用户优惠券列表 + * + * @param userId 用户主键 + * @param page 页码 + * @param useType 使用方式，UNUSED：未使用， USED：已使用，EXPIRE：已过期 + * @see quick.pager.shop.activity.enums.AppCouponUseTypeEnum + */ + @PostMapping("/app/user/coupons/{userId}/{page}/{useType}") + public Response> coupons(@PathVariable("userId") Long userId, + @PathVariable("page") Integer page, + @PathVariable("useType") String useType) { + + return appDiscountCouponService.queryCoupons(userId, page, EnumUtils.getEnum(AppCouponUseTypeEnum.class, useType)); + } +} diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/app/AppExchangeController.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/app/AppExchangeController.java similarity index 85% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/app/AppExchangeController.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/app/AppExchangeController.java index dc1e053..386241c 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/app/AppExchangeController.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/app/AppExchangeController.java @@ -1,10 +1,10 @@ -package quick.pager.shop.activity.controller.app; +package quick.pager.shop.controller.app; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.ConstantsClient; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 满赠换购 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/app/AppInviteController.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/app/AppInviteController.java similarity index 94% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/app/AppInviteController.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/app/AppInviteController.java index 22ee884..56d512d 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/controller/app/AppInviteController.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/controller/app/AppInviteController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.activity.controller.app; +package quick.pager.shop.controller.app; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.ConstantsClient; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 好友邀请 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/AssembleActivityGoodsMapper.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/AssembleActivityGoodsMapper.java similarity index 70% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/AssembleActivityGoodsMapper.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/AssembleActivityGoodsMapper.java index bc1a6fb..2eb01d7 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/AssembleActivityGoodsMapper.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/AssembleActivityGoodsMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.activity.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.activity.model.AssembleActivityGoods; +import quick.pager.shop.model.AssembleActivityGoods; /** * 评团活动 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/AssembleActivityMapper.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/AssembleActivityMapper.java similarity index 70% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/AssembleActivityMapper.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/AssembleActivityMapper.java index 8e5f1fc..ff94866 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/AssembleActivityMapper.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/AssembleActivityMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.activity.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.activity.model.AssembleActivity; +import quick.pager.shop.model.AssembleActivity; /** * 拼团活动 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/AssembleActivityMemberMapper.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/AssembleActivityMemberMapper.java similarity index 71% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/AssembleActivityMemberMapper.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/AssembleActivityMemberMapper.java index a1922c6..dfde47f 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/AssembleActivityMemberMapper.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/AssembleActivityMemberMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.activity.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.activity.model.AssembleActivityMember; +import quick.pager.shop.model.AssembleActivityMember; /** * 拼团活动成员 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/AssembleActivityRuleMapper.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/AssembleActivityRuleMapper.java similarity index 71% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/AssembleActivityRuleMapper.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/AssembleActivityRuleMapper.java index 6eeb0f2..bdb5043 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/AssembleActivityRuleMapper.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/AssembleActivityRuleMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.activity.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.activity.model.AssembleActivityRule; +import quick.pager.shop.model.AssembleActivityRule; /** * 拼团活动规则 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/BannerMapper.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/BannerMapper.java similarity index 70% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/BannerMapper.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/BannerMapper.java index a81854b..3b72683 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/BannerMapper.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/BannerMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.activity.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.activity.model.Banner; +import quick.pager.shop.model.Banner; /** * banner diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/DiscountCouponMapper.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/DiscountCouponMapper.java similarity index 70% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/DiscountCouponMapper.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/DiscountCouponMapper.java index 0b1d20e..146b2a6 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/DiscountCouponMapper.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/DiscountCouponMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.activity.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.activity.model.DiscountCoupon; +import quick.pager.shop.model.DiscountCoupon; /** * 优惠券 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/DiscountCouponTemplateMapper.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/DiscountCouponTemplateMapper.java similarity index 70% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/DiscountCouponTemplateMapper.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/DiscountCouponTemplateMapper.java index 599ce46..c80d3f2 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/DiscountCouponTemplateMapper.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/DiscountCouponTemplateMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.activity.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.activity.model.DiscountCouponTemplate; +import quick.pager.shop.model.DiscountCouponTemplate; /** * 优惠券模板 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/ExchangeActivityGoodsMapper.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/ExchangeActivityGoodsMapper.java similarity index 71% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/ExchangeActivityGoodsMapper.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/ExchangeActivityGoodsMapper.java index d5cd016..d9e5fc0 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/ExchangeActivityGoodsMapper.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/ExchangeActivityGoodsMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.activity.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.activity.model.ExchangeActivityGoods; +import quick.pager.shop.model.ExchangeActivityGoods; /** * 满赠换购商品 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/ExchangeActivityMapper.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/ExchangeActivityMapper.java similarity index 70% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/ExchangeActivityMapper.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/ExchangeActivityMapper.java index 4bd9262..24a72bd 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/ExchangeActivityMapper.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/ExchangeActivityMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.activity.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.activity.model.ExchangeActivity; +import quick.pager.shop.model.ExchangeActivity; /** * 满赠换购 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/ExchangeActivityMembersMapper.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/ExchangeActivityMembersMapper.java similarity index 84% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/ExchangeActivityMembersMapper.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/ExchangeActivityMembersMapper.java index a60cd1c..e97e64b 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/ExchangeActivityMembersMapper.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/ExchangeActivityMembersMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.activity.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.activity.model.ExchangeActivityMember; +import quick.pager.shop.model.ExchangeActivityMember; /** * 满赠换购成员 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/ExchangeActivityRuleMapper.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/ExchangeActivityRuleMapper.java similarity index 91% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/ExchangeActivityRuleMapper.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/ExchangeActivityRuleMapper.java index 51edcac..3805c27 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/ExchangeActivityRuleMapper.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/ExchangeActivityRuleMapper.java @@ -1,11 +1,11 @@ -package quick.pager.shop.activity.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import quick.pager.shop.activity.model.ExchangeActivityRule; +import quick.pager.shop.model.ExchangeActivityRule; import quick.pager.shop.activity.response.exchange.ExchangeActivityRuleResponse; /** diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/FightGroupRecordMapper.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/FightGroupRecordMapper.java similarity index 65% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/FightGroupRecordMapper.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/FightGroupRecordMapper.java index 20ecf33..6a5db9b 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/FightGroupRecordMapper.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/FightGroupRecordMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.activity.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.activity.model.AssembleActivityRecord; +import quick.pager.shop.model.AssembleActivityRecord; @Mapper public interface FightGroupRecordMapper extends BaseMapper { diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/IntegralLogMapper.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/IntegralLogMapper.java similarity index 71% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/IntegralLogMapper.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/IntegralLogMapper.java index 395f26b..c13f00c 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/IntegralLogMapper.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/IntegralLogMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.activity.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.activity.model.IntegralLog; +import quick.pager.shop.model.IntegralLog; /** * 积分日志 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/InviteCodeMapper.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/InviteCodeMapper.java similarity index 70% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/InviteCodeMapper.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/InviteCodeMapper.java index 01f94a0..95ae762 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/InviteCodeMapper.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/InviteCodeMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.activity.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.activity.model.InviteCode; +import quick.pager.shop.model.InviteCode; /** * 邀请码 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/InviteRewardRecordMapper.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/InviteRewardRecordMapper.java similarity index 71% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/InviteRewardRecordMapper.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/InviteRewardRecordMapper.java index c4a1608..0ec6685 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/mapper/InviteRewardRecordMapper.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/mapper/InviteRewardRecordMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.activity.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.activity.model.InviteRewardRecord; +import quick.pager.shop.model.InviteRewardRecord; /** * 邀请奖励记录 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/AssembleActivity.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/AssembleActivity.java similarity index 88% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/AssembleActivity.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/AssembleActivity.java index 0e2f534..d31c2d9 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/AssembleActivity.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/AssembleActivity.java @@ -1,4 +1,4 @@ -package quick.pager.shop.activity.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import java.time.LocalDateTime; @@ -6,7 +6,6 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.experimental.Accessors; -import quick.pager.shop.model.Model; @EqualsAndHashCode(callSuper = true) @Data diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/AssembleActivityGoods.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/AssembleActivityGoods.java similarity index 85% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/AssembleActivityGoods.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/AssembleActivityGoods.java index 4c9a68a..f688444 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/AssembleActivityGoods.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/AssembleActivityGoods.java @@ -1,10 +1,9 @@ -package quick.pager.shop.activity.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import quick.pager.shop.model.Model; @EqualsAndHashCode(callSuper = true) @Data diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/AssembleActivityMember.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/AssembleActivityMember.java similarity index 87% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/AssembleActivityMember.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/AssembleActivityMember.java index 0232bfa..58956d8 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/AssembleActivityMember.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/AssembleActivityMember.java @@ -1,10 +1,9 @@ -package quick.pager.shop.activity.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import quick.pager.shop.model.Model; @EqualsAndHashCode(callSuper = true) @Data diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/AssembleActivityRecord.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/AssembleActivityRecord.java similarity index 84% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/AssembleActivityRecord.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/AssembleActivityRecord.java index fb74f15..1ad844b 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/AssembleActivityRecord.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/AssembleActivityRecord.java @@ -1,10 +1,9 @@ -package quick.pager.shop.activity.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import quick.pager.shop.model.Model; @EqualsAndHashCode(callSuper = true) @Data diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/AssembleActivityRule.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/AssembleActivityRule.java similarity index 90% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/AssembleActivityRule.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/AssembleActivityRule.java index ae45777..9073ed2 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/AssembleActivityRule.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/AssembleActivityRule.java @@ -1,10 +1,9 @@ -package quick.pager.shop.activity.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import quick.pager.shop.model.Model; /** * 拼团规则 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/Banner.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/Banner.java similarity index 93% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/Banner.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/Banner.java index 92efce5..5845b04 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/Banner.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/Banner.java @@ -1,10 +1,9 @@ -package quick.pager.shop.activity.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import quick.pager.shop.model.Model; /** * 首页banner @@ -58,6 +57,7 @@ public class Banner extends Model { private String shareChannel; /** * banner 状态 + * false 开启， true 禁用 */ private Boolean bannerStatus; diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/DiscountCoupon.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/DiscountCoupon.java similarity index 85% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/DiscountCoupon.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/DiscountCoupon.java index 4352738..ea60d49 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/DiscountCoupon.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/DiscountCoupon.java @@ -1,10 +1,9 @@ -package quick.pager.shop.activity.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import quick.pager.shop.model.Model; @EqualsAndHashCode(callSuper = true) @Data diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/DiscountCouponTemplate.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/DiscountCouponTemplate.java similarity index 89% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/DiscountCouponTemplate.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/DiscountCouponTemplate.java index ad25be0..26c8585 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/DiscountCouponTemplate.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/DiscountCouponTemplate.java @@ -1,13 +1,11 @@ -package quick.pager.shop.activity.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import quick.pager.shop.model.Model; /** * 优惠券模板 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/ExchangeActivity.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/ExchangeActivity.java similarity index 90% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/ExchangeActivity.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/ExchangeActivity.java index 997309d..0624cdc 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/ExchangeActivity.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/ExchangeActivity.java @@ -1,11 +1,10 @@ -package quick.pager.shop.activity.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import quick.pager.shop.model.Model; /** * @author siguiyang diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/ExchangeActivityGoods.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/ExchangeActivityGoods.java similarity index 89% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/ExchangeActivityGoods.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/ExchangeActivityGoods.java index e747bb7..6d684a1 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/ExchangeActivityGoods.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/ExchangeActivityGoods.java @@ -1,10 +1,9 @@ -package quick.pager.shop.activity.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import quick.pager.shop.model.Model; /** * @author siguiyang diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/ExchangeActivityMember.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/ExchangeActivityMember.java similarity index 91% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/ExchangeActivityMember.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/ExchangeActivityMember.java index ddb554c..5ac8a55 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/ExchangeActivityMember.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/ExchangeActivityMember.java @@ -1,10 +1,9 @@ -package quick.pager.shop.activity.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import quick.pager.shop.model.Model; /** * 参与满赠换购的人员 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/ExchangeActivityRule.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/ExchangeActivityRule.java similarity index 90% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/ExchangeActivityRule.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/ExchangeActivityRule.java index 20bcf35..a4cf376 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/ExchangeActivityRule.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/ExchangeActivityRule.java @@ -1,11 +1,10 @@ -package quick.pager.shop.activity.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import java.math.BigDecimal; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import quick.pager.shop.model.Model; /** * @author siguiyang diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/IntegralLog.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/IntegralLog.java similarity index 85% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/IntegralLog.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/IntegralLog.java index 276bc37..bff0df5 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/IntegralLog.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/IntegralLog.java @@ -1,10 +1,9 @@ -package quick.pager.shop.activity.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import quick.pager.shop.model.Model; @EqualsAndHashCode(callSuper = true) @Data diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/InviteCode.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/InviteCode.java similarity index 84% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/InviteCode.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/InviteCode.java index 2ec9f9d..5a5d415 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/InviteCode.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/InviteCode.java @@ -1,10 +1,9 @@ -package quick.pager.shop.activity.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import quick.pager.shop.model.Model; @EqualsAndHashCode(callSuper = true) @Data diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/InviteRewardRecord.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/InviteRewardRecord.java similarity index 86% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/InviteRewardRecord.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/InviteRewardRecord.java index 3162a34..a03fc5c 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/model/InviteRewardRecord.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/model/InviteRewardRecord.java @@ -1,10 +1,9 @@ -package quick.pager.shop.activity.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import quick.pager.shop.model.Model; @EqualsAndHashCode(callSuper = true) @Data diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/AssemblyParam.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/AssemblyParam.java similarity index 79% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/AssemblyParam.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/AssemblyParam.java index e44fe84..c981608 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/AssemblyParam.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/AssemblyParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.activity.param; +package quick.pager.shop.param; import java.io.Serializable; diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/BannerParam.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/BannerParam.java similarity index 84% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/BannerParam.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/BannerParam.java index 55a0365..4030ec5 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/BannerParam.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/BannerParam.java @@ -1,8 +1,7 @@ -package quick.pager.shop.activity.param; +package quick.pager.shop.param; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.param.Param; /** * banner 请求参数 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/ExchangeMemberParam.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/ExchangeMemberParam.java similarity index 93% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/ExchangeMemberParam.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/ExchangeMemberParam.java index 70a45d7..70f229b 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/ExchangeMemberParam.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/ExchangeMemberParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.activity.param; +package quick.pager.shop.param; import java.io.Serializable; import java.math.BigDecimal; diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/coupon/DiscountCouponPageParam.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/coupon/DiscountCouponPageParam.java similarity index 89% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/coupon/DiscountCouponPageParam.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/coupon/DiscountCouponPageParam.java index a29274b..c82574d 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/coupon/DiscountCouponPageParam.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/coupon/DiscountCouponPageParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.activity.param.coupon; +package quick.pager.shop.param.coupon; import java.time.LocalDateTime; import java.util.List; diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/coupon/UserCouponParam.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/coupon/UserCouponParam.java similarity index 91% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/coupon/UserCouponParam.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/coupon/UserCouponParam.java index b68315f..baadf67 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/coupon/UserCouponParam.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/coupon/UserCouponParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.activity.param.coupon; +package quick.pager.shop.param.coupon; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/exchange/ExchangeActivityPageParam.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/exchange/ExchangeActivityPageParam.java similarity index 87% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/exchange/ExchangeActivityPageParam.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/exchange/ExchangeActivityPageParam.java index 6bc21ff..142e42f 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/exchange/ExchangeActivityPageParam.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/exchange/ExchangeActivityPageParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.activity.param.exchange; +package quick.pager.shop.param.exchange; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/exchange/ExchangeActivityRecordParam.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/exchange/ExchangeActivityRecordParam.java similarity index 91% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/exchange/ExchangeActivityRecordParam.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/exchange/ExchangeActivityRecordParam.java index 06893a5..b37a3d3 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/exchange/ExchangeActivityRecordParam.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/exchange/ExchangeActivityRecordParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.activity.param.exchange; +package quick.pager.shop.param.exchange; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/exchange/ExchangeActivityRuleSaveParam.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/exchange/ExchangeActivityRuleSaveParam.java similarity index 89% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/exchange/ExchangeActivityRuleSaveParam.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/exchange/ExchangeActivityRuleSaveParam.java index d445220..5061d0d 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/exchange/ExchangeActivityRuleSaveParam.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/exchange/ExchangeActivityRuleSaveParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.activity.param.exchange; +package quick.pager.shop.param.exchange; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/exchange/ExchangeActivitySaveParam.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/exchange/ExchangeActivitySaveParam.java similarity index 89% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/exchange/ExchangeActivitySaveParam.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/exchange/ExchangeActivitySaveParam.java index bd72c99..7234cd6 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/param/exchange/ExchangeActivitySaveParam.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/param/exchange/ExchangeActivitySaveParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.activity.param.exchange; +package quick.pager.shop.param.exchange; import java.time.LocalDateTime; import java.util.List; diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/resp/UserCouponResponse.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/resp/UserCouponResponse.java similarity index 74% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/resp/UserCouponResponse.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/resp/UserCouponResponse.java index ea5ede8..60a1b7c 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/resp/UserCouponResponse.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/resp/UserCouponResponse.java @@ -1,8 +1,8 @@ -package quick.pager.shop.activity.resp; +package quick.pager.shop.resp; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * @author siguiyang diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/AppDiscountCouponService.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/AppDiscountCouponService.java new file mode 100644 index 0000000..131e7e8 --- /dev/null +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/AppDiscountCouponService.java @@ -0,0 +1,23 @@ +package quick.pager.shop.service; + +import java.util.List; +import quick.pager.shop.activity.enums.AppCouponUseTypeEnum; +import quick.pager.shop.activity.response.coupon.CouponResponse; +import quick.pager.shop.user.response.Response; + +/** + * 优惠券服务 + * + * @author siguiyang + */ +public interface AppDiscountCouponService { + + /** + * 查询用户优惠券列表 + * + * @param userId 当前用户主键 + * @param page 页码 + * @param useType 使用方式 + */ + Response> queryCoupons(final Long userId, final Integer page, final AppCouponUseTypeEnum useType); +} diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/AssembleRuleService.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/AssembleRuleService.java similarity index 77% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/AssembleRuleService.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/AssembleRuleService.java index dd46c1d..3a11287 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/AssembleRuleService.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/AssembleRuleService.java @@ -1,10 +1,9 @@ -package quick.pager.shop.activity.service; +package quick.pager.shop.service; -import quick.pager.shop.activity.model.AssembleActivityRule; +import quick.pager.shop.model.AssembleActivityRule; import quick.pager.shop.activity.request.assemble.AssembleRuleSaveRequest; import quick.pager.shop.activity.response.assemble.AssembleActivityRuleResponse; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.IService; +import quick.pager.shop.user.response.Response; /** * 评团规则 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/AssembleService.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/AssembleService.java similarity index 81% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/AssembleService.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/AssembleService.java index 65fcb32..712c642 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/AssembleService.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/AssembleService.java @@ -1,15 +1,12 @@ -package quick.pager.shop.activity.service; +package quick.pager.shop.service; import java.util.List; import quick.pager.shop.activity.request.assemble.AssembleMemberPageRequest; import quick.pager.shop.activity.request.assemble.AssemblePageRequest; -import quick.pager.shop.activity.request.assemble.AssembleRecordPageRequest; -import quick.pager.shop.activity.request.assemble.AssembleRuleSaveRequest; import quick.pager.shop.activity.request.assemble.AssembleSaveRequest; import quick.pager.shop.activity.response.assemble.AssembleMemberResponse; -import quick.pager.shop.activity.response.assemble.AssembleResponse; import quick.pager.shop.activity.response.assemble.AssembleActivityResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 拼团活动 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/BannerService.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/BannerService.java similarity index 57% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/BannerService.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/BannerService.java index d599cfc..c3b63d3 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/BannerService.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/BannerService.java @@ -1,13 +1,13 @@ -package quick.pager.shop.activity.service; +package quick.pager.shop.service; import java.util.List; -import quick.pager.shop.activity.model.Banner; +import quick.pager.shop.model.Banner; import quick.pager.shop.activity.request.banner.BannerOtherRequest; import quick.pager.shop.activity.request.banner.BannerPageRequest; import quick.pager.shop.activity.request.banner.BannerSaveRequest; +import quick.pager.shop.activity.response.banner.BannerChannelResponse; import quick.pager.shop.activity.response.banner.BannerResponse; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.IService; +import quick.pager.shop.user.response.Response; /** * Banner 服务 @@ -35,4 +35,21 @@ public interface BannerService extends IService { * 编辑 */ Response modify(BannerSaveRequest request); + + /** + * App banner推广 + * + * @param userId 当前登陆用户主键 + * @param lat 纬度 + * @param lng 经度 + * @return 列表 + */ + Response> banners(Long userId, String lat, String lng); + + /** + * 首页banner分享渠道 + * @param id banner 主键 + * @return + */ + Response> channel(Long id); } diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/CouponTemplateService.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/CouponTemplateService.java similarity index 66% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/CouponTemplateService.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/CouponTemplateService.java index c1087b9..8675fa4 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/CouponTemplateService.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/CouponTemplateService.java @@ -1,10 +1,10 @@ -package quick.pager.shop.activity.service; +package quick.pager.shop.service; import java.util.List; -import quick.pager.shop.activity.model.DiscountCouponTemplate; import quick.pager.shop.activity.request.coupon.DiscountCouponTemplatePageRequest; import quick.pager.shop.activity.request.coupon.DiscountCouponTemplateSaveRequest; -import quick.pager.shop.response.Response; +import quick.pager.shop.activity.response.coupon.DiscountCouponTemplateResponse; +import quick.pager.shop.user.response.Response; /** * 优惠券模版 @@ -15,7 +15,7 @@ public interface CouponTemplateService { /** * 查询优惠券模版列表 */ - Response> queryPage(DiscountCouponTemplatePageRequest request); + Response> queryPage(DiscountCouponTemplatePageRequest request); /** * 新增优惠券模版 @@ -30,5 +30,5 @@ public interface CouponTemplateService { /** * 根据主键获取优惠券模板 */ - DiscountCouponTemplate info(Long id); + DiscountCouponTemplateResponse info(Long id); } diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/DiscountCouponService.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/DiscountCouponService.java similarity index 89% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/DiscountCouponService.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/DiscountCouponService.java index d4a5969..bcf369f 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/DiscountCouponService.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/DiscountCouponService.java @@ -1,9 +1,9 @@ -package quick.pager.shop.activity.service; +package quick.pager.shop.service; import java.util.List; import quick.pager.shop.activity.request.coupon.DiscountCouponPageRequest; import quick.pager.shop.activity.response.coupon.DiscountCouponResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 优惠券服务 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/ExchangeActivityHistoryService.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/ExchangeActivityHistoryService.java similarity index 55% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/ExchangeActivityHistoryService.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/ExchangeActivityHistoryService.java index dee9df4..8ac3e11 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/ExchangeActivityHistoryService.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/ExchangeActivityHistoryService.java @@ -1,4 +1,4 @@ -package quick.pager.shop.activity.service; +package quick.pager.shop.service; public interface ExchangeActivityHistoryService { } diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/ExchangeActivityRuleService.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/ExchangeActivityRuleService.java similarity index 80% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/ExchangeActivityRuleService.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/ExchangeActivityRuleService.java index d4ed9b9..4350562 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/ExchangeActivityRuleService.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/ExchangeActivityRuleService.java @@ -1,11 +1,10 @@ -package quick.pager.shop.activity.service; +package quick.pager.shop.service; import java.util.List; -import quick.pager.shop.activity.model.ExchangeActivityRule; +import quick.pager.shop.model.ExchangeActivityRule; import quick.pager.shop.activity.request.exchange.ExchangeActivityRuleSaveRequest; import quick.pager.shop.activity.response.exchange.ExchangeActivityRuleResponse; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.IService; +import quick.pager.shop.user.response.Response; /** * 满赠换购规则服务 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/ExchangeService.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/ExchangeService.java similarity index 94% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/ExchangeService.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/ExchangeService.java index d0e06e1..5f6e3ea 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/ExchangeService.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/ExchangeService.java @@ -1,4 +1,4 @@ -package quick.pager.shop.activity.service; +package quick.pager.shop.service; import java.util.List; import quick.pager.shop.activity.request.exchange.ExchangeActivityPageRequest; @@ -6,7 +6,7 @@ import quick.pager.shop.activity.request.exchange.ExchangeActivitySaveRequest; import quick.pager.shop.activity.response.exchange.ExchangeActivityRecordResponse; import quick.pager.shop.activity.response.exchange.ExchangeActivityResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 满赠换购服务 diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/AppDiscountCouponServiceImpl.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/AppDiscountCouponServiceImpl.java new file mode 100644 index 0000000..8e785dd --- /dev/null +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/AppDiscountCouponServiceImpl.java @@ -0,0 +1,31 @@ +package quick.pager.shop.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import quick.pager.shop.activity.enums.AppCouponUseTypeEnum; +import quick.pager.shop.mapper.DiscountCouponMapper; +import quick.pager.shop.mapper.DiscountCouponTemplateMapper; +import quick.pager.shop.activity.response.coupon.CouponResponse; +import quick.pager.shop.service.AppDiscountCouponService; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.user.client.UserClient; + +/** + * @author siguiyang + */ +@Service +public class AppDiscountCouponServiceImpl implements AppDiscountCouponService { + + @Autowired + private DiscountCouponTemplateMapper discountCouponTemplateMapper; + @Autowired + private DiscountCouponMapper discountCouponMapper; + @Autowired + private UserClient userClient; + + @Override + public Response> queryCoupons(Long userId, Integer page, AppCouponUseTypeEnum useType) { + return null; + } +} diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/AssembleServiceImpl.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/AssembleServiceImpl.java similarity index 74% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/AssembleServiceImpl.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/AssembleServiceImpl.java index 55369b3..17d0aaf 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/AssembleServiceImpl.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/AssembleServiceImpl.java @@ -1,29 +1,27 @@ -package quick.pager.shop.activity.service.impl; +package quick.pager.shop.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.Collections; import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import quick.pager.shop.activity.model.AssembleActivity; -import quick.pager.shop.activity.model.AssembleActivityMember; +import quick.pager.shop.model.AssembleActivity; +import quick.pager.shop.model.AssembleActivityMember; import quick.pager.shop.activity.request.assemble.AssembleMemberPageRequest; import quick.pager.shop.activity.request.assemble.AssemblePageRequest; -import quick.pager.shop.activity.request.assemble.AssembleRecordPageRequest; import quick.pager.shop.activity.request.assemble.AssembleSaveRequest; import quick.pager.shop.activity.response.assemble.AssembleActivityResponse; -import quick.pager.shop.activity.mapper.AssembleActivityMemberMapper; -import quick.pager.shop.activity.mapper.AssembleActivityMapper; +import quick.pager.shop.mapper.AssembleActivityMemberMapper; +import quick.pager.shop.mapper.AssembleActivityMapper; import quick.pager.shop.activity.response.assemble.AssembleMemberResponse; -import quick.pager.shop.response.Response; -import quick.pager.shop.activity.service.AssembleService; -import quick.pager.shop.service.impl.ServiceImpl; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.AssembleService; import quick.pager.shop.utils.BeanCopier; import quick.pager.shop.utils.DateUtils; @@ -36,19 +34,10 @@ public class AssembleServiceImpl extends ServiceImpl> queryPage(AssemblePageRequest request) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotBlank(request.getActivityName())) { - wrapper.likeRight(AssembleActivity::getActivityName, request.getActivityName()); - } - - if (CollectionUtils.isNotEmpty(request.getTimeRange())) { - wrapper.le(AssembleActivity::getBeginTime, request.getTimeRange().get(0)); - wrapper.ge(AssembleActivity::getEndTime, request.getTimeRange().get(1)); - } - - wrapper.orderByDesc(AssembleActivity::getUpdateTime); - - Response> response = this.toPage(request.getPage(), request.getPageSize(), wrapper); + Response> response = this.toPage(request.getPage(), request.getPageSize(), new LambdaQueryWrapper() + .likeRight(StringUtils.isNotBlank(request.getActivityName()), AssembleActivity::getActivityName, request.getActivityName()) + .between(CollectionUtils.isNotEmpty(request.getTimeRange()), AssembleActivity::getBeginTime, request.getTimeRange().get(0), request.getTimeRange().get(1)) + .orderByDesc(AssembleActivity::getUpdateTime)); return Response.toResponse(Optional.ofNullable(response.getData()).orElse(Collections.emptyList()).stream() .map(this::convert) @@ -98,15 +87,11 @@ public Response create(AssembleSaveRequest request) { @Override public Response> members(AssembleMemberPageRequest request) { - LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - qw.eq(AssembleActivityMember::getDeleteStatus, Boolean.FALSE); - qw.eq(AssembleActivityMember::getActivityId, request.getActivityId()); - - if (!StringUtils.isEmpty(request.getPhone())) { - qw.eq(AssembleActivityMember::getPhone, request.getPhone()); - } - - qw.orderByDesc(AssembleActivityMember::getUpdateTime); + LambdaQueryWrapper qw = new LambdaQueryWrapper() + .eq(AssembleActivityMember::getDeleteStatus, Boolean.FALSE) + .eq(Objects.nonNull(request.getActivityId()), AssembleActivityMember::getActivityId, request.getActivityId()) + .eq(StringUtils.isNotEmpty(request.getPhone()), AssembleActivityMember::getPhone, request.getPhone()) + .orderByDesc(AssembleActivityMember::getUpdateTime); int total = assembleActivityMemberMapper.selectCount(qw); List result = Collections.emptyList(); diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/AssembleServiceRuleImpl.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/AssembleServiceRuleImpl.java similarity index 77% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/AssembleServiceRuleImpl.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/AssembleServiceRuleImpl.java index 4e24226..df6c9ad 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/AssembleServiceRuleImpl.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/AssembleServiceRuleImpl.java @@ -1,21 +1,20 @@ -package quick.pager.shop.activity.service.impl; +package quick.pager.shop.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.time.LocalDateTime; import java.util.Objects; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import quick.pager.shop.activity.mapper.AssembleActivityMapper; -import quick.pager.shop.activity.mapper.AssembleActivityRuleMapper; -import quick.pager.shop.activity.model.AssembleActivity; -import quick.pager.shop.activity.model.AssembleActivityRule; +import quick.pager.shop.mapper.AssembleActivityMapper; +import quick.pager.shop.mapper.AssembleActivityRuleMapper; +import quick.pager.shop.model.AssembleActivity; +import quick.pager.shop.model.AssembleActivityRule; import quick.pager.shop.activity.request.assemble.AssembleRuleSaveRequest; import quick.pager.shop.activity.response.assemble.AssembleActivityRuleResponse; -import quick.pager.shop.activity.service.AssembleRuleService; +import quick.pager.shop.service.AssembleRuleService; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.impl.ServiceImpl; +import quick.pager.shop.user.response.Response; import quick.pager.shop.utils.BeanCopier; import quick.pager.shop.utils.DateUtils; @@ -39,9 +38,9 @@ public Response info(Long activityId) { return new Response<>(ResponseStatus.Code.FAIL_CODE, "活动已过期"); } - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(AssembleActivityRule::getDeleteStatus, Boolean.FALSE); - wrapper.eq(AssembleActivityRule::getActivityId, activityId); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(AssembleActivityRule::getDeleteStatus, Boolean.FALSE) + .eq(AssembleActivityRule::getActivityId, activityId); AssembleActivityRule updateRule = this.baseMapper.selectOne(wrapper); AssembleActivityRuleResponse response = new AssembleActivityRuleResponse(); @@ -63,9 +62,9 @@ public Response info(Long activityId) { @Override public Response rule(AssembleRuleSaveRequest request) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(AssembleActivityRule::getDeleteStatus, request.getDeleteStatus()); - wrapper.eq(AssembleActivityRule::getActivityId, request.getActivityId()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(AssembleActivityRule::getDeleteStatus, request.getDeleteStatus()) + .eq(Objects.nonNull(request.getActivityId()), AssembleActivityRule::getActivityId, request.getActivityId()); AssembleActivityRule rule = this.baseMapper.selectOne(wrapper); AssembleActivityRule activityRule = new AssembleActivityRule(); diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/BannerServiceImpl.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/BannerServiceImpl.java new file mode 100644 index 0000000..bcbaf31 --- /dev/null +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/BannerServiceImpl.java @@ -0,0 +1,181 @@ +package quick.pager.shop.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.google.common.base.Joiner; +import com.google.common.collect.Lists; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import org.apache.commons.beanutils.ConvertUtils; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import quick.pager.shop.activity.constants.RedisKeys; +import quick.pager.shop.mapper.BannerMapper; +import quick.pager.shop.model.Banner; +import quick.pager.shop.activity.request.banner.BannerOtherRequest; +import quick.pager.shop.activity.request.banner.BannerPageRequest; +import quick.pager.shop.activity.request.banner.BannerSaveRequest; +import quick.pager.shop.activity.response.banner.BannerChannelResponse; +import quick.pager.shop.activity.response.banner.BannerResponse; +import quick.pager.shop.constants.Constants; +import quick.pager.shop.constants.ResponseStatus; +import quick.pager.shop.constants.SConsts; +import quick.pager.shop.platform.client.SystemConfigDetailClient; +import quick.pager.shop.platform.dto.SystemConfigDTO; +import quick.pager.shop.platform.request.SystemConfigDetailOtherRequest; +import quick.pager.shop.platform.response.SystemConfigDetailResponse; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.BannerService; +import quick.pager.shop.service.RedisService; +import quick.pager.shop.utils.BeanCopier; +import quick.pager.shop.utils.DateUtils; + +/** + * Banner service impl + * + * @author siguiyang + * @version 3.0 + */ +@Service +public class BannerServiceImpl extends ServiceImpl implements BannerService { + + @Autowired + private RedisService redisService; + @Autowired + private SystemConfigDetailClient systemConfigDetailClient; + + @Override + public Response> queryPage(BannerPageRequest request) { + LambdaQueryWrapper qw = toQuery(request.getTitle(), request.getBannerType(), null); + Response> page = this.toPage(request.getPage(), request.getPageSize(), qw); + return Response.toResponse(page.getData().stream().map(this::convert).collect(Collectors.toList()), page.getTotal()); + } + + @Override + public Response> queryList(BannerOtherRequest request) { + LambdaQueryWrapper qw = toQuery(request.getTitle(), request.getBannerType(), request.getBannerStatus()); + + List banners = this.baseMapper.selectList(qw); + return Response.toResponse(banners.stream().map(this::convert).collect(Collectors.toList()), 0L); + } + + @Override + public Response create(BannerSaveRequest request) { + Banner banner = new Banner(); + BeanCopier.create(request, banner).copy(); + doChannel(banner, request.getShareChannel()); + banner.setBannerStatus(Boolean.FALSE); + banner.setDeleteStatus(Boolean.FALSE); + banner.setCreateTime(DateUtils.dateTime()); + this.baseMapper.insert(banner); + return new Response<>(banner.getId()); + } + + @Override + public Response modify(BannerSaveRequest request) { + Banner banner = BeanCopier.create(request, new Banner()).copy(); + doChannel(banner, request.getShareChannel()); + this.baseMapper.updateById(banner); + return new Response<>(banner.getId()); + } + + @Override + public Response> banners(Long userId, String lat, String lng) { + + // 缓存存在则直接返回 + List result = redisService.get(RedisKeys.APP_BANNER_PREFIX); + + if (CollectionUtils.isNotEmpty(result)) { + return Response.toResponse(result); + } + + List banners = this.baseMapper.selectList(new LambdaQueryWrapper() + .eq(Banner::getDeleteStatus, Boolean.FALSE) + .eq(Banner::getBannerStatus, Boolean.FALSE)); + + result = banners.stream().map(this::convert).collect(Collectors.toList()); + + // 添加缓存 + redisService.set(RedisKeys.APP_BANNER_PREFIX, new ArrayList<>(result), 30 * 24 * 60 * 60L); + + return Response.toResponse(result); + } + + @Override + public Response> channel(Long id) { + + Banner banner = this.baseMapper.selectById(id); + + if (Objects.isNull(banner)) { + return new Response<>(ResponseStatus.Code.FAIL_CODE, "banner 不存在！"); + } + + if (StringUtils.isBlank(banner.getShareChannel())) { + return new Response<>(ResponseStatus.Code.FAIL_CODE, "渠道不存在！"); + } + List shareChannels = Stream.of(banner.getShareChannel().split(SConsts.EN_COMMA)).collect(Collectors.toList()); + + List configDTOS = redisService.get(RedisKeys.BANNER_SHARE_CHANNEL); + + if (CollectionUtils.isEmpty(configDTOS)) { + SystemConfigDetailOtherRequest systemConfigDetailOtherReq = new SystemConfigDetailOtherRequest(); + systemConfigDetailOtherReq.setConfigKey(RedisKeys.BANNER_SHARE_CHANNEL); + Response> systemConfigDetailOtherRes = systemConfigDetailClient.queryList(systemConfigDetailOtherReq); + if (ResponseStatus.Code.SUCCESS == systemConfigDetailOtherRes.getCode()) { + configDTOS = systemConfigDetailOtherRes.getData().stream().map(item -> { + SystemConfigDTO dto = new SystemConfigDTO(); + dto.setConfigType(item.getConfigType()); + dto.setConfigValue(item.getConfigValue()); + dto.setConfigName(item.getConfigName()); + return dto; + }).collect(Collectors.toList()); + } + } + + return Response.toResponse(configDTOS.stream() + .filter(item -> shareChannels.contains(item.getConfigValue())) + .map(item -> { + BannerChannelResponse response = new BannerChannelResponse(); + response.setChannelName(item.getConfigName()); + response.setChannelType(item.getConfigValue()); + return response; + }) + .collect(Collectors.toList())); + } + + private void doChannel(Banner banner, List shareChannel) { + if (CollectionUtils.isEmpty(shareChannel)) { + banner.setShareChannel(null); + } else { + banner.setShareChannel(Joiner.on(Constants.COMMA).join(shareChannel)); + } + } + + /** + * Banner -> BannerResponse + */ + private BannerResponse convert(Banner banner) { + BannerResponse response = new BannerResponse(); + BeanCopier.create(banner, response).copy(); + if (StringUtils.isNotBlank(banner.getShareChannel())) { + response.setShareChannel( + Stream.of((String[]) ConvertUtils.convert(banner.getShareChannel().split(Constants.COMMA), String.class)) + .collect(Collectors.toList())); + } else { + response.setShareChannel(Lists.newArrayList()); + } + return response; + } + + private LambdaQueryWrapper toQuery(String title, String bannerType, Boolean bannerStatus) { + return new LambdaQueryWrapper() + .likeRight(StringUtils.isNotEmpty(title), Banner::getTitle, title) + .eq(StringUtils.isNotEmpty(bannerType), Banner::getBannerType, bannerType) + .eq(Objects.nonNull(bannerStatus), Banner::getBannerStatus, bannerStatus) + .orderByDesc(Banner::getUpdateTime); + } +} diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/CouponTemplateServiceImpl.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/CouponTemplateServiceImpl.java new file mode 100644 index 0000000..cd7218d --- /dev/null +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/CouponTemplateServiceImpl.java @@ -0,0 +1,79 @@ +package quick.pager.shop.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import quick.pager.shop.model.DiscountCouponTemplate; +import quick.pager.shop.activity.request.coupon.DiscountCouponTemplatePageRequest; +import quick.pager.shop.activity.request.coupon.DiscountCouponTemplateSaveRequest; +import quick.pager.shop.mapper.DiscountCouponTemplateMapper; +import quick.pager.shop.activity.response.coupon.DiscountCouponTemplateResponse; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.CouponTemplateService; +import quick.pager.shop.utils.BeanCopier; +import quick.pager.shop.utils.DateUtils; + +/** + * 优惠券模板 + * + * @author siguiyang + */ +@Service +public class CouponTemplateServiceImpl extends ServiceImpl implements CouponTemplateService { + @Override + public Response> queryPage(DiscountCouponTemplatePageRequest request) { + + Response> page = this.toPage(request.getPage(), request.getPageSize(), new LambdaQueryWrapper() + .likeRight(StringUtils.isNotEmpty(request.getTemplateName()), DiscountCouponTemplate::getTemplateName, request.getTemplateName()) + .eq(Objects.nonNull(request.getTemplateType()), DiscountCouponTemplate::getTemplateType, request.getTemplateType()) + .orderByDesc(DiscountCouponTemplate::getUpdateTime)); + + return Response.toResponse(page.getData().stream().map(this::convert).collect(Collectors.toList()), page.getTotal()); + } + + + @Override + public Response create(DiscountCouponTemplateSaveRequest request) { + DiscountCouponTemplate template = new DiscountCouponTemplate(); + BeanCopier.create(request, template).copy(); + template.setDeleteStatus(Boolean.FALSE); + template.setCreateTime(DateUtils.dateTime()); + this.baseMapper.insert(template); + + return new Response<>(template.getId()); + } + + @Override + public Response modify(DiscountCouponTemplateSaveRequest request) { + DiscountCouponTemplate template = new DiscountCouponTemplate(); + BeanCopier.create(request, template).copy(); + this.baseMapper.updateById(template); + + return new Response<>(template.getId()); + } + + @Override + public DiscountCouponTemplateResponse info(Long id) { + DiscountCouponTemplate template = this.baseMapper.selectById(id); + + if (Objects.isNull(template)) { + return null; + } + + return this.convert(template); + } + + + private DiscountCouponTemplateResponse convert(DiscountCouponTemplate template) { + if (Objects.isNull(template)) { + return null; + } + DiscountCouponTemplateResponse response = new DiscountCouponTemplateResponse(); + BeanCopier.create(template, response).copy(); + + return response; + } +} diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/DiscountCouponServiceImpl.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/DiscountCouponServiceImpl.java similarity index 88% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/DiscountCouponServiceImpl.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/DiscountCouponServiceImpl.java index b36a0ae..49c52dc 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/DiscountCouponServiceImpl.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/DiscountCouponServiceImpl.java @@ -1,4 +1,4 @@ -package quick.pager.shop.activity.service.impl; +package quick.pager.shop.service.impl; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; @@ -20,22 +20,21 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import quick.pager.shop.activity.mapper.DiscountCouponTemplateMapper; -import quick.pager.shop.activity.model.DiscountCoupon; -import quick.pager.shop.activity.model.DiscountCouponTemplate; +import quick.pager.shop.mapper.DiscountCouponTemplateMapper; +import quick.pager.shop.model.DiscountCoupon; +import quick.pager.shop.model.DiscountCouponTemplate; import quick.pager.shop.activity.request.coupon.DiscountCouponPageRequest; import quick.pager.shop.activity.response.coupon.DiscountCouponResponse; import quick.pager.shop.constants.RedisKeys; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.activity.mapper.DiscountCouponMapper; -import quick.pager.shop.response.Response; -import quick.pager.shop.activity.service.DiscountCouponService; +import quick.pager.shop.mapper.DiscountCouponMapper; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.DiscountCouponService; import quick.pager.shop.service.RedisService; -import quick.pager.shop.activity.task.SendCouponTask; -import quick.pager.shop.service.impl.ServiceImpl; +import quick.pager.shop.task.SendCouponTask; import quick.pager.shop.user.client.UserClient; import quick.pager.shop.user.request.UserRequest; -import quick.pager.shop.user.response.UserInfoResponse; +import quick.pager.shop.user.response.UserProfileResponse; import quick.pager.shop.utils.DateUtils; import quick.pager.shop.utils.FileUtil; @@ -58,11 +57,9 @@ public class DiscountCouponServiceImpl extends ServiceImpl> queryPage(DiscountCouponPageRequest request) { - LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + LambdaQueryWrapper qw = new LambdaQueryWrapper() + .eq(StringUtils.isNotEmpty(request.getPhone()), DiscountCoupon::getPhone, request.getPhone()); - if (StringUtils.isNotEmpty(request.getPhone())) { - qw.eq(DiscountCoupon::getPhone, request.getPhone()); - } if (CollectionUtils.isNotEmpty(request.getTimeRange())) { qw.ge(DiscountCoupon::getCreateTime, request.getTimeRange().get(0)); qw.le(DiscountCoupon::getCreateTime, request.getTimeRange().get(1)); @@ -115,9 +112,9 @@ public Response publish(String file, Long templateId) { UserRequest request = new UserRequest(); request.setPhones(phones); // 取出正常的用户 - Response> existsResponse = userClient.isExists(request); + Response> existsResponse = userClient.isExists(request); - List exists = null; + List exists = null; if (ResponseStatus.Code.SUCCESS == existsResponse.getCode() && null != existsResponse.getData()) { exists = existsResponse.getData(); } @@ -184,7 +181,7 @@ private DiscountCouponResponse convert(DiscountCoupon coupon) { response.setEndTime(discountCouponTemplate.getEndTime()); response.setCreateTime(coupon.getCreateTime()); - Response responseRes = userClient.getUser(coupon.getUserId()); + Response responseRes = userClient.getUser(coupon.getUserId()); response.setUsername(Objects.nonNull(responseRes.getData()) ? responseRes.getData().getUsername() : null); return response; diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/ExchangeActivityHistoryServiceImpl.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/ExchangeActivityHistoryServiceImpl.java similarity index 79% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/ExchangeActivityHistoryServiceImpl.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/ExchangeActivityHistoryServiceImpl.java index c49f77c..2dac6f9 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/ExchangeActivityHistoryServiceImpl.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/ExchangeActivityHistoryServiceImpl.java @@ -1,10 +1,9 @@ -package quick.pager.shop.activity.service.impl; +package quick.pager.shop.service.impl; import org.springframework.stereotype.Service; -import quick.pager.shop.activity.model.ExchangeActivityMember; -import quick.pager.shop.activity.service.ExchangeActivityHistoryService; -import quick.pager.shop.activity.mapper.ExchangeActivityMembersMapper; -import quick.pager.shop.service.impl.ServiceImpl; +import quick.pager.shop.model.ExchangeActivityMember; +import quick.pager.shop.service.ExchangeActivityHistoryService; +import quick.pager.shop.mapper.ExchangeActivityMembersMapper; @Service public class ExchangeActivityHistoryServiceImpl extends ServiceImpl implements ExchangeActivityHistoryService { diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/ExchangeActivityRuleServiceImpl.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/ExchangeActivityRuleServiceImpl.java similarity index 83% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/ExchangeActivityRuleServiceImpl.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/ExchangeActivityRuleServiceImpl.java index d1be92e..5c3ab96 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/ExchangeActivityRuleServiceImpl.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/ExchangeActivityRuleServiceImpl.java @@ -1,4 +1,4 @@ -package quick.pager.shop.activity.service.impl; +package quick.pager.shop.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.List; @@ -6,16 +6,15 @@ import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import quick.pager.shop.activity.mapper.ExchangeActivityMapper; -import quick.pager.shop.activity.mapper.ExchangeActivityRuleMapper; -import quick.pager.shop.activity.model.ExchangeActivity; -import quick.pager.shop.activity.model.ExchangeActivityRule; +import quick.pager.shop.mapper.ExchangeActivityMapper; +import quick.pager.shop.mapper.ExchangeActivityRuleMapper; +import quick.pager.shop.model.ExchangeActivity; +import quick.pager.shop.model.ExchangeActivityRule; import quick.pager.shop.activity.request.exchange.ExchangeActivityRuleSaveRequest; import quick.pager.shop.activity.response.exchange.ExchangeActivityRuleResponse; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.response.Response; -import quick.pager.shop.activity.service.ExchangeActivityRuleService; -import quick.pager.shop.service.impl.ServiceImpl; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.ExchangeActivityRuleService; import quick.pager.shop.utils.BeanCopier; import quick.pager.shop.utils.DateUtils; @@ -39,9 +38,9 @@ public Response> queryList(Long activityId) { return new Response<>(ResponseStatus.Code.FAIL_CODE, "不存在此活动"); } - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ExchangeActivityRule::getDeleteStatus, Boolean.FALSE); - wrapper.eq(ExchangeActivityRule::getActivityId, activityId); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(ExchangeActivityRule::getDeleteStatus, Boolean.FALSE) + .eq(ExchangeActivityRule::getActivityId, activityId); List rules = this.baseMapper.selectList(wrapper); return new Response<>(rules.stream() diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/ExchangeServiceImpl.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/ExchangeServiceImpl.java similarity index 78% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/ExchangeServiceImpl.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/ExchangeServiceImpl.java index b45fe73..c904d69 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/service/impl/ExchangeServiceImpl.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/service/impl/ExchangeServiceImpl.java @@ -1,4 +1,4 @@ -package quick.pager.shop.activity.service.impl; +package quick.pager.shop.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -11,20 +11,19 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import quick.pager.shop.activity.mapper.ExchangeActivityMapper; -import quick.pager.shop.activity.mapper.ExchangeActivityMembersMapper; -import quick.pager.shop.activity.mapper.ExchangeActivityRuleMapper; -import quick.pager.shop.activity.model.ExchangeActivity; -import quick.pager.shop.activity.model.ExchangeActivityMember; -import quick.pager.shop.activity.model.ExchangeActivityRule; +import quick.pager.shop.mapper.ExchangeActivityMapper; +import quick.pager.shop.mapper.ExchangeActivityMembersMapper; +import quick.pager.shop.mapper.ExchangeActivityRuleMapper; +import quick.pager.shop.model.ExchangeActivity; +import quick.pager.shop.model.ExchangeActivityMember; +import quick.pager.shop.model.ExchangeActivityRule; import quick.pager.shop.activity.request.exchange.ExchangeActivityPageRequest; import quick.pager.shop.activity.request.exchange.ExchangeActivityRecordPageRequest; import quick.pager.shop.activity.request.exchange.ExchangeActivitySaveRequest; import quick.pager.shop.activity.response.exchange.ExchangeActivityRecordResponse; import quick.pager.shop.activity.response.exchange.ExchangeActivityResponse; -import quick.pager.shop.response.Response; -import quick.pager.shop.activity.service.ExchangeService; -import quick.pager.shop.service.impl.ServiceImpl; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.ExchangeService; import quick.pager.shop.utils.BeanCopier; import quick.pager.shop.utils.DateUtils; @@ -51,16 +50,9 @@ public Response queryInfo(Long activityId) { @Override public Response> queryPage(ExchangeActivityPageRequest request) { - LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - - if (StringUtils.isNotEmpty(request.getActivityName())) { - qw.likeRight(ExchangeActivity::getActivityName, request.getActivityName()); - } - - if (CollectionUtils.isNotEmpty(request.getTimeRange())) { - qw.le(ExchangeActivity::getBeginTime, request.getTimeRange().get(0)); - qw.ge(ExchangeActivity::getEndTime, request.getTimeRange().get(1)); - } + LambdaQueryWrapper qw = new LambdaQueryWrapper() + .likeRight(StringUtils.isNotEmpty(request.getActivityName()), ExchangeActivity::getActivityName, request.getActivityName()) + .between(CollectionUtils.isNotEmpty(request.getTimeRange()), ExchangeActivity::getBeginTime, request.getTimeRange().get(0), request.getTimeRange().get(1)); Response> response = this.toPage(request.getPage(), request.getPageSize(), qw); @@ -95,17 +87,11 @@ public Response modify(ExchangeActivitySaveRequest request) { @Override public Response> record(ExchangeActivityRecordPageRequest request) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ExchangeActivityMember::getDeleteStatus, Boolean.FALSE); - wrapper.eq(ExchangeActivityMember::getActivityId, request.getActivityId()); - - if (StringUtils.isNotBlank(request.getPhone())) { - wrapper.likeRight(ExchangeActivityMember::getPhone, request.getPhone()); - } - - if (Objects.isNull(request.getRuleId())) { - wrapper.eq(ExchangeActivityMember::getRuleId, request.getRuleId()); - } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(ExchangeActivityMember::getDeleteStatus, Boolean.FALSE) + .eq(ExchangeActivityMember::getActivityId, request.getActivityId()) + .likeRight(StringUtils.isNotBlank(request.getPhone()), ExchangeActivityMember::getPhone, request.getPhone()) + .eq(Objects.isNull(request.getRuleId()), ExchangeActivityMember::getRuleId, request.getRuleId()); List responseList = Collections.emptyList(); int count = exchangeActivityMembersMapper.selectCount(wrapper); diff --git a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/task/SendCouponTask.java b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/task/SendCouponTask.java similarity index 75% rename from shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/task/SendCouponTask.java rename to shop-activity/shop-activity-api/src/main/java/quick/pager/shop/task/SendCouponTask.java index f8e7a05..b5de4ce 100644 --- a/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/activity/task/SendCouponTask.java +++ b/shop-activity/shop-activity-api/src/main/java/quick/pager/shop/task/SendCouponTask.java @@ -1,14 +1,14 @@ -package quick.pager.shop.activity.task; +package quick.pager.shop.task; import com.google.common.collect.Lists; import java.util.List; import java.util.concurrent.RecursiveTask; import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; -import quick.pager.shop.activity.mapper.DiscountCouponMapper; -import quick.pager.shop.activity.model.DiscountCoupon; -import quick.pager.shop.activity.model.DiscountCouponTemplate; -import quick.pager.shop.user.response.UserInfoResponse; +import quick.pager.shop.mapper.DiscountCouponMapper; +import quick.pager.shop.model.DiscountCoupon; +import quick.pager.shop.model.DiscountCouponTemplate; +import quick.pager.shop.user.response.UserProfileResponse; import quick.pager.shop.utils.DateUtils; /** @@ -20,7 +20,7 @@ public class SendCouponTask extends RecursiveTask> { private static final long serialVersionUID = 3590505263802424175L; - private List users; + private List users; private DiscountCouponTemplate discountCouponTemplate; @@ -31,7 +31,7 @@ public class SendCouponTask extends RecursiveTask> { */ private static final int CAPACITY = 1000; - public SendCouponTask(List users, DiscountCouponTemplate discountCouponTemplate, DiscountCouponMapper discountCouponMapper) { + public SendCouponTask(List users, DiscountCouponTemplate discountCouponTemplate, DiscountCouponMapper discountCouponMapper) { this.users = users; this.discountCouponTemplate = discountCouponTemplate; this.discountCouponMapper = discountCouponMapper; @@ -56,13 +56,13 @@ protected List compute() { discountCouponMapper.insert(discountCoupon); }); - return users.stream().map(UserInfoResponse::getPhone).collect(Collectors.toList()); + return users.stream().map(UserProfileResponse::getPhone).collect(Collectors.toList()); } int middle = users.size() / 2; - List one = Lists.newArrayList(); - List two = Lists.newArrayList(); + List one = Lists.newArrayList(); + List two = Lists.newArrayList(); for (int i = 0; i < users.size(); i++) { if (i < middle) { diff --git a/shop-activity/shop-activity-api/src/main/resources/bootstrap-dev.yml b/shop-activity/shop-activity-api/src/main/resources/bootstrap-dev.yml index adf3838..6b51d10 100644 --- a/shop-activity/shop-activity-api/src/main/resources/bootstrap-dev.yml +++ b/shop-activity/shop-activity-api/src/main/resources/bootstrap-dev.yml @@ -3,9 +3,26 @@ spring: nacos: config: server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d discovery: server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d + sentinel: + enabled: true + transport: + dashboard: 127.0.0.1:8080 + filter: + enabled: true +seata: + service: + vgroup-mapping: + shop-activity-seata-service-group: default + grouplist: + default: 101.132.121.178:8091 + disable-global-transaction: false # 内部服务调用授权认证配置 security: oauth2: diff --git a/shop-activity/shop-activity-api/src/main/resources/bootstrap.yml b/shop-activity/shop-activity-api/src/main/resources/bootstrap.yml index 66d6bae..1b2170a 100644 --- a/shop-activity/shop-activity-api/src/main/resources/bootstrap.yml +++ b/shop-activity/shop-activity-api/src/main/resources/bootstrap.yml @@ -8,6 +8,8 @@ spring: allow-bean-definition-overriding: true profiles: active: dev + autoconfigure: + exclude: org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration feign: sentinel: @@ -17,7 +19,7 @@ feign: httpclient: enabled: false mybatis-plus: - type-aliases-package: quick.pager.shop.activity.model + type-aliases-package: quick.pager.shop.model configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl global-config: @@ -29,4 +31,4 @@ management: exposure: include: refresh,health,info,hystrix.stream logging: - config: classpath:logback.xml + config: classpath:logback-spring.xml diff --git a/shop-activity/shop-activity-api/src/main/resources/logback.xml b/shop-activity/shop-activity-api/src/main/resources/logback-spring.xml similarity index 100% rename from shop-activity/shop-activity-api/src/main/resources/logback.xml rename to shop-activity/shop-activity-api/src/main/resources/logback-spring.xml diff --git a/shop-activity/shop-activity-client/pom.xml b/shop-activity/shop-activity-client/pom.xml index bc2fe99..9c342a0 100644 --- a/shop-activity/shop-activity-client/pom.xml +++ b/shop-activity/shop-activity-client/pom.xml @@ -23,17 +23,9 @@ provided - - org.springframework.cloud - spring-cloud-starter-netflix-ribbon - 2.1.0.RELEASE - provided - - org.springframework.cloud spring-cloud-starter-openfeign - 2.1.0.RELEASE provided diff --git a/shop-activity/shop-activity-client/src/main/java/quick/pager/shop/activity/client/AssembleClient.java b/shop-activity/shop-activity-client/src/main/java/quick/pager/shop/activity/client/AssembleClient.java index 5c69ac3..65b2e28 100644 --- a/shop-activity/shop-activity-client/src/main/java/quick/pager/shop/activity/client/AssembleClient.java +++ b/shop-activity/shop-activity-client/src/main/java/quick/pager/shop/activity/client/AssembleClient.java @@ -16,7 +16,7 @@ import quick.pager.shop.activity.response.assemble.AssembleResponse; import quick.pager.shop.constants.ConstantsClient; import quick.pager.shop.activity.fallback.FightGroupClientFallbackFactory; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 拼团活动Client diff --git a/shop-activity/shop-activity-client/src/main/java/quick/pager/shop/activity/client/BannerClient.java b/shop-activity/shop-activity-client/src/main/java/quick/pager/shop/activity/client/BannerClient.java index bbab994..b922f06 100644 --- a/shop-activity/shop-activity-client/src/main/java/quick/pager/shop/activity/client/BannerClient.java +++ b/shop-activity/shop-activity-client/src/main/java/quick/pager/shop/activity/client/BannerClient.java @@ -12,7 +12,7 @@ import quick.pager.shop.activity.response.banner.BannerResponse; import quick.pager.shop.constants.ConstantsClient; import quick.pager.shop.activity.fallback.BannerClientFallbackFactory; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * banner 服务Client diff --git a/shop-activity/shop-activity-client/src/main/java/quick/pager/shop/activity/client/DiscountCouponClient.java b/shop-activity/shop-activity-client/src/main/java/quick/pager/shop/activity/client/DiscountCouponClient.java index dab9ee6..ad7b7e5 100644 --- a/shop-activity/shop-activity-client/src/main/java/quick/pager/shop/activity/client/DiscountCouponClient.java +++ b/shop-activity/shop-activity-client/src/main/java/quick/pager/shop/activity/client/DiscountCouponClient.java @@ -14,7 +14,7 @@ import quick.pager.shop.activity.response.coupon.DiscountCouponTemplateResponse; import quick.pager.shop.constants.ConstantsClient; import quick.pager.shop.activity.fallback.DiscountCouponClientFallbackFactory; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 优惠券服务Client diff --git a/shop-activity/shop-activity-client/src/main/java/quick/pager/shop/activity/client/ExchangeClient.java b/shop-activity/shop-activity-client/src/main/java/quick/pager/shop/activity/client/ExchangeClient.java index 29c17bd..98bc12a 100644 --- a/shop-activity/shop-activity-client/src/main/java/quick/pager/shop/activity/client/ExchangeClient.java +++ b/shop-activity/shop-activity-client/src/main/java/quick/pager/shop/activity/client/ExchangeClient.java @@ -17,7 +17,7 @@ import quick.pager.shop.activity.response.exchange.ExchangeActivityResponse; import quick.pager.shop.activity.response.exchange.ExchangeActivityRuleResponse; import quick.pager.shop.constants.ConstantsClient; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 活动模块Client diff --git a/shop-activity/shop-activity-client/src/main/java/quick/pager/shop/activity/fallback/BannerClientFallbackFactory.java b/shop-activity/shop-activity-client/src/main/java/quick/pager/shop/activity/fallback/BannerClientFallbackFactory.java index 3e482fb..8114f83 100644 --- a/shop-activity/shop-activity-client/src/main/java/quick/pager/shop/activity/fallback/BannerClientFallbackFactory.java +++ b/shop-activity/shop-activity-client/src/main/java/quick/pager/shop/activity/fallback/BannerClientFallbackFactory.java @@ -10,7 +10,7 @@ import quick.pager.shop.activity.request.banner.BannerSaveRequest; import quick.pager.shop.activity.response.banner.BannerResponse; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * banner模块熔断工厂 diff --git a/shop-activity/shop-activity-model/pom.xml b/shop-activity/shop-activity-model/pom.xml index b8ed827..d8c03e6 100644 --- a/shop-activity/shop-activity-model/pom.xml +++ b/shop-activity/shop-activity-model/pom.xml @@ -12,15 +12,43 @@ shop-activity-model - - org.projectlombok - lombok - - quick.pager shop-common ${project.version} + + + com.alibaba + easyexcel + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + UTF-8 + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + + jar + + + + + + diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/constants/RedisKeys.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/constants/RedisKeys.java new file mode 100644 index 0000000..7bf0031 --- /dev/null +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/constants/RedisKeys.java @@ -0,0 +1,17 @@ +package quick.pager.shop.activity.constants; + +/** + * Redis缓存前缀 + * + * @author siguiyang + */ +public interface RedisKeys { + /** + * APP banner列表前缀 + */ + String APP_BANNER_PREFIX = "APP:BANNER_PREFIX:"; + /** + * banner分享渠道 + */ + String BANNER_SHARE_CHANNEL = "share_channel"; +} diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/assemble/AssembleMemberPageRequest.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/assemble/AssembleMemberPageRequest.java index 16242c6..0f19a8c 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/assemble/AssembleMemberPageRequest.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/assemble/AssembleMemberPageRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; @EqualsAndHashCode(callSuper = true) @Data diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/assemble/AssemblePageRequest.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/assemble/AssemblePageRequest.java index cea2650..491e29f 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/assemble/AssemblePageRequest.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/assemble/AssemblePageRequest.java @@ -1,11 +1,10 @@ package quick.pager.shop.activity.request.assemble; import java.time.LocalDateTime; -import java.util.Date; import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; /** * 拼团PageRequest diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/assemble/AssembleRecordPageRequest.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/assemble/AssembleRecordPageRequest.java index 9639e8f..5cd3285 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/assemble/AssembleRecordPageRequest.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/assemble/AssembleRecordPageRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; /** * 拼团记录 diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/assemble/AssembleRuleSaveRequest.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/assemble/AssembleRuleSaveRequest.java index 83d5257..f4738a2 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/assemble/AssembleRuleSaveRequest.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/assemble/AssembleRuleSaveRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; @EqualsAndHashCode(callSuper = true) @Data diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/assemble/AssembleSaveRequest.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/assemble/AssembleSaveRequest.java index 3580f26..fffec0e 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/assemble/AssembleSaveRequest.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/assemble/AssembleSaveRequest.java @@ -3,7 +3,7 @@ import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * 拼团SaveRequest diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/banner/BannerOtherRequest.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/banner/BannerOtherRequest.java index f6b081a..e9a8395 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/banner/BannerOtherRequest.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/banner/BannerOtherRequest.java @@ -3,7 +3,7 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * Banner PageRequest diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/banner/BannerPageRequest.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/banner/BannerPageRequest.java index 67011a3..3184a48 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/banner/BannerPageRequest.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/banner/BannerPageRequest.java @@ -3,7 +3,7 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; /** * Banner PageRequest diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/banner/BannerSaveRequest.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/banner/BannerSaveRequest.java index 797558d..03dca28 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/banner/BannerSaveRequest.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/banner/BannerSaveRequest.java @@ -3,7 +3,7 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * banner SaveRequest diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/coupon/DiscountCouponPageRequest.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/coupon/DiscountCouponPageRequest.java index 1eb2fb1..8152483 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/coupon/DiscountCouponPageRequest.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/coupon/DiscountCouponPageRequest.java @@ -1,11 +1,10 @@ package quick.pager.shop.activity.request.coupon; import java.time.LocalDateTime; -import java.util.Date; import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; /** * 优惠券PageRequest diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/coupon/DiscountCouponSaveRequest.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/coupon/DiscountCouponSaveRequest.java index 470aa62..3e5431b 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/coupon/DiscountCouponSaveRequest.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/coupon/DiscountCouponSaveRequest.java @@ -3,7 +3,7 @@ import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * 优惠券SaveRequest diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/coupon/DiscountCouponTemplatePageRequest.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/coupon/DiscountCouponTemplatePageRequest.java index f9eb593..b5b23b4 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/coupon/DiscountCouponTemplatePageRequest.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/coupon/DiscountCouponTemplatePageRequest.java @@ -3,7 +3,7 @@ import java.math.BigDecimal; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; /** * 优惠券模板PageRequest diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/coupon/DiscountCouponTemplateSaveRequest.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/coupon/DiscountCouponTemplateSaveRequest.java index 6ec51b8..efa9f7a 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/coupon/DiscountCouponTemplateSaveRequest.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/coupon/DiscountCouponTemplateSaveRequest.java @@ -3,7 +3,7 @@ import java.math.BigDecimal; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * 优惠券模板SaveRequest diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/coupon/PublishCouponRequest.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/coupon/PublishCouponRequest.java index bd59f4b..1317ef8 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/coupon/PublishCouponRequest.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/coupon/PublishCouponRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * 发布优惠券 diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/exchange/ExchangeActivityPageRequest.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/exchange/ExchangeActivityPageRequest.java index 381c0c6..69a1aa8 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/exchange/ExchangeActivityPageRequest.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/exchange/ExchangeActivityPageRequest.java @@ -4,7 +4,7 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; /** * 满赠换购PageRequest diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/exchange/ExchangeActivityRecordPageRequest.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/exchange/ExchangeActivityRecordPageRequest.java index 819ad6f..b716528 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/exchange/ExchangeActivityRecordPageRequest.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/exchange/ExchangeActivityRecordPageRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; /** * 满赠换购分页参数 diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/exchange/ExchangeActivityRulePageRequest.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/exchange/ExchangeActivityRulePageRequest.java index 8a41797..6912030 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/exchange/ExchangeActivityRulePageRequest.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/exchange/ExchangeActivityRulePageRequest.java @@ -1,6 +1,6 @@ package quick.pager.shop.activity.request.exchange; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; public class ExchangeActivityRulePageRequest extends PageRequest { } diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/exchange/ExchangeActivityRuleSaveRequest.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/exchange/ExchangeActivityRuleSaveRequest.java index baa7f73..dda5c16 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/exchange/ExchangeActivityRuleSaveRequest.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/exchange/ExchangeActivityRuleSaveRequest.java @@ -3,7 +3,7 @@ import java.math.BigDecimal; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; @EqualsAndHashCode(callSuper = true) @Data diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/exchange/ExchangeActivitySaveRequest.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/exchange/ExchangeActivitySaveRequest.java index cf2732c..850d7c4 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/exchange/ExchangeActivitySaveRequest.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/request/exchange/ExchangeActivitySaveRequest.java @@ -3,7 +3,7 @@ import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * 满赠换购SaveRequest diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/assemble/AssembleActivityResponse.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/assemble/AssembleActivityResponse.java index 31aa8fb..642c0d2 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/assemble/AssembleActivityResponse.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/assemble/AssembleActivityResponse.java @@ -3,7 +3,7 @@ import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * 评团活动 diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/assemble/AssembleActivityRuleResponse.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/assemble/AssembleActivityRuleResponse.java index 8b4a8d0..be642bd 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/assemble/AssembleActivityRuleResponse.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/assemble/AssembleActivityRuleResponse.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * 拼团规则 diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/assemble/AssembleMemberResponse.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/assemble/AssembleMemberResponse.java index c6d5a28..c02275d 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/assemble/AssembleMemberResponse.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/assemble/AssembleMemberResponse.java @@ -3,7 +3,7 @@ import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * 拼团成员 diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/assemble/AssembleResponse.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/assemble/AssembleResponse.java index fc321f6..e7b36ec 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/assemble/AssembleResponse.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/assemble/AssembleResponse.java @@ -1,11 +1,10 @@ package quick.pager.shop.activity.response.assemble; import java.time.LocalDateTime; -import java.util.Date; import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; @EqualsAndHashCode(callSuper = true) @Data diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/banner/BannerChannelResponse.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/banner/BannerChannelResponse.java new file mode 100644 index 0000000..8fbc12c --- /dev/null +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/banner/BannerChannelResponse.java @@ -0,0 +1,23 @@ +package quick.pager.shop.activity.response.banner; + +import java.io.Serializable; +import lombok.Data; + +/** + * banner渠道 + * + * @author siguiyang + */ +@Data +public class BannerChannelResponse implements Serializable { + private static final long serialVersionUID = 1489702414131088409L; + + /** + * 渠道类型 + */ + private String channelType; + /** + * 渠道名称 + */ + private String channelName; +} diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/banner/BannerResponse.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/banner/BannerResponse.java index acc070a..8cfa135 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/banner/BannerResponse.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/banner/BannerResponse.java @@ -3,7 +3,7 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * banner 数据响应对象 diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/coupon/CouponResponse.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/coupon/CouponResponse.java new file mode 100644 index 0000000..1df77b2 --- /dev/null +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/coupon/CouponResponse.java @@ -0,0 +1,14 @@ +package quick.pager.shop.activity.response.coupon; + +import java.io.Serializable; +import lombok.Data; + +/** + * 用户优惠券 + * + * @author siguiyang + */ +@Data +public class CouponResponse implements Serializable { + private static final long serialVersionUID = 523470244932587364L; +} diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/coupon/DiscountCouponResponse.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/coupon/DiscountCouponResponse.java index 0bcc8d8..d662797 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/coupon/DiscountCouponResponse.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/coupon/DiscountCouponResponse.java @@ -4,7 +4,7 @@ import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * 优惠券 diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/coupon/DiscountCouponTemplateResponse.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/coupon/DiscountCouponTemplateResponse.java index bffe62c..d6fbba4 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/coupon/DiscountCouponTemplateResponse.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/coupon/DiscountCouponTemplateResponse.java @@ -4,7 +4,7 @@ import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * 优惠券模板Response diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/exchange/ExchangeActivityRecordResponse.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/exchange/ExchangeActivityRecordResponse.java index a410a70..9f67fdb 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/exchange/ExchangeActivityRecordResponse.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/exchange/ExchangeActivityRecordResponse.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * 满赠换购记录 diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/exchange/ExchangeActivityResponse.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/exchange/ExchangeActivityResponse.java index f90a2f8..b995fa1 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/exchange/ExchangeActivityResponse.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/exchange/ExchangeActivityResponse.java @@ -3,7 +3,7 @@ import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * 满赠换购 diff --git a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/exchange/ExchangeActivityRuleResponse.java b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/exchange/ExchangeActivityRuleResponse.java index e25f08a..de35d40 100644 --- a/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/exchange/ExchangeActivityRuleResponse.java +++ b/shop-activity/shop-activity-model/src/main/java/quick/pager/shop/activity/response/exchange/ExchangeActivityRuleResponse.java @@ -3,7 +3,7 @@ import java.math.BigDecimal; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * 满赠换购规则 diff --git a/shop-auth/shop-auth-feign/pom.xml b/shop-auth/shop-auth-feign/pom.xml index 5dba2dc..ee5ba22 100644 --- a/shop-auth/shop-auth-feign/pom.xml +++ b/shop-auth/shop-auth-feign/pom.xml @@ -19,49 +19,18 @@ - - org.springframework.boot - spring-boot-starter-web - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - org.springframework.cloud spring-cloud-starter-openfeign - - org.springframework.boot - spring-boot-starter-data-redis - - - - mysql - mysql-connector-java - - - - redis.clients - jedis - - - - org.springframework.boot - spring-boot-starter-test - test - - quick.pager shop-common ${project.version} - org.springframework.security.oauth.boot spring-security-oauth2-autoconfigure @@ -82,8 +51,22 @@ UTF-8 + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + + jar + + + + + diff --git a/shop-auth/shop-auth-feign/src/main/java/quick/pager/shop/auth/feign/configuration/OAuth2FeignAutoConfiguration.java b/shop-auth/shop-auth-feign/src/main/java/quick/pager/shop/auth/feign/configuration/OAuth2FeignAutoConfiguration.java index f2af0d9..8d291f0 100644 --- a/shop-auth/shop-auth-feign/src/main/java/quick/pager/shop/auth/feign/configuration/OAuth2FeignAutoConfiguration.java +++ b/shop-auth/shop-auth-feign/src/main/java/quick/pager/shop/auth/feign/configuration/OAuth2FeignAutoConfiguration.java @@ -43,7 +43,7 @@ public ClientCredentialsResourceDetails resourceDetails() { details.setClientId(oauth2ClientProperties.getClientId()); details.setClientSecret(oauth2ClientProperties.getClientSecret()); details.setClientAuthenticationScheme(AuthenticationScheme.header); - details.setScope(!CollectionUtils.isEmpty(oauth2ClientProperties.getScopes()) ? oauth2ClientProperties.getScopes() : Collections.singletonList("app")); + details.setScope(!CollectionUtils.isEmpty(oauth2ClientProperties.getScope()) ? oauth2ClientProperties.getScope() : Collections.singletonList("app")); return details; } diff --git a/shop-auth/shop-auth-feign/src/main/java/quick/pager/shop/auth/feign/configuration/Oauth2ClientProperties.java b/shop-auth/shop-auth-feign/src/main/java/quick/pager/shop/auth/feign/configuration/Oauth2ClientProperties.java index cb471cf..7bd820a 100644 --- a/shop-auth/shop-auth-feign/src/main/java/quick/pager/shop/auth/feign/configuration/Oauth2ClientProperties.java +++ b/shop-auth/shop-auth-feign/src/main/java/quick/pager/shop/auth/feign/configuration/Oauth2ClientProperties.java @@ -32,5 +32,5 @@ public class Oauth2ClientProperties { /** * scope 模型 */ - private List scopes; + private List scope; } diff --git a/shop-auth/shop-auth-feign/src/main/resources/config.properties b/shop-auth/shop-auth-feign/src/main/resources/config.properties deleted file mode 100644 index e69de29..0000000 diff --git a/shop-auth/shop-auth-resource/pom.xml b/shop-auth/shop-auth-resource/pom.xml index 480e160..d5c4256 100644 --- a/shop-auth/shop-auth-resource/pom.xml +++ b/shop-auth/shop-auth-resource/pom.xml @@ -26,29 +26,15 @@ org.springframework.boot spring-boot-starter-data-redis + provided org.springframework.cloud spring-cloud-starter-oauth2 - - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - - + 2.2.2.RELEASE - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - 2.1.2.RELEASE - - - - redis.clients - jedis - com.alibaba fastjson @@ -76,6 +62,19 @@ UTF-8 + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + + jar + + + + diff --git a/shop-auth/shop-auth-resource/src/main/resources/config.properties b/shop-auth/shop-auth-resource/src/main/resources/config.properties deleted file mode 100644 index e69de29..0000000 diff --git a/shop-auth/shop-auth-server-api/pom.xml b/shop-auth/shop-auth-server-api/pom.xml index 02623fc..02395e7 100644 --- a/shop-auth/shop-auth-server-api/pom.xml +++ b/shop-auth/shop-auth-server-api/pom.xml @@ -25,12 +25,12 @@ com.alibaba.cloud - spring-cloud-alibaba-nacos-config + spring-cloud-starter-alibaba-nacos-config com.alibaba.cloud - spring-cloud-alibaba-nacos-discovery + spring-cloud-starter-alibaba-nacos-discovery @@ -46,12 +46,7 @@ org.springframework.cloud spring-cloud-starter-oauth2 - - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - - + 2.2.2.RELEASE @@ -75,21 +70,6 @@ 3.2.1 - - redis.clients - jedis - - - - org.projectlombok - lombok - - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - 2.1.2.RELEASE - - org.springframework.boot spring-boot-starter-jdbc @@ -106,8 +86,15 @@ - com.alibaba - druid + quick.pager + shop-common + ${project.version} + + + com.alibaba + easyexcel + + @@ -118,7 +105,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.1.2.RELEASE + 2.2.9.RELEASE package diff --git a/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/configuration/OAuth2SecurityConfiguration.java b/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/configuration/OAuth2SecurityConfiguration.java index 4ae5624..8187914 100644 --- a/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/configuration/OAuth2SecurityConfiguration.java +++ b/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/configuration/OAuth2SecurityConfiguration.java @@ -30,7 +30,6 @@ import quick.pager.shop.granter.PhonePasswordTokenGranter; import quick.pager.shop.granter.SmsTokenGranter; import quick.pager.shop.service.UserServiceImpl; -import quick.pager.shop.translator.DefaultWebResponseExceptionTranslator; /** * OAuth security 配置 @@ -51,8 +50,6 @@ public class OAuth2SecurityConfiguration extends AuthorizationServerConfigurerAd private AuthorizationCodeServices authorizationCodeServices; @Autowired private RedisConnectionFactory redisConnectionFactory; - @Autowired - private DefaultWebResponseExceptionTranslator webResponseExceptionTranslator; @Override @@ -71,7 +68,6 @@ public void configure(ClientDetailsServiceConfigurer clients) throws Exception { @Override public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception { endpoints - .exceptionTranslator(webResponseExceptionTranslator) .authenticationManager(authenticationManager) .authorizationCodeServices(authorizationCodeServices) .tokenStore(tokenStore()) diff --git a/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/configuration/RedisConfiguration.java b/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/configuration/RedisConfiguration.java deleted file mode 100644 index bfe7d06..0000000 --- a/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/configuration/RedisConfiguration.java +++ /dev/null @@ -1,26 +0,0 @@ -package quick.pager.shop.configuration; - -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.core.RedisTemplate; - -/** - * redis 配置 - * - * @author siguiyang - */ -@Configuration -@ConditionalOnClass({RedisTemplate.class, RedisConnectionFactory.class}) -public class RedisConfiguration { - - - @Bean - public ShopRedisTemplate shopRedisTemplate( - RedisConnectionFactory redisConnectionFactory) { - ShopRedisTemplate template = new ShopRedisTemplate(); - template.setConnectionFactory(redisConnectionFactory); - return template; - } -} diff --git a/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/configuration/ShopRedisTemplate.java b/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/configuration/ShopRedisTemplate.java deleted file mode 100644 index fd196e4..0000000 --- a/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/configuration/ShopRedisTemplate.java +++ /dev/null @@ -1,50 +0,0 @@ -package quick.pager.shop.configuration; - -import com.alibaba.fastjson.support.spring.GenericFastJsonRedisSerializer; -import java.io.Serializable; -import org.springframework.data.redis.connection.DefaultStringRedisConnection; -import org.springframework.data.redis.connection.RedisConnection; -import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.serializer.RedisSerializer; -import org.springframework.data.redis.serializer.StringRedisSerializer; -import org.springframework.lang.NonNull; - -/** - * redis template - * - * @author siguiyang - */ -public class ShopRedisTemplate extends RedisTemplate { - - - /** - * Constructs a new StringRedisTemplate instance. {@link #setConnectionFactory(RedisConnectionFactory)} - * and {@link #afterPropertiesSet()} still need to be called. - */ - public ShopRedisTemplate() { - RedisSerializer stringSerializer = new StringRedisSerializer(); - RedisSerializer genericFastJsonRedisSerializer = new GenericFastJsonRedisSerializer(); - setKeySerializer(stringSerializer); - setValueSerializer(genericFastJsonRedisSerializer); - setHashKeySerializer(genericFastJsonRedisSerializer); - setHashValueSerializer(genericFastJsonRedisSerializer); - } - - /** - * Constructs a new StringRedisTemplate instance ready to be used. - * - * @param connectionFactory connection factory for creating new connections - */ - public ShopRedisTemplate(RedisConnectionFactory connectionFactory) { - this(); - setConnectionFactory(connectionFactory); - afterPropertiesSet(); - } - - @NonNull - @Override - protected RedisConnection preProcessConnection(@NonNull RedisConnection connection, boolean existingConnection) { - return new DefaultStringRedisConnection(connection); - } -} diff --git a/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/resp/Response.java b/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/resp/Response.java deleted file mode 100644 index 307b27d..0000000 --- a/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/resp/Response.java +++ /dev/null @@ -1,47 +0,0 @@ -package quick.pager.shop.resp; - -import java.io.Serializable; -import lombok.Data; - -/** - * 数据响应类
- * code 201 未登陆 - * code 202 用户不存在 - * code 203 密码不正确 - * code 204 登陆过期 - * - * @param - * @author siguiyang - */ -@Data -public class Response implements Serializable { - - private static final long serialVersionUID = 473372815866107289L; - /** - * 数据响应吗 - */ - private int code = 200; - /** - * 响应消息 - */ - private String msg = "操作成功"; - /** - * 响应数据 - */ - private T data; - - /** - * 总数 - */ - private long total; - - private long timestamp = System.currentTimeMillis(); - - public Response() { - } - - public Response(int code, String msg) { - this.code = code; - this.msg = msg; - } -} diff --git a/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/service/UserServiceImpl.java b/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/service/UserServiceImpl.java index 78b1278..ea78d90 100644 --- a/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/service/UserServiceImpl.java +++ b/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/service/UserServiceImpl.java @@ -15,12 +15,12 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import quick.pager.shop.client.AuthClient; -import quick.pager.shop.client.UserClient; +import quick.pager.shop.user.client.AuthClient; +import quick.pager.shop.user.client.UserClient; import quick.pager.shop.configuration.ShopRedisTemplate; import quick.pager.shop.dto.UserDTO; import quick.pager.shop.exception.OAuth2SmsInvalidException; -import quick.pager.shop.resp.Response; +import quick.pager.shop.user.response.Response; /** * 查询用户权限 @@ -63,7 +63,7 @@ public UserDetails loadUserByUsername(String username) throws UsernameNotFoundEx * @param phone 手机号码 * @param smsCode 短信验证码 * @return 授权人 - * @throws UsernameNotFoundException + * @throws UsernameNotFoundException 未找到用户 */ public Collection loadUserBySMS(String phone, String smsCode) throws UsernameNotFoundException { diff --git a/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/sql/SQLUtils.java b/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/sql/SQLUtils.java deleted file mode 100644 index 44a038e..0000000 --- a/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/sql/SQLUtils.java +++ /dev/null @@ -1,69 +0,0 @@ -package quick.pager.shop.sql; - -public class SQLUtils { - - /** - * client 字段更新 - */ - public static final String CLIENT_FIELDS_FOR_UPDATE = "resource_ids, scope, " - + "authorized_grant_types, web_server_redirect_uri, authorities, access_token_validity, " - + "refresh_token_validity, additional_information, autoapprove, create_user,update_user, create_time, " - + "update_time, delete_status"; - - /** - * client 字段更新 - */ - public static final String FIELDS_FOR_UPDATE = "client_name,resource_ids = ?, scope = ?, authorized_grant_types = ?, " - + "web_server_redirect_uri = ?, authorities = ?, access_token_validity = ?, " - + "refresh_token_validity = ?, additional_information = ?, autoapprove = ?, " - + "update_user = ?, update_time = ?, delete_status = ?"; - - - /** - * client 所有字段 sql - */ - public static final String CLIENT_FIELDS = "client_secret, " + CLIENT_FIELDS_FOR_UPDATE; - - /** - * 基础查询字段 sql - */ - public static final String BASE_FIND_STATEMENT = "select client_id, " + CLIENT_FIELDS - + " from oauth_client_details"; - /** - * 默认查询字段sql - */ - public static final String DEFAULT_FIND_STATEMENT = BASE_FIND_STATEMENT + " order by update_time"; - - /** - * 默认查询分页sql - */ - public static final String DEFAULT_FIND_STATEMENT_LIMIT = DEFAULT_FIND_STATEMENT + " limit ?,?"; - /** - * 根据client_id sql查询 - */ - public static final String DEFAULT_SELECT_STATEMENT = BASE_FIND_STATEMENT + " where client_id = ?"; - - /** - * 根据client_id sql 分页查询 - */ - public static final String DEFAULT_SELECT_STATEMENT_LIMIT = DEFAULT_SELECT_STATEMENT + " limit ?,?"; - /** - * 默认插入sql - */ - public static final String DEFAULT_INSERT_STATEMENT = "insert into oauth_client_details (" + CLIENT_FIELDS - + ", client_id, client_name) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; - /** - * 默认更新字段sql - */ - public static final String DEFAULT_UPDATE_STATEMENT = "update oauth_client_details set " + FIELDS_FOR_UPDATE + " where client_id = ?"; - /** - * 默认根据client_id 更新client_secret - */ - public static final String DEFAULT_UPDATE_SECRET_STATEMENT = "update oauth_client_details " - + "set client_secret = ? where client_id = ?"; - /** - * 根据client_id 删除 - */ - public static final String DEFAULT_DELETE_STATEMENT = "delete from oauth_client_details where client_id = ?"; - -} diff --git a/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/translator/DefaultWebResponseExceptionTranslator.java b/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/translator/DefaultWebResponseExceptionTranslator.java deleted file mode 100644 index aa2810e..0000000 --- a/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/translator/DefaultWebResponseExceptionTranslator.java +++ /dev/null @@ -1,202 +0,0 @@ -package quick.pager.shop.translator; - -import java.io.IOException; - -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.security.access.AccessDeniedException; -import org.springframework.security.core.AuthenticationException; -import org.springframework.security.oauth2.common.DefaultThrowableAnalyzer; -import org.springframework.security.oauth2.common.OAuth2AccessToken; -import org.springframework.security.oauth2.common.exceptions.InsufficientScopeException; -import org.springframework.security.oauth2.common.exceptions.InvalidClientException; -import org.springframework.security.oauth2.common.exceptions.InvalidGrantException; -import org.springframework.security.oauth2.common.exceptions.InvalidRequestException; -import org.springframework.security.oauth2.common.exceptions.InvalidScopeException; -import org.springframework.security.oauth2.common.exceptions.InvalidTokenException; -import org.springframework.security.oauth2.common.exceptions.OAuth2Exception; -import org.springframework.security.oauth2.common.exceptions.RedirectMismatchException; -import org.springframework.security.oauth2.common.exceptions.UnauthorizedClientException; -import org.springframework.security.oauth2.common.exceptions.UnsupportedGrantTypeException; -import org.springframework.security.oauth2.common.exceptions.UnsupportedResponseTypeException; -import org.springframework.security.oauth2.common.exceptions.UserDeniedAuthorizationException; -import org.springframework.security.oauth2.provider.error.WebResponseExceptionTranslator; -import org.springframework.security.web.util.ThrowableAnalyzer; -import org.springframework.stereotype.Component; -import org.springframework.web.HttpRequestMethodNotSupportedException; -import quick.pager.shop.resp.Response; - -/** - * Default translator that converts exceptions into {@link OAuth2Exception}s. The output matches the OAuth 2.0 - * specification in terms of error response format and HTTP status code. - * - * @author Dave Syer - * @author siguiyang - */ -@Component -public class DefaultWebResponseExceptionTranslator implements WebResponseExceptionTranslator { - - private ThrowableAnalyzer throwableAnalyzer = new DefaultThrowableAnalyzer(); - - /** - * 错误码前缀 - */ - private static final int ERROR_CODE_START = 10000; - - @Override - public ResponseEntity translate(Exception e) throws Exception { - - // Try to extract a SpringSecurityException from the stacktrace - Throwable[] causeChain = throwableAnalyzer.determineCauseChain(e); - Exception ase = (OAuth2Exception) throwableAnalyzer.getFirstThrowableOfType(OAuth2Exception.class, causeChain); - - if (ase != null) { - return handleOAuth2Exception((OAuth2Exception) ase); - } - - ase = (AuthenticationException) throwableAnalyzer.getFirstThrowableOfType(AuthenticationException.class, - causeChain); - if (ase != null) { - return handleOAuth2Exception(new UnauthorizedException(e.getMessage(), e)); - } - - ase = (AccessDeniedException) throwableAnalyzer - .getFirstThrowableOfType(AccessDeniedException.class, causeChain); - if (ase instanceof AccessDeniedException) { - return handleOAuth2Exception(new ForbiddenException(ase.getMessage(), ase)); - } - - ase = (HttpRequestMethodNotSupportedException) throwableAnalyzer.getFirstThrowableOfType( - HttpRequestMethodNotSupportedException.class, causeChain); - if (ase instanceof HttpRequestMethodNotSupportedException) { - return handleOAuth2Exception(new MethodNotAllowed(ase.getMessage(), ase)); - } - - return handleOAuth2Exception(new ServerErrorException(HttpStatus.INTERNAL_SERVER_ERROR.getReasonPhrase(), e)); - - } - - private ResponseEntity handleOAuth2Exception(OAuth2Exception e) throws IOException { - - Response result = new Response<>(); - result.setCode(ERROR_CODE_START); - if (e instanceof InvalidClientException) { - result.setMsg("用户名或这密码错误"); - } else if (e instanceof UnauthorizedClientException) { - result.setMsg("未授权的ClientId"); - } else if (e instanceof InvalidGrantException) { - result.setMsg("授权失败，用户名或者密码错误"); - } else if (e instanceof InvalidScopeException) { - result.setMsg("授权客户端错误"); - } else if (e instanceof InvalidTokenException) { - result.setMsg("授权token错误"); - } else if (e instanceof InvalidRequestException) { - result.setMsg("授权请求错误"); - } else if (e instanceof RedirectMismatchException) { - result.setMsg("redirect_uri未匹配"); - } else if (e instanceof UnsupportedGrantTypeException) { - result.setMsg("不支持此授权类型"); - } else if (e instanceof UnsupportedResponseTypeException) { - result.setMsg("不支持此类型的授权码"); - } else if (e instanceof UserDeniedAuthorizationException) { - result.setMsg("您没有访问权限"); - } else { - result.setCode(ERROR_CODE_START + 1); - result.setMsg(e.getMessage()); - } - - int status = e.getHttpErrorCode(); - HttpHeaders headers = new HttpHeaders(); - headers.set("Cache-Control", "no-store"); - headers.set("Pragma", "no-cache"); - if (status == HttpStatus.UNAUTHORIZED.value() || (e instanceof InsufficientScopeException)) { - headers.set("WWW-Authenticate", String.format("%s %s", OAuth2AccessToken.BEARER_TYPE, e.getSummary())); - } - - return new ResponseEntity<>(result, headers, - HttpStatus.OK); - - } - - public void setThrowableAnalyzer(ThrowableAnalyzer throwableAnalyzer) { - this.throwableAnalyzer = throwableAnalyzer; - } - - @SuppressWarnings("serial") - private static class ForbiddenException extends OAuth2Exception { - - private ForbiddenException(String msg, Throwable t) { - super(msg, t); - } - - @Override - public String getOAuth2ErrorCode() { - return "您没有权限访问"; - } - - @Override - public int getHttpErrorCode() { - return 403; - } - - } - - @SuppressWarnings("serial") - private static class ServerErrorException extends OAuth2Exception { - - private ServerErrorException(String msg, Throwable t) { - super(msg, t); - } - - @Override - public String getOAuth2ErrorCode() { - return "服务器发生错误，请稍后重试"; - } - - @Override - public int getHttpErrorCode() { - return 500; - } - - } - - @SuppressWarnings("serial") - private static class UnauthorizedException extends OAuth2Exception { - - private UnauthorizedException(String msg, Throwable t) { - super(msg, t); - } - - @Override - public String getOAuth2ErrorCode() { - return "您尚未授权，无法访问"; - } - - @Override - public int getHttpErrorCode() { - return 401; - } - - } - - @SuppressWarnings("serial") - private static class MethodNotAllowed extends OAuth2Exception { - - private MethodNotAllowed(String msg, Throwable t) { - super(msg, t); - } - - @Override - public String getOAuth2ErrorCode() { - return "不支持此类型的方法"; - } - - @Override - public int getHttpErrorCode() { - return 405; - } - - } - -} diff --git a/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/client/AuthClient.java b/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/user/client/AuthClient.java similarity index 82% rename from shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/client/AuthClient.java rename to shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/user/client/AuthClient.java index 60bb2b7..4d386fc 100644 --- a/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/client/AuthClient.java +++ b/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/user/client/AuthClient.java @@ -1,4 +1,4 @@ -package quick.pager.shop.client; +package quick.pager.shop.user.client; import feign.hystrix.FallbackFactory; import java.util.List; @@ -8,8 +8,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; +import quick.pager.shop.constants.ResponseStatus; import quick.pager.shop.dto.UserDTO; -import quick.pager.shop.resp.Response; +import quick.pager.shop.user.response.Response; /** * 授权client @@ -50,12 +51,12 @@ public AuthClient create(Throwable cause) { return new AuthClient() { @Override public Response getSysUser(String username) { - return new Response<>(3000, "网络连接错误，请稍后重试"); + return new Response<>(ResponseStatus.Code.EXCEPTION_CODE, "网络连接错误，请稍后重试"); } @Override public Response> getRolesBySysUserId(Long sysUserId) { - return new Response<>(3000, "网络连接错误，请稍后重试"); + return new Response<>(ResponseStatus.Code.EXCEPTION_CODE, "网络连接错误，请稍后重试"); } }; } diff --git a/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/client/UserClient.java b/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/user/client/UserClient.java similarity index 91% rename from shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/client/UserClient.java rename to shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/user/client/UserClient.java index 16a7ef3..ab19741 100644 --- a/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/client/UserClient.java +++ b/shop-auth/shop-auth-server-api/src/main/java/quick/pager/shop/user/client/UserClient.java @@ -1,4 +1,4 @@ -package quick.pager.shop.client; +package quick.pager.shop.user.client; import feign.hystrix.FallbackFactory; import org.springframework.cloud.openfeign.FeignClient; @@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import quick.pager.shop.resp.Response; +import quick.pager.shop.user.response.Response; /** * 用户信息 diff --git a/shop-auth/shop-auth-server-api/src/main/resources/bootstrap-dev.yml b/shop-auth/shop-auth-server-api/src/main/resources/bootstrap-dev.yml index a3752ea..e288e87 100644 --- a/shop-auth/shop-auth-server-api/src/main/resources/bootstrap-dev.yml +++ b/shop-auth/shop-auth-server-api/src/main/resources/bootstrap-dev.yml @@ -3,5 +3,9 @@ spring: nacos: config: server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d discovery: server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d diff --git a/shop-auth/shop-auth-server-api/src/main/resources/bootstrap.yml b/shop-auth/shop-auth-server-api/src/main/resources/bootstrap.yml index 0ef95f4..8fdda40 100644 --- a/shop-auth/shop-auth-server-api/src/main/resources/bootstrap.yml +++ b/shop-auth/shop-auth-server-api/src/main/resources/bootstrap.yml @@ -4,6 +4,8 @@ server: spring: application: name: shop-auth + autoconfigure: + exclude: quick.pager.shop.configuration.ApplicationConfiguration profiles: active: dev freemarker: diff --git a/shop-cart/pom.xml b/shop-cart/pom.xml index 1528ac2..d441a8d 100644 --- a/shop-cart/pom.xml +++ b/shop-cart/pom.xml @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - shop-cart-client shop-cart-api + shop-cart-client shop-cart-model diff --git a/shop-cart/shop-cart-api/pom.xml b/shop-cart/shop-cart-api/pom.xml index fead172..e1632e1 100644 --- a/shop-cart/shop-cart-api/pom.xml +++ b/shop-cart/shop-cart-api/pom.xml @@ -18,115 +18,93 @@ + - org.springframework.boot - spring-boot-starter-web + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config com.alibaba.cloud - spring-cloud-alibaba-nacos-config + spring-cloud-starter-alibaba-nacos-discovery com.alibaba.cloud - spring-cloud-alibaba-nacos-discovery + spring-cloud-starter-alibaba-seata com.alibaba.cloud spring-cloud-starter-alibaba-sentinel + - - org.springframework.boot - spring-boot-starter-actuator - - - - com.baomidou - mybatis-plus-boot-starter - - + org.springframework.cloud spring-cloud-starter-openfeign + + org.springframework.boot - spring-boot-starter-data-redis - - - - org.springframework.cloud - spring-cloud-starter-stream-kafka + spring-boot-starter-web - org.springframework.cloud - spring-cloud-starter-sleuth + org.springframework.boot + spring-boot-starter-data-redis - org.springframework.cloud - spring-cloud-sleuth-zipkin + org.springframework.boot + spring-boot-starter-actuator + + - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - 2.1.2.RELEASE + com.baomidou + mybatis-plus-boot-starter mysql mysql-connector-java + + - redis.clients - jedis - - - - org.springframework.boot - spring-boot-starter-test - test + quick.pager + shop-auth-feign + ${project.version} quick.pager shop-auth-resource ${project.version} - - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - - + + quick.pager - shop-auth-feign + shop-cart-model ${project.version} - - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - - quick.pager - shop-common + shop-seller-client ${project.version} quick.pager - shop-cart-model + shop-goods-client ${project.version} @@ -137,7 +115,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.1.2.RELEASE + 2.2.9.RELEASE package diff --git a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/CartApplication.java b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/CartApplication.java new file mode 100644 index 0000000..f9aa7e8 --- /dev/null +++ b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/CartApplication.java @@ -0,0 +1,18 @@ +package quick.pager.shop; + +import org.springframework.boot.SpringApplication; +import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * @author siguiyang + */ +@SpringCloudApplication +@EnableFeignClients +public class CartApplication { + + public static void main(String[] args) { + SpringApplication.run(CartApplication.class, args); + } +} + diff --git a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/CartApplication.java b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/CartApplication.java deleted file mode 100644 index 1da2149..0000000 --- a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/CartApplication.java +++ /dev/null @@ -1,22 +0,0 @@ -package quick.pager.shop.cart; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.openfeign.EnableFeignClients; - -/** - * @author siguiyang - */ -@SpringBootApplication(scanBasePackages = "quick.pager.shop") -@EnableDiscoveryClient -@EnableCircuitBreaker -@EnableFeignClients("quick.pager.shop") -public class CartApplication { - - public static void main(String[] args) { - SpringApplication.run(CartApplication.class, args); - } -} - diff --git a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/controller/CartController.java b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/controller/CartController.java deleted file mode 100644 index f8f42ad..0000000 --- a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/controller/CartController.java +++ /dev/null @@ -1,58 +0,0 @@ -package quick.pager.shop.cart.controller; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import quick.pager.shop.cart.service.CartService; -import quick.pager.shop.constants.ConstantsClient; -import quick.pager.shop.response.Response; - -/** - * 购物车 - * - * @author siguiyang - */ -@RestController -@RequestMapping(ConstantsClient.CART) -public class CartController { - - @Autowired - private CartService cartService; - - /** - * 用户购物车列表 - * - * @param userId 用户主键 - * @param page 页码 - */ - @PostMapping("/app/user/{userId}/{page}/list") - public Response list(@PathVariable("userId") Long userId, @PathVariable("page") Integer page) { - - return null; - } - - /** - * 添加购物车 - * - * @return - */ - @PostMapping("/app/user/add") - public Response add(@PathVariable("userId") Long userId, @PathVariable("skuId") Long skuId) { - - return null; - } - - /** - * 删除购物车 - * - * @return - */ - @PostMapping("/app/user/delete") - public Response delete() { - - return null; - } - -} diff --git a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/service/CartService.java b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/service/CartService.java deleted file mode 100644 index 9458353..0000000 --- a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/service/CartService.java +++ /dev/null @@ -1,9 +0,0 @@ -package quick.pager.shop.cart.service; - -/** - * 购物车 - * - * @author siguiyang - */ -public interface CartService { -} diff --git a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/service/impl/CartServiceImpl.java b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/service/impl/CartServiceImpl.java deleted file mode 100644 index 2f107f2..0000000 --- a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/service/impl/CartServiceImpl.java +++ /dev/null @@ -1,13 +0,0 @@ -package quick.pager.shop.cart.service.impl; - -import org.springframework.stereotype.Service; -import quick.pager.shop.cart.service.CartService; - -/** - * CartServiceImpl - * - * @author siguiyang - */ -@Service -public class CartServiceImpl implements CartService { -} diff --git a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/service/package-info.java b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/service/package-info.java deleted file mode 100644 index 7d4fc31..0000000 --- a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/service/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package quick.pager.shop.cart.service; diff --git a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/controller/CartController.java b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/controller/CartController.java new file mode 100644 index 0000000..253ac34 --- /dev/null +++ b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/controller/CartController.java @@ -0,0 +1,64 @@ +package quick.pager.shop.controller; + +import java.util.List; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import quick.pager.shop.param.CartParam; +import quick.pager.shop.cart.response.GoodsCartResponse; +import quick.pager.shop.service.CartService; +import quick.pager.shop.constants.ConstantsClient; +import quick.pager.shop.constants.ResponseStatus; +import quick.pager.shop.user.response.Response; + +/** + * 购物车 + * + * @author siguiyang + */ +@RestController +@RequestMapping(ConstantsClient.CART) +public class CartController { + + @Autowired + private CartService cartService; + + /** + * 用户购物车列表 + * + * @param userId 用户主键 + * @param page 页码 + */ + @PostMapping("/app/user/{userId}/{page}/list") + public Response> list(@PathVariable("userId") Long userId, @PathVariable("page") Integer page) { + + return cartService.list(userId, page); + } + + /** + * 添加购物车 + */ + @PostMapping("/app/user/add") + public Response add(@RequestBody CartParam param) { + + return cartService.add(param); + } + + /** + * 删除购物车 + */ + @PostMapping("/app/user/delete") + public Response delete(@RequestBody CartParam param) { + + if (CollectionUtils.isEmpty(param.getIds())) { + return new Response<>(ResponseStatus.Code.FAIL_CODE, ResponseStatus.PARAMS_EXCEPTION); + } + + return cartService.delete(param.getIds()); + } + +} diff --git a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/mapper/GoodsCartMapper.java b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/mapper/GoodsCartMapper.java similarity index 72% rename from shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/mapper/GoodsCartMapper.java rename to shop-cart/shop-cart-api/src/main/java/quick/pager/shop/mapper/GoodsCartMapper.java index 915346a..0a5c46f 100644 --- a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/mapper/GoodsCartMapper.java +++ b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/mapper/GoodsCartMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.cart.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.cart.model.GoodsCart; +import quick.pager.shop.model.GoodsCart; /** * 购物车 diff --git a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/mapper/OrderCartMapper.java b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/mapper/OrderCartMapper.java similarity index 73% rename from shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/mapper/OrderCartMapper.java rename to shop-cart/shop-cart-api/src/main/java/quick/pager/shop/mapper/OrderCartMapper.java index 40bdea7..ad5d165 100644 --- a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/mapper/OrderCartMapper.java +++ b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/mapper/OrderCartMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.cart.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.cart.model.OrderCart; +import quick.pager.shop.model.OrderCart; /** * OrderCartMapper diff --git a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/model/GoodsCart.java b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/model/GoodsCart.java similarity index 89% rename from shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/model/GoodsCart.java rename to shop-cart/shop-cart-api/src/main/java/quick/pager/shop/model/GoodsCart.java index 7683183..9c255f9 100644 --- a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/model/GoodsCart.java +++ b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/model/GoodsCart.java @@ -1,9 +1,8 @@ -package quick.pager.shop.cart.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.model.Model; /** *

用户添加购物车

diff --git a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/model/OrderCart.java b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/model/OrderCart.java similarity index 92% rename from shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/model/OrderCart.java rename to shop-cart/shop-cart-api/src/main/java/quick/pager/shop/model/OrderCart.java index 5813158..3ad981c 100644 --- a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/cart/model/OrderCart.java +++ b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/model/OrderCart.java @@ -1,9 +1,8 @@ -package quick.pager.shop.cart.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.model.Model; /** *

购买商品生成的购物车

diff --git a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/param/CartParam.java b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/param/CartParam.java new file mode 100644 index 0000000..349c7c8 --- /dev/null +++ b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/param/CartParam.java @@ -0,0 +1,41 @@ +package quick.pager.shop.param; + +import java.util.List; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 购物车 + * + * @author siguiyang + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class CartParam extends Param { + private static final long serialVersionUID = -8307353865247178933L; + + /** + * 当前购物车的主键 + */ + private Long id; + /** + * 购物车主键集 + */ + private List ids; + /** + * 当前登陆人主键 + */ + private Long userId; + /** + * 商户主键 + */ + private Long sellerId; + /** + * 购买商品的主键 + */ + private Long skuId; + /** + * 购买商品的数量 + */ + private Integer quantity; +} diff --git a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/service/CartService.java b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/service/CartService.java new file mode 100644 index 0000000..77b1a19 --- /dev/null +++ b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/service/CartService.java @@ -0,0 +1,43 @@ +package quick.pager.shop.service; + +import java.util.List; +import quick.pager.shop.param.CartParam; +import quick.pager.shop.cart.response.GoodsCartResponse; +import quick.pager.shop.user.response.Response; + +/** + * 购物车 + * + * @author siguiyang + */ +public interface CartService { + /** + * 购物车列表 + * + * @param userId 当前登陆人主键 + * @param page 页码 + */ + Response> list(final Long userId, final Integer page); + + /** + * 添加修改购物车 + * 1. 商品未添加购物车时，直接生产购物车数据 + * 2. 商品已添加购物车时 + * 添加相同的商品，修改购物车的数量 + * 3. 减少购物车购买的数量 + * 购物车数量减少 + *

+ * 针对商品数量时，前端传入的数量值为最新的购买数量 + *

+ * + * @param param 参数 + */ + Response add(final CartParam param); + + /** + * 删除购物车 + * + * @param ids 购物车主键集 + */ + Response delete(final List ids); +} diff --git a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/service/impl/CartServiceImpl.java b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/service/impl/CartServiceImpl.java new file mode 100644 index 0000000..4de4441 --- /dev/null +++ b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/service/impl/CartServiceImpl.java @@ -0,0 +1,160 @@ +package quick.pager.shop.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.google.common.collect.Lists; +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import quick.pager.shop.mapper.GoodsCartMapper; +import quick.pager.shop.model.GoodsCart; +import quick.pager.shop.param.CartParam; +import quick.pager.shop.cart.response.GoodsCartDetailResponse; +import quick.pager.shop.cart.response.GoodsCartResponse; +import quick.pager.shop.service.CartService; +import quick.pager.shop.constants.IConsts; +import quick.pager.shop.constants.ResponseStatus; +import quick.pager.shop.goods.client.GoodsSkuClient; +import quick.pager.shop.goods.request.sku.GoodsSkuOtherRequest; +import quick.pager.shop.goods.response.sku.GoodsSkuResponse; +import quick.pager.shop.model.ImageModel; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.seller.client.SellerClient; +import quick.pager.shop.response.SellerInfoResponse; +import quick.pager.shop.utils.DateUtils; + +/** + * CartServiceImpl + * + * @author siguiyang + */ +@Service +public class CartServiceImpl implements CartService { + + @Autowired + private GoodsCartMapper goodsCartMapper; + @Autowired + private SellerClient sellerClient; + @Autowired + private GoodsSkuClient goodsSkuClient; + + @Override + public Response> list(final Long userId, final Integer page) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(GoodsCart::getDeleteStatus, Boolean.FALSE) + .eq(GoodsCart::getUserId, userId); + + Integer total = goodsCartMapper.selectCount(wrapper); + + List result = Lists.newArrayList(); + + if (total > IConsts.ZERO) { + List goodsCarts = goodsCartMapper.selectPage(new Page<>(page, IConsts.TEN, Boolean.FALSE), wrapper).getRecords(); + + Map> listMap = goodsCarts.stream().collect(Collectors.groupingBy(GoodsCart::getSellerId)); + + listMap.forEach((k, v) -> { + GoodsCartResponse goodsCart = new GoodsCartResponse(); + goodsCart.setId(k); + // 1. 处理商户 + Response sellerInfoResp = sellerClient.querySeller(k); + if (ResponseStatus.Code.SUCCESS == sellerInfoResp.getCode()) { + goodsCart.setName(sellerInfoResp.getData().getSellerName()); + goodsCart.setLogo(sellerInfoResp.getData().getLogo()); + } + // 2. 处理购物车商品 + List skuIds = v.stream().map(GoodsCart::getSkuId).collect(Collectors.toList()); + GoodsSkuOtherRequest skuOtherReq = new GoodsSkuOtherRequest(); + skuOtherReq.setIds(skuIds); + Response> skuOtherRes = goodsSkuClient.queryList(skuOtherReq); + if (ResponseStatus.Code.SUCCESS == skuOtherRes.getCode()) { + goodsCart.setDetails(skuOtherRes.getData().stream().map(item -> { + GoodsCartDetailResponse goodsCartDetail = new GoodsCartDetailResponse(); + goodsCartDetail.setSkuId(item.getId()); + goodsCartDetail.setSkuName(item.getSkuName()); + item.getImages().stream() + .filter(ImageModel::getMaster) + .findFirst() + .ifPresent(it -> goodsCartDetail.setSkuLogo(it.getUrl())); + + v.stream() + .filter(it -> IConsts.ZERO == item.getId().compareTo(it.getSkuId())) + .findFirst() + .ifPresent(it -> { + goodsCartDetail.setQuantity(it.getQuantity()); + goodsCartDetail.setGoodsCartId(it.getId()); + goodsCartDetail.setSkuAmount(item.getSkuAmount().multiply(new BigDecimal(it.getQuantity()))); + }); + return goodsCartDetail; + }).collect(Collectors.toList())); + } + }); + } + + return Response.toResponse(result, total); + } + + @Override + public Response add(final CartParam param) { + + final Long id = param.getId(); + final Long skuId = param.getSkuId(); + final Integer quantity = param.getQuantity(); + final Long userId = param.getUserId(); + final Long sellerId = param.getSellerId(); + + // 购物车的主键不存在，则认为是新增的购物车条目 + // 有一种情况，是在商品详情页时，重复添加购物车，此时前端获取不到购物车的主键 + // 则，后端需要重新处理 + if (Objects.isNull(id)) { + + List goodsCarts = goodsCartMapper.selectList(new LambdaQueryWrapper() + .eq(GoodsCart::getDeleteStatus, Boolean.FALSE) + .eq(GoodsCart::getUserId, userId) + .eq(GoodsCart::getSkuId, skuId)); + if (CollectionUtils.isEmpty(goodsCarts)) { + GoodsCart goodsCart = new GoodsCart(); + goodsCart.setUserId(userId); + goodsCart.setSkuId(skuId); + goodsCart.setQuantity(quantity); + goodsCart.setSellerId(sellerId); + goodsCart.setUpdateTime(DateUtils.dateTime()); + goodsCart.setCreateTime(DateUtils.dateTime()); + goodsCart.setDeleteStatus(Boolean.FALSE); + goodsCartMapper.insert(goodsCart); + } else { + // 此时这种情况，需要更新购物车的数量 + goodsCarts.forEach(goodsCart -> { + GoodsCart updateGoodsCart = new GoodsCart(); + updateGoodsCart.setId(goodsCart.getId()); + updateGoodsCart.setQuantity(quantity + goodsCart.getQuantity()); + updateGoodsCart.setUpdateTime(DateUtils.dateTime()); + goodsCartMapper.updateById(goodsCart); + }); + } + } else { + GoodsCart goodsCart = new GoodsCart(); + goodsCart.setId(id); + goodsCart.setQuantity(quantity); + goodsCart.setUpdateTime(DateUtils.dateTime()); + goodsCartMapper.updateById(goodsCart); + } + + return new Response<>(); + } + + @Override + public Response delete(final List ids) { + + GoodsCart goodsCart = new GoodsCart(); + goodsCart.setDeleteStatus(Boolean.TRUE); + goodsCart.setUpdateTime(DateUtils.dateTime()); + goodsCartMapper.update(goodsCart, new LambdaQueryWrapper().in(GoodsCart::getId, ids)); + return Response.toResponse("删除成功"); + } +} diff --git a/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/service/package-info.java b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/service/package-info.java new file mode 100644 index 0000000..a664e9d --- /dev/null +++ b/shop-cart/shop-cart-api/src/main/java/quick/pager/shop/service/package-info.java @@ -0,0 +1 @@ +package quick.pager.shop.service; diff --git a/shop-cart/shop-cart-api/src/main/resources/bootstrap-dev.yml b/shop-cart/shop-cart-api/src/main/resources/bootstrap-dev.yml index 2606de0..fc61506 100644 --- a/shop-cart/shop-cart-api/src/main/resources/bootstrap-dev.yml +++ b/shop-cart/shop-cart-api/src/main/resources/bootstrap-dev.yml @@ -3,13 +3,26 @@ spring: nacos: config: server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d discovery: server-addr: 101.132.121.178:8848 -# ip: 101.132.121.178 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d sentinel: enabled: true transport: - dashboard: http://localhost:9999 + dashboard: 127.0.0.1:8080 + filter: + enabled: true + +seata: + service: + vgroup-mapping: + shop-cart-seata-service-group: default + grouplist: + default: 101.132.121.178:8091 + disable-global-transaction: false # 内部服务调用授权认证配置 security: diff --git a/shop-cart/shop-cart-api/src/main/resources/bootstrap.yml b/shop-cart/shop-cart-api/src/main/resources/bootstrap.yml index 1e30fa4..2e6bd07 100644 --- a/shop-cart/shop-cart-api/src/main/resources/bootstrap.yml +++ b/shop-cart/shop-cart-api/src/main/resources/bootstrap.yml @@ -3,11 +3,13 @@ server: spring: application: - name: shop-goods + name: shop-cart main: allow-bean-definition-overriding: true profiles: active: dev + autoconfigure: + exclude: org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration feign: sentinel: enabled: true @@ -20,14 +22,17 @@ management: endpoints: web: exposure: - include: refresh,health,info, + include: refresh,health,info + mybatis-plus: - type-aliases-package: quick.pager.shop.model.goods + type-aliases-package: quick.pager.shop.model configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl global-config: db-config: id-type: auto + logging: level: com.alibaba.nacos: error + config: classpath:logback-spring.xml diff --git a/shop-cart/shop-cart-api/src/main/resources/logback-spring.xml b/shop-cart/shop-cart-api/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..0188566 --- /dev/null +++ b/shop-cart/shop-cart-api/src/main/resources/logback-spring.xml @@ -0,0 +1,167 @@ + + + + + + + + shop-cart + + + + + + + + + + + + + + + + + info + + + ${CONSOLE_LOG_PATTERN} + + UTF-8 + + + + + + + + + + ${log.path}/log_debug.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/debug/log-debug-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + debug + ACCEPT + DENY + + + + + + + ${log.path}/log_info.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/info/log-info-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + info + ACCEPT + DENY + + + + + + + ${log.path}/log_warn.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/warn/log-warn-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + warn + ACCEPT + DENY + + + + + + + + ${log.path}/log_error.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/error/log-error-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + ERROR + ACCEPT + DENY + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shop-cart/shop-cart-client/pom.xml b/shop-cart/shop-cart-client/pom.xml index ab8bad8..773d47f 100644 --- a/shop-cart/shop-cart-client/pom.xml +++ b/shop-cart/shop-cart-client/pom.xml @@ -24,17 +24,9 @@ provided - - org.springframework.cloud - spring-cloud-starter-netflix-ribbon - 2.1.0.RELEASE - provided - - org.springframework.cloud spring-cloud-starter-openfeign - 2.1.0.RELEASE provided @@ -43,12 +35,6 @@ shop-cart-model ${project.version} - - - quick.pager - shop-common - ${project.version} - diff --git a/shop-cart/shop-cart-model/pom.xml b/shop-cart/shop-cart-model/pom.xml index f12c664..6770c07 100644 --- a/shop-cart/shop-cart-model/pom.xml +++ b/shop-cart/shop-cart-model/pom.xml @@ -12,16 +12,45 @@ shop-cart-model - - org.projectlombok - lombok - - quick.pager shop-common ${project.version} + + + com.alibaba + easyexcel + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + UTF-8 + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + + jar + + + + + + + diff --git a/shop-cart/shop-cart-model/src/main/java/quick/pager/shop/cart/enums/CartOptEnums.java b/shop-cart/shop-cart-model/src/main/java/quick/pager/shop/cart/enums/CartOptEnums.java new file mode 100644 index 0000000..bc99868 --- /dev/null +++ b/shop-cart/shop-cart-model/src/main/java/quick/pager/shop/cart/enums/CartOptEnums.java @@ -0,0 +1,28 @@ +package quick.pager.shop.cart.enums; + +import quick.pager.shop.enums.IEnum; + +public enum CartOptEnums implements IEnum { + + ADD("ADD", "添加购物车"), + MODIFY("MODIFY", "修改购物车"); + + private String code; + + private String desc; + + CartOptEnums(String code, String desc) { + this.code = code; + this.desc = desc; + } + + @Override + public String getCode() { + return this.code; + } + + @Override + public String getDesc() { + return this.desc; + } +} diff --git a/shop-cart/shop-cart-model/src/main/java/quick/pager/shop/cart/response/GoodsCartDetailResponse.java b/shop-cart/shop-cart-model/src/main/java/quick/pager/shop/cart/response/GoodsCartDetailResponse.java new file mode 100644 index 0000000..59f1c3f --- /dev/null +++ b/shop-cart/shop-cart-model/src/main/java/quick/pager/shop/cart/response/GoodsCartDetailResponse.java @@ -0,0 +1,42 @@ +package quick.pager.shop.cart.response; + +import java.io.Serializable; +import java.math.BigDecimal; +import lombok.Data; + +/** + * 购物车条目 + * + * @author siguiyang + */ +@Data +public class GoodsCartDetailResponse implements Serializable { + private static final long serialVersionUID = -1499723444581929834L; + + /** + * 商品sku主键 + */ + private Long skuId; + /** + * 购物车主键 + */ + private Long goodsCartId; + /** + * 商品名称 + */ + private String skuName; + /** + * 商品图片名称 + */ + private String skuLogo; + /** + * 购买数量 + */ + private Integer quantity; + /** + * 商品名称 + */ + private BigDecimal skuAmount; + + +} diff --git a/shop-cart/shop-cart-model/src/main/java/quick/pager/shop/cart/response/GoodsCartResponse.java b/shop-cart/shop-cart-model/src/main/java/quick/pager/shop/cart/response/GoodsCartResponse.java new file mode 100644 index 0000000..8f25f5f --- /dev/null +++ b/shop-cart/shop-cart-model/src/main/java/quick/pager/shop/cart/response/GoodsCartResponse.java @@ -0,0 +1,32 @@ +package quick.pager.shop.cart.response; + +import java.io.Serializable; +import java.util.List; +import lombok.Data; + +/** + * 购物车列表 + * + * @author siguiyang + */ +@Data +public class GoodsCartResponse implements Serializable { + private static final long serialVersionUID = 1660182360445628070L; + + /** + * 商户主键 + */ + private Long id; + /** + * 商户名称 + */ + private String name; + /** + * 商户Logo + */ + private String logo; + /** + * 购物车商品条目 + */ + private List details; +} diff --git a/shop-common/pom.xml b/shop-common/pom.xml index 4bb3ea8..f29d47b 100644 --- a/shop-common/pom.xml +++ b/shop-common/pom.xml @@ -29,10 +29,10 @@ hutool-all - - redis.clients - jedis - + + + + io.github.openfeign @@ -75,14 +75,8 @@ - org.apache.poi - poi-ooxml - - - commons-codec - commons-codec - - + com.alibaba + easyexcel @@ -94,6 +88,10 @@ commons-beanutils commons-beanutils + + org.apache.commons + commons-lang3 + com.baomidou mybatis-plus-core @@ -150,6 +148,19 @@ UTF-8 + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + + jar + + + + diff --git a/shop-common/src/main/java/quick/pager/shop/constants/SConsts.java b/shop-common/src/main/java/quick/pager/shop/constants/SConsts.java new file mode 100644 index 0000000..61fd0b3 --- /dev/null +++ b/shop-common/src/main/java/quick/pager/shop/constants/SConsts.java @@ -0,0 +1,60 @@ +package quick.pager.shop.constants; + +/** + * 通用全局字符串常量 + */ +public interface SConsts { + + /** + * 字符串 0 + */ + String ZERO = "0"; + /** + * 字符串 1 + */ + String ONE = "1"; + /** + * 字符串 2 + */ + String TWO = "2"; + /** + * 字符串 3 + */ + String THREE = "3"; + /** + * 字符串 4 + */ + String FOUR = "4"; + /** + * 字符串 5 + */ + String FIVE = "5"; + /** + * 字符串 6 + */ + String SIX = "6"; + /** + * 字符串 7 + */ + String SEVEN = "7"; + /** + * 字符串 8 + */ + String EIGHT = "8"; + /** + * 字符串 9 + */ + String NINE = "9"; + /** + * 字符串 10 + */ + String TEN = "10"; + /** + * 英文逗号 + */ + String EN_COMMA = ","; + /** + * 空字符 + */ + String EMPTY = ""; +} diff --git a/shop-common/src/main/java/quick/pager/shop/enums/SortEnums.java b/shop-common/src/main/java/quick/pager/shop/enums/SortEnums.java new file mode 100644 index 0000000..5de41a7 --- /dev/null +++ b/shop-common/src/main/java/quick/pager/shop/enums/SortEnums.java @@ -0,0 +1,30 @@ +package quick.pager.shop.enums; + +/** + * 通用排序枚举 + * + * @author siguiyang + * @version 3.0.0 + */ +public enum SortEnums implements IEnum { + DESC("DESC", "倒序"), + AES("AES", "升序"); + private String code; + + private String desc; + + SortEnums(String code, String desc) { + this.code = code; + this.desc = desc; + } + + @Override + public String getCode() { + return this.code; + } + + @Override + public String getDesc() { + return this.desc; + } +} diff --git a/shop-common/src/main/java/quick/pager/shop/exception/ShopAdvice.java b/shop-common/src/main/java/quick/pager/shop/exception/ShopAdvice.java new file mode 100644 index 0000000..bbfd8f6 --- /dev/null +++ b/shop-common/src/main/java/quick/pager/shop/exception/ShopAdvice.java @@ -0,0 +1,25 @@ +package quick.pager.shop.exception; + +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import quick.pager.shop.constants.ResponseStatus; +import quick.pager.shop.user.response.Response; + +/** + * 统一异常处理 + * + * @author siguiyang + */ +@RestControllerAdvice +public class ShopAdvice { + + @ExceptionHandler + public Response doException(Exception e) { + + if (e instanceof ShopException) { + return new Response<>(((ShopException) e).getCode(), e.getMessage()); + } + + return new Response<>(ResponseStatus.Code.FAIL_CODE, ResponseStatus.TELNET_EXCEPTION); + } +} diff --git a/shop-common/src/main/java/quick/pager/shop/exception/ShopException.java b/shop-common/src/main/java/quick/pager/shop/exception/ShopException.java new file mode 100644 index 0000000..55fb55d --- /dev/null +++ b/shop-common/src/main/java/quick/pager/shop/exception/ShopException.java @@ -0,0 +1,31 @@ +package quick.pager.shop.exception; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 通用异常返回 + * + * @author siguiyang + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class ShopException extends RuntimeException { + + private static final long serialVersionUID = 7562952216658710834L; + + private int code; + + private String message; + + public ShopException(int code, String message) { + this.code = code; + this.message = message; + } + + public ShopException(String message, int code) { + super(message); + this.code = code; + this.message = message; + } +} diff --git a/shop-common/src/main/java/quick/pager/shop/handler/IHandler.java b/shop-common/src/main/java/quick/pager/shop/handler/IHandler.java index 3eb13fe..6584a91 100644 --- a/shop-common/src/main/java/quick/pager/shop/handler/IHandler.java +++ b/shop-common/src/main/java/quick/pager/shop/handler/IHandler.java @@ -1,6 +1,6 @@ package quick.pager.shop.handler; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 策略模式顶级接口 diff --git a/shop-common/src/main/java/quick/pager/shop/model/ImageModel.java b/shop-common/src/main/java/quick/pager/shop/model/ImageModel.java index be7feef..f612e49 100644 --- a/shop-common/src/main/java/quick/pager/shop/model/ImageModel.java +++ b/shop-common/src/main/java/quick/pager/shop/model/ImageModel.java @@ -20,4 +20,8 @@ public class ImageModel implements Serializable { * 图片名称 */ private String name; + /** + * 主图是true，反之亦然 + */ + private Boolean master; } diff --git a/shop-common/src/main/java/quick/pager/shop/service/IService.java b/shop-common/src/main/java/quick/pager/shop/service/IService.java index 657313b..8c76cbc 100644 --- a/shop-common/src/main/java/quick/pager/shop/service/IService.java +++ b/shop-common/src/main/java/quick/pager/shop/service/IService.java @@ -8,7 +8,7 @@ import java.io.Serializable; import java.util.Collections; import java.util.List; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 服务层基础接口
diff --git a/shop-common/src/main/java/quick/pager/shop/request/PageRequest.java b/shop-common/src/main/java/quick/pager/shop/user/request/PageRequest.java similarity index 72% rename from shop-common/src/main/java/quick/pager/shop/request/PageRequest.java rename to shop-common/src/main/java/quick/pager/shop/user/request/PageRequest.java index 259dd89..05627df 100644 --- a/shop-common/src/main/java/quick/pager/shop/request/PageRequest.java +++ b/shop-common/src/main/java/quick/pager/shop/user/request/PageRequest.java @@ -1,7 +1,8 @@ -package quick.pager.shop.request; +package quick.pager.shop.user.request; import lombok.Data; import lombok.EqualsAndHashCode; +import quick.pager.shop.enums.SortEnums; /** * @author siguiyang @@ -19,4 +20,8 @@ public class PageRequest extends Request { * 页码 */ private Integer page = 1; + /** + * 排序枚举 + */ + private SortEnums sort; } diff --git a/shop-common/src/main/java/quick/pager/shop/request/Request.java b/shop-common/src/main/java/quick/pager/shop/user/request/Request.java similarity index 81% rename from shop-common/src/main/java/quick/pager/shop/request/Request.java rename to shop-common/src/main/java/quick/pager/shop/user/request/Request.java index 55441f4..c29e315 100644 --- a/shop-common/src/main/java/quick/pager/shop/request/Request.java +++ b/shop-common/src/main/java/quick/pager/shop/user/request/Request.java @@ -1,4 +1,4 @@ -package quick.pager.shop.request; +package quick.pager.shop.user.request; import com.fasterxml.jackson.annotation.JsonProperty; import java.time.LocalDateTime; @@ -19,14 +19,6 @@ public class Request implements Serializable { * 主键 */ private Long id; - /** - * 手机号 - */ - private String phone; - /** - * 操作事件 - */ - private String event; /** * 创建人 */ @@ -53,6 +45,4 @@ public class Request implements Serializable { @JsonProperty("access_token") private String accessToken; - private Boolean serverStatus; - } diff --git a/shop-common/src/main/java/quick/pager/shop/response/BasicResponse.java b/shop-common/src/main/java/quick/pager/shop/user/response/BasicResponse.java similarity index 93% rename from shop-common/src/main/java/quick/pager/shop/response/BasicResponse.java rename to shop-common/src/main/java/quick/pager/shop/user/response/BasicResponse.java index 6512fa5..2e28fba 100644 --- a/shop-common/src/main/java/quick/pager/shop/response/BasicResponse.java +++ b/shop-common/src/main/java/quick/pager/shop/user/response/BasicResponse.java @@ -1,4 +1,4 @@ -package quick.pager.shop.response; +package quick.pager.shop.user.response; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/shop-common/src/main/java/quick/pager/shop/user/response/CommonResponse.java b/shop-common/src/main/java/quick/pager/shop/user/response/CommonResponse.java new file mode 100644 index 0000000..aa5884f --- /dev/null +++ b/shop-common/src/main/java/quick/pager/shop/user/response/CommonResponse.java @@ -0,0 +1,27 @@ +package quick.pager.shop.user.response; + +import java.io.Serializable; +import lombok.Data; + +/** + * 通用响应对象 + * + * @author siguiyang + */ +@Data +public class CommonResponse implements Serializable { + private static final long serialVersionUID = 4795023687882738889L; + + /** + * 主键 + */ + private Long id; + /** + * 名称 + */ + private String name; + /** + * 图标 + */ + private String icon; +} diff --git a/shop-common/src/main/java/quick/pager/shop/response/Response.java b/shop-common/src/main/java/quick/pager/shop/user/response/Response.java similarity index 96% rename from shop-common/src/main/java/quick/pager/shop/response/Response.java rename to shop-common/src/main/java/quick/pager/shop/user/response/Response.java index a16485f..d01dab5 100644 --- a/shop-common/src/main/java/quick/pager/shop/response/Response.java +++ b/shop-common/src/main/java/quick/pager/shop/user/response/Response.java @@ -1,4 +1,4 @@ -package quick.pager.shop.response; +package quick.pager.shop.user.response; import java.util.List; import lombok.Data; diff --git a/shop-common/src/main/java/quick/pager/shop/response/TreeResponse.java b/shop-common/src/main/java/quick/pager/shop/user/response/TreeResponse.java similarity index 93% rename from shop-common/src/main/java/quick/pager/shop/response/TreeResponse.java rename to shop-common/src/main/java/quick/pager/shop/user/response/TreeResponse.java index 302b2c6..dd92f7d 100644 --- a/shop-common/src/main/java/quick/pager/shop/response/TreeResponse.java +++ b/shop-common/src/main/java/quick/pager/shop/user/response/TreeResponse.java @@ -1,4 +1,4 @@ -package quick.pager.shop.response; +package quick.pager.shop.user.response; import java.io.Serializable; import java.util.List; diff --git a/shop-common/src/main/resources/META-INF/spring.factories b/shop-common/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..63ccac4 --- /dev/null +++ b/shop-common/src/main/resources/META-INF/spring.factories @@ -0,0 +1,5 @@ +# Auto Configure +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +quick.pager.shop.configuration.ApplicationConfiguration,\ +quick.pager.shop.configuration.ObjectMapperConfiguration,\ +quick.pager.shop.configuration.PaginationInterceptorConfiguration diff --git a/shop-dependencies/pom.xml b/shop-dependencies/pom.xml index 981fd75..c260627 100644 --- a/shop-dependencies/pom.xml +++ b/shop-dependencies/pom.xml @@ -13,31 +13,34 @@ Spring Cloud Shop Dependencies - cloud-1.0 + 1.0 4.12 4.1.14 - 3.17 + 2.2.6 2.11.0 1.2.47 20.0 7.2.11 - 1.1.10 0.1.4 4.5.5 - 3.8.1 + 3.14.7 3.4.6 - 1.18.4 - 2.9.1 - Greenwich.RELEASE - 2.1.0.RELEASE - 2.1.2.RELEASE - 2.9.2 + 1.18.12 + 2.2.1.RELEASE + 2.2.9.RELEASE + 2.2.2.RELEASE + 2.2.2.RELEASE + 2.2.2.RELEASE + 2.2.2.RELEASE + 2.2.2.RELEASE + Horsham.SR3 1.3.2 - 3.1.0 - 1.1.10 + 3.3.0 + 1.1.23 3.2.10 2.8.5 1.9.3 + 1.0.0 @@ -45,12 +48,52 @@ org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} + spring-cloud-commons-dependencies + ${spring-cloud-commons.version} pom import + + org.springframework.cloud + spring-cloud-netflix-dependencies + ${spring-cloud-netflix.version} + pom + import + + + + org.springframework.cloud + spring-cloud-openfeign-dependencies + ${spring-cloud-openfeign.version} + pom + import + + + + org.springframework.cloud + spring-cloud-bus-dependencies + ${spring-cloud-bus.version} + pom + import + + + + org.springframework.cloud + spring-cloud-gateway-dependencies + ${spring-cloud-gateway.version} + pom + import + + + + + + + + + + org.springframework.boot spring-boot-dependencies @@ -62,7 +105,16 @@ com.alibaba.cloud spring-cloud-alibaba-dependencies - 2.1.0.RELEASE + ${spring-cloud.alibaba} + pom + import + + + + + com.alibaba.cloud + aliyun-spring-boot-dependencies + ${aliyun.version} pom import @@ -111,15 +163,15 @@ - cn.hutool - hutool-all - ${hutool.version} + com.alibaba + easyexcel + ${easyexcel.version} - org.apache.poi - poi-ooxml - ${poi.version} + cn.hutool + hutool-all + ${hutool.version} @@ -128,12 +180,6 @@ ${xerces.version} - - redis.clients - jedis - ${redis.version} - - com.alibaba druid-spring-boot-starter @@ -175,6 +221,7 @@ okhttp ${okhttp.version} + com.qiniu happy-dns-java diff --git a/shop-gateway/pom.xml b/shop-gateway/pom.xml index d9d2fa1..0b7a81e 100644 --- a/shop-gateway/pom.xml +++ b/shop-gateway/pom.xml @@ -39,19 +39,14 @@ spring-boot-starter-actuator - - org.springframework.cloud - spring-cloud-starter-netflix-hystrix - - com.alibaba.cloud - spring-cloud-alibaba-nacos-config + spring-cloud-starter-alibaba-nacos-config com.alibaba.cloud - spring-cloud-alibaba-nacos-discovery + spring-cloud-starter-alibaba-nacos-discovery @@ -59,11 +54,6 @@ spring-boot-starter-data-redis-reactive - - redis.clients - jedis - - org.jetbrains annotations @@ -75,6 +65,10 @@ gson + + org.projectlombok + lombok + @@ -82,7 +76,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.1.2.RELEASE + 2.2.9.RELEASE package diff --git a/shop-gateway/src/main/java/quick/pager/shop/configuration/FilterConfiguration.java b/shop-gateway/src/main/java/quick/pager/shop/configuration/FilterConfiguration.java deleted file mode 100644 index 5f77c38..0000000 --- a/shop-gateway/src/main/java/quick/pager/shop/configuration/FilterConfiguration.java +++ /dev/null @@ -1,14 +0,0 @@ -package quick.pager.shop.configuration; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import quick.pager.shop.filter.LoginFilter; - -@Configuration -public class FilterConfiguration { - - @Bean - public LoginFilter sellerLoginFilter(){ - return new LoginFilter(); - } -} diff --git a/shop-gateway/src/main/java/quick/pager/shop/filter/LoginFilter.java b/shop-gateway/src/main/java/quick/pager/shop/filter/LoginFilter.java deleted file mode 100644 index 0ffad43..0000000 --- a/shop-gateway/src/main/java/quick/pager/shop/filter/LoginFilter.java +++ /dev/null @@ -1,84 +0,0 @@ -package quick.pager.shop.filter; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import java.nio.charset.StandardCharsets; -import java.util.Map; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.gateway.filter.GatewayFilter; -import org.springframework.cloud.gateway.filter.GatewayFilterChain; -import org.springframework.core.Ordered; -import org.springframework.core.io.buffer.DataBuffer; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.http.HttpMethod; -import org.springframework.http.HttpStatus; -import org.springframework.http.server.reactive.ServerHttpRequest; -import org.springframework.http.server.reactive.ServerHttpResponse; -import org.springframework.util.StringUtils; -import org.springframework.web.server.ServerWebExchange; -import quick.pager.shop.utils.WebUtils; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - -/** - * APP是否登陆 - * 拦截过滤器 - * - * @author siguiyang - */ -public class LoginFilter implements GatewayFilter, Ordered { - - @Autowired - private RedisTemplate redisTemplate; - - @Override - public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { - - ServerHttpRequest request = exchange.getRequest(); - // Seller APP 登陆时的token - String token = WebUtils.getParameter(request, "token"); - // 获取用户Id - String userId = WebUtils.getParameter(request, "userId"); - - // post 请求，从requestBody获取参数 - if (HttpMethod.POST.equals(exchange.getRequest().getMethod())) { - String result = WebUtils.resolveBodyFromRequest(exchange.getRequest()); - Gson gson = new GsonBuilder().create(); - Map map = gson.fromJson(result, Map.class); - if (StringUtils.isEmpty(userId)) { - userId = String.valueOf(map.get("userId")); - } - if (StringUtils.isEmpty(token)) { - token = String.valueOf(map.get("token")); - } - } - - // 获取redis中的token - String redisToken = String.valueOf(redisTemplate.boundValueOps(userId).get()); - - ServerHttpResponse response = exchange.getResponse(); - - // token 为空，userId为空，redisToken为空，token 为 "null"，userId 为 "null"，token与redisToken不相等 - // 这几种情况都是未登陆的，拦截处理 - if (StringUtils.isEmpty(token) - || "null".equals(token) - || StringUtils.isEmpty(userId) - || "null".equals(userId) - || StringUtils.isEmpty(redisToken) - || "null".equals(redisToken) - || !token.equals(redisToken)) { - response.setStatusCode(HttpStatus.OK); - String result = "{\"msg\":\"none login\",\"code\":4000}"; - DataBuffer buffer = exchange.getResponse().bufferFactory().wrap(result.getBytes(StandardCharsets.UTF_8)); - return exchange.getResponse().writeWith(Flux.just(buffer)); - } - - return chain.filter(exchange); - } - - @Override - public int getOrder() { - return -2; - } - -} diff --git a/shop-gateway/src/main/resources/bootstrap-dev.yml b/shop-gateway/src/main/resources/bootstrap-dev.yml index a3752ea..ed3d304 100644 --- a/shop-gateway/src/main/resources/bootstrap-dev.yml +++ b/shop-gateway/src/main/resources/bootstrap-dev.yml @@ -3,5 +3,15 @@ spring: nacos: config: server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d discovery: server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d + sentinel: + enabled: true + transport: + dashboard: 127.0.0.1:8080 + filter: + enabled: true diff --git a/shop-goods/pom.xml b/shop-goods/pom.xml index c5d5f58..997650c 100644 --- a/shop-goods/pom.xml +++ b/shop-goods/pom.xml @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - shop-goods-client shop-goods-api + shop-goods-client shop-goods-model diff --git a/shop-goods/shop-goods-api/pom.xml b/shop-goods/shop-goods-api/pom.xml index 7f9944c..bdb1e58 100644 --- a/shop-goods/shop-goods-api/pom.xml +++ b/shop-goods/shop-goods-api/pom.xml @@ -18,42 +18,36 @@ - + com.alibaba.cloud - spring-cloud-alibaba-nacos-config + spring-cloud-starter-alibaba-nacos-config com.alibaba.cloud - spring-cloud-alibaba-nacos-discovery + spring-cloud-starter-alibaba-nacos-discovery com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - - org.springframework.cloud - spring-cloud-starter-stream-kafka + spring-cloud-starter-alibaba-seata - org.springframework.cloud - spring-cloud-starter-sleuth + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + org.springframework.cloud - spring-cloud-sleuth-zipkin + spring-cloud-starter-openfeign + + org.springframework.boot spring-boot-starter-web @@ -61,31 +55,21 @@ org.springframework.boot - spring-boot-starter-actuator + spring-boot-starter-data-redis org.springframework.boot - spring-boot-starter-data-redis + spring-boot-starter-actuator org.springframework.data spring-data-elasticsearch + - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - 2.1.2.RELEASE - - - - org.springframework.boot - spring-boot-starter-test - test - - + com.baomidou mybatis-plus-boot-starter @@ -95,40 +79,21 @@ mysql mysql-connector-java + - - redis.clients - jedis - - - - quick.pager - shop-auth-resource - ${project.version} - - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - - - + quick.pager shop-auth-feign ${project.version} - - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - - quick.pager - shop-common + shop-auth-resource ${project.version} + quick.pager @@ -141,11 +106,6 @@ shop-activity-client ${project.version} - - quick.pager - shop-activity-model - ${project.version} - @@ -153,7 +113,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.1.2.RELEASE + 2.2.9.RELEASE package diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/GoodsApplication.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/GoodsApplication.java new file mode 100644 index 0000000..93cbab4 --- /dev/null +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/GoodsApplication.java @@ -0,0 +1,19 @@ +package quick.pager.shop; + +import org.springframework.boot.SpringApplication; +import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * @author siguiyang + */ +@SpringCloudApplication +@EnableFeignClients +public class GoodsApplication { + + public static void main(String[] args) { + System.setProperty("es.set.netty.runtime.available.processors","false"); + SpringApplication.run(GoodsApplication.class, args); + } +} + diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/constants/GoodsConstants.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/constants/GoodsConstants.java similarity index 88% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/constants/GoodsConstants.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/constants/GoodsConstants.java index 3ececf6..29ea4a7 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/constants/GoodsConstants.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/constants/GoodsConstants.java @@ -1,4 +1,4 @@ -package quick.pager.shop.goods.constants; +package quick.pager.shop.constants; /** * 商品常量 diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsBrandController.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsBrandController.java similarity index 92% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsBrandController.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsBrandController.java index 7db21b1..00385d9 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsBrandController.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsBrandController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.goods.controller; +package quick.pager.shop.controller; import java.util.List; import java.util.Objects; @@ -13,8 +13,8 @@ import quick.pager.shop.goods.request.brand.GoodsBrandPageRequest; import quick.pager.shop.goods.request.brand.GoodsBrandSaveRequest; import quick.pager.shop.goods.response.brand.GoodsBrandResponse; -import quick.pager.shop.goods.service.GoodsBrandService; -import quick.pager.shop.response.Response; +import quick.pager.shop.service.GoodsBrandService; +import quick.pager.shop.user.response.Response; /** * 商品品牌 diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsBrandGroupController.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsBrandGroupController.java similarity index 90% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsBrandGroupController.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsBrandGroupController.java index eead0a7..5bc8b83 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsBrandGroupController.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsBrandGroupController.java @@ -1,22 +1,22 @@ -package quick.pager.shop.goods.controller; +package quick.pager.shop.controller; import java.util.List; import java.util.Objects; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.Constants; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.goods.model.GoodsBrandGroup; import quick.pager.shop.goods.request.brand.GoodsBrandGroupOtherRequest; import quick.pager.shop.goods.request.brand.GoodsBrandGroupPageRequest; import quick.pager.shop.goods.request.brand.GoodsBrandGroupSaveRequest; import quick.pager.shop.goods.response.brand.GoodsBrandGroupResponse; -import quick.pager.shop.goods.service.GoodsBrandGroupService; -import quick.pager.shop.response.Response; +import quick.pager.shop.service.GoodsBrandGroupService; +import quick.pager.shop.user.response.Response; /** * 商品品牌组 @@ -49,7 +49,7 @@ public Response create(@RequestBody GoodsBrandGroupSaveRequest request) { * @param request 请求参数 * @return 品牌组主键 */ - @PostMapping("/brand/group/modify") + @PutMapping("/brand/group/modify") public Response modify(@RequestBody GoodsBrandGroupSaveRequest request) { if (Objects.isNull(request.getId())) { return new Response<>(ResponseStatus.Code.FAIL_CODE, ResponseStatus.PARAMS_EXCEPTION); diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsClassificationController.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsClassificationController.java similarity index 94% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsClassificationController.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsClassificationController.java index 3f66a4f..994f692 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsClassificationController.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsClassificationController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.goods.controller; +package quick.pager.shop.controller; import java.util.List; import java.util.Objects; @@ -13,8 +13,8 @@ import quick.pager.shop.goods.request.classification.GoodsClassificationPageRequest; import quick.pager.shop.goods.request.classification.GoodsClassificationSaveRequest; import quick.pager.shop.goods.response.classification.GoodsClassificationResponse; -import quick.pager.shop.goods.service.GoodsClassService; -import quick.pager.shop.response.Response; +import quick.pager.shop.service.GoodsClassService; +import quick.pager.shop.user.response.Response; /** * 商品分类 diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsController.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsController.java similarity index 92% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsController.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsController.java index 5cf200b..ffd4d71 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsController.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.goods.controller; +package quick.pager.shop.controller; import java.util.List; import java.util.Objects; @@ -13,8 +13,8 @@ import quick.pager.shop.goods.request.GoodsPageRequest; import quick.pager.shop.goods.request.GoodsSaveRequest; import quick.pager.shop.goods.response.GoodsResponse; -import quick.pager.shop.goods.service.GoodsService; -import quick.pager.shop.response.Response; +import quick.pager.shop.service.GoodsService; +import quick.pager.shop.user.response.Response; /** * 商品主表信息 diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsIntegralController.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsIntegralController.java similarity index 86% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsIntegralController.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsIntegralController.java index 7ff6e54..705a00c 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsIntegralController.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsIntegralController.java @@ -1,10 +1,10 @@ -package quick.pager.shop.goods.controller; +package quick.pager.shop.controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.Constants; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 积分商城 diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsPropertyController.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsPropertyController.java similarity index 93% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsPropertyController.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsPropertyController.java index 9341273..0933540 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsPropertyController.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsPropertyController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.goods.controller; +package quick.pager.shop.controller; import java.util.List; import java.util.Objects; @@ -13,8 +13,8 @@ import quick.pager.shop.goods.request.property.GoodsPropertyPageRequest; import quick.pager.shop.goods.request.property.GoodsPropertySaveRequest; import quick.pager.shop.goods.response.property.GoodsPropertyResponse; -import quick.pager.shop.goods.service.GoodsPropertyService; -import quick.pager.shop.response.Response; +import quick.pager.shop.service.GoodsPropertyService; +import quick.pager.shop.user.response.Response; /** * 商品属性 diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsPropertyGroupController.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsPropertyGroupController.java similarity index 94% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsPropertyGroupController.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsPropertyGroupController.java index 57b8c8d..081e7be 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsPropertyGroupController.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsPropertyGroupController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.goods.controller; +package quick.pager.shop.controller; import java.util.List; import java.util.Objects; @@ -15,8 +15,8 @@ import quick.pager.shop.goods.request.property.group.GoodsPropertyGroupPageRequest; import quick.pager.shop.goods.request.property.group.GoodsPropertyGroupSaveRequest; import quick.pager.shop.goods.response.property.group.GoodsPropertyGroupResponse; -import quick.pager.shop.goods.service.GoodsPropertyGroupService; -import quick.pager.shop.response.Response; +import quick.pager.shop.service.GoodsPropertyGroupService; +import quick.pager.shop.user.response.Response; /** * 商品属性组 diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsSkuController.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsSkuController.java similarity index 76% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsSkuController.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsSkuController.java index d6d2b48..e9e09e8 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsSkuController.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsSkuController.java @@ -1,25 +1,22 @@ -package quick.pager.shop.goods.controller; +package quick.pager.shop.controller; -import java.util.Collections; import java.util.List; import java.util.Objects; -import java.util.Optional; -import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.Constants; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.goods.model.GoodsSku; +import quick.pager.shop.goods.request.sku.GoodsSkuOtherRequest; import quick.pager.shop.goods.request.sku.GoodsSkuPageRequest; import quick.pager.shop.goods.request.sku.GoodsSkuSaveRequest; import quick.pager.shop.goods.response.sku.GoodsSkuResponse; -import quick.pager.shop.goods.service.GoodsSkuService; -import quick.pager.shop.response.Response; -import quick.pager.shop.utils.BeanCopier; +import quick.pager.shop.service.GoodsSkuService; +import quick.pager.shop.user.response.Response; /** * 商品sku @@ -68,4 +65,16 @@ public Response modify(@RequestBody GoodsSkuSaveRequest request) { public Response> queryPage(@RequestBody GoodsSkuPageRequest request) { return goodsSkuService.queryPage(request); } + + /** + * 商品sku集 + * + * @param request 请求参数 + * @return 商品sku集 + */ + @RequestMapping(value = "sku/list", method = RequestMethod.POST) + public Response> queryList(@RequestBody GoodsSkuOtherRequest request) { + + return goodsSkuService.queryList(request); + } } diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsSpuController.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsSpuController.java similarity index 79% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsSpuController.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsSpuController.java index 0880f26..db0ae88 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/GoodsSpuController.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/GoodsSpuController.java @@ -1,10 +1,7 @@ -package quick.pager.shop.goods.controller; +package quick.pager.shop.controller; -import java.util.Collections; import java.util.List; import java.util.Objects; -import java.util.Optional; -import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -13,13 +10,11 @@ import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.Constants; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.goods.model.GoodsSpu; import quick.pager.shop.goods.request.spu.GoodsSpuPageRequest; import quick.pager.shop.goods.request.spu.GoodsSpuSaveRequest; import quick.pager.shop.goods.response.spu.GoodsSpuResponse; -import quick.pager.shop.goods.service.GoodsSpuService; -import quick.pager.shop.response.Response; -import quick.pager.shop.utils.BeanCopier; +import quick.pager.shop.service.GoodsSpuService; +import quick.pager.shop.user.response.Response; /** * 商品spu @@ -59,7 +54,7 @@ public Response modify(@RequestBody GoodsSpuSaveRequest request) { * @return 数据响应 */ @PostMapping("/spu/page") - public Response> queryPage(@RequestBody GoodsSpuPageRequest request) { + public Response> page(@RequestBody GoodsSpuPageRequest request) { return goodsSpuService.queryPage(request); } diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/app/AppClassificationController.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/app/AppClassificationController.java new file mode 100644 index 0000000..b2dcec0 --- /dev/null +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/app/AppClassificationController.java @@ -0,0 +1,56 @@ +package quick.pager.shop.controller.app; + + +import java.util.List; +import java.util.Objects; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import quick.pager.shop.constants.Constants; +import quick.pager.shop.constants.ResponseStatus; +import quick.pager.shop.param.AppClassificationParam; +import quick.pager.shop.goods.response.classification.AppGoodsClassificationResponse; +import quick.pager.shop.service.AppClassificationService; +import quick.pager.shop.user.response.CommonResponse; +import quick.pager.shop.user.response.Response; + +/** + * 商品分类 + * + * @author siguiyang + * @version 3.0 + */ +@RestController +@RequestMapping(Constants.Module.GOODS) +public class AppClassificationController { + + @Autowired + private AppClassificationService appClassificationService; + + /** + * App 商品分类列表 + */ + @GetMapping("/app/goods/classifications") + public Response> classifications() { + + return appClassificationService.classifications(); + } + + /** + * 分类对应的详情 + * + * @param param 请求参数 + */ + @PostMapping("/app/goods/classifications/detail") + public Response detail(@RequestBody AppClassificationParam param) { + + if (Objects.isNull(param.getClassificationId())) { + return new Response<>(ResponseStatus.Code.FAIL_CODE, "分类不存在"); + } + + return appClassificationService.detail(param.getClassificationId()); + } +} diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/app/AppGoodsSkuController.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/app/AppGoodsSkuController.java new file mode 100644 index 0000000..a151d2f --- /dev/null +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/app/AppGoodsSkuController.java @@ -0,0 +1,41 @@ +package quick.pager.shop.controller.app; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import quick.pager.shop.constants.ConstantsClient; +import quick.pager.shop.constants.ResponseStatus; +import quick.pager.shop.param.GoodsSearchParam; +import quick.pager.shop.service.AppGoodsSkuService; +import quick.pager.shop.user.response.Response; + +/** + * 商品SKU + * + * @author siguiyang + */ +@RestController +@RequestMapping(ConstantsClient.GOODS) +public class AppGoodsSkuController { + + @Autowired + private AppGoodsSkuService appGoodsSkuService; + + /** + * 商品检索 + * + * @param param 请求参数 + */ + @PostMapping("/app/sku/search") + public Response search(@RequestBody GoodsSearchParam param) { + + if (StringUtils.isBlank(param.getKeyword())) { + return new Response(ResponseStatus.Code.FAIL_CODE, "请输入搜索关键字"); + } + return appGoodsSkuService.querySku(param); + } + +} diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/job/GoodsTestJobController.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/job/GoodsTestJobController.java similarity index 89% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/job/GoodsTestJobController.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/job/GoodsTestJobController.java index d7520ef..368b872 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/job/GoodsTestJobController.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/controller/job/GoodsTestJobController.java @@ -1,11 +1,11 @@ -package quick.pager.shop.goods.controller.job; +package quick.pager.shop.controller.job; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.ConstantsClient; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; @RestController @RequestMapping(ConstantsClient.GOODS) diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/GoodsApplication.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/GoodsApplication.java deleted file mode 100644 index 270bc2c..0000000 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/GoodsApplication.java +++ /dev/null @@ -1,22 +0,0 @@ -package quick.pager.shop.goods; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.openfeign.EnableFeignClients; - -/** - * @author siguiyang - */ -@SpringBootApplication(scanBasePackages = "quick.pager.shop") -@EnableDiscoveryClient -@EnableCircuitBreaker -@EnableFeignClients("quick.pager.shop") -public class GoodsApplication { - - public static void main(String[] args) { - SpringApplication.run(GoodsApplication.class, args); - } -} - diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/app/AppClassificationController.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/app/AppClassificationController.java deleted file mode 100644 index 1c3fc97..0000000 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/app/AppClassificationController.java +++ /dev/null @@ -1,30 +0,0 @@ -package quick.pager.shop.goods.controller.app; - - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import quick.pager.shop.constants.Constants; -import quick.pager.shop.response.Response; - -/** - * 商品分类 - * - * @author siguiyang - * @version 3.0 - */ -@RestController -@RequestMapping(Constants.Module.GOODS) -public class AppClassificationController { - - /** - * App 商品分类列表 - * - * @return - */ - @GetMapping("/app/goods/classifications") - public Response classifications() { - - return null; - } -} diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/app/AppGoodsSkuController.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/app/AppGoodsSkuController.java deleted file mode 100644 index 44f5231..0000000 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/controller/app/AppGoodsSkuController.java +++ /dev/null @@ -1,12 +0,0 @@ -package quick.pager.shop.goods.controller.app; - -import org.springframework.web.bind.annotation.RestController; - -/** - * 商品SKU - * - * @author siguiyang - */ -@RestController -public class AppGoodsSkuController { -} diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/es/ESGoods.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/es/ESGoods.java deleted file mode 100644 index 3de15d5..0000000 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/es/ESGoods.java +++ /dev/null @@ -1,18 +0,0 @@ -package quick.pager.shop.goods.model.es; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springframework.data.elasticsearch.annotations.Document; -import quick.pager.shop.model.Model; - -/** - * ES商品 - * - * @author siguiyang - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Document(indexName = "es_goods", createIndex = false) -public class ESGoods extends Model { - private static final long serialVersionUID = 8509683142547327975L; -} diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/param/GoodsSearchParam.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/param/GoodsSearchParam.java deleted file mode 100644 index ed4f8a8..0000000 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/param/GoodsSearchParam.java +++ /dev/null @@ -1,22 +0,0 @@ -package quick.pager.shop.goods.param; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import quick.pager.shop.param.Param; - -/** - * 商品搜索 - * - * @author siguiyang - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class GoodsSearchParam extends Param { - private static final long serialVersionUID = -5201517264758579637L; - - private Long goodsClassId; - - private String goodsName; - - -} diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/repository/ESGoodsRepository.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/repository/ESGoodsRepository.java deleted file mode 100644 index 708ec1a..0000000 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/repository/ESGoodsRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package quick.pager.shop.goods.repository; - -import org.springframework.data.elasticsearch.repository.ElasticsearchRepository; -import quick.pager.shop.goods.model.es.ESGoods; - -/** - * ES 商品 - * - * @author siguiyang - */ -public interface ESGoodsRepository extends ElasticsearchRepository { -} diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsSkuService.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsSkuService.java deleted file mode 100644 index a885dac..0000000 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsSkuService.java +++ /dev/null @@ -1,34 +0,0 @@ -package quick.pager.shop.goods.service; - -import java.util.List; -import quick.pager.shop.goods.model.GoodsSku; -import quick.pager.shop.goods.request.sku.GoodsSkuPageRequest; -import quick.pager.shop.goods.request.sku.GoodsSkuSaveRequest; -import quick.pager.shop.goods.response.sku.GoodsSkuResponse; -import quick.pager.shop.response.Response; - -/** - *

- * 商品sku 服务类 - *

- * - * @author Siguiyang - * @since 2019-10-07 - */ -public interface GoodsSkuService { - - /** - * 新增 - */ - Response create(GoodsSkuSaveRequest request); - - /** - * 编辑修改 - */ - Response modify(GoodsSkuSaveRequest request); - - /** - * 列表分页 - */ - Response> queryPage(GoodsSkuPageRequest request); -} diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsBrandGroupMapper.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsBrandGroupMapper.java similarity index 75% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsBrandGroupMapper.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsBrandGroupMapper.java index 5e2aba9..ff63f89 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsBrandGroupMapper.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsBrandGroupMapper.java @@ -1,9 +1,9 @@ -package quick.pager.shop.goods.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.goods.model.GoodsBrandGroup; +import quick.pager.shop.model.GoodsBrandGroup; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsBrandMapper.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsBrandMapper.java similarity index 67% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsBrandMapper.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsBrandMapper.java index 9e9a8b5..5796dba 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsBrandMapper.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsBrandMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.goods.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.goods.model.GoodsBrand; +import quick.pager.shop.model.GoodsBrand; @Mapper public interface GoodsBrandMapper extends BaseMapper { diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsBrandSpuMapper.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsBrandSpuMapper.java similarity index 78% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsBrandSpuMapper.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsBrandSpuMapper.java index f3ea93a..df8e70f 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsBrandSpuMapper.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsBrandSpuMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.goods.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.goods.model.GoodsBrandSpu; +import quick.pager.shop.model.GoodsBrandSpu; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsClassBannerMapper.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsClassBannerMapper.java similarity index 72% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsClassBannerMapper.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsClassBannerMapper.java index 8e908b8..2b51530 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsClassBannerMapper.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsClassBannerMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.goods.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.goods.model.GoodsClassBanner; +import quick.pager.shop.model.GoodsClassBanner; /** * 商品分类与banner diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsClassMapper.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsClassMapper.java similarity index 76% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsClassMapper.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsClassMapper.java index e28a926..7d61916 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsClassMapper.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsClassMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.goods.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.goods.model.GoodsClass; +import quick.pager.shop.model.GoodsClass; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsMapper.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsMapper.java similarity index 72% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsMapper.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsMapper.java index 27d7856..6fe4f39 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsMapper.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.goods.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.goods.model.Goods; +import quick.pager.shop.model.Goods; /** * 商品主表 diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsPropertyGroupMapper.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsPropertyGroupMapper.java similarity index 75% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsPropertyGroupMapper.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsPropertyGroupMapper.java index 0514c91..f3420fa 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsPropertyGroupMapper.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsPropertyGroupMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.goods.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.goods.model.GoodsPropertyGroup; +import quick.pager.shop.model.GoodsPropertyGroup; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsPropertyMapper.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsPropertyMapper.java similarity index 76% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsPropertyMapper.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsPropertyMapper.java index 956c480..1051482 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsPropertyMapper.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsPropertyMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.goods.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.goods.model.GoodsProperty; +import quick.pager.shop.model.GoodsProperty; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsSkuImageMapper.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsSkuImageMapper.java similarity index 76% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsSkuImageMapper.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsSkuImageMapper.java index 1b50c4e..b5428df 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsSkuImageMapper.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsSkuImageMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.goods.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.goods.model.GoodsSkuImage; +import quick.pager.shop.model.GoodsSkuImage; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsSkuMapper.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsSkuMapper.java similarity index 76% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsSkuMapper.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsSkuMapper.java index 5741771..e414555 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsSkuMapper.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsSkuMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.goods.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.goods.model.GoodsSku; +import quick.pager.shop.model.GoodsSku; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsSkuPropertyGroupMapper.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsSkuPropertyGroupMapper.java similarity index 78% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsSkuPropertyGroupMapper.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsSkuPropertyGroupMapper.java index 3f7433b..3c3f9ee 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsSkuPropertyGroupMapper.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsSkuPropertyGroupMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.goods.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.goods.model.GoodsSkuPropertyGroup; +import quick.pager.shop.model.GoodsSkuPropertyGroup; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsSkuPropertyMapper.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsSkuPropertyMapper.java similarity index 78% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsSkuPropertyMapper.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsSkuPropertyMapper.java index a459b40..96e1ae9 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsSkuPropertyMapper.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsSkuPropertyMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.goods.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.goods.model.GoodsSkuProperty; +import quick.pager.shop.model.GoodsSkuProperty; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsSkuStockMapper.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsSkuStockMapper.java similarity index 79% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsSkuStockMapper.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsSkuStockMapper.java index 20dd250..d2fb450 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsSkuStockMapper.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsSkuStockMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.goods.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.goods.model.GoodsSkuStock; +import quick.pager.shop.model.GoodsSkuStock; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsSkuTagMapper.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsSkuTagMapper.java similarity index 76% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsSkuTagMapper.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsSkuTagMapper.java index 430e8fb..e50bfdb 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsSkuTagMapper.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsSkuTagMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.goods.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.goods.model.GoodsSkuTag; +import quick.pager.shop.model.GoodsSkuTag; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsSpuMapper.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsSpuMapper.java similarity index 76% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsSpuMapper.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsSpuMapper.java index 3fa2647..352122f 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/mapper/GoodsSpuMapper.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/mapper/GoodsSpuMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.goods.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.goods.model.GoodsSpu; +import quick.pager.shop.model.GoodsSpu; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/Goods.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/Goods.java similarity index 93% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/Goods.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/Goods.java index f529880..5421225 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/Goods.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/Goods.java @@ -1,9 +1,8 @@ -package quick.pager.shop.goods.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.model.Model; /** * 商品主表 diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsBrand.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsBrand.java similarity index 91% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsBrand.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsBrand.java index 2fda731..aa5ed6d 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsBrand.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsBrand.java @@ -1,6 +1,5 @@ -package quick.pager.shop.goods.model; +package quick.pager.shop.model; -import quick.pager.shop.model.Model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsBrandGroup.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsBrandGroup.java similarity index 88% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsBrandGroup.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsBrandGroup.java index 473d103..d00d1df 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsBrandGroup.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsBrandGroup.java @@ -1,7 +1,6 @@ -package quick.pager.shop.goods.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; -import quick.pager.shop.model.Model; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsBrandSpu.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsBrandSpu.java similarity index 88% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsBrandSpu.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsBrandSpu.java index 3e6cf3a..de1b142 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsBrandSpu.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsBrandSpu.java @@ -1,7 +1,6 @@ -package quick.pager.shop.goods.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; -import quick.pager.shop.model.Model; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsClass.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsClass.java similarity index 89% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsClass.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsClass.java index 656dc49..b258419 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsClass.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsClass.java @@ -1,7 +1,6 @@ -package quick.pager.shop.goods.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; -import quick.pager.shop.model.Model; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsClassBanner.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsClassBanner.java similarity index 83% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsClassBanner.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsClassBanner.java index e0ada19..b57a29e 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsClassBanner.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsClassBanner.java @@ -1,9 +1,8 @@ -package quick.pager.shop.goods.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.model.Model; /** * 商品分类与Banner关联表 @@ -18,6 +17,7 @@ public class GoodsClassBanner extends Model { /** * 分类主键 + * 这个分类主键只可能是顶级分类，一级分类 */ private Long classificationId; /** diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsClassBrand.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsClassBrand.java similarity index 89% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsClassBrand.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsClassBrand.java index e80dda7..cd946e9 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsClassBrand.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsClassBrand.java @@ -1,10 +1,9 @@ -package quick.pager.shop.goods.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import quick.pager.shop.model.Model; /** * 商品分类与商品品牌关联 diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsProperty.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsProperty.java similarity index 88% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsProperty.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsProperty.java index 0aac22e..e086b69 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsProperty.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsProperty.java @@ -1,7 +1,6 @@ -package quick.pager.shop.goods.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; -import quick.pager.shop.model.Model; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsPropertyGroup.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsPropertyGroup.java similarity index 88% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsPropertyGroup.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsPropertyGroup.java index cd7ed70..79eaac0 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsPropertyGroup.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsPropertyGroup.java @@ -1,7 +1,6 @@ -package quick.pager.shop.goods.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; -import quick.pager.shop.model.Model; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsSku.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsSku.java similarity index 93% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsSku.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsSku.java index 73a7898..0b5bea6 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsSku.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsSku.java @@ -1,8 +1,7 @@ -package quick.pager.shop.goods.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import java.math.BigDecimal; -import quick.pager.shop.model.Model; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsSkuImage.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsSkuImage.java similarity index 91% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsSkuImage.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsSkuImage.java index 97f7954..a9c2d67 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsSkuImage.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsSkuImage.java @@ -1,7 +1,6 @@ -package quick.pager.shop.goods.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; -import quick.pager.shop.model.Model; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsSkuProperty.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsSkuProperty.java similarity index 90% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsSkuProperty.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsSkuProperty.java index 5d2d5d7..ba534e2 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsSkuProperty.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsSkuProperty.java @@ -1,7 +1,6 @@ -package quick.pager.shop.goods.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; -import quick.pager.shop.model.Model; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsSkuPropertyGroup.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsSkuPropertyGroup.java similarity index 90% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsSkuPropertyGroup.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsSkuPropertyGroup.java index bbdabc1..c08eb4f 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsSkuPropertyGroup.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsSkuPropertyGroup.java @@ -1,7 +1,6 @@ -package quick.pager.shop.goods.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; -import quick.pager.shop.model.Model; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsSkuStock.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsSkuStock.java similarity index 90% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsSkuStock.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsSkuStock.java index cba1ea4..b2e46cf 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsSkuStock.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsSkuStock.java @@ -1,7 +1,6 @@ -package quick.pager.shop.goods.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; -import quick.pager.shop.model.Model; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsSkuTag.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsSkuTag.java similarity index 89% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsSkuTag.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsSkuTag.java index f3a3bed..b32139f 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsSkuTag.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsSkuTag.java @@ -1,7 +1,6 @@ -package quick.pager.shop.goods.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; -import quick.pager.shop.model.Model; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsSpu.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsSpu.java similarity index 90% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsSpu.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsSpu.java index 02e7898..80074ec 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/model/GoodsSpu.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/GoodsSpu.java @@ -1,7 +1,6 @@ -package quick.pager.shop.goods.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; -import quick.pager.shop.model.Model; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/es/ESGoods.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/es/ESGoods.java new file mode 100644 index 0000000..ca8cd84 --- /dev/null +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/model/es/ESGoods.java @@ -0,0 +1,63 @@ +package quick.pager.shop.model.es; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.data.elasticsearch.annotations.Document; +import quick.pager.shop.model.Model; + +/** + * ES商品 + * + * @author siguiyang + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Document(indexName = "es_goods", createIndex = false) +public class ESGoods extends Model { + private static final long serialVersionUID = 8509683142547327975L; + + /** + * 品牌主键 + */ + private Long brandId; + /** + * 商品二级分类主键 + */ + private Long gcsId; + /** + * 商品属性组主键 + */ + private Long goodsPropertyGroupId; + /** + * spu 主键 + */ + private Long spuId; + /** + * 商品主表名称 + */ + private String name; + /** + * 商品状态 0 未上架 1 上架申请 2 上架 3 已下架 + */ + private Integer publishStatus; + /** + * 商品类型 + */ + private Integer goodsType; + /** + * 新品状态:0->不是新品；1->新品 + */ + private Boolean state; + /** + * 推荐状态；0->不推荐；1->推荐 + */ + private Boolean recommend; + /** + * 商品单位 + */ + private String unit; + /** + * 商品描述 + */ + private String description; +} diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/param/AppClassificationParam.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/param/AppClassificationParam.java new file mode 100644 index 0000000..e25b1d0 --- /dev/null +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/param/AppClassificationParam.java @@ -0,0 +1,20 @@ +package quick.pager.shop.param; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 分类 + * + * @author siguiyang + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class AppClassificationParam extends Param { + private static final long serialVersionUID = 8663137928076712426L; + /** + * 分类主键 + */ + private Long classificationId; + +} diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/param/CartParam.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/param/CartParam.java similarity index 84% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/param/CartParam.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/param/CartParam.java index e63931b..9272e4b 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/param/CartParam.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/param/CartParam.java @@ -1,9 +1,8 @@ -package quick.pager.shop.goods.param; +package quick.pager.shop.param; import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.param.Param; /** * 购物车 diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/param/ClassificationParam.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/param/ClassificationParam.java similarity index 86% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/param/ClassificationParam.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/param/ClassificationParam.java index 54df934..bb6c458 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/param/ClassificationParam.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/param/ClassificationParam.java @@ -1,8 +1,7 @@ -package quick.pager.shop.goods.param; +package quick.pager.shop.param; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.param.Param; /** * 商品分类 diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/param/GoodsSearchParam.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/param/GoodsSearchParam.java new file mode 100644 index 0000000..188dae0 --- /dev/null +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/param/GoodsSearchParam.java @@ -0,0 +1,36 @@ +package quick.pager.shop.param; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import quick.pager.shop.enums.SortEnums; + +/** + * 商品搜索 + * + * @author siguiyang + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class GoodsSearchParam extends PageParam { + private static final long serialVersionUID = -5201517264758579637L; + + /** + * 检索关键字 + */ + private String keyword; + + /** + * 用户主键 + */ + private Long userId; + + private Long goodsClassId; + + private String goodsName; + /** + * 排序 + */ + private SortEnums sort; + + +} diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/repository/GoodsRepository.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/repository/GoodsRepository.java new file mode 100644 index 0000000..fa887fc --- /dev/null +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/repository/GoodsRepository.java @@ -0,0 +1,12 @@ +package quick.pager.shop.repository; + +import org.springframework.data.elasticsearch.repository.ElasticsearchRepository; +import quick.pager.shop.model.es.ESGoods; + +/** + * ES 商品 + * + * @author siguiyang + */ +public interface GoodsRepository extends ElasticsearchRepository { +} diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/AppClassificationService.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/AppClassificationService.java new file mode 100644 index 0000000..840751e --- /dev/null +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/AppClassificationService.java @@ -0,0 +1,29 @@ +package quick.pager.shop.service; + +import java.util.List; +import quick.pager.shop.goods.response.classification.AppGoodsClassificationResponse; +import quick.pager.shop.user.response.CommonResponse; +import quick.pager.shop.user.response.Response; + +/** + * APP 商品分类 + * + * @author siguiyang + */ +public interface AppClassificationService { + + /** + * 分类列表 + */ + Response> classifications(); + + /** + * 分类对应的详情 + * 包含左侧分类对应的推荐信息 + * 以及二级分类对应的详情 + * + * @param classificationId 分类主键 + */ + Response detail(final Long classificationId); + +} diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/AppGoodsSkuService.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/AppGoodsSkuService.java new file mode 100644 index 0000000..3fc75b6 --- /dev/null +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/AppGoodsSkuService.java @@ -0,0 +1,22 @@ +package quick.pager.shop.service; + +import java.util.List; +import quick.pager.shop.param.GoodsSearchParam; +import quick.pager.shop.goods.response.GoodsResponse; +import quick.pager.shop.user.response.Response; + +/** + * APP 商品检索服务 + * + * @author siguiyang + */ +public interface AppGoodsSkuService { + + + /** + * 商品检索 + * + * @param param 检索参数 + */ + Response> querySku(final GoodsSearchParam param); +} diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsBrandGroupService.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsBrandGroupService.java similarity index 87% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsBrandGroupService.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsBrandGroupService.java index 79c67c5..21c4363 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsBrandGroupService.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsBrandGroupService.java @@ -1,13 +1,12 @@ -package quick.pager.shop.goods.service; +package quick.pager.shop.service; import java.util.List; -import quick.pager.shop.goods.model.GoodsBrandGroup; +import quick.pager.shop.model.GoodsBrandGroup; import quick.pager.shop.goods.request.brand.GoodsBrandGroupOtherRequest; import quick.pager.shop.goods.request.brand.GoodsBrandGroupPageRequest; import quick.pager.shop.goods.request.brand.GoodsBrandGroupSaveRequest; import quick.pager.shop.goods.response.brand.GoodsBrandGroupResponse; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.IService; +import quick.pager.shop.user.response.Response; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsBrandService.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsBrandService.java similarity index 86% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsBrandService.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsBrandService.java index e23c048..c195210 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsBrandService.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsBrandService.java @@ -1,11 +1,10 @@ -package quick.pager.shop.goods.service; +package quick.pager.shop.service; import java.util.List; -import quick.pager.shop.goods.model.GoodsBrand; import quick.pager.shop.goods.request.brand.GoodsBrandPageRequest; import quick.pager.shop.goods.request.brand.GoodsBrandSaveRequest; import quick.pager.shop.goods.response.brand.GoodsBrandResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 商品品牌 diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsBrandSpuService.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsBrandSpuService.java similarity index 74% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsBrandSpuService.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsBrandSpuService.java index e717bfe..d7c3533 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsBrandSpuService.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsBrandSpuService.java @@ -1,7 +1,7 @@ -package quick.pager.shop.goods.service; +package quick.pager.shop.service; import com.baomidou.mybatisplus.extension.service.IService; -import quick.pager.shop.goods.model.GoodsBrandSpu; +import quick.pager.shop.model.GoodsBrandSpu; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsClassService.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsClassService.java similarity index 92% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsClassService.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsClassService.java index 3ea2570..b1fce0d 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsClassService.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsClassService.java @@ -1,10 +1,10 @@ -package quick.pager.shop.goods.service; +package quick.pager.shop.service; import java.util.List; import quick.pager.shop.goods.request.classification.GoodsClassificationPageRequest; import quick.pager.shop.goods.request.classification.GoodsClassificationSaveRequest; import quick.pager.shop.goods.response.classification.GoodsClassificationResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsPropertyGroupService.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsPropertyGroupService.java similarity index 87% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsPropertyGroupService.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsPropertyGroupService.java index 1d6d73d..d7640e5 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsPropertyGroupService.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsPropertyGroupService.java @@ -1,13 +1,12 @@ -package quick.pager.shop.goods.service; +package quick.pager.shop.service; import java.util.List; -import quick.pager.shop.goods.model.GoodsPropertyGroup; +import quick.pager.shop.model.GoodsPropertyGroup; import quick.pager.shop.goods.request.property.group.GoodsPropertyGroupOtherRequest; import quick.pager.shop.goods.request.property.group.GoodsPropertyGroupPageRequest; import quick.pager.shop.goods.request.property.group.GoodsPropertyGroupSaveRequest; import quick.pager.shop.goods.response.property.group.GoodsPropertyGroupResponse; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.IService; +import quick.pager.shop.user.response.Response; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsPropertyService.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsPropertyService.java similarity index 84% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsPropertyService.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsPropertyService.java index 80eb86e..9aecac2 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsPropertyService.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsPropertyService.java @@ -1,12 +1,11 @@ -package quick.pager.shop.goods.service; +package quick.pager.shop.service; import java.util.List; -import quick.pager.shop.goods.model.GoodsProperty; +import quick.pager.shop.model.GoodsProperty; import quick.pager.shop.goods.request.property.GoodsPropertyPageRequest; import quick.pager.shop.goods.request.property.GoodsPropertySaveRequest; import quick.pager.shop.goods.response.property.GoodsPropertyResponse; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.IService; +import quick.pager.shop.user.response.Response; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsService.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsService.java similarity index 82% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsService.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsService.java index 32148e6..6ad7877 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsService.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsService.java @@ -1,12 +1,11 @@ -package quick.pager.shop.goods.service; +package quick.pager.shop.service; import java.util.List; -import quick.pager.shop.goods.model.Goods; +import quick.pager.shop.model.Goods; import quick.pager.shop.goods.request.GoodsPageRequest; import quick.pager.shop.goods.request.GoodsSaveRequest; import quick.pager.shop.goods.response.GoodsResponse; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.IService; +import quick.pager.shop.user.response.Response; /** * 商品主表信息 diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsSkuImageService.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsSkuImageService.java similarity index 72% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsSkuImageService.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsSkuImageService.java index 2a4f839..a6f07fb 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsSkuImageService.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsSkuImageService.java @@ -1,7 +1,7 @@ -package quick.pager.shop.goods.service; +package quick.pager.shop.service; import com.baomidou.mybatisplus.extension.service.IService; -import quick.pager.shop.goods.model.GoodsSkuImage; +import quick.pager.shop.model.GoodsSkuImage; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsSkuPropertyGroupService.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsSkuPropertyGroupService.java similarity index 75% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsSkuPropertyGroupService.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsSkuPropertyGroupService.java index 44c9791..2ddda8e 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsSkuPropertyGroupService.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsSkuPropertyGroupService.java @@ -1,7 +1,7 @@ -package quick.pager.shop.goods.service; +package quick.pager.shop.service; import com.baomidou.mybatisplus.extension.service.IService; -import quick.pager.shop.goods.model.GoodsSkuPropertyGroup; +import quick.pager.shop.model.GoodsSkuPropertyGroup; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsSkuPropertyService.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsSkuPropertyService.java similarity index 75% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsSkuPropertyService.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsSkuPropertyService.java index e48b61a..4a9b941 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsSkuPropertyService.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsSkuPropertyService.java @@ -1,7 +1,7 @@ -package quick.pager.shop.goods.service; +package quick.pager.shop.service; import com.baomidou.mybatisplus.extension.service.IService; -import quick.pager.shop.goods.model.GoodsSkuProperty; +import quick.pager.shop.model.GoodsSkuProperty; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsSkuService.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsSkuService.java new file mode 100644 index 0000000..93c97e3 --- /dev/null +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsSkuService.java @@ -0,0 +1,42 @@ +package quick.pager.shop.service; + +import java.util.List; +import quick.pager.shop.goods.request.sku.GoodsSkuOtherRequest; +import quick.pager.shop.goods.request.sku.GoodsSkuPageRequest; +import quick.pager.shop.goods.request.sku.GoodsSkuSaveRequest; +import quick.pager.shop.goods.response.sku.GoodsSkuResponse; +import quick.pager.shop.user.response.Response; + +/** + *

+ * 商品sku 服务类 + *

+ * + * @author Siguiyang + * @since 2019-10-07 + */ +public interface GoodsSkuService { + + /** + * 新增 + */ + Response create(final GoodsSkuSaveRequest request); + + /** + * 编辑修改 + */ + Response modify(final GoodsSkuSaveRequest request); + + /** + * 列表分页 + */ + Response> queryPage(final GoodsSkuPageRequest request); + + /** + * 商品sku集 + * + * @param request 请求参数 + * @return 商品sku集 + */ + Response> queryList(final GoodsSkuOtherRequest request); +} diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsSkuStockService.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsSkuStockService.java similarity index 75% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsSkuStockService.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsSkuStockService.java index 7c93efd..8c508c1 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsSkuStockService.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsSkuStockService.java @@ -1,7 +1,7 @@ -package quick.pager.shop.goods.service; +package quick.pager.shop.service; import com.baomidou.mybatisplus.extension.service.IService; -import quick.pager.shop.goods.model.GoodsSkuStock; +import quick.pager.shop.model.GoodsSkuStock; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsSkuTagService.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsSkuTagService.java similarity index 72% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsSkuTagService.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsSkuTagService.java index 164fa64..2ac1055 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsSkuTagService.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsSkuTagService.java @@ -1,7 +1,7 @@ -package quick.pager.shop.goods.service; +package quick.pager.shop.service; import com.baomidou.mybatisplus.extension.service.IService; -import quick.pager.shop.goods.model.GoodsSkuTag; +import quick.pager.shop.model.GoodsSkuTag; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsSpuService.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsSpuService.java similarity index 86% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsSpuService.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsSpuService.java index 8720f6e..8b8e1ae 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/GoodsSpuService.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/GoodsSpuService.java @@ -1,11 +1,10 @@ -package quick.pager.shop.goods.service; +package quick.pager.shop.service; import java.util.List; -import quick.pager.shop.goods.model.GoodsSpu; import quick.pager.shop.goods.request.spu.GoodsSpuPageRequest; import quick.pager.shop.goods.request.spu.GoodsSpuSaveRequest; import quick.pager.shop.goods.response.spu.GoodsSpuResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/AppClassificationServiceImpl.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/AppClassificationServiceImpl.java new file mode 100644 index 0000000..4e6a59b --- /dev/null +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/AppClassificationServiceImpl.java @@ -0,0 +1,101 @@ +package quick.pager.shop.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import java.util.List; +import java.util.stream.Collectors; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import quick.pager.shop.activity.client.BannerClient; +import quick.pager.shop.activity.response.banner.BannerResponse; +import quick.pager.shop.constants.ResponseStatus; +import quick.pager.shop.mapper.GoodsClassBannerMapper; +import quick.pager.shop.mapper.GoodsClassMapper; +import quick.pager.shop.mapper.GoodsSpuMapper; +import quick.pager.shop.model.GoodsClass; +import quick.pager.shop.model.GoodsClassBanner; +import quick.pager.shop.model.GoodsSpu; +import quick.pager.shop.goods.response.classification.AppGoodsBannerResponse; +import quick.pager.shop.goods.response.classification.AppGoodsClassificationDetailResponse; +import quick.pager.shop.goods.response.classification.AppGoodsClassificationResponse; +import quick.pager.shop.service.AppClassificationService; +import quick.pager.shop.user.response.CommonResponse; +import quick.pager.shop.user.response.Response; + +@Service +public class AppClassificationServiceImpl implements AppClassificationService { + + @Autowired + private GoodsClassMapper goodsClassMapper; + @Autowired + private GoodsClassBannerMapper goodsClassBannerMapper; + @Autowired + private GoodsSpuMapper goodsSpuMapper; + @Autowired + private BannerClient bannerClient; + + @Override + public Response> classifications() { + + List goodsClasses = goodsClassMapper.selectList(new LambdaQueryWrapper() + .eq(GoodsClass::getDeleteStatus, Boolean.FALSE) + .isNull(GoodsClass::getParentId)); + + return Response.toResponse(goodsClasses.stream().map(item -> { + CommonResponse response = new CommonResponse(); + response.setId(item.getId()); + response.setName(item.getClassName()); + response.setIcon(item.getIcon()); + return response; + }).collect(Collectors.toList())); + } + + @Override + public Response detail(Long classificationId) { + + AppGoodsClassificationResponse response = new AppGoodsClassificationResponse(); + // 1. 查询分类推荐的banner + List goodsClassBanners = goodsClassBannerMapper.selectList(new LambdaQueryWrapper() + .eq(GoodsClassBanner::getDeleteStatus, Boolean.FALSE) + .eq(GoodsClassBanner::getClassificationId, classificationId)); + response.setGoodsBanners(goodsClassBanners.stream().map(item -> { + AppGoodsBannerResponse appGoodsBannerResp = new AppGoodsBannerResponse(); + appGoodsBannerResp.setId(item.getId()); + + Response bannerRes = bannerClient.queryByPk(item.getBannerId()); + + if (ResponseStatus.Code.SUCCESS == bannerRes.getCode()) { + BannerResponse data = bannerRes.getData(); + appGoodsBannerResp.setName(data.getTitle()); + appGoodsBannerResp.setBannerUrl(data.getBannerUrl()); + } + return appGoodsBannerResp; + }).collect(Collectors.toList())); + + // 2. 分类详情 + List goodsClasses = goodsClassMapper.selectList(new LambdaQueryWrapper() + .eq(GoodsClass::getDeleteStatus, Boolean.FALSE) + .eq(GoodsClass::getParentId, classificationId)); + + response.setDetails(goodsClasses.stream().map(item -> { + AppGoodsClassificationDetailResponse detailResp = new AppGoodsClassificationDetailResponse(); + detailResp.setId(item.getId()); + detailResp.setClassificationId(classificationId); + detailResp.setName(item.getClassName()); + + List spus = goodsSpuMapper.selectList(new LambdaQueryWrapper() + .eq(GoodsSpu::getDeleteStatus, Boolean.FALSE) + .eq(GoodsSpu::getClassificationId, item.getId())); + + detailResp.setSpus(spus.stream().map(spu -> { + CommonResponse commonResp = new CommonResponse(); + commonResp.setId(spu.getId()); + commonResp.setName(spu.getSpuName()); + commonResp.setIcon(spu.getSpuImage()); + return commonResp; + }).collect(Collectors.toList())); + return detailResp; + }).collect(Collectors.toList())); + + return Response.toResponse(response); + } +} diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/AppGoodsSkuServiceImpl.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/AppGoodsSkuServiceImpl.java new file mode 100644 index 0000000..eed9797 --- /dev/null +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/AppGoodsSkuServiceImpl.java @@ -0,0 +1,65 @@ +package quick.pager.shop.service.impl; + +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import org.elasticsearch.index.query.BoolQueryBuilder; +import org.elasticsearch.index.query.QueryBuilders; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; +import quick.pager.shop.enums.SortEnums; +import quick.pager.shop.goods.field.GoodsField; +import quick.pager.shop.model.es.ESGoods; +import quick.pager.shop.param.GoodsSearchParam; +import quick.pager.shop.repository.GoodsRepository; +import quick.pager.shop.goods.response.GoodsResponse; +import quick.pager.shop.service.AppGoodsSkuService; +import quick.pager.shop.user.response.Response; + +/** + * @author siguiyang + */ +@Service +public class AppGoodsSkuServiceImpl implements AppGoodsSkuService { + + @Autowired + private GoodsRepository goodsRepository; + + @Override + public Response> querySku(final GoodsSearchParam param) { + + BoolQueryBuilder builder = QueryBuilders.boolQuery(); + + Sort sort = Sort.by(Sort.Direction.ASC, GoodsField.SKU_AMOUNT_KEY); + + if (Objects.nonNull(param.getSort())) { + if (SortEnums.DESC.equals(param.getSort())) { + sort = Sort.by(Sort.Direction.ASC, GoodsField.SKU_AMOUNT_KEY); + } + } + + // 搜索内容 + String keyword = param.getKeyword(); + + builder.should(QueryBuilders.matchPhraseQuery("skuName", keyword).boost(100)); + builder.should(QueryBuilders.matchPhraseQuery("spuName", keyword).boost(90)); + builder.should(QueryBuilders.matchPhraseQuery("goodsName", keyword).boost(80)); + builder.should(QueryBuilders.matchPhraseQuery("goodsPropertyName", keyword).boost(70)); + builder.should(QueryBuilders.matchPhraseQuery("goodsPropertyGroupName", keyword).boost(60)); + builder.should(QueryBuilders.matchPhraseQuery("goodsBrandName", keyword).boost(50)); + builder.should(QueryBuilders.matchPhraseQuery("goodsBrandGroupName", keyword).boost(40)); + + Page page = goodsRepository.search(builder, PageRequest.of(param.getPage(), param.getPageSize(), sort)); + return Response.toResponse(page.getContent().stream().map(this::conv).collect(Collectors.toList()), page.getTotalElements()); + } + + /** + * 商品转换 + */ + private GoodsResponse conv(ESGoods goods) { + return null; + } +} diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsBrandGroupServiceImpl.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsBrandGroupServiceImpl.java similarity index 66% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsBrandGroupServiceImpl.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsBrandGroupServiceImpl.java index c3a80d8..9356d4b 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsBrandGroupServiceImpl.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsBrandGroupServiceImpl.java @@ -1,22 +1,20 @@ -package quick.pager.shop.goods.service.impl; +package quick.pager.shop.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import quick.pager.shop.goods.mapper.GoodsBrandGroupMapper; -import quick.pager.shop.goods.model.GoodsBrandGroup; +import quick.pager.shop.mapper.GoodsBrandGroupMapper; +import quick.pager.shop.model.GoodsBrandGroup; import quick.pager.shop.goods.request.brand.GoodsBrandGroupOtherRequest; import quick.pager.shop.goods.request.brand.GoodsBrandGroupPageRequest; import quick.pager.shop.goods.request.brand.GoodsBrandGroupSaveRequest; import quick.pager.shop.goods.response.brand.GoodsBrandGroupResponse; -import quick.pager.shop.goods.service.GoodsBrandGroupService; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.impl.ServiceImpl; +import quick.pager.shop.service.GoodsBrandGroupService; +import quick.pager.shop.user.response.Response; import quick.pager.shop.utils.BeanCopier; import quick.pager.shop.utils.DateUtils; @@ -34,20 +32,11 @@ public class GoodsBrandGroupServiceImpl extends ServiceImpl> queryPage(GoodsBrandGroupPageRequest request) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(GoodsBrandGroup::getDeleteStatus, Boolean.FALSE); - if (StringUtils.isNotBlank(request.getBrandGroupName())) { - wrapper.likeRight(GoodsBrandGroup::getBrandGroupName, request.getBrandGroupName()); - } + Response> response = this.toPage(request.getPage(), request.getPageSize(), new LambdaQueryWrapper() + .eq(GoodsBrandGroup::getDeleteStatus, Boolean.FALSE) + .likeRight(StringUtils.isNotBlank(request.getBrandGroupName()), GoodsBrandGroup::getBrandGroupName, request.getBrandGroupName()) + .orderByDesc(GoodsBrandGroup::getSequence)); - if (CollectionUtils.isNotEmpty(request.getDateTimes())) { - wrapper.ge(GoodsBrandGroup::getUpdateTime, request.getDateTimes().get(0)); - wrapper.le(GoodsBrandGroup::getUpdateTime, request.getDateTimes().get(1)); - } - - wrapper.orderByDesc(GoodsBrandGroup::getSequence); - - Response> response = this.toPage(request.getPage(), request.getPageSize(), wrapper); return Response.toResponse(Optional.ofNullable(response.getData()).orElse(Collections.emptyList()).stream() .map(this::convert) .collect(Collectors.toList()), @@ -56,13 +45,10 @@ public Response> queryPage(GoodsBrandGroupPageRequ @Override public Response> queryList(GoodsBrandGroupOtherRequest request) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(GoodsBrandGroup::getDeleteStatus, Boolean.FALSE); - if (StringUtils.isNotBlank(request.getBrandGroupName())) { - wrapper.likeRight(GoodsBrandGroup::getBrandGroupName, request.getBrandGroupName()); - } - - wrapper.orderByDesc(GoodsBrandGroup::getSequence); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(GoodsBrandGroup::getDeleteStatus, Boolean.FALSE) + .likeRight(StringUtils.isNotBlank(request.getBrandGroupName()), GoodsBrandGroup::getBrandGroupName, request.getBrandGroupName()) + .orderByDesc(GoodsBrandGroup::getSequence); List brandGroups = this.baseMapper.selectList(wrapper); return Response.toResponse(brandGroups.stream().map(this::convert).collect(Collectors.toList()), 0L); } @@ -71,6 +57,7 @@ public Response> queryList(GoodsBrandGroupOtherReq public Response create(GoodsBrandGroupSaveRequest request) { GoodsBrandGroup group = convert(request); group.setCreateTime(DateUtils.dateTime()); + group.setUpdateTime(DateUtils.dateTime()); group.setDeleteStatus(Boolean.FALSE); this.baseMapper.insert(group); return new Response<>(group.getId()); @@ -79,6 +66,7 @@ public Response create(GoodsBrandGroupSaveRequest request) { @Override public Response modify(GoodsBrandGroupSaveRequest request) { GoodsBrandGroup group = convert(request); + group.setUpdateTime(DateUtils.dateTime()); this.baseMapper.updateById(group); return new Response<>(group.getId()); diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsBrandServiceImpl.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsBrandServiceImpl.java similarity index 67% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsBrandServiceImpl.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsBrandServiceImpl.java index b4323a1..71fb4b2 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsBrandServiceImpl.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsBrandServiceImpl.java @@ -1,4 +1,4 @@ -package quick.pager.shop.goods.service.impl; +package quick.pager.shop.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.List; @@ -6,17 +6,15 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import quick.pager.shop.goods.mapper.GoodsBrandGroupMapper; -import quick.pager.shop.goods.mapper.GoodsBrandMapper; -import quick.pager.shop.goods.model.GoodsBrand; -import quick.pager.shop.goods.model.GoodsBrandGroup; +import quick.pager.shop.mapper.GoodsBrandGroupMapper; +import quick.pager.shop.mapper.GoodsBrandMapper; +import quick.pager.shop.model.GoodsBrand; +import quick.pager.shop.model.GoodsBrandGroup; import quick.pager.shop.goods.request.brand.GoodsBrandPageRequest; import quick.pager.shop.goods.request.brand.GoodsBrandSaveRequest; import quick.pager.shop.goods.response.brand.GoodsBrandResponse; -import quick.pager.shop.goods.service.GoodsBrandService; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.impl.ServiceImpl; +import quick.pager.shop.service.GoodsBrandService; +import quick.pager.shop.user.response.Response; import quick.pager.shop.utils.BeanCopier; import quick.pager.shop.utils.DateUtils; @@ -33,28 +31,15 @@ public class GoodsBrandServiceImpl extends ServiceImpl> queryPage(GoodsBrandPageRequest request) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(GoodsBrand::getDeleteStatus, Boolean.FALSE); - - if (StringUtils.isNotBlank(request.getBrandCode())) { - wrapper.eq(GoodsBrand::getBrandCode, request.getBrandCode()); - } - - if (StringUtils.isNotBlank(request.getBrandName())) { - wrapper.likeRight(GoodsBrand::getBrandName, request.getBrandName()); - } - - if (!CollectionUtils.isEmpty(request.getDateTimes())) { - wrapper.ge(GoodsBrand::getCreateTime, request.getDateTimes().get(0)); - wrapper.le(GoodsBrand::getCreateTime, request.getDateTimes().get(1)); - } - - Response> page = this.toPage(request.getPage(), request.getPageSize(), wrapper); + Response> page = this.toPage(request.getPage(), request.getPageSize(), new LambdaQueryWrapper() + .eq(GoodsBrand::getDeleteStatus, Boolean.FALSE) + .eq(StringUtils.isNotBlank(request.getBrandCode()), GoodsBrand::getBrandCode, request.getBrandCode()) + .likeRight(StringUtils.isNotBlank(request.getBrandName()), GoodsBrand::getBrandName, request.getBrandName()) + .orderByDesc(GoodsBrand::getUpdateTime)); return Response.toResponse(page.getData().stream().map(this::convert).collect(Collectors.toList()), page.getTotal()); } - @Override public Response create(GoodsBrandSaveRequest request) { GoodsBrand brand = this.convert(request); diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsBrandSpuServiceImpl.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsBrandSpuServiceImpl.java similarity index 64% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsBrandSpuServiceImpl.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsBrandSpuServiceImpl.java index 001b8b4..118ea00 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsBrandSpuServiceImpl.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsBrandSpuServiceImpl.java @@ -1,10 +1,10 @@ -package quick.pager.shop.goods.service.impl; +package quick.pager.shop.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import quick.pager.shop.goods.mapper.GoodsBrandSpuMapper; -import quick.pager.shop.goods.model.GoodsBrandSpu; -import quick.pager.shop.goods.service.GoodsBrandSpuService; +import quick.pager.shop.mapper.GoodsBrandSpuMapper; +import quick.pager.shop.model.GoodsBrandSpu; +import quick.pager.shop.service.GoodsBrandSpuService; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsClassServiceImpl.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsClassServiceImpl.java similarity index 71% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsClassServiceImpl.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsClassServiceImpl.java index 6dfd7d0..da045ae 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsClassServiceImpl.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsClassServiceImpl.java @@ -1,6 +1,7 @@ -package quick.pager.shop.goods.service.impl; +package quick.pager.shop.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.google.common.collect.Lists; import java.time.LocalDateTime; import java.util.Collections; import java.util.List; @@ -13,16 +14,17 @@ import org.springframework.stereotype.Service; import quick.pager.shop.activity.client.BannerClient; import quick.pager.shop.activity.response.banner.BannerResponse; -import quick.pager.shop.goods.mapper.GoodsClassBannerMapper; -import quick.pager.shop.goods.model.GoodsClass; -import quick.pager.shop.goods.mapper.GoodsClassMapper; -import quick.pager.shop.goods.model.GoodsClassBanner; +import quick.pager.shop.constants.IConsts; +import quick.pager.shop.constants.ResponseStatus; +import quick.pager.shop.mapper.GoodsClassBannerMapper; +import quick.pager.shop.model.GoodsClass; +import quick.pager.shop.mapper.GoodsClassMapper; +import quick.pager.shop.model.GoodsClassBanner; import quick.pager.shop.goods.request.classification.GoodsClassificationPageRequest; import quick.pager.shop.goods.request.classification.GoodsClassificationSaveRequest; import quick.pager.shop.goods.response.classification.GoodsClassificationResponse; -import quick.pager.shop.response.Response; -import quick.pager.shop.goods.service.GoodsClassService; -import quick.pager.shop.service.impl.ServiceImpl; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.GoodsClassService; import quick.pager.shop.utils.BeanCopier; import quick.pager.shop.utils.DateUtils; @@ -44,6 +46,12 @@ public class GoodsClassServiceImpl extends ServiceImpl create(GoodsClassificationSaveRequest request) { + if (StringUtils.isBlank(request.getClassName())) { + return new Response<>(ResponseStatus.Code.FAIL_CODE, "分类名称不能为空！"); + } + if (checkName(request.getClassName(), null)) { + return new Response<>(ResponseStatus.Code.FAIL_CODE, "分类名称已存在！"); + } GoodsClass gc = this.convert(request); LocalDateTime dateTime = DateUtils.dateTime(); gc.setCreateTime(dateTime); @@ -58,18 +66,22 @@ public Response create(GoodsClassificationSaveRequest request) { @Override public Response modify(GoodsClassificationSaveRequest request) { + if (StringUtils.isNotBlank(request.getClassName()) && checkName(request.getClassName(), request.getId())) { + return new Response<>(ResponseStatus.Code.FAIL_CODE, "分类名称已存在！"); + } GoodsClass gc = this.convert(request); + gc.setUpdateTime(DateUtils.dateTime()); this.baseMapper.updateById(gc); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(GoodsClassBanner::getDeleteStatus, Boolean.FALSE); - wrapper.eq(GoodsClassBanner::getClassificationId, request.getId()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(GoodsClassBanner::getDeleteStatus, Boolean.FALSE) + .eq(GoodsClassBanner::getClassificationId, request.getId()); List goodsClassBanners = goodsClassBannerMapper.selectList(wrapper); if (CollectionUtils.isNotEmpty(goodsClassBanners)) { goodsClassBanners.stream().findFirst().ifPresent(item -> { // 存在 if (Objects.nonNull(request.getBannerId())) { // 更新 - if (0 != item.getBannerId().compareTo(request.getBannerId())) { + if (IConsts.ZERO != item.getBannerId().compareTo(request.getBannerId())) { updateGoodsClassBanner(item.getId(), request.getBannerId(), gc.getId(), request.getUpdateUser()); } else { // 新增 insertGoodsClassBanner(request.getBannerId(), gc.getId(), DateUtils.dateTime(), request.getUpdateUser(), request.getCreateUser()); @@ -87,12 +99,9 @@ public Response modify(GoodsClassificationSaveRequest request) { @Override public Response> queryPage(GoodsClassificationPageRequest request) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(GoodsClass::getDeleteStatus, Boolean.FALSE); - - if (StringUtils.isNotBlank(request.getClassName())) { - wrapper.likeRight(GoodsClass::getClassName, request.getClassName()); - } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(GoodsClass::getDeleteStatus, Boolean.FALSE) + .likeRight(StringUtils.isNotBlank(request.getClassName()), GoodsClass::getClassName, request.getClassName()); Response> response = this.toPage(request.getPage(), request.getPageSize(), wrapper); @@ -104,11 +113,9 @@ public Response> queryPage(GoodsClassification @Override public Response> classificationTree() { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(GoodsClass::getDeleteStatus, Boolean.FALSE); - wrapper.isNull(GoodsClass::getParentId); - - List goodsClasses = this.baseMapper.selectList(wrapper); + List goodsClasses = this.baseMapper.selectList(new LambdaQueryWrapper() + .eq(GoodsClass::getDeleteStatus, Boolean.FALSE) + .isNull(GoodsClass::getParentId)); return Response.toResponse(goodsClasses.stream().map(this::convert) .peek(item -> item.setChildren(this.toTree(item.getId()))) @@ -128,10 +135,9 @@ private GoodsClassificationResponse convert(GoodsClass gc) { response.setParentClassName(goodsClass.getClassName()); } // 查询是否关联banner - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(GoodsClassBanner::getDeleteStatus, Boolean.FALSE); - wrapper.eq(GoodsClassBanner::getClassificationId, gc.getId()); - List goodsClassBanners = goodsClassBannerMapper.selectList(wrapper); + List goodsClassBanners = goodsClassBannerMapper.selectList(new LambdaQueryWrapper() + .eq(GoodsClassBanner::getDeleteStatus, Boolean.FALSE) + .eq(GoodsClassBanner::getClassificationId, gc.getId())); if (CollectionUtils.isNotEmpty(goodsClassBanners)) { goodsClassBanners.stream().findFirst().ifPresent(item -> { Response bannerResponse = bannerClient.queryByPk(item.getBannerId()); @@ -149,15 +155,13 @@ private GoodsClassificationResponse convert(GoodsClass gc) { * 设置子节点孩子数据 */ private List toTree(Long id) { - - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(GoodsClass::getDeleteStatus, Boolean.FALSE); - wrapper.eq(GoodsClass::getParentId, id); - List goodsClasses = this.baseMapper.selectList(wrapper); + List goodsClasses = this.baseMapper.selectList(new LambdaQueryWrapper() + .eq(GoodsClass::getDeleteStatus, Boolean.FALSE) + .eq(GoodsClass::getParentId, id)); if (CollectionUtils.isNotEmpty(goodsClasses)) { return goodsClasses.stream().map(this::convert).collect(Collectors.toList()); } - return null; + return Lists.newArrayList(); } @@ -206,4 +210,29 @@ private void updateGoodsClassBanner(Long id, Long bannerId, Long classificationI goodsClassBannerMapper.updateById(goodsClassBanner); } + /** + * 校验名称的唯一性 + * + * @param name 分类名称 + * @param id 分类主键 + * @return true 表示已经存在，反之亦然 + */ + private Boolean checkName(final String name, final Long id) { + List classes = this.baseMapper.selectList(new LambdaQueryWrapper() + .eq(GoodsClass::getDeleteStatus, Boolean.FALSE) + .eq(GoodsClass::getClassName, name)); + + if (CollectionUtils.isEmpty(classes)) { + return Boolean.FALSE; + } + + return classes.stream().filter(item -> { + if (Objects.isNull(id)) { + return Boolean.TRUE; + } else { + return IConsts.ZERO != item.getId().compareTo(id); + } + }).anyMatch(item -> item.getClassName().equals(name)); + } + } diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsPropertyGroupServiceImpl.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsPropertyGroupServiceImpl.java similarity index 72% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsPropertyGroupServiceImpl.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsPropertyGroupServiceImpl.java index 4f4ef8d..3568148 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsPropertyGroupServiceImpl.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsPropertyGroupServiceImpl.java @@ -1,19 +1,18 @@ -package quick.pager.shop.goods.service.impl; +package quick.pager.shop.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.List; import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import quick.pager.shop.goods.mapper.GoodsPropertyGroupMapper; -import quick.pager.shop.goods.model.GoodsPropertyGroup; +import quick.pager.shop.mapper.GoodsPropertyGroupMapper; +import quick.pager.shop.model.GoodsPropertyGroup; import quick.pager.shop.goods.request.property.group.GoodsPropertyGroupOtherRequest; import quick.pager.shop.goods.request.property.group.GoodsPropertyGroupPageRequest; import quick.pager.shop.goods.request.property.group.GoodsPropertyGroupSaveRequest; import quick.pager.shop.goods.response.property.group.GoodsPropertyGroupResponse; -import quick.pager.shop.goods.service.GoodsPropertyGroupService; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.impl.ServiceImpl; +import quick.pager.shop.service.GoodsPropertyGroupService; +import quick.pager.shop.user.response.Response; import quick.pager.shop.utils.BeanCopier; import quick.pager.shop.utils.DateUtils; @@ -31,16 +30,10 @@ public class GoodsPropertyGroupServiceImpl extends ServiceImpl> queryPage(GoodsPropertyGroupPageRequest request) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(GoodsPropertyGroup::getDeleteStatus, Boolean.FALSE); - - if (StringUtils.isNotBlank(request.getPropertyGroupName())) { - wrapper.likeRight(GoodsPropertyGroup::getPropertyGroupName, request.getPropertyGroupName()); - } - - wrapper.orderByDesc(GoodsPropertyGroup::getUpdateTime); - - Response> page = this.toPage(request.getPage(), request.getPageSize(), wrapper); + Response> page = this.toPage(request.getPage(), request.getPageSize(), new LambdaQueryWrapper() + .eq(GoodsPropertyGroup::getDeleteStatus, Boolean.FALSE) + .likeRight(StringUtils.isNotBlank(request.getPropertyGroupName()), GoodsPropertyGroup::getPropertyGroupName, request.getPropertyGroupName()) + .orderByDesc(GoodsPropertyGroup::getUpdateTime)); return Response.toResponse(page.getData().stream().map(this::convert).collect(Collectors.toList()), page.getTotal()); } @@ -48,14 +41,10 @@ public Response> queryPage(GoodsPropertyGroupPa @Override public Response> queryList(GoodsPropertyGroupOtherRequest request) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(GoodsPropertyGroup::getDeleteStatus, Boolean.FALSE); - - if (StringUtils.isNotBlank(request.getPropertyGroupName())) { - wrapper.likeRight(GoodsPropertyGroup::getPropertyGroupName, request.getPropertyGroupName()); - } - - wrapper.orderByDesc(GoodsPropertyGroup::getUpdateTime); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(StringUtils.isNotBlank(request.getPropertyGroupName()), GoodsPropertyGroup::getDeleteStatus, Boolean.FALSE) + .likeRight(GoodsPropertyGroup::getPropertyGroupName, request.getPropertyGroupName()) + .orderByDesc(GoodsPropertyGroup::getUpdateTime); List goodsPropertyGroups = this.baseMapper.selectList(wrapper); diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsPropertyServiceImpl.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsPropertyServiceImpl.java similarity index 73% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsPropertyServiceImpl.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsPropertyServiceImpl.java index e1228fe..1f746bc 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsPropertyServiceImpl.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsPropertyServiceImpl.java @@ -1,4 +1,4 @@ -package quick.pager.shop.goods.service.impl; +package quick.pager.shop.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.List; @@ -7,16 +7,15 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import quick.pager.shop.goods.mapper.GoodsPropertyGroupMapper; -import quick.pager.shop.goods.mapper.GoodsPropertyMapper; -import quick.pager.shop.goods.model.GoodsProperty; -import quick.pager.shop.goods.model.GoodsPropertyGroup; +import quick.pager.shop.mapper.GoodsPropertyGroupMapper; +import quick.pager.shop.mapper.GoodsPropertyMapper; +import quick.pager.shop.model.GoodsProperty; +import quick.pager.shop.model.GoodsPropertyGroup; import quick.pager.shop.goods.request.property.GoodsPropertyPageRequest; import quick.pager.shop.goods.request.property.GoodsPropertySaveRequest; import quick.pager.shop.goods.response.property.GoodsPropertyResponse; -import quick.pager.shop.goods.service.GoodsPropertyService; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.impl.ServiceImpl; +import quick.pager.shop.service.GoodsPropertyService; +import quick.pager.shop.user.response.Response; import quick.pager.shop.utils.BeanCopier; import quick.pager.shop.utils.DateUtils; @@ -37,20 +36,11 @@ public class GoodsPropertyServiceImpl extends ServiceImpl> queryPage(GoodsPropertyPageRequest request) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(GoodsProperty::getDeleteStatus, Boolean.FALSE); - - if (StringUtils.isNotBlank(request.getPropertyName())) { - wrapper.likeRight(GoodsProperty::getPropertyName, request.getPropertyName()); - } - - if (Objects.nonNull(request.getPropertyGroupId())) { - wrapper.eq(GoodsProperty::getPropertyGroupId, request.getPropertyGroupId()); - } - - wrapper.orderByDesc(GoodsProperty::getUpdateTime); - - Response> page = this.toPage(request.getPage(), request.getPageSize(), wrapper); + Response> page = this.toPage(request.getPage(), request.getPageSize(), new LambdaQueryWrapper() + .eq(GoodsProperty::getDeleteStatus, Boolean.FALSE) + .eq(Objects.nonNull(request.getPropertyGroupId()), GoodsProperty::getPropertyGroupId, request.getPropertyGroupId()) + .likeRight(StringUtils.isNotBlank(request.getPropertyName()), GoodsProperty::getPropertyName, request.getPropertyName()) + .orderByDesc(GoodsProperty::getUpdateTime)); return Response.toResponse(page.getData().stream().map(this::convert).collect(Collectors.toList()), page.getTotal()); } diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsServiceImpl.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsServiceImpl.java similarity index 73% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsServiceImpl.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsServiceImpl.java index 539fe38..5440222 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsServiceImpl.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsServiceImpl.java @@ -1,4 +1,4 @@ -package quick.pager.shop.goods.service.impl; +package quick.pager.shop.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.List; @@ -9,23 +9,21 @@ import org.springframework.stereotype.Service; import quick.pager.shop.goods.enums.GoodsPublishStatusEnum; import quick.pager.shop.goods.enums.GoodsTypeEnum; -import quick.pager.shop.goods.mapper.GoodsBrandMapper; -import quick.pager.shop.goods.mapper.GoodsClassMapper; -import quick.pager.shop.goods.mapper.GoodsMapper; -import quick.pager.shop.goods.mapper.GoodsPropertyGroupMapper; -import quick.pager.shop.goods.mapper.GoodsSpuMapper; -import quick.pager.shop.goods.model.Goods; -import quick.pager.shop.goods.model.GoodsBrand; -import quick.pager.shop.goods.model.GoodsClass; -import quick.pager.shop.goods.model.GoodsPropertyGroup; -import quick.pager.shop.goods.model.GoodsSpu; -import quick.pager.shop.goods.repository.ESGoodsRepository; +import quick.pager.shop.mapper.GoodsBrandMapper; +import quick.pager.shop.mapper.GoodsClassMapper; +import quick.pager.shop.mapper.GoodsMapper; +import quick.pager.shop.mapper.GoodsPropertyGroupMapper; +import quick.pager.shop.mapper.GoodsSpuMapper; +import quick.pager.shop.model.Goods; +import quick.pager.shop.model.GoodsBrand; +import quick.pager.shop.model.GoodsClass; +import quick.pager.shop.model.GoodsPropertyGroup; +import quick.pager.shop.model.GoodsSpu; import quick.pager.shop.goods.request.GoodsPageRequest; import quick.pager.shop.goods.request.GoodsSaveRequest; import quick.pager.shop.goods.response.GoodsResponse; -import quick.pager.shop.goods.service.GoodsService; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.impl.ServiceImpl; +import quick.pager.shop.service.GoodsService; +import quick.pager.shop.user.response.Response; import quick.pager.shop.utils.BeanCopier; import quick.pager.shop.utils.DateUtils; @@ -45,8 +43,6 @@ public class GoodsServiceImpl extends ServiceImpl implements private GoodsSpuMapper goodsSpuMapper; @Autowired private GoodsPropertyGroupMapper goodsPropertyGroupMapper; - @Autowired - private ESGoodsRepository goodsRepository; @Override public Response create(GoodsSaveRequest request) { @@ -70,29 +66,15 @@ public Response modify(GoodsSaveRequest request) { @Override public Response> queryPage(GoodsPageRequest request) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Goods::getDeleteStatus, Boolean.FALSE); - if (StringUtils.isNotBlank(request.getName())) { - wrapper.likeRight(Goods::getName, request.getName()); - } - if (Objects.nonNull(request.getBrandId())) { - wrapper.eq(Goods::getBrandId, request.getBrandId()); - } - if (Objects.nonNull(request.getGcsId())) { - wrapper.eq(Goods::getGcsId, request.getGcsId()); - } - if (Objects.nonNull(request.getPublishStatus())) { - wrapper.eq(Goods::getPublishStatus, request.getPublishStatus()); - } - if (Objects.nonNull(request.getRecommend())) { - wrapper.eq(Goods::getRecommend, request.getRecommend()); - } - if (Objects.nonNull(request.getState())) { - wrapper.eq(Goods::getState, request.getState()); - } - if (Objects.nonNull(request.getSpuId())) { - wrapper.eq(Goods::getSpuId, request.getSpuId()); - } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(Goods::getDeleteStatus, Boolean.FALSE) + .likeRight(StringUtils.isNotBlank(request.getName()), Goods::getName, request.getName()) + .eq(Objects.nonNull(request.getBrandId()), Goods::getBrandId, request.getBrandId()) + .eq(Objects.nonNull(request.getGcsId()), Goods::getGcsId, request.getGcsId()) + .eq(Objects.nonNull(request.getPublishStatus()), Goods::getPublishStatus, request.getPublishStatus()) + .eq(Objects.nonNull(request.getRecommend()), Goods::getRecommend, request.getRecommend()) + .eq(Objects.nonNull(request.getState()), Goods::getState, request.getState()) + .eq(Objects.nonNull(request.getSpuId()), Goods::getSpuId, request.getSpuId()); Response> page = this.toPage(request.getPage(), request.getPageSize(), wrapper); diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsSkuImageServiceImpl.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsSkuImageServiceImpl.java similarity index 62% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsSkuImageServiceImpl.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsSkuImageServiceImpl.java index a13ec75..47ee4b3 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsSkuImageServiceImpl.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsSkuImageServiceImpl.java @@ -1,10 +1,10 @@ -package quick.pager.shop.goods.service.impl; +package quick.pager.shop.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import quick.pager.shop.goods.mapper.GoodsSkuImageMapper; -import quick.pager.shop.goods.model.GoodsSkuImage; -import quick.pager.shop.goods.service.GoodsSkuImageService; +import quick.pager.shop.mapper.GoodsSkuImageMapper; +import quick.pager.shop.model.GoodsSkuImage; +import quick.pager.shop.service.GoodsSkuImageService; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsSkuPropertyGroupServiceImpl.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsSkuPropertyGroupServiceImpl.java similarity index 65% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsSkuPropertyGroupServiceImpl.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsSkuPropertyGroupServiceImpl.java index 02e916a..1b33c99 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsSkuPropertyGroupServiceImpl.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsSkuPropertyGroupServiceImpl.java @@ -1,10 +1,10 @@ -package quick.pager.shop.goods.service.impl; +package quick.pager.shop.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import quick.pager.shop.goods.mapper.GoodsSkuPropertyGroupMapper; -import quick.pager.shop.goods.model.GoodsSkuPropertyGroup; -import quick.pager.shop.goods.service.GoodsSkuPropertyGroupService; +import quick.pager.shop.mapper.GoodsSkuPropertyGroupMapper; +import quick.pager.shop.model.GoodsSkuPropertyGroup; +import quick.pager.shop.service.GoodsSkuPropertyGroupService; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsSkuPropertyServiceImpl.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsSkuPropertyServiceImpl.java similarity index 65% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsSkuPropertyServiceImpl.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsSkuPropertyServiceImpl.java index c76554d..a770429 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsSkuPropertyServiceImpl.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsSkuPropertyServiceImpl.java @@ -1,10 +1,10 @@ -package quick.pager.shop.goods.service.impl; +package quick.pager.shop.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import quick.pager.shop.goods.mapper.GoodsSkuPropertyMapper; -import quick.pager.shop.goods.model.GoodsSkuProperty; -import quick.pager.shop.goods.service.GoodsSkuPropertyService; +import quick.pager.shop.mapper.GoodsSkuPropertyMapper; +import quick.pager.shop.model.GoodsSkuProperty; +import quick.pager.shop.service.GoodsSkuPropertyService; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsSkuServiceImpl.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsSkuServiceImpl.java similarity index 69% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsSkuServiceImpl.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsSkuServiceImpl.java index a520f75..b18a086 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsSkuServiceImpl.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsSkuServiceImpl.java @@ -1,4 +1,4 @@ -package quick.pager.shop.goods.service.impl; +package quick.pager.shop.service.impl; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSON; @@ -10,19 +10,19 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import quick.pager.shop.goods.mapper.GoodsMapper; -import quick.pager.shop.goods.mapper.GoodsSkuImageMapper; -import quick.pager.shop.goods.mapper.GoodsSkuMapper; -import quick.pager.shop.goods.model.Goods; -import quick.pager.shop.goods.model.GoodsSku; -import quick.pager.shop.goods.model.GoodsSkuImage; +import quick.pager.shop.mapper.GoodsMapper; +import quick.pager.shop.mapper.GoodsSkuImageMapper; +import quick.pager.shop.mapper.GoodsSkuMapper; +import quick.pager.shop.model.Goods; +import quick.pager.shop.model.GoodsSku; +import quick.pager.shop.model.GoodsSkuImage; +import quick.pager.shop.goods.request.sku.GoodsSkuOtherRequest; import quick.pager.shop.goods.request.sku.GoodsSkuPageRequest; import quick.pager.shop.goods.request.sku.GoodsSkuSaveRequest; import quick.pager.shop.goods.response.sku.GoodsSkuResponse; -import quick.pager.shop.goods.service.GoodsSkuService; +import quick.pager.shop.service.GoodsSkuService; import quick.pager.shop.model.ImageModel; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.impl.ServiceImpl; +import quick.pager.shop.user.response.Response; import quick.pager.shop.utils.BeanCopier; import quick.pager.shop.utils.DateUtils; @@ -44,7 +44,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl i private GoodsMapper goodsMapper; @Override - public Response create(GoodsSkuSaveRequest request) { + public Response create(final GoodsSkuSaveRequest request) { GoodsSku sku = this.convert(request); sku.setCreateTime(DateUtils.dateTime()); sku.setUpdateTime(DateUtils.dateTime()); @@ -71,7 +71,7 @@ public Response create(GoodsSkuSaveRequest request) { } @Override - public Response modify(GoodsSkuSaveRequest request) { + public Response modify(final GoodsSkuSaveRequest request) { GoodsSku sku = this.convert(request); sku.setUpdateTime(DateUtils.dateTime()); this.baseMapper.updateById(sku); @@ -79,31 +79,28 @@ public Response modify(GoodsSkuSaveRequest request) { } @Override - public Response> queryPage(GoodsSkuPageRequest request) { - LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - qw.eq(GoodsSku::getDeleteStatus, Boolean.FALSE); - - if (StringUtils.isNotBlank(request.getSkuName())) { - qw.likeRight(GoodsSku::getSkuName, request.getSkuName()); - } - - if (StringUtils.isNotBlank(request.getSkuCode())) { - qw.eq(GoodsSku::getSkuCode, request.getSkuCode()); - } - - if (Objects.nonNull(request.getInventory())) { - qw.eq(GoodsSku::getInventory, request.getInventory()); - } + public Response> queryPage(final GoodsSkuPageRequest request) { + + Response> page = this.toPage(request.getPage(), request.getPageSize(), new LambdaQueryWrapper() + .eq(GoodsSku::getDeleteStatus, Boolean.FALSE) + .likeRight(StringUtils.isNotBlank(request.getSkuName()), GoodsSku::getSkuName, request.getSkuName()) + .eq(StringUtils.isNotBlank(request.getSkuCode()), GoodsSku::getSkuCode, request.getSkuCode()) + .eq(Objects.nonNull(request.getInventory()), GoodsSku::getInventory, request.getInventory()) + .eq(Objects.nonNull(request.getDefaultSku()), GoodsSku::getDefaultSku, request.getDefaultSku()) + .orderByDesc(GoodsSku::getUpdateTime)); + return Response.toResponse(page.getData().stream().map(this::convert).collect(Collectors.toList()) + , page.getTotal()); + } - if (Objects.nonNull(request.getDefaultSku())) { - qw.eq(GoodsSku::getDefaultSku, request.getDefaultSku()); - } + @Override + public Response> queryList(GoodsSkuOtherRequest request) { - qw.orderByDesc(GoodsSku::getUpdateTime); + List skus = this.baseMapper.selectList(new LambdaQueryWrapper() + .eq(GoodsSku::getDeleteStatus, Boolean.FALSE) + .in(GoodsSku::getId, request.getIds()) + .orderByDesc(GoodsSku::getUpdateTime)); - Response> page = this.toPage(request.getPage(), request.getPageSize(), qw); - return Response.toResponse(page.getData().stream().map(this::convert).collect(Collectors.toList()) - , page.getTotal()); + return Response.toResponse(skus.stream().map(this::convert).collect(Collectors.toList())); } /** diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsSkuStockServiceImpl.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsSkuStockServiceImpl.java similarity index 65% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsSkuStockServiceImpl.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsSkuStockServiceImpl.java index 07075b2..9e75a9c 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsSkuStockServiceImpl.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsSkuStockServiceImpl.java @@ -1,10 +1,10 @@ -package quick.pager.shop.goods.service.impl; +package quick.pager.shop.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import quick.pager.shop.goods.mapper.GoodsSkuStockMapper; -import quick.pager.shop.goods.model.GoodsSkuStock; -import quick.pager.shop.goods.service.GoodsSkuStockService; +import quick.pager.shop.mapper.GoodsSkuStockMapper; +import quick.pager.shop.model.GoodsSkuStock; +import quick.pager.shop.service.GoodsSkuStockService; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsSkuTagServiceImpl.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsSkuTagServiceImpl.java similarity index 63% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsSkuTagServiceImpl.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsSkuTagServiceImpl.java index 97b4ff2..7b35d27 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsSkuTagServiceImpl.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsSkuTagServiceImpl.java @@ -1,10 +1,10 @@ -package quick.pager.shop.goods.service.impl; +package quick.pager.shop.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import quick.pager.shop.goods.mapper.GoodsSkuTagMapper; -import quick.pager.shop.goods.model.GoodsSkuTag; -import quick.pager.shop.goods.service.GoodsSkuTagService; +import quick.pager.shop.mapper.GoodsSkuTagMapper; +import quick.pager.shop.model.GoodsSkuTag; +import quick.pager.shop.service.GoodsSkuTagService; /** *

diff --git a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsSpuServiceImpl.java b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsSpuServiceImpl.java similarity index 52% rename from shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsSpuServiceImpl.java rename to shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsSpuServiceImpl.java index 1370dae..69ec7ba 100644 --- a/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/goods/service/impl/GoodsSpuServiceImpl.java +++ b/shop-goods/shop-goods-api/src/main/java/quick/pager/shop/service/impl/GoodsSpuServiceImpl.java @@ -1,22 +1,24 @@ -package quick.pager.shop.goods.service.impl; +package quick.pager.shop.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import quick.pager.shop.goods.mapper.GoodsClassMapper; -import quick.pager.shop.goods.mapper.GoodsSpuMapper; -import quick.pager.shop.goods.model.GoodsClass; -import quick.pager.shop.goods.model.GoodsSpu; +import quick.pager.shop.constants.IConsts; +import quick.pager.shop.constants.ResponseStatus; +import quick.pager.shop.mapper.GoodsClassMapper; +import quick.pager.shop.mapper.GoodsSpuMapper; +import quick.pager.shop.model.GoodsClass; +import quick.pager.shop.model.GoodsSpu; import quick.pager.shop.goods.request.spu.GoodsSpuPageRequest; import quick.pager.shop.goods.request.spu.GoodsSpuSaveRequest; import quick.pager.shop.goods.response.spu.GoodsSpuResponse; -import quick.pager.shop.goods.service.GoodsSpuService; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.impl.ServiceImpl; +import quick.pager.shop.service.GoodsSpuService; +import quick.pager.shop.user.response.Response; import quick.pager.shop.utils.BeanCopier; import quick.pager.shop.utils.DateUtils; @@ -36,6 +38,12 @@ public class GoodsSpuServiceImpl extends ServiceImpl i @Override public Response create(GoodsSpuSaveRequest request) { + if (StringUtils.isBlank(request.getSpuName())) { + return new Response<>(ResponseStatus.Code.FAIL_CODE, "spu名称不能为空！"); + } + if (checkName(request.getSpuName(), null)) { + return new Response<>(ResponseStatus.Code.FAIL_CODE, "spu名称已存在！"); + } GoodsSpu spu = this.conv(request); spu.setCreateTime(DateUtils.dateTime()); spu.setDeleteStatus(Boolean.FALSE); @@ -45,6 +53,9 @@ public Response create(GoodsSpuSaveRequest request) { @Override public Response modify(GoodsSpuSaveRequest request) { + if (StringUtils.isNotBlank(request.getSpuName()) && checkName(request.getSpuName(), request.getId())) { + return new Response<>(ResponseStatus.Code.FAIL_CODE, "spu名称已存在！"); + } GoodsSpu spu = this.conv(request); this.baseMapper.updateById(spu); return new Response<>(spu.getId()); @@ -53,13 +64,10 @@ public Response modify(GoodsSpuSaveRequest request) { @Override public Response> queryPage(GoodsSpuPageRequest request) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(GoodsSpu::getDeleteStatus, Boolean.FALSE); - - if (StringUtils.isNotBlank(request.getSpuName())) { - wrapper.likeRight(GoodsSpu::getSpuName, request.getSpuName()); - } - Response> response = this.toPage(request.getPage(), request.getPageSize(), wrapper); + Response> response = this.toPage(request.getPage(), request.getPageSize(), new LambdaQueryWrapper() + .eq(GoodsSpu::getDeleteStatus, Boolean.FALSE) + .likeRight(StringUtils.isNotBlank(request.getSpuName()), GoodsSpu::getSpuName, request.getSpuName()) + .orderByDesc(GoodsSpu::getUpdateTime)); return Response.toResponse(response.getData().stream().map(this::conv).collect(Collectors.toList()), response.getTotal()); } @@ -81,4 +89,29 @@ private GoodsSpuResponse conv(GoodsSpu spu) { return response; } + + /** + * 校验名称的唯一性 + * + * @param name spu名称 + * @param id spu主键 + * @return true 表示已经存在，反之亦然 + */ + private Boolean checkName(final String name, final Long id) { + List spus = this.baseMapper.selectList(new LambdaQueryWrapper() + .eq(GoodsSpu::getDeleteStatus, Boolean.FALSE) + .eq(GoodsSpu::getSpuName, name)); + + if (CollectionUtils.isEmpty(spus)) { + return Boolean.FALSE; + } + + return spus.stream().filter(item -> { + if (Objects.isNull(id)) { + return Boolean.TRUE; + } else { + return IConsts.ZERO != item.getId().compareTo(id); + } + }).anyMatch(item -> item.getSpuName().equals(name)); + } } diff --git a/shop-goods/shop-goods-api/src/main/resources/bootstrap-dev.yml b/shop-goods/shop-goods-api/src/main/resources/bootstrap-dev.yml index 2606de0..fa2683b 100644 --- a/shop-goods/shop-goods-api/src/main/resources/bootstrap-dev.yml +++ b/shop-goods/shop-goods-api/src/main/resources/bootstrap-dev.yml @@ -3,14 +3,29 @@ spring: nacos: config: server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d discovery: server-addr: 101.132.121.178:8848 -# ip: 101.132.121.178 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d sentinel: enabled: true transport: - dashboard: http://localhost:9999 - + dashboard: 127.0.0.1:8080 + filter: + enabled: true + data: + elasticsearch: + cluster-name: elasticsearch + cluster-nodes: 192.168.199.101:9200 +seata: + service: + vgroup-mapping: + shop-goods-seata-service-group: default + grouplist: + default: 101.132.121.178:8091 + disable-global-transaction: false # 内部服务调用授权认证配置 security: oauth2: diff --git a/shop-goods/shop-goods-api/src/main/resources/bootstrap.yml b/shop-goods/shop-goods-api/src/main/resources/bootstrap.yml index 1e30fa4..ccb7fa9 100644 --- a/shop-goods/shop-goods-api/src/main/resources/bootstrap.yml +++ b/shop-goods/shop-goods-api/src/main/resources/bootstrap.yml @@ -4,6 +4,8 @@ server: spring: application: name: shop-goods + autoconfigure: + exclude: org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration main: allow-bean-definition-overriding: true profiles: @@ -20,14 +22,17 @@ management: endpoints: web: exposure: - include: refresh,health,info, + include: refresh,health,info + mybatis-plus: - type-aliases-package: quick.pager.shop.model.goods + type-aliases-package: quick.pager.shop.model configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl global-config: db-config: id-type: auto + logging: level: com.alibaba.nacos: error +# config: classpath:logback-spring.xml diff --git a/shop-job/shop-job-api/src/main/resources/logback.xml b/shop-goods/shop-goods-api/src/main/resources/logback-spring.xml similarity index 98% rename from shop-job/shop-job-api/src/main/resources/logback.xml rename to shop-goods/shop-goods-api/src/main/resources/logback-spring.xml index 2186a42..3b57233 100644 --- a/shop-job/shop-job-api/src/main/resources/logback.xml +++ b/shop-goods/shop-goods-api/src/main/resources/logback-spring.xml @@ -147,10 +147,8 @@ - - diff --git a/shop-goods/shop-goods-client/pom.xml b/shop-goods/shop-goods-client/pom.xml index 30dcd1c..9b62d29 100644 --- a/shop-goods/shop-goods-client/pom.xml +++ b/shop-goods/shop-goods-client/pom.xml @@ -24,17 +24,9 @@ provided - - org.springframework.cloud - spring-cloud-starter-netflix-ribbon - 2.1.0.RELEASE - provided - - org.springframework.cloud spring-cloud-starter-openfeign - 2.1.0.RELEASE provided @@ -43,12 +35,6 @@ shop-goods-model ${project.version} - - - quick.pager - shop-common - ${project.version} - diff --git a/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/ClassificationClient.java b/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/ClassificationClient.java index f252139..e71982c 100644 --- a/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/ClassificationClient.java +++ b/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/ClassificationClient.java @@ -10,7 +10,7 @@ import quick.pager.shop.goods.request.classification.GoodsClassificationPageRequest; import quick.pager.shop.goods.request.classification.GoodsClassificationSaveRequest; import quick.pager.shop.goods.response.classification.GoodsClassificationResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 商品 -> 分类服务 diff --git a/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/GoodsBrandClient.java b/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/GoodsBrandClient.java index ca01df5..b7ea42c 100644 --- a/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/GoodsBrandClient.java +++ b/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/GoodsBrandClient.java @@ -10,7 +10,7 @@ import quick.pager.shop.goods.request.brand.GoodsBrandPageRequest; import quick.pager.shop.goods.request.brand.GoodsBrandSaveRequest; import quick.pager.shop.goods.response.brand.GoodsBrandResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 商品 -> 品牌服务 diff --git a/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/GoodsBrandGroupClient.java b/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/GoodsBrandGroupClient.java index 7d73503..f7c04e4 100644 --- a/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/GoodsBrandGroupClient.java +++ b/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/GoodsBrandGroupClient.java @@ -10,7 +10,7 @@ import quick.pager.shop.goods.request.brand.GoodsBrandGroupPageRequest; import quick.pager.shop.goods.request.brand.GoodsBrandGroupSaveRequest; import quick.pager.shop.goods.response.brand.GoodsBrandGroupResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 商品组对外服务 diff --git a/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/GoodsSkuClient.java b/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/GoodsSkuClient.java index 7346bfb..0045afa 100644 --- a/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/GoodsSkuClient.java +++ b/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/GoodsSkuClient.java @@ -7,10 +7,11 @@ import org.springframework.web.bind.annotation.RequestMethod; import quick.pager.shop.constants.ConstantsClient; import quick.pager.shop.goods.fallback.GoodsSkuClientFallbackFactory; +import quick.pager.shop.goods.request.sku.GoodsSkuOtherRequest; import quick.pager.shop.goods.request.sku.GoodsSkuPageRequest; import quick.pager.shop.goods.request.sku.GoodsSkuSaveRequest; import quick.pager.shop.goods.response.sku.GoodsSkuResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 商品sku服务 @@ -47,4 +48,13 @@ public interface GoodsSkuClient { */ @RequestMapping(value = "/sku/page", method = RequestMethod.POST) Response> queryPage(@RequestBody GoodsSkuPageRequest request); + + /** + * 商品sku集 + * + * @param request 请求参数 + * @return 商品sku集 + */ + @RequestMapping(value = "sku/list", method = RequestMethod.POST) + Response> queryList(@RequestBody GoodsSkuOtherRequest request); } diff --git a/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/GoodsSpuClient.java b/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/GoodsSpuClient.java index 72f0996..6c53e15 100644 --- a/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/GoodsSpuClient.java +++ b/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/GoodsSpuClient.java @@ -10,7 +10,7 @@ import quick.pager.shop.goods.request.spu.GoodsSpuPageRequest; import quick.pager.shop.goods.request.spu.GoodsSpuSaveRequest; import quick.pager.shop.goods.response.spu.GoodsSpuResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 商品spu服务 diff --git a/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/job/GoodsTestJobClient.java b/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/job/GoodsTestJobClient.java index 584164c..bc16e1d 100644 --- a/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/job/GoodsTestJobClient.java +++ b/shop-goods/shop-goods-client/src/main/java/quick/pager/shop/goods/client/job/GoodsTestJobClient.java @@ -5,7 +5,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import quick.pager.shop.constants.ConstantsClient; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 商品服务测试定时任务 diff --git a/shop-goods/shop-goods-model/pom.xml b/shop-goods/shop-goods-model/pom.xml index 8cca14e..a8b67f1 100644 --- a/shop-goods/shop-goods-model/pom.xml +++ b/shop-goods/shop-goods-model/pom.xml @@ -12,16 +12,45 @@ shop-goods-model - - org.projectlombok - lombok - - quick.pager shop-common ${project.version} + + + com.alibaba + easyexcel + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + UTF-8 + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + + jar + + + + + + + diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/field/GoodsField.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/field/GoodsField.java new file mode 100644 index 0000000..cc560db --- /dev/null +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/field/GoodsField.java @@ -0,0 +1,18 @@ +package quick.pager.shop.goods.field; + +/** + * 商品字段 + * + * @author siguiyang + */ +public interface GoodsField { + + /** + * 商品金额 + */ + String SKU_AMOUNT_KEY = "skuAmount"; + /** + * 创建时间 + */ + String ORDER_TIME_KEY = "createTime"; +} diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/ClassificationRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/ClassificationRequest.java index 13bf7a1..a31de04 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/ClassificationRequest.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/ClassificationRequest.java @@ -4,7 +4,7 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; @EqualsAndHashCode(callSuper = true) @Data diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/GoodsBrandRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/GoodsBrandRequest.java index f901515..df86110 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/GoodsBrandRequest.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/GoodsBrandRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * 商品品牌 diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/GoodsOtherRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/GoodsOtherRequest.java index f8d3c90..05b6395 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/GoodsOtherRequest.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/GoodsOtherRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * @author siguiyang diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/GoodsPageRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/GoodsPageRequest.java index 2d43b60..cee8596 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/GoodsPageRequest.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/GoodsPageRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; /** * @author siguiyang diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/GoodsRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/GoodsRequest.java index 8596946..3df9b9b 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/GoodsRequest.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/GoodsRequest.java @@ -3,7 +3,7 @@ import java.math.BigDecimal; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; @EqualsAndHashCode(callSuper = true) @Data diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/GoodsSaveRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/GoodsSaveRequest.java index c84c4ec..25fd50a 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/GoodsSaveRequest.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/GoodsSaveRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * @author siguiyang diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/brand/GoodsBrandGroupOtherRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/brand/GoodsBrandGroupOtherRequest.java index 6a00dc4..a03e77f 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/brand/GoodsBrandGroupOtherRequest.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/brand/GoodsBrandGroupOtherRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * 商品组 diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/brand/GoodsBrandGroupPageRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/brand/GoodsBrandGroupPageRequest.java index b62f36e..8f2dbcc 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/brand/GoodsBrandGroupPageRequest.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/brand/GoodsBrandGroupPageRequest.java @@ -4,7 +4,7 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; @EqualsAndHashCode(callSuper = true) @Data diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/brand/GoodsBrandGroupSaveRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/brand/GoodsBrandGroupSaveRequest.java index b9677b6..8bdf81f 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/brand/GoodsBrandGroupSaveRequest.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/brand/GoodsBrandGroupSaveRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * 商品品牌组保存 diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/brand/GoodsBrandPageRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/brand/GoodsBrandPageRequest.java index 500b33a..f5b4ad1 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/brand/GoodsBrandPageRequest.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/brand/GoodsBrandPageRequest.java @@ -4,7 +4,7 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; /** * GoodsBrandPageRequest diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/brand/GoodsBrandSaveRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/brand/GoodsBrandSaveRequest.java index 19da61d..bb5b986 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/brand/GoodsBrandSaveRequest.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/brand/GoodsBrandSaveRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * 商品品牌保存 diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/classification/GoodsClassificationPageRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/classification/GoodsClassificationPageRequest.java index cec9b39..a297a0c 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/classification/GoodsClassificationPageRequest.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/classification/GoodsClassificationPageRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; /** * 商品分类 diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/classification/GoodsClassificationSaveRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/classification/GoodsClassificationSaveRequest.java index 02de7d2..97fbcf4 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/classification/GoodsClassificationSaveRequest.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/classification/GoodsClassificationSaveRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * 商品分类 diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/property/GoodsPropertyPageRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/property/GoodsPropertyPageRequest.java index 1aee4ee..11d95c5 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/property/GoodsPropertyPageRequest.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/property/GoodsPropertyPageRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; /** * 商品属性 diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/property/GoodsPropertySaveRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/property/GoodsPropertySaveRequest.java index 65d7151..a191d23 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/property/GoodsPropertySaveRequest.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/property/GoodsPropertySaveRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * 商品属性 diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/property/group/GoodsPropertyGroupOtherRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/property/group/GoodsPropertyGroupOtherRequest.java index 5455713..0ba8e14 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/property/group/GoodsPropertyGroupOtherRequest.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/property/group/GoodsPropertyGroupOtherRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * 属性组 diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/property/group/GoodsPropertyGroupPageRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/property/group/GoodsPropertyGroupPageRequest.java index 354f7d3..36e8891 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/property/group/GoodsPropertyGroupPageRequest.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/property/group/GoodsPropertyGroupPageRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; /** * 商品属性组分页 diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/property/group/GoodsPropertyGroupSaveRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/property/group/GoodsPropertyGroupSaveRequest.java index e677fd5..9317f9c 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/property/group/GoodsPropertyGroupSaveRequest.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/property/group/GoodsPropertyGroupSaveRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * 商品属性组 diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/sku/GoodsSkuOtherRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/sku/GoodsSkuOtherRequest.java new file mode 100644 index 0000000..c837f2e --- /dev/null +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/sku/GoodsSkuOtherRequest.java @@ -0,0 +1,22 @@ +package quick.pager.shop.goods.request.sku; + +import java.util.List; +import lombok.Data; +import lombok.EqualsAndHashCode; +import quick.pager.shop.user.request.Request; + +/** + * 商品sku检索 + * + * @author siguiyang + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class GoodsSkuOtherRequest extends Request { + private static final long serialVersionUID = 4142738456666068299L; + /** + * 商品sku 主键集 + */ + private List ids; + +} diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/sku/GoodsSkuPageRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/sku/GoodsSkuPageRequest.java index 59b6b92..00d517d 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/sku/GoodsSkuPageRequest.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/sku/GoodsSkuPageRequest.java @@ -1,9 +1,8 @@ package quick.pager.shop.goods.request.sku; -import java.math.BigDecimal; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; /** * 商品sku 分页 diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/sku/GoodsSkuSaveRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/sku/GoodsSkuSaveRequest.java index 8bb37c4..d330559 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/sku/GoodsSkuSaveRequest.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/sku/GoodsSkuSaveRequest.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import quick.pager.shop.model.ImageModel; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * 商品sku diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/spu/GoodsSpuPageRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/spu/GoodsSpuPageRequest.java index b4920d3..92d2e1a 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/spu/GoodsSpuPageRequest.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/spu/GoodsSpuPageRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; /** * 商品spu 分页 diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/spu/GoodsSpuSaveRequest.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/spu/GoodsSpuSaveRequest.java index 63846cf..67250a5 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/spu/GoodsSpuSaveRequest.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/request/spu/GoodsSpuSaveRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * 商品spu diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/GoodsResponse.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/GoodsResponse.java index e1a53af..07d2a5f 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/GoodsResponse.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/GoodsResponse.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * 商品主表信息 diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/brand/GoodsBrandGroupResponse.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/brand/GoodsBrandGroupResponse.java index c8e5f74..435720a 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/brand/GoodsBrandGroupResponse.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/brand/GoodsBrandGroupResponse.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * banner 组 diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/brand/GoodsBrandResponse.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/brand/GoodsBrandResponse.java index 6b15cbc..2a8dd94 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/brand/GoodsBrandResponse.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/brand/GoodsBrandResponse.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * 品牌组 diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/classification/AppGoodsBannerResponse.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/classification/AppGoodsBannerResponse.java new file mode 100644 index 0000000..c9651d6 --- /dev/null +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/classification/AppGoodsBannerResponse.java @@ -0,0 +1,27 @@ +package quick.pager.shop.goods.response.classification; + +import java.io.Serializable; +import lombok.Data; + +/** + * App 商品banner + * + * @author siguiyang + */ +@Data +public class AppGoodsBannerResponse implements Serializable { + private static final long serialVersionUID = -3597093777641918706L; + + /** + * 主键 + */ + private Long id; + /** + * 名称 + */ + private String name; + /** + * banner图片地址 + */ + private String bannerUrl; +} diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/classification/AppGoodsClassificationDetailResponse.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/classification/AppGoodsClassificationDetailResponse.java new file mode 100644 index 0000000..744739d --- /dev/null +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/classification/AppGoodsClassificationDetailResponse.java @@ -0,0 +1,34 @@ +package quick.pager.shop.goods.response.classification; + +import java.io.Serializable; +import java.util.List; +import lombok.Data; +import quick.pager.shop.user.response.CommonResponse; + +/** + * 分类详情 + * + * @author siguiyang + */ +@Data +public class AppGoodsClassificationDetailResponse implements Serializable { + private static final long serialVersionUID = 1700041614051493637L; + + /** + * 主键 + */ + private Long id; + /** + * 对应的父级分类 + * APP 左侧的分类主键 + */ + private Long classificationId; + /** + * 分类名称 + */ + private String name; + /** + * 分类详情 + */ + private List spus; +} diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/classification/AppGoodsClassificationResponse.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/classification/AppGoodsClassificationResponse.java new file mode 100644 index 0000000..105fbac --- /dev/null +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/classification/AppGoodsClassificationResponse.java @@ -0,0 +1,25 @@ +package quick.pager.shop.goods.response.classification; + +import java.io.Serializable; +import java.util.List; +import lombok.Data; + +/** + * 一级分类下的详情 + * + * @author siguiyang + */ +@Data +public class AppGoodsClassificationResponse implements Serializable { + private static final long serialVersionUID = 7718730100415756686L; + + /** + * 该分类下的推荐Banner列表 + */ + private List goodsBanners; + /** + * 分类详情 + */ + private List details; + +} diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/classification/GoodsClassificationResponse.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/classification/GoodsClassificationResponse.java index 45ea68a..be19009 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/classification/GoodsClassificationResponse.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/classification/GoodsClassificationResponse.java @@ -3,7 +3,7 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * 商品分类响应对象 diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/property/GoodsPropertyResponse.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/property/GoodsPropertyResponse.java index 37caed7..42af734 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/property/GoodsPropertyResponse.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/property/GoodsPropertyResponse.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * @author siguiyang diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/property/group/GoodsPropertyGroupResponse.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/property/group/GoodsPropertyGroupResponse.java index 1adc4b1..1118663 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/property/group/GoodsPropertyGroupResponse.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/property/group/GoodsPropertyGroupResponse.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * 商品属性组 diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/sku/GoodsSkuResponse.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/sku/GoodsSkuResponse.java index 951b577..0cc4984 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/sku/GoodsSkuResponse.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/sku/GoodsSkuResponse.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import quick.pager.shop.model.ImageModel; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * 商品sku diff --git a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/spu/GoodsSpuResponse.java b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/spu/GoodsSpuResponse.java index 3790b3e..3e9f3d6 100644 --- a/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/spu/GoodsSpuResponse.java +++ b/shop-goods/shop-goods-model/src/main/java/quick/pager/shop/goods/response/spu/GoodsSpuResponse.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * 商品spu diff --git a/shop-job/shop-job-api/pom.xml b/shop-job/shop-job-api/pom.xml index 5f72abf..c9536aa 100644 --- a/shop-job/shop-job-api/pom.xml +++ b/shop-job/shop-job-api/pom.xml @@ -19,34 +19,14 @@ - - org.springframework.boot - spring-boot-starter-web - - - - cglib - cglib - - com.alibaba.cloud - spring-cloud-alibaba-nacos-config + spring-cloud-starter-alibaba-nacos-config com.alibaba.cloud - spring-cloud-alibaba-nacos-discovery - - - - org.springframework.boot - spring-boot-starter-actuator - - - - com.baomidou - mybatis-plus-boot-starter + spring-cloud-starter-alibaba-nacos-discovery @@ -56,39 +36,32 @@ org.springframework.boot - spring-boot-starter-mail + spring-boot-starter-web org.springframework.boot - spring-boot-starter-quartz - - - - com.alibaba - druid + spring-boot-starter-actuator - redis.clients - jedis + org.springframework.boot + spring-boot-starter-mail org.springframework.boot - spring-boot-starter-test - test + spring-boot-starter-quartz - quick.pager - shop-job-model - ${project.version} + com.baomidou + mybatis-plus-boot-starter quick.pager - shop-common + shop-job-model ${project.version} @@ -96,32 +69,16 @@ mysql mysql-connector-java + quick.pager shop-auth-resource ${project.version} - - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - - quick.pager shop-auth-feign ${project.version} - - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - - - - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - 2.1.2.RELEASE @@ -130,7 +87,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.1.2.RELEASE + 2.2.9.RELEASE package diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/JobApplication.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/JobApplication.java similarity index 72% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/JobApplication.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/JobApplication.java index a99a419..cc8dc57 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/JobApplication.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/JobApplication.java @@ -1,27 +1,18 @@ -package quick.pager.shop.job; +package quick.pager.shop; -import org.quartz.JobBuilder; -import org.quartz.JobDataMap; -import org.quartz.JobDetail; -import org.quartz.SimpleScheduleBuilder; -import org.quartz.Trigger; -import org.quartz.TriggerBuilder; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.Bean; -import quick.pager.shop.job.enums.JobEnums; -import quick.pager.shop.job.quartz.JobQuartzJobBean; /** * 高扩展分布式定时任务启动 * * @author siguiyang */ -@SpringBootApplication(scanBasePackages = "quick.pager.shop") +@SpringBootApplication @EnableDiscoveryClient -@EnableFeignClients("quick.pager.shop") +@EnableFeignClients public class JobApplication { public static void main(String[] args) { diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/configuration/JobConfiguration.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/configuration/JobConfiguration.java similarity index 92% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/configuration/JobConfiguration.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/configuration/JobConfiguration.java index 9a1be15..2bc6bfa 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/configuration/JobConfiguration.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/configuration/JobConfiguration.java @@ -1,4 +1,4 @@ -package quick.pager.shop.job.configuration; +package quick.pager.shop.configuration; import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.cloud.client.loadbalancer.LoadBalanced; diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/controller/JobController.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/controller/JobController.java similarity index 97% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/controller/JobController.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/controller/JobController.java index 22cc554..7e9b5c3 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/controller/JobController.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/controller/JobController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.job.controller; +package quick.pager.shop.controller; import java.util.List; import java.util.Objects; @@ -24,8 +24,8 @@ import quick.pager.shop.job.response.JobGroupResponse; import quick.pager.shop.job.response.JobResponse; import quick.pager.shop.job.response.JobStatusResponse; -import quick.pager.shop.job.service.JobService; -import quick.pager.shop.response.Response; +import quick.pager.shop.service.JobService; +import quick.pager.shop.user.response.Response; /** * job 定时任务 diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/AbstractHandler.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/AbstractHandler.java similarity index 85% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/AbstractHandler.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/AbstractHandler.java index d60c759..a909337 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/AbstractHandler.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/AbstractHandler.java @@ -1,11 +1,11 @@ -package quick.pager.shop.job.handler; +package quick.pager.shop.handler; import java.time.LocalDateTime; import quick.pager.shop.context.ShopSpringContext; -import quick.pager.shop.job.mapper.JobInfoMapper; -import quick.pager.shop.job.mapper.JobLogMapper; -import quick.pager.shop.job.model.JobInfo; -import quick.pager.shop.job.model.JobLog; +import quick.pager.shop.mapper.JobInfoMapper; +import quick.pager.shop.mapper.JobLogMapper; +import quick.pager.shop.model.JobInfo; +import quick.pager.shop.model.JobLog; /** * 抽离记录日志的方式 diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/IHandler.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/IHandler.java similarity index 96% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/IHandler.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/IHandler.java index bfeac9b..f2489f8 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/IHandler.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/IHandler.java @@ -1,4 +1,4 @@ -package quick.pager.shop.job.handler; +package quick.pager.shop.handler; import quick.pager.shop.job.enums.JobEnums; diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/core/CreateJobHandler.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/core/CreateJobHandler.java similarity index 86% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/core/CreateJobHandler.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/core/CreateJobHandler.java index 5bd2e5d..77097f6 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/core/CreateJobHandler.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/core/CreateJobHandler.java @@ -1,4 +1,4 @@ -package quick.pager.shop.job.handler.core; +package quick.pager.shop.handler.core; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -7,10 +7,10 @@ import quick.pager.shop.context.ShopSpringContext; import quick.pager.shop.job.enums.JobEnums; import quick.pager.shop.job.enums.JobStatusEnums; -import quick.pager.shop.job.handler.AbstractHandler; -import quick.pager.shop.job.mapper.JobInfoMapper; -import quick.pager.shop.job.model.JobInfo; -import quick.pager.shop.job.trigger.JobTrigger; +import quick.pager.shop.handler.AbstractHandler; +import quick.pager.shop.mapper.JobInfoMapper; +import quick.pager.shop.model.JobInfo; +import quick.pager.shop.trigger.JobTrigger; /** * 任务创建 diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/core/DeleteHandler.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/core/DeleteHandler.java similarity index 86% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/core/DeleteHandler.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/core/DeleteHandler.java index b52a42a..3836893 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/core/DeleteHandler.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/core/DeleteHandler.java @@ -1,4 +1,4 @@ -package quick.pager.shop.job.handler.core; +package quick.pager.shop.handler.core; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -7,10 +7,10 @@ import quick.pager.shop.context.ShopSpringContext; import quick.pager.shop.job.enums.JobEnums; import quick.pager.shop.job.enums.JobStatusEnums; -import quick.pager.shop.job.handler.AbstractHandler; -import quick.pager.shop.job.mapper.JobInfoMapper; -import quick.pager.shop.job.model.JobInfo; -import quick.pager.shop.job.trigger.JobTrigger; +import quick.pager.shop.handler.AbstractHandler; +import quick.pager.shop.mapper.JobInfoMapper; +import quick.pager.shop.model.JobInfo; +import quick.pager.shop.trigger.JobTrigger; /** * 从定时任务池中删除 diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/core/ExecuteHandler.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/core/ExecuteHandler.java similarity index 93% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/core/ExecuteHandler.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/core/ExecuteHandler.java index 079ee69..091383b 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/core/ExecuteHandler.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/core/ExecuteHandler.java @@ -1,4 +1,4 @@ -package quick.pager.shop.job.handler.core; +package quick.pager.shop.handler.core; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -17,9 +17,9 @@ import quick.pager.shop.context.ShopSpringContext; import quick.pager.shop.job.enums.JobEnums; import quick.pager.shop.job.enums.JobStatusEnums; -import quick.pager.shop.job.handler.AbstractHandler; -import quick.pager.shop.job.mapper.JobInfoMapper; -import quick.pager.shop.job.model.JobInfo; +import quick.pager.shop.handler.AbstractHandler; +import quick.pager.shop.mapper.JobInfoMapper; +import quick.pager.shop.model.JobInfo; /** * 执行执行器 diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/core/ManualHandler.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/core/ManualHandler.java similarity index 84% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/core/ManualHandler.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/core/ManualHandler.java index 7ca51f2..aaa7f92 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/core/ManualHandler.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/core/ManualHandler.java @@ -1,8 +1,8 @@ -package quick.pager.shop.job.handler.core; +package quick.pager.shop.handler.core; import lombok.extern.slf4j.Slf4j; import quick.pager.shop.job.enums.JobEnums; -import quick.pager.shop.job.handler.AbstractHandler; +import quick.pager.shop.handler.AbstractHandler; /** * 人工手动触发 执行器 diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/core/PauseHandler.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/core/PauseHandler.java similarity index 86% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/core/PauseHandler.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/core/PauseHandler.java index add5d72..1d2f3b0 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/core/PauseHandler.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/core/PauseHandler.java @@ -1,4 +1,4 @@ -package quick.pager.shop.job.handler.core; +package quick.pager.shop.handler.core; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -7,10 +7,10 @@ import quick.pager.shop.context.ShopSpringContext; import quick.pager.shop.job.enums.JobEnums; import quick.pager.shop.job.enums.JobStatusEnums; -import quick.pager.shop.job.handler.AbstractHandler; -import quick.pager.shop.job.mapper.JobInfoMapper; -import quick.pager.shop.job.model.JobInfo; -import quick.pager.shop.job.trigger.JobTrigger; +import quick.pager.shop.handler.AbstractHandler; +import quick.pager.shop.mapper.JobInfoMapper; +import quick.pager.shop.model.JobInfo; +import quick.pager.shop.trigger.JobTrigger; /** * 从定时任务池中暂停 diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/core/ResumeHandler.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/core/ResumeHandler.java similarity index 86% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/core/ResumeHandler.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/core/ResumeHandler.java index 592ec92..190f7f1 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/core/ResumeHandler.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/core/ResumeHandler.java @@ -1,4 +1,4 @@ -package quick.pager.shop.job.handler.core; +package quick.pager.shop.handler.core; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -7,10 +7,10 @@ import quick.pager.shop.context.ShopSpringContext; import quick.pager.shop.job.enums.JobEnums; import quick.pager.shop.job.enums.JobStatusEnums; -import quick.pager.shop.job.handler.AbstractHandler; -import quick.pager.shop.job.mapper.JobInfoMapper; -import quick.pager.shop.job.model.JobInfo; -import quick.pager.shop.job.trigger.JobTrigger; +import quick.pager.shop.handler.AbstractHandler; +import quick.pager.shop.mapper.JobInfoMapper; +import quick.pager.shop.model.JobInfo; +import quick.pager.shop.trigger.JobTrigger; /** * 从定时任务池中恢复 diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/core/UpdateJobHandler.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/core/UpdateJobHandler.java similarity index 86% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/core/UpdateJobHandler.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/core/UpdateJobHandler.java index 70aaec5..7a388da 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/handler/core/UpdateJobHandler.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/handler/core/UpdateJobHandler.java @@ -1,4 +1,4 @@ -package quick.pager.shop.job.handler.core; +package quick.pager.shop.handler.core; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -7,10 +7,10 @@ import quick.pager.shop.context.ShopSpringContext; import quick.pager.shop.job.enums.JobEnums; import quick.pager.shop.job.enums.JobStatusEnums; -import quick.pager.shop.job.handler.AbstractHandler; -import quick.pager.shop.job.mapper.JobInfoMapper; -import quick.pager.shop.job.model.JobInfo; -import quick.pager.shop.job.trigger.JobTrigger; +import quick.pager.shop.handler.AbstractHandler; +import quick.pager.shop.mapper.JobInfoMapper; +import quick.pager.shop.model.JobInfo; +import quick.pager.shop.trigger.JobTrigger; /** * 任务更新 diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/helper/JobHelper.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/helper/JobHelper.java similarity index 65% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/helper/JobHelper.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/helper/JobHelper.java index ca8e40b..1ae67b5 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/helper/JobHelper.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/helper/JobHelper.java @@ -1,16 +1,16 @@ -package quick.pager.shop.job.helper; +package quick.pager.shop.helper; import com.google.common.collect.Lists; import java.util.List; -import quick.pager.shop.job.handler.IHandler; -import quick.pager.shop.job.handler.core.CreateJobHandler; -import quick.pager.shop.job.handler.core.DeleteHandler; -import quick.pager.shop.job.handler.core.ExecuteHandler; -import quick.pager.shop.job.handler.core.ManualHandler; -import quick.pager.shop.job.handler.core.PauseHandler; -import quick.pager.shop.job.handler.core.ResumeHandler; -import quick.pager.shop.job.handler.core.UpdateJobHandler; -import quick.pager.shop.job.model.DTO; +import quick.pager.shop.handler.IHandler; +import quick.pager.shop.handler.core.CreateJobHandler; +import quick.pager.shop.handler.core.DeleteHandler; +import quick.pager.shop.handler.core.ExecuteHandler; +import quick.pager.shop.handler.core.ManualHandler; +import quick.pager.shop.handler.core.PauseHandler; +import quick.pager.shop.handler.core.ResumeHandler; +import quick.pager.shop.handler.core.UpdateJobHandler; +import quick.pager.shop.model.DTO; /** * job 执行协助器 diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/mapper/JobGroupMapper.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/mapper/JobGroupMapper.java similarity index 79% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/mapper/JobGroupMapper.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/mapper/JobGroupMapper.java index 7ab51a9..b5030b1 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/mapper/JobGroupMapper.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/mapper/JobGroupMapper.java @@ -1,9 +1,9 @@ -package quick.pager.shop.job.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; -import quick.pager.shop.job.model.JobGroup; +import quick.pager.shop.model.JobGroup; @Mapper public interface JobGroupMapper extends BaseMapper { diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/mapper/JobInfoMapper.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/mapper/JobInfoMapper.java similarity index 68% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/mapper/JobInfoMapper.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/mapper/JobInfoMapper.java index 3532bc8..a3f6f98 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/mapper/JobInfoMapper.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/mapper/JobInfoMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.job.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.job.model.JobInfo; +import quick.pager.shop.model.JobInfo; @Mapper public interface JobInfoMapper extends BaseMapper { diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/mapper/JobLogMapper.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/mapper/JobLogMapper.java similarity index 68% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/mapper/JobLogMapper.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/mapper/JobLogMapper.java index ba1a74e..7aace19 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/mapper/JobLogMapper.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/mapper/JobLogMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.job.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.job.model.JobLog; +import quick.pager.shop.model.JobLog; @Mapper public interface JobLogMapper extends BaseMapper { diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/model/DTO.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/model/DTO.java similarity index 95% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/model/DTO.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/model/DTO.java index c3a6ace..4a8905b 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/model/DTO.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/model/DTO.java @@ -1,4 +1,4 @@ -package quick.pager.shop.job.model; +package quick.pager.shop.model; import java.io.Serializable; import lombok.Builder; diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/model/JobGroup.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/model/JobGroup.java similarity index 84% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/model/JobGroup.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/model/JobGroup.java index 53d2b4c..e5b034c 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/model/JobGroup.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/model/JobGroup.java @@ -1,12 +1,9 @@ -package quick.pager.shop.job.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import lombok.Data; /** diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/model/JobInfo.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/model/JobInfo.java similarity index 96% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/model/JobInfo.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/model/JobInfo.java index e569392..16075e7 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/model/JobInfo.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/model/JobInfo.java @@ -1,11 +1,10 @@ -package quick.pager.shop.job.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDateTime; -import java.util.Map; import lombok.Data; import lombok.ToString; diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/model/JobLog.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/model/JobLog.java similarity index 96% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/model/JobLog.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/model/JobLog.java index 898db65..c4405d6 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/model/JobLog.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/model/JobLog.java @@ -1,4 +1,4 @@ -package quick.pager.shop.job.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/quartz/JobQuartzJobBean.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/quartz/JobQuartzJobBean.java similarity index 93% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/quartz/JobQuartzJobBean.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/quartz/JobQuartzJobBean.java index e7ccf17..a352cec 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/quartz/JobQuartzJobBean.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/quartz/JobQuartzJobBean.java @@ -1,4 +1,4 @@ -package quick.pager.shop.job.quartz; +package quick.pager.shop.quartz; import lombok.extern.slf4j.Slf4j; import org.quartz.DisallowConcurrentExecution; @@ -6,8 +6,8 @@ import org.quartz.PersistJobDataAfterExecution; import org.springframework.scheduling.quartz.QuartzJobBean; import quick.pager.shop.job.enums.JobEnums; -import quick.pager.shop.job.helper.JobHelper; -import quick.pager.shop.job.model.DTO; +import quick.pager.shop.helper.JobHelper; +import quick.pager.shop.model.DTO; /** * QuartzJobBean diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/runner/JobRunner.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/runner/JobRunner.java similarity index 90% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/runner/JobRunner.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/runner/JobRunner.java index fecac29..2466b9b 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/runner/JobRunner.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/runner/JobRunner.java @@ -1,4 +1,4 @@ -package quick.pager.shop.job.runner; +package quick.pager.shop.runner; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.List; @@ -13,11 +13,11 @@ import quick.pager.shop.context.ShopSpringContext; import quick.pager.shop.job.enums.JobEnums; import quick.pager.shop.job.enums.JobStatusEnums; -import quick.pager.shop.job.helper.JobHelper; -import quick.pager.shop.job.mapper.JobInfoMapper; -import quick.pager.shop.job.model.DTO; -import quick.pager.shop.job.model.JobInfo; -import quick.pager.shop.job.trigger.JobTrigger; +import quick.pager.shop.helper.JobHelper; +import quick.pager.shop.mapper.JobInfoMapper; +import quick.pager.shop.model.DTO; +import quick.pager.shop.model.JobInfo; +import quick.pager.shop.trigger.JobTrigger; /** * 应用加载完成后，向定时任务池加任务 diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/service/JobService.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/service/JobService.java similarity index 94% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/service/JobService.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/service/JobService.java index 1fd6d8e..e32d776 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/service/JobService.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/service/JobService.java @@ -1,4 +1,4 @@ -package quick.pager.shop.job.service; +package quick.pager.shop.service; import java.util.List; import quick.pager.shop.job.enums.JobEnums; @@ -8,7 +8,7 @@ import quick.pager.shop.job.request.JobSaveRequest; import quick.pager.shop.job.response.JobGroupResponse; import quick.pager.shop.job.response.JobResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * Job Service 服务 diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/service/impl/JobServiceImpl.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/service/impl/JobServiceImpl.java similarity index 93% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/service/impl/JobServiceImpl.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/service/impl/JobServiceImpl.java index 979d8c7..92ef1cf 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/service/impl/JobServiceImpl.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/service/impl/JobServiceImpl.java @@ -1,4 +1,4 @@ -package quick.pager.shop.job.service.impl; +package quick.pager.shop.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -14,20 +14,20 @@ import quick.pager.shop.constants.ResponseStatus; import quick.pager.shop.job.enums.JobEnums; import quick.pager.shop.job.enums.JobStatusEnums; -import quick.pager.shop.job.helper.JobHelper; -import quick.pager.shop.job.mapper.JobGroupMapper; -import quick.pager.shop.job.mapper.JobInfoMapper; -import quick.pager.shop.job.model.DTO; -import quick.pager.shop.job.model.JobGroup; -import quick.pager.shop.job.model.JobInfo; +import quick.pager.shop.helper.JobHelper; +import quick.pager.shop.mapper.JobGroupMapper; +import quick.pager.shop.mapper.JobInfoMapper; +import quick.pager.shop.model.DTO; +import quick.pager.shop.model.JobGroup; +import quick.pager.shop.model.JobInfo; import quick.pager.shop.job.request.JobGroupSaveRequest; import quick.pager.shop.job.request.JobPageRequest; import quick.pager.shop.job.request.JobRequest; import quick.pager.shop.job.request.JobSaveRequest; import quick.pager.shop.job.response.JobGroupResponse; import quick.pager.shop.job.response.JobResponse; -import quick.pager.shop.job.service.JobService; -import quick.pager.shop.response.Response; +import quick.pager.shop.service.JobService; +import quick.pager.shop.user.response.Response; import quick.pager.shop.utils.BeanCopier; /** diff --git a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/trigger/JobTrigger.java b/shop-job/shop-job-api/src/main/java/quick/pager/shop/trigger/JobTrigger.java similarity index 98% rename from shop-job/shop-job-api/src/main/java/quick/pager/shop/job/trigger/JobTrigger.java rename to shop-job/shop-job-api/src/main/java/quick/pager/shop/trigger/JobTrigger.java index ed29fd9..6187769 100644 --- a/shop-job/shop-job-api/src/main/java/quick/pager/shop/job/trigger/JobTrigger.java +++ b/shop-job/shop-job-api/src/main/java/quick/pager/shop/trigger/JobTrigger.java @@ -1,4 +1,4 @@ -package quick.pager.shop.job.trigger; +package quick.pager.shop.trigger; import com.google.common.collect.Lists; import java.util.Collections; @@ -25,8 +25,8 @@ import java.util.Set; import quick.pager.shop.job.enums.JobEnums; import quick.pager.shop.job.enums.JobStatusEnums; -import quick.pager.shop.job.model.JobInfo; -import quick.pager.shop.job.quartz.JobQuartzJobBean; +import quick.pager.shop.model.JobInfo; +import quick.pager.shop.quartz.JobQuartzJobBean; /** * 任务调度工具类 diff --git a/shop-job/shop-job-api/src/main/resources/bootstrap-dev.yml b/shop-job/shop-job-api/src/main/resources/bootstrap-dev.yml index 96f1ae6..bd85619 100644 --- a/shop-job/shop-job-api/src/main/resources/bootstrap-dev.yml +++ b/shop-job/shop-job-api/src/main/resources/bootstrap-dev.yml @@ -3,8 +3,12 @@ spring: nacos: config: server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d discovery: server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d # 内部服务调用授权认证配置 security: diff --git a/shop-job/shop-job-api/src/main/resources/bootstrap.yml b/shop-job/shop-job-api/src/main/resources/bootstrap.yml index 3dced71..16d73c9 100644 --- a/shop-job/shop-job-api/src/main/resources/bootstrap.yml +++ b/shop-job/shop-job-api/src/main/resources/bootstrap.yml @@ -1,6 +1,16 @@ + +server: + port: 9988 +spring: + application: + name: shop-job + autoconfigure: + exclude: org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration + profiles: + active: dev + quartz: + startup-delay: 10s feign: - sentinel: - enabled: true okhttp: enabled: true httpclient: @@ -11,16 +21,6 @@ management: web: exposure: include: refresh,health,info - -server: - port: 9988 -spring: - application: - name: shop-job - profiles: - active: dev - quartz: - startup-delay: 10s logging: - config: classpath:logback.xml + config: classpath:logback-spring.xml diff --git a/shop-goods/shop-goods-api/src/main/resources/logback.xml b/shop-job/shop-job-api/src/main/resources/logback-spring.xml similarity index 99% rename from shop-goods/shop-goods-api/src/main/resources/logback.xml rename to shop-job/shop-job-api/src/main/resources/logback-spring.xml index 32402ee..e5cc68e 100644 --- a/shop-goods/shop-goods-api/src/main/resources/logback.xml +++ b/shop-job/shop-job-api/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ - shop-activity + shop-job @@ -147,6 +147,7 @@ + diff --git a/shop-job/shop-job-client/pom.xml b/shop-job/shop-job-client/pom.xml index a5d6b2c..65db614 100644 --- a/shop-job/shop-job-client/pom.xml +++ b/shop-job/shop-job-client/pom.xml @@ -26,14 +26,12 @@ org.springframework.cloud spring-cloud-starter-netflix-ribbon - 2.1.0.RELEASE provided org.springframework.cloud spring-cloud-starter-openfeign - 2.1.0.RELEASE provided @@ -43,13 +41,6 @@ ${project.version} provided - - - quick.pager - shop-common - ${project.version} - provided - diff --git a/shop-job/shop-job-client/src/main/java/quick/pager/shop/job/client/JobClient.java b/shop-job/shop-job-client/src/main/java/quick/pager/shop/job/client/JobClient.java index f434102..efdcfb8 100644 --- a/shop-job/shop-job-client/src/main/java/quick/pager/shop/job/client/JobClient.java +++ b/shop-job/shop-job-client/src/main/java/quick/pager/shop/job/client/JobClient.java @@ -14,7 +14,7 @@ import quick.pager.shop.job.request.JobRequest; import quick.pager.shop.job.request.JobSaveRequest; import quick.pager.shop.job.response.JobResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; @FeignClient(value = ConstantsClient.JOB_CLIENT, path = ConstantsClient.JOB, fallbackFactory = JobFallbackFactory.class) public interface JobClient { diff --git a/shop-job/shop-job-client/src/main/java/quick/pager/shop/job/fallback/JobFallbackFactory.java b/shop-job/shop-job-client/src/main/java/quick/pager/shop/job/fallback/JobFallbackFactory.java index fa4d8a7..d0f7b81 100644 --- a/shop-job/shop-job-client/src/main/java/quick/pager/shop/job/fallback/JobFallbackFactory.java +++ b/shop-job/shop-job-client/src/main/java/quick/pager/shop/job/fallback/JobFallbackFactory.java @@ -9,7 +9,7 @@ import quick.pager.shop.job.request.JobRequest; import quick.pager.shop.job.request.JobSaveRequest; import quick.pager.shop.job.response.JobResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; @Component @Slf4j diff --git a/shop-job/shop-job-model/pom.xml b/shop-job/shop-job-model/pom.xml index 88b38e1..a9dc422 100644 --- a/shop-job/shop-job-model/pom.xml +++ b/shop-job/shop-job-model/pom.xml @@ -21,6 +21,41 @@ quick.pager shop-common ${project.version} + + + com.alibaba + easyexcel + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + UTF-8 + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + + jar + + + + + + + diff --git a/shop-job/shop-job-model/src/main/java/quick/pager/shop/job/request/JobPageRequest.java b/shop-job/shop-job-model/src/main/java/quick/pager/shop/job/request/JobPageRequest.java index 14ce145..d13f381 100644 --- a/shop-job/shop-job-model/src/main/java/quick/pager/shop/job/request/JobPageRequest.java +++ b/shop-job/shop-job-model/src/main/java/quick/pager/shop/job/request/JobPageRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; /** * Job 分页请求 diff --git a/shop-manage/pom.xml b/shop-manage/pom.xml index 9005bd4..6371239 100644 --- a/shop-manage/pom.xml +++ b/shop-manage/pom.xml @@ -22,122 +22,94 @@ + - org.springframework.boot - spring-boot-starter-web + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config com.alibaba.cloud - spring-cloud-alibaba-nacos-config + spring-cloud-starter-alibaba-nacos-discovery com.alibaba.cloud - spring-cloud-alibaba-nacos-discovery + spring-cloud-starter-alibaba-seata com.alibaba.cloud spring-cloud-starter-alibaba-sentinel + - - org.springframework.boot - spring-boot-starter-actuator - - - - com.baomidou - mybatis-plus-boot-starter - - - - com.baomidou - mybatis-plus-generator - provided - - - - org.freemarker - freemarker - 2.3.29 - provided - - + org.springframework.cloud spring-cloud-starter-openfeign + + org.springframework.boot - spring-boot-starter-data-redis + spring-boot-starter-web - org.springframework.cloud - spring-cloud-starter-stream-kafka + org.springframework.boot + spring-boot-starter-data-redis - org.springframework.cloud - spring-cloud-starter-sleuth + org.springframework.boot + spring-boot-starter-actuator + + - org.springframework.cloud - spring-cloud-sleuth-zipkin + com.baomidou + mybatis-plus-boot-starter - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - 2.1.2.RELEASE + com.baomidou + mybatis-plus-generator - mysql mysql-connector-java + - - redis.clients - jedis - - - - org.springframework.boot - spring-boot-starter-test - test - - + quick.pager - shop-common + shop-auth-feign ${project.version} + quick.pager - shop-platform-client + shop-auth-resource ${project.version} + + - quick.pager - shop-platform-model - ${project.version} + org.springframework.boot + spring-boot-starter-test + test + quick.pager - shop-auth-resource + shop-platform-client ${project.version} - - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - - + @@ -145,7 +117,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.1.2.RELEASE + 2.2.9.RELEASE package diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/ManageApplication.java b/shop-manage/src/main/java/quick/pager/shop/ManageApplication.java similarity index 50% rename from shop-manage/src/main/java/quick/pager/shop/manage/ManageApplication.java rename to shop-manage/src/main/java/quick/pager/shop/ManageApplication.java index 94af0d5..8ba1994 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/ManageApplication.java +++ b/shop-manage/src/main/java/quick/pager/shop/ManageApplication.java @@ -1,19 +1,15 @@ -package quick.pager.shop.manage; +package quick.pager.shop; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.client.SpringCloudApplication; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.EnableAspectJAutoProxy; /** * @author siguiyang */ -@SpringBootApplication(scanBasePackages = "quick.pager.shop") -@EnableDiscoveryClient -@EnableCircuitBreaker -@EnableFeignClients("quick.pager.shop") +@SpringCloudApplication +@EnableFeignClients @EnableAspectJAutoProxy(proxyTargetClass = true) public class ManageApplication { diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/controller/LoginController.java b/shop-manage/src/main/java/quick/pager/shop/controller/LoginController.java similarity index 84% rename from shop-manage/src/main/java/quick/pager/shop/manage/controller/LoginController.java rename to shop-manage/src/main/java/quick/pager/shop/controller/LoginController.java index f0d2241..1ba0683 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/controller/LoginController.java +++ b/shop-manage/src/main/java/quick/pager/shop/controller/LoginController.java @@ -1,7 +1,6 @@ -package quick.pager.shop.manage.controller; +package quick.pager.shop.controller; import java.util.List; -import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -9,9 +8,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.Constants; -import quick.pager.shop.manage.model.SysUser; -import quick.pager.shop.response.Response; -import quick.pager.shop.manage.service.system.impl.SysUserClientService; +import quick.pager.shop.model.SysUser; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.system.impl.SysUserClientService; /** * 非需权限接口 diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/controller/common/CommonEnumController.java b/shop-manage/src/main/java/quick/pager/shop/controller/common/CommonEnumController.java similarity index 77% rename from shop-manage/src/main/java/quick/pager/shop/manage/controller/common/CommonEnumController.java rename to shop-manage/src/main/java/quick/pager/shop/controller/common/CommonEnumController.java index 253be61..2f29b2d 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/controller/common/CommonEnumController.java +++ b/shop-manage/src/main/java/quick/pager/shop/controller/common/CommonEnumController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.controller.common; +package quick.pager.shop.controller.common; import java.util.List; import java.util.Map; @@ -7,9 +7,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.Constants; -import quick.pager.shop.response.Response; -import quick.pager.shop.manage.response.EnumResponse; -import quick.pager.shop.manage.service.CommonEnumService; +import quick.pager.shop.service.CommonEnumService; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.response.EnumResponse; /** * 常量枚举 diff --git a/shop-manage/src/main/java/quick/pager/shop/controller/common/package-info.java b/shop-manage/src/main/java/quick/pager/shop/controller/common/package-info.java new file mode 100644 index 0000000..1606f70 --- /dev/null +++ b/shop-manage/src/main/java/quick/pager/shop/controller/common/package-info.java @@ -0,0 +1 @@ +package quick.pager.shop.controller.common; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/controller/customer/SellerManageController.java b/shop-manage/src/main/java/quick/pager/shop/controller/customer/SellerManageController.java similarity index 85% rename from shop-manage/src/main/java/quick/pager/shop/manage/controller/customer/SellerManageController.java rename to shop-manage/src/main/java/quick/pager/shop/controller/customer/SellerManageController.java index 141729c..2979618 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/controller/customer/SellerManageController.java +++ b/shop-manage/src/main/java/quick/pager/shop/controller/customer/SellerManageController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.controller.customer; +package quick.pager.shop.controller.customer; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/controller/customer/UserManageController.java b/shop-manage/src/main/java/quick/pager/shop/controller/customer/UserManageController.java similarity index 84% rename from shop-manage/src/main/java/quick/pager/shop/manage/controller/customer/UserManageController.java rename to shop-manage/src/main/java/quick/pager/shop/controller/customer/UserManageController.java index 83278a4..c407f1c 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/controller/customer/UserManageController.java +++ b/shop-manage/src/main/java/quick/pager/shop/controller/customer/UserManageController.java @@ -1,10 +1,10 @@ -package quick.pager.shop.manage.controller.customer; +package quick.pager.shop.controller.customer; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.Constants; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 管理平台用户服务 diff --git a/shop-manage/src/main/java/quick/pager/shop/controller/customer/package-info.java b/shop-manage/src/main/java/quick/pager/shop/controller/customer/package-info.java new file mode 100644 index 0000000..9aa91d4 --- /dev/null +++ b/shop-manage/src/main/java/quick/pager/shop/controller/customer/package-info.java @@ -0,0 +1 @@ +package quick.pager.shop.controller.customer; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/controller/dashboard/DashboardController.java b/shop-manage/src/main/java/quick/pager/shop/controller/dashboard/DashboardController.java similarity index 84% rename from shop-manage/src/main/java/quick/pager/shop/manage/controller/dashboard/DashboardController.java rename to shop-manage/src/main/java/quick/pager/shop/controller/dashboard/DashboardController.java index 2e5ff76..81599d4 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/controller/dashboard/DashboardController.java +++ b/shop-manage/src/main/java/quick/pager/shop/controller/dashboard/DashboardController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.controller.dashboard; +package quick.pager.shop.controller.dashboard; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -6,8 +6,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.Constants; -import quick.pager.shop.response.Response; -import quick.pager.shop.manage.service.dashboard.DashboardService; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.dashboard.DashboardService; /** * 首页统计数据 diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/controller/monitor/MonitorController.java b/shop-manage/src/main/java/quick/pager/shop/controller/monitor/MonitorController.java similarity index 93% rename from shop-manage/src/main/java/quick/pager/shop/manage/controller/monitor/MonitorController.java rename to shop-manage/src/main/java/quick/pager/shop/controller/monitor/MonitorController.java index 2a45fc6..754cf95 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/controller/monitor/MonitorController.java +++ b/shop-manage/src/main/java/quick/pager/shop/controller/monitor/MonitorController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.controller.monitor; +package quick.pager.shop.controller.monitor; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.Constants; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 监控服务 diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/controller/system/ConfigController.java b/shop-manage/src/main/java/quick/pager/shop/controller/system/ConfigController.java similarity index 90% rename from shop-manage/src/main/java/quick/pager/shop/manage/controller/system/ConfigController.java rename to shop-manage/src/main/java/quick/pager/shop/controller/system/ConfigController.java index 0298356..e634842 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/controller/system/ConfigController.java +++ b/shop-manage/src/main/java/quick/pager/shop/controller/system/ConfigController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.controller.system; +package quick.pager.shop.controller.system; import javax.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; @@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.Constants; -import quick.pager.shop.manage.param.system.SystemConfigParam; -import quick.pager.shop.manage.service.system.SystemConfigService; -import quick.pager.shop.response.Response; +import quick.pager.shop.param.system.SystemConfigParam; +import quick.pager.shop.service.system.SystemConfigService; +import quick.pager.shop.user.response.Response; /** * 系统配置 diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/controller/system/DynamicFormController.java b/shop-manage/src/main/java/quick/pager/shop/controller/system/DynamicFormController.java similarity index 90% rename from shop-manage/src/main/java/quick/pager/shop/manage/controller/system/DynamicFormController.java rename to shop-manage/src/main/java/quick/pager/shop/controller/system/DynamicFormController.java index 9734705..54bf07d 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/controller/system/DynamicFormController.java +++ b/shop-manage/src/main/java/quick/pager/shop/controller/system/DynamicFormController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.controller.system; +package quick.pager.shop.controller.system; import java.util.List; import org.apache.commons.lang3.StringUtils; @@ -12,10 +12,10 @@ import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.ConstantsClient; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.manage.param.system.DynamicFormOtherSaveParam; -import quick.pager.shop.manage.service.system.DynamicFormService; +import quick.pager.shop.param.system.DynamicFormOtherSaveParam; +import quick.pager.shop.service.system.DynamicFormService; import quick.pager.shop.platform.response.DynamicFormResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 自定义表单 diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/controller/system/GeneratorController.java b/shop-manage/src/main/java/quick/pager/shop/controller/system/GeneratorController.java similarity index 88% rename from shop-manage/src/main/java/quick/pager/shop/manage/controller/system/GeneratorController.java rename to shop-manage/src/main/java/quick/pager/shop/controller/system/GeneratorController.java index 4b35f04..49b436c 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/controller/system/GeneratorController.java +++ b/shop-manage/src/main/java/quick/pager/shop/controller/system/GeneratorController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.controller.system; +package quick.pager.shop.controller.system; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.Constants; -import quick.pager.shop.manage.param.system.GeneratorPageParam; -import quick.pager.shop.response.Response; -import quick.pager.shop.manage.service.GeneratorService; +import quick.pager.shop.param.system.GeneratorPageParam; +import quick.pager.shop.service.GeneratorService; +import quick.pager.shop.user.response.Response; /** * 代码生成器 diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/controller/system/MenuController.java b/shop-manage/src/main/java/quick/pager/shop/controller/system/MenuController.java similarity index 87% rename from shop-manage/src/main/java/quick/pager/shop/manage/controller/system/MenuController.java rename to shop-manage/src/main/java/quick/pager/shop/controller/system/MenuController.java index 3557294..40e5516 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/controller/system/MenuController.java +++ b/shop-manage/src/main/java/quick/pager/shop/controller/system/MenuController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.controller.system; +package quick.pager.shop.controller.system; import java.util.Objects; import org.springframework.beans.factory.annotation.Autowired; @@ -12,10 +12,10 @@ import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.Constants; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.manage.param.system.MenuOtherParam; -import quick.pager.shop.manage.param.system.MenuSaveParam; -import quick.pager.shop.manage.service.system.MenuService; -import quick.pager.shop.response.Response; +import quick.pager.shop.param.system.MenuOtherParam; +import quick.pager.shop.param.system.MenuSaveParam; +import quick.pager.shop.service.system.MenuService; +import quick.pager.shop.user.response.Response; /** * 菜单管理 diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/controller/system/PermissionController.java b/shop-manage/src/main/java/quick/pager/shop/controller/system/PermissionController.java similarity index 85% rename from shop-manage/src/main/java/quick/pager/shop/manage/controller/system/PermissionController.java rename to shop-manage/src/main/java/quick/pager/shop/controller/system/PermissionController.java index 1397a5d..6668d67 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/controller/system/PermissionController.java +++ b/shop-manage/src/main/java/quick/pager/shop/controller/system/PermissionController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.controller.system; +package quick.pager.shop.controller.system; import java.util.List; import java.util.Objects; @@ -12,10 +12,10 @@ import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.Constants; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.manage.param.system.AuthorizationParam; -import quick.pager.shop.manage.response.system.MenuResponse; -import quick.pager.shop.manage.service.system.PermissionService; -import quick.pager.shop.response.Response; +import quick.pager.shop.param.system.AuthorizationParam; +import quick.pager.shop.response.system.MenuResponse; +import quick.pager.shop.service.system.PermissionService; +import quick.pager.shop.user.response.Response; /** * 权限 diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/controller/system/RoleController.java b/shop-manage/src/main/java/quick/pager/shop/controller/system/RoleController.java similarity index 84% rename from shop-manage/src/main/java/quick/pager/shop/manage/controller/system/RoleController.java rename to shop-manage/src/main/java/quick/pager/shop/controller/system/RoleController.java index 2f852a8..22f5b51 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/controller/system/RoleController.java +++ b/shop-manage/src/main/java/quick/pager/shop/controller/system/RoleController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.controller.system; +package quick.pager.shop.controller.system; import java.util.Objects; import org.springframework.beans.factory.annotation.Autowired; @@ -10,12 +10,12 @@ import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.Constants; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.manage.param.system.RoleOtherParam; -import quick.pager.shop.manage.param.system.RolePageParam; -import quick.pager.shop.manage.param.system.RoleSaveParam; -import quick.pager.shop.manage.response.PermissionResponse; -import quick.pager.shop.manage.service.system.RoleService; -import quick.pager.shop.response.Response; +import quick.pager.shop.param.system.RoleOtherParam; +import quick.pager.shop.param.system.RolePageParam; +import quick.pager.shop.param.system.RoleSaveParam; +import quick.pager.shop.response.PermissionResponse; +import quick.pager.shop.service.system.RoleService; +import quick.pager.shop.user.response.Response; /** * 角色管理 diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/controller/system/SystemController.java b/shop-manage/src/main/java/quick/pager/shop/controller/system/SystemController.java similarity index 84% rename from shop-manage/src/main/java/quick/pager/shop/manage/controller/system/SystemController.java rename to shop-manage/src/main/java/quick/pager/shop/controller/system/SystemController.java index 65539b9..86474bc 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/controller/system/SystemController.java +++ b/shop-manage/src/main/java/quick/pager/shop/controller/system/SystemController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.controller.system; +package quick.pager.shop.controller.system; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -8,11 +8,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.Constants; -import quick.pager.shop.manage.param.system.SysUserPageParam; -import quick.pager.shop.manage.service.system.SysUserService; -import quick.pager.shop.response.Response; -import quick.pager.shop.manage.param.system.SysUserParam; -import quick.pager.shop.manage.utils.PrincipalUtils; +import quick.pager.shop.param.system.SysUserPageParam; +import quick.pager.shop.service.system.SysUserService; +import quick.pager.shop.param.system.SysUserParam; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.utils.PrincipalUtils; /** * 系统管理 diff --git a/shop-manage/src/main/java/quick/pager/shop/controller/system/package-info.java b/shop-manage/src/main/java/quick/pager/shop/controller/system/package-info.java new file mode 100644 index 0000000..356d2d2 --- /dev/null +++ b/shop-manage/src/main/java/quick/pager/shop/controller/system/package-info.java @@ -0,0 +1 @@ +package quick.pager.shop.controller.system; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/exception/ShopException.java b/shop-manage/src/main/java/quick/pager/shop/exception/ShopException.java similarity index 95% rename from shop-manage/src/main/java/quick/pager/shop/manage/exception/ShopException.java rename to shop-manage/src/main/java/quick/pager/shop/exception/ShopException.java index 2984d43..3c82788 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/exception/ShopException.java +++ b/shop-manage/src/main/java/quick/pager/shop/exception/ShopException.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.exception; +package quick.pager.shop.exception; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/exception/ShopExceptionAdvice.java b/shop-manage/src/main/java/quick/pager/shop/exception/ShopExceptionAdvice.java similarity index 92% rename from shop-manage/src/main/java/quick/pager/shop/manage/exception/ShopExceptionAdvice.java rename to shop-manage/src/main/java/quick/pager/shop/exception/ShopExceptionAdvice.java index 75dde26..7a94ac1 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/exception/ShopExceptionAdvice.java +++ b/shop-manage/src/main/java/quick/pager/shop/exception/ShopExceptionAdvice.java @@ -1,11 +1,11 @@ -package quick.pager.shop.manage.exception; +package quick.pager.shop.exception; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.AccessDeniedException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 统一异常处理机制 diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/helper/MenuHelper.java b/shop-manage/src/main/java/quick/pager/shop/helper/MenuHelper.java similarity index 88% rename from shop-manage/src/main/java/quick/pager/shop/manage/helper/MenuHelper.java rename to shop-manage/src/main/java/quick/pager/shop/helper/MenuHelper.java index c2c7d1a..dfcc32d 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/helper/MenuHelper.java +++ b/shop-manage/src/main/java/quick/pager/shop/helper/MenuHelper.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.helper; +package quick.pager.shop.helper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.Collections; @@ -8,13 +8,13 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import quick.pager.shop.manage.mapper.MenuMapper; -import quick.pager.shop.manage.mapper.RoleMapper; -import quick.pager.shop.manage.mapper.RoleMenuMapper; -import quick.pager.shop.manage.mapper.SysRoleMapper; -import quick.pager.shop.manage.model.Menu; -import quick.pager.shop.manage.model.RoleMenu; -import quick.pager.shop.manage.model.SysRole; +import quick.pager.shop.mapper.MenuMapper; +import quick.pager.shop.mapper.RoleMapper; +import quick.pager.shop.mapper.RoleMenuMapper; +import quick.pager.shop.mapper.SysRoleMapper; +import quick.pager.shop.model.Menu; +import quick.pager.shop.model.RoleMenu; +import quick.pager.shop.model.SysRole; /** * 菜单工具类 diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/controller/common/package-info.java b/shop-manage/src/main/java/quick/pager/shop/manage/controller/common/package-info.java deleted file mode 100644 index de03989..0000000 --- a/shop-manage/src/main/java/quick/pager/shop/manage/controller/common/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package quick.pager.shop.manage.controller.common; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/controller/customer/package-info.java b/shop-manage/src/main/java/quick/pager/shop/manage/controller/customer/package-info.java deleted file mode 100644 index 6303009..0000000 --- a/shop-manage/src/main/java/quick/pager/shop/manage/controller/customer/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package quick.pager.shop.manage.controller.customer; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/controller/system/package-info.java b/shop-manage/src/main/java/quick/pager/shop/manage/controller/system/package-info.java deleted file mode 100644 index e8593c0..0000000 --- a/shop-manage/src/main/java/quick/pager/shop/manage/controller/system/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package quick.pager.shop.manage.controller.system; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/ClassificationSaveParam.java b/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/ClassificationSaveParam.java deleted file mode 100644 index 9232a15..0000000 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/ClassificationSaveParam.java +++ /dev/null @@ -1,4 +0,0 @@ -package quick.pager.shop.manage.param.goods; - -public class ClassificationSaveParam { -} diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsBrandGroupPageParam.java b/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsBrandGroupPageParam.java deleted file mode 100644 index ba51b2c..0000000 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsBrandGroupPageParam.java +++ /dev/null @@ -1,4 +0,0 @@ -package quick.pager.shop.manage.param.goods; - -public class GoodsBrandGroupPageParam { -} diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsBrandGroupSaveParam.java b/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsBrandGroupSaveParam.java deleted file mode 100644 index 1b8f5ac..0000000 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsBrandGroupSaveParam.java +++ /dev/null @@ -1,4 +0,0 @@ -package quick.pager.shop.manage.param.goods; - -public class GoodsBrandGroupSaveParam { -} diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsBrandPageParam.java b/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsBrandPageParam.java deleted file mode 100644 index 524431a..0000000 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsBrandPageParam.java +++ /dev/null @@ -1,4 +0,0 @@ -package quick.pager.shop.manage.param.goods; - -public class GoodsBrandPageParam { -} diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsBrandSaveParam.java b/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsBrandSaveParam.java deleted file mode 100644 index 504ef11..0000000 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsBrandSaveParam.java +++ /dev/null @@ -1,4 +0,0 @@ -package quick.pager.shop.manage.param.goods; - -public class GoodsBrandSaveParam { -} diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsPageParam.java b/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsPageParam.java deleted file mode 100644 index d903055..0000000 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsPageParam.java +++ /dev/null @@ -1,4 +0,0 @@ -package quick.pager.shop.manage.param.goods; - -public class GoodsPageParam { -} diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsSaveParam.java b/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsSaveParam.java deleted file mode 100644 index 6d24ca0..0000000 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsSaveParam.java +++ /dev/null @@ -1,4 +0,0 @@ -package quick.pager.shop.manage.param.goods; - -public class GoodsSaveParam { -} diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/order/UserOrderPageParam.java b/shop-manage/src/main/java/quick/pager/shop/manage/param/order/UserOrderPageParam.java deleted file mode 100644 index 22801a8..0000000 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/order/UserOrderPageParam.java +++ /dev/null @@ -1,4 +0,0 @@ -package quick.pager.shop.manage.param.order; - -public class UserOrderPageParam { -} diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/service/dashboard/DashboardService.java b/shop-manage/src/main/java/quick/pager/shop/manage/service/dashboard/DashboardService.java deleted file mode 100644 index 8d1e865..0000000 --- a/shop-manage/src/main/java/quick/pager/shop/manage/service/dashboard/DashboardService.java +++ /dev/null @@ -1,4 +0,0 @@ -package quick.pager.shop.manage.service.dashboard; - -public interface DashboardService { -} diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/package-info.java b/shop-manage/src/main/java/quick/pager/shop/manage/service/system/package-info.java deleted file mode 100644 index 2b95fa1..0000000 --- a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package quick.pager.shop.manage.service.system; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/mapper/GeneratorMapper.java b/shop-manage/src/main/java/quick/pager/shop/mapper/GeneratorMapper.java similarity index 81% rename from shop-manage/src/main/java/quick/pager/shop/manage/mapper/GeneratorMapper.java rename to shop-manage/src/main/java/quick/pager/shop/mapper/GeneratorMapper.java index 2ef2a16..8906fdd 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/mapper/GeneratorMapper.java +++ b/shop-manage/src/main/java/quick/pager/shop/mapper/GeneratorMapper.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -6,8 +6,8 @@ import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import quick.pager.shop.manage.model.Columns; -import quick.pager.shop.manage.model.Tables; +import quick.pager.shop.model.Columns; +import quick.pager.shop.model.Tables; @Mapper public interface GeneratorMapper { diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/mapper/MenuMapper.java b/shop-manage/src/main/java/quick/pager/shop/mapper/MenuMapper.java similarity index 72% rename from shop-manage/src/main/java/quick/pager/shop/manage/mapper/MenuMapper.java rename to shop-manage/src/main/java/quick/pager/shop/mapper/MenuMapper.java index b3dca44..ed243cf 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/mapper/MenuMapper.java +++ b/shop-manage/src/main/java/quick/pager/shop/mapper/MenuMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.manage.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.manage.model.Menu; +import quick.pager.shop.model.Menu; /** * MenuMapper diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/mapper/RoleMapper.java b/shop-manage/src/main/java/quick/pager/shop/mapper/RoleMapper.java similarity index 72% rename from shop-manage/src/main/java/quick/pager/shop/manage/mapper/RoleMapper.java rename to shop-manage/src/main/java/quick/pager/shop/mapper/RoleMapper.java index 0d83341..f1a3a99 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/mapper/RoleMapper.java +++ b/shop-manage/src/main/java/quick/pager/shop/mapper/RoleMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.manage.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.manage.model.Role; +import quick.pager.shop.model.Role; /** * 角色Mapper diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/mapper/RoleMenuMapper.java b/shop-manage/src/main/java/quick/pager/shop/mapper/RoleMenuMapper.java similarity index 72% rename from shop-manage/src/main/java/quick/pager/shop/manage/mapper/RoleMenuMapper.java rename to shop-manage/src/main/java/quick/pager/shop/mapper/RoleMenuMapper.java index edde66c..ad85461 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/mapper/RoleMenuMapper.java +++ b/shop-manage/src/main/java/quick/pager/shop/mapper/RoleMenuMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.manage.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.manage.model.RoleMenu; +import quick.pager.shop.model.RoleMenu; /** * RoleMenuMapper diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/mapper/SysRoleMapper.java b/shop-manage/src/main/java/quick/pager/shop/mapper/SysRoleMapper.java similarity index 67% rename from shop-manage/src/main/java/quick/pager/shop/manage/mapper/SysRoleMapper.java rename to shop-manage/src/main/java/quick/pager/shop/mapper/SysRoleMapper.java index b93b82a..24a9c66 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/mapper/SysRoleMapper.java +++ b/shop-manage/src/main/java/quick/pager/shop/mapper/SysRoleMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.manage.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.manage.model.SysRole; +import quick.pager.shop.model.SysRole; @Mapper public interface SysRoleMapper extends BaseMapper { diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/mapper/SysUserMapper.java b/shop-manage/src/main/java/quick/pager/shop/mapper/SysUserMapper.java similarity index 72% rename from shop-manage/src/main/java/quick/pager/shop/manage/mapper/SysUserMapper.java rename to shop-manage/src/main/java/quick/pager/shop/mapper/SysUserMapper.java index 63deaf6..5715440 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/mapper/SysUserMapper.java +++ b/shop-manage/src/main/java/quick/pager/shop/mapper/SysUserMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.manage.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.manage.model.SysUser; +import quick.pager.shop.model.SysUser; /** * 系统用户Mapper diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/model/Columns.java b/shop-manage/src/main/java/quick/pager/shop/model/Columns.java similarity index 95% rename from shop-manage/src/main/java/quick/pager/shop/manage/model/Columns.java rename to shop-manage/src/main/java/quick/pager/shop/model/Columns.java index e4ae03d..18bbaea 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/model/Columns.java +++ b/shop-manage/src/main/java/quick/pager/shop/model/Columns.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/model/Menu.java b/shop-manage/src/main/java/quick/pager/shop/model/Menu.java similarity index 95% rename from shop-manage/src/main/java/quick/pager/shop/manage/model/Menu.java rename to shop-manage/src/main/java/quick/pager/shop/model/Menu.java index f944478..f38a650 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/model/Menu.java +++ b/shop-manage/src/main/java/quick/pager/shop/model/Menu.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/model/Role.java b/shop-manage/src/main/java/quick/pager/shop/model/Role.java similarity index 94% rename from shop-manage/src/main/java/quick/pager/shop/manage/model/Role.java rename to shop-manage/src/main/java/quick/pager/shop/model/Role.java index 615ce92..7bc1ddb 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/model/Role.java +++ b/shop-manage/src/main/java/quick/pager/shop/model/Role.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/model/RoleMenu.java b/shop-manage/src/main/java/quick/pager/shop/model/RoleMenu.java similarity index 92% rename from shop-manage/src/main/java/quick/pager/shop/manage/model/RoleMenu.java rename to shop-manage/src/main/java/quick/pager/shop/model/RoleMenu.java index 11ff1c4..25c893c 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/model/RoleMenu.java +++ b/shop-manage/src/main/java/quick/pager/shop/model/RoleMenu.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/model/SysRole.java b/shop-manage/src/main/java/quick/pager/shop/model/SysRole.java similarity index 91% rename from shop-manage/src/main/java/quick/pager/shop/manage/model/SysRole.java rename to shop-manage/src/main/java/quick/pager/shop/model/SysRole.java index 8608b91..d16f825 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/model/SysRole.java +++ b/shop-manage/src/main/java/quick/pager/shop/model/SysRole.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/model/SysUser.java b/shop-manage/src/main/java/quick/pager/shop/model/SysUser.java similarity index 92% rename from shop-manage/src/main/java/quick/pager/shop/manage/model/SysUser.java rename to shop-manage/src/main/java/quick/pager/shop/model/SysUser.java index 73b8b56..db4c5a4 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/model/SysUser.java +++ b/shop-manage/src/main/java/quick/pager/shop/model/SysUser.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @@ -6,7 +6,6 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.model.Model; /** * 系统登陆用户 diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/model/Tables.java b/shop-manage/src/main/java/quick/pager/shop/model/Tables.java similarity index 93% rename from shop-manage/src/main/java/quick/pager/shop/manage/model/Tables.java rename to shop-manage/src/main/java/quick/pager/shop/model/Tables.java index 4b4bac4..6b9f544 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/model/Tables.java +++ b/shop-manage/src/main/java/quick/pager/shop/model/Tables.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/ClassificationPageParam.java b/shop-manage/src/main/java/quick/pager/shop/param/goods/ClassificationPageParam.java similarity index 88% rename from shop-manage/src/main/java/quick/pager/shop/manage/param/goods/ClassificationPageParam.java rename to shop-manage/src/main/java/quick/pager/shop/param/goods/ClassificationPageParam.java index 18d0bca..aa74214 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/ClassificationPageParam.java +++ b/shop-manage/src/main/java/quick/pager/shop/param/goods/ClassificationPageParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.param.goods; +package quick.pager.shop.param.goods; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/shop-manage/src/main/java/quick/pager/shop/param/goods/ClassificationSaveParam.java b/shop-manage/src/main/java/quick/pager/shop/param/goods/ClassificationSaveParam.java new file mode 100644 index 0000000..86aebd3 --- /dev/null +++ b/shop-manage/src/main/java/quick/pager/shop/param/goods/ClassificationSaveParam.java @@ -0,0 +1,4 @@ +package quick.pager.shop.param.goods; + +public class ClassificationSaveParam { +} diff --git a/shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsBrandGroupPageParam.java b/shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsBrandGroupPageParam.java new file mode 100644 index 0000000..97a2ffa --- /dev/null +++ b/shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsBrandGroupPageParam.java @@ -0,0 +1,4 @@ +package quick.pager.shop.param.goods; + +public class GoodsBrandGroupPageParam { +} diff --git a/shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsBrandGroupSaveParam.java b/shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsBrandGroupSaveParam.java new file mode 100644 index 0000000..b5dff05 --- /dev/null +++ b/shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsBrandGroupSaveParam.java @@ -0,0 +1,4 @@ +package quick.pager.shop.param.goods; + +public class GoodsBrandGroupSaveParam { +} diff --git a/shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsBrandPageParam.java b/shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsBrandPageParam.java new file mode 100644 index 0000000..dbbfde1 --- /dev/null +++ b/shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsBrandPageParam.java @@ -0,0 +1,4 @@ +package quick.pager.shop.param.goods; + +public class GoodsBrandPageParam { +} diff --git a/shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsBrandSaveParam.java b/shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsBrandSaveParam.java new file mode 100644 index 0000000..26a0abd --- /dev/null +++ b/shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsBrandSaveParam.java @@ -0,0 +1,4 @@ +package quick.pager.shop.param.goods; + +public class GoodsBrandSaveParam { +} diff --git a/shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsPageParam.java b/shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsPageParam.java new file mode 100644 index 0000000..e4a0752 --- /dev/null +++ b/shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsPageParam.java @@ -0,0 +1,4 @@ +package quick.pager.shop.param.goods; + +public class GoodsPageParam { +} diff --git a/shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsSaveParam.java b/shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsSaveParam.java new file mode 100644 index 0000000..22c4718 --- /dev/null +++ b/shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsSaveParam.java @@ -0,0 +1,4 @@ +package quick.pager.shop.param.goods; + +public class GoodsSaveParam { +} diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsSpuPageParam.java b/shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsSpuPageParam.java similarity index 82% rename from shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsSpuPageParam.java rename to shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsSpuPageParam.java index 5f40b23..2304f5b 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsSpuPageParam.java +++ b/shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsSpuPageParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.param.goods; +package quick.pager.shop.param.goods; import quick.pager.shop.param.Param; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsSpuSaveParam.java b/shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsSpuSaveParam.java similarity index 82% rename from shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsSpuSaveParam.java rename to shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsSpuSaveParam.java index fef12cd..b440096 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/goods/GoodsSpuSaveParam.java +++ b/shop-manage/src/main/java/quick/pager/shop/param/goods/GoodsSpuSaveParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.param.goods; +package quick.pager.shop.param.goods; import quick.pager.shop.param.Param; diff --git a/shop-manage/src/main/java/quick/pager/shop/param/order/UserOrderPageParam.java b/shop-manage/src/main/java/quick/pager/shop/param/order/UserOrderPageParam.java new file mode 100644 index 0000000..4629a23 --- /dev/null +++ b/shop-manage/src/main/java/quick/pager/shop/param/order/UserOrderPageParam.java @@ -0,0 +1,4 @@ +package quick.pager.shop.param.order; + +public class UserOrderPageParam { +} diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/AuthorizationParam.java b/shop-manage/src/main/java/quick/pager/shop/param/system/AuthorizationParam.java similarity index 89% rename from shop-manage/src/main/java/quick/pager/shop/manage/param/system/AuthorizationParam.java rename to shop-manage/src/main/java/quick/pager/shop/param/system/AuthorizationParam.java index 2ac98af..e29fece 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/AuthorizationParam.java +++ b/shop-manage/src/main/java/quick/pager/shop/param/system/AuthorizationParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.param.system; +package quick.pager.shop.param.system; import java.util.List; import lombok.Data; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/DynamicFormOtherSaveParam.java b/shop-manage/src/main/java/quick/pager/shop/param/system/DynamicFormOtherSaveParam.java similarity index 88% rename from shop-manage/src/main/java/quick/pager/shop/manage/param/system/DynamicFormOtherSaveParam.java rename to shop-manage/src/main/java/quick/pager/shop/param/system/DynamicFormOtherSaveParam.java index 81b0bba..9a512da 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/DynamicFormOtherSaveParam.java +++ b/shop-manage/src/main/java/quick/pager/shop/param/system/DynamicFormOtherSaveParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.param.system; +package quick.pager.shop.param.system; import java.io.Serializable; import java.util.List; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/DynamicFormParam.java b/shop-manage/src/main/java/quick/pager/shop/param/system/DynamicFormParam.java similarity index 97% rename from shop-manage/src/main/java/quick/pager/shop/manage/param/system/DynamicFormParam.java rename to shop-manage/src/main/java/quick/pager/shop/param/system/DynamicFormParam.java index 9f6d4db..c7e898f 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/DynamicFormParam.java +++ b/shop-manage/src/main/java/quick/pager/shop/param/system/DynamicFormParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.param.system; +package quick.pager.shop.param.system; import java.io.Serializable; import lombok.Data; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/GeneratorPageParam.java b/shop-manage/src/main/java/quick/pager/shop/param/system/GeneratorPageParam.java similarity index 90% rename from shop-manage/src/main/java/quick/pager/shop/manage/param/system/GeneratorPageParam.java rename to shop-manage/src/main/java/quick/pager/shop/param/system/GeneratorPageParam.java index 9912853..eba58a8 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/GeneratorPageParam.java +++ b/shop-manage/src/main/java/quick/pager/shop/param/system/GeneratorPageParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.param.system; +package quick.pager.shop.param.system; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/MenuOtherParam.java b/shop-manage/src/main/java/quick/pager/shop/param/system/MenuOtherParam.java similarity index 88% rename from shop-manage/src/main/java/quick/pager/shop/manage/param/system/MenuOtherParam.java rename to shop-manage/src/main/java/quick/pager/shop/param/system/MenuOtherParam.java index 9d131f6..0600500 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/MenuOtherParam.java +++ b/shop-manage/src/main/java/quick/pager/shop/param/system/MenuOtherParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.param.system; +package quick.pager.shop.param.system; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/MenuSaveParam.java b/shop-manage/src/main/java/quick/pager/shop/param/system/MenuSaveParam.java similarity index 93% rename from shop-manage/src/main/java/quick/pager/shop/manage/param/system/MenuSaveParam.java rename to shop-manage/src/main/java/quick/pager/shop/param/system/MenuSaveParam.java index 7f12587..0bbddf2 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/MenuSaveParam.java +++ b/shop-manage/src/main/java/quick/pager/shop/param/system/MenuSaveParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.param.system; +package quick.pager.shop.param.system; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/RoleOtherParam.java b/shop-manage/src/main/java/quick/pager/shop/param/system/RoleOtherParam.java similarity index 87% rename from shop-manage/src/main/java/quick/pager/shop/manage/param/system/RoleOtherParam.java rename to shop-manage/src/main/java/quick/pager/shop/param/system/RoleOtherParam.java index 7390145..6d0e5cb 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/RoleOtherParam.java +++ b/shop-manage/src/main/java/quick/pager/shop/param/system/RoleOtherParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.param.system; +package quick.pager.shop.param.system; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/RolePageParam.java b/shop-manage/src/main/java/quick/pager/shop/param/system/RolePageParam.java similarity index 87% rename from shop-manage/src/main/java/quick/pager/shop/manage/param/system/RolePageParam.java rename to shop-manage/src/main/java/quick/pager/shop/param/system/RolePageParam.java index 827cbf8..4d2b466 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/RolePageParam.java +++ b/shop-manage/src/main/java/quick/pager/shop/param/system/RolePageParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.param.system; +package quick.pager.shop.param.system; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/RoleSaveParam.java b/shop-manage/src/main/java/quick/pager/shop/param/system/RoleSaveParam.java similarity index 91% rename from shop-manage/src/main/java/quick/pager/shop/manage/param/system/RoleSaveParam.java rename to shop-manage/src/main/java/quick/pager/shop/param/system/RoleSaveParam.java index 1a53c66..82d78ef 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/RoleSaveParam.java +++ b/shop-manage/src/main/java/quick/pager/shop/param/system/RoleSaveParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.param.system; +package quick.pager.shop.param.system; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/SysUserPageParam.java b/shop-manage/src/main/java/quick/pager/shop/param/system/SysUserPageParam.java similarity index 91% rename from shop-manage/src/main/java/quick/pager/shop/manage/param/system/SysUserPageParam.java rename to shop-manage/src/main/java/quick/pager/shop/param/system/SysUserPageParam.java index 2586f10..c564650 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/SysUserPageParam.java +++ b/shop-manage/src/main/java/quick/pager/shop/param/system/SysUserPageParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.param.system; +package quick.pager.shop.param.system; import java.util.List; import lombok.Data; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/SysUserParam.java b/shop-manage/src/main/java/quick/pager/shop/param/system/SysUserParam.java similarity index 90% rename from shop-manage/src/main/java/quick/pager/shop/manage/param/system/SysUserParam.java rename to shop-manage/src/main/java/quick/pager/shop/param/system/SysUserParam.java index e5f3007..c6cde44 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/SysUserParam.java +++ b/shop-manage/src/main/java/quick/pager/shop/param/system/SysUserParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.param.system; +package quick.pager.shop.param.system; import java.util.List; import lombok.Data; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/SystemConfigParam.java b/shop-manage/src/main/java/quick/pager/shop/param/system/SystemConfigParam.java similarity index 93% rename from shop-manage/src/main/java/quick/pager/shop/manage/param/system/SystemConfigParam.java rename to shop-manage/src/main/java/quick/pager/shop/param/system/SystemConfigParam.java index ed176a7..87d71b3 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/param/system/SystemConfigParam.java +++ b/shop-manage/src/main/java/quick/pager/shop/param/system/SystemConfigParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.param.system; +package quick.pager.shop.param.system; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/response/EnumResponse.java b/shop-manage/src/main/java/quick/pager/shop/response/EnumResponse.java similarity index 96% rename from shop-manage/src/main/java/quick/pager/shop/manage/response/EnumResponse.java rename to shop-manage/src/main/java/quick/pager/shop/response/EnumResponse.java index 73f6f2e..cc7909f 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/response/EnumResponse.java +++ b/shop-manage/src/main/java/quick/pager/shop/response/EnumResponse.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.response; +package quick.pager.shop.response; import java.io.Serializable; import lombok.Data; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/response/LoginResponse.java b/shop-manage/src/main/java/quick/pager/shop/response/LoginResponse.java similarity index 85% rename from shop-manage/src/main/java/quick/pager/shop/manage/response/LoginResponse.java rename to shop-manage/src/main/java/quick/pager/shop/response/LoginResponse.java index ef3cd54..c0708b4 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/response/LoginResponse.java +++ b/shop-manage/src/main/java/quick/pager/shop/response/LoginResponse.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.response; +package quick.pager.shop.response; import java.io.Serializable; import lombok.Data; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/response/PermissionResponse.java b/shop-manage/src/main/java/quick/pager/shop/response/PermissionResponse.java similarity index 84% rename from shop-manage/src/main/java/quick/pager/shop/manage/response/PermissionResponse.java rename to shop-manage/src/main/java/quick/pager/shop/response/PermissionResponse.java index a8f01a2..160bbf2 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/response/PermissionResponse.java +++ b/shop-manage/src/main/java/quick/pager/shop/response/PermissionResponse.java @@ -1,10 +1,10 @@ -package quick.pager.shop.manage.response; +package quick.pager.shop.response; import com.google.common.collect.Lists; import java.io.Serializable; import java.util.List; import lombok.Data; -import quick.pager.shop.manage.response.system.MenuResponse; +import quick.pager.shop.response.system.MenuResponse; @Data public class PermissionResponse implements Serializable { diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/response/system/MenuResponse.java b/shop-manage/src/main/java/quick/pager/shop/response/system/MenuResponse.java similarity index 96% rename from shop-manage/src/main/java/quick/pager/shop/manage/response/system/MenuResponse.java rename to shop-manage/src/main/java/quick/pager/shop/response/system/MenuResponse.java index 5224d9a..8ce7b0c 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/response/system/MenuResponse.java +++ b/shop-manage/src/main/java/quick/pager/shop/response/system/MenuResponse.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.response.system; +package quick.pager.shop.response.system; import java.io.Serializable; import java.util.List; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/response/system/RoleResponse.java b/shop-manage/src/main/java/quick/pager/shop/response/system/RoleResponse.java similarity index 82% rename from shop-manage/src/main/java/quick/pager/shop/manage/response/system/RoleResponse.java rename to shop-manage/src/main/java/quick/pager/shop/response/system/RoleResponse.java index e4151ae..eb217f8 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/response/system/RoleResponse.java +++ b/shop-manage/src/main/java/quick/pager/shop/response/system/RoleResponse.java @@ -1,8 +1,8 @@ -package quick.pager.shop.manage.response.system; +package quick.pager.shop.response.system; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * 角色 diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/response/system/SysUserResponse.java b/shop-manage/src/main/java/quick/pager/shop/response/system/SysUserResponse.java similarity index 84% rename from shop-manage/src/main/java/quick/pager/shop/manage/response/system/SysUserResponse.java rename to shop-manage/src/main/java/quick/pager/shop/response/system/SysUserResponse.java index 2e02a8b..46c41a2 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/response/system/SysUserResponse.java +++ b/shop-manage/src/main/java/quick/pager/shop/response/system/SysUserResponse.java @@ -1,12 +1,12 @@ -package quick.pager.shop.manage.response.system; +package quick.pager.shop.response.system; import com.google.common.collect.Lists; import java.util.ArrayList; import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.manage.model.Role; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.model.Role; +import quick.pager.shop.user.response.BasicResponse; /** * 系统用户 diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/service/CommonEnumService.java b/shop-manage/src/main/java/quick/pager/shop/service/CommonEnumService.java similarity index 96% rename from shop-manage/src/main/java/quick/pager/shop/manage/service/CommonEnumService.java rename to shop-manage/src/main/java/quick/pager/shop/service/CommonEnumService.java index 53b554e..a3982f9 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/service/CommonEnumService.java +++ b/shop-manage/src/main/java/quick/pager/shop/service/CommonEnumService.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.service; +package quick.pager.shop.service; import com.alibaba.fastjson.JSON; import com.google.common.collect.Lists; @@ -11,9 +11,8 @@ import org.springframework.stereotype.Service; import quick.pager.shop.constants.Constants; import quick.pager.shop.platform.dto.SystemConfigDTO; -import quick.pager.shop.response.Response; -import quick.pager.shop.manage.response.EnumResponse; -import quick.pager.shop.service.RedisService; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.response.EnumResponse; /** * 通用枚举服务 diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/service/GeneratorService.java b/shop-manage/src/main/java/quick/pager/shop/service/GeneratorService.java similarity index 94% rename from shop-manage/src/main/java/quick/pager/shop/manage/service/GeneratorService.java rename to shop-manage/src/main/java/quick/pager/shop/service/GeneratorService.java index 8703998..bf3d391 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/service/GeneratorService.java +++ b/shop-manage/src/main/java/quick/pager/shop/service/GeneratorService.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.service; +package quick.pager.shop.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -22,11 +22,11 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import quick.pager.shop.manage.param.system.GeneratorPageParam; -import quick.pager.shop.manage.mapper.GeneratorMapper; -import quick.pager.shop.manage.model.Columns; -import quick.pager.shop.manage.model.Tables; -import quick.pager.shop.response.Response; +import quick.pager.shop.param.system.GeneratorPageParam; +import quick.pager.shop.mapper.GeneratorMapper; +import quick.pager.shop.model.Columns; +import quick.pager.shop.model.Tables; +import quick.pager.shop.user.response.Response; /** * @author siguiyang diff --git a/shop-manage/src/main/java/quick/pager/shop/service/dashboard/DashboardService.java b/shop-manage/src/main/java/quick/pager/shop/service/dashboard/DashboardService.java new file mode 100644 index 0000000..f93bf7f --- /dev/null +++ b/shop-manage/src/main/java/quick/pager/shop/service/dashboard/DashboardService.java @@ -0,0 +1,4 @@ +package quick.pager.shop.service.dashboard; + +public interface DashboardService { +} diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/service/dashboard/impl/DashboardServiceImpl.java b/shop-manage/src/main/java/quick/pager/shop/service/dashboard/impl/DashboardServiceImpl.java similarity index 59% rename from shop-manage/src/main/java/quick/pager/shop/manage/service/dashboard/impl/DashboardServiceImpl.java rename to shop-manage/src/main/java/quick/pager/shop/service/dashboard/impl/DashboardServiceImpl.java index 419e177..7063ade 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/service/dashboard/impl/DashboardServiceImpl.java +++ b/shop-manage/src/main/java/quick/pager/shop/service/dashboard/impl/DashboardServiceImpl.java @@ -1,7 +1,7 @@ -package quick.pager.shop.manage.service.dashboard.impl; +package quick.pager.shop.service.dashboard.impl; import org.springframework.stereotype.Service; -import quick.pager.shop.manage.service.dashboard.DashboardService; +import quick.pager.shop.service.dashboard.DashboardService; /** * 首页数据服务 diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/DynamicFormService.java b/shop-manage/src/main/java/quick/pager/shop/service/system/DynamicFormService.java similarity index 76% rename from shop-manage/src/main/java/quick/pager/shop/manage/service/system/DynamicFormService.java rename to shop-manage/src/main/java/quick/pager/shop/service/system/DynamicFormService.java index 050c99a..a31c903 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/DynamicFormService.java +++ b/shop-manage/src/main/java/quick/pager/shop/service/system/DynamicFormService.java @@ -1,9 +1,9 @@ -package quick.pager.shop.manage.service.system; +package quick.pager.shop.service.system; import java.util.List; -import quick.pager.shop.manage.param.system.DynamicFormOtherSaveParam; +import quick.pager.shop.param.system.DynamicFormOtherSaveParam; import quick.pager.shop.platform.response.DynamicFormResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 自定义表单 diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/MenuService.java b/shop-manage/src/main/java/quick/pager/shop/service/system/MenuService.java similarity index 63% rename from shop-manage/src/main/java/quick/pager/shop/manage/service/system/MenuService.java rename to shop-manage/src/main/java/quick/pager/shop/service/system/MenuService.java index efdfb04..005812b 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/MenuService.java +++ b/shop-manage/src/main/java/quick/pager/shop/service/system/MenuService.java @@ -1,11 +1,11 @@ -package quick.pager.shop.manage.service.system; +package quick.pager.shop.service.system; import java.util.List; -import quick.pager.shop.manage.model.Menu; -import quick.pager.shop.manage.param.system.MenuOtherParam; -import quick.pager.shop.manage.param.system.MenuSaveParam; -import quick.pager.shop.manage.response.system.MenuResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.model.Menu; +import quick.pager.shop.param.system.MenuOtherParam; +import quick.pager.shop.param.system.MenuSaveParam; +import quick.pager.shop.response.system.MenuResponse; +import quick.pager.shop.user.response.Response; import quick.pager.shop.service.IService; /** diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/PermissionService.java b/shop-manage/src/main/java/quick/pager/shop/service/system/PermissionService.java similarity index 78% rename from shop-manage/src/main/java/quick/pager/shop/manage/service/system/PermissionService.java rename to shop-manage/src/main/java/quick/pager/shop/service/system/PermissionService.java index 8483c4f..41e7811 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/PermissionService.java +++ b/shop-manage/src/main/java/quick/pager/shop/service/system/PermissionService.java @@ -1,8 +1,8 @@ -package quick.pager.shop.manage.service.system; +package quick.pager.shop.service.system; import java.util.List; -import quick.pager.shop.manage.response.system.MenuResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.response.system.MenuResponse; +import quick.pager.shop.user.response.Response; /** * 权限服务 diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/RoleService.java b/shop-manage/src/main/java/quick/pager/shop/service/system/RoleService.java similarity index 65% rename from shop-manage/src/main/java/quick/pager/shop/manage/service/system/RoleService.java rename to shop-manage/src/main/java/quick/pager/shop/service/system/RoleService.java index 7f0bac4..a854bbc 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/RoleService.java +++ b/shop-manage/src/main/java/quick/pager/shop/service/system/RoleService.java @@ -1,12 +1,12 @@ -package quick.pager.shop.manage.service.system; +package quick.pager.shop.service.system; import java.util.List; -import quick.pager.shop.manage.param.system.RoleOtherParam; -import quick.pager.shop.manage.param.system.RolePageParam; -import quick.pager.shop.manage.param.system.RoleSaveParam; -import quick.pager.shop.manage.response.PermissionResponse; -import quick.pager.shop.manage.response.system.RoleResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.param.system.RoleOtherParam; +import quick.pager.shop.param.system.RolePageParam; +import quick.pager.shop.param.system.RoleSaveParam; +import quick.pager.shop.response.PermissionResponse; +import quick.pager.shop.response.system.RoleResponse; +import quick.pager.shop.user.response.Response; /** * 角色服务 diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/SysUserService.java b/shop-manage/src/main/java/quick/pager/shop/service/system/SysUserService.java similarity index 66% rename from shop-manage/src/main/java/quick/pager/shop/manage/service/system/SysUserService.java rename to shop-manage/src/main/java/quick/pager/shop/service/system/SysUserService.java index f0dab63..1f90ed4 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/SysUserService.java +++ b/shop-manage/src/main/java/quick/pager/shop/service/system/SysUserService.java @@ -1,10 +1,10 @@ -package quick.pager.shop.manage.service.system; +package quick.pager.shop.service.system; import java.util.List; -import quick.pager.shop.manage.param.system.SysUserPageParam; -import quick.pager.shop.manage.param.system.SysUserParam; -import quick.pager.shop.manage.response.system.SysUserResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.param.system.SysUserPageParam; +import quick.pager.shop.param.system.SysUserParam; +import quick.pager.shop.response.system.SysUserResponse; +import quick.pager.shop.user.response.Response; /** * 系统用户服务 diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/SystemConfigService.java b/shop-manage/src/main/java/quick/pager/shop/service/system/SystemConfigService.java similarity index 81% rename from shop-manage/src/main/java/quick/pager/shop/manage/service/system/SystemConfigService.java rename to shop-manage/src/main/java/quick/pager/shop/service/system/SystemConfigService.java index 752e7e1..a78244b 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/SystemConfigService.java +++ b/shop-manage/src/main/java/quick/pager/shop/service/system/SystemConfigService.java @@ -1,9 +1,9 @@ -package quick.pager.shop.manage.service.system; +package quick.pager.shop.service.system; import java.util.List; -import quick.pager.shop.manage.param.system.SystemConfigParam; +import quick.pager.shop.param.system.SystemConfigParam; import quick.pager.shop.platform.response.SystemConfigResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 系统配置 diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/DynamicFormServiceImpl.java b/shop-manage/src/main/java/quick/pager/shop/service/system/impl/DynamicFormServiceImpl.java similarity index 85% rename from shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/DynamicFormServiceImpl.java rename to shop-manage/src/main/java/quick/pager/shop/service/system/impl/DynamicFormServiceImpl.java index aabbfb2..4b28644 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/DynamicFormServiceImpl.java +++ b/shop-manage/src/main/java/quick/pager/shop/service/system/impl/DynamicFormServiceImpl.java @@ -1,17 +1,17 @@ -package quick.pager.shop.manage.service.system.impl; +package quick.pager.shop.service.system.impl; import java.util.Collections; import java.util.List; import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import quick.pager.shop.manage.param.system.DynamicFormOtherSaveParam; -import quick.pager.shop.manage.param.system.DynamicFormParam; -import quick.pager.shop.manage.service.system.DynamicFormService; +import quick.pager.shop.param.system.DynamicFormOtherSaveParam; +import quick.pager.shop.param.system.DynamicFormParam; +import quick.pager.shop.service.system.DynamicFormService; import quick.pager.shop.platform.client.DynamicFormClient; import quick.pager.shop.platform.request.DynamicFormSaveRequest; import quick.pager.shop.platform.response.DynamicFormResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; import quick.pager.shop.utils.BeanCopier; @Service diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/LoginService.java b/shop-manage/src/main/java/quick/pager/shop/service/system/impl/LoginService.java similarity index 89% rename from shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/LoginService.java rename to shop-manage/src/main/java/quick/pager/shop/service/system/impl/LoginService.java index 71a857a..c8c55c9 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/LoginService.java +++ b/shop-manage/src/main/java/quick/pager/shop/service/system/impl/LoginService.java @@ -8,12 +8,12 @@ //import org.springframework.stereotype.Service; //import quick.pager.shop.constants.ResponseStatus; //import quick.pager.shop.dto.BaseDTO; -//import quick.pager.shop.response.Response; +//import quick.pager.shop.user.response.Response; //import quick.pager.shop.service.IService; //import quick.pager.shop.manage.param.LoginDTO; -//import quick.pager.shop.manage.mapper.SysUserMapper; -//import quick.pager.shop.manage.response.LoginResponse; -//import quick.pager.shop.manage.model.SysUser; +//import SysUserMapper; +//import LoginResponse; +//import SysUser; // ///** // * 登陆服务 diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/MenuServiceImpl.java b/shop-manage/src/main/java/quick/pager/shop/service/system/impl/MenuServiceImpl.java similarity index 88% rename from shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/MenuServiceImpl.java rename to shop-manage/src/main/java/quick/pager/shop/service/system/impl/MenuServiceImpl.java index 84744e5..1f2ccf3 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/MenuServiceImpl.java +++ b/shop-manage/src/main/java/quick/pager/shop/service/system/impl/MenuServiceImpl.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.service.system.impl; +package quick.pager.shop.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.Collections; @@ -9,13 +9,13 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import quick.pager.shop.manage.mapper.MenuMapper; -import quick.pager.shop.manage.param.system.MenuOtherParam; -import quick.pager.shop.manage.param.system.MenuSaveParam; -import quick.pager.shop.manage.response.system.MenuResponse; -import quick.pager.shop.manage.service.system.MenuService; -import quick.pager.shop.manage.model.Menu; -import quick.pager.shop.response.Response; +import quick.pager.shop.mapper.MenuMapper; +import quick.pager.shop.param.system.MenuOtherParam; +import quick.pager.shop.param.system.MenuSaveParam; +import quick.pager.shop.response.system.MenuResponse; +import quick.pager.shop.service.system.MenuService; +import quick.pager.shop.model.Menu; +import quick.pager.shop.user.response.Response; import quick.pager.shop.service.impl.ServiceImpl; import quick.pager.shop.utils.BeanCopier; import quick.pager.shop.utils.DateUtils; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/PermissionServiceImpl.java b/shop-manage/src/main/java/quick/pager/shop/service/system/impl/PermissionServiceImpl.java similarity index 86% rename from shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/PermissionServiceImpl.java rename to shop-manage/src/main/java/quick/pager/shop/service/system/impl/PermissionServiceImpl.java index 980676d..36fa87a 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/PermissionServiceImpl.java +++ b/shop-manage/src/main/java/quick/pager/shop/service/system/impl/PermissionServiceImpl.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.service.system.impl; +package quick.pager.shop.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -8,14 +8,14 @@ import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import quick.pager.shop.manage.helper.MenuHelper; -import quick.pager.shop.manage.mapper.MenuMapper; -import quick.pager.shop.manage.mapper.RoleMenuMapper; -import quick.pager.shop.manage.model.Menu; -import quick.pager.shop.manage.model.RoleMenu; -import quick.pager.shop.manage.response.system.MenuResponse; -import quick.pager.shop.manage.service.system.PermissionService; -import quick.pager.shop.response.Response; +import quick.pager.shop.helper.MenuHelper; +import quick.pager.shop.mapper.MenuMapper; +import quick.pager.shop.mapper.RoleMenuMapper; +import quick.pager.shop.model.Menu; +import quick.pager.shop.model.RoleMenu; +import quick.pager.shop.response.system.MenuResponse; +import quick.pager.shop.service.system.PermissionService; +import quick.pager.shop.user.response.Response; import quick.pager.shop.utils.DateUtils; /** diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/RoleServiceImpl.java b/shop-manage/src/main/java/quick/pager/shop/service/system/impl/RoleServiceImpl.java similarity index 79% rename from shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/RoleServiceImpl.java rename to shop-manage/src/main/java/quick/pager/shop/service/system/impl/RoleServiceImpl.java index ca27e91..dde5b20 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/RoleServiceImpl.java +++ b/shop-manage/src/main/java/quick/pager/shop/service/system/impl/RoleServiceImpl.java @@ -1,7 +1,6 @@ -package quick.pager.shop.manage.service.system.impl; +package quick.pager.shop.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.collect.Lists; import java.util.Collections; import java.util.List; @@ -14,19 +13,19 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import quick.pager.shop.manage.helper.MenuHelper; -import quick.pager.shop.manage.mapper.MenuMapper; -import quick.pager.shop.manage.mapper.RoleMapper; -import quick.pager.shop.manage.param.system.RoleOtherParam; -import quick.pager.shop.manage.param.system.RolePageParam; -import quick.pager.shop.manage.param.system.RoleSaveParam; -import quick.pager.shop.manage.response.PermissionResponse; -import quick.pager.shop.manage.response.system.MenuResponse; -import quick.pager.shop.manage.response.system.RoleResponse; -import quick.pager.shop.manage.service.system.RoleService; -import quick.pager.shop.manage.model.Menu; -import quick.pager.shop.manage.model.Role; -import quick.pager.shop.response.Response; +import quick.pager.shop.helper.MenuHelper; +import quick.pager.shop.mapper.MenuMapper; +import quick.pager.shop.mapper.RoleMapper; +import quick.pager.shop.param.system.RoleOtherParam; +import quick.pager.shop.param.system.RolePageParam; +import quick.pager.shop.param.system.RoleSaveParam; +import quick.pager.shop.response.PermissionResponse; +import quick.pager.shop.response.system.MenuResponse; +import quick.pager.shop.response.system.RoleResponse; +import quick.pager.shop.service.system.RoleService; +import quick.pager.shop.model.Menu; +import quick.pager.shop.model.Role; +import quick.pager.shop.user.response.Response; import quick.pager.shop.service.impl.ServiceImpl; import quick.pager.shop.utils.BeanCopier; import quick.pager.shop.utils.DateUtils; @@ -47,12 +46,9 @@ public class RoleServiceImpl extends ServiceImpl implements Ro @Override public Response> queryPage(RolePageParam param) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Role::getDeleteStatus, Boolean.FALSE); - - if (StringUtils.isNotBlank(param.getRoleName())) { - wrapper.likeRight(Role::getRoleName, param.getRoleName()); - } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(Role::getDeleteStatus, Boolean.FALSE) + .likeRight(StringUtils.isNotBlank(param.getRoleName()), Role::getRoleName, param.getRoleName()); Response> response = this.toPage(param.getPage(), param.getPageSize(), wrapper); @@ -64,12 +60,10 @@ public Response> queryPage(RolePageParam param) { @Override public Response> queryList(RoleOtherParam param) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Role::getDeleteStatus, Boolean.FALSE); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(Role::getDeleteStatus, Boolean.FALSE) + .likeRight(StringUtils.isNotBlank(param.getRoleName()), Role::getRoleName, param.getRoleName()); - if (StringUtils.isNotEmpty(param.getRoleName())) { - wrapper.eq(Role::getRoleName, param.getRoleName()); - } List roles = this.list(wrapper); return new Response<>(roles.stream().map(item -> BeanCopier.create(item, new RoleResponse()).copy()).collect(Collectors.toList())); @@ -105,9 +99,7 @@ public Response delete(Long id) { @Override public Response queryRolePermission(Long roleId) { - Menu menu = new Menu(); - menu.setDeleteStatus(Boolean.FALSE); - List

menus = menuMapper.selectList(new QueryWrapper<>(menu)); + List menus = menuMapper.selectList(new LambdaQueryWrapper().eq(Menu::getDeleteStatus, Boolean.FALSE)); // 得到顶级菜单 List parentResp = Optional.ofNullable(menus).orElse(Collections.emptyList()).stream() .filter(item -> Objects.isNull(item.getParentId())) diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/SysUserClientService.java b/shop-manage/src/main/java/quick/pager/shop/service/system/impl/SysUserClientService.java similarity index 74% rename from shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/SysUserClientService.java rename to shop-manage/src/main/java/quick/pager/shop/service/system/impl/SysUserClientService.java index 1d40016..55aac75 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/SysUserClientService.java +++ b/shop-manage/src/main/java/quick/pager/shop/service/system/impl/SysUserClientService.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.service.system.impl; +package quick.pager.shop.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.List; @@ -7,11 +7,11 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.manage.helper.MenuHelper; -import quick.pager.shop.manage.model.Menu; -import quick.pager.shop.response.Response; -import quick.pager.shop.manage.mapper.SysUserMapper; -import quick.pager.shop.manage.model.SysUser; +import quick.pager.shop.helper.MenuHelper; +import quick.pager.shop.model.Menu; +import quick.pager.shop.mapper.SysUserMapper; +import quick.pager.shop.model.SysUser; +import quick.pager.shop.user.response.Response; /** * 用户信息 @@ -27,9 +27,9 @@ public class SysUserClientService { private MenuHelper menuHelper; public Response querySysUserByUsername(String phone) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SysUser::getDeleteStatus, Boolean.FALSE); - wrapper.eq(SysUser::getPhone, phone); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(SysUser::getDeleteStatus, Boolean.FALSE) + .eq(SysUser::getPhone, phone); return new Response<>(sysUserMapper.selectOne(wrapper)); } diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/SysUserInfoService.java b/shop-manage/src/main/java/quick/pager/shop/service/system/impl/SysUserInfoService.java similarity index 98% rename from shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/SysUserInfoService.java rename to shop-manage/src/main/java/quick/pager/shop/service/system/impl/SysUserInfoService.java index f360a75..27c9f95 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/SysUserInfoService.java +++ b/shop-manage/src/main/java/quick/pager/shop/service/system/impl/SysUserInfoService.java @@ -1,6 +1,6 @@ //package quick.pager.shop.manage.service.system.impl; // -//import quick.pager.shop.manage.response.system.SysUserResponse; +//import SysUserResponse; //import quick.pager.shop.service.IService; // ///** diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/SysUserServiceImpl.java b/shop-manage/src/main/java/quick/pager/shop/service/system/impl/SysUserServiceImpl.java similarity index 83% rename from shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/SysUserServiceImpl.java rename to shop-manage/src/main/java/quick/pager/shop/service/system/impl/SysUserServiceImpl.java index 8d01c51..71e40b1 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/SysUserServiceImpl.java +++ b/shop-manage/src/main/java/quick/pager/shop/service/system/impl/SysUserServiceImpl.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.service.system.impl; +package quick.pager.shop.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,22 +19,21 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.manage.helper.MenuHelper; -import quick.pager.shop.manage.mapper.MenuMapper; -import quick.pager.shop.manage.mapper.RoleMapper; -import quick.pager.shop.manage.model.Menu; -import quick.pager.shop.manage.model.Role; -import quick.pager.shop.manage.param.system.SysUserPageParam; -import quick.pager.shop.manage.response.system.MenuResponse; -import quick.pager.shop.manage.response.system.SysUserResponse; -import quick.pager.shop.manage.service.system.SysUserService; -import quick.pager.shop.manage.utils.PrincipalUtils; -import quick.pager.shop.response.Response; -import quick.pager.shop.manage.param.system.SysUserParam; -import quick.pager.shop.manage.mapper.SysRoleMapper; -import quick.pager.shop.manage.mapper.SysUserMapper; -import quick.pager.shop.manage.model.SysRole; -import quick.pager.shop.manage.model.SysUser; +import quick.pager.shop.helper.MenuHelper; +import quick.pager.shop.mapper.RoleMapper; +import quick.pager.shop.model.Menu; +import quick.pager.shop.model.Role; +import quick.pager.shop.param.system.SysUserPageParam; +import quick.pager.shop.response.system.MenuResponse; +import quick.pager.shop.response.system.SysUserResponse; +import quick.pager.shop.service.system.SysUserService; +import quick.pager.shop.utils.PrincipalUtils; +import quick.pager.shop.mapper.SysRoleMapper; +import quick.pager.shop.mapper.SysUserMapper; +import quick.pager.shop.model.SysRole; +import quick.pager.shop.model.SysUser; +import quick.pager.shop.param.system.SysUserParam; +import quick.pager.shop.user.response.Response; import quick.pager.shop.utils.BeanCopier; import quick.pager.shop.utils.DateUtils; @@ -54,17 +53,15 @@ public class SysUserServiceImpl implements SysUserService { @Autowired private RoleMapper roleMapper; @Autowired - private MenuMapper menuMapper; - @Autowired private MenuHelper menuHelper; @Override public Response> queryPage(SysUserPageParam param) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if (!StringUtils.isEmpty(param.getPhone())) { - wrapper.eq(SysUser::getPhone, param.getPhone()); - } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(SysUser::getDeleteStatus, Boolean.FALSE) + .eq(!StringUtils.isEmpty(param.getPhone()), SysUser::getPhone, param.getPhone()); + int total = sysUserMapper.selectCount(wrapper); List responseList = Collections.emptyList(); @@ -148,9 +145,9 @@ private void modifySysUser(List roleIds, SysUser sysUser) { roleIds.forEach(id -> { // 查询系统用户与角色关系 - LambdaQueryWrapper sysRoleWrapper = new LambdaQueryWrapper<>(); - sysRoleWrapper.eq(SysRole::getDeleteStatus, Boolean.FALSE); - sysRoleWrapper.eq(SysRole::getSysUserId, sysUser.getId()); + LambdaQueryWrapper sysRoleWrapper = new LambdaQueryWrapper() + .eq(SysRole::getDeleteStatus, Boolean.FALSE) + .eq(SysRole::getSysUserId, sysUser.getId()); List sysRoles = sysRoleMapper.selectList(sysRoleWrapper); LocalDateTime time = DateUtils.dateTime(); @@ -205,9 +202,9 @@ private SysUserResponse convert(SysUser user) { BeanCopier.copy(user, resp); // 查询系统用户与角色关系 - LambdaQueryWrapper sysRoleWrapper = new LambdaQueryWrapper<>(); - sysRoleWrapper.eq(SysRole::getDeleteStatus, Boolean.FALSE); - sysRoleWrapper.eq(SysRole::getSysUserId, user.getId()); + LambdaQueryWrapper sysRoleWrapper = new LambdaQueryWrapper() + .eq(SysRole::getDeleteStatus, Boolean.FALSE) + .eq(SysRole::getSysUserId, user.getId()); List sysRoles = sysRoleMapper.selectList(sysRoleWrapper); sysRoles.forEach(sysRole -> { diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/SystemConfigServiceImpl.java b/shop-manage/src/main/java/quick/pager/shop/service/system/impl/SystemConfigServiceImpl.java similarity index 89% rename from shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/SystemConfigServiceImpl.java rename to shop-manage/src/main/java/quick/pager/shop/service/system/impl/SystemConfigServiceImpl.java index ce8419c..01517eb 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/service/system/impl/SystemConfigServiceImpl.java +++ b/shop-manage/src/main/java/quick/pager/shop/service/system/impl/SystemConfigServiceImpl.java @@ -1,16 +1,16 @@ -package quick.pager.shop.manage.service.system.impl; +package quick.pager.shop.service.system.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import quick.pager.shop.manage.service.system.SystemConfigService; +import quick.pager.shop.service.system.SystemConfigService; +import quick.pager.shop.param.system.SystemConfigParam; import quick.pager.shop.platform.client.SystemConfigClient; import quick.pager.shop.platform.request.SystemConfigOtherRequest; import quick.pager.shop.platform.request.SystemConfigPageRequest; import quick.pager.shop.platform.request.SystemConfigSaveRequest; import quick.pager.shop.platform.response.SystemConfigResponse; -import quick.pager.shop.response.Response; -import quick.pager.shop.manage.param.system.SystemConfigParam; +import quick.pager.shop.user.response.Response; import quick.pager.shop.utils.BeanCopier; @Service diff --git a/shop-manage/src/main/java/quick/pager/shop/service/system/package-info.java b/shop-manage/src/main/java/quick/pager/shop/service/system/package-info.java new file mode 100644 index 0000000..79a8f06 --- /dev/null +++ b/shop-manage/src/main/java/quick/pager/shop/service/system/package-info.java @@ -0,0 +1 @@ +package quick.pager.shop.service.system; diff --git a/shop-manage/src/main/java/quick/pager/shop/manage/utils/PrincipalUtils.java b/shop-manage/src/main/java/quick/pager/shop/utils/PrincipalUtils.java similarity index 90% rename from shop-manage/src/main/java/quick/pager/shop/manage/utils/PrincipalUtils.java rename to shop-manage/src/main/java/quick/pager/shop/utils/PrincipalUtils.java index c4b8c99..b72ba01 100644 --- a/shop-manage/src/main/java/quick/pager/shop/manage/utils/PrincipalUtils.java +++ b/shop-manage/src/main/java/quick/pager/shop/utils/PrincipalUtils.java @@ -1,4 +1,4 @@ -package quick.pager.shop.manage.utils; +package quick.pager.shop.utils; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/shop-manage/src/main/resources/bootstrap-dev.yml b/shop-manage/src/main/resources/bootstrap-dev.yml index 893753b..9768eeb 100644 --- a/shop-manage/src/main/resources/bootstrap-dev.yml +++ b/shop-manage/src/main/resources/bootstrap-dev.yml @@ -3,11 +3,35 @@ spring: nacos: config: server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d discovery: server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d + sentinel: + enabled: true + transport: + dashboard: 127.0.0.1:8080 + filter: + enabled: true + +seata: + service: + vgroup-mapping: + shop-manage-seata-service-group: default + grouplist: + default: 101.132.121.178:8091 + disable-global-transaction: false security: oauth2: + client: + clientId: client8 + clientSecret: 111111 + user-authorization-uri: http://localhost:8095/oauth/authorize + access-token-uri: http://localhost:8095/oauth/token + scope: app resource: id: shop-manage user-info-uri: http://shop-auth/oauth/principal diff --git a/shop-manage/src/main/resources/bootstrap.yml b/shop-manage/src/main/resources/bootstrap.yml index 72f47f2..89c8652 100644 --- a/shop-manage/src/main/resources/bootstrap.yml +++ b/shop-manage/src/main/resources/bootstrap.yml @@ -7,18 +7,11 @@ spring: autoconfigure: exclude: - org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration - cloud: - alibaba: - seata: - tx-service-group: shop_tx_group + - org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration main: allow-bean-definition-overriding: true profiles: active: dev - redis: - host: 101.132.121.178 - port: 6379 - password: abc+123 feign: sentinel: enabled: true diff --git a/shop-manage/src/main/resources/file.conf b/shop-manage/src/main/resources/file.conf deleted file mode 100644 index 878fe71..0000000 --- a/shop-manage/src/main/resources/file.conf +++ /dev/null @@ -1,110 +0,0 @@ -transport { - # tcp udt unix-domain-socket - type = "TCP" - #NIO NATIVE - server = "NIO" - #enable heartbeat - heartbeat = true - #thread factory for netty - thread-factory { - boss-thread-prefix = "NettyBoss" - worker-thread-prefix = "NettyServerNIOWorker" - server-executor-thread-prefix = "NettyServerBizHandler" - share-boss-worker = false - client-selector-thread-prefix = "NettyClientSelector" - client-selector-thread-size = 1 - client-worker-thread-prefix = "NettyClientWorkerThread" - # netty boss thread size,will not be used for UDT - boss-thread-size = 1 - #auto default pin or 8 - worker-thread-size = 8 - } -} -service { - #vgroup->rgroup - vgroup_mapping.shop_tx_group = "default" - #only support single node - default.grouplist = "127.0.0.1:8091" - #degrade current not support - enableDegrade = false - #disable - disable = false - #unit ms,s,m,h,d represents milliseconds, seconds, minutes, hours, days, default permanent - max.commit.retry.timeout = "-1" - max.rollback.retry.timeout = "-1" -} - -client { - async.commit.buffer.limit = 10000 - lock { - retry.internal = 10 - retry.times = 30 - } - report.retry.count = 5 -} - -## transaction log store -store { - ## store mode: file、db - mode = "file" - - ## file store - file { - dir = "sessionStore" - - # branch session size , if exceeded first try compress lockkey, still exceeded throws exceptions - max-branch-session-size = 16384 - # globe session size , if exceeded throws exceptions - max-global-session-size = 512 - # file buffer size , if exceeded allocate new buffer - file-write-buffer-cache-size = 16384 - # when recover batch read size - session.reload.read_size = 100 - # async, sync - flush-disk-mode = async - } - - ## database store - db { - ## the implement of javax.sql.DataSource, such as DruidDataSource(druid)/BasicDataSource(dbcp) etc. - datasource = "druid" - ## mysql/oracle/h2/oceanbase etc. - db-type = "mysql" - url = "jdbc:mysql://127.0.0.1:3306/seata?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false" - user = "root" - password = "root" - min-conn = 1 - max-conn = 30 - global.table = "global_table" - branch.table = "branch_table" - query-limit = 100 - } -} -lock { - ## the data row lock store mode: local_db、memory or db - mode = "db" - - memory{ - ## store lock in memory of server - } - - db{ - ## use db of server to store lock, the db is ${store.db.url} - lock-table= "lock_table" - } - - local_db { - ## store lock in local db - } -} -recovery{ - committing-retry-delay = 30 - asyn-committing-retry-delay = 30 - rollbacking-retry-delay = 30 - timeout-retry-delay = 30 -} - -transaction { - undo.data.validation = false - undo.log.serialization = fastjson -} diff --git a/shop-manage/src/main/resources/mapper/GeneratorMapper.xml b/shop-manage/src/main/resources/mapper/GeneratorMapper.xml index c5277d4..46e093e 100644 --- a/shop-manage/src/main/resources/mapper/GeneratorMapper.xml +++ b/shop-manage/src/main/resources/mapper/GeneratorMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -11,7 +11,7 @@ - + diff --git a/shop-manage/src/main/resources/registry.conf b/shop-manage/src/main/resources/registry.conf deleted file mode 100644 index 66b963d..0000000 --- a/shop-manage/src/main/resources/registry.conf +++ /dev/null @@ -1,74 +0,0 @@ -registry { - # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa - type = "file" - - nacos { - serverAddr = "localhost" - namespace = "public" - cluster = "default" - } - eureka { - serviceUrl = "http://localhost:1001/eureka" - application = "default" - weight = "1" - } - redis { - serverAddr = "localhost:6379" - db = "0" - } - zk { - cluster = "default" - serverAddr = "127.0.0.1:2181" - session.timeout = 6000 - connect.timeout = 2000 - } - consul { - cluster = "default" - serverAddr = "127.0.0.1:8500" - } - etcd3 { - cluster = "default" - serverAddr = "http://localhost:2379" - } - sofa { - serverAddr = "127.0.0.1:9603" - application = "default" - region = "DEFAULT_ZONE" - datacenter = "DefaultDataCenter" - cluster = "default" - group = "SEATA_GROUP" - addressWaitTime = "3000" - } - file { - name = "file.conf" - } -} - -config { - # file、nacos 、apollo、zk、consul、etcd3 - type = "file" - - nacos { - serverAddr = "localhost" - namespace = "public" - cluster = "default" - } - consul { - serverAddr = "127.0.0.1:8500" - } - apollo { - app.id = "seata-server" - apollo.meta = "http://192.168.1.204:8801" - } - zk { - serverAddr = "127.0.0.1:2181" - session.timeout = 6000 - connect.timeout = 2000 - } - etcd3 { - serverAddr = "http://localhost:2379" - } - file { - name = "file.conf" - } -} diff --git a/shop-manage/src/test/java/ManageApplicationTests.java b/shop-manage/src/test/java/ManageApplicationTests.java index 53beb87..020dfa6 100644 --- a/shop-manage/src/test/java/ManageApplicationTests.java +++ b/shop-manage/src/test/java/ManageApplicationTests.java @@ -1,17 +1,17 @@ import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.collect.ImmutableMap; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import quick.pager.shop.manage.ManageApplication; -import quick.pager.shop.manage.mapper.MenuMapper; -import quick.pager.shop.manage.model.Menu; +import quick.pager.shop.ManageApplication; +import quick.pager.shop.mapper.MenuMapper; +import quick.pager.shop.model.Menu; @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = ManageApplication.class) @@ -29,4 +29,15 @@ public void testMenu() { System.out.println(JSON.toJSONString(menus.stream().map(item -> ImmutableMap.of(item.getPermission(), item.getPermission(), "// ", item.getName())).collect(Collectors.toList()))); } + + + @Test + public void test() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + + wrapper.eq(1 ==1 , Menu::getName, "系统管理"); + List menus = menuMapper.selectList(wrapper); + + System.out.println(menus); + } } diff --git a/shop-order/shop-order-api/pom.xml b/shop-order/shop-order-api/pom.xml index 4098750..16f298f 100644 --- a/shop-order/shop-order-api/pom.xml +++ b/shop-order/shop-order-api/pom.xml @@ -18,63 +18,58 @@ - + com.alibaba.cloud - spring-cloud-alibaba-nacos-config + spring-cloud-starter-alibaba-nacos-config com.alibaba.cloud - spring-cloud-alibaba-nacos-discovery + spring-cloud-starter-alibaba-nacos-discovery com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel + spring-cloud-starter-alibaba-seata - org.springframework.cloud - spring-cloud-starter-openfeign + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + org.springframework.cloud - spring-cloud-starter-stream-kafka - - - - com.alibaba.cloud - spring-cloud-starter-stream-rocketmq + spring-cloud-starter-openfeign + + org.springframework.boot spring-boot-starter-web - - org.springframework.boot - spring-boot-starter-actuator - - org.springframework.boot spring-boot-starter-data-redis - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - 2.1.2.RELEASE + org.springframework.boot + spring-boot-starter-actuator org.springframework.data spring-data-elasticsearch + + com.baomidou mybatis-plus-boot-starter @@ -84,40 +79,25 @@ mysql mysql-connector-java + - - redis.clients - jedis - - - - org.springframework.boot - spring-boot-starter-test - test - - + quick.pager - shop-auth-resource + shop-auth-feign ${project.version} - - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - - quick.pager - shop-order-model + shop-auth-resource ${project.version} - + quick.pager - shop-common + shop-order-model ${project.version} @@ -128,7 +108,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.1.2.RELEASE + 2.2.9.RELEASE package diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/OrderApplication.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/OrderApplication.java new file mode 100644 index 0000000..91e4476 --- /dev/null +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/OrderApplication.java @@ -0,0 +1,18 @@ +package quick.pager.shop; + +import org.springframework.boot.SpringApplication; +import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * @author siguiyang + */ +@SpringCloudApplication +@EnableFeignClients +public class OrderApplication { + + public static void main(String[] args) { + System.setProperty("es.set.netty.runtime.available.processors","false"); + SpringApplication.run(OrderApplication.class, args); + } +} diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/controller/SellerOrderController.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/controller/SellerOrderController.java similarity index 85% rename from shop-order/shop-order-api/src/main/java/quick/pager/shop/order/controller/SellerOrderController.java rename to shop-order/shop-order-api/src/main/java/quick/pager/shop/controller/SellerOrderController.java index a4f7d7e..02f3531 100644 --- a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/controller/SellerOrderController.java +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/controller/SellerOrderController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.order.controller; +package quick.pager.shop.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.Constants; import quick.pager.shop.order.request.SellerOrderSaveRequest; -import quick.pager.shop.response.Response; -import quick.pager.shop.order.service.SellerOrderService; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.SellerOrderService; /** * 商户订单 diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/controller/UserOrderController.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/controller/UserOrderController.java similarity index 91% rename from shop-order/shop-order-api/src/main/java/quick/pager/shop/order/controller/UserOrderController.java rename to shop-order/shop-order-api/src/main/java/quick/pager/shop/controller/UserOrderController.java index fef9a5d..7643e3c 100644 --- a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/controller/UserOrderController.java +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/controller/UserOrderController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.order.controller; +package quick.pager.shop.controller; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -11,8 +11,8 @@ import quick.pager.shop.order.request.OrderPageRequest; import quick.pager.shop.order.request.UserOrderSaveRequest; import quick.pager.shop.order.response.OrderResponse; -import quick.pager.shop.response.Response; -import quick.pager.shop.order.service.UserOrderService; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.UserOrderService; /** * 用户订单管理
diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/controller/app/AppSellerOrderController.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/controller/app/AppSellerOrderController.java similarity index 87% rename from shop-order/shop-order-api/src/main/java/quick/pager/shop/order/controller/app/AppSellerOrderController.java rename to shop-order/shop-order-api/src/main/java/quick/pager/shop/controller/app/AppSellerOrderController.java index 93c749a..20d8589 100644 --- a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/controller/app/AppSellerOrderController.java +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/controller/app/AppSellerOrderController.java @@ -1,11 +1,11 @@ -package quick.pager.shop.order.controller.app; +package quick.pager.shop.controller.app; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.Constants; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * APP 商户订单 diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/controller/app/AppUserOrderController.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/controller/app/AppUserOrderController.java similarity index 65% rename from shop-order/shop-order-api/src/main/java/quick/pager/shop/order/controller/app/AppUserOrderController.java rename to shop-order/shop-order-api/src/main/java/quick/pager/shop/controller/app/AppUserOrderController.java index 9d9cfb4..cc85cd0 100644 --- a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/controller/app/AppUserOrderController.java +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/controller/app/AppUserOrderController.java @@ -1,14 +1,16 @@ -package quick.pager.shop.order.controller.app; +package quick.pager.shop.controller.app; -import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.Constants; -import quick.pager.shop.order.param.AppUserOrderEvaluateParam; -import quick.pager.shop.response.Response; +import quick.pager.shop.param.AppUserOrderEvaluateParam; +import quick.pager.shop.order.response.UserOrderQuantityResponse; +import quick.pager.shop.service.AppUserOrderService; +import quick.pager.shop.user.response.Response; /** * App 用户订单 @@ -19,16 +21,19 @@ @RequestMapping(Constants.Module.ORDER) public class AppUserOrderController { + @Autowired + private AppUserOrderService appUserOrderService; + /** * App 用户订单头部气泡数 * * @param userId 用户主键 * @return */ - @GetMapping("/app/order/${userId}/quantity") - public Response quantity(@PathVariable("userId") Long userId) { + @PostMapping("/app/order/{userId}/quantity") + public Response quantity(@PathVariable("userId") Long userId) { - return null; + return appUserOrderService.quantity(userId); } /** @@ -39,12 +44,12 @@ public Response quantity(@PathVariable("userId") Long userId) { * @param orderType 订单类型 * @return */ - @GetMapping("/app/order/${userId}/${page}/${orderType}") + @PostMapping("/app/order/{userId}/{page}/{orderType}") public Response orders(@PathVariable("userId") Long userId, @PathVariable("page") Integer page, @PathVariable("orderType") String orderType) { - return null; + return appUserOrderService.orders(userId, page, orderType); } /** @@ -54,11 +59,11 @@ public Response orders(@PathVariable("userId") Long userId, * @param orderId 订单主键 * @return */ - @PostMapping("/app/order/${userId}/${orderId}/detail") + @PostMapping("/app/order/{userId}/{orderId}/detail") public Response detail(@PathVariable("userId") Long userId, @PathVariable("orderId") Long orderId) { - return null; + return appUserOrderService.detail(userId, orderId); } /** @@ -68,12 +73,12 @@ public Response detail(@PathVariable("userId") Long userId, * @param orderId 订单主键 * @return */ - @PostMapping("/app/order/${userId}/${orderId}/evaluate") + @PostMapping("/app/order/{userId}/{orderId}/evaluate") public Response evaluate(@PathVariable("userId") Long userId, @PathVariable("orderId") Long orderId, @RequestBody AppUserOrderEvaluateParam param) { - return null; + return appUserOrderService.evaluate(userId, orderId, param); } /** @@ -83,11 +88,11 @@ public Response evaluate(@PathVariable("userId") Long userId, * @param orderId 订单主键 * @return */ - @PostMapping("/app/order/${userId}/${orderId}/cancel") + @PostMapping("/app/order/{userId}/{orderId}/cancel") public Response cancel(@PathVariable("userId") Long userId, @PathVariable("orderId") Long orderId) { - return null; + return appUserOrderService.cancel(userId, orderId); } /** @@ -97,11 +102,11 @@ public Response cancel(@PathVariable("userId") Long userId, * @param orderId 订单主键 * @return */ - @PostMapping("/app/order/${userId}/${orderId}/refund") + @PostMapping("/app/order/{userId}/{orderId}/refund") public Response refund(@PathVariable("userId") Long userId, @PathVariable("orderId") Long orderId) { - return null; + return appUserOrderService.refund(userId, orderId); } /** @@ -111,10 +116,10 @@ public Response refund(@PathVariable("userId") Long userId, * @param orderId 订单主键 * @return */ - @PostMapping("/app/order/${userId}/${orderId}/confirm") + @PostMapping("/app/order/{userId}/{orderId}/confirm") public Response confirm(@PathVariable("userId") Long userId, @PathVariable("orderId") Long orderId) { - return null; + return appUserOrderService.confirm(userId, orderId); } } diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/mapper/OrderEvaluateMapper.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/mapper/OrderEvaluateMapper.java new file mode 100644 index 0000000..4c3a0f2 --- /dev/null +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/mapper/OrderEvaluateMapper.java @@ -0,0 +1,14 @@ +package quick.pager.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import quick.pager.shop.model.OrderEvaluate; + +/** + * 订单评价 + * + * @author siguiyang + */ +@Mapper +public interface OrderEvaluateMapper extends BaseMapper { +} diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/mapper/OrderItemMapper.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/mapper/OrderItemMapper.java new file mode 100644 index 0000000..f524872 --- /dev/null +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/mapper/OrderItemMapper.java @@ -0,0 +1,13 @@ +package quick.pager.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import quick.pager.shop.model.OrderItem; + +/** + * 订单商品明细 + * @author siguiyang + */ +@Mapper +public interface OrderItemMapper extends BaseMapper { +} diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/mapper/SaleAfterOrderMapper.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/mapper/SaleAfterOrderMapper.java new file mode 100644 index 0000000..ef3b1ed --- /dev/null +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/mapper/SaleAfterOrderMapper.java @@ -0,0 +1,14 @@ +package quick.pager.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import quick.pager.shop.model.SaleAfterOrder; + +/** + * 售后订单 + * + * @author siguiyang + */ +@Mapper +public interface SaleAfterOrderMapper extends BaseMapper { +} diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/mapper/SellerOrderMapper.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/mapper/SellerOrderMapper.java similarity index 72% rename from shop-order/shop-order-api/src/main/java/quick/pager/shop/order/mapper/SellerOrderMapper.java rename to shop-order/shop-order-api/src/main/java/quick/pager/shop/mapper/SellerOrderMapper.java index 9e0077b..e671e87 100644 --- a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/mapper/SellerOrderMapper.java +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/mapper/SellerOrderMapper.java @@ -1,9 +1,9 @@ -package quick.pager.shop.order.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.order.model.SellerOrder; +import quick.pager.shop.model.SellerOrder; /** * 商户订单 diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/mapper/UserOrderMapper.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/mapper/UserOrderMapper.java similarity index 72% rename from shop-order/shop-order-api/src/main/java/quick/pager/shop/order/mapper/UserOrderMapper.java rename to shop-order/shop-order-api/src/main/java/quick/pager/shop/mapper/UserOrderMapper.java index bfd1238..85249c5 100644 --- a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/mapper/UserOrderMapper.java +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/mapper/UserOrderMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.order.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.order.model.UserOrder; +import quick.pager.shop.model.UserOrder; /** * 用户订单 diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/model/OrderEvaluate.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/model/OrderEvaluate.java new file mode 100644 index 0000000..1ad7cbc --- /dev/null +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/model/OrderEvaluate.java @@ -0,0 +1,23 @@ +package quick.pager.shop.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 订单评价 + * + * @author siguiyang + */ +@EqualsAndHashCode(callSuper = true) +@Data +@TableName("t_order_evaluate") +public class OrderEvaluate extends Model { + + private static final long serialVersionUID = 9104021175949931054L; + private Long id; + + private Long userId; + + private String content; +} diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/model/OrderItem.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/model/OrderItem.java new file mode 100644 index 0000000..4ade8cf --- /dev/null +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/model/OrderItem.java @@ -0,0 +1,53 @@ +package quick.pager.shop.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.math.BigDecimal; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 订单商品明细 + * + * @author siguiyang + */ +@EqualsAndHashCode(callSuper = true) +@Data +@TableName("t_order_item") +public class OrderItem extends Model { + + private static final long serialVersionUID = 331049701400102546L; + /** + * 主键 + */ + private Long id; + /** + * 用户主键 + */ + private Long userId; + /** + * 商户主键 + */ + private Long sellerId; + /** + * 订单主键 + */ + private Long userOrderId; + /** + * 商户订单主键 + */ + private Long sellerOrderId; + /** + * 购买商品主键 + */ + private Long goodsSkuId; + /** + * 购买商品花费金额 + */ + private BigDecimal purchaseAmount; + /** + * 购买商品数量 + */ + private Integer purchaseQuantity; + + +} diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/model/SaleAfterOrder.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/model/SaleAfterOrder.java similarity index 84% rename from shop-order/shop-order-api/src/main/java/quick/pager/shop/order/model/SaleAfterOrder.java rename to shop-order/shop-order-api/src/main/java/quick/pager/shop/model/SaleAfterOrder.java index 1ac6b0b..22e2793 100644 --- a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/model/SaleAfterOrder.java +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/model/SaleAfterOrder.java @@ -1,10 +1,9 @@ -package quick.pager.shop.order.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import quick.pager.shop.model.Model; /** * 售后订单 diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/model/SellerOrder.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/model/SellerOrder.java similarity index 87% rename from shop-order/shop-order-api/src/main/java/quick/pager/shop/order/model/SellerOrder.java rename to shop-order/shop-order-api/src/main/java/quick/pager/shop/model/SellerOrder.java index 77ddb42..9302bca 100644 --- a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/model/SellerOrder.java +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/model/SellerOrder.java @@ -1,11 +1,10 @@ -package quick.pager.shop.order.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import java.math.BigDecimal; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import quick.pager.shop.model.Model; /** * 商户订单 @@ -31,7 +30,7 @@ public class SellerOrder extends Model { /** * 配送地址 */ - private Long addressId; + private Long deliveryAddressId; /** * 商户订单号 */ @@ -54,6 +53,10 @@ public class SellerOrder extends Model { * 订单金额 */ private BigDecimal orderAmount; + /** + * 折扣金额 + */ + private BigDecimal discountAmount; /** * 是否支持自提 */ diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/model/UserOrder.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/model/UserOrder.java similarity index 93% rename from shop-order/shop-order-api/src/main/java/quick/pager/shop/order/model/UserOrder.java rename to shop-order/shop-order-api/src/main/java/quick/pager/shop/model/UserOrder.java index 381e0af..7c91bdb 100644 --- a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/model/UserOrder.java +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/model/UserOrder.java @@ -1,11 +1,10 @@ -package quick.pager.shop.order.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import java.math.BigDecimal; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import quick.pager.shop.model.Model; /** * 用户订单 @@ -30,7 +29,7 @@ public class UserOrder extends Model { /** * 配送地址主键 */ - private Long addressId; + private Long deliveryAddressId; /** * 优惠券主键 */ diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/model/es/ESSellerOrder.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/model/es/ESSellerOrder.java new file mode 100644 index 0000000..3d3cfe2 --- /dev/null +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/model/es/ESSellerOrder.java @@ -0,0 +1,15 @@ +package quick.pager.shop.model.es; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.data.elasticsearch.annotations.Document; +import quick.pager.shop.model.Model; + +@EqualsAndHashCode(callSuper = true) +@Data +@Document(indexName = "es_seller_order", createIndex = false) +public class ESSellerOrder extends Model { + private static final long serialVersionUID = -4998360130097863880L; + + private Long ids; +} diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/model/es/ESUserOrder.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/model/es/ESUserOrder.java new file mode 100644 index 0000000..aed2abc --- /dev/null +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/model/es/ESUserOrder.java @@ -0,0 +1,16 @@ +package quick.pager.shop.model.es; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.data.elasticsearch.annotations.Document; +import quick.pager.shop.model.Model; + +@EqualsAndHashCode(callSuper = true) +@Data +@Document(indexName = "es_user_order", createIndex = false) +public class ESUserOrder extends Model { + private static final long serialVersionUID = -4291580691749163266L; + + private Long ids; + +} diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/OrderApplication.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/OrderApplication.java deleted file mode 100644 index ac613a1..0000000 --- a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/OrderApplication.java +++ /dev/null @@ -1,21 +0,0 @@ -package quick.pager.shop.order; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.openfeign.EnableFeignClients; - -/** - * @author siguiyang - */ -@SpringBootApplication(scanBasePackages = "quick.pager.shop") -@EnableDiscoveryClient -@EnableCircuitBreaker -@EnableFeignClients("quick.pager.shop") -public class OrderApplication { - - public static void main(String[] args) { - SpringApplication.run(OrderApplication.class, args); - } -} diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/service/impl/UserOrderServiceImpl.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/service/impl/UserOrderServiceImpl.java deleted file mode 100644 index f64f1fb..0000000 --- a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/service/impl/UserOrderServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package quick.pager.shop.order.service.impl; - -import java.util.List; -import org.springframework.stereotype.Service; -import quick.pager.shop.order.request.OrderPageRequest; -import quick.pager.shop.order.request.UserOrderSaveRequest; -import quick.pager.shop.order.response.OrderResponse; -import quick.pager.shop.response.Response; -import quick.pager.shop.order.service.UserOrderService; - -@Service -public class UserOrderServiceImpl implements UserOrderService { - @Override - public Response> queryPage(OrderPageRequest request) { - return null; - } - - @Override - public Response detail(Long orderId) { - return null; - } - - @Override - public Response create(UserOrderSaveRequest request) { - return null; - } -} diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/param/AppUserOrderEvaluateParam.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/param/AppUserOrderEvaluateParam.java similarity index 79% rename from shop-order/shop-order-api/src/main/java/quick/pager/shop/order/param/AppUserOrderEvaluateParam.java rename to shop-order/shop-order-api/src/main/java/quick/pager/shop/param/AppUserOrderEvaluateParam.java index 502b550..9071be1 100644 --- a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/param/AppUserOrderEvaluateParam.java +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/param/AppUserOrderEvaluateParam.java @@ -1,8 +1,7 @@ -package quick.pager.shop.order.param; +package quick.pager.shop.param; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.param.Param; /** * 用户订单评价内容 diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/repository/SellerOrderRepository.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/repository/SellerOrderRepository.java new file mode 100644 index 0000000..4c27d02 --- /dev/null +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/repository/SellerOrderRepository.java @@ -0,0 +1,7 @@ +package quick.pager.shop.repository; + +import org.springframework.data.elasticsearch.repository.ElasticsearchCrudRepository; +import quick.pager.shop.model.es.ESSellerOrder; + +public interface SellerOrderRepository extends ElasticsearchCrudRepository { +} diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/repository/UserOrderRepository.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/repository/UserOrderRepository.java new file mode 100644 index 0000000..1a1eece --- /dev/null +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/repository/UserOrderRepository.java @@ -0,0 +1,7 @@ +package quick.pager.shop.repository; + +import org.springframework.data.elasticsearch.repository.ElasticsearchRepository; +import quick.pager.shop.model.es.ESUserOrder; + +public interface UserOrderRepository extends ElasticsearchRepository { +} diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/service/AppUserOrderService.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/service/AppUserOrderService.java new file mode 100644 index 0000000..4db68be --- /dev/null +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/service/AppUserOrderService.java @@ -0,0 +1,69 @@ +package quick.pager.shop.service; + +import quick.pager.shop.param.AppUserOrderEvaluateParam; +import quick.pager.shop.order.response.UserOrderQuantityResponse; +import quick.pager.shop.user.response.Response; + +/** + * App订单服务 + * + * @author siguiyang + */ +public interface AppUserOrderService { + /** + * 订单气泡数 + * + * @param userId 当前用户登陆主键 + */ + Response quantity(final Long userId); + + /** + * 订单列表 + * + * @param userId 当前用户登陆主键 + * @param page 页码 + * @param orderType 订单类型 + */ + Response orders(final Long userId, final Integer page, final String orderType); + + /** + * 订单详情 + * + * @param userId 当前用户登陆主键 + * @param orderId 订单主键 + */ + Response detail(final Long userId, final Long orderId); + + /** + * 订单评价 + * + * @param userId 当前用户登陆主键 + * @param orderId 订单主键 + * @param param 订单评价内容 + */ + Response evaluate(Long userId, Long orderId, AppUserOrderEvaluateParam param); + + /** + * 订单取消 + * + * @param userId 当前用户登陆主键 + * @param orderId 订单主键 + */ + Response cancel(final Long userId, final Long orderId); + + /** + * 用户订单退款 + * + * @param userId 当前用户登陆主键 + * @param orderId 订单主键 + */ + Response refund(final Long userId, final Long orderId); + + /** + * 用户订单确认收货 + * + * @param userId 当前用户登陆主键 + * @param orderId 订单主键 + */ + Response confirm(final Long userId, final Long orderId); +} diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/service/SellerOrderService.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/service/SellerOrderService.java similarity index 74% rename from shop-order/shop-order-api/src/main/java/quick/pager/shop/order/service/SellerOrderService.java rename to shop-order/shop-order-api/src/main/java/quick/pager/shop/service/SellerOrderService.java index 5d8400f..799ebc4 100644 --- a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/service/SellerOrderService.java +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/service/SellerOrderService.java @@ -1,7 +1,7 @@ -package quick.pager.shop.order.service; +package quick.pager.shop.service; import quick.pager.shop.order.request.SellerOrderSaveRequest; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 商户订单 diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/service/UserOrderService.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/service/UserOrderService.java similarity index 88% rename from shop-order/shop-order-api/src/main/java/quick/pager/shop/order/service/UserOrderService.java rename to shop-order/shop-order-api/src/main/java/quick/pager/shop/service/UserOrderService.java index 8a1a551..6d3de3e 100644 --- a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/service/UserOrderService.java +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/service/UserOrderService.java @@ -1,10 +1,10 @@ -package quick.pager.shop.order.service; +package quick.pager.shop.service; import java.util.List; import quick.pager.shop.order.request.OrderPageRequest; import quick.pager.shop.order.request.UserOrderSaveRequest; import quick.pager.shop.order.response.OrderResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 用户订单 diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/service/impl/AppUserOrderServiceImpl.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/service/impl/AppUserOrderServiceImpl.java new file mode 100644 index 0000000..faf3ebb --- /dev/null +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/service/impl/AppUserOrderServiceImpl.java @@ -0,0 +1,60 @@ +package quick.pager.shop.service.impl; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import quick.pager.shop.mapper.UserOrderMapper; +import quick.pager.shop.param.AppUserOrderEvaluateParam; +import quick.pager.shop.repository.UserOrderRepository; +import quick.pager.shop.order.response.UserOrderQuantityResponse; +import quick.pager.shop.service.AppUserOrderService; +import quick.pager.shop.user.response.Response; + +/** + * AppUserOrderService 实现 + * + * @author siguiyang + */ +@Service +public class AppUserOrderServiceImpl implements AppUserOrderService { + + @Autowired + private UserOrderRepository userOrderRepository; + + @Autowired + private UserOrderMapper userOrderMapper; + + @Override + public Response quantity(Long userId) { + return null; + } + + @Override + public Response orders(Long userId, Integer page, String orderType) { + return null; + } + + @Override + public Response detail(Long userId, Long orderId) { + return null; + } + + @Override + public Response evaluate(Long userId, Long orderId, AppUserOrderEvaluateParam param) { + return null; + } + + @Override + public Response cancel(Long userId, Long orderId) { + return null; + } + + @Override + public Response refund(Long userId, Long orderId) { + return null; + } + + @Override + public Response confirm(Long userId, Long orderId) { + return null; + } +} diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/service/impl/SellerOrderServiceImpl.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/service/impl/SellerOrderServiceImpl.java similarity index 66% rename from shop-order/shop-order-api/src/main/java/quick/pager/shop/order/service/impl/SellerOrderServiceImpl.java rename to shop-order/shop-order-api/src/main/java/quick/pager/shop/service/impl/SellerOrderServiceImpl.java index 0d7fc54..6f09960 100644 --- a/shop-order/shop-order-api/src/main/java/quick/pager/shop/order/service/impl/SellerOrderServiceImpl.java +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/service/impl/SellerOrderServiceImpl.java @@ -1,9 +1,9 @@ -package quick.pager.shop.order.service.impl; +package quick.pager.shop.service.impl; import org.springframework.stereotype.Service; import quick.pager.shop.order.request.SellerOrderSaveRequest; -import quick.pager.shop.response.Response; -import quick.pager.shop.order.service.SellerOrderService; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.SellerOrderService; @Service public class SellerOrderServiceImpl implements SellerOrderService { diff --git a/shop-order/shop-order-api/src/main/java/quick/pager/shop/service/impl/UserOrderServiceImpl.java b/shop-order/shop-order-api/src/main/java/quick/pager/shop/service/impl/UserOrderServiceImpl.java new file mode 100644 index 0000000..77beea6 --- /dev/null +++ b/shop-order/shop-order-api/src/main/java/quick/pager/shop/service/impl/UserOrderServiceImpl.java @@ -0,0 +1,83 @@ +package quick.pager.shop.service.impl; + +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import org.apache.commons.lang3.StringUtils; +import org.elasticsearch.index.query.BoolQueryBuilder; +import org.elasticsearch.index.query.QueryBuilders; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; +import quick.pager.shop.order.field.UserOrderField; +import quick.pager.shop.model.es.ESUserOrder; +import quick.pager.shop.repository.UserOrderRepository; +import quick.pager.shop.order.request.OrderPageRequest; +import quick.pager.shop.order.request.UserOrderSaveRequest; +import quick.pager.shop.order.response.OrderResponse; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.UserOrderService; + +@Service +public class UserOrderServiceImpl implements UserOrderService { + + @Autowired + private UserOrderRepository userOrderRepository; + + @Override + public Response> queryPage(OrderPageRequest request) { + + PageRequest pageRequest = PageRequest.of(request.getPage(), request.getPageSize(), Sort.by(Sort.Direction.DESC, "updateTime")); + //创建查询条件 + BoolQueryBuilder builder = QueryBuilders.boolQuery(); + + // 用户主键 + if (Objects.nonNull(request.getUserId())) { + builder.must(QueryBuilders.matchPhraseQuery(UserOrderField.USER_ID_KEY, request.getUserId())); + } + // 订单主键 + if (Objects.nonNull(request.getOrderId())) { + builder.must(QueryBuilders.matchPhraseQuery(UserOrderField.ORDER_ID_KEY, request.getOrderId())); + } + // 订单类型 + if (Objects.nonNull(request.getOrderType())) { + builder.must(QueryBuilders.matchPhraseQuery(UserOrderField.ORDER_TYPE_KEY, request.getOrderType())); + } + // 订单编号 + if (StringUtils.isNotBlank(request.getOrderCode())) { + builder.should(QueryBuilders.matchPhraseQuery(UserOrderField.ORDER_CODE_KEY, request.getOrderCode())); + } + // 订单状态 + if (StringUtils.isNotBlank(request.getOrderStatus())) { + builder.must(QueryBuilders.matchPhraseQuery(UserOrderField.ORDER_STATUS_KEY, request.getOrderCode())); + } + // 下单时间范围查询 + if (Objects.nonNull(request.getBeginTime()) && Objects.nonNull(request.getEndTime())) { + builder.filter(QueryBuilders.rangeQuery(UserOrderField.ORDER_TIME_KEY).from(request.getBeginTime()).to(request.getEndTime())); + } + + Page page = userOrderRepository.search(builder, pageRequest); + + return Response.toResponse(page.getContent().stream().map(this::conv).collect(Collectors.toList()), page.getTotalElements()); + } + + @Override + public Response detail(Long orderId) { + return null; + } + + @Override + public Response create(UserOrderSaveRequest request) { + return null; + } + + + private OrderResponse conv(ESUserOrder order) { + OrderResponse resp = new OrderResponse(); + return resp; + } + + +} diff --git a/shop-order/shop-order-api/src/main/resources/bootstrap-dev.yml b/shop-order/shop-order-api/src/main/resources/bootstrap-dev.yml index e53b462..e0d2b01 100644 --- a/shop-order/shop-order-api/src/main/resources/bootstrap-dev.yml +++ b/shop-order/shop-order-api/src/main/resources/bootstrap-dev.yml @@ -2,9 +2,30 @@ spring: cloud: nacos: config: - server-addr: 127.0.0.1:8848 + server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d discovery: - server-addr: 127.0.0.1:8848 + server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d + sentinel: + enabled: true + transport: + dashboard: 127.0.0.1:8080 + filter: + enabled: true + data: + elasticsearch: + cluster-name: elasticsearch + cluster-nodes: 192.168.199.101:9200 +seata: + service: + vgroup-mapping: + shop-order-seata-service-group: default + grouplist: + default: 101.132.121.178:8091 + disable-global-transaction: false # 内部服务调用授权认证配置 security: diff --git a/shop-order/shop-order-api/src/main/resources/bootstrap.yml b/shop-order/shop-order-api/src/main/resources/bootstrap.yml index dade246..c41a677 100644 --- a/shop-order/shop-order-api/src/main/resources/bootstrap.yml +++ b/shop-order/shop-order-api/src/main/resources/bootstrap.yml @@ -6,7 +6,8 @@ spring: name: shop-order profiles: active: dev - + autoconfigure: + exclude: org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration feign: sentinel: enabled: true @@ -20,9 +21,9 @@ management: exposure: include: refresh,health,info,hystrix.stream mybatis-plus: - type-aliases-package: quick.pager.shop.order.model + type-aliases-package: quick.pager.shop.model global-config: db-config: id-type: auto logging: - config: classpath:logback.xml + config: classpath:logback-spring.xml diff --git a/shop-order/shop-order-api/src/main/resources/logback.xml b/shop-order/shop-order-api/src/main/resources/logback-spring.xml similarity index 100% rename from shop-order/shop-order-api/src/main/resources/logback.xml rename to shop-order/shop-order-api/src/main/resources/logback-spring.xml diff --git a/shop-order/shop-order-client/pom.xml b/shop-order/shop-order-client/pom.xml index 9330d46..ac98512 100644 --- a/shop-order/shop-order-client/pom.xml +++ b/shop-order/shop-order-client/pom.xml @@ -24,17 +24,9 @@ provided - - org.springframework.cloud - spring-cloud-starter-netflix-ribbon - 2.1.0.RELEASE - provided - - org.springframework.cloud spring-cloud-starter-openfeign - 2.1.0.RELEASE provided @@ -43,11 +35,6 @@ shop-order-model ${project.version} - - quick.pager - shop-common - ${project.version} - diff --git a/shop-order/shop-order-client/src/main/java/quick/pager/shop/order/client/SellerOrderClient.java b/shop-order/shop-order-client/src/main/java/quick/pager/shop/order/client/SellerOrderClient.java index 88b0617..3ba32ee 100644 --- a/shop-order/shop-order-client/src/main/java/quick/pager/shop/order/client/SellerOrderClient.java +++ b/shop-order/shop-order-client/src/main/java/quick/pager/shop/order/client/SellerOrderClient.java @@ -9,7 +9,7 @@ import quick.pager.shop.order.fallback.SellerOrderClientFallbackFactory; import quick.pager.shop.order.request.SellerOrderPageRequest; import quick.pager.shop.order.request.SellerOrderSaveRequest; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 商户订单模块 diff --git a/shop-order/shop-order-client/src/main/java/quick/pager/shop/order/client/UserOrderClient.java b/shop-order/shop-order-client/src/main/java/quick/pager/shop/order/client/UserOrderClient.java index 9f0c0ff..416d209 100644 --- a/shop-order/shop-order-client/src/main/java/quick/pager/shop/order/client/UserOrderClient.java +++ b/shop-order/shop-order-client/src/main/java/quick/pager/shop/order/client/UserOrderClient.java @@ -9,7 +9,7 @@ import quick.pager.shop.order.fallback.UserOrderClientFallbackFactory; import quick.pager.shop.order.request.OrderPageRequest; import quick.pager.shop.order.request.UserOrderSaveRequest; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 用户订单 @@ -44,5 +44,5 @@ public interface UserOrderClient { * @return 订单主键 */ @RequestMapping(value = "/user/create", method = RequestMethod.POST) - Response userOrderCreate(@RequestBody UserOrderSaveRequest request); + Response create(@RequestBody UserOrderSaveRequest request); } diff --git a/shop-order/shop-order-model/pom.xml b/shop-order/shop-order-model/pom.xml index 3848d87..7de7d58 100644 --- a/shop-order/shop-order-model/pom.xml +++ b/shop-order/shop-order-model/pom.xml @@ -12,16 +12,44 @@ shop-order-model - - org.projectlombok - lombok - - quick.pager shop-common ${project.version} + + + com.alibaba + easyexcel + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + UTF-8 + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + + jar + + + + + + diff --git a/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/enums/OrderEnums.java b/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/enums/OrderEnums.java new file mode 100644 index 0000000..3d9df95 --- /dev/null +++ b/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/enums/OrderEnums.java @@ -0,0 +1,36 @@ +package quick.pager.shop.order.enums; + +import quick.pager.shop.enums.IEnum; + +/** + * 查询订单枚举 + * + * @author siguiyang + */ +public enum OrderEnums implements IEnum { + + ALL(1, "所有订单"), + PAYMENT(2, "待付款"), + RECEIVED(3, "待收货"), + RAISED(4, "待自提"), + EVALUATED(5, "待评价"); + + private Integer code; + + private String desc; + + OrderEnums(Integer code, String desc) { + this.code = code; + this.desc = desc; + } + + @Override + public Integer getCode() { + return this.code; + } + + @Override + public String getDesc() { + return this.desc; + } +} diff --git a/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/field/UserOrderField.java b/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/field/UserOrderField.java new file mode 100644 index 0000000..ef10fc8 --- /dev/null +++ b/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/field/UserOrderField.java @@ -0,0 +1,34 @@ +package quick.pager.shop.order.field; + +/** + * 用户订单字段 + * + * @author siguiyang + */ +public interface UserOrderField { + + /** + * 用户主键 + */ + String USER_ID_KEY = "userId"; + /** + * 订单主键 + */ + String ORDER_ID_KEY = "orderId"; + /** + * 订单类型 + */ + String ORDER_TYPE_KEY = "orderType"; + /** + * 订单编号 + */ + String ORDER_CODE_KEY = "orderCode"; + /** + * 订单状态 + */ + String ORDER_STATUS_KEY = "orderStatus"; + /** + * 下单时间 + */ + String ORDER_TIME_KEY = "createTime"; +} diff --git a/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/request/OrderPageRequest.java b/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/request/OrderPageRequest.java index 966f481..ed5e01f 100644 --- a/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/request/OrderPageRequest.java +++ b/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/request/OrderPageRequest.java @@ -1,8 +1,9 @@ package quick.pager.shop.order.request; +import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; @EqualsAndHashCode(callSuper = true) @Data @@ -13,26 +14,35 @@ public class OrderPageRequest extends PageRequest { * 订单Id */ private Long orderId; + /** + * 用户主键 + */ + private Long userId; /** * 订单号 */ private String orderCode; /** * 订单状态 + * @see quick.pager.shop.order.enums.OrderStatusEnums¬ */ private String orderStatus; /** * 所有订单 1, 待付款 2, 待收货 3, 待自提 4, 待评价 5 + * + * @see quick.pager.shop.order.enums.OrderEnums */ private Integer order; /** * 订单类型 1，专区订单； 2 普通订单；3 自提订单； 4，秒杀订单，5积分订单 + * + * @see quick.pager.shop.order.enums.OrderTypeEnums */ private Integer orderType; - private String beginTime; + private LocalDateTime beginTime; - private String endTime; + private LocalDateTime endTime; } diff --git a/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/request/SellerOrderPageRequest.java b/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/request/SellerOrderPageRequest.java index 8037f10..d23c53f 100644 --- a/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/request/SellerOrderPageRequest.java +++ b/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/request/SellerOrderPageRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; @EqualsAndHashCode(callSuper = true) @Data diff --git a/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/request/SellerOrderSaveRequest.java b/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/request/SellerOrderSaveRequest.java index 60a0e90..18d4cb0 100644 --- a/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/request/SellerOrderSaveRequest.java +++ b/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/request/SellerOrderSaveRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; @EqualsAndHashCode(callSuper = true) @Data diff --git a/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/request/UserOrderPageRequest.java b/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/request/UserOrderPageRequest.java index fd9e7c3..7719a54 100644 --- a/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/request/UserOrderPageRequest.java +++ b/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/request/UserOrderPageRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; /** * 用户订单列表分页请求参数 diff --git a/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/request/UserOrderSaveRequest.java b/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/request/UserOrderSaveRequest.java index 4892f08..eb49cff 100644 --- a/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/request/UserOrderSaveRequest.java +++ b/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/request/UserOrderSaveRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * 用户订单保存 diff --git a/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/response/UserOrderQuantityResponse.java b/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/response/UserOrderQuantityResponse.java new file mode 100644 index 0000000..76545d9 --- /dev/null +++ b/shop-order/shop-order-model/src/main/java/quick/pager/shop/order/response/UserOrderQuantityResponse.java @@ -0,0 +1,30 @@ +package quick.pager.shop.order.response; + +import java.io.Serializable; +import lombok.Data; + +/** + * 订单气泡数 + * + * @author siguiyang + */ +@Data +public class UserOrderQuantityResponse implements Serializable { + private static final long serialVersionUID = -955161449008299661L; + /** + * 待支付 + */ + private Integer payment; + /** + * 待收货 + */ + private Integer received; + /** + * 待自提 + */ + private Integer raised; + /** + * 待评价 + */ + private Integer evaluated; +} diff --git a/shop-oss/pom.xml b/shop-oss/pom.xml index 427c613..da8a772 100644 --- a/shop-oss/pom.xml +++ b/shop-oss/pom.xml @@ -22,29 +22,25 @@ - - org.springframework.boot - spring-boot-starter-web - com.alibaba.cloud - spring-cloud-alibaba-nacos-config + spring-cloud-starter-alibaba-nacos-config com.alibaba.cloud - spring-cloud-alibaba-nacos-discovery + spring-cloud-starter-alibaba-nacos-discovery org.springframework.boot - spring-boot-starter-actuator + spring-boot-starter-web - org.springframework.cloud - spring-cloud-starter-openfeign + org.springframework.boot + spring-boot-starter-actuator @@ -53,10 +49,10 @@ test + - com.aliyun.oss - aliyun-sdk-oss - 3.8.0 + com.alibaba.cloud + aliyun-oss-spring-boot-starter @@ -89,7 +85,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.1.2.RELEASE + 2.2.9.RELEASE package diff --git a/shop-oss/src/main/java/quick/pager/shop/oss/OSSApplication.java b/shop-oss/src/main/java/quick/pager/shop/OSSApplication.java similarity index 50% rename from shop-oss/src/main/java/quick/pager/shop/oss/OSSApplication.java rename to shop-oss/src/main/java/quick/pager/shop/OSSApplication.java index f71d245..a9c2426 100644 --- a/shop-oss/src/main/java/quick/pager/shop/oss/OSSApplication.java +++ b/shop-oss/src/main/java/quick/pager/shop/OSSApplication.java @@ -1,16 +1,12 @@ -package quick.pager.shop.oss; +package quick.pager.shop; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.openfeign.EnableFeignClients; /** * @author siguiyang */ -@SpringBootApplication(scanBasePackages = "quick.pager.shop") -@EnableDiscoveryClient -@EnableFeignClients("quick.pager.shop") +@SpringBootApplication public class OSSApplication { public static void main(String[] args) { diff --git a/shop-oss/src/main/java/quick/pager/shop/oss/configuration/QiniuAutoConfiguration.java b/shop-oss/src/main/java/quick/pager/shop/configuration/QiniuAutoConfiguration.java similarity index 91% rename from shop-oss/src/main/java/quick/pager/shop/oss/configuration/QiniuAutoConfiguration.java rename to shop-oss/src/main/java/quick/pager/shop/configuration/QiniuAutoConfiguration.java index c809d91..62b1c4c 100644 --- a/shop-oss/src/main/java/quick/pager/shop/oss/configuration/QiniuAutoConfiguration.java +++ b/shop-oss/src/main/java/quick/pager/shop/configuration/QiniuAutoConfiguration.java @@ -1,4 +1,4 @@ -package quick.pager.shop.oss.configuration; +package quick.pager.shop.configuration; import com.qiniu.storage.Region; import com.qiniu.storage.UploadManager; @@ -8,7 +8,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import quick.pager.shop.oss.properties.QiniuProperties; +import quick.pager.shop.properties.QiniuProperties; /** * 七牛云存储自动化配置 diff --git a/shop-oss/src/main/java/quick/pager/shop/oss/controller/UploadController.java b/shop-oss/src/main/java/quick/pager/shop/controller/UploadController.java similarity index 66% rename from shop-oss/src/main/java/quick/pager/shop/oss/controller/UploadController.java rename to shop-oss/src/main/java/quick/pager/shop/controller/UploadController.java index 130b24f..60acc26 100644 --- a/shop-oss/src/main/java/quick/pager/shop/oss/controller/UploadController.java +++ b/shop-oss/src/main/java/quick/pager/shop/controller/UploadController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.oss.controller; +package quick.pager.shop.controller; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.URLUtil; @@ -11,6 +11,7 @@ import java.util.Map; import javax.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -18,9 +19,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import quick.pager.shop.oss.service.impl.AliyunServiceImpl; -import quick.pager.shop.oss.service.impl.QiniuServiceImpl; -import quick.pager.shop.response.Response; +import quick.pager.shop.constants.ResponseStatus; +import quick.pager.shop.enmus.OSSTypeEnum; +import quick.pager.shop.service.UploadService; +import quick.pager.shop.user.response.Response; import quick.pager.shop.utils.FileUtil; /** @@ -32,35 +34,28 @@ @RestController @RequestMapping("/oss") public class UploadController { - - @Autowired - private AliyunServiceImpl aliyunService; @Autowired - private QiniuServiceImpl qiniuService; + private Map uploadService; /** - * 管理后端上传服务 + * 上传服务 + * + * @param file 上传的文件 + * @param ossType 上传云服务器类型 */ - @PostMapping("/qiniu/upload") - public Response> qiniuUpload(@RequestParam MultipartFile file) throws IOException { - String originalFilename = file.getOriginalFilename(); - InputStream inputStream = file.getInputStream(); - String url = qiniuService.uploadStream(inputStream, originalFilename); - log.info("文件上传的URL = {}", url); - Map result = Maps.newConcurrentMap(); - result.put("name", originalFilename); - result.put("url", url); - return new Response<>(result); - } + @PostMapping("/upload") + public Response> qiniuUpload(@RequestParam MultipartFile file, @RequestParam(required = false) String ossType) throws IOException { + + if (StringUtils.isEmpty(ossType)) { + ossType = OSSTypeEnum.ALIYUN.getCode(); + } + if (this.uploadService.containsKey(ossType)) { + return new Response<>(ResponseStatus.Code.FAIL_CODE, "未找到可用的云服务器"); + } - /** - * 管理后端上传服务 - */ - @PostMapping("/aliyun/upload") - public Response> aliyunUpload(@RequestParam MultipartFile file) throws IOException { String originalFilename = file.getOriginalFilename(); InputStream inputStream = file.getInputStream(); - String url = aliyunService.uploadStream(inputStream, originalFilename); + String url = this.uploadService.get(ossType).uploadStream(inputStream, originalFilename); log.info("文件上传的URL = {}", url); Map result = Maps.newConcurrentMap(); result.put("name", originalFilename); @@ -69,7 +64,11 @@ public Response> aliyunUpload(@RequestParam MultipartFile fi } /** - * 管理后端下载文件服务 + * 下载文件服务 + * + * @param downloadFile 下载的文件路径 + * @param downloadFilename 下载文件的名称 + * @param response 响应流 */ @GetMapping("/download") public void download(@RequestParam String downloadFile, @RequestParam String downloadFilename, HttpServletResponse response) throws Exception { diff --git a/shop-oss/src/main/java/quick/pager/shop/enmus/OSSTypeEnum.java b/shop-oss/src/main/java/quick/pager/shop/enmus/OSSTypeEnum.java new file mode 100644 index 0000000..51f1d1e --- /dev/null +++ b/shop-oss/src/main/java/quick/pager/shop/enmus/OSSTypeEnum.java @@ -0,0 +1,33 @@ +package quick.pager.shop.enmus; + +import quick.pager.shop.enums.IEnum; + +/** + * OOS 云类型枚举 + * + * @author siguiyang + */ +public enum OSSTypeEnum implements IEnum { + + ALIYUN("ALIYUN", "阿里云"), + QINIU("QINIU", "七牛云"); + + private String code; + + private String desc; + + OSSTypeEnum(String code, String desc) { + this.code = code; + this.desc = desc; + } + + @Override + public String getCode() { + return this.code; + } + + @Override + public String getDesc() { + return this.desc; + } +} diff --git a/shop-oss/src/main/java/quick/pager/shop/oss/exception/OSSException.java b/shop-oss/src/main/java/quick/pager/shop/exception/OSSException.java similarity index 95% rename from shop-oss/src/main/java/quick/pager/shop/oss/exception/OSSException.java rename to shop-oss/src/main/java/quick/pager/shop/exception/OSSException.java index 58feb1f..be2c221 100644 --- a/shop-oss/src/main/java/quick/pager/shop/oss/exception/OSSException.java +++ b/shop-oss/src/main/java/quick/pager/shop/exception/OSSException.java @@ -1,4 +1,4 @@ -package quick.pager.shop.oss.exception; +package quick.pager.shop.exception; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/shop-oss/src/main/java/quick/pager/shop/oss/exception/ShopExceptionAdvice.java b/shop-oss/src/main/java/quick/pager/shop/exception/ShopExceptionAdvice.java similarity index 90% rename from shop-oss/src/main/java/quick/pager/shop/oss/exception/ShopExceptionAdvice.java rename to shop-oss/src/main/java/quick/pager/shop/exception/ShopExceptionAdvice.java index eeaf136..aae388f 100644 --- a/shop-oss/src/main/java/quick/pager/shop/oss/exception/ShopExceptionAdvice.java +++ b/shop-oss/src/main/java/quick/pager/shop/exception/ShopExceptionAdvice.java @@ -1,10 +1,10 @@ -package quick.pager.shop.oss.exception; +package quick.pager.shop.exception; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 统一异常处理机制 diff --git a/shop-oss/src/main/java/quick/pager/shop/oss/configuration/OSSAutoConfiguration.java b/shop-oss/src/main/java/quick/pager/shop/oss/configuration/OSSAutoConfiguration.java deleted file mode 100644 index b09ea81..0000000 --- a/shop-oss/src/main/java/quick/pager/shop/oss/configuration/OSSAutoConfiguration.java +++ /dev/null @@ -1,31 +0,0 @@ -package quick.pager.shop.oss.configuration; - -import com.aliyun.oss.OSS; -import com.aliyun.oss.OSSClient; -import com.aliyun.oss.OSSClientBuilder; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import quick.pager.shop.oss.properties.OSSProperties; - -/** - * 阿里云OSS自动化配置 - * - * @author siguiyang - */ -@Configuration -@ConditionalOnClass(OSSClient.class) -@EnableConfigurationProperties(OSSProperties.class) -public class OSSAutoConfiguration { - - @Autowired - private OSSProperties ossProperties; - - @Bean - public OSS ossClient() { - return new OSSClientBuilder().build(ossProperties.getEndpoint(), ossProperties.getAccessKeyId(), ossProperties.getAccessKeySecret()); - } - -} diff --git a/shop-oss/src/main/java/quick/pager/shop/oss/properties/OSSProperties.java b/shop-oss/src/main/java/quick/pager/shop/oss/properties/OSSProperties.java deleted file mode 100644 index 94ad71b..0000000 --- a/shop-oss/src/main/java/quick/pager/shop/oss/properties/OSSProperties.java +++ /dev/null @@ -1,34 +0,0 @@ -package quick.pager.shop.oss.properties; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; - -/** - * 阿里云OSS配置 - * - * @author siguiyang - */ -@Data -@ConfigurationProperties(prefix = "shop.oss") -public class OSSProperties { - - /** - * http://pager-static.oss-accelerate.aliyuncs.com - */ - private String endpoint = "http://oss-cn-hangzhou.aliyuncs.com"; - // accessKeyId和accessKeySecret是OSS的访问密钥，您可以在控制台上创建和查看， - // 创建和查看访问密钥的链接地址是：https://ak-console.aliyun.com/#/。 - // 注意：accessKeyId和accessKeySecret前后都没有空格，从控制台复制时请检查并去除多余的空格。 - // LTAI4G7cyWJMo2dsEKtypcen - private String accessKeyId = ""; - // UIsJeLhmK944HJAGxWaxuoTWTs4iHf - private String accessKeySecret = ""; - // Bucket用来管理所存储Object的存储空间，详细描述请参看“开发人员指南 > 基本概念 > OSS基本概念介绍”。 - // Bucket命名规范如下：只能包括小写字母，数字和短横线（-），必须以小写字母或者数字开头，长度必须在3-63字节之间。 - // pager-static - private String bucketName = ""; - // Object是OSS存储数据的基本单元，称为OSS的对象，也被称为OSS的文件。详细描述请参看“开发人员指南 > 基本概念 > OSS基本概念介绍”。 - // Object命名规范如下：使用UTF-8编码，长度必须在1-1023字节之间，不能以“/”或者“\”字符开头。 - private String firstKey = "my-first-key"; - -} diff --git a/shop-oss/src/main/java/quick/pager/shop/oss/properties/QiniuProperties.java b/shop-oss/src/main/java/quick/pager/shop/properties/QiniuProperties.java similarity index 89% rename from shop-oss/src/main/java/quick/pager/shop/oss/properties/QiniuProperties.java rename to shop-oss/src/main/java/quick/pager/shop/properties/QiniuProperties.java index 6e3094d..ea41614 100644 --- a/shop-oss/src/main/java/quick/pager/shop/oss/properties/QiniuProperties.java +++ b/shop-oss/src/main/java/quick/pager/shop/properties/QiniuProperties.java @@ -1,4 +1,4 @@ -package quick.pager.shop.oss.properties; +package quick.pager.shop.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/shop-oss/src/main/java/quick/pager/shop/oss/service/UploadService.java b/shop-oss/src/main/java/quick/pager/shop/service/UploadService.java similarity index 94% rename from shop-oss/src/main/java/quick/pager/shop/oss/service/UploadService.java rename to shop-oss/src/main/java/quick/pager/shop/service/UploadService.java index 5b0b403..4e0e2ec 100644 --- a/shop-oss/src/main/java/quick/pager/shop/oss/service/UploadService.java +++ b/shop-oss/src/main/java/quick/pager/shop/service/UploadService.java @@ -1,4 +1,4 @@ -package quick.pager.shop.oss.service; +package quick.pager.shop.service; import java.io.File; import java.io.InputStream; diff --git a/shop-oss/src/main/java/quick/pager/shop/oss/service/impl/AliyunServiceImpl.java b/shop-oss/src/main/java/quick/pager/shop/service/impl/AliyunServiceImpl.java similarity index 59% rename from shop-oss/src/main/java/quick/pager/shop/oss/service/impl/AliyunServiceImpl.java rename to shop-oss/src/main/java/quick/pager/shop/service/impl/AliyunServiceImpl.java index 117c58e..c2eb32d 100644 --- a/shop-oss/src/main/java/quick/pager/shop/oss/service/impl/AliyunServiceImpl.java +++ b/shop-oss/src/main/java/quick/pager/shop/service/impl/AliyunServiceImpl.java @@ -1,32 +1,31 @@ -package quick.pager.shop.oss.service.impl; +package quick.pager.shop.service.impl; import com.aliyun.oss.OSS; +import com.aliyun.oss.model.PutObjectResult; import java.io.File; import java.io.InputStream; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import quick.pager.shop.oss.properties.OSSProperties; -import quick.pager.shop.oss.service.UploadService; +import quick.pager.shop.service.UploadService; /** * 阿里云OSS * * @author siguiyang */ -@Service -@EnableConfigurationProperties(OSSProperties.class) +@Service("ALIYUN") public class AliyunServiceImpl implements UploadService { @Autowired(required = false) private OSS oss; - @Autowired(required = false) - private OSSProperties ossProperties; + @Value("${alibaba.cloud.bucket}") + private String bucket; @Override public String uploadStream(InputStream is, String fileName) { - oss.putObject(ossProperties.getBucketName(), ossProperties.getFirstKey(), is); + PutObjectResult result = oss.putObject(bucket, fileName, is); return null; } diff --git a/shop-oss/src/main/java/quick/pager/shop/oss/service/impl/QiniuServiceImpl.java b/shop-oss/src/main/java/quick/pager/shop/service/impl/QiniuServiceImpl.java similarity index 94% rename from shop-oss/src/main/java/quick/pager/shop/oss/service/impl/QiniuServiceImpl.java rename to shop-oss/src/main/java/quick/pager/shop/service/impl/QiniuServiceImpl.java index ec386e6..7b4a104 100644 --- a/shop-oss/src/main/java/quick/pager/shop/oss/service/impl/QiniuServiceImpl.java +++ b/shop-oss/src/main/java/quick/pager/shop/service/impl/QiniuServiceImpl.java @@ -1,4 +1,4 @@ -package quick.pager.shop.oss.service.impl; +package quick.pager.shop.service.impl; import com.alibaba.fastjson.JSON; import com.qiniu.common.QiniuException; @@ -13,8 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.stereotype.Service; -import quick.pager.shop.oss.properties.QiniuProperties; -import quick.pager.shop.oss.service.UploadService; +import quick.pager.shop.properties.QiniuProperties; +import quick.pager.shop.service.UploadService; import quick.pager.shop.utils.DateUtils; /** @@ -22,7 +22,7 @@ * * @author siguiyang */ -@Service +@Service("QINIU") @EnableConfigurationProperties(QiniuProperties.class) public class QiniuServiceImpl implements UploadService { diff --git a/shop-oss/src/main/java/quick/pager/shop/oss/utils/QiniuUpload.java b/shop-oss/src/main/java/quick/pager/shop/utils/QiniuUpload.java similarity index 96% rename from shop-oss/src/main/java/quick/pager/shop/oss/utils/QiniuUpload.java rename to shop-oss/src/main/java/quick/pager/shop/utils/QiniuUpload.java index 77892db..36efc47 100644 --- a/shop-oss/src/main/java/quick/pager/shop/oss/utils/QiniuUpload.java +++ b/shop-oss/src/main/java/quick/pager/shop/utils/QiniuUpload.java @@ -1,4 +1,4 @@ -package quick.pager.shop.oss.utils; +package quick.pager.shop.utils; import java.io.File; import java.io.InputStream; diff --git a/shop-oss/src/main/java/quick/pager/shop/oss/utils/UploadConfiguration.java b/shop-oss/src/main/java/quick/pager/shop/utils/UploadConfiguration.java similarity index 96% rename from shop-oss/src/main/java/quick/pager/shop/oss/utils/UploadConfiguration.java rename to shop-oss/src/main/java/quick/pager/shop/utils/UploadConfiguration.java index dce820b..6ea3368 100644 --- a/shop-oss/src/main/java/quick/pager/shop/oss/utils/UploadConfiguration.java +++ b/shop-oss/src/main/java/quick/pager/shop/utils/UploadConfiguration.java @@ -1,4 +1,4 @@ -package quick.pager.shop.oss.utils; +package quick.pager.shop.utils; import com.alibaba.fastjson.JSON; import com.qiniu.common.QiniuException; @@ -13,8 +13,6 @@ import java.io.InputStream; import java.time.LocalDateTime; import quick.pager.shop.constants.SysConfigKeys; -import quick.pager.shop.utils.DateUtils; -import quick.pager.shop.utils.SysConfigMap; /** * 七牛存储配置 diff --git a/shop-oss/src/main/resources/META-INF/spring.factories b/shop-oss/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..75d0f58 --- /dev/null +++ b/shop-oss/src/main/resources/META-INF/spring.factories @@ -0,0 +1 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=quick.pager.shop.configuration.QiniuAutoConfiguration diff --git a/shop-oss/src/main/resources/bootstrap-dev.yml b/shop-oss/src/main/resources/bootstrap-dev.yml index a3752ea..e288e87 100644 --- a/shop-oss/src/main/resources/bootstrap-dev.yml +++ b/shop-oss/src/main/resources/bootstrap-dev.yml @@ -3,5 +3,9 @@ spring: nacos: config: server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d discovery: server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d diff --git a/shop-oss/src/main/resources/bootstrap.yml b/shop-oss/src/main/resources/bootstrap.yml index 86c88e3..bf4d544 100644 --- a/shop-oss/src/main/resources/bootstrap.yml +++ b/shop-oss/src/main/resources/bootstrap.yml @@ -8,6 +8,8 @@ spring: allow-bean-definition-overriding: true profiles: active: dev + autoconfigure: + exclude: org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration feign: sentinel: enabled: true diff --git a/shop-platform/pom.xml b/shop-platform/pom.xml index 46a23c0..f6369bf 100644 --- a/shop-platform/pom.xml +++ b/shop-platform/pom.xml @@ -14,8 +14,8 @@ Shop 中台 shop-platform-api - shop-platform-model shop-platform-client + shop-platform-model diff --git a/shop-platform/shop-platform-api/pom.xml b/shop-platform/shop-platform-api/pom.xml index a8b21fc..56be639 100644 --- a/shop-platform/shop-platform-api/pom.xml +++ b/shop-platform/shop-platform-api/pom.xml @@ -20,83 +20,81 @@ + - org.springframework.boot - spring-boot-starter-web + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + com.alibaba.cloud - spring-cloud-alibaba-nacos-config + spring-cloud-starter-alibaba-nacos-discovery + com.alibaba.cloud - spring-cloud-alibaba-nacos-discovery + spring-cloud-starter-alibaba-seata + com.alibaba.cloud spring-cloud-starter-alibaba-sentinel + + + - org.springframework.boot - spring-boot-starter-actuator + org.springframework.cloud + spring-cloud-starter-openfeign + + + - com.baomidou - mybatis-plus-boot-starter + org.springframework.boot + spring-boot-starter-web + org.springframework.boot spring-boot-starter-data-redis + - org.springframework.cloud - spring-cloud-starter-stream-kafka - - - org.springframework.cloud - spring-cloud-starter-sleuth - - - org.springframework.cloud - spring-cloud-sleuth-zipkin + org.springframework.boot + spring-boot-starter-actuator + + + - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - 2.1.2.RELEASE + com.baomidou + mybatis-plus-boot-starter + mysql mysql-connector-java - - redis.clients - jedis - - - org.springframework.boot - spring-boot-starter-test - test - + + + quick.pager - shop-auth-resource + shop-auth-feign ${project.version} - - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - - + quick.pager - shop-platform-model + shop-auth-resource ${project.version} + + quick.pager - shop-common + shop-platform-model ${project.version} @@ -106,7 +104,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.1.2.RELEASE + 2.2.9.RELEASE package diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/PlatformApplication.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/PlatformApplication.java new file mode 100644 index 0000000..3b99601 --- /dev/null +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/PlatformApplication.java @@ -0,0 +1,12 @@ +package quick.pager.shop; + +import org.springframework.boot.SpringApplication; +import org.springframework.cloud.client.SpringCloudApplication; + +@SpringCloudApplication +public class PlatformApplication { + + public static void main(String[] args) { + SpringApplication.run(PlatformApplication.class, args); + } +} diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/controller/DynamicFormController.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/controller/DynamicFormController.java similarity index 92% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/controller/DynamicFormController.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/controller/DynamicFormController.java index c7555f6..4518593 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/controller/DynamicFormController.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/controller/DynamicFormController.java @@ -17,11 +17,11 @@ //import org.springframework.web.bind.annotation.RestController; //import quick.pager.shop.constants.ConstantsClient; //import quick.pager.shop.constants.ResponseStatus; -//import quick.pager.shop.platform.model.DynamicForm; +//import quick.pager.shop.model.DynamicForm; //import quick.pager.shop.platform.request.DynamicFormSaveRequest; //import quick.pager.shop.platform.response.DynamicFormResponse; -//import quick.pager.shop.platform.service.DynamicFormService; -//import quick.pager.shop.response.Response; +//import quick.pager.shop.service.DynamicFormService; +//import quick.pager.shop.user.response.Response; //import quick.pager.shop.utils.BeanCopier; // ///** diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/controller/FormController.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/controller/FormController.java similarity index 89% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/controller/FormController.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/controller/FormController.java index e7ed53f..0cb15e8 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/controller/FormController.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/controller/FormController.java @@ -1,10 +1,7 @@ -package quick.pager.shop.platform.controller; +package quick.pager.shop.controller; -import java.util.Collections; import java.util.List; import java.util.Objects; -import java.util.Optional; -import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -15,16 +12,14 @@ import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.ConstantsClient; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.platform.model.Form; import quick.pager.shop.platform.request.form.FormOtherRequest; import quick.pager.shop.platform.request.form.FormPageRequest; import quick.pager.shop.platform.request.form.FormSaveRequest; import quick.pager.shop.platform.response.FieldResponse; import quick.pager.shop.platform.response.FormResponse; -import quick.pager.shop.platform.service.FieldService; -import quick.pager.shop.platform.service.FormService; -import quick.pager.shop.response.Response; -import quick.pager.shop.utils.BeanCopier; +import quick.pager.shop.service.FieldService; +import quick.pager.shop.service.FormService; +import quick.pager.shop.user.response.Response; /** * 表单模型 diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/controller/SMSController.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/controller/SMSController.java similarity index 89% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/controller/SMSController.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/controller/SMSController.java index 35aff42..7ce0931 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/controller/SMSController.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/controller/SMSController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.platform.controller; +package quick.pager.shop.controller; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -9,8 +9,8 @@ import quick.pager.shop.constants.ConstantsClient; import quick.pager.shop.constants.ResponseStatus; import quick.pager.shop.platform.request.sms.SMSRequest; -import quick.pager.shop.platform.service.SMSService; -import quick.pager.shop.response.Response; +import quick.pager.shop.service.SMSService; +import quick.pager.shop.user.response.Response; /** * 短信验证码发送 diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/controller/SMSTemplateController.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/controller/SMSTemplateController.java similarity index 87% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/controller/SMSTemplateController.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/controller/SMSTemplateController.java index 102fec5..93bca73 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/controller/SMSTemplateController.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/controller/SMSTemplateController.java @@ -1,10 +1,7 @@ -package quick.pager.shop.platform.controller; +package quick.pager.shop.controller; -import java.util.Collections; import java.util.List; import java.util.Objects; -import java.util.Optional; -import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -15,13 +12,11 @@ import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.ConstantsClient; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.platform.model.SMSTemplate; import quick.pager.shop.platform.request.sms.SMSTemplatePageRequest; import quick.pager.shop.platform.request.sms.SMSTemplateSaveRequest; import quick.pager.shop.platform.response.SMSTemplateResponse; -import quick.pager.shop.platform.service.SMSTemplateService; -import quick.pager.shop.response.Response; -import quick.pager.shop.utils.BeanCopier; +import quick.pager.shop.service.SMSTemplateService; +import quick.pager.shop.user.response.Response; /** * 短信模板 diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/controller/SystemConfigController.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/controller/SystemConfigController.java similarity index 94% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/controller/SystemConfigController.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/controller/SystemConfigController.java index 4860f49..41db7ce 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/controller/SystemConfigController.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/controller/SystemConfigController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.platform.controller; +package quick.pager.shop.controller; import java.util.Collections; import java.util.List; @@ -14,13 +14,13 @@ import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.ConstantsClient; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.platform.model.SystemConfig; +import quick.pager.shop.model.SystemConfig; import quick.pager.shop.platform.request.SystemConfigOtherRequest; import quick.pager.shop.platform.request.SystemConfigPageRequest; import quick.pager.shop.platform.request.SystemConfigSaveRequest; import quick.pager.shop.platform.response.SystemConfigResponse; -import quick.pager.shop.platform.service.SystemConfigService; -import quick.pager.shop.response.Response; +import quick.pager.shop.service.SystemConfigService; +import quick.pager.shop.user.response.Response; import quick.pager.shop.utils.BeanCopier; /** diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/controller/SystemConfigDetailController.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/controller/SystemConfigDetailController.java similarity index 92% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/controller/SystemConfigDetailController.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/controller/SystemConfigDetailController.java index e5f5c92..dbdd8b8 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/controller/SystemConfigDetailController.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/controller/SystemConfigDetailController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.platform.controller; +package quick.pager.shop.controller; import java.util.List; import java.util.Objects; @@ -14,8 +14,8 @@ import quick.pager.shop.platform.request.SystemConfigDetailOtherRequest; import quick.pager.shop.platform.request.SystemConfigDetailSaveRequest; import quick.pager.shop.platform.response.SystemConfigDetailResponse; -import quick.pager.shop.platform.service.SystemConfigDetailService; -import quick.pager.shop.response.Response; +import quick.pager.shop.service.SystemConfigDetailService; +import quick.pager.shop.user.response.Response; /** * 系统配置 diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/AreaMapper.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/AreaMapper.java similarity index 65% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/AreaMapper.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/AreaMapper.java index a17c071..2d50566 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/AreaMapper.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/AreaMapper.java @@ -1,9 +1,8 @@ -package quick.pager.shop.platform.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import java.util.List; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.platform.model.Area; +import quick.pager.shop.model.Area; /** * 地区 diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/CityMapper.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/CityMapper.java similarity index 75% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/CityMapper.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/CityMapper.java index 0fe5c2c..4c03b5c 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/CityMapper.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/CityMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.platform.mapper; +package quick.pager.shop.mapper; import java.util.List; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.platform.model.City; +import quick.pager.shop.model.City; @Mapper public interface CityMapper { diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/DynamicFormMapper.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/DynamicFormMapper.java similarity index 74% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/DynamicFormMapper.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/DynamicFormMapper.java index 9c3daac..3d67a7f 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/DynamicFormMapper.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/DynamicFormMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.platform.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.platform.model.DynamicForm; +import quick.pager.shop.model.DynamicForm; /** *

diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/FieldMapper.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/FieldMapper.java similarity index 69% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/FieldMapper.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/FieldMapper.java index edbba50..6608713 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/FieldMapper.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/FieldMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.platform.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.platform.model.Field; +import quick.pager.shop.model.Field; /** * @author siguiyang diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/FieldPropsMapper.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/FieldPropsMapper.java similarity index 71% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/FieldPropsMapper.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/FieldPropsMapper.java index eee68da..3b4d887 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/FieldPropsMapper.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/FieldPropsMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.platform.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.platform.model.FieldProps; +import quick.pager.shop.model.FieldProps; /** * FieldPropsMapper diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/FormMapper.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/FormMapper.java similarity index 71% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/FormMapper.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/FormMapper.java index 2daff88..e9425a2 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/FormMapper.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/FormMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.platform.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.platform.model.Form; +import quick.pager.shop.model.Form; /** * FormMapper diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/ProvinceMapper.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/ProvinceMapper.java similarity index 76% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/ProvinceMapper.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/ProvinceMapper.java index 1a60430..5a0eb24 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/ProvinceMapper.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/ProvinceMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.platform.mapper; +package quick.pager.shop.mapper; import java.util.List; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.platform.model.Province; +import quick.pager.shop.model.Province; @Mapper public interface ProvinceMapper { diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/SMSTemplateMapper.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/SMSTemplateMapper.java similarity index 71% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/SMSTemplateMapper.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/SMSTemplateMapper.java index 43b284c..93551f6 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/SMSTemplateMapper.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/SMSTemplateMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.platform.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.platform.model.SMSTemplate; +import quick.pager.shop.model.SMSTemplate; /** * SmsTemplateMapper diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/SystemConfigDetailMapper.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/SystemConfigDetailMapper.java similarity index 71% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/SystemConfigDetailMapper.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/SystemConfigDetailMapper.java index 7fbc3e9..0dca538 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/SystemConfigDetailMapper.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/SystemConfigDetailMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.platform.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.platform.model.SystemConfigDetail; +import quick.pager.shop.model.SystemConfigDetail; /** * SystemConfigDetailMapper diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/SystemConfigMapper.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/SystemConfigMapper.java similarity index 65% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/SystemConfigMapper.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/SystemConfigMapper.java index 50b33cf..fa7f437 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/mapper/SystemConfigMapper.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/mapper/SystemConfigMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.platform.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.platform.model.SystemConfig; +import quick.pager.shop.model.SystemConfig; @Mapper public interface SystemConfigMapper extends BaseMapper { diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/Area.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/Area.java similarity index 79% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/Area.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/Area.java index ea9e050..3e62d9e 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/Area.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/Area.java @@ -1,8 +1,7 @@ -package quick.pager.shop.platform.model; +package quick.pager.shop.model; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.model.Model; @EqualsAndHashCode(callSuper = true) @Data diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/City.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/City.java similarity index 79% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/City.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/City.java index 04af96f..3af3f14 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/City.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/City.java @@ -1,8 +1,7 @@ -package quick.pager.shop.platform.model; +package quick.pager.shop.model; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.model.Model; @EqualsAndHashCode(callSuper = true) @Data diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/DynamicForm.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/DynamicForm.java similarity index 97% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/DynamicForm.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/DynamicForm.java index 64e4f6f..f5559b5 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/DynamicForm.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/DynamicForm.java @@ -1,4 +1,4 @@ -package quick.pager.shop.platform.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/Field.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/Field.java similarity index 87% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/Field.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/Field.java index b5e74b2..54e849a 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/Field.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/Field.java @@ -1,9 +1,8 @@ -package quick.pager.shop.platform.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.model.Model; /** * 动态表单字段 diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/FieldProps.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/FieldProps.java similarity index 94% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/FieldProps.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/FieldProps.java index 000583c..916596f 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/FieldProps.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/FieldProps.java @@ -1,9 +1,8 @@ -package quick.pager.shop.platform.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.model.Model; /** * 字段属性 diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/Form.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/Form.java similarity index 86% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/Form.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/Form.java index dca37b6..d8871b5 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/Form.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/Form.java @@ -1,9 +1,8 @@ -package quick.pager.shop.platform.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.model.Model; /** * 表单模型 diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/Province.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/Province.java similarity index 78% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/Province.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/Province.java index 304c274..9cc059d 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/Province.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/Province.java @@ -1,8 +1,7 @@ -package quick.pager.shop.platform.model; +package quick.pager.shop.model; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.model.Model; @EqualsAndHashCode(callSuper = true) @Data diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/SMSTemplate.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/SMSTemplate.java similarity index 86% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/SMSTemplate.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/SMSTemplate.java index 00b3c91..714c325 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/SMSTemplate.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/SMSTemplate.java @@ -1,10 +1,9 @@ -package quick.pager.shop.platform.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.model.Model; /** * 短信模板 diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/SystemConfig.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/SystemConfig.java similarity index 85% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/SystemConfig.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/SystemConfig.java index d5618ee..64abae5 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/SystemConfig.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/SystemConfig.java @@ -1,9 +1,8 @@ -package quick.pager.shop.platform.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.model.Model; /** * 配置项 diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/SystemConfigDetail.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/SystemConfigDetail.java similarity index 89% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/SystemConfigDetail.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/SystemConfigDetail.java index 7451b49..a17f3c2 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/model/SystemConfigDetail.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/model/SystemConfigDetail.java @@ -1,9 +1,8 @@ -package quick.pager.shop.platform.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.model.Model; /** * @author siguiyang diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/PlatformApplication.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/PlatformApplication.java deleted file mode 100644 index 8fd9f55..0000000 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/PlatformApplication.java +++ /dev/null @@ -1,16 +0,0 @@ -package quick.pager.shop.platform; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; - -@SpringBootApplication(scanBasePackages = "quick.pager.shop") -@EnableDiscoveryClient -@EnableCircuitBreaker -public class PlatformApplication { - - public static void main(String[] args) { - SpringApplication.run(PlatformApplication.class, args); - } -} diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/FieldService.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/FieldService.java deleted file mode 100644 index c032528..0000000 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/FieldService.java +++ /dev/null @@ -1,10 +0,0 @@ -package quick.pager.shop.platform.service; - -import quick.pager.shop.platform.model.Field; -import quick.pager.shop.service.IService; - -/** - * @author siguiyang - */ -public interface FieldService extends IService { -} diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/impl/FieldServiceImpl.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/impl/FieldServiceImpl.java deleted file mode 100644 index 5a5bdc6..0000000 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/impl/FieldServiceImpl.java +++ /dev/null @@ -1,14 +0,0 @@ -package quick.pager.shop.platform.service.impl; - -import org.springframework.stereotype.Service; -import quick.pager.shop.platform.mapper.FieldMapper; -import quick.pager.shop.platform.model.Field; -import quick.pager.shop.platform.service.FieldService; -import quick.pager.shop.service.impl.ServiceImpl; - -/** - * @author siguiyang - */ -@Service -public class FieldServiceImpl extends ServiceImpl implements FieldService { -} diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/runner/PlatformRunner.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/runner/PlatformRunner.java similarity index 83% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/runner/PlatformRunner.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/runner/PlatformRunner.java index c189a6e..4c30b96 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/runner/PlatformRunner.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/runner/PlatformRunner.java @@ -1,9 +1,9 @@ -package quick.pager.shop.platform.runner; +package quick.pager.shop.runner; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.stereotype.Component; -import quick.pager.shop.platform.service.SystemConfigService; +import quick.pager.shop.service.SystemConfigService; /** * 初始化系统配置参数加入到redis缓存中 diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/DynamicFormService.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/DynamicFormService.java similarity index 84% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/DynamicFormService.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/DynamicFormService.java index 28f8c26..d50f672 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/DynamicFormService.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/DynamicFormService.java @@ -1,7 +1,7 @@ -package quick.pager.shop.platform.service; +package quick.pager.shop.service; import java.util.List; -import quick.pager.shop.platform.model.DynamicForm; +import quick.pager.shop.model.DynamicForm; import quick.pager.shop.platform.request.DynamicFormSaveRequest; /** diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/FieldService.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/FieldService.java new file mode 100644 index 0000000..d8bb7ee --- /dev/null +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/FieldService.java @@ -0,0 +1,9 @@ +package quick.pager.shop.service; + +import quick.pager.shop.model.Field; + +/** + * @author siguiyang + */ +public interface FieldService extends IService { +} diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/FormService.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/FormService.java similarity index 87% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/FormService.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/FormService.java index 752a648..cf003fc 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/FormService.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/FormService.java @@ -1,14 +1,13 @@ -package quick.pager.shop.platform.service; +package quick.pager.shop.service; import java.util.List; -import quick.pager.shop.platform.model.Form; +import quick.pager.shop.model.Form; import quick.pager.shop.platform.request.form.FormOtherRequest; import quick.pager.shop.platform.request.form.FormPageRequest; import quick.pager.shop.platform.request.form.FormSaveRequest; import quick.pager.shop.platform.response.FieldResponse; import quick.pager.shop.platform.response.FormResponse; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.IService; +import quick.pager.shop.user.response.Response; /** * 表单服务 diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/SMSService.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/SMSService.java similarity index 75% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/SMSService.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/SMSService.java index a0b0281..350d5c7 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/SMSService.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/SMSService.java @@ -1,6 +1,6 @@ -package quick.pager.shop.platform.service; +package quick.pager.shop.service; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 发送短信 diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/SMSTemplateService.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/SMSTemplateService.java similarity index 85% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/SMSTemplateService.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/SMSTemplateService.java index 50a64c4..7813f0e 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/SMSTemplateService.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/SMSTemplateService.java @@ -1,12 +1,11 @@ -package quick.pager.shop.platform.service; +package quick.pager.shop.service; import java.util.List; -import quick.pager.shop.platform.model.SMSTemplate; +import quick.pager.shop.model.SMSTemplate; import quick.pager.shop.platform.request.sms.SMSTemplatePageRequest; import quick.pager.shop.platform.request.sms.SMSTemplateSaveRequest; import quick.pager.shop.platform.response.SMSTemplateResponse; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.IService; +import quick.pager.shop.user.response.Response; /** * 短信模板服务 diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/SystemConfigDetailService.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/SystemConfigDetailService.java similarity index 79% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/SystemConfigDetailService.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/SystemConfigDetailService.java index fecb777..0867827 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/SystemConfigDetailService.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/SystemConfigDetailService.java @@ -1,12 +1,11 @@ -package quick.pager.shop.platform.service; +package quick.pager.shop.service; import java.util.List; -import quick.pager.shop.platform.model.SystemConfigDetail; +import quick.pager.shop.model.SystemConfigDetail; import quick.pager.shop.platform.request.SystemConfigDetailOtherRequest; import quick.pager.shop.platform.request.SystemConfigDetailSaveRequest; import quick.pager.shop.platform.response.SystemConfigDetailResponse; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.IService; +import quick.pager.shop.user.response.Response; /** * 系统配置服务部 diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/SystemConfigDetailServiceImpl.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/SystemConfigDetailServiceImpl.java similarity index 93% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/SystemConfigDetailServiceImpl.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/SystemConfigDetailServiceImpl.java index 2bfbfaa..165fe86 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/SystemConfigDetailServiceImpl.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/SystemConfigDetailServiceImpl.java @@ -1,16 +1,16 @@ -package quick.pager.shop.platform.service; +package quick.pager.shop.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.List; import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import quick.pager.shop.platform.mapper.SystemConfigDetailMapper; -import quick.pager.shop.platform.model.SystemConfigDetail; +import quick.pager.shop.mapper.SystemConfigDetailMapper; +import quick.pager.shop.model.SystemConfigDetail; import quick.pager.shop.platform.request.SystemConfigDetailOtherRequest; import quick.pager.shop.platform.request.SystemConfigDetailSaveRequest; import quick.pager.shop.platform.response.SystemConfigDetailResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; import quick.pager.shop.service.impl.ServiceImpl; import quick.pager.shop.utils.BeanCopier; import quick.pager.shop.utils.DateUtils; diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/SystemConfigService.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/SystemConfigService.java similarity index 85% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/SystemConfigService.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/SystemConfigService.java index dc55ec5..f866bfa 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/SystemConfigService.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/SystemConfigService.java @@ -1,11 +1,11 @@ -package quick.pager.shop.platform.service; +package quick.pager.shop.service; import java.util.List; -import quick.pager.shop.platform.model.SystemConfig; +import quick.pager.shop.model.SystemConfig; import quick.pager.shop.platform.request.SystemConfigOtherRequest; import quick.pager.shop.platform.request.SystemConfigPageRequest; import quick.pager.shop.platform.request.SystemConfigSaveRequest; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 系统配置服务部 diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/impl/DynamicFormServiceImpl.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/impl/DynamicFormServiceImpl.java similarity index 80% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/impl/DynamicFormServiceImpl.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/impl/DynamicFormServiceImpl.java index cfb5832..fdd465f 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/impl/DynamicFormServiceImpl.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/impl/DynamicFormServiceImpl.java @@ -1,13 +1,12 @@ -package quick.pager.shop.platform.service.impl; +package quick.pager.shop.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; import org.springframework.stereotype.Service; -import quick.pager.shop.platform.mapper.DynamicFormMapper; -import quick.pager.shop.platform.model.DynamicForm; +import quick.pager.shop.mapper.DynamicFormMapper; +import quick.pager.shop.model.DynamicForm; import quick.pager.shop.platform.request.DynamicFormSaveRequest; -import quick.pager.shop.platform.service.DynamicFormService; -import quick.pager.shop.service.impl.ServiceImpl; +import quick.pager.shop.service.DynamicFormService; import quick.pager.shop.utils.BeanCopier; /** diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/impl/FieldServiceImpl.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/impl/FieldServiceImpl.java new file mode 100644 index 0000000..d5a14aa --- /dev/null +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/impl/FieldServiceImpl.java @@ -0,0 +1,13 @@ +package quick.pager.shop.service.impl; + +import org.springframework.stereotype.Service; +import quick.pager.shop.mapper.FieldMapper; +import quick.pager.shop.model.Field; +import quick.pager.shop.service.FieldService; + +/** + * @author siguiyang + */ +@Service +public class FieldServiceImpl extends ServiceImpl implements FieldService { +} diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/impl/FormServiceImpl.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/impl/FormServiceImpl.java similarity index 91% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/impl/FormServiceImpl.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/impl/FormServiceImpl.java index e164501..9d5b565 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/impl/FormServiceImpl.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/impl/FormServiceImpl.java @@ -1,4 +1,4 @@ -package quick.pager.shop.platform.service.impl; +package quick.pager.shop.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.Collections; @@ -9,21 +9,20 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import quick.pager.shop.platform.mapper.FieldMapper; -import quick.pager.shop.platform.mapper.FieldPropsMapper; -import quick.pager.shop.platform.mapper.FormMapper; -import quick.pager.shop.platform.model.Field; -import quick.pager.shop.platform.model.FieldProps; -import quick.pager.shop.platform.model.Form; +import quick.pager.shop.mapper.FieldMapper; +import quick.pager.shop.mapper.FieldPropsMapper; +import quick.pager.shop.mapper.FormMapper; +import quick.pager.shop.model.Field; +import quick.pager.shop.model.FieldProps; +import quick.pager.shop.model.Form; import quick.pager.shop.platform.request.form.FormOtherRequest; import quick.pager.shop.platform.request.form.FormPageRequest; import quick.pager.shop.platform.request.form.FormSaveRequest; import quick.pager.shop.platform.response.FieldPropsResponse; import quick.pager.shop.platform.response.FieldResponse; import quick.pager.shop.platform.response.FormResponse; -import quick.pager.shop.platform.service.FormService; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.impl.ServiceImpl; +import quick.pager.shop.service.FormService; +import quick.pager.shop.user.response.Response; import quick.pager.shop.utils.BeanCopier; import quick.pager.shop.utils.DateUtils; diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/impl/SMSServiceImpl.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/impl/SMSServiceImpl.java similarity index 91% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/impl/SMSServiceImpl.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/impl/SMSServiceImpl.java index f18f0e4..2549321 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/impl/SMSServiceImpl.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/impl/SMSServiceImpl.java @@ -1,4 +1,4 @@ -package quick.pager.shop.platform.service.impl; +package quick.pager.shop.service.impl; import cn.hutool.core.util.RandomUtil; import java.util.Objects; @@ -9,9 +9,9 @@ import quick.pager.shop.constants.ResponseStatus; import quick.pager.shop.platform.enums.SMSCodeEnums; import quick.pager.shop.platform.response.SMSTemplateResponse; -import quick.pager.shop.platform.service.SMSService; -import quick.pager.shop.platform.service.SMSTemplateService; -import quick.pager.shop.response.Response; +import quick.pager.shop.service.SMSService; +import quick.pager.shop.service.SMSTemplateService; +import quick.pager.shop.user.response.Response; /** * 短信 diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/impl/SMSTemplateServiceImpl.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/impl/SMSTemplateServiceImpl.java similarity index 92% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/impl/SMSTemplateServiceImpl.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/impl/SMSTemplateServiceImpl.java index 44bf03c..7c2b6bd 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/impl/SMSTemplateServiceImpl.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/impl/SMSTemplateServiceImpl.java @@ -1,4 +1,4 @@ -package quick.pager.shop.platform.service.impl; +package quick.pager.shop.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,14 +10,13 @@ import org.springframework.stereotype.Service; import quick.pager.shop.configuration.ShopRedisTemplate; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.platform.mapper.SMSTemplateMapper; -import quick.pager.shop.platform.model.SMSTemplate; +import quick.pager.shop.mapper.SMSTemplateMapper; +import quick.pager.shop.model.SMSTemplate; import quick.pager.shop.platform.request.sms.SMSTemplatePageRequest; import quick.pager.shop.platform.request.sms.SMSTemplateSaveRequest; import quick.pager.shop.platform.response.SMSTemplateResponse; -import quick.pager.shop.platform.service.SMSTemplateService; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.impl.ServiceImpl; +import quick.pager.shop.service.SMSTemplateService; +import quick.pager.shop.user.response.Response; import quick.pager.shop.utils.BeanCopier; import quick.pager.shop.utils.DateUtils; diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/impl/SystemConfigServiceImpl.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/impl/SystemConfigServiceImpl.java similarity index 89% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/impl/SystemConfigServiceImpl.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/impl/SystemConfigServiceImpl.java index 784313c..f21704f 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/service/impl/SystemConfigServiceImpl.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/service/impl/SystemConfigServiceImpl.java @@ -1,9 +1,9 @@ -package quick.pager.shop.platform.service.impl; +package quick.pager.shop.service.impl; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.collect.Maps; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -11,17 +11,16 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import quick.pager.shop.platform.dto.SystemConfigDTO; -import quick.pager.shop.platform.mapper.SystemConfigDetailMapper; -import quick.pager.shop.platform.mapper.SystemConfigMapper; -import quick.pager.shop.platform.model.SystemConfig; -import quick.pager.shop.platform.model.SystemConfigDetail; +import quick.pager.shop.mapper.SystemConfigDetailMapper; +import quick.pager.shop.mapper.SystemConfigMapper; +import quick.pager.shop.model.SystemConfig; +import quick.pager.shop.model.SystemConfigDetail; import quick.pager.shop.platform.request.SystemConfigOtherRequest; import quick.pager.shop.platform.request.SystemConfigPageRequest; import quick.pager.shop.platform.request.SystemConfigSaveRequest; -import quick.pager.shop.platform.service.SystemConfigService; -import quick.pager.shop.response.Response; +import quick.pager.shop.service.SystemConfigService; +import quick.pager.shop.user.response.Response; import quick.pager.shop.service.RedisService; -import quick.pager.shop.service.impl.ServiceImpl; import quick.pager.shop.utils.BeanCopier; import quick.pager.shop.utils.DateUtils; @@ -97,7 +96,7 @@ public void executeTask() { listMap.put(config.getConfigType(), dtos); } - listMap.forEach((k, v) -> redisService.set(k, JSON.toJSONString(v), 24 * 60 * 60L * 2)); + listMap.forEach((k, v) -> redisService.set(k, new ArrayList<>(v), 24 * 60 * 60L * 2)); } /** diff --git a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/task/RedisCacheTask.java b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/task/RedisCacheTask.java similarity index 85% rename from shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/task/RedisCacheTask.java rename to shop-platform/shop-platform-api/src/main/java/quick/pager/shop/task/RedisCacheTask.java index 336685e..3329665 100644 --- a/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/platform/task/RedisCacheTask.java +++ b/shop-platform/shop-platform-api/src/main/java/quick/pager/shop/task/RedisCacheTask.java @@ -1,10 +1,10 @@ -package quick.pager.shop.platform.task; +package quick.pager.shop.task; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import quick.pager.shop.platform.service.SystemConfigService; +import quick.pager.shop.service.SystemConfigService; /** * 定时更新配置缓存 diff --git a/shop-platform/shop-platform-api/src/main/resources/bootstrap-dev.yml b/shop-platform/shop-platform-api/src/main/resources/bootstrap-dev.yml index a3752ea..1b93098 100644 --- a/shop-platform/shop-platform-api/src/main/resources/bootstrap-dev.yml +++ b/shop-platform/shop-platform-api/src/main/resources/bootstrap-dev.yml @@ -3,5 +3,23 @@ spring: nacos: config: server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d discovery: server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d + sentinel: + enabled: true + transport: + dashboard: 127.0.0.1:8080 + filter: + enabled: true + +seata: + service: + vgroup-mapping: + shop-platform-seata-service-group: default + grouplist: + default: 101.132.121.178:8091 + disable-global-transaction: false diff --git a/shop-platform/shop-platform-api/src/main/resources/bootstrap.yml b/shop-platform/shop-platform-api/src/main/resources/bootstrap.yml index c37305d..fc4657a 100644 --- a/shop-platform/shop-platform-api/src/main/resources/bootstrap.yml +++ b/shop-platform/shop-platform-api/src/main/resources/bootstrap.yml @@ -4,31 +4,40 @@ server: spring: application: name: shop-platform + autoconfigure: + exclude: org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration main: allow-bean-definition-overriding: true profiles: active: dev - redis: - host: 101.132.121.178 - port: 6379 - password: abc+123 + +feign: + sentinel: + enabled: true + okhttp: + enabled: true + httpclient: + enabled: false shop: oauth: permissions: - /platform/sms/send + management: endpoints: web: exposure: - include: refresh,health,info, + include: refresh,health,info + mybatis-plus: - type-aliases-package: quick.pager.shop.platform.model + type-aliases-package: quick.pager.shop.model configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl global-config: db-config: id-type: auto + logging: level: com.alibaba.nacos: error diff --git a/shop-platform/shop-platform-client/pom.xml b/shop-platform/shop-platform-client/pom.xml index ec9ecc4..10d32d2 100644 --- a/shop-platform/shop-platform-client/pom.xml +++ b/shop-platform/shop-platform-client/pom.xml @@ -24,17 +24,9 @@ provided - - org.springframework.cloud - spring-cloud-starter-netflix-ribbon - 2.1.0.RELEASE - provided - - org.springframework.cloud spring-cloud-starter-openfeign - 2.1.0.RELEASE provided @@ -42,13 +34,6 @@ quick.pager shop-platform-model ${project.version} - provided - - - quick.pager - shop-common - ${project.version} - provided diff --git a/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/client/DynamicFormClient.java b/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/client/DynamicFormClient.java index 17f8452..60cbe37 100644 --- a/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/client/DynamicFormClient.java +++ b/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/client/DynamicFormClient.java @@ -10,7 +10,7 @@ import quick.pager.shop.platform.fallback.DynamicFormClientFallback; import quick.pager.shop.platform.request.DynamicFormSaveRequest; import quick.pager.shop.platform.response.DynamicFormResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * feignClient 对外服务 diff --git a/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/client/SMSTemplateClient.java b/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/client/SMSTemplateClient.java index e056652..861c937 100644 --- a/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/client/SMSTemplateClient.java +++ b/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/client/SMSTemplateClient.java @@ -12,7 +12,7 @@ import quick.pager.shop.platform.request.sms.SMSTemplatePageRequest; import quick.pager.shop.platform.request.sms.SMSTemplateSaveRequest; import quick.pager.shop.platform.response.SMSTemplateResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 短信模板对外开放接口 diff --git a/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/client/SystemConfigClient.java b/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/client/SystemConfigClient.java index e365f46..65223a7 100644 --- a/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/client/SystemConfigClient.java +++ b/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/client/SystemConfigClient.java @@ -11,7 +11,7 @@ import quick.pager.shop.platform.request.SystemConfigPageRequest; import quick.pager.shop.platform.request.SystemConfigSaveRequest; import quick.pager.shop.platform.response.SystemConfigResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 暴露服务系统配置 diff --git a/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/client/SystemConfigDetailClient.java b/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/client/SystemConfigDetailClient.java new file mode 100644 index 0000000..9d9542c --- /dev/null +++ b/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/client/SystemConfigDetailClient.java @@ -0,0 +1,28 @@ +package quick.pager.shop.platform.client; + +import java.util.List; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import quick.pager.shop.constants.ConstantsClient; +import quick.pager.shop.platform.fallback.SystemConfigClientFallback; +import quick.pager.shop.platform.request.SystemConfigDetailOtherRequest; +import quick.pager.shop.platform.response.SystemConfigDetailResponse; +import quick.pager.shop.user.response.Response; + +/** + * 配置详情 + * + * @author siguiyang + */ +@FeignClient(value = ConstantsClient.PLATFORM_CLIENT, path = ConstantsClient.PLATFORM, fallbackFactory = SystemConfigClientFallback.class) +public interface SystemConfigDetailClient { + + /** + * 获取配置明细列表 + * + * @param request 请求参数 + */ + @RequestMapping(value = "/config/detail/list", method = RequestMethod.GET) + Response> queryList(SystemConfigDetailOtherRequest request); +} diff --git a/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/fallback/DynamicFormClientFallback.java b/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/fallback/DynamicFormClientFallback.java index e2cf7d7..a42a543 100644 --- a/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/fallback/DynamicFormClientFallback.java +++ b/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/fallback/DynamicFormClientFallback.java @@ -8,7 +8,7 @@ import quick.pager.shop.platform.client.DynamicFormClient; import quick.pager.shop.platform.request.DynamicFormSaveRequest; import quick.pager.shop.platform.response.DynamicFormResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; @Component @Slf4j diff --git a/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/fallback/SystemConfigClientFallback.java b/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/fallback/SystemConfigClientFallback.java index fca5da3..c74ae84 100644 --- a/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/fallback/SystemConfigClientFallback.java +++ b/shop-platform/shop-platform-client/src/main/java/quick/pager/shop/platform/fallback/SystemConfigClientFallback.java @@ -10,7 +10,7 @@ import quick.pager.shop.platform.request.SystemConfigPageRequest; import quick.pager.shop.platform.request.SystemConfigSaveRequest; import quick.pager.shop.platform.response.SystemConfigResponse; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 系统配置熔断 diff --git a/shop-platform/shop-platform-model/pom.xml b/shop-platform/shop-platform-model/pom.xml index 920332f..bfa19ac 100644 --- a/shop-platform/shop-platform-model/pom.xml +++ b/shop-platform/shop-platform-model/pom.xml @@ -12,15 +12,44 @@ shop-platform-model - - org.projectlombok - lombok - - quick.pager shop-common ${project.version} + + + com.alibaba + easyexcel + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + UTF-8 + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + + jar + + + + + + diff --git a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/SystemConfigDetailOtherRequest.java b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/SystemConfigDetailOtherRequest.java index 34c66dc..242bcaf 100644 --- a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/SystemConfigDetailOtherRequest.java +++ b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/SystemConfigDetailOtherRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * SystemConfigDetailOtherRequest diff --git a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/SystemConfigDetailSaveRequest.java b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/SystemConfigDetailSaveRequest.java index 63193dd..e2a6d64 100644 --- a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/SystemConfigDetailSaveRequest.java +++ b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/SystemConfigDetailSaveRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * SystemConfigDetailSaveRequest diff --git a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/SystemConfigPageRequest.java b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/SystemConfigPageRequest.java index 83ae08e..e6eb833 100644 --- a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/SystemConfigPageRequest.java +++ b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/SystemConfigPageRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; /** * 系统配置Page diff --git a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/SystemConfigSaveRequest.java b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/SystemConfigSaveRequest.java index e92bbc3..f3c0278 100644 --- a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/SystemConfigSaveRequest.java +++ b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/SystemConfigSaveRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * 系统配置Request diff --git a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/form/FormOtherRequest.java b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/form/FormOtherRequest.java index 031f7aa..bc8009b 100644 --- a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/form/FormOtherRequest.java +++ b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/form/FormOtherRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * FormOtherRequest diff --git a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/form/FormPageRequest.java b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/form/FormPageRequest.java index 8d1fca6..cf37678 100644 --- a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/form/FormPageRequest.java +++ b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/form/FormPageRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; +import quick.pager.shop.user.request.PageRequest; /** * FormPageRequest diff --git a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/form/FormSaveRequest.java b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/form/FormSaveRequest.java index ff7f15d..d16508c 100644 --- a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/form/FormSaveRequest.java +++ b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/form/FormSaveRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * FormSaveRequest diff --git a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/sms/SMSRequest.java b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/sms/SMSRequest.java index 8cbc99a..54cc9b0 100644 --- a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/sms/SMSRequest.java +++ b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/sms/SMSRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * 短信发送请求 diff --git a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/sms/SMSTemplateOtherRequest.java b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/sms/SMSTemplateOtherRequest.java index 7004fa4..a233e76 100644 --- a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/sms/SMSTemplateOtherRequest.java +++ b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/sms/SMSTemplateOtherRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * 短信模板 OtherRequest diff --git a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/sms/SMSTemplatePageRequest.java b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/sms/SMSTemplatePageRequest.java index 93656ef..f4c7e81 100644 --- a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/sms/SMSTemplatePageRequest.java +++ b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/sms/SMSTemplatePageRequest.java @@ -2,8 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.PageRequest; /** * 短信模板 PageRequest diff --git a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/sms/SMSTemplateSaveRequest.java b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/sms/SMSTemplateSaveRequest.java index 11b0cf7..ccd2c85 100644 --- a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/sms/SMSTemplateSaveRequest.java +++ b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/request/sms/SMSTemplateSaveRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * 短信模板 SaveRequest diff --git a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/response/FieldResponse.java b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/response/FieldResponse.java index cb2db40..3a348f7 100644 --- a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/response/FieldResponse.java +++ b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/response/FieldResponse.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * @author siguiyang diff --git a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/response/FormResponse.java b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/response/FormResponse.java index 4f20eb3..ecc4019 100644 --- a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/response/FormResponse.java +++ b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/response/FormResponse.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * FormResponse diff --git a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/response/SystemConfigDetailResponse.java b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/response/SystemConfigDetailResponse.java index 3061e7f..f2df897 100644 --- a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/response/SystemConfigDetailResponse.java +++ b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/response/SystemConfigDetailResponse.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * 系统配置明细 diff --git a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/response/SystemConfigResponse.java b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/response/SystemConfigResponse.java index 36f8eb5..5dd8498 100644 --- a/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/response/SystemConfigResponse.java +++ b/shop-platform/shop-platform-model/src/main/java/quick/pager/shop/platform/response/SystemConfigResponse.java @@ -1,9 +1,8 @@ package quick.pager.shop.platform.response; -import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; +import quick.pager.shop.user.response.BasicResponse; /** * 系统配置 diff --git a/shop-risk/shop-risk-api/pom.xml b/shop-risk/shop-risk-api/pom.xml index 18a9123..b80984c 100644 --- a/shop-risk/shop-risk-api/pom.xml +++ b/shop-risk/shop-risk-api/pom.xml @@ -19,98 +19,81 @@ + - org.springframework.boot - spring-boot-starter-web + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config com.alibaba.cloud - spring-cloud-alibaba-nacos-config + spring-cloud-starter-alibaba-nacos-discovery com.alibaba.cloud - spring-cloud-alibaba-nacos-discovery + spring-cloud-starter-alibaba-seata com.alibaba.cloud spring-cloud-starter-alibaba-sentinel + - - org.springframework.boot - spring-boot-starter-actuator - - - - com.baomidou - mybatis-plus-boot-starter - - + org.springframework.cloud spring-cloud-starter-openfeign + + org.springframework.boot - spring-boot-starter-data-redis - - - - org.springframework.cloud - spring-cloud-starter-stream-kafka + spring-boot-starter-web - org.springframework.cloud - spring-cloud-starter-sleuth + org.springframework.boot + spring-boot-starter-data-redis - org.springframework.cloud - spring-cloud-sleuth-zipkin + org.springframework.boot + spring-boot-starter-actuator + + - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - 2.1.2.RELEASE + com.baomidou + mybatis-plus-boot-starter mysql mysql-connector-java + - - redis.clients - jedis - - + quick.pager - shop-auth-resource + shop-auth-feign ${project.version} - - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - - quick.pager - shop-risk-model + shop-auth-resource ${project.version} + quick.pager - shop-common + shop-risk-model ${project.version} @@ -121,7 +104,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.1.2.RELEASE + 2.2.9.RELEASE package diff --git a/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/RiskApplication.java b/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/RiskApplication.java new file mode 100644 index 0000000..1284559 --- /dev/null +++ b/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/RiskApplication.java @@ -0,0 +1,12 @@ +package quick.pager.shop; + +import org.springframework.boot.SpringApplication; +import org.springframework.cloud.client.SpringCloudApplication; + +@SpringCloudApplication +public class RiskApplication { + + public static void main(String[] args) { + SpringApplication.run(RiskApplication.class, args); + } +} diff --git a/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/controller/BlackListController.java b/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/controller/BlackListController.java similarity index 91% rename from shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/controller/BlackListController.java rename to shop-risk/shop-risk-api/src/main/java/quick/pager/shop/controller/BlackListController.java index 9553bdd..3ae830a 100644 --- a/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/controller/BlackListController.java +++ b/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/controller/BlackListController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.risk.controller; +package quick.pager.shop.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; @@ -9,10 +9,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.Constants; -import quick.pager.shop.response.Response; import quick.pager.shop.risk.request.BlackListPageRequest; import quick.pager.shop.risk.request.BlackListSaveRequest; -import quick.pager.shop.risk.service.BlackListService; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.BlackListService; /** diff --git a/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/controller/RiskController.java b/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/controller/RiskController.java similarity index 74% rename from shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/controller/RiskController.java rename to shop-risk/shop-risk-api/src/main/java/quick/pager/shop/controller/RiskController.java index f61be9e..73be29a 100644 --- a/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/controller/RiskController.java +++ b/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/controller/RiskController.java @@ -1,10 +1,9 @@ -package quick.pager.shop.risk.controller; +package quick.pager.shop.controller; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.Constants; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 风控管理 diff --git a/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/controller/RiskTestJobController.java b/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/controller/RiskTestJobController.java similarity index 95% rename from shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/controller/RiskTestJobController.java rename to shop-risk/shop-risk-api/src/main/java/quick/pager/shop/controller/RiskTestJobController.java index 61d9935..f4c86c2 100644 --- a/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/controller/RiskTestJobController.java +++ b/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/controller/RiskTestJobController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.risk.controller; +package quick.pager.shop.controller; import com.google.common.collect.ImmutableMap; import java.util.Map; diff --git a/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/mapper/BlackListMapper.java b/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/mapper/BlackListMapper.java similarity index 80% rename from shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/mapper/BlackListMapper.java rename to shop-risk/shop-risk-api/src/main/java/quick/pager/shop/mapper/BlackListMapper.java index ad684e0..d765755 100644 --- a/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/mapper/BlackListMapper.java +++ b/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/mapper/BlackListMapper.java @@ -1,9 +1,9 @@ -package quick.pager.shop.risk.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.risk.model.BlackList; +import quick.pager.shop.model.BlackList; /** * @author siguiyang diff --git a/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/mapper/package-info.java b/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/mapper/package-info.java new file mode 100644 index 0000000..130c589 --- /dev/null +++ b/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/mapper/package-info.java @@ -0,0 +1 @@ +package quick.pager.shop.mapper; diff --git a/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/model/BlackList.java b/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/model/BlackList.java similarity index 93% rename from shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/model/BlackList.java rename to shop-risk/shop-risk-api/src/main/java/quick/pager/shop/model/BlackList.java index 17f7f91..7f5fb58 100644 --- a/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/model/BlackList.java +++ b/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/model/BlackList.java @@ -1,4 +1,4 @@ -package quick.pager.shop.risk.model; +package quick.pager.shop.model; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/RiskApplication.java b/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/RiskApplication.java deleted file mode 100644 index 4cf4cf5..0000000 --- a/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/RiskApplication.java +++ /dev/null @@ -1,16 +0,0 @@ -package quick.pager.shop.risk; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; - -@SpringBootApplication(scanBasePackages = "quick.pager.shop") -@EnableDiscoveryClient -@EnableCircuitBreaker -public class RiskApplication { - - public static void main(String[] args) { - SpringApplication.run(RiskApplication.class, args); - } -} diff --git a/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/mapper/package-info.java b/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/mapper/package-info.java deleted file mode 100644 index 9eb5b51..0000000 --- a/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/mapper/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package quick.pager.shop.risk.mapper; diff --git a/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/service/BlackListService.java b/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/service/BlackListService.java similarity index 67% rename from shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/service/BlackListService.java rename to shop-risk/shop-risk-api/src/main/java/quick/pager/shop/service/BlackListService.java index d0d97df..aac09f4 100644 --- a/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/service/BlackListService.java +++ b/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/service/BlackListService.java @@ -1,6 +1,6 @@ -package quick.pager.shop.risk.service; +package quick.pager.shop.service; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * @author siguiyang diff --git a/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/service/impl/BlackListServiceImpl.java b/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/service/impl/BlackListServiceImpl.java similarity index 75% rename from shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/service/impl/BlackListServiceImpl.java rename to shop-risk/shop-risk-api/src/main/java/quick/pager/shop/service/impl/BlackListServiceImpl.java index 049dd7f..6ee9136 100644 --- a/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/risk/service/impl/BlackListServiceImpl.java +++ b/shop-risk/shop-risk-api/src/main/java/quick/pager/shop/service/impl/BlackListServiceImpl.java @@ -1,18 +1,12 @@ -package quick.pager.shop.risk.service.impl; +package quick.pager.shop.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; -import quick.pager.shop.constants.Constants; -import quick.pager.shop.response.Response; -import quick.pager.shop.risk.mapper.BlackListMapper; -import quick.pager.shop.risk.model.BlackList; -import quick.pager.shop.risk.service.BlackListService; -import quick.pager.shop.utils.DateUtils; +import quick.pager.shop.mapper.BlackListMapper; +import quick.pager.shop.model.BlackList; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.BlackListService; @Service @Slf4j diff --git a/shop-risk/shop-risk-api/src/main/resources/bootstrap-dev.yml b/shop-risk/shop-risk-api/src/main/resources/bootstrap-dev.yml index a3752ea..fc32e05 100644 --- a/shop-risk/shop-risk-api/src/main/resources/bootstrap-dev.yml +++ b/shop-risk/shop-risk-api/src/main/resources/bootstrap-dev.yml @@ -3,5 +3,39 @@ spring: nacos: config: server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d discovery: server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d + sentinel: + enabled: true + transport: + dashboard: 127.0.0.1:8080 + filter: + enabled: true + +seata: + service: + vgroup-mapping: + shop-risk-seata-service-group: default + grouplist: + default: 101.132.121.178:8091 + disable-global-transaction: false + + +# 内部服务调用授权认证配置 +security: + oauth2: + client: + clientId: client8 + clientSecret: 111111 + user-authorization-uri: http://localhost:8095/oauth/authorize + access-token-uri: http://localhost:8095/oauth/token + scope: app + resource: + id: shop-order + user-info-uri: http://shop-auth/oauth/principal + prefer-token-info: true + loadBalanced: true diff --git a/shop-risk/shop-risk-api/src/main/resources/bootstrap.yml b/shop-risk/shop-risk-api/src/main/resources/bootstrap.yml index 2d846fe..164a6c9 100644 --- a/shop-risk/shop-risk-api/src/main/resources/bootstrap.yml +++ b/shop-risk/shop-risk-api/src/main/resources/bootstrap.yml @@ -6,7 +6,8 @@ spring: name: shop-risk profiles: active: dev - + autoconfigure: + exclude: org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration feign: sentinel: enabled: true diff --git a/shop-risk/shop-risk-client/pom.xml b/shop-risk/shop-risk-client/pom.xml index 0ee32cc..8ed3d35 100644 --- a/shop-risk/shop-risk-client/pom.xml +++ b/shop-risk/shop-risk-client/pom.xml @@ -28,7 +28,6 @@ org.springframework.cloud spring-cloud-starter-netflix-ribbon - 2.1.0.RELEASE provided diff --git a/shop-risk/shop-risk-client/src/main/java/quick/pager/shop/risk/client/RiskClient.java b/shop-risk/shop-risk-client/src/main/java/quick/pager/shop/risk/client/RiskClient.java index f315f9a..15414ec 100644 --- a/shop-risk/shop-risk-client/src/main/java/quick/pager/shop/risk/client/RiskClient.java +++ b/shop-risk/shop-risk-client/src/main/java/quick/pager/shop/risk/client/RiskClient.java @@ -8,9 +8,9 @@ import org.springframework.web.bind.annotation.RequestBody; import quick.pager.shop.constants.ConstantsClient; import quick.pager.shop.risk.fallback.RiskClientFallbackFactory; -import quick.pager.shop.response.Response; import quick.pager.shop.risk.request.BlackListPageRequest; import quick.pager.shop.risk.request.BlackListSaveRequest; +import quick.pager.shop.user.response.Response; /** * 风控服务 diff --git a/shop-risk/shop-risk-client/src/main/java/quick/pager/shop/risk/fallback/RiskClientFallbackFactory.java b/shop-risk/shop-risk-client/src/main/java/quick/pager/shop/risk/fallback/RiskClientFallbackFactory.java index 0e1111b..4f4fa7e 100644 --- a/shop-risk/shop-risk-client/src/main/java/quick/pager/shop/risk/fallback/RiskClientFallbackFactory.java +++ b/shop-risk/shop-risk-client/src/main/java/quick/pager/shop/risk/fallback/RiskClientFallbackFactory.java @@ -2,10 +2,10 @@ import feign.hystrix.FallbackFactory; import org.springframework.stereotype.Component; +import quick.pager.shop.risk.request.BlackListPageRequest; import quick.pager.shop.risk.client.RiskClient; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.response.Response; -import quick.pager.shop.risk.request.BlackListPageRequest; +import quick.pager.shop.user.response.Response; import quick.pager.shop.risk.request.BlackListSaveRequest; /** diff --git a/shop-risk/shop-risk-client/src/main/java/quick/pager/shop/risk/package-info.java b/shop-risk/shop-risk-client/src/main/java/quick/pager/shop/risk/package-info.java deleted file mode 100644 index 06d785f..0000000 --- a/shop-risk/shop-risk-client/src/main/java/quick/pager/shop/risk/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package quick.pager.shop.risk; diff --git a/shop-risk/shop-risk-client/src/main/java/quick/pager/shop/risk/request/BlackListPageRequest.java b/shop-risk/shop-risk-client/src/main/java/quick/pager/shop/risk/request/BlackListPageRequest.java index 653da7b..cba3ef3 100644 --- a/shop-risk/shop-risk-client/src/main/java/quick/pager/shop/risk/request/BlackListPageRequest.java +++ b/shop-risk/shop-risk-client/src/main/java/quick/pager/shop/risk/request/BlackListPageRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * 黑名单SaveRequest diff --git a/shop-risk/shop-risk-client/src/main/java/quick/pager/shop/risk/request/BlackListSaveRequest.java b/shop-risk/shop-risk-client/src/main/java/quick/pager/shop/risk/request/BlackListSaveRequest.java index 24e813f..28a5a30 100644 --- a/shop-risk/shop-risk-client/src/main/java/quick/pager/shop/risk/request/BlackListSaveRequest.java +++ b/shop-risk/shop-risk-client/src/main/java/quick/pager/shop/risk/request/BlackListSaveRequest.java @@ -2,7 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.Request; +import quick.pager.shop.user.request.Request; /** * 黑名单SaveRequest diff --git a/shop-risk/shop-risk-model/pom.xml b/shop-risk/shop-risk-model/pom.xml index 124b7f9..ccb0b42 100644 --- a/shop-risk/shop-risk-model/pom.xml +++ b/shop-risk/shop-risk-model/pom.xml @@ -12,16 +12,45 @@ shop-risk-model - - org.projectlombok - lombok - - quick.pager shop-common ${project.version} + + + com.alibaba + easyexcel + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + UTF-8 + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + + jar + + + + + + + diff --git a/shop-risk/shop-risk-model/src/main/java/quick/pager/shop/risk/package-info.java b/shop-risk/shop-risk-model/src/main/java/quick/pager/shop/risk/package-info.java deleted file mode 100644 index 06d785f..0000000 --- a/shop-risk/shop-risk-model/src/main/java/quick/pager/shop/risk/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package quick.pager.shop.risk; diff --git a/shop-risk/shop-risk-model/src/main/java/quick/pager/shop/risk/response/RiskResponse.java b/shop-risk/shop-risk-model/src/main/java/quick/pager/shop/risk/response/RiskResponse.java new file mode 100644 index 0000000..85d3e37 --- /dev/null +++ b/shop-risk/shop-risk-model/src/main/java/quick/pager/shop/risk/response/RiskResponse.java @@ -0,0 +1,4 @@ +package quick.pager.shop.risk.response; + +public class RiskResponse { +} diff --git a/shop-seller/shop-seller-api/pom.xml b/shop-seller/shop-seller-api/pom.xml index 14169a9..5e38244 100644 --- a/shop-seller/shop-seller-api/pom.xml +++ b/shop-seller/shop-seller-api/pom.xml @@ -19,154 +19,83 @@ + - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-aop - - - - cglib - cglib + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config com.alibaba.cloud - spring-cloud-alibaba-nacos-config + spring-cloud-starter-alibaba-nacos-discovery com.alibaba.cloud - spring-cloud-alibaba-nacos-discovery + spring-cloud-starter-alibaba-seata com.alibaba.cloud spring-cloud-starter-alibaba-sentinel + - - org.springframework.boot - spring-boot-starter-actuator - - - - com.baomidou - mybatis-plus-boot-starter - - + org.springframework.cloud spring-cloud-starter-openfeign + + org.springframework.boot - spring-boot-starter-data-redis - - - - org.springframework.cloud - spring-cloud-starter-stream-kafka - - - - org.springframework.cloud - spring-cloud-starter-sleuth - - - - org.springframework.cloud - spring-cloud-sleuth-zipkin - - - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - 2.1.2.RELEASE + spring-boot-starter-web - redis.clients - jedis + org.springframework.boot + spring-boot-starter-data-redis - com.alibaba.cloud - spring-cloud-starter-alibaba-seata - - - io.seata - seata-spring - - - com.ctrip.framework.apollo - apollo-client - - - com.ctrip.framework.apollo - apollo-core - - - com.ecwid.consul - consul-api - - + org.springframework.boot + spring-boot-starter-actuator + + - io.seata - seata-spring - ${seata.version} - - - cglib - cglib - - - com.alibaba - fastjson - - + com.baomidou + mybatis-plus-boot-starter - org.springframework.boot - spring-boot-starter-test - test + mysql + mysql-connector-java + + quick.pager - shop-auth-resource + shop-auth-feign ${project.version} - - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - - quick.pager - shop-seller-model + shop-auth-resource ${project.version} + quick.pager - shop-common + shop-seller-model ${project.version} - - - mysql - mysql-connector-java - @@ -196,7 +125,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.1.2.RELEASE + 2.2.9.RELEASE package diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/SellerApplication.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/SellerApplication.java similarity index 51% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/SellerApplication.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/SellerApplication.java index 4c0981c..d827295 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/SellerApplication.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/SellerApplication.java @@ -1,9 +1,7 @@ -package quick.pager.shop.seller; +package quick.pager.shop; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.client.SpringCloudApplication; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.EnableAspectJAutoProxy; @@ -11,10 +9,8 @@ * @author siguiyang */ -@SpringBootApplication(scanBasePackages = "quick.pager.shop") -@EnableDiscoveryClient -@EnableCircuitBreaker -@EnableFeignClients("quick.pager.shop") +@SpringCloudApplication +@EnableFeignClients @EnableAspectJAutoProxy(proxyTargetClass = true) public class SellerApplication { diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/aop/OperationLogAspect.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/aop/OperationLogAspect.java similarity index 93% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/aop/OperationLogAspect.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/aop/OperationLogAspect.java index f2c204f..f625e07 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/aop/OperationLogAspect.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/aop/OperationLogAspect.java @@ -1,4 +1,4 @@ -package quick.pager.shop.seller.aop; +package quick.pager.shop.aop; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; @@ -6,7 +6,7 @@ import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.springframework.stereotype.Component; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * Service 层请求日志拦截
diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/controller/SellerAccountController.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/controller/SellerAccountController.java similarity index 68% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/controller/SellerAccountController.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/controller/SellerAccountController.java index a0f40ae..be4b1b3 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/controller/SellerAccountController.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/controller/SellerAccountController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.seller.controller; +package quick.pager.shop.controller; /** * 商家财务账本 diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/controller/SellerController.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/controller/SellerController.java similarity index 79% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/controller/SellerController.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/controller/SellerController.java index d140bad..9e079a1 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/controller/SellerController.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/controller/SellerController.java @@ -1,14 +1,14 @@ -package quick.pager.shop.seller.controller; +package quick.pager.shop.controller; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.Constants; -import quick.pager.shop.seller.model.SellerInfo; -import quick.pager.shop.response.Response; -import quick.pager.shop.seller.param.SellerLoginParam; -import quick.pager.shop.seller.param.SellerSubscribeParam; +import quick.pager.shop.model.SellerInfo; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.param.SellerLoginParam; +import quick.pager.shop.param.SellerSubscribeParam; /** * 商家服务 diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/controller/SellerGoodsController.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/controller/SellerGoodsController.java similarity index 85% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/controller/SellerGoodsController.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/controller/SellerGoodsController.java index ed1177a..16fb591 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/controller/SellerGoodsController.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/controller/SellerGoodsController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.seller.controller; +package quick.pager.shop.controller; /** * 商户申请添加新商品
diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/controller/SellerOrderController.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/controller/SellerOrderController.java similarity index 66% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/controller/SellerOrderController.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/controller/SellerOrderController.java index 02a2ce2..bb93726 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/controller/SellerOrderController.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/controller/SellerOrderController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.seller.controller; +package quick.pager.shop.controller; /** * 商家订单 diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/controller/SellerShipController.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/controller/SellerShipController.java similarity index 66% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/controller/SellerShipController.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/controller/SellerShipController.java index 703ef1f..1cf8d1a 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/controller/SellerShipController.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/controller/SellerShipController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.seller.controller; +package quick.pager.shop.controller; /** * 商家配送 diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/mapper/SellerInfoMapper.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/mapper/SellerInfoMapper.java similarity index 73% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/mapper/SellerInfoMapper.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/mapper/SellerInfoMapper.java index 29e6e1b..219c0c0 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/mapper/SellerInfoMapper.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/mapper/SellerInfoMapper.java @@ -1,7 +1,7 @@ -package quick.pager.shop.seller.mapper; +package quick.pager.shop.mapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.seller.model.SellerInfo; +import quick.pager.shop.model.SellerInfo; @Mapper public interface SellerInfoMapper { diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/mapper/SellerInfoMapper.xml b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/mapper/SellerInfoMapper.xml similarity index 95% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/mapper/SellerInfoMapper.xml rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/mapper/SellerInfoMapper.xml index 892a35e..88fdc6e 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/mapper/SellerInfoMapper.xml +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/mapper/SellerInfoMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -24,7 +24,7 @@ where id = #{id,jdbcType=BIGINT} - + insert into t_seller_info @@ -91,7 +91,7 @@ - + update t_seller_info diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/mapper/SellerMapper.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/mapper/SellerMapper.java similarity index 72% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/mapper/SellerMapper.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/mapper/SellerMapper.java index 2ee0a3b..27213bc 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/mapper/SellerMapper.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/mapper/SellerMapper.java @@ -1,7 +1,7 @@ -package quick.pager.shop.seller.mapper; +package quick.pager.shop.mapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.seller.model.Seller; +import quick.pager.shop.model.Seller; @Mapper public interface SellerMapper { diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/mapper/SellerMapper.xml b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/mapper/SellerMapper.xml similarity index 93% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/mapper/SellerMapper.xml rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/mapper/SellerMapper.xml index e347950..9403114 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/mapper/SellerMapper.xml +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/mapper/SellerMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -19,7 +19,7 @@ where id = #{id,jdbcType=BIGINT} - + insert into t_seller @@ -62,7 +62,7 @@ - + update t_seller diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/model/Seller.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/model/Seller.java similarity index 85% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/model/Seller.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/model/Seller.java index ed0d719..3476bfb 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/model/Seller.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/model/Seller.java @@ -1,8 +1,7 @@ -package quick.pager.shop.seller.model; +package quick.pager.shop.model; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.model.Model; /** * 商户 diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/model/SellerInfo.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/model/SellerInfo.java similarity index 83% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/model/SellerInfo.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/model/SellerInfo.java index 1e3536a..bc1c5a0 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/model/SellerInfo.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/model/SellerInfo.java @@ -1,8 +1,7 @@ -package quick.pager.shop.seller.model; +package quick.pager.shop.model; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.model.Model; @EqualsAndHashCode(callSuper = true) @Data diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/param/SellerLoginParam.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/param/SellerLoginParam.java similarity index 87% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/param/SellerLoginParam.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/param/SellerLoginParam.java index 63456a1..2836951 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/param/SellerLoginParam.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/param/SellerLoginParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.seller.param; +package quick.pager.shop.param; import java.io.Serializable; import lombok.Data; diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/param/SellerSubscribeParam.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/param/SellerSubscribeParam.java similarity index 74% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/param/SellerSubscribeParam.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/param/SellerSubscribeParam.java index 7172eb4..40b1612 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/param/SellerSubscribeParam.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/param/SellerSubscribeParam.java @@ -1,8 +1,7 @@ -package quick.pager.shop.seller.param; +package quick.pager.shop.param; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.param.Param; @EqualsAndHashCode(callSuper = true) @Data diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/response/LoginOrSubscribeResponse.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/response/LoginOrSubscribeResponse.java similarity index 90% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/response/LoginOrSubscribeResponse.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/response/LoginOrSubscribeResponse.java index 52a5b91..2c3789b 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/response/LoginOrSubscribeResponse.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/response/LoginOrSubscribeResponse.java @@ -1,4 +1,4 @@ -package quick.pager.shop.seller.response; +package quick.pager.shop.response; import java.io.Serializable; import lombok.Data; diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/response/MessageResponse.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/response/MessageResponse.java similarity index 81% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/response/MessageResponse.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/response/MessageResponse.java index ee606c1..011df14 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/response/MessageResponse.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/response/MessageResponse.java @@ -1,4 +1,4 @@ -package quick.pager.shop.seller.response; +package quick.pager.shop.response; import java.io.Serializable; import lombok.Data; diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/response/SellerResponse.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/response/SellerResponse.java similarity index 81% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/response/SellerResponse.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/response/SellerResponse.java index 9787367..9b57c32 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/response/SellerResponse.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/response/SellerResponse.java @@ -1,4 +1,4 @@ -package quick.pager.shop.seller.response; +package quick.pager.shop.response; import java.io.Serializable; import lombok.Data; diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/response/UserInfoResponse.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/response/UserInfoResponse.java similarity index 92% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/response/UserInfoResponse.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/response/UserInfoResponse.java index 493adc3..657bf52 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/response/UserInfoResponse.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/response/UserInfoResponse.java @@ -1,4 +1,4 @@ -package quick.pager.shop.seller.response; +package quick.pager.shop.response; import java.io.Serializable; import java.util.Date; diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/SellerShipService.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/SellerShipService.java deleted file mode 100644 index e27b384..0000000 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/SellerShipService.java +++ /dev/null @@ -1,4 +0,0 @@ -package quick.pager.shop.seller.service; - -public interface SellerShipService { -} diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/SellerAccountService.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/SellerAccountService.java similarity index 51% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/SellerAccountService.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/SellerAccountService.java index f224049..a2581fc 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/SellerAccountService.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/SellerAccountService.java @@ -1,4 +1,4 @@ -package quick.pager.shop.seller.service; +package quick.pager.shop.service; public interface SellerAccountService { } diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/SellerGoodsService.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/SellerGoodsService.java similarity index 50% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/SellerGoodsService.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/SellerGoodsService.java index 93f2151..b7c0b8f 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/SellerGoodsService.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/SellerGoodsService.java @@ -1,4 +1,4 @@ -package quick.pager.shop.seller.service; +package quick.pager.shop.service; public interface SellerGoodsService { } diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/SellerLoginService.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/SellerLoginService.java similarity index 70% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/SellerLoginService.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/SellerLoginService.java index 938e9d0..3b45121 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/SellerLoginService.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/SellerLoginService.java @@ -1,4 +1,4 @@ -package quick.pager.shop.seller.service; +package quick.pager.shop.service; /** diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/SellerOrderService.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/SellerOrderService.java similarity index 50% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/SellerOrderService.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/SellerOrderService.java index 2c13ff0..73d1782 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/SellerOrderService.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/SellerOrderService.java @@ -1,4 +1,4 @@ -package quick.pager.shop.seller.service; +package quick.pager.shop.service; public interface SellerOrderService { } diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/SellerService.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/SellerService.java similarity index 75% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/SellerService.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/SellerService.java index 4a2aa80..bb36443 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/SellerService.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/SellerService.java @@ -1,7 +1,7 @@ -package quick.pager.shop.seller.service; +package quick.pager.shop.service; -import quick.pager.shop.response.Response; -import quick.pager.shop.seller.param.SellerSubscribeParam; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.param.SellerSubscribeParam; /** * 商户 diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/SellerShipService.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/SellerShipService.java new file mode 100644 index 0000000..7b16e8d --- /dev/null +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/SellerShipService.java @@ -0,0 +1,4 @@ +package quick.pager.shop.service; + +public interface SellerShipService { +} diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/SellerSubscribeService.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/SellerSubscribeService.java similarity index 70% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/SellerSubscribeService.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/SellerSubscribeService.java index cebb48c..ec91989 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/SellerSubscribeService.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/SellerSubscribeService.java @@ -1,4 +1,4 @@ -package quick.pager.shop.seller.service; +package quick.pager.shop.service; /** * 商户开户服务 diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/impl/SellerLoginServiceImpl.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/impl/SellerLoginServiceImpl.java similarity index 54% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/impl/SellerLoginServiceImpl.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/impl/SellerLoginServiceImpl.java index dd6c2a7..15c0fe1 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/impl/SellerLoginServiceImpl.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/impl/SellerLoginServiceImpl.java @@ -1,7 +1,7 @@ -package quick.pager.shop.seller.service.impl; +package quick.pager.shop.service.impl; import org.springframework.stereotype.Service; -import quick.pager.shop.seller.service.SellerLoginService; +import quick.pager.shop.service.SellerLoginService; @Service public class SellerLoginServiceImpl implements SellerLoginService { diff --git a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/impl/SellerSubscribeServiceImpl.java b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/impl/SellerSubscribeServiceImpl.java similarity index 55% rename from shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/impl/SellerSubscribeServiceImpl.java rename to shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/impl/SellerSubscribeServiceImpl.java index 5cd43cc..2f170f6 100644 --- a/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/seller/service/impl/SellerSubscribeServiceImpl.java +++ b/shop-seller/shop-seller-api/src/main/java/quick/pager/shop/service/impl/SellerSubscribeServiceImpl.java @@ -1,7 +1,7 @@ -package quick.pager.shop.seller.service.impl; +package quick.pager.shop.service.impl; import org.springframework.stereotype.Service; -import quick.pager.shop.seller.service.SellerSubscribeService; +import quick.pager.shop.service.SellerSubscribeService; @Service public class SellerSubscribeServiceImpl implements SellerSubscribeService { diff --git a/shop-seller/shop-seller-api/src/main/resources/bootstrap-dev.yml b/shop-seller/shop-seller-api/src/main/resources/bootstrap-dev.yml index 4004436..c7657ad 100644 --- a/shop-seller/shop-seller-api/src/main/resources/bootstrap-dev.yml +++ b/shop-seller/shop-seller-api/src/main/resources/bootstrap-dev.yml @@ -2,9 +2,27 @@ spring: cloud: nacos: config: - server-addr: 127.0.0.1:8848 + server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d discovery: - server-addr: 127.0.0.1:8848 + server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d + sentinel: + enabled: true + transport: + dashboard: 127.0.0.1:8080 + filter: + enabled: true + +seata: + service: + vgroup-mapping: + shop-seller-seata-service-group: default + grouplist: + default: 101.132.121.178:8091 + disable-global-transaction: false # 内部服务调用授权认证配置 security: diff --git a/shop-seller/shop-seller-api/src/main/resources/bootstrap.yml b/shop-seller/shop-seller-api/src/main/resources/bootstrap.yml index 6436a0f..d02c038 100644 --- a/shop-seller/shop-seller-api/src/main/resources/bootstrap.yml +++ b/shop-seller/shop-seller-api/src/main/resources/bootstrap.yml @@ -7,7 +7,8 @@ spring: profiles: active: dev - + autoconfigure: + exclude: org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration feign: sentinel: enabled: true @@ -21,9 +22,9 @@ management: exposure: include: refresh,health,info,hystrix.stream mybatis-plus: - type-aliases-package: quick.pager.shop.seller.model + type-aliases-package: quick.pager.shop.model global-config: db-config: id-type: auto logging: - config: classpath:logback.xml + config: classpath:logback-spring.xml diff --git a/shop-seller/shop-seller-api/src/main/resources/logback.xml b/shop-seller/shop-seller-api/src/main/resources/logback-spring.xml similarity index 100% rename from shop-seller/shop-seller-api/src/main/resources/logback.xml rename to shop-seller/shop-seller-api/src/main/resources/logback-spring.xml diff --git a/shop-seller/shop-seller-client/pom.xml b/shop-seller/shop-seller-client/pom.xml index c42be0d..e70eae1 100644 --- a/shop-seller/shop-seller-client/pom.xml +++ b/shop-seller/shop-seller-client/pom.xml @@ -24,25 +24,16 @@ provided - - org.springframework.cloud - spring-cloud-starter-netflix-ribbon - 2.1.0.RELEASE - provided - - org.springframework.cloud spring-cloud-starter-openfeign - 2.1.0.RELEASE provided quick.pager - shop-common + shop-seller-model ${project.version} - provided diff --git a/shop-seller/shop-seller-client/src/main/java/quick/pager/shop/response/SellerInfoResponse.java b/shop-seller/shop-seller-client/src/main/java/quick/pager/shop/response/SellerInfoResponse.java new file mode 100644 index 0000000..edd803a --- /dev/null +++ b/shop-seller/shop-seller-client/src/main/java/quick/pager/shop/response/SellerInfoResponse.java @@ -0,0 +1,32 @@ +package quick.pager.shop.response; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import quick.pager.shop.user.response.BasicResponse; + +/** + * 商户详情 + * + * @author siguiyang + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class SellerInfoResponse extends BasicResponse { + private static final long serialVersionUID = 4463151693132197632L; + + private Long id; + + private String phone; + + private String sellerName; + + private String address; + + private Integer sellerStatus; + + private String logo; + + private String longitude; + + private String latitude; +} diff --git a/shop-seller/shop-seller-client/src/main/java/quick/pager/shop/seller/client/SellerClient.java b/shop-seller/shop-seller-client/src/main/java/quick/pager/shop/seller/client/SellerClient.java index d9ddb9c..64f5981 100644 --- a/shop-seller/shop-seller-client/src/main/java/quick/pager/shop/seller/client/SellerClient.java +++ b/shop-seller/shop-seller-client/src/main/java/quick/pager/shop/seller/client/SellerClient.java @@ -6,8 +6,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import quick.pager.shop.constants.ConstantsClient; import quick.pager.shop.seller.fallback.SellerFallbackFactory; -import quick.pager.shop.response.Response; -import quick.pager.shop.seller.response.SellerInfoResponse; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.response.SellerInfoResponse; /** * 商家服务 diff --git a/shop-seller/shop-seller-client/src/main/java/quick/pager/shop/seller/fallback/SellerFallbackFactory.java b/shop-seller/shop-seller-client/src/main/java/quick/pager/shop/seller/fallback/SellerFallbackFactory.java index 6c616f7..da2d67a 100644 --- a/shop-seller/shop-seller-client/src/main/java/quick/pager/shop/seller/fallback/SellerFallbackFactory.java +++ b/shop-seller/shop-seller-client/src/main/java/quick/pager/shop/seller/fallback/SellerFallbackFactory.java @@ -4,9 +4,9 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; import quick.pager.shop.seller.client.SellerClient; -import quick.pager.shop.seller.response.SellerInfoResponse; +import quick.pager.shop.response.SellerInfoResponse; @Slf4j @Component diff --git a/shop-seller/shop-seller-client/src/main/java/quick/pager/shop/seller/response/SellerInfoResponse.java b/shop-seller/shop-seller-client/src/main/java/quick/pager/shop/seller/response/SellerInfoResponse.java deleted file mode 100644 index b5ff81c..0000000 --- a/shop-seller/shop-seller-client/src/main/java/quick/pager/shop/seller/response/SellerInfoResponse.java +++ /dev/null @@ -1,4 +0,0 @@ -package quick.pager.shop.seller.response; - -public class SellerInfoResponse { -} diff --git a/shop-seller/shop-seller-model/pom.xml b/shop-seller/shop-seller-model/pom.xml index d819ba2..3738947 100644 --- a/shop-seller/shop-seller-model/pom.xml +++ b/shop-seller/shop-seller-model/pom.xml @@ -12,15 +12,44 @@ shop-seller-model - - org.projectlombok - lombok - - quick.pager shop-common ${project.version} + + + com.alibaba + easyexcel + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + UTF-8 + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + + jar + + + + + + diff --git a/shop-settlement/pom.xml b/shop-settlement/pom.xml index 3dd871a..acf0598 100644 --- a/shop-settlement/pom.xml +++ b/shop-settlement/pom.xml @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - shop-settlement-client shop-settlement-api + shop-settlement-client shop-settlement-model diff --git a/shop-settlement/shop-settlement-api/pom.xml b/shop-settlement/shop-settlement-api/pom.xml index 81afbf3..036e80d 100644 --- a/shop-settlement/shop-settlement-api/pom.xml +++ b/shop-settlement/shop-settlement-api/pom.xml @@ -18,118 +18,145 @@ + - org.springframework.boot - spring-boot-starter-web + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config com.alibaba.cloud - spring-cloud-alibaba-nacos-config + spring-cloud-starter-alibaba-nacos-discovery com.alibaba.cloud - spring-cloud-alibaba-nacos-discovery + spring-cloud-starter-alibaba-seata com.alibaba.cloud spring-cloud-starter-alibaba-sentinel + - - org.springframework.boot - spring-boot-starter-actuator - - - - com.baomidou - mybatis-plus-boot-starter - - + org.springframework.cloud spring-cloud-starter-openfeign + + org.springframework.boot - spring-boot-starter-data-redis - - - - org.springframework.cloud - spring-cloud-starter-stream-kafka + spring-boot-starter-web - org.springframework.cloud - spring-cloud-starter-sleuth + org.springframework.boot + spring-boot-starter-data-redis - org.springframework.cloud - spring-cloud-sleuth-zipkin + org.springframework.boot + spring-boot-starter-actuator + + - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - 2.1.2.RELEASE + quick.pager + shop-auth-feign + ${project.version} + + + quick.pager + shop-common + + - mysql - mysql-connector-java + quick.pager + shop-auth-resource + ${project.version} + + + quick.pager + shop-common + + + - redis.clients - jedis + quick.pager + shop-settlement-model + ${project.version} + + + quick.pager + shop-common + + - - org.springframework.boot - spring-boot-starter-test - test + quick.pager + shop-goods-client + ${project.version} + + + quick.pager + shop-common + + - quick.pager - shop-auth-resource + shop-order-client ${project.version} - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure + quick.pager + shop-common quick.pager - shop-auth-feign + shop-platform-client ${project.version} - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure + quick.pager + shop-common - quick.pager - shop-common + shop-user-client ${project.version} + + + quick.pager + shop-common + + quick.pager - shop-settlement-model + shop-common ${project.version} + + + com.alibaba + druid-spring-boot-starter + + - @@ -137,7 +164,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.1.2.RELEASE + 2.2.9.RELEASE package diff --git a/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/SettlementApplication.java b/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/SettlementApplication.java new file mode 100644 index 0000000..dfee90a --- /dev/null +++ b/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/SettlementApplication.java @@ -0,0 +1,18 @@ +package quick.pager.shop; + +import org.springframework.boot.SpringApplication; +import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * @author siguiyang + */ +@SpringCloudApplication +@EnableFeignClients +public class SettlementApplication { + + public static void main(String[] args) { + SpringApplication.run(SettlementApplication.class, args); + } +} + diff --git a/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/cart/SettlementApplication.java b/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/cart/SettlementApplication.java deleted file mode 100644 index 13c5c14..0000000 --- a/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/cart/SettlementApplication.java +++ /dev/null @@ -1,22 +0,0 @@ -package quick.pager.shop.cart; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.openfeign.EnableFeignClients; - -/** - * @author siguiyang - */ -@SpringBootApplication(scanBasePackages = "quick.pager.shop") -@EnableDiscoveryClient -@EnableCircuitBreaker -@EnableFeignClients("quick.pager.shop") -public class SettlementApplication { - - public static void main(String[] args) { - SpringApplication.run(SettlementApplication.class, args); - } -} - diff --git a/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/cart/controller/SettlementController.java b/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/cart/controller/SettlementController.java deleted file mode 100644 index 47ca2df..0000000 --- a/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/cart/controller/SettlementController.java +++ /dev/null @@ -1,9 +0,0 @@ -package quick.pager.shop.cart.controller; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping -public class SettlementController { -} diff --git a/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/cart/service/package-info.java b/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/cart/service/package-info.java deleted file mode 100644 index 7d4fc31..0000000 --- a/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/cart/service/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package quick.pager.shop.cart.service; diff --git a/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/controller/SettlementController.java b/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/controller/SettlementController.java new file mode 100644 index 0000000..83d3581 --- /dev/null +++ b/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/controller/SettlementController.java @@ -0,0 +1,58 @@ +package quick.pager.shop.controller; + +import java.util.Objects; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import quick.pager.shop.param.SettlementParam; +import quick.pager.shop.service.SettlementOrderService; +import quick.pager.shop.constants.ConstantsClient; +import quick.pager.shop.constants.ResponseStatus; +import quick.pager.shop.user.response.Response; + +/** + * 清结算生成订单 + * + * @author siguiyang + */ +@RestController +@RequestMapping(ConstantsClient.SETTLEMENT) +public class SettlementController { + + @Autowired + private SettlementOrderService settlementOrderService; + + /** + * 验证结算数据是否正确 + * + * @param param 请求参数 + * @return 返回响应消息 + */ + @PostMapping("check") + public Response check(@RequestBody SettlementParam param) { + if (Objects.isNull(param.getShipId())) { + return new Response<>(ResponseStatus.Code.FAIL_CODE, "请先完善配送地址"); + } + if (CollectionUtils.isEmpty(param.getGoodsCart())) { + return new Response<>(ResponseStatus.Code.FAIL_CODE, ResponseStatus.TELNET_EXCEPTION); + } + return settlementOrderService.check(param); + } + + /** + * 生成订单 + * + * @param param 请求参数 + * @return 返回响应消息 + */ + @PostMapping("create") + public Response create(@RequestBody SettlementParam param) { + if (CollectionUtils.isEmpty(param.getGoodsCart())) { + return new Response<>(ResponseStatus.Code.FAIL_CODE, ResponseStatus.TELNET_EXCEPTION); + } + return settlementOrderService.createOrder(param); + } +} diff --git a/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/param/GoodsCartParam.java b/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/param/GoodsCartParam.java new file mode 100644 index 0000000..cef8ab5 --- /dev/null +++ b/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/param/GoodsCartParam.java @@ -0,0 +1,29 @@ +package quick.pager.shop.param; + +import java.util.List; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 购物车商品明细 + * + * @author siguiyang + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class GoodsCartParam extends Param { + private static final long serialVersionUID = -9118054142979867878L; + + /** + * 购买商品的所属商户主键 + */ + private Long sellerId; + /** + * 优惠券主键 + */ + private Long couponId; + /** + * 商品明细 + */ + private List goods; +} diff --git a/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/param/GoodsParam.java b/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/param/GoodsParam.java new file mode 100644 index 0000000..7740682 --- /dev/null +++ b/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/param/GoodsParam.java @@ -0,0 +1,29 @@ +package quick.pager.shop.param; + +import java.math.BigDecimal; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 购物车商品明细 + * + * @author siguiyang + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class GoodsParam extends Param { + private static final long serialVersionUID = 1012530220733336415L; + + /** + * 购买商品主键 + */ + private Long goodsId; + /** + * 购买商品数量 + */ + private Integer purchaseQuantity; + /** + * 购买商品价格 + */ + private BigDecimal goodsAmount; +} diff --git a/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/param/SettlementParam.java b/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/param/SettlementParam.java new file mode 100644 index 0000000..41f86f2 --- /dev/null +++ b/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/param/SettlementParam.java @@ -0,0 +1,38 @@ +package quick.pager.shop.param; + +import java.math.BigDecimal; +import java.util.List; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 清结算 + * + * @author siguiyang + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class SettlementParam extends Param { + private static final long serialVersionUID = 3785254179117618026L; + + /** + * 当前用户主键 + */ + private Long userId; + /** + * 配送地址主键 + */ + private Long shipId; + /** + * 支付金额 + */ + private BigDecimal payAmount; + /** + * 使用积分 + */ + private Integer integral; + /** + * 提交购物车商品明细 + */ + private List goodsCart; +} diff --git a/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/service/SettlementOrderService.java b/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/service/SettlementOrderService.java new file mode 100644 index 0000000..34e8f36 --- /dev/null +++ b/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/service/SettlementOrderService.java @@ -0,0 +1,28 @@ +package quick.pager.shop.service; + +import quick.pager.shop.param.SettlementParam; +import quick.pager.shop.user.response.Response; + +/** + * 订单清结算 + * + * @author siguiyang + */ +public interface SettlementOrderService { + + /** + * 验证结算数据是否正确 + * + * @param param 请求参数 + * @return 返回响应消息 + */ + Response check(final SettlementParam param); + + /** + * 清结算生产订单 + * + * @param param 业务处理参数 + * @return 返回响应消息 + */ + Response createOrder(final SettlementParam param); +} diff --git a/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/service/impl/SettlementOrderServiceImpl.java b/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/service/impl/SettlementOrderServiceImpl.java new file mode 100644 index 0000000..a7f02d8 --- /dev/null +++ b/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/service/impl/SettlementOrderServiceImpl.java @@ -0,0 +1,123 @@ +package quick.pager.shop.service.impl; + +import io.seata.spring.annotation.GlobalTransactional; +import java.math.BigDecimal; +import java.util.List; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import quick.pager.shop.param.GoodsCartParam; +import quick.pager.shop.param.GoodsParam; +import quick.pager.shop.param.SettlementParam; +import quick.pager.shop.service.SettlementOrderService; +import quick.pager.shop.constants.IConsts; +import quick.pager.shop.constants.ResponseStatus; +import quick.pager.shop.constants.SConsts; +import quick.pager.shop.goods.client.GoodsSkuClient; +import quick.pager.shop.order.client.SellerOrderClient; +import quick.pager.shop.order.client.UserOrderClient; +import quick.pager.shop.order.request.SellerOrderSaveRequest; +import quick.pager.shop.order.request.UserOrderSaveRequest; +import quick.pager.shop.platform.client.SystemConfigDetailClient; +import quick.pager.shop.platform.request.SystemConfigDetailOtherRequest; +import quick.pager.shop.platform.response.SystemConfigDetailResponse; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.RedisService; +import quick.pager.shop.settlement.constants.SettlementRedisKeys; + +/** + * SettlementOrderServiceImpl + * + * @author siguiyang + */ +@Service +public class SettlementOrderServiceImpl implements SettlementOrderService { + + @Autowired + private UserOrderClient userOrderClient; + @Autowired + private SellerOrderClient sellerOrderClient; + @Autowired + private GoodsSkuClient goodsSkuClient; + @Autowired + private SystemConfigDetailClient systemConfigDetailClient; + @Autowired + private RedisService redisService; + + // TODO 暂时只做简单的校验 + @Override + public Response check(final SettlementParam param) { + final List goodsCart = param.getGoodsCart(); + final Integer integral = param.getIntegral(); + final BigDecimal payAmount = param.getPayAmount(); + final Long userId = param.getUserId(); + + // 1. 计算得出商品sku支付总金额 + BigDecimal calPayAmount = goodsCart.stream().map(item -> { + List goods = item.getGoods(); + return goods.stream().map(GoodsParam::getGoodsAmount).reduce(BigDecimal.ZERO, BigDecimal::add); + }).reduce(BigDecimal.ZERO, BigDecimal::add); + + BigDecimal deduction = new BigDecimal("100"); + + // 2. 积分抵扣金额 + List systemConfigDetails = redisService.get(SettlementRedisKeys.INTEGRAL_DEDUCTION); + if (CollectionUtils.isEmpty(systemConfigDetails)) { + SystemConfigDetailOtherRequest configDetailOtherReq = new SystemConfigDetailOtherRequest(); + configDetailOtherReq.setConfigKey(SettlementRedisKeys.INTEGRAL_DEDUCTION); + Response> configDetailOtherRes = systemConfigDetailClient.queryList(configDetailOtherReq); + if (ResponseStatus.Code.SUCCESS == configDetailOtherRes.getCode()) { + systemConfigDetails = configDetailOtherRes.getData(); + } + } + + if (CollectionUtils.isNotEmpty(systemConfigDetails)) { + deduction = new BigDecimal(systemConfigDetails.get(IConsts.ZERO).getConfigValue()); + } + + calPayAmount = calPayAmount.add(new BigDecimal(integral).divide(deduction, BigDecimal.ROUND_HALF_DOWN)); + + // 3. 校验金额是否相等 + if (IConsts.ZERO != payAmount.compareTo(calPayAmount)) { + return new Response<>(ResponseStatus.Code.FAIL_CODE, "支付金额与商品计算金额不相等！"); + } + + return new Response<>(); + } + + @Override + @GlobalTransactional + public Response createOrder(final SettlementParam param) { + final List goodsCart = param.getGoodsCart(); + final Integer integral = param.getIntegral(); + final BigDecimal payAmount = param.getPayAmount(); + final Long userId = param.getUserId(); + + // 1. 幂等性验证 + String result = redisService.get(SettlementRedisKeys.APP_SUBMIT_ORDER + userId); + + if (StringUtils.isNotBlank(result)) { + return new Response<>(ResponseStatus.Code.FAIL_CODE, "请勿重复提交订单"); + } + + // 2. 添加redis锁 + redisService.set(SettlementRedisKeys.APP_SUBMIT_ORDER + userId, SConsts.ONE, 30L); + + // 3. 生产订单做再做二次验证，防止接口攻击 + + // 4. 生成用户订单 + UserOrderSaveRequest userOrderSaveReq = new UserOrderSaveRequest(); + userOrderClient.create(userOrderSaveReq); + + // 5. 生成商户订单 + SellerOrderSaveRequest sellerOrderSaveReq = new SellerOrderSaveRequest(); + + sellerOrderClient.create(sellerOrderSaveReq); + + // 6. 生成订单商品明细 + + + return new Response<>(); + } +} diff --git a/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/service/package-info.java b/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/service/package-info.java new file mode 100644 index 0000000..a664e9d --- /dev/null +++ b/shop-settlement/shop-settlement-api/src/main/java/quick/pager/shop/service/package-info.java @@ -0,0 +1 @@ +package quick.pager.shop.service; diff --git a/shop-settlement/shop-settlement-api/src/main/resources/bootstrap-dev.yml b/shop-settlement/shop-settlement-api/src/main/resources/bootstrap-dev.yml index 2606de0..c098a6d 100644 --- a/shop-settlement/shop-settlement-api/src/main/resources/bootstrap-dev.yml +++ b/shop-settlement/shop-settlement-api/src/main/resources/bootstrap-dev.yml @@ -3,13 +3,26 @@ spring: nacos: config: server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d discovery: server-addr: 101.132.121.178:8848 -# ip: 101.132.121.178 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d sentinel: enabled: true transport: - dashboard: http://localhost:9999 + dashboard: 127.0.0.1:8080 + filter: + enabled: true + +seata: + service: + vgroup-mapping: + shop-settlement-seata-service-group: default + grouplist: + default: 101.132.121.178:8091 + disable-global-transaction: false # 内部服务调用授权认证配置 security: @@ -21,7 +34,7 @@ security: access-token-uri: http://localhost:8095/oauth/token scope: app resource: - id: shop-goods + id: shop-settlement user-info-uri: http://shop-auth/oauth/principal prefer-token-info: true loadBalanced: true diff --git a/shop-settlement/shop-settlement-api/src/main/resources/bootstrap.yml b/shop-settlement/shop-settlement-api/src/main/resources/bootstrap.yml index fc7ceba..feefc26 100644 --- a/shop-settlement/shop-settlement-api/src/main/resources/bootstrap.yml +++ b/shop-settlement/shop-settlement-api/src/main/resources/bootstrap.yml @@ -3,11 +3,15 @@ server: spring: application: - name: shop-goods + name: shop-settlement main: allow-bean-definition-overriding: true profiles: active: dev + autoconfigure: + exclude: + - org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration + feign: sentinel: enabled: true @@ -20,13 +24,7 @@ management: endpoints: web: exposure: - include: refresh,health,info, -mybatis-plus: - type-aliases-package: quick.pager.shop.model.goods - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - global-config: - db-config: - id-type: auto + include: refresh,health,info + logging: - config: classpath:logback.xml + config: classpath:logback-spring.xml diff --git a/shop-settlement/shop-settlement-api/src/main/resources/logback.xml b/shop-settlement/shop-settlement-api/src/main/resources/logback-spring.xml similarity index 99% rename from shop-settlement/shop-settlement-api/src/main/resources/logback.xml rename to shop-settlement/shop-settlement-api/src/main/resources/logback-spring.xml index f8e47bb..b04190d 100644 --- a/shop-settlement/shop-settlement-api/src/main/resources/logback.xml +++ b/shop-settlement/shop-settlement-api/src/main/resources/logback-spring.xml @@ -147,6 +147,7 @@ + diff --git a/shop-settlement/shop-settlement-client/pom.xml b/shop-settlement/shop-settlement-client/pom.xml index 0767382..cc497e0 100644 --- a/shop-settlement/shop-settlement-client/pom.xml +++ b/shop-settlement/shop-settlement-client/pom.xml @@ -24,17 +24,9 @@ provided - - org.springframework.cloud - spring-cloud-starter-netflix-ribbon - 2.1.0.RELEASE - provided - - org.springframework.cloud spring-cloud-starter-openfeign - 2.1.0.RELEASE provided @@ -43,12 +35,6 @@ shop-settlement-model ${project.version} - - - quick.pager - shop-common - ${project.version} - diff --git a/shop-settlement/shop-settlement-model/pom.xml b/shop-settlement/shop-settlement-model/pom.xml index 289127d..865b21a 100644 --- a/shop-settlement/shop-settlement-model/pom.xml +++ b/shop-settlement/shop-settlement-model/pom.xml @@ -12,16 +12,45 @@ shop-settlement-model - - org.projectlombok - lombok - - quick.pager shop-common ${project.version} + + + com.alibaba + easyexcel + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + UTF-8 + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + + jar + + + + + + + diff --git a/shop-settlement/shop-settlement-model/src/main/java/quick/pager/shop/settlement/constants/Constants.java b/shop-settlement/shop-settlement-model/src/main/java/quick/pager/shop/settlement/constants/Constants.java new file mode 100644 index 0000000..9712d9e --- /dev/null +++ b/shop-settlement/shop-settlement-model/src/main/java/quick/pager/shop/settlement/constants/Constants.java @@ -0,0 +1,14 @@ +package quick.pager.shop.settlement.constants; + +/** + * 系统常量 + * + * @author siguiyang + */ +public interface Constants { + + /** + * 积分抵扣 + */ + String INTEGRAL_DEDUCTION = "integral_deduction"; +} diff --git a/shop-settlement/shop-settlement-model/src/main/java/quick/pager/shop/settlement/constants/SettlementRedisKeys.java b/shop-settlement/shop-settlement-model/src/main/java/quick/pager/shop/settlement/constants/SettlementRedisKeys.java new file mode 100644 index 0000000..abcf511 --- /dev/null +++ b/shop-settlement/shop-settlement-model/src/main/java/quick/pager/shop/settlement/constants/SettlementRedisKeys.java @@ -0,0 +1,17 @@ +package quick.pager.shop.settlement.constants; + +/** + * 清结算 + * + * @author siguiyang + */ +public interface SettlementRedisKeys { + /** + * 积分抵扣 + */ + String INTEGRAL_DEDUCTION = "integral_deduction"; + /** + * 订单提交幂等性前缀 + */ + String APP_SUBMIT_ORDER = "app:submit:order:"; +} diff --git a/shop-user/shop-user-api/pom.xml b/shop-user/shop-user-api/pom.xml index 7e970e6..54f889a 100644 --- a/shop-user/shop-user-api/pom.xml +++ b/shop-user/shop-user-api/pom.xml @@ -19,150 +19,87 @@ + - org.springframework.boot - spring-boot-starter-web + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config com.alibaba.cloud - spring-cloud-alibaba-nacos-config + spring-cloud-starter-alibaba-nacos-discovery com.alibaba.cloud - spring-cloud-alibaba-nacos-discovery + spring-cloud-starter-alibaba-seata com.alibaba.cloud spring-cloud-starter-alibaba-sentinel + - - org.springframework.boot - spring-boot-starter-actuator - - - - com.baomidou - mybatis-plus-boot-starter - - + org.springframework.cloud spring-cloud-starter-openfeign + + org.springframework.boot - spring-boot-starter-data-redis - - - - org.springframework.cloud - spring-cloud-starter-stream-kafka - - - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - 2.1.2.RELEASE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - redis.clients - jedis + spring-boot-starter-web - cglib - cglib + org.springframework.boot + spring-boot-starter-data-redis org.springframework.boot - spring-boot-starter-test - test + spring-boot-starter-actuator + + - quick.pager - shop-common - ${project.version} + com.baomidou + mybatis-plus-boot-starter mysql mysql-connector-java + + quick.pager - shop-auth-resource + shop-auth-feign ${project.version} - - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - - quick.pager - shop-user-model + shop-auth-resource ${project.version} + quick.pager - shop-activity-client + shop-user-model ${project.version} quick.pager - shop-activity-model + shop-activity-client ${project.version} @@ -172,13 +109,6 @@ ${project.version} - - - quick.pager - shop-platform-model - ${project.version} - - @@ -208,7 +138,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.1.2.RELEASE + 2.2.9.RELEASE package diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/UserApplication.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/UserApplication.java new file mode 100644 index 0000000..31b091f --- /dev/null +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/UserApplication.java @@ -0,0 +1,21 @@ +package quick.pager.shop; + +import org.springframework.boot.SpringApplication; +import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.EnableAspectJAutoProxy; + +/** + * @author siguiyang + */ +@SpringCloudApplication +@EnableFeignClients +@EnableAspectJAutoProxy(proxyTargetClass = true) +public class UserApplication { + + public static void main(String[] args) { + SpringApplication.run(UserApplication.class, args); + } + +} + diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/app/AppFeedbackController.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/controller/app/AppFeedbackController.java similarity index 52% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/app/AppFeedbackController.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/controller/app/AppFeedbackController.java index b7b9fa2..bfa7cc9 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/app/AppFeedbackController.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/controller/app/AppFeedbackController.java @@ -1,14 +1,15 @@ -package quick.pager.shop.user.controller.app; +package quick.pager.shop.controller.app; -import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.ConstantsClient; -import quick.pager.shop.response.Response; -import quick.pager.shop.user.param.FeedbackParam; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.FeedbackService; +import quick.pager.shop.param.FeedbackParam; /** * app意见反馈 @@ -21,27 +22,18 @@ @RequestMapping(ConstantsClient.USER) public class AppFeedbackController { - /** - * 用户反馈列表 - * - * @param userId 用户主键 - * @return - */ - @GetMapping("/app/feedback/{userId}/{page}") - public Response list(@PathVariable("userId") Long userId, @PathVariable("page") Integer page) { - - return null; - } + @Autowired + private FeedbackService feedbackService; /** * 用户提交意见反馈 * * @param userId 用户主键 - * @return + * @param param 保存参数 */ @PostMapping("/app/feedback/{userId}/create") - public Response create(@PathVariable("userId") Long userId, @RequestBody FeedbackParam param) { + public Response create(@PathVariable("userId") Long userId, @RequestBody FeedbackParam param) { - return null; + return feedbackService.create(userId, param); } } diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/controller/app/AppNativeMessageController.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/controller/app/AppNativeMessageController.java new file mode 100644 index 0000000..0cbc477 --- /dev/null +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/controller/app/AppNativeMessageController.java @@ -0,0 +1,75 @@ +package quick.pager.shop.controller.app; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import quick.pager.shop.constants.Constants; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.param.AppNativeMessageParam; +import quick.pager.shop.user.response.NativeMessageResponse; +import quick.pager.shop.service.NativeMessageService; + +/** + * 站内消息 + * + * @author siguiyang + */ +@RestController +@RequestMapping(Constants.Module.USER) +public class AppNativeMessageController { + + @Autowired + private NativeMessageService nativeMessageService; + + /** + * 站内信未读个数 + * + * @param userId 当前登陆人主键 + */ + @PostMapping("/app/message/{userId}/count") + public Response count(@PathVariable("userId") Long userId) { + return nativeMessageService.count(userId); + } + + /** + * 站内消息列表 + * + * @param userId 用户主键 + * @param page 页码 + */ + @PostMapping("/app/message/{userId}/{page}") + public Response> message(@PathVariable("userId") Long userId, @PathVariable("page") Integer page) { + return nativeMessageService.queryAppPage(userId, page); + } + + /** + * 站内消息操作 删除 + */ + @PostMapping("/app/message/delete") + public Response delete(@RequestBody AppNativeMessageParam param) { + return nativeMessageService.delete(param.getUserId(), param.getMessageIds()); + } + + /** + * 站内消息操作 删除 + * 批量设置已读消息 + */ + @PostMapping("/app/message/modify") + public Response modify(@RequestBody AppNativeMessageParam param) { + return nativeMessageService.modify(param.getMessageIds()); + } + + /** + * 站内信详情¬ + * + * @param id 站内信主键 + */ + @PostMapping("/app/message/{id}/info") + public Response info(@PathVariable("id") Long id) { + return nativeMessageService.info(id); + } +} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/app/AppUserAddressController.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/controller/app/AppUserAddressController.java similarity index 89% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/app/AppUserAddressController.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/controller/app/AppUserAddressController.java index f380f36..855e2e1 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/app/AppUserAddressController.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/controller/app/AppUserAddressController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.user.controller.app; +package quick.pager.shop.controller.app; import java.util.List; import java.util.Objects; @@ -11,11 +11,10 @@ import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.Constants; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.response.Response; -import quick.pager.shop.user.param.UserAddressPageParam; -import quick.pager.shop.user.param.UserAddressSaveParam; +import quick.pager.shop.param.UserAddressSaveParam; import quick.pager.shop.user.response.AddressResponse; -import quick.pager.shop.user.service.AddressService; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.AddressService; /** * 地址管理 diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/app/AppUserCodeController.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/controller/app/AppUserCodeController.java similarity index 90% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/app/AppUserCodeController.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/controller/app/AppUserCodeController.java index 6c57180..ed2b48a 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/app/AppUserCodeController.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/controller/app/AppUserCodeController.java @@ -1,4 +1,4 @@ -package quick.pager.shop.user.controller.app; +package quick.pager.shop.controller.app; import java.io.IOException; import javax.servlet.http.HttpServletResponse; @@ -11,9 +11,9 @@ import quick.pager.shop.constants.Constants; import quick.pager.shop.constants.RedisKeys; import quick.pager.shop.param.SendParam; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; import quick.pager.shop.service.RedisService; -import quick.pager.shop.user.service.SMSCodeService; +import quick.pager.shop.service.SMSCodeService; import quick.pager.shop.utils.VerifyCodeUtils; /** @@ -33,7 +33,7 @@ public class AppUserCodeController { /** * 发送短信验证码 */ - @RequestMapping(value = "/app/code/sendSMS", method = RequestMethod.POST) + @RequestMapping(value = "/app/send/code/sms", method = RequestMethod.POST) public Response sendSMS(@RequestBody SendParam param) { diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/app/AppUserProfileController.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/controller/app/AppUserProfileController.java similarity index 56% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/app/AppUserProfileController.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/controller/app/AppUserProfileController.java index 3e3c4a1..d4dd5ca 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/app/AppUserProfileController.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/controller/app/AppUserProfileController.java @@ -1,11 +1,14 @@ -package quick.pager.shop.user.controller.app; +package quick.pager.shop.controller.app; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import quick.pager.shop.constants.ConstantsClient; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.user.response.UserProfileResponse; +import quick.pager.shop.service.UserService; /** * 用户信息 @@ -16,15 +19,16 @@ @RequestMapping(ConstantsClient.USER) public class AppUserProfileController { + @Autowired + private UserService userService; /** * 用户信息详情 * * @param userId 用户主键 - * @return */ @GetMapping("/app/{userId}/profile") - public Response profile(@PathVariable("userId") Long userId) { - return null; + public Response profile(@PathVariable("userId") Long userId) { + return userService.profile(userId); } } diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/controller/package-info.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/controller/package-info.java new file mode 100644 index 0000000..1751f0f --- /dev/null +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/controller/package-info.java @@ -0,0 +1 @@ +package quick.pager.shop.controller; diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/handler/TestHandler01.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/handler/TestHandler01.java similarity index 79% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/handler/TestHandler01.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/handler/TestHandler01.java index 5807682..61de561 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/handler/TestHandler01.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/handler/TestHandler01.java @@ -1,10 +1,9 @@ -package quick.pager.shop.user.handler; +package quick.pager.shop.handler; import com.alibaba.fastjson.JSON; import org.springframework.stereotype.Component; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.handler.AbstractHandler; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; @Component public class TestHandler01 extends AbstractHandler { diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/handler/TestHandler02.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/handler/TestHandler02.java similarity index 79% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/handler/TestHandler02.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/handler/TestHandler02.java index 176cbcf..f994703 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/handler/TestHandler02.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/handler/TestHandler02.java @@ -1,10 +1,9 @@ -package quick.pager.shop.user.handler; +package quick.pager.shop.handler; import com.alibaba.fastjson.JSON; import org.springframework.stereotype.Component; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.handler.AbstractHandler; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; @Component public class TestHandler02 extends AbstractHandler { diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/listener/RedisMessageListener.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/listener/RedisMessageListener.java similarity index 95% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/listener/RedisMessageListener.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/listener/RedisMessageListener.java index 8c39164..09dc69d 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/listener/RedisMessageListener.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/listener/RedisMessageListener.java @@ -1,4 +1,4 @@ -package quick.pager.shop.user.listener; +package quick.pager.shop.listener; import org.springframework.data.redis.connection.Message; import org.springframework.data.redis.connection.MessageListener; diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/mapper/AddressMapper.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/mapper/AddressMapper.java similarity index 68% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/mapper/AddressMapper.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/mapper/AddressMapper.java index 421f043..262070c 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/mapper/AddressMapper.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/mapper/AddressMapper.java @@ -1,9 +1,9 @@ -package quick.pager.shop.user.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.user.model.Address; +import quick.pager.shop.model.Address; @Mapper public interface AddressMapper extends BaseMapper
{ diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/mapper/FeedbackMapper.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/mapper/FeedbackMapper.java new file mode 100644 index 0000000..f721d98 --- /dev/null +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/mapper/FeedbackMapper.java @@ -0,0 +1,9 @@ +package quick.pager.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import quick.pager.shop.model.Feedback; + +@Mapper +public interface FeedbackMapper extends BaseMapper { +} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/mapper/NativeMessageMapper.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/mapper/NativeMessageMapper.java new file mode 100644 index 0000000..c8cdedf --- /dev/null +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/mapper/NativeMessageMapper.java @@ -0,0 +1,14 @@ +package quick.pager.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import quick.pager.shop.model.NativeMessage; + +/** + * 站内信 + * + * @author siguiyang + */ +@Mapper +public interface NativeMessageMapper extends BaseMapper { +} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/mapper/UserInfoMapper.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/mapper/UserInfoMapper.java similarity index 67% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/mapper/UserInfoMapper.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/mapper/UserInfoMapper.java index dad4826..bbd6793 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/mapper/UserInfoMapper.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/mapper/UserInfoMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.user.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.user.model.UserInfo; +import quick.pager.shop.model.UserInfo; @Mapper public interface UserInfoMapper extends BaseMapper { diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/mapper/UserMapper.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/mapper/UserMapper.java similarity index 68% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/mapper/UserMapper.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/mapper/UserMapper.java index 0dc2517..fb457c5 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/mapper/UserMapper.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/mapper/UserMapper.java @@ -1,8 +1,8 @@ -package quick.pager.shop.user.mapper; +package quick.pager.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.user.model.User; +import quick.pager.shop.model.User; @Mapper public interface UserMapper extends BaseMapper { diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/model/Address.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/model/Address.java similarity index 93% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/model/Address.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/model/Address.java index 5ccb24c..57a3a01 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/model/Address.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/model/Address.java @@ -1,4 +1,4 @@ -package quick.pager.shop.user.model; +package quick.pager.shop.model; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/model/Feedback.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/model/Feedback.java new file mode 100644 index 0000000..5c6f6a1 --- /dev/null +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/model/Feedback.java @@ -0,0 +1,34 @@ +package quick.pager.shop.model; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import quick.pager.shop.model.Model; + +/** + * 意见反馈 + * + * @author siguiyang + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class Feedback extends Model { + private static final long serialVersionUID = 2997049206403488676L; + + /** + * 主键 + */ + private Long id; + /** + * 用户主键 + */ + private Long userId; + /** + * 反馈内容 + */ + private String content; + /** + * 反馈图片 + */ + private String images; + +} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/model/NativeMessage.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/model/NativeMessage.java new file mode 100644 index 0000000..e346a7a --- /dev/null +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/model/NativeMessage.java @@ -0,0 +1,35 @@ +package quick.pager.shop.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import quick.pager.shop.model.Model; + +/** + * 站内信 + * + * @author siguiyang + */ +@EqualsAndHashCode(callSuper = true) +@Data +@TableName("t_native_message") +public class NativeMessage extends Model { + + private static final long serialVersionUID = 1354022482374239056L; + /** + * 用户主键 + */ + private Long userId; + /** + * 当前登陆人手机号码 + */ + private String phone; + /** + * 站内信内容 + */ + private String content; + /** + * 站内信状态 + */ + private Integer status; +} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/model/ShippingAddress.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/model/ShippingAddress.java similarity index 95% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/model/ShippingAddress.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/model/ShippingAddress.java index 32f12d8..fcef6ea 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/model/ShippingAddress.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/model/ShippingAddress.java @@ -1,4 +1,4 @@ -package quick.pager.shop.user.model; +package quick.pager.shop.model; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/model/User.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/model/User.java similarity index 91% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/model/User.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/model/User.java index 0348a46..19aed4f 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/model/User.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/model/User.java @@ -1,4 +1,4 @@ -package quick.pager.shop.user.model; +package quick.pager.shop.model; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/model/UserInfo.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/model/UserInfo.java similarity index 87% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/model/UserInfo.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/model/UserInfo.java index 9c5f0f6..e1e8bf1 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/model/UserInfo.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/model/UserInfo.java @@ -1,6 +1,6 @@ -package quick.pager.shop.user.model; +package quick.pager.shop.model; -import java.util.Date; +import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; @@ -30,7 +30,6 @@ public class UserInfo extends Model { * true 男，false 女 */ private Boolean gender; - /** * 年龄 */ @@ -42,7 +41,7 @@ public class UserInfo extends Model { /** * 生日 */ - private Date birthday; + private LocalDateTime birthday; /** * 头像地址 */ diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/AddressParam.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/param/AddressParam.java similarity index 95% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/AddressParam.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/param/AddressParam.java index a8eb41c..7a6a6ae 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/AddressParam.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/param/AddressParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.user.param; +package quick.pager.shop.param; import javax.validation.constraints.NotBlank; import lombok.Data; diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/StationMessageParam.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/param/AppNativeMessageParam.java similarity index 71% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/StationMessageParam.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/param/AppNativeMessageParam.java index 6668713..5fe5fd8 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/StationMessageParam.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/param/AppNativeMessageParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.user.param; +package quick.pager.shop.param; import java.util.List; import lombok.Data; @@ -12,10 +12,10 @@ */ @EqualsAndHashCode(callSuper = true) @Data -public class StationMessageParam extends Param { +public class AppNativeMessageParam extends Param { private static final long serialVersionUID = 473556005516138206L; private Long userId; - private List messageId; + private List messageIds; } diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/FeedbackParam.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/param/FeedbackParam.java similarity index 65% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/FeedbackParam.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/param/FeedbackParam.java index 7c26155..0596617 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/FeedbackParam.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/param/FeedbackParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.user.param; +package quick.pager.shop.param; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,4 +13,13 @@ @Data public class FeedbackParam extends Param { private static final long serialVersionUID = 9166714534870089988L; + + /** + * 反馈内容 + */ + private String content; + /** + * 反馈图片 + */ + private String images; } diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/ForgetPasswordParam.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/param/ForgetPasswordParam.java similarity index 94% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/ForgetPasswordParam.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/param/ForgetPasswordParam.java index 4dbc250..7693143 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/ForgetPasswordParam.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/param/ForgetPasswordParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.user.param; +package quick.pager.shop.param; import javax.validation.constraints.NotBlank; import lombok.Data; diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/GoodsCartParam.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/param/GoodsCartParam.java similarity index 90% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/GoodsCartParam.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/param/GoodsCartParam.java index f4845a4..fa8f0d2 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/GoodsCartParam.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/param/GoodsCartParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.user.param; +package quick.pager.shop.param; import java.util.List; import lombok.Data; diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/InviteFriendAwardParam.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/param/InviteFriendAwardParam.java similarity index 89% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/InviteFriendAwardParam.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/param/InviteFriendAwardParam.java index 41d9186..2295f4f 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/InviteFriendAwardParam.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/param/InviteFriendAwardParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.user.param; +package quick.pager.shop.param; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/UserAddressPageParam.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/param/UserAddressPageParam.java similarity index 91% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/UserAddressPageParam.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/param/UserAddressPageParam.java index e036fe4..f6dfe15 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/UserAddressPageParam.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/param/UserAddressPageParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.user.param; +package quick.pager.shop.param; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/UserAddressSaveParam.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/param/UserAddressSaveParam.java similarity index 94% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/UserAddressSaveParam.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/param/UserAddressSaveParam.java index 34b90a3..6ab102b 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/UserAddressSaveParam.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/param/UserAddressSaveParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.user.param; +package quick.pager.shop.param; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/UserLoginParam.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/param/UserLoginParam.java similarity index 93% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/UserLoginParam.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/param/UserLoginParam.java index 64d1347..4939e36 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/UserLoginParam.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/param/UserLoginParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.user.param; +package quick.pager.shop.param; import java.io.Serializable; import lombok.Data; diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/UserOrderParam.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/param/UserOrderParam.java similarity index 97% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/UserOrderParam.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/param/UserOrderParam.java index ebccf6c..7bb1146 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/UserOrderParam.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/param/UserOrderParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.user.param; +package quick.pager.shop.param; import java.math.BigDecimal; import java.util.List; diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/UserSubscribeParam.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/param/UserSubscribeParam.java similarity index 88% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/UserSubscribeParam.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/param/UserSubscribeParam.java index a556509..895c772 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/param/UserSubscribeParam.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/param/UserSubscribeParam.java @@ -1,4 +1,4 @@ -package quick.pager.shop.user.param; +package quick.pager.shop.param; import java.io.Serializable; import lombok.Data; diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/AddressService.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/AddressService.java similarity index 77% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/AddressService.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/service/AddressService.java index 0661045..7a59b5d 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/AddressService.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/AddressService.java @@ -1,17 +1,17 @@ -package quick.pager.shop.user.service; +package quick.pager.shop.service; import java.util.List; -import quick.pager.shop.response.Response; -import quick.pager.shop.user.model.Address; -import quick.pager.shop.user.param.UserAddressSaveParam; import quick.pager.shop.user.response.AddressResponse; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.model.Address; +import quick.pager.shop.param.UserAddressSaveParam; /** * 地址接口服务 * * @author siguiyang */ -public interface AddressService { +public interface AddressService extends IService
{ /** * 地址列表分页 diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/AreaService.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/AreaService.java similarity index 95% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/AreaService.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/service/AreaService.java index 163539d..846e65c 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/AreaService.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/AreaService.java @@ -1,4 +1,4 @@ -package quick.pager.shop.user.service; +package quick.pager.shop.service; /** * 地区服务 diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/FeedbackService.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/FeedbackService.java new file mode 100644 index 0000000..ee40da9 --- /dev/null +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/FeedbackService.java @@ -0,0 +1,21 @@ +package quick.pager.shop.service; + +import quick.pager.shop.user.response.Response; +import quick.pager.shop.model.Feedback; +import quick.pager.shop.param.FeedbackParam; + +/** + * 意见反馈 + * + * @author siguiyang + */ +public interface FeedbackService extends IService { + + /** + * 提交意见反馈 + * + * @param userId 用户主键 + * @param param 保存内容 + */ + Response create(final Long userId, final FeedbackParam param); +} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/GoodsCartService.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/GoodsCartService.java similarity index 69% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/GoodsCartService.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/service/GoodsCartService.java index 52696c1..c104adb 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/GoodsCartService.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/GoodsCartService.java @@ -1,6 +1,6 @@ -package quick.pager.shop.user.service; +package quick.pager.shop.service; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; public interface GoodsCartService { /** diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/InitService.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/InitService.java similarity index 97% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/InitService.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/service/InitService.java index 5b898ba..88059bd 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/InitService.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/InitService.java @@ -1,4 +1,4 @@ -package quick.pager.shop.user.service; +package quick.pager.shop.service; import java.util.ArrayList; import java.util.List; diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/NativeMessageService.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/NativeMessageService.java new file mode 100644 index 0000000..d897165 --- /dev/null +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/NativeMessageService.java @@ -0,0 +1,64 @@ +package quick.pager.shop.service; + +import java.util.List; +import quick.pager.shop.user.request.NativeMessagePageRequest; +import quick.pager.shop.user.response.NativeMessageResponse; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.model.NativeMessage; + +/** + * 站内信 + * + * @author siguiyang + */ +public interface NativeMessageService extends IService { + + /** + * 站内信分页 + * + * @param request 请求参数 + * @return 响应结果 + */ + Response> queryPage(final NativeMessagePageRequest request); + + /** + * 站内信分页 + * + * @param userId 用户主键 + * @param page 页码 + * @return 响应结果 + */ + Response> queryAppPage(final Long userId, final Integer page); + + /** + * 站内信详情 + * + * @param id 站内行主键 + * @return 详情 + */ + Response info(final Long id); + + /** + * 未读消息个数 + * + * @param userId 当前用户主键 + * @return 消息个数 + */ + Response count(final Long userId); + + /** + * 批量删除站内信 + * + * @param userId 当前用户主键 + * @param messageIds 站内信主键集 + */ + Response delete(final Long userId, final List messageIds); + + /** + * 批量设置站内信已读 + * + * @param messageIds 站内信主键集 + */ + Response modify(final List messageIds); + +} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/ReceiverService.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/ReceiverService.java similarity index 83% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/ReceiverService.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/service/ReceiverService.java index abb32b3..96ab573 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/ReceiverService.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/ReceiverService.java @@ -1,4 +1,4 @@ -package quick.pager.shop.user.service; +package quick.pager.shop.service; import org.springframework.stereotype.Service; diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/SMSCodeService.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/SMSCodeService.java similarity index 97% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/SMSCodeService.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/service/SMSCodeService.java index aca7248..dea52a0 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/SMSCodeService.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/SMSCodeService.java @@ -1,7 +1,7 @@ -package quick.pager.shop.user.service; +package quick.pager.shop.service; import quick.pager.shop.param.SendParam; -import quick.pager.shop.response.Response; +import quick.pager.shop.user.response.Response; /** * 短信发送服务 diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/UserInfoService.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/UserInfoService.java new file mode 100644 index 0000000..ad5dcd1 --- /dev/null +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/UserInfoService.java @@ -0,0 +1,11 @@ +package quick.pager.shop.service; + +import quick.pager.shop.model.UserInfo; + +/** + * 用户信息 + * + * @author siguiyang + */ +public interface UserInfoService extends IService { +} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/UserService.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/UserService.java new file mode 100644 index 0000000..0a9e052 --- /dev/null +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/UserService.java @@ -0,0 +1,20 @@ +package quick.pager.shop.service; + +import quick.pager.shop.user.response.Response; +import quick.pager.shop.user.response.UserProfileResponse; + +/** + * 用户服务 + * + * @author siguiyang + */ +public interface UserService { + + /** + * 用户信息详情 + * + * @param userId 用户主键 + * @return 用户信息 + */ + Response profile(final Long userId); +} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/AddressServiceImpl.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/impl/AddressServiceImpl.java similarity index 56% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/AddressServiceImpl.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/service/impl/AddressServiceImpl.java index 2222ff5..e0f1c86 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/AddressServiceImpl.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/impl/AddressServiceImpl.java @@ -1,19 +1,16 @@ -package quick.pager.shop.user.service.impl; +package quick.pager.shop.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import quick.pager.shop.constants.IConsts; -import quick.pager.shop.response.Response; -import quick.pager.shop.user.mapper.AddressMapper; -import quick.pager.shop.user.model.Address; -import quick.pager.shop.user.param.UserAddressSaveParam; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.mapper.AddressMapper; +import quick.pager.shop.model.Address; +import quick.pager.shop.param.UserAddressSaveParam; import quick.pager.shop.user.response.AddressResponse; -import quick.pager.shop.user.service.AddressService; +import quick.pager.shop.service.AddressService; import quick.pager.shop.utils.BeanCopier; import quick.pager.shop.utils.DateUtils; @@ -23,27 +20,15 @@ * @author siguiyang */ @Service -public class AddressServiceImpl implements AddressService { - - @Autowired - private AddressMapper addressMapper; - +public class AddressServiceImpl extends ServiceImpl implements AddressService { @Override public Response> queryPage(Long userId, Integer page) { - LambdaQueryWrapper
qw = new LambdaQueryWrapper
() + Response> response = this.toPage(page, IConsts.TEN, new LambdaQueryWrapper
() .eq(Address::getDeleteStatus, Boolean.FALSE) - .eq(Address::getUserId, userId); - - int total = addressMapper.selectCount(qw); - - List list = Collections.emptyList(); - if (0 < total) { - List
addressList = addressMapper.selectPage(new Page<>(page, IConsts.TEN), qw).getRecords(); - list = addressList.stream().map(this::convert).collect(Collectors.toList()); - } - - return Response.toResponse(list, total); + .eq(Address::getUserId, userId)); + return Response.toResponse(response.getData().stream().map(this::convert).collect(Collectors.toList()) + , response.getTotal()); } @Override @@ -51,24 +36,23 @@ public Long create(UserAddressSaveParam param) { Address address = this.convert(param); address.setDeleteStatus(Boolean.FALSE); address.setCreateTime(DateUtils.dateTime()); - addressMapper.insert(address); + this.baseMapper.insert(address); return address.getId(); } @Override public Long modify(UserAddressSaveParam param) { Address address = this.convert(param); - addressMapper.updateById(address); + this.baseMapper.updateById(address); return address.getId(); } @Override public AddressResponse queryByPrimaryKey(Long addressId) { - Address address = addressMapper.selectById(addressId); + Address address = this.baseMapper.selectById(addressId); return this.convert(address); } - /** * Address -> AddressResponse * diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/AreaServiceImpl.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/impl/AreaServiceImpl.java similarity index 54% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/AreaServiceImpl.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/service/impl/AreaServiceImpl.java index ab492f1..2141094 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/AreaServiceImpl.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/impl/AreaServiceImpl.java @@ -1,7 +1,7 @@ -package quick.pager.shop.user.service.impl; +package quick.pager.shop.service.impl; import org.springframework.stereotype.Service; -import quick.pager.shop.user.service.AreaService; +import quick.pager.shop.service.AreaService; @Service public class AreaServiceImpl implements AreaService { diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/impl/FeedbackServiceImpl.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/impl/FeedbackServiceImpl.java new file mode 100644 index 0000000..2bc09e5 --- /dev/null +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/impl/FeedbackServiceImpl.java @@ -0,0 +1,33 @@ +package quick.pager.shop.service.impl; + +import org.springframework.stereotype.Service; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.mapper.FeedbackMapper; +import quick.pager.shop.model.Feedback; +import quick.pager.shop.param.FeedbackParam; +import quick.pager.shop.service.FeedbackService; +import quick.pager.shop.utils.DateUtils; + +/** + * 意见反馈 + * + * @author siguiyang + */ +@Service +public class FeedbackServiceImpl extends ServiceImpl implements FeedbackService { + + + @Override + public Response create(final Long userId, final FeedbackParam param) { + + Feedback feedback = new Feedback(); + feedback.setUserId(userId); + feedback.setContent(param.getContent()); + feedback.setImages(param.getImages()); + feedback.setDeleteStatus(Boolean.FALSE); + feedback.setCreateTime(DateUtils.dateTime()); + feedback.setUpdateTime(DateUtils.dateTime()); + this.baseMapper.insert(feedback); + return Response.toResponse(feedback.getId()); + } +} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/GoodsCartServiceImpl.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/impl/GoodsCartServiceImpl.java similarity index 82% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/GoodsCartServiceImpl.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/service/impl/GoodsCartServiceImpl.java index 2caef5e..260627a 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/GoodsCartServiceImpl.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/impl/GoodsCartServiceImpl.java @@ -1,8 +1,8 @@ -package quick.pager.shop.user.service.impl; +package quick.pager.shop.service.impl; import org.springframework.stereotype.Service; -import quick.pager.shop.response.Response; -import quick.pager.shop.user.service.GoodsCartService; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.GoodsCartService; @Service public class GoodsCartServiceImpl implements GoodsCartService { diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/impl/NativeMessageServiceImpl.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/impl/NativeMessageServiceImpl.java new file mode 100644 index 0000000..7cff49d --- /dev/null +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/impl/NativeMessageServiceImpl.java @@ -0,0 +1,100 @@ +package quick.pager.shop.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import org.springframework.stereotype.Service; +import quick.pager.shop.constants.IConsts; +import quick.pager.shop.constants.ResponseStatus; +import quick.pager.shop.user.request.NativeMessagePageRequest; +import quick.pager.shop.user.response.NativeMessageResponse; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.mapper.NativeMessageMapper; +import quick.pager.shop.model.NativeMessage; +import quick.pager.shop.service.NativeMessageService; +import quick.pager.shop.utils.BeanCopier; +import quick.pager.shop.utils.DateUtils; + +/** + * 站内信实现 + * + * @author siguiyang + */ +@Service +public class NativeMessageServiceImpl extends ServiceImpl implements NativeMessageService { + + @Override + public Response> queryPage(final NativeMessagePageRequest request) { + return null; + } + + @Override + public Response> queryAppPage(final Long userId, final Integer page) { + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(NativeMessage::getDeleteStatus, Boolean.FALSE) + .eq(NativeMessage::getUserId, userId); + Response> response = this.toPage(page, IConsts.TEN, wrapper); + + return Response.toResponse(response.getData().stream().map(this::convert).collect(Collectors.toList()), response.getTotal()); + } + + @Override + public Response info(final Long id) { + NativeMessage message = this.baseMapper.selectById(id); + if (Objects.isNull(message) || message.getDeleteStatus()) { + return new Response<>(ResponseStatus.Code.FAIL_CODE, "消息不存在！"); + } + + if (IConsts.ZERO.equals(message.getStatus())) { + NativeMessage updateNativeMessage = new NativeMessage(); + updateNativeMessage.setId(id); + updateNativeMessage.setStatus(IConsts.ONE); + updateNativeMessage.setUpdateTime(DateUtils.dateTime()); + this.baseMapper.updateById(updateNativeMessage); + } + return Response.toResponse(this.convert(message)); + } + + @Override + public Response count(final Long userId) { + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(NativeMessage::getDeleteStatus, Boolean.FALSE) + .eq(NativeMessage::getUserId, userId) + .eq(NativeMessage::getStatus, IConsts.ZERO); + + Integer count = this.baseMapper.selectCount(wrapper); + return Response.toResponse(count); + } + + @Override + public Response delete(final Long userId, final List messageIds) { + NativeMessage nativeMessage = new NativeMessage(); + nativeMessage.setDeleteStatus(Boolean.TRUE); + nativeMessage.setStatus(IConsts.ONE); + this.baseMapper.update(nativeMessage, new LambdaQueryWrapper() + .eq(NativeMessage::getDeleteStatus, Boolean.FALSE) + .eq(NativeMessage::getUserId, userId) + .eq(NativeMessage::getStatus, IConsts.ZERO) + .in(NativeMessage::getId, messageIds)); + return new Response(); + } + + @Override + public Response modify(List messageIds) { + + NativeMessage nativeMessage = new NativeMessage(); + nativeMessage.setDeleteStatus(Boolean.FALSE); + nativeMessage.setStatus(IConsts.ONE); + this.baseMapper.update(nativeMessage, new LambdaQueryWrapper() + .eq(NativeMessage::getDeleteStatus, Boolean.FALSE) + .in(NativeMessage::getId, messageIds)); + return new Response(); + } + + private NativeMessageResponse convert(final NativeMessage nativeMessage) { + return BeanCopier.copy(nativeMessage, new NativeMessageResponse()); + } +} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/SMSCodeServiceImpl.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/impl/SMSCodeServiceImpl.java similarity index 68% rename from shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/SMSCodeServiceImpl.java rename to shop-user/shop-user-api/src/main/java/quick/pager/shop/service/impl/SMSCodeServiceImpl.java index d88f9c3..6f4f21c 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/SMSCodeServiceImpl.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/impl/SMSCodeServiceImpl.java @@ -1,9 +1,9 @@ -package quick.pager.shop.user.service.impl; +package quick.pager.shop.service.impl; import org.springframework.stereotype.Service; import quick.pager.shop.param.SendParam; -import quick.pager.shop.response.Response; -import quick.pager.shop.user.service.SMSCodeService; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.service.SMSCodeService; /** * SMSCodeServiceImpl diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/impl/UserServiceImpl.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/impl/UserServiceImpl.java new file mode 100644 index 0000000..7b331cf --- /dev/null +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/service/impl/UserServiceImpl.java @@ -0,0 +1,51 @@ +package quick.pager.shop.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import java.util.Objects; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import quick.pager.shop.constants.ResponseStatus; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.user.response.UserProfileResponse; +import quick.pager.shop.mapper.UserInfoMapper; +import quick.pager.shop.mapper.UserMapper; +import quick.pager.shop.model.User; +import quick.pager.shop.model.UserInfo; +import quick.pager.shop.service.UserService; +import quick.pager.shop.utils.BeanCopier; + +/** + * 用户登陆 + * + * @author siguiyang + */ +@Service +@Slf4j +public class UserServiceImpl implements UserService { + + @Autowired + private UserMapper userMapper; + @Autowired + private UserInfoMapper userInfoMapper; + + @Override + public Response profile(final Long userId) { + log.info("查询用户主键 userId = {}", userId); + User user = userMapper.selectById(userId); + + if (Objects.isNull(user)) { + return new Response<>(ResponseStatus.Code.FAIL_CODE, "用户不存在"); + } + + UserInfo userInfo = userInfoMapper.selectOne(new LambdaQueryWrapper() + .eq(UserInfo::getDeleteStatus, Boolean.FALSE) + .eq(UserInfo::getUserId, userId)); + + return Response.toResponse(this.convert(userInfo)); + } + + private UserProfileResponse convert(final UserInfo userInfo) { + return BeanCopier.copy(userInfo, new UserProfileResponse()); + } +} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/UserApplication.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/UserApplication.java deleted file mode 100644 index 3f7f2a4..0000000 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/UserApplication.java +++ /dev/null @@ -1,38 +0,0 @@ -package quick.pager.shop.user; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.CommandLineRunner; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.EnableAspectJAutoProxy; -import quick.pager.shop.mq.MqMessage; -import quick.pager.shop.user.mq.KafkaService; - -/** - * @author siguiyang - */ -@SpringBootApplication(scanBasePackages = "quick.pager.shop") -@EnableDiscoveryClient -@EnableCircuitBreaker -@EnableFeignClients("quick.pager.shop") -@EnableAspectJAutoProxy(proxyTargetClass = true) -public class UserApplication implements CommandLineRunner { - - public static void main(String[] args) { - SpringApplication.run(UserApplication.class, args); - } - - @Autowired - private KafkaService kafkaService; - - @Override - public void run(String... args) throws Exception { - - kafkaService.sender(MqMessage.builder().queueName("sms_send").payLoad("发送短信服务").build()); - - } -} - diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/OrderController.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/OrderController.java deleted file mode 100644 index 88141f5..0000000 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/OrderController.java +++ /dev/null @@ -1,48 +0,0 @@ -package quick.pager.shop.user.controller; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import quick.pager.shop.constants.Constants; -import quick.pager.shop.response.Response; -import quick.pager.shop.user.service.UserOrderService; - -/** - * 用户订单 - * - * @author siguiyang - */ -@RestController -@RequestMapping(Constants.Module.USER) -public class OrderController { - - - @Autowired - private UserOrderService userOrderService; - - /** - * 订单列表 - */ - @PostMapping("/orders") - public Response orderList() { - return userOrderService.orders(); - } - - /** - * 订单详情 - */ - @PostMapping("/oder/detail") - public Response detail() { - return userOrderService.orderInfo(0L); - } - - /** - * 创建订单，下单接口 - */ - @PostMapping("/order/create") - public Response createOrder() { - return userOrderService.createOrder(); - } -} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/UserController.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/UserController.java deleted file mode 100644 index 27b7788..0000000 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/UserController.java +++ /dev/null @@ -1,95 +0,0 @@ -package quick.pager.shop.user.controller; - -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; -import quick.pager.shop.constants.Constants; -import quick.pager.shop.constants.RedisKeys; -import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.RedisService; -import quick.pager.shop.user.param.UserLoginParam; -import quick.pager.shop.user.request.UserPageRequest; -import quick.pager.shop.user.service.UserService; - -/** - * 用户管理
- * 用户信息 忘记密码 - * - * @author siguiyang - */ -@RestController -@RequestMapping(Constants.Module.USER) -@Slf4j -public class UserController { - - @Autowired - private UserService userService; - @Autowired - private RedisService redisService; - - - /** - * 用户列表 - * - * @param request 请求参数 - * @return 数据响应 - */ - @PostMapping("/profile/page") - public Response page(@RequestBody UserPageRequest request) { - - return null; - } - - - /** - * 退出 - */ - @GetMapping("/logout/{userId}") - public Response logout(@PathVariable("userId") Long userId) { - redisService.del(String.valueOf(userId)); - return new Response(); - } - - /** - * 用户信息 - */ - @GetMapping("/info/{userId}") - public Response userInfo(@PathVariable("userId") Long userId) { - return null; - } - -// -// /** -// * 站内信列表 -// */ -// @RequestMapping(value = "/station/message", method = RequestMethod.POST) -// public Response message(@RequestBody @Valid AppRequest request, BindingResult bindingResult) { -// BindingResultUtils.getFieldErrorMessage(bindingResult); -// StationMessageDTO dto = new StationMessageDTO(); -// dto.setId(request.getUserId()); -// dto.setEvent(request.getEvent()); -// dto.setPageSize(request.getPageSize()); -// dto.setPage(request.getPage()); -// return stationMessageService.doService(dto); -// } -// -// /** -// * 未读站内信个数 -// */ -// @PostMapping("/station/count") -// public Response messageCount(@PathVariable("userId") Long userId) { -// StationMessageDTO stationMessageDTO = new StationMessageDTO(); -// stationMessageDTO.setUserId(userId); -// stationMessageDTO.setEvent("count"); -// return stationMessageService.doService(stationMessageDTO); -// } -} - diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/app/AppNativeMessageController.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/app/AppNativeMessageController.java deleted file mode 100644 index 08d645a..0000000 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/app/AppNativeMessageController.java +++ /dev/null @@ -1,37 +0,0 @@ -package quick.pager.shop.user.controller.app; - -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import quick.pager.shop.constants.Constants; -import quick.pager.shop.response.Response; - -/** - * 站内消息 - * - * @author siguiyang - */ -@RestController -@RequestMapping(Constants.Module.USER) -public class AppNativeMessageController { - - - /** - * 站内消息列表 - */ - @PostMapping("/app/message/{userId}") - public Response message(@PathVariable("userId") Long userId) { - return null; - } - - - /** - * 站内消息操作 删除 已读 - */ - @PostMapping("/app/message/modify") - public Response modifyMessage() { - return null; - } -} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/client/UserClientController.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/client/UserClientController.java deleted file mode 100644 index fd79db3..0000000 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/controller/client/UserClientController.java +++ /dev/null @@ -1,70 +0,0 @@ -package quick.pager.shop.user.controller.client; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import quick.pager.shop.constants.Constants; - -/** - * feign 暴露的接口 - */ -@RestController -@RequestMapping(Constants.Module.USER) -public class UserClientController { - -// /** -// * 获取用户信息 -// * -// * @param userId 用户Id -// */ -// @RequestMapping(value = "/getUser/{userId}", method = RequestMethod.POST) -// public Response getUser(@PathVariable("userId") Long userId) { -// List user = userClientService.getUser(Collections.singletonList(userId)); -// if (CollectionUtils.isEmpty(user)) { -// return new Response<>(); -// } -// return new Response<>(user.get(0)); -// } -// -// /** -// * 批量获取用户信息 -// * -// * @param userIds 用户Id集合 -// */ -// @RequestMapping(value = "/batchUser/profile", method = RequestMethod.POST) -// public Response> getBatchUser(@RequestParam("userIds") List userIds) { -// List user = userClientService.getUser(userIds); -// return new Response<>(user); -// } -// -// /** -// * 批量检测手机号是否存在 -// * -// * @param phones 手机号集合 -// */ -// @RequestMapping(value = "/isExists", method = RequestMethod.POST) -// public Response isExists(@RequestParam("phones") List phones) { -// if (CollectionUtils.isEmpty(phones)) { -// return new Response(); -// } -// return userClientService.isExists(phones); -// } -// -// /** -// * 根据手机号查询用户信息 -// * -// * @param phone 手机号 -// */ -// @RequestMapping(value = "/queryUser/profile", method = RequestMethod.POST) -// public Response queryUserProfile(@RequestParam("phone") String phone) { -// return userClientService.queryUserProfile(phone); -// } -// -// /** -// * 查询站内信列表 -// */ -// @RequestMapping(value = "/queryStationLetter", method = RequestMethod.POST) -// public Response> queryStationLetter(@RequestBody ManageRequest request) { -// -// return userClientService.queryStationLetter(request.getPhone(), request.getPage(), request.getPageSize()); -// } -} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/listener/SMSKafkaListener.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/listener/SMSKafkaListener.java deleted file mode 100644 index f3d8772..0000000 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/listener/SMSKafkaListener.java +++ /dev/null @@ -1,27 +0,0 @@ -package quick.pager.shop.user.listener; - -import java.util.Optional; -import org.apache.kafka.clients.consumer.ConsumerRecord; -import org.springframework.kafka.annotation.KafkaListener; -import org.springframework.stereotype.Component; - -/** - * 发送短信 - * - * @author siguiyang - */ -@Component -public class SMSKafkaListener { - - - @KafkaListener(topics = "sms_send") - public void doProcess(ConsumerRecord record) { - Optional message = Optional.ofNullable(record.value()); - - if (message.isPresent()) { - Object obj = message.get(); - System.out.println("============" + obj); - } - - } -} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/mapper/StationLetterMapper.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/mapper/StationLetterMapper.java deleted file mode 100644 index 844cadc..0000000 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/mapper/StationLetterMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package quick.pager.shop.user.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import quick.pager.shop.user.model.StationLetter; - -@Mapper -public interface StationLetterMapper extends BaseMapper { -} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/model/StationLetter.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/model/StationLetter.java deleted file mode 100644 index 5f9f164..0000000 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/model/StationLetter.java +++ /dev/null @@ -1,20 +0,0 @@ -package quick.pager.shop.user.model; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import quick.pager.shop.model.Model; - -@EqualsAndHashCode(callSuper = true) -@Data -public class StationLetter extends Model { - - private static final long serialVersionUID = 1354022482374239056L; - - private Long userId; - - private String phone; - - private String content; - - private Integer status; -} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/mq/KafkaService.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/mq/KafkaService.java deleted file mode 100644 index 6cb3c1d..0000000 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/mq/KafkaService.java +++ /dev/null @@ -1,23 +0,0 @@ -package quick.pager.shop.user.mq; - -import javax.annotation.Resource; -import org.springframework.kafka.core.KafkaTemplate; -import org.springframework.stereotype.Service; -import quick.pager.shop.mq.MqMessage; - -/** - * kafka 生产者 - * - * @author siguiyang - */ -@Service -public class KafkaService { - - @Resource - private KafkaTemplate kafkaTemplate; - - - public void sender(MqMessage message) { - kafkaTemplate.send(message.getQueueName(), message.getPayLoad()); - } -} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/response/AreaResponse.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/response/AreaResponse.java index 02af118..a397ba8 100644 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/response/AreaResponse.java +++ b/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/response/AreaResponse.java @@ -1,7 +1,6 @@ package quick.pager.shop.user.response; import java.io.Serializable; -import java.util.List; import lombok.Data; //import quick.pager.shop.model.Area; //import quick.pager.shop.model.City; diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/response/UserInfoResponse.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/response/UserInfoResponse.java deleted file mode 100644 index 498cfbe..0000000 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/response/UserInfoResponse.java +++ /dev/null @@ -1,36 +0,0 @@ -package quick.pager.shop.user.response; - -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class UserInfoResponse implements Serializable { - private static final long serialVersionUID = -4170663634334464488L; - - private Long userId; - /** - * 手机号 - */ - private String phone; - - private String password; - - private String username; - - private Boolean gender; - - private Integer age; - - private String email; - - private Date birthday; - - private String avatar; -} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/BannerService.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/BannerService.java deleted file mode 100644 index fb7ef2e..0000000 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/BannerService.java +++ /dev/null @@ -1,20 +0,0 @@ -package quick.pager.shop.user.service; - -import java.util.List; -import quick.pager.shop.activity.response.banner.BannerResponse; -import quick.pager.shop.response.Response; - -/** - * Banner 服务 - * - * @author siguiyang - */ -public interface BannerService { - - /** - * 消费者端Banner 列表 - * - * @return banner 列表数据 - */ - Response> queryList(); -} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/CheckOrderService.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/CheckOrderService.java deleted file mode 100644 index cf7394b..0000000 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/CheckOrderService.java +++ /dev/null @@ -1,9 +0,0 @@ -package quick.pager.shop.user.service; - -/** - * 校验订单有效性 - * - * @author siguiyang - */ -public interface CheckOrderService { -} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/UserInfoService.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/UserInfoService.java deleted file mode 100644 index e3ecf44..0000000 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/UserInfoService.java +++ /dev/null @@ -1,12 +0,0 @@ -package quick.pager.shop.user.service; - -import quick.pager.shop.service.IService; -import quick.pager.shop.user.model.UserInfo; - -/** - * 用户信息 - * - * @author siguiyang - */ -public interface UserInfoService extends IService { -} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/UserOrderService.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/UserOrderService.java deleted file mode 100644 index 2504214..0000000 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/UserOrderService.java +++ /dev/null @@ -1,24 +0,0 @@ -package quick.pager.shop.user.service; - -import quick.pager.shop.response.Response; - -public interface UserOrderService { - - - /** - * 订单列表 - */ - Response orders(); - - /** - * 订单详情 - * - * @param orderId 订单Id - */ - Response orderInfo(Long orderId); - - /** - * 下单 - */ - Response createOrder(); -} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/UserService.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/UserService.java deleted file mode 100644 index 0d1f472..0000000 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/UserService.java +++ /dev/null @@ -1,20 +0,0 @@ -package quick.pager.shop.user.service; - -import quick.pager.shop.response.Response; -import quick.pager.shop.user.response.UserInfoResponse; - -/** - * 用户服务 - * - * @author siguiyang - */ -public interface UserService { - - /** - * 用户信息详情 - * - * @param userId 用户主键 - * @return 用户信息 - */ - Response profile(final Long userId); -} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/BannerServiceImpl.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/BannerServiceImpl.java deleted file mode 100644 index 45a049c..0000000 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/BannerServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package quick.pager.shop.user.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import quick.pager.shop.activity.client.BannerClient; -import quick.pager.shop.activity.request.banner.BannerOtherRequest; -import quick.pager.shop.activity.response.banner.BannerResponse; -import quick.pager.shop.response.Response; -import quick.pager.shop.user.service.BannerService; - -/** - * BannerServiceImpl - * - * @author siguiyang - */ -@Service -public class BannerServiceImpl implements BannerService { - - @Autowired - private BannerClient bannerClient; - - @Override - public Response> queryList() { - - BannerOtherRequest bannerOtherRequest = new BannerOtherRequest(); - bannerOtherRequest.setBannerStatus(Boolean.FALSE); - return bannerClient.queryList(bannerOtherRequest); - } -} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/CheckOrderServiceImpl.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/CheckOrderServiceImpl.java deleted file mode 100644 index d903549..0000000 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/CheckOrderServiceImpl.java +++ /dev/null @@ -1,8 +0,0 @@ -package quick.pager.shop.user.service.impl; - -import org.springframework.stereotype.Service; -import quick.pager.shop.user.service.CheckOrderService; - -@Service -public class CheckOrderServiceImpl implements CheckOrderService { -} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/UserOrderServiceImpl.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/UserOrderServiceImpl.java deleted file mode 100644 index 585e695..0000000 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/UserOrderServiceImpl.java +++ /dev/null @@ -1,112 +0,0 @@ -package quick.pager.shop.user.service.impl; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.RedisService; -import quick.pager.shop.user.mq.KafkaService; -import quick.pager.shop.user.service.CheckOrderService; -import quick.pager.shop.user.service.UserOrderService; - -@Service -@Slf4j -public class UserOrderServiceImpl implements UserOrderService { - -// @Autowired -// private DiscountCouponClient discountCouponClient; -// @Autowired -// private UserOrderClient userOrderClient; -// @Autowired -// private SellerOrderClient sellerOrderClient; -// @Autowired -// private GoodsClient goodsClient; - - @Autowired - private RedisService redisService; - - @Autowired - private CheckOrderService checkOrderService; - @Autowired - private KafkaService kafkaService; - - - @Override - public Response orders() { - return null; - } - - @Override - public Response orderInfo(Long orderId) { -// return userOrderClient.orderInfo(orderId); - return null; - } - - @Override - public Response createOrder() { -// -// String key = RedisKeys.UserKeys.SHOP_ORDER_ + dto.getUserId(); -// -// String value = redisService.get(key); -// try { -// // 幂等性处理 -// if (!StringUtils.isEmpty(value)) { -// return new Response(ResponseStatus.Code.FAIL_CODE, "请勿重复下单"); -// } -// -// redisService.set(key, Constants.Common.ONE, 30); -// -// // TODO 校验配送地址 -// -// // TODO 校验客户端计算下单金额结果是否与后端一致 -// -// List goodsCart = dto.getGoodsCart(); -// // 初始结算金额 -// BigDecimal totalAmount = BigDecimal.ZERO; -// // 商户结算金额 -// BigDecimal sellerTotalAmount = BigDecimal.ZERO; -// // 获取购买的商品 -//// Optional.ofNullable(goodsCart).orElse(Collections.emptyList()).forEach(goodsCartDTO -> { -//// Response goodsResponseResponse = goodsClient.goodsInfo(goodsCartDTO.getGoodsId()); -//// if (ResponseStatus.Code.SUCCESS == goodsResponseResponse.getCode()) { -//// GoodsResponse goodsResponse = goodsResponseResponse.getData(); -//// BigDecimal goodsDiscountAmount = goodsResponse.getGoods().getGoodsDiscountAmount(); -//// } -//// }); -// -// // TODO 计算是否使用优惠券 -// if (null != dto.getCouponId()) { -// Response discountCouponResponse = discountCouponClient.userCoupons(dto.getCouponId()); -// } -// // TODO 创建订单 -// -// UserOrder userOrder = new UserOrder(); -// userOrder.setCouponId(dto.getCouponId()); -// userOrder.setShipId(dto.getAddressId()); -// userOrder.setUserId(dto.getUserId()); -// userOrder.setOrderType(dto.getOrderType()); -// -// Response response = userOrderClient.userOrderCreate(userOrder); -// -// // TODO 创建商户订单 -// -// SellerOrder sellerOrder = new SellerOrder(); -// sellerOrder.setSellerId(dto.getSellerId()); -// sellerOrder.setCreateTime(DateUtils.dateTime()); -// sellerOrder.setDeleteStatus(false); -// -// -// sellerOrderClient.sellerOrderCreate(sellerOrder); -// -// -// // 好友佣金计算，分配奖励，使用异步方式实现放在MQ处理 -// InviteFriendAwardDTO inviteFriendAwardDTO = new InviteFriendAwardDTO(); -// inviteFriendAwardDTO.setUserId(dto.getUserId()); -// kafkaService.sender(MqMessage.builder().queueName(RabbitMqKeys.TOPIC_INVITE_FRIEND_AWARD).payLoad(inviteFriendAwardDTO).build()); -// } finally { -// -// redisService.del(key); -// } - return new Response(); - } -} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/UserServiceImpl.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/UserServiceImpl.java deleted file mode 100644 index 17a9511..0000000 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/impl/UserServiceImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -package quick.pager.shop.user.service.impl; - -import cn.hutool.core.util.RandomUtil; -import cn.hutool.crypto.SecureUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import java.util.Objects; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.parameters.P; -import org.springframework.stereotype.Service; -import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.mq.MqMessage; -import quick.pager.shop.platform.client.SMSTemplateClient; -import quick.pager.shop.platform.response.SMSTemplateResponse; -import quick.pager.shop.response.Response; -import quick.pager.shop.service.RedisService; -import quick.pager.shop.user.mapper.UserInfoMapper; -import quick.pager.shop.user.mapper.UserMapper; -import quick.pager.shop.user.model.User; -import quick.pager.shop.user.model.UserInfo; -import quick.pager.shop.user.mq.KafkaService; -import quick.pager.shop.user.response.UserInfoResponse; -import quick.pager.shop.user.service.UserService; -import quick.pager.shop.utils.DateUtils; - -/** - * 用户登陆 - * - * @author siguiyang - */ -@Service -@Slf4j -public class UserServiceImpl implements UserService { - - @Autowired - private UserMapper userMapper; - @Autowired - private UserInfoMapper userInfoMapper; - - @Override - public Response profile(final Long userId) { - log.info("查询用户主键 userId = {}", userId); - User user = userMapper.selectById(userId); - - if (Objects.isNull(user)) { - return new Response<>(ResponseStatus.Code.FAIL_CODE, "用户不存在"); - } - - UserInfo userInfo = userInfoMapper.selectOne(new LambdaQueryWrapper() - .eq(UserInfo::getDeleteStatus, Boolean.FALSE) - .eq(UserInfo::getUserId, userId)); - - // 返回用户信息主题信息 - UserInfoResponse userInfoResp = new UserInfoResponse(); - userInfoResp.setAge(Objects.nonNull(userInfo) ? userInfo.getAge() : null); - return null; - } -} diff --git a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/order/OrderService.java b/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/order/OrderService.java deleted file mode 100644 index 06c8ff7..0000000 --- a/shop-user/shop-user-api/src/main/java/quick/pager/shop/user/service/order/OrderService.java +++ /dev/null @@ -1,10 +0,0 @@ -package quick.pager.shop.user.service.order; - -/** - * 订单服务 - * - * @author siguiyang - */ -public interface OrderService { - -} diff --git a/shop-user/shop-user-api/src/main/resources/bootstrap-dev.yml b/shop-user/shop-user-api/src/main/resources/bootstrap-dev.yml index aad4e3f..8abb35c 100644 --- a/shop-user/shop-user-api/src/main/resources/bootstrap-dev.yml +++ b/shop-user/shop-user-api/src/main/resources/bootstrap-dev.yml @@ -1,38 +1,28 @@ - spring: - kafka: - bootstrap-servers: 127.0.0.1:9092 - #生产者的配置，大部分我们可以使用默认的，这里列出几个比较重要的属性 - producer: - #每批次发送消息的数量 - batch-size: 16 - #设置大于0的值将使客户端重新发送任何数据，一旦这些数据发送失败。注意，这些重试与客户端接收到发送错误时的重试没有什么不同。允许重试将潜在的改变数据的顺序，如果这两个消息记录都是发送到同一个partition，则第一个消息失败第二个发送成功，则第二条消息会比第一条消息出现要早。 - retries: 0 - #producer可以用来缓存数据的内存大小。如果数据产生速度大于向broker发送的速度，producer会阻塞或者抛出异常，以“block.on.buffer.full”来表明。这项设置将和producer能够使用的总内存相关，但并不是一个硬性的限制，因为不是producer使用的所有内存都是用于缓存。一些额外的内存会用于压缩（如果引入压缩机制），同样还有一些用于维护请求。 - buffer-memory: 33554432 - #key序列化方式 - key-serializer: org.apache.kafka.common.serialization.StringSerializer - value-serializer: org.apache.kafka.common.serialization.StringSerializer - #消费者的配置 - consumer: - #Kafka中没有初始偏移或如果当前偏移在服务器上不再存在时,默认区最新 ，有三个选项 【latest, earliest, none】 - auto-offset-reset: latest - #是否开启自动提交 - enable-auto-commit: true - #自动提交的时间间隔 - auto-commit-interval: 100 - #key的解码方式 - key-deserializer: org.apache.kafka.common.serialization.StringDeserializer - #value的解码方式 - value-deserializer: org.apache.kafka.common.serialization.StringDeserializer - #在/usr/local/etc/kafka/consumer.properties中有配置 - group-id: test-consumer-group cloud: nacos: config: - server-addr: 127.0.0.1:8848 + server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d discovery: - server-addr: 127.0.0.1:8848 + server-addr: 101.132.121.178:8848 + group: shop + namespace: 0759bc76-60b5-4f32-acd5-e5095cf2b93d + sentinel: + enabled: true + transport: + dashboard: 127.0.0.1:8080 + filter: + enabled: true + +seata: + service: + vgroup-mapping: + shop-user-seata-service-group: default + grouplist: + default: 101.132.121.178:8091 + disable-global-transaction: false # 内部服务调用授权认证配置 security: diff --git a/shop-user/shop-user-api/src/main/resources/bootstrap.yml b/shop-user/shop-user-api/src/main/resources/bootstrap.yml index e09e7df..d4122bc 100644 --- a/shop-user/shop-user-api/src/main/resources/bootstrap.yml +++ b/shop-user/shop-user-api/src/main/resources/bootstrap.yml @@ -4,16 +4,13 @@ server: spring: application: name: shop-user - cloud: - alibaba: - seata: - tx-service-group: shop_tx_group main: allow-bean-definition-overriding: true profiles: active: dev autoconfigure: - exclude: org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration + exclude: + - org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration feign: sentinel: @@ -34,4 +31,4 @@ mybatis-plus: db-config: id-type: auto logging: - config: classpath:logback.xml + config: classpath:logback-spring.xml diff --git a/shop-user/shop-user-api/src/main/resources/file.conf b/shop-user/shop-user-api/src/main/resources/file.conf deleted file mode 100644 index 878fe71..0000000 --- a/shop-user/shop-user-api/src/main/resources/file.conf +++ /dev/null @@ -1,110 +0,0 @@ -transport { - # tcp udt unix-domain-socket - type = "TCP" - #NIO NATIVE - server = "NIO" - #enable heartbeat - heartbeat = true - #thread factory for netty - thread-factory { - boss-thread-prefix = "NettyBoss" - worker-thread-prefix = "NettyServerNIOWorker" - server-executor-thread-prefix = "NettyServerBizHandler" - share-boss-worker = false - client-selector-thread-prefix = "NettyClientSelector" - client-selector-thread-size = 1 - client-worker-thread-prefix = "NettyClientWorkerThread" - # netty boss thread size,will not be used for UDT - boss-thread-size = 1 - #auto default pin or 8 - worker-thread-size = 8 - } -} -service { - #vgroup->rgroup - vgroup_mapping.shop_tx_group = "default" - #only support single node - default.grouplist = "127.0.0.1:8091" - #degrade current not support - enableDegrade = false - #disable - disable = false - #unit ms,s,m,h,d represents milliseconds, seconds, minutes, hours, days, default permanent - max.commit.retry.timeout = "-1" - max.rollback.retry.timeout = "-1" -} - -client { - async.commit.buffer.limit = 10000 - lock { - retry.internal = 10 - retry.times = 30 - } - report.retry.count = 5 -} - -## transaction log store -store { - ## store mode: file、db - mode = "file" - - ## file store - file { - dir = "sessionStore" - - # branch session size , if exceeded first try compress lockkey, still exceeded throws exceptions - max-branch-session-size = 16384 - # globe session size , if exceeded throws exceptions - max-global-session-size = 512 - # file buffer size , if exceeded allocate new buffer - file-write-buffer-cache-size = 16384 - # when recover batch read size - session.reload.read_size = 100 - # async, sync - flush-disk-mode = async - } - - ## database store - db { - ## the implement of javax.sql.DataSource, such as DruidDataSource(druid)/BasicDataSource(dbcp) etc. - datasource = "druid" - ## mysql/oracle/h2/oceanbase etc. - db-type = "mysql" - url = "jdbc:mysql://127.0.0.1:3306/seata?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false" - user = "root" - password = "root" - min-conn = 1 - max-conn = 30 - global.table = "global_table" - branch.table = "branch_table" - query-limit = 100 - } -} -lock { - ## the data row lock store mode: local_db、memory or db - mode = "db" - - memory{ - ## store lock in memory of server - } - - db{ - ## use db of server to store lock, the db is ${store.db.url} - lock-table= "lock_table" - } - - local_db { - ## store lock in local db - } -} -recovery{ - committing-retry-delay = 30 - asyn-committing-retry-delay = 30 - rollbacking-retry-delay = 30 - timeout-retry-delay = 30 -} - -transaction { - undo.data.validation = false - undo.log.serialization = fastjson -} diff --git a/shop-user/shop-user-api/src/main/resources/generatorConfig.xml b/shop-user/shop-user-api/src/main/resources/generatorConfig.xml deleted file mode 100644 index dcaafe6..0000000 --- a/shop-user/shop-user-api/src/main/resources/generatorConfig.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/shop-user/shop-user-api/src/main/resources/logback.xml b/shop-user/shop-user-api/src/main/resources/logback-spring.xml similarity index 100% rename from shop-user/shop-user-api/src/main/resources/logback.xml rename to shop-user/shop-user-api/src/main/resources/logback-spring.xml diff --git a/shop-user/shop-user-api/src/main/resources/registry.conf b/shop-user/shop-user-api/src/main/resources/registry.conf deleted file mode 100644 index 66b963d..0000000 --- a/shop-user/shop-user-api/src/main/resources/registry.conf +++ /dev/null @@ -1,74 +0,0 @@ -registry { - # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa - type = "file" - - nacos { - serverAddr = "localhost" - namespace = "public" - cluster = "default" - } - eureka { - serviceUrl = "http://localhost:1001/eureka" - application = "default" - weight = "1" - } - redis { - serverAddr = "localhost:6379" - db = "0" - } - zk { - cluster = "default" - serverAddr = "127.0.0.1:2181" - session.timeout = 6000 - connect.timeout = 2000 - } - consul { - cluster = "default" - serverAddr = "127.0.0.1:8500" - } - etcd3 { - cluster = "default" - serverAddr = "http://localhost:2379" - } - sofa { - serverAddr = "127.0.0.1:9603" - application = "default" - region = "DEFAULT_ZONE" - datacenter = "DefaultDataCenter" - cluster = "default" - group = "SEATA_GROUP" - addressWaitTime = "3000" - } - file { - name = "file.conf" - } -} - -config { - # file、nacos 、apollo、zk、consul、etcd3 - type = "file" - - nacos { - serverAddr = "localhost" - namespace = "public" - cluster = "default" - } - consul { - serverAddr = "127.0.0.1:8500" - } - apollo { - app.id = "seata-server" - apollo.meta = "http://192.168.1.204:8801" - } - zk { - serverAddr = "127.0.0.1:2181" - session.timeout = 6000 - connect.timeout = 2000 - } - etcd3 { - serverAddr = "http://localhost:2379" - } - file { - name = "file.conf" - } -} diff --git a/shop-user/shop-user-api/src/main/resources/test.properties b/shop-user/shop-user-api/src/main/resources/test.properties deleted file mode 100644 index d9d904a..0000000 --- a/shop-user/shop-user-api/src/main/resources/test.properties +++ /dev/null @@ -1,15 +0,0 @@ -server.port=8098 -spring.application.name=shop-user -spring.profiles.active=dev -spring.cloud.config.uri=http://127.0.0.1:8889/ -spring.cloud.config.label=master -spring.cloud.consul.port=8500 -spring.cloud.consul.discovery.tags=pager=shop-user -spring.cloud.consul.discovery.healthCheckInterval=30s -spring.cloud.consul.discovery.port=${server.port} -spring.cloud.consul.discovery.prefer-ip-address=true -spring.cloud.consul.discovery.instance-id=${spring.application.name}:${vcap.application.instance_id:${spring.application.instance_id:${random.value}:${server.port}}} -spring.cloud.alibaba.seata.tx-service-group=shop_user_tx_group -management.endpoints.web.exposure.include=refresh,health,info,hystrix.stream -mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl -mybatis.type-aliases-package=quick.pager.shop.model diff --git a/shop-user/shop-user-client/pom.xml b/shop-user/shop-user-client/pom.xml index b39e123..19dcc90 100644 --- a/shop-user/shop-user-client/pom.xml +++ b/shop-user/shop-user-client/pom.xml @@ -23,17 +23,9 @@ provided - - org.springframework.cloud - spring-cloud-starter-netflix-ribbon - 2.1.0.RELEASE - provided - - org.springframework.cloud spring-cloud-starter-openfeign - 2.1.0.RELEASE provided @@ -41,14 +33,6 @@ quick.pagershop-user-model${project.version} - provided - - - - quick.pager - shop-common - ${project.version} - provided diff --git a/shop-user/shop-user-client/src/main/java/quick/pager/shop/user/client/UserClient.java b/shop-user/shop-user-client/src/main/java/quick/pager/shop/user/client/UserClient.java index e792ba6..9714915 100644 --- a/shop-user/shop-user-client/src/main/java/quick/pager/shop/user/client/UserClient.java +++ b/shop-user/shop-user-client/src/main/java/quick/pager/shop/user/client/UserClient.java @@ -7,13 +7,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import quick.pager.shop.constants.ConstantsClient; -import quick.pager.shop.response.Response; import quick.pager.shop.user.fallback.UserFallbackFactory; -import quick.pager.shop.user.request.StationLetterRequest; import quick.pager.shop.user.request.UserRequest; import quick.pager.shop.user.response.AddressResponse; -import quick.pager.shop.user.response.StationLetterResponse; -import quick.pager.shop.user.response.UserInfoResponse; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.user.response.UserProfileResponse; /** * 用户模块 @@ -29,25 +27,19 @@ public interface UserClient { * @param userId 用户Id */ @RequestMapping(value = "/getUser/{userId}", method = RequestMethod.POST) - Response getUser(@PathVariable("userId") Long userId); + Response getUser(@PathVariable("userId") Long userId); /** * 批量获取用户信息 */ @RequestMapping(value = "/batchUser/profile", method = RequestMethod.POST) - Response> getBatchUser(@RequestBody UserRequest request); + Response> getBatchUser(@RequestBody UserRequest request); /** * 批量判断用户是否存在 */ @RequestMapping(value = "/isExists", method = RequestMethod.POST) - Response> isExists(@RequestBody UserRequest request); - - /** - * 查询站内信列表 - */ - @RequestMapping(value = "/queryStationLetter", method = RequestMethod.POST) - Response> queryStationLetter(@RequestBody StationLetterRequest request); + Response> isExists(@RequestBody UserRequest request); /** * 批量获取用户信息 diff --git a/shop-user/shop-user-client/src/main/java/quick/pager/shop/user/fallback/UserFallbackFactory.java b/shop-user/shop-user-client/src/main/java/quick/pager/shop/user/fallback/UserFallbackFactory.java index dda3d74..0de79bd 100644 --- a/shop-user/shop-user-client/src/main/java/quick/pager/shop/user/fallback/UserFallbackFactory.java +++ b/shop-user/shop-user-client/src/main/java/quick/pager/shop/user/fallback/UserFallbackFactory.java @@ -5,13 +5,11 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import quick.pager.shop.constants.ResponseStatus; -import quick.pager.shop.response.Response; -import quick.pager.shop.user.client.UserClient; -import quick.pager.shop.user.request.StationLetterRequest; import quick.pager.shop.user.request.UserRequest; import quick.pager.shop.user.response.AddressResponse; -import quick.pager.shop.user.response.StationLetterResponse; -import quick.pager.shop.user.response.UserInfoResponse; +import quick.pager.shop.user.response.Response; +import quick.pager.shop.user.response.UserProfileResponse; +import quick.pager.shop.user.client.UserClient; @Slf4j @Component @@ -21,29 +19,23 @@ public UserClient create(Throwable cause) { log.error("UserClient 进入熔断措施 msg = {}", cause.getMessage()); return new UserClient() { @Override - public Response getUser(Long userId) { + public Response getUser(Long userId) { log.error("进入熔断措施 UserClient.getUser"); return new Response<>(ResponseStatus.Code.EXCEPTION_CODE, ResponseStatus.PARAMS_EXCEPTION); } @Override - public Response> getBatchUser(UserRequest request) { + public Response> getBatchUser(UserRequest request) { log.error("进入熔断措施 UserClient.getBatchUser"); return new Response<>(ResponseStatus.Code.EXCEPTION_CODE, ResponseStatus.PARAMS_EXCEPTION); } @Override - public Response> isExists(UserRequest request) { + public Response> isExists(UserRequest request) { log.error("进入熔断措施 UserClient.isExists"); return new Response<>(ResponseStatus.Code.EXCEPTION_CODE, ResponseStatus.PARAMS_EXCEPTION); } - @Override - public Response> queryStationLetter(StationLetterRequest request) { - log.error("进入熔断措施 UserClient.queryStationLetter"); - return new Response<>(ResponseStatus.Code.EXCEPTION_CODE, ResponseStatus.TELNET_EXCEPTION); - } - @Override public Response address(Long addressId) { log.error("进入熔断措施 UserClient.queryAddress"); diff --git a/shop-user/shop-user-client/src/main/java/quick/pager/shop/user/package-info.java b/shop-user/shop-user-client/src/main/java/quick/pager/shop/user/package-info.java deleted file mode 100644 index 21d6337..0000000 --- a/shop-user/shop-user-client/src/main/java/quick/pager/shop/user/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package quick.pager.shop.user; diff --git a/shop-user/shop-user-model/pom.xml b/shop-user/shop-user-model/pom.xml index 8872dad..31cd57b 100644 --- a/shop-user/shop-user-model/pom.xml +++ b/shop-user/shop-user-model/pom.xml @@ -12,16 +12,45 @@ shop-user-model - - org.projectlombok - lombok - - quick.pager shop-common ${project.version} + + + com.alibaba + easyexcel + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + UTF-8 + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + + jar + + + + + + + diff --git a/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/package-info.java b/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/package-info.java deleted file mode 100644 index 21d6337..0000000 --- a/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package quick.pager.shop.user; diff --git a/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/request/NativeMessageOtherRequest.java b/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/request/NativeMessageOtherRequest.java new file mode 100644 index 0000000..09d4a58 --- /dev/null +++ b/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/request/NativeMessageOtherRequest.java @@ -0,0 +1,15 @@ +package quick.pager.shop.user.request; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 站内信 + * + * @author siguiyang + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class NativeMessageOtherRequest extends Request { + private static final long serialVersionUID = 8943906703926337166L; +} diff --git a/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/request/StationLetterRequest.java b/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/request/NativeMessagePageRequest.java similarity index 72% rename from shop-user/shop-user-model/src/main/java/quick/pager/shop/user/request/StationLetterRequest.java rename to shop-user/shop-user-model/src/main/java/quick/pager/shop/user/request/NativeMessagePageRequest.java index cfa025a..3e7a169 100644 --- a/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/request/StationLetterRequest.java +++ b/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/request/NativeMessagePageRequest.java @@ -2,7 +2,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; /** * 站内信 @@ -12,6 +11,6 @@ */ @EqualsAndHashCode(callSuper = true) @Data -public class StationLetterRequest extends PageRequest { +public class NativeMessagePageRequest extends PageRequest { private static final long serialVersionUID = -1376351904746695505L; } diff --git a/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/request/UserAddressPageRequest.java b/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/request/UserAddressPageRequest.java index beae432..db13221 100644 --- a/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/request/UserAddressPageRequest.java +++ b/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/request/UserAddressPageRequest.java @@ -2,7 +2,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; /** * 用户地址列表 diff --git a/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/request/UserPageRequest.java b/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/request/UserPageRequest.java index 6245e10..13f56b6 100644 --- a/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/request/UserPageRequest.java +++ b/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/request/UserPageRequest.java @@ -2,7 +2,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.request.PageRequest; /** * 用户信息 diff --git a/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/request/UserSaveRequest.java b/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/request/UserSaveRequest.java deleted file mode 100644 index d2e5140..0000000 --- a/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/request/UserSaveRequest.java +++ /dev/null @@ -1,4 +0,0 @@ -package quick.pager.shop.user.request; - -public class UserSaveRequest { -} diff --git a/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/response/NativeMessageResponse.java b/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/response/NativeMessageResponse.java new file mode 100644 index 0000000..bf9d8c9 --- /dev/null +++ b/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/response/NativeMessageResponse.java @@ -0,0 +1,15 @@ +package quick.pager.shop.user.response; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 站内信 + * + * @author siguiyang + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class NativeMessageResponse extends BasicResponse { + private static final long serialVersionUID = -8645225790778661418L; +} diff --git a/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/response/StationLetterResponse.java b/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/response/StationLetterResponse.java deleted file mode 100644 index 48d20ae..0000000 --- a/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/response/StationLetterResponse.java +++ /dev/null @@ -1,4 +0,0 @@ -package quick.pager.shop.user.response; - -public class StationLetterResponse { -} diff --git a/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/response/UserInfoResponse.java b/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/response/UserProfileResponse.java similarity index 58% rename from shop-user/shop-user-model/src/main/java/quick/pager/shop/user/response/UserInfoResponse.java rename to shop-user/shop-user-model/src/main/java/quick/pager/shop/user/response/UserProfileResponse.java index 4449c39..ff4bb71 100644 --- a/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/response/UserInfoResponse.java +++ b/shop-user/shop-user-model/src/main/java/quick/pager/shop/user/response/UserProfileResponse.java @@ -1,10 +1,9 @@ package quick.pager.shop.user.response; -import java.util.Date; +import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; -import quick.pager.shop.response.BasicResponse; /** * 用户信息 @@ -13,7 +12,7 @@ */ @EqualsAndHashCode(callSuper = true) @Data -public class UserInfoResponse extends BasicResponse { +public class UserProfileResponse extends BasicResponse { private static final long serialVersionUID = -2189550686183346833L; private Long id; @@ -21,20 +20,29 @@ public class UserInfoResponse extends BasicResponse { * 手机号 */ private String phone; - - private String password; - - private Integer serverStatus; - + /** + * 昵称 + */ private String username; - + /** + * 性别 + * true 男，false 女 + */ private Boolean gender; - + /** + * 年龄 + */ private Integer age; - + /** + * 邮箱地址 + */ private String email; - - private Date birthday; - + /** + * 生日 + */ + private LocalDateTime birthday; + /** + * 头像地址 + */ private String avatar; }