吴程程 / gxb-doc · Commits

Commit fade7bda32fae03bd17f0ddc2c27acb27d01ab80

Authored by 李星
2 parents 1a634aa5 346692ae

Merge branch 'master' of http://gitlab.gaoxiaobang.com/gxb-wiki/gxb-doc

Inline Side-by-side
Showing 3 changed files with 898 additions and 1 deletions
database/sql_log.sql
  View file @fade7bd
1   -
2 1 # 什么时间加的,谁加的,干什么的
3 2 #SQL语句
4 3  
... ... @@ -2484,3 +2483,266 @@ CREATE TABLE `gxb_core`.`programming_live_room` (
2484 2483 -- 2017-08-28 李星 跟随式编程房间表 end
2485 2484 -- -------------------------------------
2486 2485  
  2486 +-- ----------------------------
  2487 +-- 2017-08-30
  2488 +-- 罗銅 刘岱鹏
  2489 +-- 代码版本 feature/fix170831
  2490 +-- 脚本版本 201708301449
  2491 +-- 涉及功能 首页增加模版 增加师资管理 添加学校课程
  2492 +-- START
  2493 +-- ----------------------------
  2494 +alter table zygj_classroom add enter_year varchar(10) not null default '' comment '入学年份';
  2495 +alter table zygj_teacher modify teacher_type tinyint(2) NOT NULL DEFAULT '0' COMMENT '师资类型,1:讲师-企业老师，2:讲师-学校老师,3:全职讲师';
  2496 +update zygj_teacher set teacher_type = 3 where job_type = 1;
  2497 +alter table zygj_teacher add teacher_level tinyint(2) NOT NULL DEFAULT '0' COMMENT '师资级别,1:实习，2:初级，3:高级，4:金牌，5:特级，6:特约';
  2498 +alter table zygj_teacher add address varchar(255) NOT NULL DEFAULT '' COMMENT '详细地址';
  2499 +alter table zygj_teacher add `credentials_photo_url` varchar(255) NOT NULL DEFAULT '' COMMENT '证件照片url,格式 jpg、png';
  2500 +alter table zygj_teacher add `credentials_photo_name` varchar(255) not null default '' comment '证件照片名称';
  2501 +
  2502 +update zygj_teacher set company = concat(company,' ',position) where position != '';
  2503 +
  2504 +CREATE TABLE `zygj_teacher_education` (
  2505 + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id',
  2506 + teacher_id bigint(20) not null default '0' comment '专业共建老师id',
  2507 + type tinyint(2) not null default '1' comment '学历类型，最近学历：1，第一学历：2',
  2508 + school varchar(100) not null default '' comment '毕业院校',
  2509 + major varchar(100) not null default '' comment '专业',
  2510 + education tinyint(2) NOT NULL DEFAULT '0' COMMENT '最近学历 (1 博士、2 硕士、3 本科、4 大专、5 高中)',
  2511 + `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
  2512 + `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
  2513 + `delete_flag` tinyint(2) NOT NULL DEFAULT '1' COMMENT '1 正常，0 删除',
  2514 + PRIMARY KEY (`id`)
  2515 +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='老师学历表';
  2516 +
  2517 +alter table zygj_teacher add linkman_mobile varchar(50) NOT NULL DEFAULT '' COMMENT '推荐人联系方式';
  2518 +alter table zygj_teacher add contract_start_time datetime DEFAULT NULL COMMENT '合同开始时间';
  2519 +alter table zygj_teacher add contract_end_time datetime DEFAULT NULL COMMENT '合同结束时间';
  2520 +alter table zygj_teacher add contract_photo_url varchar(255) NOT NULL DEFAULT '' COMMENT '合同照片url';
  2521 +alter table zygj_teacher add contract_photo_name varchar(255) NOT NULL DEFAULT '' COMMENT '合同照片名称';
  2522 +alter table zygj_teacher add card_photo_url varchar(255) NOT NULL DEFAULT '' COMMENT '身份证照片url';
  2523 +alter table zygj_teacher add card_photo_name varchar(255) NOT NULL DEFAULT '' COMMENT '身份证照片名称';
  2524 +alter table zygj_teacher add benchmarkc_condition varchar(255) NOT NULL DEFAULT '' COMMENT '课酬约束条件';
  2525 +alter table zygj_teacher add bank_card varchar(255) NOT NULL DEFAULT '' COMMENT '银行卡号';
  2526 +alter table zygj_teacher add open_bank varchar(255) NOT NULL DEFAULT '' COMMENT '开户行';
  2527 +alter table zygj_teacher add open_bank_address varchar(255) NOT NULL DEFAULT '' COMMENT '开户网点';
  2528 +alter table zygj_teacher add replace_name varchar(255) NOT NULL DEFAULT '' COMMENT '代收款人姓名';
  2529 +alter table zygj_teacher add replace_bank_card varchar(255) NOT NULL DEFAULT '' COMMENT '代收款人银行卡号';
  2530 +alter table zygj_teacher add replace_open_bank varchar(255) NOT NULL DEFAULT '' COMMENT '代收款人开户行';
  2531 +alter table zygj_teacher add replace_open_bank_address varchar(255) NOT NULL DEFAULT '' COMMENT '代收款人开户网点';
  2532 +alter table zygj_teacher modify `introduction` mediumtext default null COMMENT '个人简介';
  2533 +ALTER TABLE `zygj_teacher` CHANGE `created_at` `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
  2534 +
  2535 +alter table zygj_teacher_class add judges varchar(100) NOT NULL DEFAULT '' COMMENT '认证评委名称';
  2536 +alter table zygj_teacher_class add score float NOT NULL DEFAULT '0' COMMENT '认证评分';
  2537 +alter table zygj_teacher_class add authenticate_time datetime DEFAULT null COMMENT '认证时间';
  2538 +
  2539 +ALTER TABLE `zygj_class_material` CHANGE `created_at` `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
  2540 +ALTER TABLE `zygj_class_material` CHANGE `updated_at` `updated_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
  2541 +
  2542 +
  2543 +
  2544 +# ------------
  2545 +CREATE TABLE
  2546 + zygj_school_class
  2547 + (
  2548 + class_id bigint NOT NULL AUTO_INCREMENT,
  2549 + uuid VARCHAR(255) COLLATE utf8_general_ci NOT NULL COMMENT '视频上传小工具要用uuid',
  2550 + course_id bigint NOT NULL COMMENT '课程id',
  2551 + user_id bigint NOT NULL COMMENT '创建者id',
  2552 + editor_id bigint NOT NULL COMMENT '修改者id',
  2553 + tenant_id bigint COMMENT '租户id',
  2554 + from_tenant_id bigint COMMENT '购买租户id',
  2555 + class_name VARCHAR(255) COLLATE utf8_general_ci NOT NULL COMMENT '班次名称',
  2556 + intro VARCHAR(255) COLLATE utf8_general_ci COMMENT '班次简介',
  2557 + class_type VARCHAR(50) COLLATE utf8_general_ci DEFAULT 'Class' COMMENT
  2558 + '班次类型,MicroClass Class 微课 普通班次',
  2559 + level VARCHAR(255) COLLATE utf8_general_ci COMMENT '班次难度：10 易 20 中 30 难',
  2560 + use_type VARCHAR(255) COLLATE utf8_general_ci COMMENT '班次使用性质：10 自用 20 售卖',
  2561 + credit_score DECIMAL(5,2) COMMENT '学分',
  2562 + validate_type VARCHAR(255) COLLATE utf8_general_ci DEFAULT '30' COMMENT
  2563 + '校验类型: 10 其他用户 20 全校可选 30 授权 40 付费',
  2564 + teach_mode VARCHAR(255) COLLATE utf8_general_ci COMMENT
  2565 + '教学模式: 10 开放学习模式 20 传统学习模式 30 顺序学习模式 40 条件解锁模式',
  2566 + start_at DATETIME COMMENT '开课时间',
  2567 + conclude_at DATETIME COMMENT '结课时间',
  2568 + score_publish_day INT COMMENT '成绩公布时间（N天之后）',
  2569 + study_hour INT COMMENT '课程学时',
  2570 + experience_num INT COMMENT '试学的前N个视频',
  2571 + status VARCHAR(255) COLLATE utf8_general_ci COMMENT '状态: 10 待发布 20 预发布 30 已发布 40 关闭',
  2572 + delete_flag TINYINT COMMENT '1可用 0 不可用',
  2573 + created_at DATETIME,
  2574 + updated_at DATETIME,
  2575 + is_documented TINYINT(1) DEFAULT 0 COMMENT '是否归档',
  2576 + unlock_quiz_score INT DEFAULT 0 COMMENT '条件模式解锁条件,测验需要达到的分数',
  2577 + type VARCHAR(50) COLLATE utf8_general_ci DEFAULT 'Class' COMMENT 'SchoolClass',
  2578 + position bigint COMMENT '排序',
  2579 + is_top TINYINT COMMENT '是否置顶 -1:置顶,null:不置顶',
  2580 + is_move TINYINT DEFAULT 0 COMMENT '0 未移动数据 1 已移动数据',
  2581 + least_move_at DATETIME COMMENT '最早移动时间',
  2582 + dropping_self TINYINT DEFAULT 0,
  2583 + practice_hour INT COMMENT '实践课时',
  2584 + theory_hour INT COMMENT '理论课时',
  2585 + evaluation_mode TINYINT COMMENT '考核方式 1:线上考试 2:线下考试 3:答辩 4:大作业',
  2586 + version VARCHAR(255) COMMENT '版本',
  2587 + research_personnel VARCHAR(255) COMMENT '研发人员',
  2588 + from_class bigint COMMENT '班次复制售卖源',
  2589 + root_class bigint COMMENT '班次复制根源',
  2590 + PRIMARY KEY (class_id),
  2591 + INDEX index_course_id (course_id)
  2592 + )
  2593 + ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Class表映射表，表示学校自由课程，表结构跟class一致';
  2594 +
  2595 +CREATE TABLE
  2596 + zygj_class_category
  2597 + (
  2598 + id bigint NOT NULL AUTO_INCREMENT COMMENT 'id',
  2599 + name VARCHAR(50) NOT NULL COMMENT '分类名称',
  2600 + level INT DEFAULT 1 NOT NULL COMMENT '层级',
  2601 + parent_id bigint NOT NULL COMMENT '父节点ID',
  2602 + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  2603 + updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  2604 + delete_flag TINYINT DEFAULT 0 NOT NULL COMMENT '是否删除',
  2605 + tenant_id INT COMMENT '租户ID',
  2606 + user_id INT COMMENT '学生ID',
  2607 + PRIMARY KEY (id)
  2608 + )
  2609 + ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='班级分类';
  2610 +
  2611 +ALTER TABLE `zygj_material` CHANGE `user_id` `user_id` BIGINT(20) NOT NULL COMMENT '添加人';
  2612 +ALTER TABLE `zygj_material` CHANGE `delete_flag` `delete_flag` TINYINT(4) NOT NULL COMMENT '是否删除';
  2613 +ALTER TABLE `zygj_material` CHANGE `updated_at` `updated_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间';
  2614 +ALTER TABLE `zygj_material` CHANGE `created_at` `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间';
  2615 +ALTER TABLE `zygj_material` CHANGE `remark` `remark` MEDIUMTEXT CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '备注';
  2616 +ALTER TABLE `zygj_material` CHANGE `publish_at` `publish_at` DATE NULL DEFAULT NULL COMMENT '出版时间';
  2617 +ALTER TABLE `zygj_material` CHANGE `press` `press` VARCHAR(120) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '出版社';
  2618 +ALTER TABLE `zygj_material` CHANGE `isbn` `isbn` VARCHAR(120) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'ISBN号';
  2619 +ALTER TABLE `zygj_material` CHANGE `author` `author` VARCHAR(120) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '作者';
  2620 +ALTER TABLE `zygj_material` CHANGE `name` `name` VARCHAR(120) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '姓名';
  2621 +ALTER TABLE `zygj_material` CHANGE `id` `id` BIGINT(20) NOT NULL AUTO_INCREMENT COMMENT '主键ID';
  2622 +
  2623 +
  2624 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (1, '通识与公共基础课程', 1, 0, '2017-08-24 10:42:59', '2017-08-28 17:12:41', 1, null, null);
  2625 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (2, '思想政治类', 2, 1, '2017-08-24 10:42:59', '2017-08-28 17:15:25', 1, null, null);
  2626 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (3, '军事体育类', 2, 1, '2017-08-24 10:42:59', '2017-08-28 17:15:25', 1, null, null);
  2627 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (4, '通识类', 2, 1, '2017-08-24 10:42:59', '2017-08-28 17:15:25', 1, null, null);
  2628 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (5, '外语类', 2, 1, '2017-08-21 16:54:07', '2017-08-28 17:16:48', 1, null, null);
  2629 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (6, '数学类', 2, 1, '2017-08-21 16:54:07', '2017-08-28 17:16:48', 1, null, null);
  2630 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (7, '学科与专业基本课程', 1, 0, '2017-08-21 16:54:07', '2017-08-28 17:16:48', 1, null, null);
  2631 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (8, '学科基础（大类）平台课程', 2, 7, '2017-08-21 16:54:07', '2017-08-28 17:16:48', 1, null, null);
  2632 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (11, '专业基础课程', 2, 7, '2017-08-28 17:15:55', '2017-08-28 17:27:50', 1, null, null);
  2633 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (12, '专业与专业方向（模块）课程', 1, 0, '2017-08-28 17:15:55', '2017-08-28 17:27:50', 1, null, null);
  2634 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (13, '专业课程', 2, 12, '2017-08-28 17:15:55', '2017-08-28 17:27:50', 1, null, null);
  2635 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (14, '专业方向模块课程', 2, 12, '2017-08-28 17:15:55', '2017-08-28 17:27:50', 1, null, null);
  2636 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (15, '专业实验、实习、实践', 2, 12, '2017-08-28 17:15:55', '2017-08-28 17:27:50', 1, null, null);
  2637 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (16, '专业实训', 2, 12, '2017-08-28 17:15:55', '2017-08-28 17:27:50', 1, null, null);
  2638 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (17, '毕业设计（论文）', 2, 12, '2017-08-28 17:15:55', '2017-08-28 17:27:50', 1, null, null);
  2639 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (18, '交叉与个性发展课程', 1, 0, '2017-08-28 17:15:55', '2017-08-28 17:27:50', 1, null, null);
  2640 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (19, '跨学科课程', 2, 18, '2017-08-28 17:15:55', '2017-08-28 17:27:50', 1, null, null);
  2641 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (20, '创新创业训练计划', 2, 18, '2017-08-28 17:15:55', '2017-08-28 17:27:50', 1, null, null);
  2642 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (21, '个性选修课', 2, 18, '2017-08-28 17:15:55', '2017-08-28 17:27:50', 1, null, null);
  2643 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (22, '第二课堂', 1, 0, '2017-08-28 17:15:55', '2017-08-28 17:27:50', 1, null, null);
  2644 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (23, '社会实践', 2, 22, '2017-08-28 17:15:55', '2017-08-28 17:27:50', 1, null, null);
  2645 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (24, '健康教育', 2, 22, '2017-08-28 17:15:55', '2017-08-28 17:27:50', 1, null, null);
  2646 +INSERT INTO zygj_class_category (id, name, level, parent_id, created_at, updated_at, delete_flag, tenant_id, user_id) VALUES (25, '讲座、两组学习、劳动、社团活动等', 2, 22, '2017-08-28 17:15:55', '2017-08-28 17:27:50', 1, null, null);
  2647 +
  2648 +
  2649 +ALTER TABLE `zygj_solution_class` ADD `practice_hour` INT(11) NOT NULL DEFAULT '0' COMMENT '实践学时，小时为单位';
  2650 +ALTER TABLE `zygj_solution_class` ADD `theory_hour` INT(11) NOT NULL DEFAULT '0' COMMENT '理论学时，小时为单位';
  2651 +ALTER TABLE `zygj_solution_class` ADD `class_target` VARCHAR(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '0' COMMENT 'prefession,class 慧科课程 SchoolClass 学校自建课程';
  2652 +ALTER TABLE `zygj_solution_class` ADD `category_id` BIGINT(20) NOT NULL DEFAULT '0' COMMENT '课程分类，二级分类ID';
  2653 +
  2654 +ALTER TABLE `zygj_class_schedule` ADD `class_target` VARCHAR(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '0' COMMENT '课程类型';
  2655 +
  2656 +ALTER TABLE `zygj_class_schedule` ADD (teacher_name VARCHAR(50) COLLATE utf8_general_ci COMMENT '学校课程老师名称');
  2657 +
  2658 +# ------------
  2659 +CREATE TABLE `zygj_major` (
  2660 + `major_id` bigint(20) NOT NULL AUTO_INCREMENT,
  2661 + `product_direction` int(11) NOT NULL DEFAULT '0' COMMENT '产品方向，1:云计算、2:大数据技术与应用、3:智能硬件、4:虚拟现实（VR）、5:互联网产品设计、6:互联网营销、7:互联网金融、8:网络空间安全、9:人工智能、10:互联网医疗、11:互联网教育、12:智能制造',
  2662 + `name` varchar(60) COLLATE utf8mb4_bin NOT NULL COMMENT '专业名称',
  2663 + `synopsis` text COLLATE utf8mb4_bin NOT NULL COMMENT '专业简介',
  2664 + `cover` text CHARACTER SET utf8mb4 COMMENT '封面',
  2665 + `tenant_id` bigint(20) DEFAULT '0' COMMENT '所属学校id',
  2666 + `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
  2667 + `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
  2668 + `delete_flag` tinyint(2) NOT NULL DEFAULT '1',
  2669 + PRIMARY KEY (`major_id`)
  2670 +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='合作专业表';
  2671 +-- ----------------------------
  2672 +-- 2017-08-30 罗銅 高校邦Y-迭代1.6相关 END
  2673 +-- ----------------------------
  2674 +
  2675 +
  2676 +
  2677 +
  2678 +-- ----------------------------
  2679 +-- 2017-08-30
  2680 +-- 罗銅 刘岱鹏
  2681 +-- 代码版本 feature/fix170831
  2682 +-- 脚本版本 201708301623
  2683 +-- 涉及功能 feature/fix170831版本，sql脚本修复
  2684 +-- START
  2685 +-- ----------------------------
  2686 +
  2687 +update zygj_solution_class,class set zygj_solution_class.class_target=class.type where zygj_solution_class.class_target!='SchoolClass' and zygj_solution_class.class_id=class.class_id;
  2688 +alter table zygj_teacher modify city varchar(50) NOT NULL DEFAULT '' COMMENT '城市';
  2689 +
  2690 +-- ----------------------------
  2691 +-- 2017-08-30 罗銅 脚本版本 201708301623 END
  2692 +-- ----------------------------
  2693 +
  2694 +-- ----------------------------
  2695 +-- 2017-08-30
  2696 +-- 罗銅 刘岱鹏
  2697 +-- 代码版本 feature/fix170831
  2698 +-- 脚本版本 201708301735
  2699 +-- 涉及功能 feature/fix170831版本，sql脚本修复
  2700 +-- START
  2701 +-- ----------------------------
  2702 +
  2703 +ALTER TABLE `zygj_teacher` CHANGE `benchmarkc_condition` `benchmark_condition` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '课酬约束条件';
  2704 +
  2705 +-- ----------------------------
  2706 +-- 2017-08-30 罗銅 脚本版本 201708301735 END
  2707 +-- ----------------------------
  2708 +
  2709 +
  2710 +
  2711 +-- ----------------------------
  2712 +-- 2017-08-31
  2713 +-- 罗銅 刘岱鹏
  2714 +-- 代码版本 feature/fix170831
  2715 +-- 脚本版本 201708311952
  2716 +-- 涉及功能 feature/fix170831版本，sql脚本修复
  2717 +-- 执行环境 予发布和灰度
  2718 +-- START
  2719 +-- ----------------------------
  2720 +
  2721 +alter table zygj_solution add enter_year varchar(10) not null default '' comment '入学年份';
  2722 +
  2723 +-- ----------------------------
  2724 +-- 2017-08-31 罗銅 脚本版本 201708311952 END
  2725 +-- ----------------------------
  2726 +
  2727 +
  2728 +
  2729 +-- ----------------------------
  2730 +-- 2017-09-11
  2731 +-- 刘岱鹏
  2732 +-- 代码版本 无
  2733 +-- 脚本版本 201709111442
  2734 +-- 涉及功能 线上数据修正
  2735 +-- 执行环境 予发布和灰度
  2736 +-- START
  2737 +-- ----------------------------
  2738 +
  2739 +update zygj_class_category set name='学科基础︵大类︶平台课程' where id=8;
  2740 +update zygj_class_category set name='专业与专业方向︵模块︶课程' where id=12;
  2741 +update zygj_class_category set name='毕业设计︵论文︶' where id=17;
  2742 +
  2743 +-- ----------------------------
  2744 +-- 2017-09-11 刘岱鹏 脚本版本 201709111442 END
  2745 +-- ----------------------------
  2746 +
  2747 +
  2748 +
... ...
document/CAS及第三方登录技术文档.docx 0 → 100644
View file @fade7bd
No preview for this file type
standard/intellij-java-gxb-style.xml 0 → 100644
  View file @fade7bd
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<code_scheme name="GoogleStyle">
  3 + <option name="OTHER_INDENT_OPTIONS">
  4 + <value>
  5 + <!--缩进占用几个空格 google默认2,我们默认用4个 -->
  6 + <option name="INDENT_SIZE" value="4" />
  7 + <!-- google默认4,我们默认用8个 -->
  8 + <option name="CONTINUATION_INDENT_SIZE" value="8" />
  9 + <!--Tab 占用几个空格， google 默认2个 我们默认 4个-->
  10 + <option name="TAB_SIZE" value="2" />
  11 + <!--是否用tab 缩进-->
  12 + <option name="USE_TAB_CHARACTER" value="false" />
  13 + <option name="SMART_TABS" value="false" />
  14 + <!--代码出现label在当前基础上继续缩进空格数-->
  15 + <option name="LABEL_INDENT_SIZE" value="0" />
  16 + <!--如果是true 从开始缩进 LABEL_INDENT_SIZE-->
  17 + <option name="LABEL_INDENT_ABSOLUTE" value="false" />
  18 + <option name="USE_RELATIVE_INDENTS" value="false" />
  19 + </value>
  20 + </option>
  21 + <!--自动导入内容类 比如OnClickListener 不用写成 View.OnClickListener-->
  22 + <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
  23 + <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
  24 + <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
  25 + <!--保证不出现例如这样的import语句：import java.util.*;-->
  26 + <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
  27 + <value />
  28 + </option>
  29 + <!--import 布局 static import 空行 other import-->
  30 + <option name="IMPORT_LAYOUT_TABLE">
  31 + <value>
  32 + <package name="" withSubpackages="true" static="true" />
  33 + <emptyLine />
  34 + <package name="" withSubpackages="true" static="false" />
  35 + </value>
  36 + </option>
  37 + <!--一行最多多少列 google 默认100 我们 140-->
  38 + <option name="RIGHT_MARGIN" value="140" />
  39 + <!--一注释中的param 不对齐-->
  40 + <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
  41 + <!--一注释中的throws 不对齐-->
  42 + <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
  43 + <!--一注释中的空白行是否生成<p> 标签-->
  44 + <option name="JD_P_AT_EMPTY_LINES" value="false" />
  45 + <!--一注释中如果参数没有描述 就不存在改参数行-->
  46 + <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
  47 + <!--一注释中如果throws没有描述 就不存在改参数行-->
  48 + <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
  49 + <!--一注释中如果return 没有描述 就不存在改参数行-->
  50 + <option name="JD_KEEP_EMPTY_RETURN" value="false" />
  51 + <!--一格式化代码时控制语句 另起一行 比如 if(a == b) return ; return 会重新启一行 -->
  52 + <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
  53 + <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
  54 + <!--正常方法代码中间隔的最大空行数-->
  55 + <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
  56 + <!--类生明 与类具体内容中间最小的空行数-->
  57 + <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="0" />
  58 + <!--方法参数多行时是否对齐参数-->
  59 + <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
  60 + <!--for循环声明时 如果多行是否对齐-->
  61 + <option name="ALIGN_MULTILINE_FOR" value="false" />
  62 + <!--方法调用 wrap规则-->
  63 + <option name="CALL_PARAMETERS_WRAP" value="1" />
  64 + <!--方法声明 wrap 规则-->
  65 + <option name="METHOD_PARAMETERS_WRAP" value="1" />
  66 + <!--类集成 实现 wrap 规则-->
  67 + <option name="EXTENDS_LIST_WRAP" value="1" />
  68 + <!--方法声明 throws wrap 规则-->
  69 + <option name="THROWS_KEYWORD_WRAP" value="1" />
  70 + <!--链式调用 throws wrap 规则-->
  71 + <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
  72 + <!--表达式 wrap 规则-->
  73 + <option name="BINARY_OPERATION_WRAP" value="1" />
  74 + <!--表达式 另起一行 -->
  75 + <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
  76 + <!--三元表达式 wrap 规则-->
  77 + <option name="TERNARY_OPERATION_WRAP" value="1" />
  78 + <!--三元表达式 ？ ： 不在一行-->
  79 + <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
  80 + <!--for循环 wrap 规则-->
  81 + <option name="FOR_STATEMENT_WRAP" value="1" />
  82 + <!--数组初始化 wrap 规则-->
  83 + <option name="ARRAY_INITIALIZER_WRAP" value="1" />
  84 + <option name="WRAP_COMMENTS" value="true" />
  85 + <!--if 强制 大括号-->
  86 + <option name="IF_BRACE_FORCE" value="3" />
  87 + <!--do while 强制 大括号-->
  88 + <option name="DOWHILE_BRACE_FORCE" value="3" />
  89 + <!--while 强制 大括号-->
  90 + <option name="WHILE_BRACE_FORCE" value="3" />
  91 + <!--for 强制 大括号-->
  92 + <option name="FOR_BRACE_FORCE" value="3" />
  93 + <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
  94 + <AndroidXmlCodeStyleSettings>
  95 + <option name="USE_CUSTOM_SETTINGS" value="true" />
  96 + <option name="LAYOUT_SETTINGS">
  97 + <value>
  98 + <option name="INSERT_BLANK_LINE_BEFORE_TAG" value="false" />
  99 + </value>
  100 + </option>
  101 + </AndroidXmlCodeStyleSettings>
  102 + <JSCodeStyleSettings>
  103 + <option name="INDENT_CHAINED_CALLS" value="false" />
  104 + </JSCodeStyleSettings>
  105 + <Python>
  106 + <option name="USE_CONTINUATION_INDENT_FOR_ARGUMENTS" value="true" />
  107 + </Python>
  108 + <TypeScriptCodeStyleSettings>
  109 + <option name="INDENT_CHAINED_CALLS" value="false" />
  110 + </TypeScriptCodeStyleSettings>
  111 + <XML>
  112 + <option name="XML_ALIGN_ATTRIBUTES" value="false" />
  113 + <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
  114 + </XML>
  115 + <codeStyleSettings language="CSS">
  116 + <indentOptions>
  117 + <option name="INDENT_SIZE" value="4" />
  118 + <option name="CONTINUATION_INDENT_SIZE" value="8" />
  119 + <option name="TAB_SIZE" value="4" />
  120 + </indentOptions>
  121 + </codeStyleSettings>
  122 + <codeStyleSettings language="ECMA Script Level 4">
  123 + <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
  124 + <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
  125 + <option name="ALIGN_MULTILINE_FOR" value="false" />
  126 + <option name="CALL_PARAMETERS_WRAP" value="1" />
  127 + <option name="METHOD_PARAMETERS_WRAP" value="1" />
  128 + <option name="EXTENDS_LIST_WRAP" value="1" />
  129 + <option name="BINARY_OPERATION_WRAP" value="1" />
  130 + <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
  131 + <option name="TERNARY_OPERATION_WRAP" value="1" />
  132 + <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
  133 + <option name="FOR_STATEMENT_WRAP" value="1" />
  134 + <option name="ARRAY_INITIALIZER_WRAP" value="1" />
  135 + <option name="IF_BRACE_FORCE" value="3" />
  136 + <option name="DOWHILE_BRACE_FORCE" value="3" />
  137 + <option name="WHILE_BRACE_FORCE" value="3" />
  138 + <option name="FOR_BRACE_FORCE" value="3" />
  139 + <option name="PARENT_SETTINGS_INSTALLED" value="true" />
  140 + </codeStyleSettings>
  141 + <codeStyleSettings language="HTML">
  142 + <indentOptions>
  143 + <option name="INDENT_SIZE" value="4" />
  144 + <option name="CONTINUATION_INDENT_SIZE" value="8" />
  145 + <option name="TAB_SIZE" value="4" />
  146 + </indentOptions>
  147 + </codeStyleSettings>
  148 + <codeStyleSettings language="JAVA">
  149 + <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
  150 + <!--代码中最多留的空行-->
  151 + <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
  152 + <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
  153 + <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
  154 + <option name="ALIGN_MULTILINE_RESOURCES" value="false" />
  155 + <option name="ALIGN_MULTILINE_FOR" value="false" />
  156 + <option name="CALL_PARAMETERS_WRAP" value="1" />
  157 + <option name="METHOD_PARAMETERS_WRAP" value="1" />
  158 + <option name="EXTENDS_LIST_WRAP" value="1" />
  159 + <option name="THROWS_KEYWORD_WRAP" value="1" />
  160 + <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
  161 + <option name="BINARY_OPERATION_WRAP" value="1" />
  162 + <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
  163 + <option name="TERNARY_OPERATION_WRAP" value="1" />
  164 + <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
  165 + <option name="FOR_STATEMENT_WRAP" value="1" />
  166 + <option name="ARRAY_INITIALIZER_WRAP" value="1" />
  167 + <option name="WRAP_COMMENTS" value="true" />
  168 + <option name="IF_BRACE_FORCE" value="3" />
  169 + <option name="DOWHILE_BRACE_FORCE" value="3" />
  170 + <option name="WHILE_BRACE_FORCE" value="3" />
  171 + <option name="FOR_BRACE_FORCE" value="3" />
  172 + <option name="PARENT_SETTINGS_INSTALLED" value="true" />
  173 + <indentOptions>
  174 + <option name="INDENT_SIZE" value="4" />
  175 + <option name="CONTINUATION_INDENT_SIZE" value="8" />
  176 + <option name="TAB_SIZE" value="4" />
  177 + </indentOptions>
  178 + </codeStyleSettings>
  179 + <codeStyleSettings language="JSON">
  180 + <indentOptions>
  181 + <option name="CONTINUATION_INDENT_SIZE" value="4" />
  182 + <option name="TAB_SIZE" value="4" />
  183 + </indentOptions>
  184 + </codeStyleSettings>
  185 + <codeStyleSettings language="JavaScript">
  186 + <option name="RIGHT_MARGIN" value="140" />
  187 + <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
  188 + <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
  189 + <option name="ALIGN_MULTILINE_FOR" value="false" />
  190 + <option name="CALL_PARAMETERS_WRAP" value="1" />
  191 + <option name="METHOD_PARAMETERS_WRAP" value="1" />
  192 + <option name="BINARY_OPERATION_WRAP" value="1" />
  193 + <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
  194 + <option name="TERNARY_OPERATION_WRAP" value="1" />
  195 + <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
  196 + <option name="FOR_STATEMENT_WRAP" value="1" />
  197 + <option name="ARRAY_INITIALIZER_WRAP" value="1" />
  198 + <option name="IF_BRACE_FORCE" value="3" />
  199 + <option name="DOWHILE_BRACE_FORCE" value="3" />
  200 + <option name="WHILE_BRACE_FORCE" value="3" />
  201 + <option name="FOR_BRACE_FORCE" value="3" />
  202 + <option name="PARENT_SETTINGS_INSTALLED" value="true" />
  203 + <indentOptions>
  204 + <option name="INDENT_SIZE" value="4" />
  205 + <option name="TAB_SIZE" value="4" />
  206 + </indentOptions>
  207 + </codeStyleSettings>
  208 + <codeStyleSettings language="PROTO">
  209 + <option name="RIGHT_MARGIN" value="140" />
  210 + <indentOptions>
  211 + <option name="INDENT_SIZE" value="4" />
  212 + <option name="CONTINUATION_INDENT_SIZE" value="4" />
  213 + <option name="TAB_SIZE" value="4" />
  214 + </indentOptions>
  215 + </codeStyleSettings>
  216 + <codeStyleSettings language="protobuf">
  217 + <option name="RIGHT_MARGIN" value="140" />
  218 + <indentOptions>
  219 + <option name="INDENT_SIZE" value="4" />
  220 + <option name="CONTINUATION_INDENT_SIZE" value="4" />
  221 + <option name="TAB_SIZE" value="4" />
  222 + </indentOptions>
  223 + </codeStyleSettings>
  224 + <codeStyleSettings language="Python">
  225 + <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
  226 + <option name="RIGHT_MARGIN" value="140" />
  227 + <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
  228 + <option name="PARENT_SETTINGS_INSTALLED" value="true" />
  229 + <indentOptions>
  230 + <option name="INDENT_SIZE" value="4" />
  231 + <option name="CONTINUATION_INDENT_SIZE" value="8" />
  232 + <option name="TAB_SIZE" value="4" />
  233 + </indentOptions>
  234 + </codeStyleSettings>
  235 + <codeStyleSettings language="SASS">
  236 + <indentOptions>
  237 + <option name="CONTINUATION_INDENT_SIZE" value="8" />
  238 + <option name="TAB_SIZE" value="4" />
  239 + </indentOptions>
  240 + </codeStyleSettings>
  241 + <codeStyleSettings language="SCSS">
  242 + <indentOptions>
  243 + <option name="CONTINUATION_INDENT_SIZE" value="8" />
  244 + <option name="TAB_SIZE" value="4" />
  245 + </indentOptions>
  246 + </codeStyleSettings>
  247 + <codeStyleSettings language="TypeScript">
  248 + <indentOptions>
  249 + <option name="INDENT_SIZE" value="4" />
  250 + <option name="TAB_SIZE" value="4" />
  251 + </indentOptions>
  252 + </codeStyleSettings>
  253 + <codeStyleSettings language="XML">
  254 + <indentOptions>
  255 + <option name="INDENT_SIZE" value="4" />
  256 + <option name="CONTINUATION_INDENT_SIZE" value="8" />
  257 + <option name="TAB_SIZE" value="4" />
  258 + </indentOptions>
  259 + <arrangement>
  260 + <rules>
  261 + <section>
  262 + <rule>
  263 + <match>
  264 + <AND>
  265 + <NAME>xmlns:android</NAME>
  266 + <XML_ATTRIBUTE />
  267 + <XML_NAMESPACE>^$</XML_NAMESPACE>
  268 + </AND>
  269 + </match>
  270 + </rule>
  271 + </section>
  272 + <section>
  273 + <rule>
  274 + <match>
  275 + <AND>
  276 + <NAME>xmlns:.*</NAME>
  277 + <XML_ATTRIBUTE />
  278 + <XML_NAMESPACE>^$</XML_NAMESPACE>
  279 + </AND>
  280 + </match>
  281 + <order>BY_NAME</order>
  282 + </rule>
  283 + </section>
  284 + <section>
  285 + <rule>
  286 + <match>
  287 + <AND>
  288 + <NAME>.*:id</NAME>
  289 + <XML_ATTRIBUTE />
  290 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  291 + </AND>
  292 + </match>
  293 + </rule>
  294 + </section>
  295 + <section>
  296 + <rule>
  297 + <match>
  298 + <AND>
  299 + <NAME>style</NAME>
  300 + <XML_ATTRIBUTE />
  301 + <XML_NAMESPACE>^$</XML_NAMESPACE>
  302 + </AND>
  303 + </match>
  304 + </rule>
  305 + </section>
  306 + <section>
  307 + <rule>
  308 + <match>
  309 + <AND>
  310 + <NAME>.*</NAME>
  311 + <XML_ATTRIBUTE />
  312 + <XML_NAMESPACE>^$</XML_NAMESPACE>
  313 + </AND>
  314 + </match>
  315 + <order>BY_NAME</order>
  316 + </rule>
  317 + </section>
  318 + <section>
  319 + <rule>
  320 + <match>
  321 + <AND>
  322 + <NAME>.*:.*Style</NAME>
  323 + <XML_ATTRIBUTE />
  324 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  325 + </AND>
  326 + </match>
  327 + <order>BY_NAME</order>
  328 + </rule>
  329 + </section>
  330 + <section>
  331 + <rule>
  332 + <match>
  333 + <AND>
  334 + <NAME>.*:layout_width</NAME>
  335 + <XML_ATTRIBUTE />
  336 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  337 + </AND>
  338 + </match>
  339 + </rule>
  340 + </section>
  341 + <section>
  342 + <rule>
  343 + <match>
  344 + <AND>
  345 + <NAME>.*:layout_height</NAME>
  346 + <XML_ATTRIBUTE />
  347 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  348 + </AND>
  349 + </match>
  350 + </rule>
  351 + </section>
  352 + <section>
  353 + <rule>
  354 + <match>
  355 + <AND>
  356 + <NAME>.*:layout_weight</NAME>
  357 + <XML_ATTRIBUTE />
  358 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  359 + </AND>
  360 + </match>
  361 + </rule>
  362 + </section>
  363 + <section>
  364 + <rule>
  365 + <match>
  366 + <AND>
  367 + <NAME>.*:layout_margin</NAME>
  368 + <XML_ATTRIBUTE />
  369 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  370 + </AND>
  371 + </match>
  372 + </rule>
  373 + </section>
  374 + <section>
  375 + <rule>
  376 + <match>
  377 + <AND>
  378 + <NAME>.*:layout_marginTop</NAME>
  379 + <XML_ATTRIBUTE />
  380 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  381 + </AND>
  382 + </match>
  383 + </rule>
  384 + </section>
  385 + <section>
  386 + <rule>
  387 + <match>
  388 + <AND>
  389 + <NAME>.*:layout_marginBottom</NAME>
  390 + <XML_ATTRIBUTE />
  391 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  392 + </AND>
  393 + </match>
  394 + </rule>
  395 + </section>
  396 + <section>
  397 + <rule>
  398 + <match>
  399 + <AND>
  400 + <NAME>.*:layout_marginStart</NAME>
  401 + <XML_ATTRIBUTE />
  402 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  403 + </AND>
  404 + </match>
  405 + </rule>
  406 + </section>
  407 + <section>
  408 + <rule>
  409 + <match>
  410 + <AND>
  411 + <NAME>.*:layout_marginEnd</NAME>
  412 + <XML_ATTRIBUTE />
  413 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  414 + </AND>
  415 + </match>
  416 + </rule>
  417 + </section>
  418 + <section>
  419 + <rule>
  420 + <match>
  421 + <AND>
  422 + <NAME>.*:layout_marginLeft</NAME>
  423 + <XML_ATTRIBUTE />
  424 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  425 + </AND>
  426 + </match>
  427 + </rule>
  428 + </section>
  429 + <section>
  430 + <rule>
  431 + <match>
  432 + <AND>
  433 + <NAME>.*:layout_marginRight</NAME>
  434 + <XML_ATTRIBUTE />
  435 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  436 + </AND>
  437 + </match>
  438 + </rule>
  439 + </section>
  440 + <section>
  441 + <rule>
  442 + <match>
  443 + <AND>
  444 + <NAME>.*:layout_.*</NAME>
  445 + <XML_ATTRIBUTE />
  446 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  447 + </AND>
  448 + </match>
  449 + <order>BY_NAME</order>
  450 + </rule>
  451 + </section>
  452 + <section>
  453 + <rule>
  454 + <match>
  455 + <AND>
  456 + <NAME>.*:padding</NAME>
  457 + <XML_ATTRIBUTE />
  458 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  459 + </AND>
  460 + </match>
  461 + </rule>
  462 + </section>
  463 + <section>
  464 + <rule>
  465 + <match>
  466 + <AND>
  467 + <NAME>.*:paddingTop</NAME>
  468 + <XML_ATTRIBUTE />
  469 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  470 + </AND>
  471 + </match>
  472 + </rule>
  473 + </section>
  474 + <section>
  475 + <rule>
  476 + <match>
  477 + <AND>
  478 + <NAME>.*:paddingBottom</NAME>
  479 + <XML_ATTRIBUTE />
  480 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  481 + </AND>
  482 + </match>
  483 + </rule>
  484 + </section>
  485 + <section>
  486 + <rule>
  487 + <match>
  488 + <AND>
  489 + <NAME>.*:paddingStart</NAME>
  490 + <XML_ATTRIBUTE />
  491 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  492 + </AND>
  493 + </match>
  494 + </rule>
  495 + </section>
  496 + <section>
  497 + <rule>
  498 + <match>
  499 + <AND>
  500 + <NAME>.*:paddingEnd</NAME>
  501 + <XML_ATTRIBUTE />
  502 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  503 + </AND>
  504 + </match>
  505 + </rule>
  506 + </section>
  507 + <section>
  508 + <rule>
  509 + <match>
  510 + <AND>
  511 + <NAME>.*:paddingLeft</NAME>
  512 + <XML_ATTRIBUTE />
  513 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  514 + </AND>
  515 + </match>
  516 + </rule>
  517 + </section>
  518 + <section>
  519 + <rule>
  520 + <match>
  521 + <AND>
  522 + <NAME>.*:paddingRight</NAME>
  523 + <XML_ATTRIBUTE />
  524 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  525 + </AND>
  526 + </match>
  527 + </rule>
  528 + </section>
  529 + <section>
  530 + <rule>
  531 + <match>
  532 + <AND>
  533 + <NAME>.*</NAME>
  534 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  535 + </AND>
  536 + </match>
  537 + <order>BY_NAME</order>
  538 + </rule>
  539 + </section>
  540 + <section>
  541 + <rule>
  542 + <match>
  543 + <AND>
  544 + <NAME>.*</NAME>
  545 + <XML_NAMESPACE>http://schemas.android.com/apk/res-auto</XML_NAMESPACE>
  546 + </AND>
  547 + </match>
  548 + <order>BY_NAME</order>
  549 + </rule>
  550 + </section>
  551 + <section>
  552 + <rule>
  553 + <match>
  554 + <AND>
  555 + <NAME>.*</NAME>
  556 + <XML_NAMESPACE>http://schemas.android.com/tools</XML_NAMESPACE>
  557 + </AND>
  558 + </match>
  559 + <order>BY_NAME</order>
  560 + </rule>
  561 + </section>
  562 + <section>
  563 + <rule>
  564 + <match>
  565 + <AND>
  566 + <NAME>.*</NAME>
  567 + <XML_NAMESPACE>.*</XML_NAMESPACE>
  568 + </AND>
  569 + </match>
  570 + <order>BY_NAME</order>
  571 + </rule>
  572 + </section>
  573 + </rules>
  574 + </arrangement>
  575 + </codeStyleSettings>
  576 + <Objective-C>
  577 + <option name="INDENT_NAMESPACE_MEMBERS" value="0" />
  578 + <option name="INDENT_C_STRUCT_MEMBERS" value="2" />
  579 + <option name="INDENT_CLASS_MEMBERS" value="2" />
  580 + <option name="INDENT_VISIBILITY_KEYWORDS" value="1" />
  581 + <option name="INDENT_INSIDE_CODE_BLOCK" value="2" />
  582 + <option name="KEEP_STRUCTURES_IN_ONE_LINE" value="true" />
  583 + <option name="FUNCTION_PARAMETERS_WRAP" value="5" />
  584 + <option name="FUNCTION_CALL_ARGUMENTS_WRAP" value="5" />
  585 + <option name="TEMPLATE_CALL_ARGUMENTS_WRAP" value="5" />
  586 + <option name="TEMPLATE_CALL_ARGUMENTS_ALIGN_MULTILINE" value="true" />
  587 + <option name="ALIGN_INIT_LIST_IN_COLUMNS" value="false" />
  588 + <option name="SPACE_BEFORE_SUPERCLASS_COLON" value="false" />
  589 + </Objective-C>
  590 + <Objective-C-extensions>
  591 + <option name="GENERATE_INSTANCE_VARIABLES_FOR_PROPERTIES" value="ASK" />
  592 + <option name="RELEASE_STYLE" value="IVAR" />
  593 + <option name="TYPE_QUALIFIERS_PLACEMENT" value="BEFORE" />
  594 + <file>
  595 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
  596 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
  597 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
  598 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
  599 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
  600 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
  601 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
  602 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
  603 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
  604 + </file>
  605 + <class>
  606 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
  607 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
  608 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
  609 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
  610 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
  611 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
  612 + </class>
  613 + <extensions>
  614 + <pair source="cc" header="h" />
  615 + <pair source="c" header="h" />
  616 + </extensions>
  617 + </Objective-C-extensions>
  618 + <codeStyleSettings language="ObjectiveC">
  619 + <option name="RIGHT_MARGIN" value="140" />
  620 + <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
  621 + <option name="BLANK_LINES_BEFORE_IMPORTS" value="0" />
  622 + <option name="BLANK_LINES_AFTER_IMPORTS" value="0" />
  623 + <option name="BLANK_LINES_AROUND_CLASS" value="0" />
  624 + <option name="BLANK_LINES_AROUND_METHOD" value="0" />
  625 + <option name="BLANK_LINES_AROUND_METHOD_IN_INTERFACE" value="0" />
  626 + <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="false" />
  627 + <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
  628 + <option name="FOR_STATEMENT_WRAP" value="1" />
  629 + <option name="ASSIGNMENT_WRAP" value="1" />
  630 + <indentOptions>
  631 + <option name="INDENT_SIZE" value="4" />
  632 + <option name="CONTINUATION_INDENT_SIZE" value="8" />
  633 + </indentOptions>
  634 + </codeStyleSettings>
  635 +</code_scheme>
... ...