Merge branch 'master' of github.com:jigsaw-projects/jigsaw-payment

To remove qiyi identification.
This commit is contained in:
shamphone
2017-09-29 09:45:57 +08:00
13 changed files with 7 additions and 2906 deletions
-80
View File
@@ -1,80 +0,0 @@
## 1.0.36 2017-07-04
### Changed
- 需求id:银行卡绑卡附加协议
## 1.0.33 2017-06-20
### Changed
- 需求id:支付退款接口更新订单状态
## 1.0.31
### Changed
- 需求id:http://pms.qiyi.domain/browse/PAYDEV-524 支付中心订单差异处理后台退款功能优化 苹果自动续费退款兼容处理
## 1.0.30
### Changed
- 需求id:http://pms.qiyi.domain/browse/BASELINEBUG-7601 修改信用卡不许钥有效期及CVV到校验逻辑 修改后台退款对应到大类ID
## 1.0.29
### Changed
- 需求id:http://pms.qiyi.domain/browse/PAYDEV-457 绑卡流程优化,判断信用卡是否需要输入CVV与有效期
## 1.0.28
### Changed
- 需求id:http://pms.qiyi.domain/browse/PAYDEV-431 passport接口替换为调用sdk
## 1.0.27
### Added
- 需求 :对账增加查询与退款接口
## 1.0.26
### Changed
- 更新订单优化
## 1.0.25
### Changed
- 增加prepareOrder接口
## 1.0.24
### Changed
- 银行卡立减活动
## 1.0.23
### Changed
- 苹果退款查单
## 1.0.22
### Changed
- 修改查询receipt方式
- 修改统计日志
## 1.0.21
### Changed
- 变更:支持百度API按照百分比切量
## 1.0.20
### Added
- 需求ID : http://pms.qiyi.domain/browse/PAYREQ-168 苹果自动续费查单
## 1.0.19
### Added
- 需求ID : http://pms.qiyi.domain/browse/PAYDEV-171 百度API
- 需求ID : http://pms.qiyi.domain/browse/PAYDEV-238 退款接口合并
## 1.0.18
### Added
- 需求ID : http://pms.qiyi.domain/browse/VIPDEV-27 增加超商支付渠道
### Changed
- 变更02:退款接口合并
### Changed
- 变更01:超商支付增加超时时间
+1 -2
View File
@@ -1,2 +1 @@
# 支付网关前置
路由转换,连接支付渠道与最终用户
# 快捷支付接口的实现
@@ -109,7 +109,7 @@ message PayOrder {
optional EntityType sub_type = 52;//主体类型
optional string sub_name = 53;//主体名称
optional string sub_account_id = 54;//主体帐号
optional int32 sub_account_type = 55;//主体帐号类型:银行卡,奇点,奇豆,钱包,支付渠道
optional int32 sub_account_type = 55;//主体帐号类型:银行卡,钱包,支付渠道
optional string sub_ip = 56;// 主体使用的IP
optional string sub_mobile = 57;//主体使用的手机号
optional string sub_client_code = 58;//发起交易的客户端代码
@@ -398,4 +398,4 @@ message Certification {
optional string digest = 18; //校验md5
optional bytes data = 19; //文件内容
optional string memo = 20; //描述
}
}
-97
View File
@@ -1,97 +0,0 @@
/*
Navicat MySQL Data Transfer
Source Server : jigsaw-payment
Source Server Version : 50719
Source Host : localhost:3306
Source Database : jigsaw-payment
Target Server Type : MYSQL
Target Server Version : 50719
File Encoding : 65001
Date: 2017-08-10 19:19:42
*/
SET FOREIGN_KEY_CHECKS=0;
-- ----------------------------
-- Table structure for pay_order_0
-- ----------------------------
DROP TABLE IF EXISTS `pay_order_0`;
CREATE TABLE `pay_order_0` (
`id` bigint(20) NOT NULL COMMENT '自增ID,兼容遗留数据',
`code` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '交易流水号',
`version` bigint(20) NOT NULL DEFAULT '0',
`app_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '发起交易的app id',
`pay_scenarios` int(4) NOT NULL COMMENT '发起交易的场景,包括api, 通用收银台,充值收银台,扫码支付等',
`notify_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '异步通知url',
`return_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '同步通知url',
`status` int(9) NOT NULL COMMENT '订单状态 1:已支付;2:未支付;3:等待中;4:退单;5:短信支付扣费成功;6:冻结;7:关闭',
`create_time` datetime NOT NULL,
`update_time` datetime NOT NULL,
`expire_time` datetime NOT NULL COMMENT '过期时间',
`pay_time` datetime NOT NULL COMMENT '支付时间',
`error_code` varchar(32) NOT NULL COMMENT '如果支付失败,这里需记录错误码',
`error_detail` varchar(128) NOT NULL COMMENT '详细错误信息,如果支付失败,需要在这里记录错误信息',
`partner_order_no` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '接入方订单号',
`pay_mode` tinyint(10) NOT NULL COMMENT '0.正常订单,1.代表测试订单',
`order_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '订单ID,记录用户购买的产品信息(需使用产品查询接口)',
`order_title` varchar(62) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '订单名称',
`order_detail` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '订单描述',
`order_show_url` varchar(256) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '订单显示的url地址',
`fee` int(9) NOT NULL COMMENT '预期金额',
`fee_real` int(9) NOT NULL COMMENT '实际支付总金额',
`fee_unit` tinyint(2) NOT NULL DEFAULT '1' COMMENT '货币类型 ',
`sub_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '交易主体不仅仅是用户,也可以是商户',
`sub_type` int(9) NOT NULL COMMENT '交易主体类型',
`sub_name` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '交易主体名称',
`sub_account_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '交易主体账号',
`sub_account_type` int(10) NOT NULL COMMENT '交易主体使用的账号类型;银行卡、钱包、奇点、奇豆等',
`sub_ip` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '交易主体ip地址',
`sub_mobile` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '交易主体使用的手机号',
`sub_client_code` varchar(16) NOT NULL COMMENT '交易主体的客户端代码,发起交易的平台代码,参考公司标准代码规范',
`sub_device_id` varchar(32) NOT NULL COMMENT '交易主体使用的设备',
`sub_email` varchar(128) NOT NULL COMMENT '交易主体的邮箱【预留】',
`sub_location` varchar(128) NOT NULL COMMENT '交易主体在交易发生时所在的位置【预留】',
`sub_country_code` varchar(128) NOT NULL COMMENT '交易主体所在的国家代码,默认为中国【预留】',
`partner_id` int(9) NOT NULL COMMENT '交易对手的Id,接入方ID',
`partner_type` int(9) NOT NULL COMMENT '交易对手的类型',
`partner_account_id` int(9) NOT NULL COMMENT '交易对手的账号,商户号pay_service_account的ID',
`partner_name` varchar(32) NOT NULL COMMENT '交易对手的名称',
`source_pay_type` int(9) NOT NULL COMMENT '用户选择的交易渠道实体编码',
`dest_pay_type` int(9) NOT NULL COMMENT '实际执行的交易渠道虚拟账户编码',
`third_create_time` datetime NOT NULL COMMENT '第三方创建时间',
`third_pay_time` datetime NOT NULL COMMENT '第三方创建时间',
`third_trade_code` varchar(256) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '第三方交易订单号',
`current_key` int(9) NOT NULL,
PRIMARY KEY (`code`),
KEY `idx_pay_uid_time` (`sub_id`,`create_time`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
DROP TABLE IF EXISTS `pay_order_1`;
CREATE TABLE `pay_order_1` like `pay_order_0` ;
DROP TABLE IF EXISTS `pay_order_2`;
CREATE TABLE `pay_order_2` like `pay_order_0` ;
DROP TABLE IF EXISTS `pay_order_3`;
CREATE TABLE `pay_order_3` like `pay_order_0` ;
DROP TABLE IF EXISTS `pay_order_4`;
CREATE TABLE `pay_order_4` like `pay_order_0` ;
DROP TABLE IF EXISTS `pay_order_5`;
CREATE TABLE `pay_order_5` like `pay_order_0` ;
DROP TABLE IF EXISTS `pay_order_6`;
CREATE TABLE `pay_order_6` like `pay_order_0` ;
DROP TABLE IF EXISTS `pay_order_7`;
CREATE TABLE `pay_order_7` like `pay_order_0` ;
DROP TABLE IF EXISTS `pay_order_8`;
CREATE TABLE `pay_order_8` like `pay_order_0` ;
DROP TABLE IF EXISTS `pay_order_9`;
CREATE TABLE `pay_order_9` like `pay_order_0` ;
@@ -19,7 +19,7 @@
# log4j.rootCategory = info, Console
#------------------------------------------------------------------------------
#
# The following properties configure the Daily Rolling File appender for qipu exporter.
# The following properties configure the Daily Rolling File appender for exporter.
#
#------------------------------------------------------------------------------
log4j.logger.org.jigsaw = debug, Console
@@ -19,7 +19,7 @@
# log4j.rootCategory = info, Console
#------------------------------------------------------------------------------
#
# The following properties configure the Daily Rolling File appender for qipu exporter.
# The following properties configure the Daily Rolling File appender for exporter.
#
#------------------------------------------------------------------------------
log4j.logger.org.jigsaw.payment = debug, Console
@@ -1,37 +0,0 @@
/*
Navicat MySQL Data Transfer
Source Server : bj.payaccount.w.qiyi.db
Source Server Version : 50626
Source Host : bj.payaccount.w.qiyi.db:8847
Source Database : pay_account
Target Server Type : MYSQL
Target Server Version : 50626
File Encoding : 65001
Date: 2017-08-18 18:50:13
*/
SET FOREIGN_KEY_CHECKS=0;
-- ----------------------------
-- Table structure for account_channel_pki
-- ----------------------------
DROP TABLE IF EXISTS `account_channel_pki`;
CREATE TABLE `account_channel_pki` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
`channel_entity_id` int(11) NOT NULL DEFAULT '0' COMMENT 'pay_partner固定编码',
`channel_account_no` varchar(128) NOT NULL COMMENT '商户号',
`type` int(11) NOT NULL COMMENT '文件类型:1.P12;2.CER;3.JKS;4.pem; 5.pfx',
`status` int(11) NOT NULL COMMENT '状态: 1.有效;2.过期',
`memo` varchar(512) NOT NULL COMMENT '描述',
`usage` int(11) NOT NULL COMMENT '用途:1.SSL 2.SIGN 3.ENC 4.CHANNEL_SSL 5.CHANNEL_SIGN 6.CHANNEL_ENC',
`pass_phrase` varchar(128) NOT NULL COMMENT '私钥密码',
`data` blob COMMENT '文件内容',
`digest` varchar(32) NOT NULL COMMENT '校验md5',
`create_time` timestamp NOT NULL,
`update_time` timestamp NOT NULL,
PRIMARY KEY (`id`),
KEY `idx_account` (`channel_entity_id`,`channel_account_no`)
) ENGINE=InnoDB AUTO_INCREMENT=33 DEFAULT CHARSET=utf8;
+1 -1
View File
@@ -12,7 +12,7 @@ CREATE TABLE `pay_account_0` (
`order_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '签约并支付时关联的订单号',
`type` tinyint(2) NOT NULL DEFAULT '2' COMMENT '账户类型',
`account_title` bigint(20) NOT NULL DEFAULT '0' COMMENT '会计科目代码',
`fee_unit` tinyint(4) NOT NULL DEFAULT '1' COMMENT '货币类型 1、人民币 2、奇豆 3、积分 4、代金券 5、美元 6、台币',
`fee_unit` tinyint(4) NOT NULL DEFAULT '1' COMMENT '货币类型 1、人民币 2、积分 3、代金券 4、美元 5、台币',
`third_type` int(8) NOT NULL DEFAULT '0' COMMENT '第三方渠道ID,pay_partner表维护',
`third_account` varchar(32) NOT NULL DEFAULT '' COMMENT '第三方的用户账户',
`third_param` varchar(1024) NOT NULL DEFAULT '' COMMENT '第三方凭证信息,通用字段,每个渠道区别维护',
@@ -15,7 +15,7 @@ CREATE TABLE `pay_contract_account_0` (
`owner_id` bigint(20) NOT NULL COMMENT '用户id',
`type` tinyint(2) NOT NULL DEFAULT '2' COMMENT '账户类型',
`order_id` bigint(20) NOT NULL COMMENT '签约并支付时关联的订单号',
`fee_unit` tinyint(4) NOT NULL DEFAULT '1' COMMENT '货币类型 1、人民币 2、奇豆 3、积分 4、代金券 5、美元 6、台币',
`fee_unit` tinyint(4) NOT NULL DEFAULT '1' COMMENT '货币类型 1、人民币 2、积分 3、代金券',
`contract_account` varchar(20) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT '签约账号,如银行卡号,第三方平台的账户号',
`mobile_number` varchar(20) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT '银行预留手机号',
-85
View File
@@ -1,85 +0,0 @@
SET FOREIGN_KEY_CHECKS=0;
-- ----------------------------
-- Table structure for pay_order_0
-- ----------------------------
DROP TABLE IF EXISTS `pay_order_0`;
CREATE TABLE `pay_order_0` (
`key` bigint(20) NOT NULL COMMENT '内部主键,自增型',
`id` bigint(20) NOT NULL COMMENT '交易流水号,用于分表分库',
`version` bigint(20) NOT NULL DEFAULT '0',
`app_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '发起交易的app id',
`pay_scenarios` int(4) NOT NULL COMMENT '发起交易的场景,包括api, 通用收银台,充值收银台,扫码支付等',
`notify_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '异步通知url',
`return_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '同步通知url',
`status` int(9) NOT NULL COMMENT '订单状态 1:已支付;2:未支付;3:等待中;4:退单;5:短信支付扣费成功;6:冻结;7:关闭',
`create_time` datetime NOT NULL,
`update_time` datetime NOT NULL,
`expire_time` datetime NOT NULL COMMENT '过期时间',
`pay_time` datetime NOT NULL COMMENT '支付时间',
`error_code` varchar(32) NOT NULL COMMENT '如果支付失败,这里需记录错误码',
`error_detail` varchar(128) NOT NULL COMMENT '详细错误信息,如果支付失败,需要在这里记录错误信息',
`partner_order_no` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '接入方订单号',
`pay_mode` tinyint(10) NOT NULL COMMENT '0.正常订单,1.代表测试订单',
`order_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '订单ID,记录用户购买的产品信息(需使用产品查询接口)',
`order_title` varchar(62) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '订单名称',
`order_detail` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '订单描述',
`order_show_url` varchar(256) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '订单显示的url地址',
`fee` int(9) NOT NULL COMMENT '预期金额',
`fee_real` int(9) NOT NULL COMMENT '实际支付总金额',
`fee_unit` tinyint(2) NOT NULL DEFAULT '1' COMMENT '货币类型 ',
`sub_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '交易主体不仅仅是用户,也可以是商户',
`sub_type` int(9) NOT NULL COMMENT '交易主体类型',
`sub_name` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '交易主体名称',
`sub_account_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '交易主体账号',
`sub_account_type` int(10) NOT NULL COMMENT '交易主体使用的账号类型;银行卡、钱包、奇点、奇豆等',
`sub_ip` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '交易主体ip地址',
`sub_mobile` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '交易主体使用的手机号',
`sub_client_code` varchar(16) NOT NULL COMMENT '交易主体的客户端代码,发起交易的平台代码,参考公司标准代码规范',
`sub_device_id` varchar(32) NOT NULL COMMENT '交易主体使用的设备',
`sub_email` varchar(128) NOT NULL COMMENT '交易主体的邮箱【预留】',
`sub_location` varchar(128) NOT NULL COMMENT '交易主体在交易发生时所在的位置【预留】',
`sub_country_code` varchar(128) NOT NULL COMMENT '交易主体所在的国家代码,默认为中国【预留】',
`partner_id` int(9) NOT NULL COMMENT '交易对手的Id,接入方ID',
`partner_type` int(9) NOT NULL COMMENT '交易对手的类型',
`partner_account_id` int(9) NOT NULL COMMENT '交易对手的账号,商户号pay_service_account的ID',
`partner_name` varchar(32) NOT NULL COMMENT '交易对手的名称',
`source_pay_type` int(9) NOT NULL COMMENT '用户选择的交易渠道实体编码',
`dest_pay_type` int(9) NOT NULL COMMENT '实际执行的交易渠道虚拟账户编码',
`third_create_time` datetime NOT NULL COMMENT '第三方创建时间',
`third_pay_time` datetime NOT NULL COMMENT '第三方创建时间',
`third_trade_code` varchar(256) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '第三方交易订单号',
`current_key` int(9) NOT NULL,
PRIMARY KEY (`key`),
UNIQUE KEY `idx_pay_order_id` (`id`) USING BTREE,
KEY `idx_pay_order_sub_id` (`sub_id`),
KEY `idx_pay_order_partner_id` (`partner_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
DROP TABLE IF EXISTS `pay_order_1`;
CREATE TABLE `pay_order_1` like `pay_order_0` ;
DROP TABLE IF EXISTS `pay_order_2`;
CREATE TABLE `pay_order_2` like `pay_order_0` ;
DROP TABLE IF EXISTS `pay_order_3`;
CREATE TABLE `pay_order_3` like `pay_order_0` ;
DROP TABLE IF EXISTS `pay_order_4`;
CREATE TABLE `pay_order_4` like `pay_order_0` ;
DROP TABLE IF EXISTS `pay_order_5`;
CREATE TABLE `pay_order_5` like `pay_order_0` ;
DROP TABLE IF EXISTS `pay_order_6`;
CREATE TABLE `pay_order_6` like `pay_order_0` ;
DROP TABLE IF EXISTS `pay_order_7`;
CREATE TABLE `pay_order_7` like `pay_order_0` ;
DROP TABLE IF EXISTS `pay_order_8`;
CREATE TABLE `pay_order_8` like `pay_order_0` ;
DROP TABLE IF EXISTS `pay_order_9`;
CREATE TABLE `pay_order_9` like `pay_order_0` ;
@@ -1,37 +0,0 @@
/*
Navicat MySQL Data Transfer
Source Server : online-qiyi_pay
Source Server Version : 50626
Source Host : bj.qiyipay.r.qiyi.db:6217
Source Database : qiyi_pay
Target Server Type : MYSQL
Target Server Version : 50626
File Encoding : 65001
Date: 2017-08-17 17:33:39
*/
SET FOREIGN_KEY_CHECKS=0;
-- ----------------------------
-- Table structure for pay_partner
-- ----------------------------
DROP TABLE IF EXISTS `pay_partner`;
CREATE TABLE `pay_partner` (
`id` int(20) NOT NULL AUTO_INCREMENT,
`name` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
`type` decimal(19,0) NOT NULL,
`priority` int(9) DEFAULT NULL,
`email` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`phone` varchar(20) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`contact` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`create_user` decimal(19,0) NOT NULL,
`create_time` datetime NOT NULL,
`update_user` decimal(19,0) DEFAULT NULL,
`update_time` datetime DEFAULT NULL,
`version` int(9) NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `pay_partner_name_uni_inx` (`name`)
) ENGINE=InnoDB AUTO_INCREMENT=306 DEFAULT CHARSET=utf8;
@@ -1,46 +0,0 @@
/*
Navicat MySQL Data Transfer
Source Server : online-qiyi_pay
Source Server Version : 50626
Source Host : bj.qiyipay.r.qiyi.db:6217
Source Database : qiyi_pay
Target Server Type : MYSQL
Target Server Version : 50626
File Encoding : 65001
Date: 2017-08-17 17:34:10
*/
SET FOREIGN_KEY_CHECKS=0;
-- ----------------------------
-- Table structure for pay_payment_service
-- ----------------------------
DROP TABLE IF EXISTS `pay_payment_service`;
CREATE TABLE `pay_payment_service` (
`id` int(20) NOT NULL AUTO_INCREMENT,
`name` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
`description` varchar(256) DEFAULT NULL COMMENT '备注说明',
`type` int(9) NOT NULL,
`class_name` varchar(256) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
`pay_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
`contract_id` decimal(19,0) DEFAULT NULL,
`partner_id` decimal(19,0) DEFAULT NULL,
`rate_info_id` decimal(19,0) DEFAULT NULL,
`status` int(9) NOT NULL,
`create_user` decimal(19,0) NOT NULL,
`create_time` datetime NOT NULL,
`update_user` decimal(19,0) DEFAULT NULL,
`update_time` datetime DEFAULT NULL,
`version` int(9) NOT NULL,
`total_money` decimal(19,0) NOT NULL,
`total_rate_money` decimal(19,0) NOT NULL,
`payment_service_type` int(6) DEFAULT NULL,
`dut_type` int(10) DEFAULT NULL COMMENT '支付类型(支付,签约,代扣,签约支付)',
`is_third_channel` smallint(2) DEFAULT NULL COMMENT '是否第三方通道1是0否',
PRIMARY KEY (`id`),
UNIQUE KEY `service_name_unq_inx` (`name`),
UNIQUE KEY `service_pay_code_unq_inx` (`pay_code`)
) ENGINE=InnoDB AUTO_INCREMENT=454 DEFAULT CHARSET=utf8;
File diff suppressed because it is too large Load Diff