From 2b3794b585f0b2a3900ddbab92018b140d9d900a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=98=A5=E5=85=89?= <1992lcg@163.com> Date: Mon, 9 Apr 2018 18:07:22 +0800 Subject: [PATCH 01/36] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Readme.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Readme.md diff --git a/Readme.md b/Readme.md new file mode 100644 index 0000000..af5e739 --- /dev/null +++ b/Readme.md @@ -0,0 +1,5 @@ +1.新建数据库，导数数据库脚本,修改clouddo-admin的数据库用户密码 +2.启动clouddo-server 注册中心 +3.启动clouddo-zuul 网关 +4.启动clouddo-admin 权限微服务 +5.启动前端项目 \ No newline at end of file -- Gitee From d8bba8bda8aa411cfe1bc6234ff783f1d5486ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=98=A5=E5=85=89?= <1992lcg@163.com> Date: Mon, 9 Apr 2018 18:11:40 +0800 Subject: [PATCH 02/36] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Readme.md => README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Readme.md => README.md (100%) diff --git a/Readme.md b/README.md similarity index 100% rename from Readme.md rename to README.md -- Gitee From 38c9bb95a18bc8f9db28e97f9ace63b89cb0b5e5 Mon Sep 17 00:00:00 2001 From: lcg0124 <1992lcg@163.com> Date: Mon, 9 Apr 2018 18:13:24 +0800 Subject: [PATCH 03/36] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index af5e739..f92a149 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ 1.新建数据库，导数数据库脚本,修改clouddo-admin的数据库用户密码 + 2.启动clouddo-server 注册中心 + 3.启动clouddo-zuul 网关 + 4.启动clouddo-admin 权限微服务 + 5.启动前端项目 \ No newline at end of file -- Gitee From c97dd1cc0593a8392b1efab12ba9814ce100bda9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=98=A5=E5=85=89?= <1992lcg@163.com> Date: Mon, 9 Apr 2018 18:14:49 +0800 Subject: [PATCH 04/36] =?UTF-8?q?=E5=8A=A0=E5=85=A5sql=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clouddo-admin/clouddo.sql | 660 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 660 insertions(+) create mode 100644 clouddo-admin/clouddo.sql diff --git a/clouddo-admin/clouddo.sql b/clouddo-admin/clouddo.sql new file mode 100644 index 0000000..e3e7c3c --- /dev/null +++ b/clouddo-admin/clouddo.sql @@ -0,0 +1,660 @@ +/* +Navicat MySQL Data Transfer + +Source Server : localhost +Source Server Version : 50721 +Source Host : localhost:3306 +Source Database : clouddo + +Target Server Type : MYSQL +Target Server Version : 50721 +File Encoding : 65001 + +Date: 2018-04-09 18:13:51 +*/ + +SET FOREIGN_KEY_CHECKS=0; + +-- ---------------------------- +-- Table structure for `sys_dept` +-- ---------------------------- +DROP TABLE IF EXISTS `sys_dept`; +CREATE TABLE `sys_dept` ( + `dept_id` bigint(20) NOT NULL AUTO_INCREMENT, + `parent_id` bigint(20) DEFAULT NULL COMMENT '上级部门ID，一级部门为0', + `name` varchar(50) DEFAULT NULL COMMENT '部门名称', + `order_num` int(11) DEFAULT NULL COMMENT '排序', + `del_flag` tinyint(4) DEFAULT '0' COMMENT '是否删除 -1：已删除 0：正常', + PRIMARY KEY (`dept_id`) +) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8 COMMENT='部门管理'; + +-- ---------------------------- +-- Records of sys_dept +-- ---------------------------- +INSERT INTO `sys_dept` VALUES ('6', '0', '研发部', '1', '1'); +INSERT INTO `sys_dept` VALUES ('7', '6', '研發一部', '1', '1'); +INSERT INTO `sys_dept` VALUES ('8', '6', '研发二部', '2', '1'); +INSERT INTO `sys_dept` VALUES ('9', '0', '销售部', '2', '1'); +INSERT INTO `sys_dept` VALUES ('10', '9', '销售一部', '1', '1'); +INSERT INTO `sys_dept` VALUES ('11', '0', '产品部', '3', '1'); +INSERT INTO `sys_dept` VALUES ('12', '11', '产品一部', '1', '1'); +INSERT INTO `sys_dept` VALUES ('13', '0', '测试部', '5', '1'); +INSERT INTO `sys_dept` VALUES ('14', '13', '测试一部', '1', '1'); +INSERT INTO `sys_dept` VALUES ('15', '13', '测试二部', '2', '1'); + +-- ---------------------------- +-- Table structure for `sys_dict` +-- ---------------------------- +DROP TABLE IF EXISTS `sys_dict`; +CREATE TABLE `sys_dict` ( + `id` bigint(64) NOT NULL AUTO_INCREMENT COMMENT '编号', + `name` varchar(100) COLLATE utf8_bin DEFAULT NULL COMMENT '标签名', + `value` varchar(100) COLLATE utf8_bin DEFAULT NULL COMMENT '数据值', + `type` varchar(100) COLLATE utf8_bin DEFAULT NULL COMMENT '类型', + `description` varchar(100) COLLATE utf8_bin DEFAULT NULL COMMENT '描述', + `sort` decimal(10,0) DEFAULT NULL COMMENT '排序（升序）', + `parent_id` bigint(64) DEFAULT '0' COMMENT '父级编号', + `create_by` int(64) DEFAULT NULL COMMENT '创建者', + `create_date` datetime DEFAULT NULL COMMENT '创建时间', + `update_by` bigint(64) DEFAULT NULL COMMENT '更新者', + `update_date` datetime DEFAULT NULL COMMENT '更新时间', + `remarks` varchar(255) COLLATE utf8_bin DEFAULT NULL COMMENT '备注信息', + `del_flag` char(1) COLLATE utf8_bin DEFAULT '0' COMMENT '删除标记', + PRIMARY KEY (`id`), + KEY `sys_dict_value` (`value`), + KEY `sys_dict_label` (`name`), + KEY `sys_dict_del_flag` (`del_flag`) +) ENGINE=InnoDB AUTO_INCREMENT=122 DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='字典表'; + +-- ---------------------------- +-- Records of sys_dict +-- ---------------------------- +INSERT INTO `sys_dict` VALUES ('1', '正常', '0', 'del_flag', '删除标记', '10', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('3', '显示', '1', 'show_hide', '显示/隐藏', '10', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('4', '隐藏', '0', 'show_hide', '显示/隐藏', '20', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('5', '是', '1', 'yes_no', '是/否', '10', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('6', '否', '0', 'yes_no', '是/否', '20', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('7', '红色', 'red', 'color', '颜色值', '10', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('8', '绿色', 'green', 'color', '颜色值', '20', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('9', '蓝色', 'blue', 'color', '颜色值', '30', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('10', '黄色', 'yellow', 'color', '颜色值', '40', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('11', '橙色', 'orange', 'color', '颜色值', '50', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('12', '默认主题', 'default', 'theme', '主题方案', '10', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('13', '天蓝主题', 'cerulean', 'theme', '主题方案', '20', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('14', '橙色主题', 'readable', 'theme', '主题方案', '30', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('15', '红色主题', 'united', 'theme', '主题方案', '40', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('16', 'Flat主题', 'flat', 'theme', '主题方案', '60', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('17', '国家', '1', 'sys_area_type', '区域类型', '10', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('18', '省份、直辖市', '2', 'sys_area_type', '区域类型', '20', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('19', '地市', '3', 'sys_area_type', '区域类型', '30', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('20', '区县', '4', 'sys_area_type', '区域类型', '40', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('21', '公司', '1', 'sys_office_type', '机构类型', '60', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('22', '部门', '2', 'sys_office_type', '机构类型', '70', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('23', '小组', '3', 'sys_office_type', '机构类型', '80', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('24', '其它', '4', 'sys_office_type', '机构类型', '90', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('25', '综合部', '1', 'sys_office_common', '快捷通用部门', '30', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('26', '开发部', '2', 'sys_office_common', '快捷通用部门', '40', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('27', '人力部', '3', 'sys_office_common', '快捷通用部门', '50', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('28', '一级', '1', 'sys_office_grade', '机构等级', '10', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('29', '二级', '2', 'sys_office_grade', '机构等级', '20', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('30', '三级', '3', 'sys_office_grade', '机构等级', '30', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('31', '四级', '4', 'sys_office_grade', '机构等级', '40', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('32', '所有数据', '1', 'sys_data_scope', '数据范围', '10', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('33', '所在公司及以下数据', '2', 'sys_data_scope', '数据范围', '20', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('34', '所在公司数据', '3', 'sys_data_scope', '数据范围', '30', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('35', '所在部门及以下数据', '4', 'sys_data_scope', '数据范围', '40', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('36', '所在部门数据', '5', 'sys_data_scope', '数据范围', '50', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('37', '仅本人数据', '8', 'sys_data_scope', '数据范围', '90', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('38', '按明细设置', '9', 'sys_data_scope', '数据范围', '100', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('39', '系统管理', '1', 'sys_user_type', '用户类型', '10', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('40', '部门经理', '2', 'sys_user_type', '用户类型', '20', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('41', '普通用户', '3', 'sys_user_type', '用户类型', '30', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('42', '基础主题', 'basic', 'cms_theme', '站点主题', '10', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('43', '蓝色主题', 'blue', 'cms_theme', '站点主题', '20', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('44', '红色主题', 'red', 'cms_theme', '站点主题', '30', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('45', '文章模型', 'article', 'cms_module', '栏目模型', '10', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('46', '图片模型', 'picture', 'cms_module', '栏目模型', '20', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('47', '下载模型', 'download', 'cms_module', '栏目模型', '30', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('48', '链接模型', 'link', 'cms_module', '栏目模型', '40', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('49', '专题模型', 'special', 'cms_module', '栏目模型', '50', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('50', '默认展现方式', '0', 'cms_show_modes', '展现方式', '10', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('51', '首栏目内容列表', '1', 'cms_show_modes', '展现方式', '20', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('52', '栏目第一条内容', '2', 'cms_show_modes', '展现方式', '30', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('53', '发布', '0', 'cms_del_flag', '内容状态', '10', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('54', '删除', '1', 'cms_del_flag', '内容状态', '20', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('55', '审核', '2', 'cms_del_flag', '内容状态', '15', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('56', '首页焦点图', '1', 'cms_posid', '推荐位', '10', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('57', '栏目页文章推荐', '2', 'cms_posid', '推荐位', '20', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('58', '咨询', '1', 'cms_guestbook', '留言板分类', '10', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('59', '建议', '2', 'cms_guestbook', '留言板分类', '20', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('60', '投诉', '3', 'cms_guestbook', '留言板分类', '30', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('61', '其它', '4', 'cms_guestbook', '留言板分类', '40', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('62', '公休', '1', 'oa_leave_type', '请假类型', '10', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('63', '病假', '2', 'oa_leave_type', '请假类型', '20', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('64', '事假', '3', 'oa_leave_type', '请假类型', '30', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('65', '调休', '4', 'oa_leave_type', '请假类型', '40', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('66', '婚假', '5', 'oa_leave_type', '请假类型', '60', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('67', '接入日志', '1', 'sys_log_type', '日志类型', '30', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('68', '异常日志', '2', 'sys_log_type', '日志类型', '40', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('69', '请假流程', 'leave', 'act_type', '流程类型', '10', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('70', '审批测试流程', 'test_audit', 'act_type', '流程类型', '20', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('71', '分类1', '1', 'act_category', '流程分类', '10', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('72', '分类2', '2', 'act_category', '流程分类', '20', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('73', '增删改查', 'crud', 'gen_category', '代码生成分类', '10', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('74', '增删改查（包含从表）', 'crud_many', 'gen_category', '代码生成分类', '20', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('75', '树结构', 'tree', 'gen_category', '代码生成分类', '30', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('76', '=', '=', 'gen_query_type', '查询方式', '10', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('77', '!=', '!=', 'gen_query_type', '查询方式', '20', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('78', '>', '>', 'gen_query_type', '查询方式', '30', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('79', '<', '<', 'gen_query_type', '查询方式', '40', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('80', 'Between', 'between', 'gen_query_type', '查询方式', '50', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('81', 'Like', 'like', 'gen_query_type', '查询方式', '60', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('82', 'Left Like', 'left_like', 'gen_query_type', '查询方式', '70', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('83', 'Right Like', 'right_like', 'gen_query_type', '查询方式', '80', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('84', '文本框', 'input', 'gen_show_type', '字段生成方案', '10', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('85', '文本域', 'textarea', 'gen_show_type', '字段生成方案', '20', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('86', '下拉框', 'select', 'gen_show_type', '字段生成方案', '30', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('87', '复选框', 'checkbox', 'gen_show_type', '字段生成方案', '40', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('88', '单选框', 'radiobox', 'gen_show_type', '字段生成方案', '50', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('89', '日期选择', 'dateselect', 'gen_show_type', '字段生成方案', '60', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('90', '人员选择', 'userselect', 'gen_show_type', '字段生成方案', '70', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('91', '部门选择', 'officeselect', 'gen_show_type', '字段生成方案', '80', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('92', '区域选择', 'areaselect', 'gen_show_type', '字段生成方案', '90', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('93', 'String', 'String', 'gen_java_type', 'Java类型', '10', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('94', 'Long', 'Long', 'gen_java_type', 'Java类型', '20', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('95', '仅持久层', 'dao', 'gen_category', '代码生成分类', '40', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('96', '男', '1', 'sex', '性别', '10', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('97', '女', '2', 'sex', '性别', '20', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('98', 'Integer', 'Integer', 'gen_java_type', 'Java类型', '30', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('99', 'Double', 'Double', 'gen_java_type', 'Java类型', '40', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('100', 'Date', 'java.util.Date', 'gen_java_type', 'Java类型', '50', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('104', 'Custom', 'Custom', 'gen_java_type', 'Java类型', '90', '0', '1', null, '1', null, null, '1'); +INSERT INTO `sys_dict` VALUES ('105', '会议通告', '1', 'oa_notify_type', '通知通告类型', '10', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('106', '奖惩通告', '2', 'oa_notify_type', '通知通告类型', '20', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('107', '活动通告', '3', 'oa_notify_type', '通知通告类型', '30', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('108', '草稿', '0', 'oa_notify_status', '通知通告状态', '10', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('109', '发布', '1', 'oa_notify_status', '通知通告状态', '20', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('110', '未读', '0', 'oa_notify_read', '通知通告状态', '10', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('111', '已读', '1', 'oa_notify_read', '通知通告状态', '20', '0', '1', null, '1', null, null, '0'); +INSERT INTO `sys_dict` VALUES ('112', '草稿', '0', 'oa_notify_status', '通知通告状态', '10', '0', '1', null, '1', null, '', '0'); +INSERT INTO `sys_dict` VALUES ('113', '删除', '0', 'del_flag', '删除标记', null, null, null, null, null, null, '', ''); +INSERT INTO `sys_dict` VALUES ('118', '关于', 'about', 'blog_type', '博客类型', null, null, null, null, null, null, '全url是:/blog/open/page/about', ''); +INSERT INTO `sys_dict` VALUES ('119', '交流', 'communication', 'blog_type', '博客类型', null, null, null, null, null, null, '', ''); +INSERT INTO `sys_dict` VALUES ('120', '文章', 'article', 'blog_type', '博客类型', null, null, null, null, null, null, '', ''); +INSERT INTO `sys_dict` VALUES ('121', '编码', 'code', 'hobby', '爱好', null, null, null, null, null, null, '', ''); + +-- ---------------------------- +-- Table structure for `sys_file` +-- ---------------------------- +DROP TABLE IF EXISTS `sys_file`; +CREATE TABLE `sys_file` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `type` int(11) DEFAULT NULL COMMENT '文件类型', + `url` varchar(200) DEFAULT NULL COMMENT 'URL地址', + `create_date` datetime DEFAULT NULL COMMENT '创建时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=139 DEFAULT CHARSET=utf8 COMMENT='文件上传'; + +-- ---------------------------- +-- Records of sys_file +-- ---------------------------- +INSERT INTO `sys_file` VALUES ('110', '0', '/files/d64a62e3-6821-48f1-bac6-a1b9945f4afb.jpg', '2017-10-14 16:20:17'); +INSERT INTO `sys_file` VALUES ('111', '0', '/files/aa2c3dc6-495f-48cc-8e12-446eceb2535e.jpg', '2017-10-14 16:20:21'); +INSERT INTO `sys_file` VALUES ('114', '0', '/files/84c29777-11bc-44b9-818d-859f2d04d417.jpg', '2017-10-20 09:27:18'); +INSERT INTO `sys_file` VALUES ('117', '0', '/files/40073f7e-82ec-43f2-b9d3-fd9068916d4b.jpg', '2017-10-20 11:53:47'); +INSERT INTO `sys_file` VALUES ('118', '0', '/files/a973499e-3ec7-4d43-8a52-b6f6517c77e3.jpg', '2017-10-20 11:53:52'); +INSERT INTO `sys_file` VALUES ('125', '0', '/files/e2901e59-2e65-45a0-9fd8-284c88133cdd.jpg', '2017-10-20 11:54:20'); +INSERT INTO `sys_file` VALUES ('127', '0', '/files/1a42a630-5186-44c1-8378-5f974652d7c8.jpg', '2017-10-20 13:20:49'); +INSERT INTO `sys_file` VALUES ('132', '0', '/files/e6f13526-e31c-4ebe-a3cf-5fd88dd10be6.jpg', '2017-12-18 20:19:51'); +INSERT INTO `sys_file` VALUES ('134', '0', '/files/cd016e72-77f7-4425-afe2-b79dfbdc3ae9.jpeg', '2017-12-18 22:44:07'); +INSERT INTO `sys_file` VALUES ('138', '0', '/files/9ec12ee7-65b5-4cc5-9900-d2ec6185b336.jpg', '2017-12-19 19:55:27'); + +-- ---------------------------- +-- Table structure for `sys_log` +-- ---------------------------- +DROP TABLE IF EXISTS `sys_log`; +CREATE TABLE `sys_log` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `user_id` bigint(20) DEFAULT NULL COMMENT '用户id', + `username` varchar(50) DEFAULT NULL COMMENT '用户名', + `operation` varchar(50) DEFAULT NULL COMMENT '用户操作', + `time` int(11) DEFAULT NULL COMMENT '响应时间', + `method` varchar(200) DEFAULT NULL COMMENT '请求方法', + `params` varchar(5000) DEFAULT NULL COMMENT '请求参数', + `ip` varchar(64) DEFAULT NULL COMMENT 'IP地址', + `gmt_create` datetime DEFAULT NULL COMMENT '创建时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8 COMMENT='系统日志'; + +-- ---------------------------- +-- Records of sys_log +-- ---------------------------- +INSERT INTO `sys_log` VALUES ('1', '2', 'test', '登录', '0', 'com.bootdo.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2017-12-26 11:33:58'); +INSERT INTO `sys_log` VALUES ('2', '2', 'test', '请求访问主页', '286', 'com.bootdo.system.controller.LoginController.index()', null, '127.0.0.1', '2017-12-26 11:33:59'); +INSERT INTO `sys_log` VALUES ('3', '1', 'admin', '登录', '3', 'com.bootdo.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2017-12-26 11:55:59'); +INSERT INTO `sys_log` VALUES ('4', '1', 'admin', '请求访问主页', '32', 'com.bootdo.system.controller.LoginController.index()', null, '127.0.0.1', '2017-12-26 11:55:59'); +INSERT INTO `sys_log` VALUES ('5', '1', 'admin', '请求访问主页', '11', 'com.bootdo.system.controller.LoginController.index()', null, '127.0.0.1', '2017-12-26 11:56:56'); +INSERT INTO `sys_log` VALUES ('6', '2', 'test', '登录', '22', 'com.bootdo.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2017-12-26 12:00:43'); +INSERT INTO `sys_log` VALUES ('7', '2', 'test', '请求访问主页', '79', 'com.bootdo.system.controller.LoginController.index()', null, '127.0.0.1', '2017-12-26 12:00:43'); +INSERT INTO `sys_log` VALUES ('8', '2', 'test', '请求访问主页', '15', 'com.bootdo.system.controller.LoginController.index()', null, '127.0.0.1', '2017-12-26 12:00:52'); +INSERT INTO `sys_log` VALUES ('9', '1', 'admin', '登录', '8', 'com.bootdo.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2017-12-26 12:01:03'); +INSERT INTO `sys_log` VALUES ('10', '1', 'admin', '请求访问主页', '17', 'com.bootdo.system.controller.LoginController.index()', null, '127.0.0.1', '2017-12-26 12:01:03'); +INSERT INTO `sys_log` VALUES ('11', '1', 'admin', '请求访问主页', '17', 'com.bootdo.system.controller.LoginController.index()', null, '127.0.0.1', '2017-12-26 12:01:22'); +INSERT INTO `sys_log` VALUES ('12', '1', 'admin', '请求访问主页', '10', 'com.bootdo.system.controller.LoginController.index()', null, '127.0.0.1', '2017-12-26 12:16:26'); +INSERT INTO `sys_log` VALUES ('13', '1', 'admin', '登录', '8', 'com.bootdo.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2017-12-26 12:23:19'); +INSERT INTO `sys_log` VALUES ('14', '1', 'admin', '请求访问主页', '32', 'com.bootdo.system.controller.LoginController.index()', null, '127.0.0.1', '2017-12-26 12:23:20'); +INSERT INTO `sys_log` VALUES ('15', '1', 'admin', '登录', '10', 'com.bootdo.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2017-12-26 12:34:03'); +INSERT INTO `sys_log` VALUES ('16', '1', 'admin', '请求访问主页', '81', 'com.bootdo.system.controller.LoginController.index()', null, '127.0.0.1', '2017-12-26 12:34:04'); +INSERT INTO `sys_log` VALUES ('17', '-1', '获取用户信息为空', '登录', '16', 'com.bootdo.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2017-12-26 20:26:22'); +INSERT INTO `sys_log` VALUES ('18', '1', 'admin', '登录', '4', 'com.bootdo.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2017-12-26 20:26:28'); +INSERT INTO `sys_log` VALUES ('19', '1', 'admin', '请求访问主页', '52', 'com.bootdo.system.controller.LoginController.index()', null, '127.0.0.1', '2017-12-26 20:26:29'); + +-- ---------------------------- +-- Table structure for `sys_menu` +-- ---------------------------- +DROP TABLE IF EXISTS `sys_menu`; +CREATE TABLE `sys_menu` ( + `menu_id` bigint(20) NOT NULL AUTO_INCREMENT, + `parent_id` bigint(20) DEFAULT NULL COMMENT '父菜单ID，一级菜单为0', + `name` varchar(50) DEFAULT NULL COMMENT '菜单名称', + `url` varchar(200) DEFAULT NULL COMMENT '菜单URL', + `perms` varchar(500) DEFAULT NULL COMMENT '授权(多个用逗号分隔，如：user:list,user:create)', + `type` int(11) DEFAULT NULL COMMENT '类型 0：目录 1：菜单 2：按钮', + `icon` varchar(50) DEFAULT NULL COMMENT '菜单图标', + `order_num` int(11) DEFAULT NULL COMMENT '排序', + `gmt_create` datetime DEFAULT NULL COMMENT '创建时间', + `component` varchar(20) DEFAULT NULL, + `gmt_modified` datetime DEFAULT NULL COMMENT '修改时间', + `redirect` varchar(20) DEFAULT NULL, + PRIMARY KEY (`menu_id`) +) ENGINE=InnoDB AUTO_INCREMENT=81 DEFAULT CHARSET=utf8 COMMENT='菜单管理'; + +-- ---------------------------- +-- Records of sys_menu +-- ---------------------------- +INSERT INTO `sys_menu` VALUES ('2', '3', '系统菜单', '/admin/menu', 'admin:menu:menu', '1', 'fa fa-th-list', '2', '2017-08-09 22:55:15', null, null, null); +INSERT INTO `sys_menu` VALUES ('3', '0', '系统管理', null, null, '0', 'fa fa-desktop', '1', '2017-08-09 23:06:55', null, '2017-08-14 14:13:43', null); +INSERT INTO `sys_menu` VALUES ('6', '3', '用户管理', '/admin/user', 'admin:user:user', '1', 'fa fa-user', '0', '2017-08-10 00:00:00', null, null, null); +INSERT INTO `sys_menu` VALUES ('7', '3', '角色管理', '/admin/role', 'admin:role:role', '1', 'fa fa-paw', '1', '2017-08-10 00:00:00', null, null, null); +INSERT INTO `sys_menu` VALUES ('12', '6', '新增', '', 'sys:user:add', '2', '', '0', '2017-08-14 10:51:35', null, null, null); +INSERT INTO `sys_menu` VALUES ('13', '6', '编辑', '', 'sys:user:edit', '2', '', '0', '2017-08-14 10:52:06', null, null, null); +INSERT INTO `sys_menu` VALUES ('14', '6', '删除', null, 'sys:user:remove', '2', null, '0', '2017-08-14 10:52:24', null, null, null); +INSERT INTO `sys_menu` VALUES ('15', '7', '新增', '', 'sys:role:add', '2', '', '0', '2017-08-14 10:56:37', null, null, null); +INSERT INTO `sys_menu` VALUES ('20', '2', '新增', '/api-admin/menu', 'admin:menu:add', '2', '', '0', '2017-08-14 00:00:00', null, null, null); +INSERT INTO `sys_menu` VALUES ('21', '2', '编辑', '/api-admin/menu', 'admin:menu:edit', '2', '', '0', '2017-08-14 00:00:00', null, null, null); +INSERT INTO `sys_menu` VALUES ('22', '2', '删除', '/api-admin/menu', 'admin:menu:remove', '2', '', '0', '2017-08-14 00:00:00', null, null, null); +INSERT INTO `sys_menu` VALUES ('24', '6', '批量删除', '', 'sys:user:batchRemove', '2', '', '0', '2017-08-14 17:27:18', null, null, null); +INSERT INTO `sys_menu` VALUES ('25', '6', '停用', null, 'sys:user:disable', '2', null, '0', '2017-08-14 17:27:43', null, null, null); +INSERT INTO `sys_menu` VALUES ('26', '6', '重置密码', '', 'sys:user:resetPwd', '2', '', '0', '2017-08-14 17:28:34', null, null, null); +INSERT INTO `sys_menu` VALUES ('55', '7', '编辑', '', 'sys:role:edit', '2', '', null, null, null, null, null); +INSERT INTO `sys_menu` VALUES ('56', '7', '删除', '', 'sys:role:remove', '2', null, null, null, null, null, null); +INSERT INTO `sys_menu` VALUES ('61', '2', '批量删除', '/api-admin/menu/batchRemove', 'admin:menu:batchRemove', '2', null, null, null, null, null, null); +INSERT INTO `sys_menu` VALUES ('62', '7', '批量删除', '', 'sys:role:batchRemove', '2', null, null, null, null, null, null); +INSERT INTO `sys_menu` VALUES ('73', '3', '部门管理', '/admin/api/user/currentUser', 'admin:dept:dept', '1', 'fa fa-users', '3', null, null, null, null); +INSERT INTO `sys_menu` VALUES ('74', '73', '清除缓存', '/admin/api/menu/clearCache', 'system:sysDept:add', '1', null, '1', null, null, null, null); +INSERT INTO `sys_menu` VALUES ('75', '73', '刪除', 'system/sysDept/remove', 'system:sysDept:remove', '2', null, '2', null, null, null, null); +INSERT INTO `sys_menu` VALUES ('76', '73', '编辑', '/admin/api/user/currentUser', 'system:sysDept:edit', '2', null, '3', null, null, null, null); +INSERT INTO `sys_menu` VALUES ('77', '2', '列表', '/api-admin/menu', 'admin:menu:list', '2', null, null, null, null, null, null); +INSERT INTO `sys_menu` VALUES ('78', '0', '内容管理', null, null, '0', null, null, null, null, null, null); +INSERT INTO `sys_menu` VALUES ('79', '0', '基础信息', null, null, '0', null, null, null, null, null, null); +INSERT INTO `sys_menu` VALUES ('80', '79', '数据字典', '/a', null, '1', null, null, null, null, null, null); + +-- ---------------------------- +-- Table structure for `sys_role` +-- ---------------------------- +DROP TABLE IF EXISTS `sys_role`; +CREATE TABLE `sys_role` ( + `role_id` bigint(20) NOT NULL AUTO_INCREMENT, + `role_name` varchar(100) DEFAULT NULL COMMENT '角色名称', + `role_sign` varchar(100) DEFAULT NULL COMMENT '角色标识', + `remark` varchar(100) DEFAULT NULL COMMENT '备注', + `user_id_create` bigint(255) DEFAULT NULL COMMENT '创建用户id', + `gmt_create` datetime DEFAULT NULL COMMENT '创建时间', + `gmt_modified` datetime DEFAULT NULL COMMENT '创建时间', + PRIMARY KEY (`role_id`) +) ENGINE=InnoDB AUTO_INCREMENT=58 DEFAULT CHARSET=utf8 COMMENT='角色'; + +-- ---------------------------- +-- Records of sys_role +-- ---------------------------- +INSERT INTO `sys_role` VALUES ('1', '管理员角色', 'admin', '拥有最高权限', '2', '2017-08-12 00:00:00', '2017-08-12 00:00:00'); +INSERT INTO `sys_role` VALUES ('48', '钻石会员', null, '高级用户', null, null, null); +INSERT INTO `sys_role` VALUES ('56', '普通用户', null, '普通用户，没啥权限', null, null, null); + +-- ---------------------------- +-- Table structure for `sys_role_menu` +-- ---------------------------- +DROP TABLE IF EXISTS `sys_role_menu`; +CREATE TABLE `sys_role_menu` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `role_id` bigint(20) DEFAULT NULL COMMENT '角色ID', + `menu_id` bigint(20) DEFAULT NULL COMMENT '菜单ID', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=2998 DEFAULT CHARSET=utf8 COMMENT='角色与菜单对应关系'; + +-- ---------------------------- +-- Records of sys_role_menu +-- ---------------------------- +INSERT INTO `sys_role_menu` VALUES ('367', '44', '1'); +INSERT INTO `sys_role_menu` VALUES ('368', '44', '32'); +INSERT INTO `sys_role_menu` VALUES ('369', '44', '33'); +INSERT INTO `sys_role_menu` VALUES ('370', '44', '34'); +INSERT INTO `sys_role_menu` VALUES ('371', '44', '35'); +INSERT INTO `sys_role_menu` VALUES ('372', '44', '28'); +INSERT INTO `sys_role_menu` VALUES ('373', '44', '29'); +INSERT INTO `sys_role_menu` VALUES ('374', '44', '30'); +INSERT INTO `sys_role_menu` VALUES ('375', '44', '38'); +INSERT INTO `sys_role_menu` VALUES ('376', '44', '4'); +INSERT INTO `sys_role_menu` VALUES ('377', '44', '27'); +INSERT INTO `sys_role_menu` VALUES ('378', '45', '38'); +INSERT INTO `sys_role_menu` VALUES ('379', '46', '3'); +INSERT INTO `sys_role_menu` VALUES ('380', '46', '20'); +INSERT INTO `sys_role_menu` VALUES ('381', '46', '21'); +INSERT INTO `sys_role_menu` VALUES ('382', '46', '22'); +INSERT INTO `sys_role_menu` VALUES ('383', '46', '23'); +INSERT INTO `sys_role_menu` VALUES ('384', '46', '11'); +INSERT INTO `sys_role_menu` VALUES ('385', '46', '12'); +INSERT INTO `sys_role_menu` VALUES ('386', '46', '13'); +INSERT INTO `sys_role_menu` VALUES ('387', '46', '14'); +INSERT INTO `sys_role_menu` VALUES ('388', '46', '24'); +INSERT INTO `sys_role_menu` VALUES ('389', '46', '25'); +INSERT INTO `sys_role_menu` VALUES ('390', '46', '26'); +INSERT INTO `sys_role_menu` VALUES ('391', '46', '15'); +INSERT INTO `sys_role_menu` VALUES ('392', '46', '2'); +INSERT INTO `sys_role_menu` VALUES ('393', '46', '6'); +INSERT INTO `sys_role_menu` VALUES ('394', '46', '7'); +INSERT INTO `sys_role_menu` VALUES ('598', '50', '38'); +INSERT INTO `sys_role_menu` VALUES ('632', '38', '42'); +INSERT INTO `sys_role_menu` VALUES ('737', '51', '38'); +INSERT INTO `sys_role_menu` VALUES ('738', '51', '39'); +INSERT INTO `sys_role_menu` VALUES ('739', '51', '40'); +INSERT INTO `sys_role_menu` VALUES ('740', '51', '41'); +INSERT INTO `sys_role_menu` VALUES ('741', '51', '4'); +INSERT INTO `sys_role_menu` VALUES ('742', '51', '32'); +INSERT INTO `sys_role_menu` VALUES ('743', '51', '33'); +INSERT INTO `sys_role_menu` VALUES ('744', '51', '34'); +INSERT INTO `sys_role_menu` VALUES ('745', '51', '35'); +INSERT INTO `sys_role_menu` VALUES ('746', '51', '27'); +INSERT INTO `sys_role_menu` VALUES ('747', '51', '28'); +INSERT INTO `sys_role_menu` VALUES ('748', '51', '29'); +INSERT INTO `sys_role_menu` VALUES ('749', '51', '30'); +INSERT INTO `sys_role_menu` VALUES ('750', '51', '1'); +INSERT INTO `sys_role_menu` VALUES ('1064', '54', '53'); +INSERT INTO `sys_role_menu` VALUES ('1095', '55', '2'); +INSERT INTO `sys_role_menu` VALUES ('1096', '55', '6'); +INSERT INTO `sys_role_menu` VALUES ('1097', '55', '7'); +INSERT INTO `sys_role_menu` VALUES ('1098', '55', '3'); +INSERT INTO `sys_role_menu` VALUES ('1099', '55', '50'); +INSERT INTO `sys_role_menu` VALUES ('1100', '55', '49'); +INSERT INTO `sys_role_menu` VALUES ('1101', '55', '1'); +INSERT INTO `sys_role_menu` VALUES ('1856', '53', '28'); +INSERT INTO `sys_role_menu` VALUES ('1857', '53', '29'); +INSERT INTO `sys_role_menu` VALUES ('1858', '53', '30'); +INSERT INTO `sys_role_menu` VALUES ('1859', '53', '27'); +INSERT INTO `sys_role_menu` VALUES ('1860', '53', '57'); +INSERT INTO `sys_role_menu` VALUES ('1861', '53', '71'); +INSERT INTO `sys_role_menu` VALUES ('1862', '53', '48'); +INSERT INTO `sys_role_menu` VALUES ('1863', '53', '72'); +INSERT INTO `sys_role_menu` VALUES ('1864', '53', '1'); +INSERT INTO `sys_role_menu` VALUES ('1865', '53', '7'); +INSERT INTO `sys_role_menu` VALUES ('1866', '53', '55'); +INSERT INTO `sys_role_menu` VALUES ('1867', '53', '56'); +INSERT INTO `sys_role_menu` VALUES ('1868', '53', '62'); +INSERT INTO `sys_role_menu` VALUES ('1869', '53', '15'); +INSERT INTO `sys_role_menu` VALUES ('1870', '53', '2'); +INSERT INTO `sys_role_menu` VALUES ('1871', '53', '61'); +INSERT INTO `sys_role_menu` VALUES ('1872', '53', '20'); +INSERT INTO `sys_role_menu` VALUES ('1873', '53', '21'); +INSERT INTO `sys_role_menu` VALUES ('1874', '53', '22'); +INSERT INTO `sys_role_menu` VALUES ('2084', '56', '68'); +INSERT INTO `sys_role_menu` VALUES ('2085', '56', '60'); +INSERT INTO `sys_role_menu` VALUES ('2086', '56', '59'); +INSERT INTO `sys_role_menu` VALUES ('2087', '56', '58'); +INSERT INTO `sys_role_menu` VALUES ('2088', '56', '51'); +INSERT INTO `sys_role_menu` VALUES ('2089', '56', '50'); +INSERT INTO `sys_role_menu` VALUES ('2090', '56', '49'); +INSERT INTO `sys_role_menu` VALUES ('2247', '63', '-1'); +INSERT INTO `sys_role_menu` VALUES ('2248', '63', '84'); +INSERT INTO `sys_role_menu` VALUES ('2249', '63', '85'); +INSERT INTO `sys_role_menu` VALUES ('2250', '63', '88'); +INSERT INTO `sys_role_menu` VALUES ('2251', '63', '87'); +INSERT INTO `sys_role_menu` VALUES ('2252', '64', '84'); +INSERT INTO `sys_role_menu` VALUES ('2253', '64', '89'); +INSERT INTO `sys_role_menu` VALUES ('2254', '64', '88'); +INSERT INTO `sys_role_menu` VALUES ('2255', '64', '87'); +INSERT INTO `sys_role_menu` VALUES ('2256', '64', '86'); +INSERT INTO `sys_role_menu` VALUES ('2257', '64', '85'); +INSERT INTO `sys_role_menu` VALUES ('2258', '65', '89'); +INSERT INTO `sys_role_menu` VALUES ('2259', '65', '88'); +INSERT INTO `sys_role_menu` VALUES ('2260', '65', '86'); +INSERT INTO `sys_role_menu` VALUES ('2262', '67', '48'); +INSERT INTO `sys_role_menu` VALUES ('2263', '68', '88'); +INSERT INTO `sys_role_menu` VALUES ('2264', '68', '87'); +INSERT INTO `sys_role_menu` VALUES ('2265', '69', '89'); +INSERT INTO `sys_role_menu` VALUES ('2266', '69', '88'); +INSERT INTO `sys_role_menu` VALUES ('2267', '69', '86'); +INSERT INTO `sys_role_menu` VALUES ('2268', '69', '87'); +INSERT INTO `sys_role_menu` VALUES ('2269', '69', '85'); +INSERT INTO `sys_role_menu` VALUES ('2270', '69', '84'); +INSERT INTO `sys_role_menu` VALUES ('2271', '70', '85'); +INSERT INTO `sys_role_menu` VALUES ('2272', '70', '89'); +INSERT INTO `sys_role_menu` VALUES ('2273', '70', '88'); +INSERT INTO `sys_role_menu` VALUES ('2274', '70', '87'); +INSERT INTO `sys_role_menu` VALUES ('2275', '70', '86'); +INSERT INTO `sys_role_menu` VALUES ('2276', '70', '84'); +INSERT INTO `sys_role_menu` VALUES ('2277', '71', '87'); +INSERT INTO `sys_role_menu` VALUES ('2278', '72', '59'); +INSERT INTO `sys_role_menu` VALUES ('2279', '73', '48'); +INSERT INTO `sys_role_menu` VALUES ('2280', '74', '88'); +INSERT INTO `sys_role_menu` VALUES ('2281', '74', '87'); +INSERT INTO `sys_role_menu` VALUES ('2282', '75', '88'); +INSERT INTO `sys_role_menu` VALUES ('2283', '75', '87'); +INSERT INTO `sys_role_menu` VALUES ('2284', '76', '85'); +INSERT INTO `sys_role_menu` VALUES ('2285', '76', '89'); +INSERT INTO `sys_role_menu` VALUES ('2286', '76', '88'); +INSERT INTO `sys_role_menu` VALUES ('2287', '76', '87'); +INSERT INTO `sys_role_menu` VALUES ('2288', '76', '86'); +INSERT INTO `sys_role_menu` VALUES ('2289', '76', '84'); +INSERT INTO `sys_role_menu` VALUES ('2292', '78', '88'); +INSERT INTO `sys_role_menu` VALUES ('2293', '78', '87'); +INSERT INTO `sys_role_menu` VALUES ('2294', '78', null); +INSERT INTO `sys_role_menu` VALUES ('2295', '78', null); +INSERT INTO `sys_role_menu` VALUES ('2296', '78', null); +INSERT INTO `sys_role_menu` VALUES ('2308', '80', '87'); +INSERT INTO `sys_role_menu` VALUES ('2309', '80', '86'); +INSERT INTO `sys_role_menu` VALUES ('2310', '80', '-1'); +INSERT INTO `sys_role_menu` VALUES ('2311', '80', '84'); +INSERT INTO `sys_role_menu` VALUES ('2312', '80', '85'); +INSERT INTO `sys_role_menu` VALUES ('2328', '79', '72'); +INSERT INTO `sys_role_menu` VALUES ('2329', '79', '48'); +INSERT INTO `sys_role_menu` VALUES ('2330', '79', '77'); +INSERT INTO `sys_role_menu` VALUES ('2331', '79', '84'); +INSERT INTO `sys_role_menu` VALUES ('2332', '79', '89'); +INSERT INTO `sys_role_menu` VALUES ('2333', '79', '88'); +INSERT INTO `sys_role_menu` VALUES ('2334', '79', '87'); +INSERT INTO `sys_role_menu` VALUES ('2335', '79', '86'); +INSERT INTO `sys_role_menu` VALUES ('2336', '79', '85'); +INSERT INTO `sys_role_menu` VALUES ('2337', '79', '-1'); +INSERT INTO `sys_role_menu` VALUES ('2338', '77', '89'); +INSERT INTO `sys_role_menu` VALUES ('2339', '77', '88'); +INSERT INTO `sys_role_menu` VALUES ('2340', '77', '87'); +INSERT INTO `sys_role_menu` VALUES ('2341', '77', '86'); +INSERT INTO `sys_role_menu` VALUES ('2342', '77', '85'); +INSERT INTO `sys_role_menu` VALUES ('2343', '77', '84'); +INSERT INTO `sys_role_menu` VALUES ('2344', '77', '72'); +INSERT INTO `sys_role_menu` VALUES ('2345', '77', '-1'); +INSERT INTO `sys_role_menu` VALUES ('2346', '77', '77'); +INSERT INTO `sys_role_menu` VALUES ('2974', '1', '78'); +INSERT INTO `sys_role_menu` VALUES ('2975', '1', '3'); +INSERT INTO `sys_role_menu` VALUES ('2976', '1', '73'); +INSERT INTO `sys_role_menu` VALUES ('2977', '1', '76'); +INSERT INTO `sys_role_menu` VALUES ('2978', '1', '75'); +INSERT INTO `sys_role_menu` VALUES ('2979', '1', '74'); +INSERT INTO `sys_role_menu` VALUES ('2980', '1', '7'); +INSERT INTO `sys_role_menu` VALUES ('2981', '1', '62'); +INSERT INTO `sys_role_menu` VALUES ('2982', '1', '56'); +INSERT INTO `sys_role_menu` VALUES ('2983', '1', '55'); +INSERT INTO `sys_role_menu` VALUES ('2984', '1', '15'); +INSERT INTO `sys_role_menu` VALUES ('2985', '1', '6'); +INSERT INTO `sys_role_menu` VALUES ('2986', '1', '26'); +INSERT INTO `sys_role_menu` VALUES ('2987', '1', '25'); +INSERT INTO `sys_role_menu` VALUES ('2988', '1', '24'); +INSERT INTO `sys_role_menu` VALUES ('2989', '1', '14'); +INSERT INTO `sys_role_menu` VALUES ('2990', '1', '13'); +INSERT INTO `sys_role_menu` VALUES ('2991', '1', '12'); +INSERT INTO `sys_role_menu` VALUES ('2992', '1', '2'); +INSERT INTO `sys_role_menu` VALUES ('2993', '1', '77'); +INSERT INTO `sys_role_menu` VALUES ('2994', '1', '61'); +INSERT INTO `sys_role_menu` VALUES ('2995', '1', '22'); +INSERT INTO `sys_role_menu` VALUES ('2996', '1', '21'); +INSERT INTO `sys_role_menu` VALUES ('2997', '1', '20'); + +-- ---------------------------- +-- Table structure for `sys_task` +-- ---------------------------- +DROP TABLE IF EXISTS `sys_task`; +CREATE TABLE `sys_task` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `cron_expression` varchar(255) DEFAULT NULL COMMENT 'cron表达式', + `method_name` varchar(255) DEFAULT NULL COMMENT '任务调用的方法名', + `is_concurrent` varchar(255) DEFAULT NULL COMMENT '任务是否有状态', + `description` varchar(255) DEFAULT NULL COMMENT '任务描述', + `update_by` varchar(64) DEFAULT NULL COMMENT '更新者', + `bean_class` varchar(255) DEFAULT NULL COMMENT '任务执行时调用哪个类的方法 包名+类名', + `create_date` datetime DEFAULT NULL COMMENT '创建时间', + `job_status` varchar(255) DEFAULT NULL COMMENT '任务状态', + `job_group` varchar(255) DEFAULT NULL COMMENT '任务分组', + `update_date` datetime DEFAULT NULL COMMENT '更新时间', + `create_by` varchar(64) DEFAULT NULL COMMENT '创建者', + `spring_bean` varchar(255) DEFAULT NULL COMMENT 'Spring bean', + `job_name` varchar(255) DEFAULT NULL COMMENT '任务名', + PRIMARY KEY (`id`) +) ENGINE=MyISAM AUTO_INCREMENT=8 DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Records of sys_task +-- ---------------------------- +INSERT INTO `sys_task` VALUES ('2', '0/10 * * * * ?', 'run1', '1', '', '4028ea815a3d2a8c015a3d2f8d2a0002', 'com.bootdo.common.task.WelcomeJob', '2017-05-19 18:30:56', '0', 'group1', '2017-05-19 18:31:07', null, '', 'welcomJob'); + +-- ---------------------------- +-- Table structure for `sys_user` +-- ---------------------------- +DROP TABLE IF EXISTS `sys_user`; +CREATE TABLE `sys_user` ( + `user_id` bigint(20) NOT NULL AUTO_INCREMENT, + `username` varchar(50) DEFAULT NULL COMMENT '用户名', + `name` varchar(100) DEFAULT NULL, + `password` varchar(50) DEFAULT NULL COMMENT '密码', + `dept_id` bigint(20) DEFAULT NULL, + `email` varchar(100) DEFAULT NULL COMMENT '邮箱', + `mobile` varchar(100) DEFAULT NULL COMMENT '手机号', + `status` tinyint(255) DEFAULT NULL COMMENT '状态 0:禁用，1:正常', + `user_id_create` bigint(255) DEFAULT NULL COMMENT '创建用户id', + `gmt_create` datetime DEFAULT NULL COMMENT '创建时间', + `gmt_modified` datetime DEFAULT NULL COMMENT '修改时间', + `sex` bigint(32) DEFAULT NULL COMMENT '性别', + `birth` datetime DEFAULT NULL COMMENT '出身日期', + `pic_id` bigint(32) DEFAULT NULL, + `live_address` varchar(500) DEFAULT NULL COMMENT '现居住地', + `hobby` varchar(255) DEFAULT NULL COMMENT '爱好', + `province` varchar(255) DEFAULT NULL COMMENT '省份', + `city` varchar(255) DEFAULT NULL COMMENT '所在城市', + `district` varchar(255) DEFAULT NULL COMMENT '所在地区', + PRIMARY KEY (`user_id`) +) ENGINE=InnoDB AUTO_INCREMENT=158 DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Records of sys_user +-- ---------------------------- +INSERT INTO `sys_user` VALUES ('1', 'admin', '超级管理员', 'd0af8fa1272ef5a152d9e27763eea293', '6', 'admin@example.com', '17699999999', '1', '1', '2017-08-15 21:40:39', '2017-08-15 21:41:00', '96', '2017-12-14 00:00:00', '138', 'ccc', '', '北京市', '北京市市辖区', '东城区'); +INSERT INTO `sys_user` VALUES ('2', 'test', '临时用户', '6cf3bb3deba2aadbd41ec9a22511084e', '6', 'test@bootdo.com', null, '1', '1', '2017-08-14 13:43:05', '2017-08-14 21:15:36', null, null, null, null, null, null, null, null); +INSERT INTO `sys_user` VALUES ('36', 'ldh', '刘德华', 'bfd9394475754fbe45866eba97738c36', '7', 'ldh@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null); +INSERT INTO `sys_user` VALUES ('123', 'zxy', '张学友', '35174ba93f5fe7267f1fb3c1bf903781', '6', 'zxy@bootdo', null, '0', null, null, null, null, null, null, null, null, null, null, null); +INSERT INTO `sys_user` VALUES ('124', 'wyf', '吴亦凡', 'e179e6f687bbd57b9d7efc4746c8090a', '6', 'wyf@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null); +INSERT INTO `sys_user` VALUES ('130', 'lh', '鹿晗', '7924710cd673f68967cde70e188bb097', '9', 'lh@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null); +INSERT INTO `sys_user` VALUES ('131', 'lhc', '令狐冲', 'd515538e17ecb570ba40344b5618f5d4', '6', 'lhc@bootdo.com', null, '0', null, null, null, null, null, null, null, null, null, null, null); +INSERT INTO `sys_user` VALUES ('132', 'lyf', '刘亦菲', '7fdb1d9008f45950c1620ba0864e5fbd', '13', 'lyf@bootdo.com', null, '1', null, null, null, null, '2018-03-15 00:00:00', null, null, null, null, null, null); +INSERT INTO `sys_user` VALUES ('134', 'lyh', '李彦宏', 'dc26092b3244d9d432863f2738180e19', '8', 'lyh@bootdo.com', null, '1', null, null, null, null, '2018-03-18 00:00:00', null, null, null, null, null, null); +INSERT INTO `sys_user` VALUES ('135', 'wjl', '王健林', '3967697dfced162cf6a34080259b83aa', '6', 'wjl@bootod.com', null, '1', null, null, null, null, '2018-03-19 00:00:00', null, null, null, null, null, null); +INSERT INTO `sys_user` VALUES ('136', 'gdg2', '郭德纲', '3bb1bda86bc02bf6478cd91e42135d2f', '9', 'gdg@bootdo.com', null, '1', null, null, null, null, '2018-03-07 00:00:00', null, null, null, null, null, null); +INSERT INTO `sys_user` VALUES ('156', 'test2', '测试二', '9f411bc8445132fba6bef0ee865f9d08', null, 'test2@bootdo', null, null, null, null, null, null, '2018-03-06 00:00:00', null, null, null, null, null, null); + +-- ---------------------------- +-- Table structure for `sys_user_plus` +-- ---------------------------- +DROP TABLE IF EXISTS `sys_user_plus`; +CREATE TABLE `sys_user_plus` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `user_id` bigint(20) NOT NULL, + `payment` double DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Records of sys_user_plus +-- ---------------------------- + +-- ---------------------------- +-- Table structure for `sys_user_role` +-- ---------------------------- +DROP TABLE IF EXISTS `sys_user_role`; +CREATE TABLE `sys_user_role` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `user_id` bigint(20) DEFAULT NULL COMMENT '用户ID', + `role_id` bigint(20) DEFAULT NULL COMMENT '角色ID', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=158 DEFAULT CHARSET=utf8 COMMENT='用户与角色对应关系'; + +-- ---------------------------- +-- Records of sys_user_role +-- ---------------------------- +INSERT INTO `sys_user_role` VALUES ('73', '30', '48'); +INSERT INTO `sys_user_role` VALUES ('74', '30', '49'); +INSERT INTO `sys_user_role` VALUES ('75', '30', '50'); +INSERT INTO `sys_user_role` VALUES ('76', '31', '48'); +INSERT INTO `sys_user_role` VALUES ('77', '31', '49'); +INSERT INTO `sys_user_role` VALUES ('78', '31', '52'); +INSERT INTO `sys_user_role` VALUES ('79', '32', '48'); +INSERT INTO `sys_user_role` VALUES ('80', '32', '49'); +INSERT INTO `sys_user_role` VALUES ('81', '32', '50'); +INSERT INTO `sys_user_role` VALUES ('82', '32', '51'); +INSERT INTO `sys_user_role` VALUES ('83', '32', '52'); +INSERT INTO `sys_user_role` VALUES ('84', '33', '38'); +INSERT INTO `sys_user_role` VALUES ('85', '33', '49'); +INSERT INTO `sys_user_role` VALUES ('86', '33', '52'); +INSERT INTO `sys_user_role` VALUES ('87', '34', '50'); +INSERT INTO `sys_user_role` VALUES ('88', '34', '51'); +INSERT INTO `sys_user_role` VALUES ('89', '34', '52'); +INSERT INTO `sys_user_role` VALUES ('106', '124', '1'); +INSERT INTO `sys_user_role` VALUES ('110', '1', '1'); +INSERT INTO `sys_user_role` VALUES ('111', '2', '1'); +INSERT INTO `sys_user_role` VALUES ('123', '130', '1'); +INSERT INTO `sys_user_role` VALUES ('124', null, '48'); +INSERT INTO `sys_user_role` VALUES ('127', '123', '48'); +INSERT INTO `sys_user_role` VALUES ('132', '36', '48'); +INSERT INTO `sys_user_role` VALUES ('150', '156', '1'); +INSERT INTO `sys_user_role` VALUES ('151', '136', '1'); +INSERT INTO `sys_user_role` VALUES ('152', '135', '1'); +INSERT INTO `sys_user_role` VALUES ('153', '134', '1'); +INSERT INTO `sys_user_role` VALUES ('154', '134', '48'); +INSERT INTO `sys_user_role` VALUES ('155', '134', '56'); +INSERT INTO `sys_user_role` VALUES ('156', '131', '48'); +INSERT INTO `sys_user_role` VALUES ('157', '131', '1'); + +-- ---------------------------- +-- Table structure for `sys_user_token` +-- ---------------------------- +DROP TABLE IF EXISTS `sys_user_token`; +CREATE TABLE `sys_user_token` ( + `user_id` bigint(20) NOT NULL, + `token` varchar(100) NOT NULL COMMENT 'token', + `expire_time` datetime DEFAULT NULL COMMENT '过期时间', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`user_id`), + UNIQUE KEY `token` (`token`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='系统用户Token'; + +-- ---------------------------- +-- Records of sys_user_token +-- ---------------------------- +INSERT INTO `sys_user_token` VALUES ('1', 'b87fcf0a-1139-4079-a34f-5bc27957e458', '2018-01-18 11:29:29', '2018-01-18 10:59:29'); -- Gitee From 68207029e7cd3e4e06d1019da50f079fe563608d Mon Sep 17 00:00:00 2001 From: lcg0124 <1992lcg@163.com> Date: Mon, 9 Apr 2018 18:16:56 +0800 Subject: [PATCH 05/36] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f92a149..db1072b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -1.新建数据库，导数数据库脚本,修改clouddo-admin的数据库用户密码 +1.新建数据库，导数数据库脚本（clouddo-admin的根目录下）,修改clouddo-admin的数据库用户密码 2.启动clouddo-server 注册中心 -- Gitee From 911543cb705b343f24b0cf6ed74316ecd89ae9a4 Mon Sep 17 00:00:00 2001 From: lcg0124 <1992lcg@163.com> Date: Mon, 9 Apr 2018 18:23:42 +0800 Subject: [PATCH 06/36] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index db1072b..6863bbb 100644 --- a/README.md +++ b/README.md @@ -6,4 +6,4 @@ 4.启动clouddo-admin 权限微服务 -5.启动前端项目 \ No newline at end of file +5.启动前端项目 https://gitee.com/lcg0124/clouddo-view.git \ No newline at end of file -- Gitee From c94c8343ce572e164637bd5ccf312fb38453d55a Mon Sep 17 00:00:00 2001 From: lcg0124 <1992lcg@163.com> Date: Mon, 9 Apr 2018 18:28:13 +0800 Subject: [PATCH 07/36] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 6863bbb..6c83f26 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +项目介绍 + clouddo是基于springcloud和vue微服务，前端分离的后台管理框架，可以作为springcloud和vue的入门学习框架，亦可以作为一个基础脚手架进行二次开发 + +使用说明 1.新建数据库，导数数据库脚本（clouddo-admin的根目录下）,修改clouddo-admin的数据库用户密码 2.启动clouddo-server 注册中心 -- Gitee From 5435bd40193257adc87c40cf4790838a551e155d Mon Sep 17 00:00:00 2001 From: lcg0124 <1992lcg@163.com> Date: Mon, 9 Apr 2018 18:28:35 +0800 Subject: [PATCH 08/36] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6c83f26..6717935 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ -项目介绍 +### 项目介绍 + clouddo是基于springcloud和vue微服务，前端分离的后台管理框架，可以作为springcloud和vue的入门学习框架，亦可以作为一个基础脚手架进行二次开发 使用说明 + 1.新建数据库，导数数据库脚本（clouddo-admin的根目录下）,修改clouddo-admin的数据库用户密码 2.启动clouddo-server 注册中心 -- Gitee From 936b1cbd5e5f325f6a23912d2555f464e902bd93 Mon Sep 17 00:00:00 2001 From: lcg0124 <1992lcg@163.com> Date: Mon, 9 Apr 2018 18:28:54 +0800 Subject: [PATCH 09/36] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6717935..a06a2d1 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,8 @@ clouddo是基于springcloud和vue微服务，前端分离的后台管理框架，可以作为springcloud和vue的入门学习框架，亦可以作为一个基础脚手架进行二次开发 -使用说明 +### 使用说明 + 1.新建数据库，导数数据库脚本（clouddo-admin的根目录下）,修改clouddo-admin的数据库用户密码 -- Gitee From 29ddd798f32ca20817ca27cabd40a66618092417 Mon Sep 17 00:00:00 2001 From: lcg0124 <1992lcg@163.com> Date: Wed, 11 Apr 2018 14:48:05 +0800 Subject: [PATCH 10/36] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a06a2d1..47abea5 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,6 @@ 4.启动clouddo-admin 权限微服务 -5.启动前端项目 https://gitee.com/lcg0124/clouddo-view.git \ No newline at end of file +5.启动前端项目 https://gitee.com/lcg0124/clouddo-view.git +### 系统截图 +![输入图片说明](https://gitee.com/uploads/images/2018/0411/144753_cbc377fb_1204498.png "屏幕截图.png") \ No newline at end of file -- Gitee From 8737d1cc294a252b6ebbcdb4960fcf277ed20228 Mon Sep 17 00:00:00 2001 From: lcg0124 <1992lcg@163.com> Date: Tue, 8 May 2018 11:58:54 +0800 Subject: [PATCH 11/36] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9B=AE=E5=BD=95.idea?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/clouddo.iml | 12 -- .idea/compiler.xml | 26 ---- .idea/encodings.xml | 10 -- .idea/libraries/Maven__antlr_antlr_2_7_7.xml | 13 -- .../Maven__aopalliance_aopalliance_1_0.xml | 13 -- ..._ch_qos_logback_logback_classic_1_1_11.xml | 13 -- ...__ch_qos_logback_logback_classic_1_2_3.xml | 13 -- ...en__ch_qos_logback_logback_core_1_1_11.xml | 13 -- ...ven__ch_qos_logback_logback_core_1_2_3.xml | 13 -- .../Maven__com_alibaba_fastjson_1_2_42.xml | 13 -- .../Maven__com_fasterxml_classmate_1_3_4.xml | 13 -- ...jackson_core_jackson_annotations_2_8_0.xml | 13 -- ...jackson_core_jackson_annotations_2_9_0.xml | 13 -- ...erxml_jackson_core_jackson_core_2_8_10.xml | 13 -- ...terxml_jackson_core_jackson_core_2_9_3.xml | 13 -- ...l_jackson_core_jackson_databind_2_8_10.xml | 13 -- ...ml_jackson_core_jackson_databind_2_9_3.xml | 13 -- ...taformat_jackson_dataformat_xml_2_8_10.xml | 13 -- ...ataformat_jackson_dataformat_xml_2_9_3.xml | 13 -- ...n_datatype_jackson_datatype_jdk8_2_9_3.xml | 13 -- ...datatype_jackson_datatype_jsr310_2_9_3.xml | 13 -- ...dule_jackson_module_afterburner_2_8_10.xml | 13 -- ...odule_jackson_module_afterburner_2_9_3.xml | 13 -- ...jackson_module_jaxb_annotations_2_8_10.xml | 13 -- ..._jackson_module_jaxb_annotations_2_9_3.xml | 13 -- ...e_jackson_module_parameter_names_2_9_3.xml | 13 -- ...fasterxml_woodstox_woodstox_core_5_0_3.xml | 13 -- ...ub_andrewoma_dexx_dexx_collections_0_2.xml | 13 -- ...ithub_vlsi_compactmap_compactmap_1_2_1.xml | 13 -- ..._com_google_code_findbugs_jsr305_3_0_1.xml | 13 -- ...Maven__com_google_code_gson_gson_2_8_2.xml | 13 -- .../Maven__com_google_guava_guava_18_0.xml | 13 -- .../Maven__com_google_inject_guice_4_1_0.xml | 13 -- ...n__com_jayway_jsonpath_json_path_2_2_0.xml | 13 -- ...n__com_jayway_jsonpath_json_path_2_4_0.xml | 13 -- ...m_netflix_archaius_archaius_core_0_7_4.xml | 13 -- ...m_netflix_archaius_archaius_core_0_7_5.xml | 13 -- ...com_netflix_eureka_eureka_client_1_7_0.xml | 13 -- ...com_netflix_eureka_eureka_client_1_8_6.xml | 13 -- ...__com_netflix_eureka_eureka_core_1_7_0.xml | 13 -- ...__com_netflix_eureka_eureka_core_1_8_6.xml | 13 -- ...om_netflix_hystrix_hystrix_core_1_5_12.xml | 13 -- ...etflix_hystrix_hystrix_javanica_1_5_12.xml | 13 -- ...ix_hystrix_metrics_event_stream_1_5_12.xml | 13 -- ...x_hystrix_hystrix_serialization_1_5_12.xml | 13 -- ...lix_commons_netflix_commons_util_0_1_1.xml | 13 -- ...netflix_commons_netflix_eventbus_0_3_0.xml | 13 -- ...ix_netflix_commons_netflix_infix_0_3_0.xml | 13 -- ...tflix_commons_netflix_statistics_0_1_1.xml | 13 -- ...Maven__com_netflix_ribbon_ribbon_2_2_4.xml | 13 -- ...__com_netflix_ribbon_ribbon_core_2_2_4.xml | 13 -- ...com_netflix_ribbon_ribbon_eureka_2_2_4.xml | 13 -- ...netflix_ribbon_ribbon_httpclient_2_2_4.xml | 13 -- ...tflix_ribbon_ribbon_loadbalancer_2_2_4.xml | 13 -- ..._netflix_ribbon_ribbon_transport_2_2_4.xml | 13 -- ...n__com_netflix_servo_servo_core_0_10_1.xml | 13 -- ...om_netflix_servo_servo_internal_0_10_1.xml | 13 -- ...aven__com_netflix_zuul_zuul_core_1_3_0.xml | 13 -- ..._contribs_jersey_apache_client4_1_19_1.xml | 13 -- ...n__com_sun_jersey_jersey_client_1_19_1.xml | 13 -- ...ven__com_sun_jersey_jersey_core_1_19_1.xml | 13 -- ...n__com_sun_jersey_jersey_server_1_19_1.xml | 13 -- ...__com_sun_jersey_jersey_servlet_1_19_1.xml | 13 -- ...com_thoughtworks_xstream_xstream_1_4_9.xml | 13 -- ...ogle_android_json_0_0_20131108_vaadin1.xml | 13 -- .../Maven__com_zaxxer_HikariCP_2_7_8.xml | 13 -- ...mons_beanutils_commons_beanutils_1_9_3.xml | 13 -- ...aven__commons_codec_commons_codec_1_10.xml | 13 -- ...aven__commons_codec_commons_codec_1_11.xml | 13 -- ..._collections_commons_collections_3_2_2.xml | 13 -- ...onfiguration_commons_configuration_1_8.xml | 13 -- .../Maven__commons_io_commons_io_2_4.xml | 13 -- ...ven__commons_jxpath_commons_jxpath_1_3.xml | 13 -- .../Maven__commons_lang_commons_lang_2_6.xml | 13 -- ...__io_github_openfeign_feign_core_9_5_0.xml | 13 -- ...__io_github_openfeign_feign_core_9_5_1.xml | 13 -- ...o_github_openfeign_feign_hystrix_9_5_0.xml | 13 -- ...o_github_openfeign_feign_hystrix_9_5_1.xml | 13 -- ..._io_github_openfeign_feign_java8_9_5_1.xml | 13 -- ..._io_github_openfeign_feign_slf4j_9_5_0.xml | 13 -- ..._io_github_openfeign_feign_slf4j_9_5_1.xml | 13 -- .../Maven__io_jsonwebtoken_jjwt_0_7_0.xml | 13 -- ...n__io_micrometer_micrometer_core_1_0_1.xml | 13 -- ...en__io_netty_netty_buffer_4_0_27_Final.xml | 13 -- ...en__io_netty_netty_buffer_4_1_22_Final.xml | 13 -- ...ven__io_netty_netty_codec_4_0_27_Final.xml | 13 -- ...ven__io_netty_netty_codec_4_1_22_Final.xml | 13 -- ...io_netty_netty_codec_http_4_0_27_Final.xml | 13 -- ...io_netty_netty_codec_http_4_1_22_Final.xml | 13 -- ...en__io_netty_netty_common_4_0_27_Final.xml | 13 -- ...en__io_netty_netty_common_4_1_22_Final.xml | 13 -- ...n__io_netty_netty_handler_4_0_27_Final.xml | 13 -- ...__io_netty_netty_resolver_4_1_22_Final.xml | 13 -- ..._io_netty_netty_transport_4_0_27_Final.xml | 13 -- ..._io_netty_netty_transport_4_1_22_Final.xml | 13 -- ...ty_transport_native_epoll_4_0_27_Final.xml | 13 -- ...ty_transport_native_epoll_4_1_22_Final.xml | 13 -- ...nsport_native_unix_common_4_1_22_Final.xml | 13 -- .../Maven__io_reactivex_rxjava_1_2_0.xml | 13 -- .../Maven__io_reactivex_rxjava_1_3_6.xml | 13 -- ...eactivex_rxjava_reactive_streams_1_2_1.xml | 13 -- .../Maven__io_reactivex_rxnetty_0_4_9.xml | 13 -- ...n__io_reactivex_rxnetty_contexts_0_4_9.xml | 13 -- ...aven__io_reactivex_rxnetty_servo_0_4_9.xml | 13 -- ..._annotation_javax_annotation_api_1_3_2.xml | 13 -- .../Maven__javax_inject_javax_inject_1.xml | 13 -- ..._validation_validation_api_1_1_0_Final.xml | 13 -- ..._validation_validation_api_2_0_1_Final.xml | 13 -- .../Maven__javax_ws_rs_jsr311_api_1_1_1.xml | 13 -- ...Maven__javax_xml_stream_stax_api_1_0_2.xml | 13 -- .../Maven__joda_time_joda_time_2_9_9.xml | 13 -- .idea/libraries/Maven__junit_junit_4_12.xml | 13 -- ...ven__mysql_mysql_connector_java_5_1_44.xml | 13 -- ...ven__mysql_mysql_connector_java_5_1_45.xml | 13 -- ...Maven__net_bytebuddy_byte_buddy_1_7_10.xml | 13 -- ..._net_bytebuddy_byte_buddy_agent_1_7_10.xml | 13 -- ...Maven__net_minidev_accessors_smart_1_1.xml | 13 -- ...Maven__net_minidev_accessors_smart_1_2.xml | 13 -- .../Maven__net_minidev_json_smart_2_2_1.xml | 13 -- .../Maven__net_minidev_json_smart_2_3.xml | 13 -- .../Maven__net_sf_ehcache_ehcache_2_10_4.xml | 13 -- .../Maven__org_antlr_antlr_runtime_3_4.xml | 13 -- .../Maven__org_antlr_stringtemplate_3_2_1.xml | 13 -- ...__org_apache_commons_commons_lang3_3_1.xml | 13 -- ...__org_apache_commons_commons_lang3_3_7.xml | 13 -- ...n__org_apache_commons_commons_math_2_2.xml | 13 -- ...apache_httpcomponents_httpclient_4_5_3.xml | 13 -- ...apache_httpcomponents_httpclient_4_5_5.xml | 13 -- ...g_apache_httpcomponents_httpcore_4_4_8.xml | 13 -- ...g_apache_httpcomponents_httpcore_4_4_9.xml | 13 -- ..._apache_logging_log4j_log4j_api_2_10_0.xml | 13 -- ...he_logging_log4j_log4j_to_slf4j_2_10_0.xml | 13 -- ...ven__org_apache_shiro_shiro_core_1_3_2.xml | 13 -- ..._tomcat_embed_tomcat_embed_core_8_5_23.xml | 13 -- ..._tomcat_embed_tomcat_embed_core_8_5_28.xml | 13 -- ...he_tomcat_embed_tomcat_embed_el_8_5_23.xml | 13 -- ...he_tomcat_embed_tomcat_embed_el_8_5_28.xml | 13 -- ...at_embed_tomcat_embed_websocket_8_5_23.xml | 13 -- ...at_embed_tomcat_embed_websocket_8_5_28.xml | 13 -- ...e_tomcat_tomcat_annotations_api_8_5_23.xml | 13 -- ...__org_apache_tomcat_tomcat_jdbc_8_5_23.xml | 13 -- ...__org_apache_tomcat_tomcat_juli_8_5_23.xml | 13 -- ...aven__org_aspectj_aspectjweaver_1_8_13.xml | 13 -- .../Maven__org_assertj_assertj_core_2_6_0.xml | 13 -- .../Maven__org_assertj_assertj_core_3_9_1.xml | 13 -- ...__org_bouncycastle_bcpkix_jdk15on_1_55.xml | 13 -- ...__org_bouncycastle_bcpkix_jdk15on_1_56.xml | 13 -- ...__org_bouncycastle_bcprov_jdk15on_1_55.xml | 13 -- ...__org_bouncycastle_bcprov_jdk15on_1_56.xml | 13 -- ...__org_codehaus_jettison_jettison_1_3_7.xml | 13 -- ..._org_codehaus_woodstox_stax2_api_3_1_4.xml | 13 -- ...ehaus_woodstox_woodstox_core_asl_4_4_1.xml | 13 -- ...reemarker_freemarker_2_3_27_incubating.xml | 13 -- .../Maven__org_hamcrest_hamcrest_core_1_3.xml | 13 -- ...ven__org_hamcrest_hamcrest_library_1_3.xml | 13 -- ...n__org_hdrhistogram_HdrHistogram_2_1_9.xml | 13 -- ...ernate_hibernate_validator_5_3_6_Final.xml | 13 -- ...idator_hibernate_validator_6_0_7_Final.xml | 13 -- ...boss_logging_jboss_logging_3_3_1_Final.xml | 13 -- ...boss_logging_jboss_logging_3_3_2_Final.xml | 13 -- ...rg_jvnet_animal_sniffer_annotation_1_0.xml | 13 -- ...n__org_latencyutils_LatencyUtils_2_0_3.xml | 13 -- ...n__org_mapstruct_mapstruct_1_1_0_Final.xml | 13 -- ...g_mapstruct_mapstruct_jdk8_1_1_0_Final.xml | 13 -- ...g_mapstruct_mapstruct_jdk8_1_2_0_Final.xml | 13 -- ...struct_mapstruct_processor_1_1_0_Final.xml | 13 -- ...aven__org_mockito_mockito_core_1_10_19.xml | 13 -- ...Maven__org_mockito_mockito_core_2_15_0.xml | 13 -- .../Maven__org_mybatis_mybatis_3_4_4.xml | 13 -- .../Maven__org_mybatis_mybatis_3_4_5.xml | 13 -- ...aven__org_mybatis_mybatis_spring_1_3_0.xml | 13 -- ...aven__org_mybatis_mybatis_spring_1_3_1.xml | 13 -- ...ybatis_spring_boot_autoconfigure_1_1_1.xml | 13 -- ...ybatis_spring_boot_autoconfigure_1_3_1.xml | 13 -- ...boot_mybatis_spring_boot_starter_1_1_1.xml | 13 -- ...boot_mybatis_spring_boot_starter_1_3_1.xml | 13 -- .../Maven__org_objenesis_objenesis_2_1.xml | 13 -- .../Maven__org_objenesis_objenesis_2_6.xml | 13 -- .../Maven__org_ow2_asm_asm_5_0_3.xml | 13 -- .../Maven__org_ow2_asm_asm_5_0_4.xml | 13 -- ...reactivestreams_reactive_streams_1_0_2.xml | 13 -- ...aven__org_skyscreamer_jsonassert_1_4_0.xml | 13 -- ...aven__org_skyscreamer_jsonassert_1_5_0.xml | 13 -- ...Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml | 13 -- .../Maven__org_slf4j_jul_to_slf4j_1_7_25.xml | 13 -- ...ven__org_slf4j_log4j_over_slf4j_1_7_25.xml | 13 -- .../Maven__org_slf4j_slf4j_api_1_7_25.xml | 13 -- ...amework_boot_spring_boot_1_5_9_RELEASE.xml | 13 -- ...amework_boot_spring_boot_2_0_0_RELEASE.xml | 13 -- ...oot_spring_boot_actuator_1_5_9_RELEASE.xml | 13 -- ...oot_spring_boot_actuator_2_0_0_RELEASE.xml | 13 -- ...t_actuator_autoconfigure_2_0_0_RELEASE.xml | 13 -- ...pring_boot_autoconfigure_1_5_6_RELEASE.xml | 13 -- ...pring_boot_autoconfigure_1_5_9_RELEASE.xml | 13 -- ...pring_boot_autoconfigure_2_0_0_RELEASE.xml | 13 -- ...boot_spring_boot_starter_1_5_9_RELEASE.xml | 13 -- ...boot_spring_boot_starter_2_0_0_RELEASE.xml | 13 -- ...ng_boot_starter_actuator_1_5_9_RELEASE.xml | 13 -- ...ng_boot_starter_actuator_2_0_0_RELEASE.xml | 13 -- ..._spring_boot_starter_aop_2_0_0_RELEASE.xml | 13 -- ..._boot_starter_freemarker_1_5_9_RELEASE.xml | 13 -- ..._boot_starter_freemarker_2_0_0_RELEASE.xml | 13 -- ...spring_boot_starter_jdbc_1_5_9_RELEASE.xml | 13 -- ...spring_boot_starter_jdbc_2_0_0_RELEASE.xml | 13 -- ...spring_boot_starter_json_2_0_0_RELEASE.xml | 13 -- ...ing_boot_starter_logging_1_5_9_RELEASE.xml | 13 -- ...ing_boot_starter_logging_2_0_0_RELEASE.xml | 13 -- ...ng_boot_starter_security_1_5_9_RELEASE.xml | 13 -- ...spring_boot_starter_test_1_5_9_RELEASE.xml | 13 -- ...spring_boot_starter_test_2_0_0_RELEASE.xml | 13 -- ...ring_boot_starter_tomcat_1_5_9_RELEASE.xml | 13 -- ...ring_boot_starter_tomcat_2_0_0_RELEASE.xml | 13 -- ..._spring_boot_starter_web_1_5_9_RELEASE.xml | 13 -- ..._spring_boot_starter_web_2_0_0_RELEASE.xml | 13 -- ...g_boot_starter_websocket_1_5_9_RELEASE.xml | 13 -- ...rk_boot_spring_boot_test_1_5_9_RELEASE.xml | 13 -- ...rk_boot_spring_boot_test_2_0_0_RELEASE.xml | 13 -- ..._boot_test_autoconfigure_1_5_9_RELEASE.xml | 13 -- ..._boot_test_autoconfigure_2_0_0_RELEASE.xml | 13 -- ...oud_spring_cloud_commons_1_3_0_RELEASE.xml | 13 -- ...rk_cloud_spring_cloud_commons_2_0_0_M8.xml | 13 -- ...oud_spring_cloud_context_1_3_0_RELEASE.xml | 13 -- ...rk_cloud_spring_cloud_context_2_0_0_M8.xml | 13 -- ...spring_cloud_netflix_archaius_2_0_0_M7.xml | 13 -- ...pring_cloud_netflix_core_1_4_0_RELEASE.xml | 13 -- ...oud_spring_cloud_netflix_core_2_0_0_M7.xml | 13 -- ...ud_netflix_eureka_client_1_4_0_RELEASE.xml | 13 -- ...g_cloud_netflix_eureka_client_2_0_0_M7.xml | 13 -- ...ud_netflix_eureka_server_1_4_0_RELEASE.xml | 13 -- ...g_cloud_netflix_eureka_server_2_0_0_M7.xml | 13 -- ...d_spring_cloud_netflix_ribbon_2_0_0_M7.xml | 13 -- ...d_spring_cloud_openfeign_core_2_0_0_M1.xml | 13 -- ...oud_spring_cloud_starter_1_3_0_RELEASE.xml | 13 -- ...rk_cloud_spring_cloud_starter_2_0_0_M8.xml | 13 -- ...ud_starter_eureka_server_1_4_0_RELEASE.xml | 13 -- ...ring_cloud_starter_feign_1_4_0_RELEASE.xml | 13 -- ...ng_cloud_starter_hystrix_1_4_0_RELEASE.xml | 13 -- ...starter_netflix_archaius_1_4_0_RELEASE.xml | 13 -- ...loud_starter_netflix_archaius_2_0_0_M7.xml | 13 -- ...er_netflix_eureka_server_1_4_0_RELEASE.xml | 13 -- ...starter_netflix_eureka_server_2_0_0_M7.xml | 13 -- ..._starter_netflix_hystrix_1_4_0_RELEASE.xml | 13 -- ...cloud_starter_netflix_hystrix_2_0_0_M7.xml | 13 -- ...d_starter_netflix_ribbon_1_4_0_RELEASE.xml | 13 -- ..._cloud_starter_netflix_ribbon_2_0_0_M7.xml | 13 -- ...oud_starter_netflix_zuul_1_4_0_RELEASE.xml | 13 -- ..._cloud_starter_openfeign_1_4_0_RELEASE.xml | 13 -- ...pring_cloud_starter_openfeign_2_0_0_M1.xml | 13 -- ...ing_cloud_starter_ribbon_1_4_0_RELEASE.xml | 13 -- ...pring_cloud_starter_zuul_1_4_0_RELEASE.xml | 13 -- ...y_spring_security_config_4_2_3_RELEASE.xml | 13 -- ...ity_spring_security_core_4_2_3_RELEASE.xml | 13 -- ...y_spring_security_crypto_4_2_3_RELEASE.xml | 13 -- ...y_spring_security_crypto_5_0_3_RELEASE.xml | 13 -- ...rity_spring_security_rsa_1_0_3_RELEASE.xml | 13 -- ...rity_spring_security_rsa_1_0_5_RELEASE.xml | 13 -- ...rity_spring_security_web_4_2_3_RELEASE.xml | 13 -- ...ingframework_spring_aop_4_3_13_RELEASE.xml | 13 -- ...ringframework_spring_aop_5_0_4_RELEASE.xml | 13 -- ...gframework_spring_beans_4_3_13_RELEASE.xml | 13 -- ...ngframework_spring_beans_5_0_4_RELEASE.xml | 13 -- ...ramework_spring_context_4_3_13_RELEASE.xml | 13 -- ...framework_spring_context_5_0_4_RELEASE.xml | 13 -- ..._spring_context_support_4_3_13_RELEASE.xml | 13 -- ...k_spring_context_support_5_0_4_RELEASE.xml | 13 -- ...ngframework_spring_core_4_3_13_RELEASE.xml | 13 -- ...ingframework_spring_core_5_0_4_RELEASE.xml | 13 -- ...ework_spring_expression_4_3_13_RELEASE.xml | 13 -- ...mework_spring_expression_5_0_4_RELEASE.xml | 13 -- ...ringframework_spring_jcl_5_0_4_RELEASE.xml | 13 -- ...ngframework_spring_jdbc_4_3_13_RELEASE.xml | 13 -- ...ingframework_spring_jdbc_5_0_4_RELEASE.xml | 13 -- ...mework_spring_messaging_4_3_13_RELEASE.xml | 13 -- ...ngframework_spring_test_4_3_13_RELEASE.xml | 13 -- ...ingframework_spring_test_5_0_4_RELEASE.xml | 13 -- ...ringframework_spring_tx_4_3_13_RELEASE.xml | 13 -- ...pringframework_spring_tx_5_0_4_RELEASE.xml | 13 -- ...ingframework_spring_web_4_3_13_RELEASE.xml | 13 -- ...ringframework_spring_web_5_0_4_RELEASE.xml | 13 -- ...framework_spring_webmvc_4_3_13_RELEASE.xml | 13 -- ...gframework_spring_webmvc_5_0_4_RELEASE.xml | 13 -- ...mework_spring_websocket_4_3_13_RELEASE.xml | 13 -- .../Maven__org_xmlunit_xmlunit_core_2_5_1.xml | 13 -- .../Maven__org_yaml_snakeyaml_1_17.xml | 13 -- .../Maven__org_yaml_snakeyaml_1_19.xml | 13 -- .../libraries/Maven__stax_stax_api_1_0_1.xml | 13 -- .../Maven__xmlpull_xmlpull_1_1_3_1.xml | 13 -- .../libraries/Maven__xpp3_xpp3_min_1_1_4c.xml | 13 -- .idea/misc.xml | 16 --- .idea/modules.xml | 13 -- .idea/uiDesigner.xml | 124 ------------------ .idea/vcs.xml | 6 - 292 files changed, 3912 deletions(-) delete mode 100644 .idea/clouddo.iml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/libraries/Maven__antlr_antlr_2_7_7.xml delete mode 100644 .idea/libraries/Maven__aopalliance_aopalliance_1_0.xml delete mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_11.xml delete mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml delete mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_core_1_1_11.xml delete mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml delete mode 100644 .idea/libraries/Maven__com_alibaba_fastjson_1_2_42.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_10.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_3.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_10.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_3.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_xml_2_8_10.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_xml_2_9_3.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_3.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_3.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_8_10.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_9_3.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_8_10.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_9_3.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_3.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_woodstox_woodstox_core_5_0_3.xml delete mode 100644 .idea/libraries/Maven__com_github_andrewoma_dexx_dexx_collections_0_2.xml delete mode 100644 .idea/libraries/Maven__com_github_vlsi_compactmap_compactmap_1_2_1.xml delete mode 100644 .idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_1.xml delete mode 100644 .idea/libraries/Maven__com_google_code_gson_gson_2_8_2.xml delete mode 100644 .idea/libraries/Maven__com_google_guava_guava_18_0.xml delete mode 100644 .idea/libraries/Maven__com_google_inject_guice_4_1_0.xml delete mode 100644 .idea/libraries/Maven__com_jayway_jsonpath_json_path_2_2_0.xml delete mode 100644 .idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml delete mode 100644 .idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_4.xml delete mode 100644 .idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_5.xml delete mode 100644 .idea/libraries/Maven__com_netflix_eureka_eureka_client_1_7_0.xml delete mode 100644 .idea/libraries/Maven__com_netflix_eureka_eureka_client_1_8_6.xml delete mode 100644 .idea/libraries/Maven__com_netflix_eureka_eureka_core_1_7_0.xml delete mode 100644 .idea/libraries/Maven__com_netflix_eureka_eureka_core_1_8_6.xml delete mode 100644 .idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_12.xml delete mode 100644 .idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_12.xml delete mode 100644 .idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_12.xml delete mode 100644 .idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_12.xml delete mode 100644 .idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_1_1.xml delete mode 100644 .idea/libraries/Maven__com_netflix_netflix_commons_netflix_eventbus_0_3_0.xml delete mode 100644 .idea/libraries/Maven__com_netflix_netflix_commons_netflix_infix_0_3_0.xml delete mode 100644 .idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml delete mode 100644 .idea/libraries/Maven__com_netflix_ribbon_ribbon_2_2_4.xml delete mode 100644 .idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_2_4.xml delete mode 100644 .idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_2_4.xml delete mode 100644 .idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_2_4.xml delete mode 100644 .idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_2_4.xml delete mode 100644 .idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_2_4.xml delete mode 100644 .idea/libraries/Maven__com_netflix_servo_servo_core_0_10_1.xml delete mode 100644 .idea/libraries/Maven__com_netflix_servo_servo_internal_0_10_1.xml delete mode 100644 .idea/libraries/Maven__com_netflix_zuul_zuul_core_1_3_0.xml delete mode 100644 .idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml delete mode 100644 .idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml delete mode 100644 .idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml delete mode 100644 .idea/libraries/Maven__com_sun_jersey_jersey_server_1_19_1.xml delete mode 100644 .idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_19_1.xml delete mode 100644 .idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_9.xml delete mode 100644 .idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml delete mode 100644 .idea/libraries/Maven__com_zaxxer_HikariCP_2_7_8.xml delete mode 100644 .idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml delete mode 100644 .idea/libraries/Maven__commons_codec_commons_codec_1_10.xml delete mode 100644 .idea/libraries/Maven__commons_codec_commons_codec_1_11.xml delete mode 100644 .idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml delete mode 100644 .idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml delete mode 100644 .idea/libraries/Maven__commons_io_commons_io_2_4.xml delete mode 100644 .idea/libraries/Maven__commons_jxpath_commons_jxpath_1_3.xml delete mode 100644 .idea/libraries/Maven__commons_lang_commons_lang_2_6.xml delete mode 100644 .idea/libraries/Maven__io_github_openfeign_feign_core_9_5_0.xml delete mode 100644 .idea/libraries/Maven__io_github_openfeign_feign_core_9_5_1.xml delete mode 100644 .idea/libraries/Maven__io_github_openfeign_feign_hystrix_9_5_0.xml delete mode 100644 .idea/libraries/Maven__io_github_openfeign_feign_hystrix_9_5_1.xml delete mode 100644 .idea/libraries/Maven__io_github_openfeign_feign_java8_9_5_1.xml delete mode 100644 .idea/libraries/Maven__io_github_openfeign_feign_slf4j_9_5_0.xml delete mode 100644 .idea/libraries/Maven__io_github_openfeign_feign_slf4j_9_5_1.xml delete mode 100644 .idea/libraries/Maven__io_jsonwebtoken_jjwt_0_7_0.xml delete mode 100644 .idea/libraries/Maven__io_micrometer_micrometer_core_1_0_1.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_buffer_4_0_27_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_buffer_4_1_22_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_codec_4_0_27_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_codec_4_1_22_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_codec_http_4_0_27_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_codec_http_4_1_22_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_common_4_0_27_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_common_4_1_22_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_handler_4_0_27_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_resolver_4_1_22_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_transport_4_0_27_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_transport_4_1_22_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_transport_native_epoll_4_0_27_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_transport_native_epoll_4_1_22_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_22_Final.xml delete mode 100644 .idea/libraries/Maven__io_reactivex_rxjava_1_2_0.xml delete mode 100644 .idea/libraries/Maven__io_reactivex_rxjava_1_3_6.xml delete mode 100644 .idea/libraries/Maven__io_reactivex_rxjava_reactive_streams_1_2_1.xml delete mode 100644 .idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml delete mode 100644 .idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml delete mode 100644 .idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml delete mode 100644 .idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml delete mode 100644 .idea/libraries/Maven__javax_inject_javax_inject_1.xml delete mode 100644 .idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml delete mode 100644 .idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml delete mode 100644 .idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml delete mode 100644 .idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml delete mode 100644 .idea/libraries/Maven__joda_time_joda_time_2_9_9.xml delete mode 100644 .idea/libraries/Maven__junit_junit_4_12.xml delete mode 100644 .idea/libraries/Maven__mysql_mysql_connector_java_5_1_44.xml delete mode 100644 .idea/libraries/Maven__mysql_mysql_connector_java_5_1_45.xml delete mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_10.xml delete mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_10.xml delete mode 100644 .idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml delete mode 100644 .idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml delete mode 100644 .idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml delete mode 100644 .idea/libraries/Maven__net_minidev_json_smart_2_3.xml delete mode 100644 .idea/libraries/Maven__net_sf_ehcache_ehcache_2_10_4.xml delete mode 100644 .idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml delete mode 100644 .idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_lang3_3_1.xml delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_math_2_2.xml delete mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_3.xml delete mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_5.xml delete mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_8.xml delete mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_9.xml delete mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_10_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_core_1_3_2.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_23.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_28.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_23.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_28.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_23.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_28.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_8_5_23.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_23.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_23.xml delete mode 100644 .idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml delete mode 100644 .idea/libraries/Maven__org_assertj_assertj_core_2_6_0.xml delete mode 100644 .idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml delete mode 100644 .idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_55.xml delete mode 100644 .idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_56.xml delete mode 100644 .idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_55.xml delete mode 100644 .idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_56.xml delete mode 100644 .idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_7.xml delete mode 100644 .idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml delete mode 100644 .idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml delete mode 100644 .idea/libraries/Maven__org_freemarker_freemarker_2_3_27_incubating.xml delete mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml delete mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml delete mode 100644 .idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml delete mode 100644 .idea/libraries/Maven__org_hibernate_hibernate_validator_5_3_6_Final.xml delete mode 100644 .idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_7_Final.xml delete mode 100644 .idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_1_Final.xml delete mode 100644 .idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml delete mode 100644 .idea/libraries/Maven__org_jvnet_animal_sniffer_annotation_1_0.xml delete mode 100644 .idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml delete mode 100644 .idea/libraries/Maven__org_mapstruct_mapstruct_1_1_0_Final.xml delete mode 100644 .idea/libraries/Maven__org_mapstruct_mapstruct_jdk8_1_1_0_Final.xml delete mode 100644 .idea/libraries/Maven__org_mapstruct_mapstruct_jdk8_1_2_0_Final.xml delete mode 100644 .idea/libraries/Maven__org_mapstruct_mapstruct_processor_1_1_0_Final.xml delete mode 100644 .idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml delete mode 100644 .idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml delete mode 100644 .idea/libraries/Maven__org_mybatis_mybatis_3_4_4.xml delete mode 100644 .idea/libraries/Maven__org_mybatis_mybatis_3_4_5.xml delete mode 100644 .idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml delete mode 100644 .idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml delete mode 100644 .idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_1_1.xml delete mode 100644 .idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_1.xml delete mode 100644 .idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_1_1.xml delete mode 100644 .idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_1.xml delete mode 100644 .idea/libraries/Maven__org_objenesis_objenesis_2_1.xml delete mode 100644 .idea/libraries/Maven__org_objenesis_objenesis_2_6.xml delete mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml delete mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml delete mode 100644 .idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml delete mode 100644 .idea/libraries/Maven__org_skyscreamer_jsonassert_1_4_0.xml delete mode 100644 .idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml delete mode 100644 .idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml delete mode 100644 .idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml delete mode 100644 .idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_25.xml delete mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_1_5_9_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_1_5_9_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_0_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_0_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_9_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_5_9_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_1_5_9_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_0_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_1_5_9_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_0_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_5_9_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_5_9_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_1_5_9_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_5_9_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_5_9_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_5_9_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_1_5_9_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_1_5_9_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_1_5_9_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_1_3_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_0_0_M8.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_1_3_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_0_0_M8.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_0_0_M7.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_1_4_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_2_0_0_M7.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_1_4_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_2_0_0_M7.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_server_1_4_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_server_2_0_0_M7.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_0_0_M7.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_0_0_M1.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_1_3_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_0_0_M8.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_eureka_server_1_4_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_feign_1_4_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_hystrix_1_4_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_1_4_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_0_0_M7.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_server_1_4_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_server_2_0_0_M7.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_1_4_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_0_0_M7.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_1_4_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_0_0_M7.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_zuul_1_4_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_1_4_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_0_0_M1.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_ribbon_1_4_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_zuul_1_4_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_config_4_2_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_core_4_2_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_crypto_4_2_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_0_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_5_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_web_4_2_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_aop_4_3_13_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_aop_5_0_4_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_beans_4_3_13_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_beans_5_0_4_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_context_4_3_13_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_context_5_0_4_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_context_support_4_3_13_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_context_support_5_0_4_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_core_4_3_13_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_core_5_0_4_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_expression_4_3_13_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_expression_5_0_4_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_jcl_5_0_4_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_jdbc_4_3_13_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_jdbc_5_0_4_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_messaging_4_3_13_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_test_4_3_13_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_test_5_0_4_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_tx_4_3_13_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_tx_5_0_4_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_web_4_3_13_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_web_5_0_4_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_webmvc_4_3_13_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_webmvc_5_0_4_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_websocket_4_3_13_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml delete mode 100644 .idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml delete mode 100644 .idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml delete mode 100644 .idea/libraries/Maven__stax_stax_api_1_0_1.xml delete mode 100644 .idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml delete mode 100644 .idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/uiDesigner.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/clouddo.iml b/.idea/clouddo.iml deleted file mode 100644 index 4fd5057..0000000 --- a/.idea/clouddo.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index bb65c5b..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index fe0237c..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml deleted file mode 100644 index b8d93d8..0000000 --- a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml deleted file mode 100644 index 30ff5cb..0000000 --- a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_11.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_11.xml deleted file mode 100644 index c6ea67e..0000000 --- a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_11.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml deleted file mode 100644 index 6fec8f4..0000000 --- a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_11.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_11.xml deleted file mode 100644 index f538e36..0000000 --- a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_11.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml deleted file mode 100644 index 9eb8596..0000000 --- a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_42.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_42.xml deleted file mode 100644 index a0dad74..0000000 --- a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_42.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml deleted file mode 100644 index 33c30b4..0000000 --- a/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml deleted file mode 100644 index 49b4ec7..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml deleted file mode 100644 index 06441f4..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_10.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_10.xml deleted file mode 100644 index 5d9d662..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_3.xml deleted file mode 100644 index 4110fd4..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_10.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_10.xml deleted file mode 100644 index df5cb22..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_3.xml deleted file mode 100644 index 0bc8068..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_xml_2_8_10.xml b/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_xml_2_8_10.xml deleted file mode 100644 index dc55693..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_xml_2_8_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_xml_2_9_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_xml_2_9_3.xml deleted file mode 100644 index 762f646..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_xml_2_9_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_3.xml deleted file mode 100644 index 9c4042d..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_3.xml deleted file mode 100644 index 73161db..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_8_10.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_8_10.xml deleted file mode 100644 index 9f10588..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_8_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_9_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_9_3.xml deleted file mode 100644 index 17dcde5..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_9_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_8_10.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_8_10.xml deleted file mode 100644 index 4274b9d..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_8_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_9_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_9_3.xml deleted file mode 100644 index 096aa2c..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_9_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_3.xml deleted file mode 100644 index ced21d4..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_woodstox_woodstox_core_5_0_3.xml b/.idea/libraries/Maven__com_fasterxml_woodstox_woodstox_core_5_0_3.xml deleted file mode 100644 index c08dcae..0000000 --- a/.idea/libraries/Maven__com_fasterxml_woodstox_woodstox_core_5_0_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_andrewoma_dexx_dexx_collections_0_2.xml b/.idea/libraries/Maven__com_github_andrewoma_dexx_dexx_collections_0_2.xml deleted file mode 100644 index 04210c5..0000000 --- a/.idea/libraries/Maven__com_github_andrewoma_dexx_dexx_collections_0_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_vlsi_compactmap_compactmap_1_2_1.xml b/.idea/libraries/Maven__com_github_vlsi_compactmap_compactmap_1_2_1.xml deleted file mode 100644 index 0bc971a..0000000 --- a/.idea/libraries/Maven__com_github_vlsi_compactmap_compactmap_1_2_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_1.xml b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_1.xml deleted file mode 100644 index 09453c9..0000000 --- a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_2.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_8_2.xml deleted file mode 100644 index 49c91be..0000000 --- a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_18_0.xml b/.idea/libraries/Maven__com_google_guava_guava_18_0.xml deleted file mode 100644 index bbd71d7..0000000 --- a/.idea/libraries/Maven__com_google_guava_guava_18_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_inject_guice_4_1_0.xml b/.idea/libraries/Maven__com_google_inject_guice_4_1_0.xml deleted file mode 100644 index e956197..0000000 --- a/.idea/libraries/Maven__com_google_inject_guice_4_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_2_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_2_0.xml deleted file mode 100644 index 578b079..0000000 --- a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml deleted file mode 100644 index f19f6eb..0000000 --- a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_4.xml b/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_4.xml deleted file mode 100644 index e5a8232..0000000 --- a/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_5.xml b/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_5.xml deleted file mode 100644 index 3641a97..0000000 --- a/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_5.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_7_0.xml b/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_7_0.xml deleted file mode 100644 index 89ed6f5..0000000 --- a/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_7_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_8_6.xml b/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_8_6.xml deleted file mode 100644 index e25a768..0000000 --- a/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_8_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_7_0.xml b/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_7_0.xml deleted file mode 100644 index 52fb825..0000000 --- a/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_7_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_8_6.xml b/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_8_6.xml deleted file mode 100644 index 79c252c..0000000 --- a/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_8_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_12.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_12.xml deleted file mode 100644 index 8f6dabe..0000000 --- a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_12.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_12.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_12.xml deleted file mode 100644 index be8a561..0000000 --- a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_12.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_12.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_12.xml deleted file mode 100644 index 9f01c4f..0000000 --- a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_12.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_12.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_12.xml deleted file mode 100644 index d71dae3..0000000 --- a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_12.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_1_1.xml b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_1_1.xml deleted file mode 100644 index 9854a4d..0000000 --- a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_eventbus_0_3_0.xml b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_eventbus_0_3_0.xml deleted file mode 100644 index 85ba8c9..0000000 --- a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_eventbus_0_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_infix_0_3_0.xml b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_infix_0_3_0.xml deleted file mode 100644 index c8b512e..0000000 --- a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_infix_0_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml deleted file mode 100644 index 09c6f6e..0000000 --- a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_2_4.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_2_4.xml deleted file mode 100644 index 7dd8bae..0000000 --- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_2_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_2_4.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_2_4.xml deleted file mode 100644 index 7f8420a..0000000 --- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_2_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_2_4.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_2_4.xml deleted file mode 100644 index 0b069c0..0000000 --- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_2_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_2_4.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_2_4.xml deleted file mode 100644 index b81422c..0000000 --- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_2_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_2_4.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_2_4.xml deleted file mode 100644 index 533f7ae..0000000 --- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_2_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_2_4.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_2_4.xml deleted file mode 100644 index 2c1133d..0000000 --- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_2_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_servo_servo_core_0_10_1.xml b/.idea/libraries/Maven__com_netflix_servo_servo_core_0_10_1.xml deleted file mode 100644 index 8e42a88..0000000 --- a/.idea/libraries/Maven__com_netflix_servo_servo_core_0_10_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_servo_servo_internal_0_10_1.xml b/.idea/libraries/Maven__com_netflix_servo_servo_internal_0_10_1.xml deleted file mode 100644 index 74dfcbc..0000000 --- a/.idea/libraries/Maven__com_netflix_servo_servo_internal_0_10_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_zuul_zuul_core_1_3_0.xml b/.idea/libraries/Maven__com_netflix_zuul_zuul_core_1_3_0.xml deleted file mode 100644 index 04b3227..0000000 --- a/.idea/libraries/Maven__com_netflix_zuul_zuul_core_1_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml deleted file mode 100644 index 2061d8c..0000000 --- a/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml deleted file mode 100644 index 2b077bc..0000000 --- a/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml deleted file mode 100644 index 91d65b2..0000000 --- a/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_19_1.xml deleted file mode 100644 index b4ad3de..0000000 --- a/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_19_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_19_1.xml deleted file mode 100644 index 943df5a..0000000 --- a/.idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_19_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_9.xml b/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_9.xml deleted file mode 100644 index 1922b11..0000000 --- a/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml deleted file mode 100644 index b8581a6..0000000 --- a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_8.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_8.xml deleted file mode 100644 index 848c412..0000000 --- a/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_8.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml deleted file mode 100644 index 687a60e..0000000 --- a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml deleted file mode 100644 index 27424a1..0000000 --- a/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml deleted file mode 100644 index 4c8ff54..0000000 --- a/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml deleted file mode 100644 index 13afda2..0000000 --- a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml deleted file mode 100644 index 772d6fe..0000000 --- a/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml deleted file mode 100644 index bc2aad0..0000000 --- a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_jxpath_commons_jxpath_1_3.xml b/.idea/libraries/Maven__commons_jxpath_commons_jxpath_1_3.xml deleted file mode 100644 index 1816895..0000000 --- a/.idea/libraries/Maven__commons_jxpath_commons_jxpath_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml deleted file mode 100644 index 2ec8376..0000000 --- a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_core_9_5_0.xml b/.idea/libraries/Maven__io_github_openfeign_feign_core_9_5_0.xml deleted file mode 100644 index aa7944c..0000000 --- a/.idea/libraries/Maven__io_github_openfeign_feign_core_9_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_core_9_5_1.xml b/.idea/libraries/Maven__io_github_openfeign_feign_core_9_5_1.xml deleted file mode 100644 index 43878d4..0000000 --- a/.idea/libraries/Maven__io_github_openfeign_feign_core_9_5_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_9_5_0.xml b/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_9_5_0.xml deleted file mode 100644 index 1cddd78..0000000 --- a/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_9_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_9_5_1.xml b/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_9_5_1.xml deleted file mode 100644 index b37db53..0000000 --- a/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_9_5_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_java8_9_5_1.xml b/.idea/libraries/Maven__io_github_openfeign_feign_java8_9_5_1.xml deleted file mode 100644 index a052ec9..0000000 --- a/.idea/libraries/Maven__io_github_openfeign_feign_java8_9_5_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_9_5_0.xml b/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_9_5_0.xml deleted file mode 100644 index 57db686..0000000 --- a/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_9_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_9_5_1.xml b/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_9_5_1.xml deleted file mode 100644 index ade452c..0000000 --- a/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_9_5_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_7_0.xml b/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_7_0.xml deleted file mode 100644 index c9bf8a5..0000000 --- a/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_7_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_micrometer_micrometer_core_1_0_1.xml b/.idea/libraries/Maven__io_micrometer_micrometer_core_1_0_1.xml deleted file mode 100644 index 26851cb..0000000 --- a/.idea/libraries/Maven__io_micrometer_micrometer_core_1_0_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_buffer_4_0_27_Final.xml b/.idea/libraries/Maven__io_netty_netty_buffer_4_0_27_Final.xml deleted file mode 100644 index ad32e95..0000000 --- a/.idea/libraries/Maven__io_netty_netty_buffer_4_0_27_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_22_Final.xml b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_22_Final.xml deleted file mode 100644 index 02e8171..0000000 --- a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_22_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_4_0_27_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_4_0_27_Final.xml deleted file mode 100644 index 84e99a4..0000000 --- a/.idea/libraries/Maven__io_netty_netty_codec_4_0_27_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_4_1_22_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_4_1_22_Final.xml deleted file mode 100644 index 0b6fb38..0000000 --- a/.idea/libraries/Maven__io_netty_netty_codec_4_1_22_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_http_4_0_27_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_http_4_0_27_Final.xml deleted file mode 100644 index cab5893..0000000 --- a/.idea/libraries/Maven__io_netty_netty_codec_http_4_0_27_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_22_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_22_Final.xml deleted file mode 100644 index 19d22dc..0000000 --- a/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_22_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_common_4_0_27_Final.xml b/.idea/libraries/Maven__io_netty_netty_common_4_0_27_Final.xml deleted file mode 100644 index 045bf26..0000000 --- a/.idea/libraries/Maven__io_netty_netty_common_4_0_27_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_common_4_1_22_Final.xml b/.idea/libraries/Maven__io_netty_netty_common_4_1_22_Final.xml deleted file mode 100644 index 732004f..0000000 --- a/.idea/libraries/Maven__io_netty_netty_common_4_1_22_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_handler_4_0_27_Final.xml b/.idea/libraries/Maven__io_netty_netty_handler_4_0_27_Final.xml deleted file mode 100644 index 4f6d30b..0000000 --- a/.idea/libraries/Maven__io_netty_netty_handler_4_0_27_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_22_Final.xml b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_22_Final.xml deleted file mode 100644 index b6f0e75..0000000 --- a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_22_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_4_0_27_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_4_0_27_Final.xml deleted file mode 100644 index 82b77c1..0000000 --- a/.idea/libraries/Maven__io_netty_netty_transport_4_0_27_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_4_1_22_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_4_1_22_Final.xml deleted file mode 100644 index bb8cca8..0000000 --- a/.idea/libraries/Maven__io_netty_netty_transport_4_1_22_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_4_0_27_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_4_0_27_Final.xml deleted file mode 100644 index 94ab026..0000000 --- a/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_4_0_27_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_4_1_22_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_4_1_22_Final.xml deleted file mode 100644 index 60be1d6..0000000 --- a/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_4_1_22_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_22_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_22_Final.xml deleted file mode 100644 index 8e31ee9..0000000 --- a/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_22_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_reactivex_rxjava_1_2_0.xml b/.idea/libraries/Maven__io_reactivex_rxjava_1_2_0.xml deleted file mode 100644 index 27eb537..0000000 --- a/.idea/libraries/Maven__io_reactivex_rxjava_1_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_reactivex_rxjava_1_3_6.xml b/.idea/libraries/Maven__io_reactivex_rxjava_1_3_6.xml deleted file mode 100644 index 14a209e..0000000 --- a/.idea/libraries/Maven__io_reactivex_rxjava_1_3_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_reactivex_rxjava_reactive_streams_1_2_1.xml b/.idea/libraries/Maven__io_reactivex_rxjava_reactive_streams_1_2_1.xml deleted file mode 100644 index c77c4af..0000000 --- a/.idea/libraries/Maven__io_reactivex_rxjava_reactive_streams_1_2_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml b/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml deleted file mode 100644 index 82613f4..0000000 --- a/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml b/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml deleted file mode 100644 index 1ce62ff..0000000 --- a/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml b/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml deleted file mode 100644 index f9da5f7..0000000 --- a/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml deleted file mode 100644 index e74f3ab..0000000 --- a/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_inject_javax_inject_1.xml b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml deleted file mode 100644 index 93cf65a..0000000 --- a/.idea/libraries/Maven__javax_inject_javax_inject_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml deleted file mode 100644 index 940ce73..0000000 --- a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml deleted file mode 100644 index 6978c0b..0000000 --- a/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml b/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml deleted file mode 100644 index a0c4d76..0000000 --- a/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml b/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml deleted file mode 100644 index 2a4dd7a..0000000 --- a/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__joda_time_joda_time_2_9_9.xml b/.idea/libraries/Maven__joda_time_joda_time_2_9_9.xml deleted file mode 100644 index a468f58..0000000 --- a/.idea/libraries/Maven__joda_time_joda_time_2_9_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml deleted file mode 100644 index d411041..0000000 --- a/.idea/libraries/Maven__junit_junit_4_12.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_44.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_44.xml deleted file mode 100644 index 72f63f2..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_44.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_45.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_45.xml deleted file mode 100644 index 8280cea..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_45.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_10.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_10.xml deleted file mode 100644 index 7b90f25..0000000 --- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_10.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_10.xml deleted file mode 100644 index c9e49ad..0000000 --- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml deleted file mode 100644 index 88d626e..0000000 --- a/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml deleted file mode 100644 index b3d3858..0000000 --- a/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml deleted file mode 100644 index 6c692c8..0000000 --- a/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml deleted file mode 100644 index 1083023..0000000 --- a/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ehcache_ehcache_2_10_4.xml b/.idea/libraries/Maven__net_sf_ehcache_ehcache_2_10_4.xml deleted file mode 100644 index c97170d..0000000 --- a/.idea/libraries/Maven__net_sf_ehcache_ehcache_2_10_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml b/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml deleted file mode 100644 index fd0779a..0000000 --- a/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml b/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml deleted file mode 100644 index 6998bac..0000000 --- a/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_1.xml deleted file mode 100644 index 32bfe3b..0000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml deleted file mode 100644 index 28edf49..0000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_math_2_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_math_2_2.xml deleted file mode 100644 index 8f3e315..0000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_math_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_3.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_3.xml deleted file mode 100644 index c82bb7c..0000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_5.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_5.xml deleted file mode 100644 index e4eb38b..0000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_5.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_8.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_8.xml deleted file mode 100644 index 6372678..0000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_8.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_9.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_9.xml deleted file mode 100644 index 7f14d45..0000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml deleted file mode 100644 index cbe5ca7..0000000 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_10_0.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_10_0.xml deleted file mode 100644 index 1407c58..0000000 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_10_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_3_2.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_3_2.xml deleted file mode 100644 index b5977cf..0000000 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_3_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_23.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_23.xml deleted file mode 100644 index 99e8c9e..0000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_23.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_28.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_28.xml deleted file mode 100644 index c83f72e..0000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_28.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_23.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_23.xml deleted file mode 100644 index 9837b75..0000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_23.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_28.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_28.xml deleted file mode 100644 index a90b7bb..0000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_28.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_23.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_23.xml deleted file mode 100644 index 6a989bb..0000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_23.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_28.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_28.xml deleted file mode 100644 index 66bd03f..0000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_28.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_8_5_23.xml b/.idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_8_5_23.xml deleted file mode 100644 index 4aba27a..0000000 --- a/.idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_8_5_23.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_23.xml b/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_23.xml deleted file mode 100644 index 38b86a3..0000000 --- a/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_23.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_23.xml b/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_23.xml deleted file mode 100644 index a9350c3..0000000 --- a/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_23.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml deleted file mode 100644 index d46e30a..0000000 --- a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_2_6_0.xml b/.idea/libraries/Maven__org_assertj_assertj_core_2_6_0.xml deleted file mode 100644 index 58bdc9a..0000000 --- a/.idea/libraries/Maven__org_assertj_assertj_core_2_6_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml deleted file mode 100644 index 40adaaa..0000000 --- a/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_55.xml b/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_55.xml deleted file mode 100644 index 5d81708..0000000 --- a/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_55.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_56.xml b/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_56.xml deleted file mode 100644 index 99a1774..0000000 --- a/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_56.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_55.xml b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_55.xml deleted file mode 100644 index a2576d9..0000000 --- a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_55.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_56.xml b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_56.xml deleted file mode 100644 index 4e0490f..0000000 --- a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_56.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_7.xml b/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_7.xml deleted file mode 100644 index ca43e29..0000000 --- a/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml b/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml deleted file mode 100644 index b510642..0000000 --- a/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml b/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml deleted file mode 100644 index 2997967..0000000 --- a/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_freemarker_freemarker_2_3_27_incubating.xml b/.idea/libraries/Maven__org_freemarker_freemarker_2_3_27_incubating.xml deleted file mode 100644 index a8f7879..0000000 --- a/.idea/libraries/Maven__org_freemarker_freemarker_2_3_27_incubating.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml deleted file mode 100644 index f58bbc1..0000000 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml deleted file mode 100644 index 78dbe45..0000000 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml b/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml deleted file mode 100644 index 04cc804..0000000 --- a/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_3_6_Final.xml deleted file mode 100644 index 3c0ddd4..0000000 --- a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_3_6_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_7_Final.xml b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_7_Final.xml deleted file mode 100644 index a4f8873..0000000 --- a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_7_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_1_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_1_Final.xml deleted file mode 100644 index 6dc7a37..0000000 --- a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_1_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml deleted file mode 100644 index 5f7dd01..0000000 --- a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jvnet_animal_sniffer_annotation_1_0.xml b/.idea/libraries/Maven__org_jvnet_animal_sniffer_annotation_1_0.xml deleted file mode 100644 index b1afcf5..0000000 --- a/.idea/libraries/Maven__org_jvnet_animal_sniffer_annotation_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml b/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml deleted file mode 100644 index bf68169..0000000 --- a/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_1_0_Final.xml b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_1_0_Final.xml deleted file mode 100644 index 8c06db4..0000000 --- a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_1_0_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mapstruct_mapstruct_jdk8_1_1_0_Final.xml b/.idea/libraries/Maven__org_mapstruct_mapstruct_jdk8_1_1_0_Final.xml deleted file mode 100644 index f09f04f..0000000 --- a/.idea/libraries/Maven__org_mapstruct_mapstruct_jdk8_1_1_0_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mapstruct_mapstruct_jdk8_1_2_0_Final.xml b/.idea/libraries/Maven__org_mapstruct_mapstruct_jdk8_1_2_0_Final.xml deleted file mode 100644 index 98040d9..0000000 --- a/.idea/libraries/Maven__org_mapstruct_mapstruct_jdk8_1_2_0_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mapstruct_mapstruct_processor_1_1_0_Final.xml b/.idea/libraries/Maven__org_mapstruct_mapstruct_processor_1_1_0_Final.xml deleted file mode 100644 index 5b28f67..0000000 --- a/.idea/libraries/Maven__org_mapstruct_mapstruct_processor_1_1_0_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml deleted file mode 100644 index a523703..0000000 --- a/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml b/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml deleted file mode 100644 index a742a6d..0000000 --- a/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_4_4.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_4_4.xml deleted file mode 100644 index dc8a00a..0000000 --- a/.idea/libraries/Maven__org_mybatis_mybatis_3_4_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_4_5.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_4_5.xml deleted file mode 100644 index fbd64cf..0000000 --- a/.idea/libraries/Maven__org_mybatis_mybatis_3_4_5.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml deleted file mode 100644 index bd108d5..0000000 --- a/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml deleted file mode 100644 index 774f47c..0000000 --- a/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_1_1.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_1_1.xml deleted file mode 100644 index 218b48a..0000000 --- a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_1.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_1.xml deleted file mode 100644 index 633d095..0000000 --- a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_1_1.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_1_1.xml deleted file mode 100644 index 77694f1..0000000 --- a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_1.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_1.xml deleted file mode 100644 index 46e34e5..0000000 --- a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml deleted file mode 100644 index 7ab319b..0000000 --- a/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml deleted file mode 100644 index af41e3b..0000000 --- a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml deleted file mode 100644 index da69f6c..0000000 --- a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml deleted file mode 100644 index 0bf8cf2..0000000 --- a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml deleted file mode 100644 index 457c7b7..0000000 --- a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_4_0.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_4_0.xml deleted file mode 100644 index f86d2c8..0000000 --- a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml deleted file mode 100644 index c4c54d6..0000000 --- a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml deleted file mode 100644 index bae9949..0000000 --- a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml deleted file mode 100644 index 6073e53..0000000 --- a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_25.xml deleted file mode 100644 index a14ac63..0000000 --- a/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_25.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml deleted file mode 100644 index 20e8163..0000000 --- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_5_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_5_9_RELEASE.xml deleted file mode 100644 index 44dc419..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_5_9_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_0_RELEASE.xml deleted file mode 100644 index 6f53ce1..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_1_5_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_1_5_9_RELEASE.xml deleted file mode 100644 index 72bbcfe..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_1_5_9_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_0_0_RELEASE.xml deleted file mode 100644 index e65a3ec..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_0_0_RELEASE.xml deleted file mode 100644 index 2291406..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_6_RELEASE.xml deleted file mode 100644 index ababaf5..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_9_RELEASE.xml deleted file mode 100644 index 4c3a2b7..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_9_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_0_RELEASE.xml deleted file mode 100644 index bb1e179..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_5_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_5_9_RELEASE.xml deleted file mode 100644 index c6ba5e1..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_5_9_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_0_RELEASE.xml deleted file mode 100644 index da1a887..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_1_5_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_1_5_9_RELEASE.xml deleted file mode 100644 index 285ddbc..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_1_5_9_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_0_0_RELEASE.xml deleted file mode 100644 index ac213f4..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_0_RELEASE.xml deleted file mode 100644 index c479f04..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_1_5_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_1_5_9_RELEASE.xml deleted file mode 100644 index d7506b5..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_1_5_9_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_0_0_RELEASE.xml deleted file mode 100644 index 605a919..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_5_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_5_9_RELEASE.xml deleted file mode 100644 index 338299a..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_5_9_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_0_RELEASE.xml deleted file mode 100644 index 250e96a..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_0_RELEASE.xml deleted file mode 100644 index 440dbd0..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_5_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_5_9_RELEASE.xml deleted file mode 100644 index 33c0b1c..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_5_9_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_0_RELEASE.xml deleted file mode 100644 index 35e7c76..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_1_5_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_1_5_9_RELEASE.xml deleted file mode 100644 index 9b8fec1..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_1_5_9_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_5_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_5_9_RELEASE.xml deleted file mode 100644 index d7db397..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_5_9_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_0_RELEASE.xml deleted file mode 100644 index b292009..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_5_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_5_9_RELEASE.xml deleted file mode 100644 index ed7b340..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_5_9_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_0_RELEASE.xml deleted file mode 100644 index b3063f3..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_5_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_5_9_RELEASE.xml deleted file mode 100644 index f0bd94f..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_5_9_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_0_RELEASE.xml deleted file mode 100644 index d1159de..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_1_5_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_1_5_9_RELEASE.xml deleted file mode 100644 index e9d7abc..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_1_5_9_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_1_5_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_1_5_9_RELEASE.xml deleted file mode 100644 index 9312efe..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_1_5_9_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_0_RELEASE.xml deleted file mode 100644 index d298a45..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_1_5_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_1_5_9_RELEASE.xml deleted file mode 100644 index 07d7bca..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_1_5_9_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_0_RELEASE.xml deleted file mode 100644 index 06ed00f..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_1_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_1_3_0_RELEASE.xml deleted file mode 100644 index 6aab5d4..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_1_3_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_0_0_M8.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_0_0_M8.xml deleted file mode 100644 index 4163c70..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_0_0_M8.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_1_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_1_3_0_RELEASE.xml deleted file mode 100644 index 482bf05..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_1_3_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_0_0_M8.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_0_0_M8.xml deleted file mode 100644 index 27ff633..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_0_0_M8.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_0_0_M7.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_0_0_M7.xml deleted file mode 100644 index 69c722b..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_0_0_M7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_1_4_0_RELEASE.xml deleted file mode 100644 index cccd738..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_1_4_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_2_0_0_M7.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_2_0_0_M7.xml deleted file mode 100644 index b76e598..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_2_0_0_M7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_1_4_0_RELEASE.xml deleted file mode 100644 index 83ca4ac..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_1_4_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_2_0_0_M7.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_2_0_0_M7.xml deleted file mode 100644 index 46914b5..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_2_0_0_M7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_server_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_server_1_4_0_RELEASE.xml deleted file mode 100644 index c6b32c7..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_server_1_4_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_server_2_0_0_M7.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_server_2_0_0_M7.xml deleted file mode 100644 index c3eb553..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_server_2_0_0_M7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_0_0_M7.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_0_0_M7.xml deleted file mode 100644 index 05dfd26..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_0_0_M7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_0_0_M1.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_0_0_M1.xml deleted file mode 100644 index 27a160e..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_0_0_M1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_1_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_1_3_0_RELEASE.xml deleted file mode 100644 index 5649d57..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_1_3_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_0_0_M8.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_0_0_M8.xml deleted file mode 100644 index ec52eb8..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_0_0_M8.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_eureka_server_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_eureka_server_1_4_0_RELEASE.xml deleted file mode 100644 index 72b310a..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_eureka_server_1_4_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_feign_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_feign_1_4_0_RELEASE.xml deleted file mode 100644 index b2575ff..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_feign_1_4_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_hystrix_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_hystrix_1_4_0_RELEASE.xml deleted file mode 100644 index a73617b..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_hystrix_1_4_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_1_4_0_RELEASE.xml deleted file mode 100644 index 663349c..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_1_4_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_0_0_M7.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_0_0_M7.xml deleted file mode 100644 index 4e6cdf4..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_0_0_M7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_server_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_server_1_4_0_RELEASE.xml deleted file mode 100644 index a220524..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_server_1_4_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_server_2_0_0_M7.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_server_2_0_0_M7.xml deleted file mode 100644 index 4e6ffa0..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_server_2_0_0_M7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_1_4_0_RELEASE.xml deleted file mode 100644 index 4009379..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_1_4_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_0_0_M7.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_0_0_M7.xml deleted file mode 100644 index 59acf6e..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_0_0_M7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_1_4_0_RELEASE.xml deleted file mode 100644 index aa7f665..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_1_4_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_0_0_M7.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_0_0_M7.xml deleted file mode 100644 index a35f285..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_0_0_M7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_zuul_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_zuul_1_4_0_RELEASE.xml deleted file mode 100644 index e4a2126..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_zuul_1_4_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_1_4_0_RELEASE.xml deleted file mode 100644 index 65363b8..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_1_4_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_0_0_M1.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_0_0_M1.xml deleted file mode 100644 index cbda0d9..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_0_0_M1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_ribbon_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_ribbon_1_4_0_RELEASE.xml deleted file mode 100644 index 2ddf376..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_ribbon_1_4_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_zuul_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_zuul_1_4_0_RELEASE.xml deleted file mode 100644 index 25c19d9..0000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_zuul_1_4_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_config_4_2_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_config_4_2_3_RELEASE.xml deleted file mode 100644 index fc65a5c..0000000 --- a/.idea/libraries/Maven__org_springframework_security_spring_security_config_4_2_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_core_4_2_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_core_4_2_3_RELEASE.xml deleted file mode 100644 index 288e0d7..0000000 --- a/.idea/libraries/Maven__org_springframework_security_spring_security_core_4_2_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_4_2_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_4_2_3_RELEASE.xml deleted file mode 100644 index 18a198e..0000000 --- a/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_4_2_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_0_3_RELEASE.xml deleted file mode 100644 index 8fe04df..0000000 --- a/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_3_RELEASE.xml deleted file mode 100644 index a17b0ca..0000000 --- a/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_5_RELEASE.xml deleted file mode 100644 index 82e92cd..0000000 --- a/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_5_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_web_4_2_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_web_4_2_3_RELEASE.xml deleted file mode 100644 index 1ee15c1..0000000 --- a/.idea/libraries/Maven__org_springframework_security_spring_security_web_4_2_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_3_13_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_3_13_RELEASE.xml deleted file mode 100644 index e06e71e..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_aop_4_3_13_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_0_4_RELEASE.xml deleted file mode 100644 index 42e3c72..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_aop_5_0_4_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_3_13_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_3_13_RELEASE.xml deleted file mode 100644 index 0a8cafe..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_beans_4_3_13_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_0_4_RELEASE.xml deleted file mode 100644 index 9d3252b..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_beans_5_0_4_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_3_13_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_3_13_RELEASE.xml deleted file mode 100644 index 8050852..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_context_4_3_13_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_0_4_RELEASE.xml deleted file mode 100644 index 24e83c9..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_context_5_0_4_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_13_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_13_RELEASE.xml deleted file mode 100644 index 83cd823..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_13_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_5_0_4_RELEASE.xml deleted file mode 100644 index 864030c..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_context_support_5_0_4_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_3_13_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_3_13_RELEASE.xml deleted file mode 100644 index b95dd78..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_core_4_3_13_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_0_4_RELEASE.xml deleted file mode 100644 index 2784300..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_core_5_0_4_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_3_13_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_3_13_RELEASE.xml deleted file mode 100644 index 7a825ff..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_expression_4_3_13_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_0_4_RELEASE.xml deleted file mode 100644 index 8151535..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_expression_5_0_4_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_4_RELEASE.xml deleted file mode 100644 index d0484b5..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_4_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_13_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_13_RELEASE.xml deleted file mode 100644 index 49da486..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_13_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_4_RELEASE.xml deleted file mode 100644 index 8b68fe1..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_4_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_messaging_4_3_13_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_messaging_4_3_13_RELEASE.xml deleted file mode 100644 index 9c66306..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_messaging_4_3_13_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_3_13_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_3_13_RELEASE.xml deleted file mode 100644 index 0c0fcbf..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_test_4_3_13_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_0_4_RELEASE.xml deleted file mode 100644 index e8317f4..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_test_5_0_4_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_3_13_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_3_13_RELEASE.xml deleted file mode 100644 index d56e28f..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_tx_4_3_13_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_0_4_RELEASE.xml deleted file mode 100644 index e6f1139..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_tx_5_0_4_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_3_13_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_3_13_RELEASE.xml deleted file mode 100644 index 31aebfb..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_web_4_3_13_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_0_4_RELEASE.xml deleted file mode 100644 index 002d32d..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_web_5_0_4_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_13_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_13_RELEASE.xml deleted file mode 100644 index 01a3291..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_13_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_4_RELEASE.xml deleted file mode 100644 index 0aed43d..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_4_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_websocket_4_3_13_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_websocket_4_3_13_RELEASE.xml deleted file mode 100644 index 57f5d10..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_websocket_4_3_13_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml deleted file mode 100644 index 474c910..0000000 --- a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml deleted file mode 100644 index 20e2920..0000000 --- a/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml deleted file mode 100644 index 33ccf19..0000000 --- a/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml deleted file mode 100644 index 0b13335..0000000 --- a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml b/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml deleted file mode 100644 index 0f2d9ef..0000000 --- a/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml b/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml deleted file mode 100644 index 6726a2d..0000000 --- a/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 5761fb7..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index cc41e7e..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file -- Gitee From ce6a79c2714254efb00d40c40071fd6ba6b81276 Mon Sep 17 00:00:00 2001 From: lcg0124 <1992lcg@163.com> Date: Tue, 8 May 2018 11:59:05 +0800 Subject: [PATCH 12/36] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6cloud?= =?UTF-8?q?do-admin/clouddo-admin.iml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clouddo-admin/clouddo-admin.iml | 192 -------------------------------- 1 file changed, 192 deletions(-) delete mode 100644 clouddo-admin/clouddo-admin.iml diff --git a/clouddo-admin/clouddo-admin.iml b/clouddo-admin/clouddo-admin.iml deleted file mode 100644 index 8dea02a..0000000 --- a/clouddo-admin/clouddo-admin.iml +++ /dev/null @@ -1,192 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file -- Gitee From 788a25f1a1214917de972accf05d4d48c4fa16af Mon Sep 17 00:00:00 2001 From: lcg0124 <7G9v8384> Date: Tue, 8 May 2018 12:00:22 +0800 Subject: [PATCH 13/36] 1.0.1 --- .../controller/LoginController.java | 7 ++- .../clouddoadmin/service/MenuService.java | 4 ++ .../service/impl/MenuServiceImpl.java | 12 ++++ .../bootdo/clouddoadmin/utils/JwtUtils.java | 12 ++-- .../src/main/resources/application.yml | 2 +- .../ClouddoAdminApplicationTests.java | 56 +++++++++++++------ .../clouddocms/ClouddoCmsApplication.java | 25 +++++++++ .../clouddocms/controller/FileController.java | 24 ++++---- .../src/main/resources/application.yml | 23 ++++++++ .../mapper/{clouddocms => }/FileMapper.xml | 0 .../clouddocommon/aspect/WebLogAspect.java | 4 ++ .../CommonConstants.java | 3 +- .../context/FilterContextHandler.java | 2 +- .../clouddocommon/filter/ContextFilter.java | 10 ++-- .../intercepter/AuthIntercepter.java | 2 +- .../intercepter/FeignIntercepter.java | 2 +- .../bootdo/clouddocommon/utils/JwtUtils.java | 3 +- .../controller/LoginController.java | 5 +- .../clouddozuul/filter/AccessFilter.java | 6 +- 19 files changed, 146 insertions(+), 56 deletions(-) create mode 100644 clouddo-cms/src/main/java/com/bootdo/clouddocms/ClouddoCmsApplication.java create mode 100644 clouddo-cms/src/main/resources/application.yml rename clouddo-cms/src/main/resources/mapper/{clouddocms => }/FileMapper.xml (100%) create mode 100644 clouddo-common/src/main/java/com/bootdo/clouddocommon/aspect/WebLogAspect.java rename clouddo-common/src/main/java/com/bootdo/clouddocommon/{Constants => constants}/CommonConstants.java (76%) diff --git a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/controller/LoginController.java b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/controller/LoginController.java index 5bc977e..b4d9f64 100644 --- a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/controller/LoginController.java +++ b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/controller/LoginController.java @@ -53,14 +53,17 @@ public class LoginController { UserToken userToken = new UserToken(userDO.getUsername(), userDO.getUserId().toString(), userDO.getName()); String token=""; try { - token = JwtUtils.generateToken(userToken, 300*60*1000); + token = JwtUtils.generateToken(userToken, 2*60*60*1000); } catch (Exception e) { e.printStackTrace(); } //首先清除用户缓存权限 menuService.clearCache(userDO.getUserId()); // String token = tokenService.createToken(userDO.getUserId()); - return R.ok("登录成功").put("token", token).put("user",userDO).put("router",menuService.RouterDTOsByUserId(userDO.getUserId())); + return R.ok("登录成功") + .put("token", token).put("user",userDO) + .put("perms",menuService.PermsByUserId(userDO.getUserId())) + .put("router",menuService.RouterDTOsByUserId(userDO.getUserId())); } diff --git a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/service/MenuService.java b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/service/MenuService.java index 73afd0f..e51df6e 100644 --- a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/service/MenuService.java +++ b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/service/MenuService.java @@ -56,4 +56,8 @@ public interface MenuService { * @return */ List RouterDTOsByUserId(Long userId); + /** + * 用户权限 + */ + List PermsByUserId(Long userId); } diff --git a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/service/impl/MenuServiceImpl.java b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/service/impl/MenuServiceImpl.java index a0f8f4c..f8388b2 100644 --- a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/service/impl/MenuServiceImpl.java +++ b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/service/impl/MenuServiceImpl.java @@ -208,6 +208,18 @@ public class MenuServiceImpl implements MenuService { return RouterDTO.buildList(routerDTOs, 0L); } + @Override + public List PermsByUserId(Long userId) { + List permsList = new ArrayList<>(); + List menuDOs = userMenus(userId); + for (MenuDO menuDO:menuDOs){ + if(menuDO.getPerms()!=null && ""!=menuDO.getPerms()){ + permsList.add(menuDO.getPerms()); + } + } + return permsList; + } + @Override public List> listMenuTree(Long id) { List> trees = new ArrayList>(); diff --git a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/utils/JwtUtils.java b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/utils/JwtUtils.java index a94ed99..b3982d0 100644 --- a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/utils/JwtUtils.java +++ b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/utils/JwtUtils.java @@ -1,6 +1,6 @@ //package com.bootdo.clouddoadmin.utils; // -//import com.bootdo.clouddoadmin.constants.Constants; +//import com.bootdo.clouddoadmin.constants.constants; //import com.bootdo.clouddoadmin.vo.UserToken; //import com.netflix.discovery.CommonConstants; //import io.jsonwebtoken.Claims; @@ -18,10 +18,10 @@ // public static String generateToken(UserToken userToken, int expire) throws Exception { // String token = Jwts.builder() // .setSubject(userToken.getUsername()) -// .claim(Constants.USER_TOKEN_ID, userToken.getUserId()) -// .claim(Constants.USER_TOKEN_NAME, userToken.getName()) +// .claim(constants.USER_TOKEN_ID, userToken.getUserId()) +// .claim(constants.USER_TOKEN_NAME, userToken.getName()) // .setExpiration(new Date(System.currentTimeMillis()+expire)) -// .signWith(SignatureAlgorithm.HS256, Constants.JWT_PRIVATE_KEY) +// .signWith(SignatureAlgorithm.HS256, constants.JWT_PRIVATE_KEY) // .compact(); // return token; // } @@ -29,8 +29,8 @@ // // public static UserToken getInfoFromToken(String token) throws Exception { // Claims claims = Jwts.parser() -// .setSigningKey(Constants.JWT_PRIVATE_KEY).parseClaimsJws(token) +// .setSigningKey(constants.JWT_PRIVATE_KEY).parseClaimsJws(token) // .getBody(); -// return new UserToken(claims.getSubject(), ((Integer)claims.get(Constants.USER_TOKEN_ID)).longValue() ,claims.get(Constants.USER_TOKEN_NAME).toString()); +// return new UserToken(claims.getSubject(), ((Integer)claims.get(constants.USER_TOKEN_ID)).longValue() ,claims.get(constants.USER_TOKEN_NAME).toString()); // } //} diff --git a/clouddo-admin/src/main/resources/application.yml b/clouddo-admin/src/main/resources/application.yml index 668c104..218dff5 100644 --- a/clouddo-admin/src/main/resources/application.yml +++ b/clouddo-admin/src/main/resources/application.yml @@ -6,7 +6,7 @@ security: basic: enabled: false server: - port: 8003 + port: 8005 spring: application: name: api-admin diff --git a/clouddo-admin/src/test/java/com/bootdo/clouddoadmin/ClouddoAdminApplicationTests.java b/clouddo-admin/src/test/java/com/bootdo/clouddoadmin/ClouddoAdminApplicationTests.java index e3f1ed6..0216b0c 100644 --- a/clouddo-admin/src/test/java/com/bootdo/clouddoadmin/ClouddoAdminApplicationTests.java +++ b/clouddo-admin/src/test/java/com/bootdo/clouddoadmin/ClouddoAdminApplicationTests.java @@ -1,8 +1,5 @@ //package com.bootdo.clouddoadmin; // -//import com.bootdo.clouddoadmin.utils.JwtUtils; -//import com.bootdo.clouddoadmin.vo.UserToken; -//import org.junit.Test; //import org.junit.runner.RunWith; //import org.springframework.boot.test.context.SpringBootTest; //import org.springframework.test.context.junit4.SpringRunner; @@ -11,19 +8,44 @@ //@SpringBootTest //public class ClouddoAdminApplicationTests { // -// @Test -// public void contextLoads() { -// UserToken userToken = new UserToken("admin",1L,"管理员"); -// String jwt = null; -// try { -// jwt = JwtUtils.generateToken(userToken,1); -// Thread.sleep(100); -// UserToken userToken1 = JwtUtils.getInfoFromToken(jwt); -// System.out.println(userToken1); -// } catch (Exception e) { -// e.printStackTrace(); -// } -// -// } +// public static void main(String[] args) { +// MobileCardCompanyDO cardPayOrderModel = new MobileCardCompanyDO(); +// cardPayOrderModel.setCompanyCode("HS"); +// cardPayOrderModel.setCompanyDesc("a1231241241awdasdf"); +// cardPayOrderModel.setCompanyName("123124dzvsds"); +// cardPayOrderModel.setId(2l); +// cardPayOrderModel.setStatus("1"); +// CompanyModel companyModel = new CompanyModel(); +// +// /** +// * 10W次 +// * BeanUtils.copyProperties：718 +// * beanCopier.copy：56 +// */ +// +// /** +// * 100W次 +// * BeanUtils.copyProperties：5673 +// * beanCopier.copy：70 +// */ +// +// //BeanUtils性能 +// long start = System.currentTimeMillis(); +// for (int i = 0; i < 1000000; i++) { +// BeanUtils.copyProperties(cardPayOrderModel, companyModel); +// } +// long end = System.currentTimeMillis(); +// System.out.println(end - start); +// +// //BeanCopier性能 +// long start1 = System.currentTimeMillis(); +// BeanCopier beanCopier = BeanCopier.create(MobileCardCompanyDO.class, CompanyModel.class, +// false); +// for (int i = 0; i < 1000000; i++) { +// beanCopier.copy(cardPayOrderModel, companyModel, null); +// } +// long end1 = System.currentTimeMillis(); +// System.out.println(end1 - start1); +// } // //} diff --git a/clouddo-cms/src/main/java/com/bootdo/clouddocms/ClouddoCmsApplication.java b/clouddo-cms/src/main/java/com/bootdo/clouddocms/ClouddoCmsApplication.java new file mode 100644 index 0000000..0478b0a --- /dev/null +++ b/clouddo-cms/src/main/java/com/bootdo/clouddocms/ClouddoCmsApplication.java @@ -0,0 +1,25 @@ +package com.bootdo.clouddocms; + +import com.bootdo.clouddocommon.filter.ContextFilter; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.context.annotation.Bean; +import org.springframework.scheduling.annotation.EnableScheduling; + +@EnableCaching +@EnableScheduling +@SpringBootApplication +public class ClouddoCmsApplication { + + public static void main(String[] args) { + SpringApplication.run(ClouddoCmsApplication.class, args); + } + @Bean + public FilterRegistrationBean filterRegistrationBean(){ + FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(new ContextFilter()); + filterRegistrationBean.addUrlPatterns("/*"); + return filterRegistrationBean; + } +} diff --git a/clouddo-cms/src/main/java/com/bootdo/clouddocms/controller/FileController.java b/clouddo-cms/src/main/java/com/bootdo/clouddocms/controller/FileController.java index 263ed2e..3e1c1cb 100644 --- a/clouddo-cms/src/main/java/com/bootdo/clouddocms/controller/FileController.java +++ b/clouddo-cms/src/main/java/com/bootdo/clouddocms/controller/FileController.java @@ -25,27 +25,29 @@ import com.bootdo.clouddocommon.utils.R; */ @RestController -@RequestMapping("/clouddocms/file") +@RequestMapping("/file") public class FileController { @Autowired private FileService fileService; @GetMapping("{id}") - public R get(@PathVariable Long id){ + public R get(@PathVariable Long id) { FileDTO fileDTO = FileConvert.MAPPER.do2dto(fileService.get(id)); return R.data(fileDTO); } + /** - * 分页查询 - */ + * 分页查询 + */ @GetMapping public R list(@RequestParam Map params) { Query query = new Query(params); List fileList = fileService.list(query); - List fileDTOS = FileConvert.MAPPER.dos2dtos(fileList); +// List fileDTOS = FileConvert.MAPPER.dos2dtos(fileList); int total = fileService.count(query); - PageUtils pageUtils = new PageUtils(fileDTOS, total); +// PageUtils pageUtils = new PageUtils(fileDTOS, total); + PageUtils pageUtils = new PageUtils(fileList, total); return R.page(pageUtils); } @@ -62,22 +64,22 @@ public class FileController { */ @PutMapping public R update(FileDO file) { - return R.operate(fileService.update(file) >0 ); + return R.operate(fileService.update(file) > 0); } /** * 删除 */ @DeleteMapping - public R remove( Long id) { + public R remove(Long id) { return R.operate(fileService.remove(id) > 0); } /** * 删除 */ - @DeleteMapping ("/batchRemove") - public R remove(@RequestParam("ids[]") Long[]ids) { - return R.operate(fileService.batchRemove(ids)>0); + @DeleteMapping("/batchRemove") + public R remove(@RequestParam("ids[]") Long[] ids) { + return R.operate(fileService.batchRemove(ids) > 0); } } diff --git a/clouddo-cms/src/main/resources/application.yml b/clouddo-cms/src/main/resources/application.yml new file mode 100644 index 0000000..7e21774 --- /dev/null +++ b/clouddo-cms/src/main/resources/application.yml @@ -0,0 +1,23 @@ +eureka: + client: + serviceUrl: + defaultZone: http://localhost:8001/eureka/ +security: + basic: + enabled: false +server: + port: 8004 +spring: + application: + name: api-cms + datasource: + url: jdbc:mysql://127.0.0.1:3306/clouddo?useUnicode=true&characterEncoding=utf8 + username: root + password: root + jackson: + date-format: yyyy-MM-dd + time-zone: GMT+8 +mybatis: + mapper-locations: mapper/**Mapper.xml + configuration: + map-underscore-to-camel-case: true \ No newline at end of file diff --git a/clouddo-cms/src/main/resources/mapper/clouddocms/FileMapper.xml b/clouddo-cms/src/main/resources/mapper/FileMapper.xml similarity index 100% rename from clouddo-cms/src/main/resources/mapper/clouddocms/FileMapper.xml rename to clouddo-cms/src/main/resources/mapper/FileMapper.xml diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/aspect/WebLogAspect.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/aspect/WebLogAspect.java new file mode 100644 index 0000000..c591e75 --- /dev/null +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/aspect/WebLogAspect.java @@ -0,0 +1,4 @@ +package com.bootdo.clouddocommon.aspect; + +public class WebLogAspect { +} diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/Constants/CommonConstants.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/constants/CommonConstants.java similarity index 76% rename from clouddo-common/src/main/java/com/bootdo/clouddocommon/Constants/CommonConstants.java rename to clouddo-common/src/main/java/com/bootdo/clouddocommon/constants/CommonConstants.java index 11ad90c..0808697 100644 --- a/clouddo-common/src/main/java/com/bootdo/clouddocommon/Constants/CommonConstants.java +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/constants/CommonConstants.java @@ -1,4 +1,4 @@ -package com.bootdo.clouddocommon.Constants; +package com.bootdo.clouddocommon.constants; public class CommonConstants { public final static String CONTEXT_TOKEN="Authorization"; @@ -6,4 +6,5 @@ public class CommonConstants { public final static String CONTEXT_USER_ID="contextUserId"; public final static String CONTEXT_NAME="contextName"; public final static String JWT_PRIVATE_KEY ="wwwbootdocom"; + public final static String RENEWAL_TIME = "renewalTime"; } diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/context/FilterContextHandler.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/context/FilterContextHandler.java index b4407e5..54da267 100644 --- a/clouddo-common/src/main/java/com/bootdo/clouddocommon/context/FilterContextHandler.java +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/context/FilterContextHandler.java @@ -1,6 +1,6 @@ package com.bootdo.clouddocommon.context; -import com.bootdo.clouddocommon.Constants.CommonConstants; +import com.bootdo.clouddocommon.constants.CommonConstants; import java.util.HashMap; import java.util.Map; diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/filter/ContextFilter.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/filter/ContextFilter.java index e2648d0..dbc54c0 100644 --- a/clouddo-common/src/main/java/com/bootdo/clouddocommon/filter/ContextFilter.java +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/filter/ContextFilter.java @@ -1,6 +1,6 @@ package com.bootdo.clouddocommon.filter; -import com.bootdo.clouddocommon.Constants.CommonConstants; +import com.bootdo.clouddocommon.constants.CommonConstants; import com.bootdo.clouddocommon.context.FilterContextHandler; import com.bootdo.clouddocommon.dto.UserToken; import com.bootdo.clouddocommon.utils.JsonUtils; @@ -25,8 +25,8 @@ public class ContextFilter implements Filter { HttpServletResponse response = (HttpServletResponse) servletResponse; response.setCharacterEncoding("utf-8"); response.setContentType("application/json;charset=UTF-8"); - if(request.getRequestURI().startsWith("/login")){ - filterChain.doFilter(request,response); + if (request.getRequestURI().startsWith("/login")) { + filterChain.doFilter(request, response); return; } String token = request.getHeader(CommonConstants.CONTEXT_TOKEN); @@ -35,14 +35,14 @@ public class ContextFilter implements Filter { userToken = JwtUtils.getInfoFromToken(token); } catch (Exception e) { PrintWriter printWriter = response.getWriter(); - printWriter.write(JsonUtils.toJson(R.error(403,"缺少token,非法请求"))); + printWriter.write(JsonUtils.toJson(R.error403())); return; } FilterContextHandler.setToken(token); FilterContextHandler.setUsername(userToken.getUsername()); FilterContextHandler.setName(userToken.getName()); FilterContextHandler.setUserID(userToken.getUserId()); - filterChain.doFilter(request,response); + filterChain.doFilter(request, response); } @Override diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/intercepter/AuthIntercepter.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/intercepter/AuthIntercepter.java index 765da27..fb4c120 100644 --- a/clouddo-common/src/main/java/com/bootdo/clouddocommon/intercepter/AuthIntercepter.java +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/intercepter/AuthIntercepter.java @@ -1,6 +1,6 @@ package com.bootdo.clouddocommon.intercepter; -import com.bootdo.clouddocommon.Constants.CommonConstants; +import com.bootdo.clouddocommon.constants.CommonConstants; import com.bootdo.clouddocommon.context.FilterContextHandler; import com.bootdo.clouddocommon.dto.UserToken; import com.bootdo.clouddocommon.utils.JwtUtils; diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/intercepter/FeignIntercepter.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/intercepter/FeignIntercepter.java index 3832cae..6c77906 100644 --- a/clouddo-common/src/main/java/com/bootdo/clouddocommon/intercepter/FeignIntercepter.java +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/intercepter/FeignIntercepter.java @@ -1,6 +1,6 @@ package com.bootdo.clouddocommon.intercepter; -import com.bootdo.clouddocommon.Constants.CommonConstants; +import com.bootdo.clouddocommon.constants.CommonConstants; import com.bootdo.clouddocommon.context.FilterContextHandler; import feign.RequestInterceptor; import feign.RequestTemplate; diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/JwtUtils.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/JwtUtils.java index 108ca26..ab9445c 100644 --- a/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/JwtUtils.java +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/JwtUtils.java @@ -1,6 +1,6 @@ package com.bootdo.clouddocommon.utils; -import com.bootdo.clouddocommon.Constants.CommonConstants; +import com.bootdo.clouddocommon.constants.CommonConstants; import com.bootdo.clouddocommon.dto.UserToken; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; @@ -18,6 +18,7 @@ public class JwtUtils { .setSubject(userToken.getUsername()) .claim(CommonConstants.CONTEXT_USER_ID, userToken.getUserId()) .claim(CommonConstants.CONTEXT_NAME, userToken.getName()) + .claim(CommonConstants.RENEWAL_TIME,new Date(System.currentTimeMillis()+expire/2)) .setExpiration(new Date(System.currentTimeMillis()+expire)) .signWith(SignatureAlgorithm.HS256, CommonConstants.JWT_PRIVATE_KEY) .compact(); diff --git a/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/controller/LoginController.java b/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/controller/LoginController.java index 1207ec9..acde117 100644 --- a/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/controller/LoginController.java +++ b/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/controller/LoginController.java @@ -1,17 +1,14 @@ package com.bootdo.clouddozuul.controller; -import com.bootdo.clouddocommon.Constants.CommonConstants; +import com.bootdo.clouddocommon.constants.CommonConstants; import com.bootdo.clouddocommon.context.FilterContextHandler; import com.bootdo.clouddocommon.dto.MenuDTO; import com.bootdo.clouddozuul.prc.admin.MenuService; -import com.netflix.ribbon.proxy.annotation.Http; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.util.List; /** diff --git a/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/filter/AccessFilter.java b/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/filter/AccessFilter.java index 1ef59d3..dffd251 100644 --- a/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/filter/AccessFilter.java +++ b/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/filter/AccessFilter.java @@ -1,6 +1,6 @@ package com.bootdo.clouddozuul.filter; -import com.bootdo.clouddocommon.Constants.CommonConstants; +import com.bootdo.clouddocommon.constants.CommonConstants; import com.bootdo.clouddocommon.context.FilterContextHandler; import com.bootdo.clouddocommon.dto.MenuDTO; import com.bootdo.clouddocommon.dto.UserToken; @@ -10,12 +10,8 @@ import com.bootdo.clouddocommon.utils.R; import com.bootdo.clouddozuul.prc.admin.MenuService; import com.netflix.zuul.ZuulFilter; import com.netflix.zuul.context.RequestContext; -import org.apache.commons.lang.StringUtils; -import org.apache.http.HttpStatus; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -- Gitee From c1c1751178f21d6c364af2e9795ffef8b202456f Mon Sep 17 00:00:00 2001 From: lcg0124 <7G9v8384> Date: Tue, 8 May 2018 12:09:38 +0800 Subject: [PATCH 14/36] 1.0.1 --- .gitignore | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a316185 --- /dev/null +++ b/.gitignore @@ -0,0 +1,56 @@ +# Created by .ignore support plugin (hsz.mobi) +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff: +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/dictionaries + +# Sensitive or high-churn files: +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.xml +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml + +# Gradle: +.idea/**/gradle.xml +.idea/**/libraries + +# CMake +cmake-build-debug/ +cmake-build-release/ + +# Mongo Explorer plugin: +.idea/**/mongoSettings.xml + +## File-based project format: +*.iws + +## Plugin-specific files: + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +.idea/workspace.xml +clouddo-admin/target/ +clouddo-common/target/ -- Gitee From 424486fe8c1e65284606a216cb2111fdea06590d Mon Sep 17 00:00:00 2001 From: lcg0124 <1992lcg@163.com> Date: Tue, 8 May 2018 12:13:38 +0800 Subject: [PATCH 15/36] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9B=AE=E5=BD=95cloud?= =?UTF-8?q?do-zuul/.mvn/wrapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clouddo-zuul/.mvn/wrapper/maven-wrapper.jar | Bin 47610 -> 0 bytes .../.mvn/wrapper/maven-wrapper.properties | 1 - 2 files changed, 1 deletion(-) delete mode 100644 clouddo-zuul/.mvn/wrapper/maven-wrapper.jar delete mode 100644 clouddo-zuul/.mvn/wrapper/maven-wrapper.properties diff --git a/clouddo-zuul/.mvn/wrapper/maven-wrapper.jar b/clouddo-zuul/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 9cc84ea9b4d95453115d0c26488d6a78694e0bc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47610 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 diff --git a/clouddo-zuul/.mvn/wrapper/maven-wrapper.properties b/clouddo-zuul/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index 9dda3b6..0000000 --- a/clouddo-zuul/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip -- Gitee From 7574c4f401219fbd17ab73327b20c86462429476 Mon Sep 17 00:00:00 2001 From: lcg0124 <1992lcg@163.com> Date: Tue, 8 May 2018 12:13:46 +0800 Subject: [PATCH 16/36] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6cloud?= =?UTF-8?q?do-zuul/mvnw.cmd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clouddo-zuul/mvnw.cmd | 143 ------------------------------------------ 1 file changed, 143 deletions(-) delete mode 100644 clouddo-zuul/mvnw.cmd diff --git a/clouddo-zuul/mvnw.cmd b/clouddo-zuul/mvnw.cmd deleted file mode 100644 index 019bd74..0000000 --- a/clouddo-zuul/mvnw.cmd +++ /dev/null @@ -1,143 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven2 Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" - -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% -- Gitee From 7e45d9296772eedeacd04d57d423f43ec56e2b8d Mon Sep 17 00:00:00 2001 From: lcg0124 <1992lcg@163.com> Date: Tue, 8 May 2018 12:13:52 +0800 Subject: [PATCH 17/36] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6cloud?= =?UTF-8?q?do-zuul/mvnw?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clouddo-zuul/mvnw | 225 ---------------------------------------------- 1 file changed, 225 deletions(-) delete mode 100644 clouddo-zuul/mvnw diff --git a/clouddo-zuul/mvnw b/clouddo-zuul/mvnw deleted file mode 100644 index 5bf251c..0000000 --- a/clouddo-zuul/mvnw +++ /dev/null @@ -1,225 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven2 Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Migwn, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" - # TODO classpath? -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` - fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -echo $MAVEN_PROJECTBASEDIR -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" -- Gitee From 44089e863e742d99a56644471eb6551b7fa9c820 Mon Sep 17 00:00:00 2001 From: lcg0124 <1992lcg@163.com> Date: Tue, 8 May 2018 12:13:59 +0800 Subject: [PATCH 18/36] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6cloud?= =?UTF-8?q?do-zuul/.gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clouddo-zuul/.gitignore | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 clouddo-zuul/.gitignore diff --git a/clouddo-zuul/.gitignore b/clouddo-zuul/.gitignore deleted file mode 100644 index 2af7cef..0000000 --- a/clouddo-zuul/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -target/ -!.mvn/wrapper/maven-wrapper.jar - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -nbproject/private/ -build/ -nbbuild/ -dist/ -nbdist/ -.nb-gradle/ \ No newline at end of file -- Gitee From f2a68893ec83c3a22126142e0ed6cfa8b735014f Mon Sep 17 00:00:00 2001 From: lcg0124 <1992lcg@163.com> Date: Tue, 8 May 2018 12:14:15 +0800 Subject: [PATCH 19/36] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9B=AE=E5=BD=95cloud?= =?UTF-8?q?do-server/.mvn/wrapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clouddo-server/.mvn/wrapper/maven-wrapper.jar | Bin 47610 -> 0 bytes .../.mvn/wrapper/maven-wrapper.properties | 1 - 2 files changed, 1 deletion(-) delete mode 100644 clouddo-server/.mvn/wrapper/maven-wrapper.jar delete mode 100644 clouddo-server/.mvn/wrapper/maven-wrapper.properties diff --git a/clouddo-server/.mvn/wrapper/maven-wrapper.jar b/clouddo-server/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 9cc84ea9b4d95453115d0c26488d6a78694e0bc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47610 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 diff --git a/clouddo-server/.mvn/wrapper/maven-wrapper.properties b/clouddo-server/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index 9dda3b6..0000000 --- a/clouddo-server/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip -- Gitee From 271cfb731bf0ca71ad1dbd1a4164996eb2ce76f7 Mon Sep 17 00:00:00 2001 From: lcg0124 <1992lcg@163.com> Date: Tue, 8 May 2018 12:14:22 +0800 Subject: [PATCH 20/36] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6cloud?= =?UTF-8?q?do-server/.gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clouddo-server/.gitignore | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 clouddo-server/.gitignore diff --git a/clouddo-server/.gitignore b/clouddo-server/.gitignore deleted file mode 100644 index 2af7cef..0000000 --- a/clouddo-server/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -target/ -!.mvn/wrapper/maven-wrapper.jar - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -nbproject/private/ -build/ -nbbuild/ -dist/ -nbdist/ -.nb-gradle/ \ No newline at end of file -- Gitee From 2494fb463938d478cf5d4438183d40804fb0e63c Mon Sep 17 00:00:00 2001 From: lcg0124 <1992lcg@163.com> Date: Tue, 8 May 2018 12:14:28 +0800 Subject: [PATCH 21/36] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6cloud?= =?UTF-8?q?do-server/mvnw?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clouddo-server/mvnw | 225 -------------------------------------------- 1 file changed, 225 deletions(-) delete mode 100644 clouddo-server/mvnw diff --git a/clouddo-server/mvnw b/clouddo-server/mvnw deleted file mode 100644 index 5bf251c..0000000 --- a/clouddo-server/mvnw +++ /dev/null @@ -1,225 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven2 Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Migwn, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" - # TODO classpath? -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` - fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -echo $MAVEN_PROJECTBASEDIR -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" -- Gitee From cc8f900cd4905b8d70aa7ec4d5a2a192cbc12c6f Mon Sep 17 00:00:00 2001 From: lcg0124 <1992lcg@163.com> Date: Tue, 8 May 2018 12:14:35 +0800 Subject: [PATCH 22/36] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6cloud?= =?UTF-8?q?do-server/mvnw.cmd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clouddo-server/mvnw.cmd | 143 ---------------------------------------- 1 file changed, 143 deletions(-) delete mode 100644 clouddo-server/mvnw.cmd diff --git a/clouddo-server/mvnw.cmd b/clouddo-server/mvnw.cmd deleted file mode 100644 index 019bd74..0000000 --- a/clouddo-server/mvnw.cmd +++ /dev/null @@ -1,143 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven2 Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" - -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% -- Gitee From aa72c5dedd1725b284dd3db846bbbe6cdd7466bc Mon Sep 17 00:00:00 2001 From: lcg0124 <1992lcg@163.com> Date: Tue, 8 May 2018 12:14:47 +0800 Subject: [PATCH 23/36] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6cloud?= =?UTF-8?q?do-common/clouddo-common.iml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clouddo-common/clouddo-common.iml | 130 ------------------------------ 1 file changed, 130 deletions(-) delete mode 100644 clouddo-common/clouddo-common.iml diff --git a/clouddo-common/clouddo-common.iml b/clouddo-common/clouddo-common.iml deleted file mode 100644 index 53e56f9..0000000 --- a/clouddo-common/clouddo-common.iml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file -- Gitee From 1083e28b89a5954ab08e6014132a3f15ee23f564 Mon Sep 17 00:00:00 2001 From: lcg0124 <1992lcg@163.com> Date: Tue, 8 May 2018 12:15:06 +0800 Subject: [PATCH 24/36] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6cloud?= =?UTF-8?q?do-cms/.gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clouddo-cms/.gitignore | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 clouddo-cms/.gitignore diff --git a/clouddo-cms/.gitignore b/clouddo-cms/.gitignore deleted file mode 100644 index 2af7cef..0000000 --- a/clouddo-cms/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -target/ -!.mvn/wrapper/maven-wrapper.jar - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -nbproject/private/ -build/ -nbbuild/ -dist/ -nbdist/ -.nb-gradle/ \ No newline at end of file -- Gitee From d8af532b0e3eede603d97a0631e4e915f660329a Mon Sep 17 00:00:00 2001 From: lcg0124 <1992lcg@163.com> Date: Tue, 8 May 2018 12:15:13 +0800 Subject: [PATCH 25/36] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6cloud?= =?UTF-8?q?do-cms/mvnw.cmd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clouddo-cms/mvnw.cmd | 143 ------------------------------------------- 1 file changed, 143 deletions(-) delete mode 100644 clouddo-cms/mvnw.cmd diff --git a/clouddo-cms/mvnw.cmd b/clouddo-cms/mvnw.cmd deleted file mode 100644 index 019bd74..0000000 --- a/clouddo-cms/mvnw.cmd +++ /dev/null @@ -1,143 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven2 Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" - -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% -- Gitee From a268590ff85135d12da9db79c388e5367baf75ed Mon Sep 17 00:00:00 2001 From: lcg0124 <7G9v8384> Date: Tue, 8 May 2018 12:34:06 +0800 Subject: [PATCH 26/36] =?UTF-8?q?=E4=BF=AE=E6=94=B9ignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 58 +++--------------------------------------------------- 1 file changed, 3 insertions(+), 55 deletions(-) diff --git a/.gitignore b/.gitignore index a316185..46dd41b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,56 +1,4 @@ -# Created by .ignore support plugin (hsz.mobi) -### JetBrains template -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 -# User-specific stuff: -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/dictionaries - -# Sensitive or high-churn files: -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.xml -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml - -# Gradle: -.idea/**/gradle.xml -.idea/**/libraries - -# CMake -cmake-build-debug/ -cmake-build-release/ - -# Mongo Explorer plugin: -.idea/**/mongoSettings.xml - -## File-based project format: -*.iws - -## Plugin-specific files: - -# IntelliJ -out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Cursive Clojure plugin -.idea/replstate.xml - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - -.idea/workspace.xml -clouddo-admin/target/ -clouddo-common/target/ +/.idea/ +/clouddo.iml +/clouddo-*/clouddo-*.iml -- Gitee From 9ab612d7720985fdcebd5069f44114ad119119fa Mon Sep 17 00:00:00 2001 From: lcg0124 <7G9v8384> Date: Fri, 25 May 2018 15:41:43 +0800 Subject: [PATCH 27/36] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88v0.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clouddo-base/pom.xml | 90 ++++++++++++++++ .../clouddobase/ClouddoBaseApplication.java | 14 +++ .../clouddobase/controller/LogController.java | 53 +++++++++ .../com/bootdo/clouddobase/dao/LogDao.java | 31 ++++++ .../clouddobase/service/LogService.java | 22 ++++ .../service/impl/LogServiceImpl.java | 46 ++++++++ .../src/main/resources/application.yml | 15 +++ .../src/main/resources/mapper/LogMapper.xml | 102 ++++++++++++++++++ .../src/main/resources/mybatis/LogMapper.xml | 102 ++++++++++++++++++ .../ClouddoLogApplicationTests.java | 16 +++ 10 files changed, 491 insertions(+) create mode 100644 clouddo-base/pom.xml create mode 100644 clouddo-base/src/main/java/com/bootdo/clouddobase/ClouddoBaseApplication.java create mode 100644 clouddo-base/src/main/java/com/bootdo/clouddobase/controller/LogController.java create mode 100644 clouddo-base/src/main/java/com/bootdo/clouddobase/dao/LogDao.java create mode 100644 clouddo-base/src/main/java/com/bootdo/clouddobase/service/LogService.java create mode 100644 clouddo-base/src/main/java/com/bootdo/clouddobase/service/impl/LogServiceImpl.java create mode 100644 clouddo-base/src/main/resources/application.yml create mode 100644 clouddo-base/src/main/resources/mapper/LogMapper.xml create mode 100644 clouddo-base/src/main/resources/mybatis/LogMapper.xml create mode 100644 clouddo-base/src/test/java/com/bootdo/clouddobase/ClouddoLogApplicationTests.java diff --git a/clouddo-base/pom.xml b/clouddo-base/pom.xml new file mode 100644 index 0000000..592de6a --- /dev/null +++ b/clouddo-base/pom.xml @@ -0,0 +1,90 @@ + + + 4.0.0 + + com.bootdo + clouddo-base + 0.0.1-SNAPSHOT + jar + + clouddo-base + 日志等基础服务 + + + org.springframework.boot + spring-boot-starter-parent + 1.5.9.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + Edgware.RELEASE + + + + + org.springframework.cloud + spring-cloud-starter-eureka-server + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + + mysql + mysql-connector-java + + + org.mybatis + mybatis + 3.4.4 + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 1.1.1 + + + + com.bootdo + clouddo-common + 0.0.1-SNAPSHOT + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + diff --git a/clouddo-base/src/main/java/com/bootdo/clouddobase/ClouddoBaseApplication.java b/clouddo-base/src/main/java/com/bootdo/clouddobase/ClouddoBaseApplication.java new file mode 100644 index 0000000..2595ae7 --- /dev/null +++ b/clouddo-base/src/main/java/com/bootdo/clouddobase/ClouddoBaseApplication.java @@ -0,0 +1,14 @@ +package com.bootdo.clouddobase; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@MapperScan(basePackages = {"com.bootdo.*.dao"}) +@SpringBootApplication +public class ClouddoBaseApplication { + + public static void main(String[] args) { + SpringApplication.run(ClouddoBaseApplication.class, args); + } +} diff --git a/clouddo-base/src/main/java/com/bootdo/clouddobase/controller/LogController.java b/clouddo-base/src/main/java/com/bootdo/clouddobase/controller/LogController.java new file mode 100644 index 0000000..71762af --- /dev/null +++ b/clouddo-base/src/main/java/com/bootdo/clouddobase/controller/LogController.java @@ -0,0 +1,53 @@ +package com.bootdo.clouddobase.controller; + + +import com.bootdo.clouddocommon.dto.LogDO; +import com.bootdo.clouddocommon.utils.PageUtils; +import com.bootdo.clouddocommon.utils.Query; +import com.bootdo.clouddocommon.utils.R; +import com.bootdo.clouddobase.service.LogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@RequestMapping("/log") +@RestController +public class LogController { + @Autowired + LogService logService; + + @GetMapping() + R list(@RequestParam Map params) { + Query query = new Query(params); + return R.page(new PageUtils(logService.queryList(query), logService.count(query))); + } + + @PostMapping("/save") + R save(@RequestBody LogDO logDO) { + if (logService.save(logDO) > 0) { + return R.ok(); + } + return R.error(); + } + + @DeleteMapping() + R remove(Long id) { + if (logService.remove(id) > 0) { + return R.ok(); + } + return R.error(); + } + + @PostMapping("/batchRemove") + R batchRemove(@RequestParam("ids[]") Long[] ids) { + int r = logService.batchRemove(ids); + if (r > 0) { + return R.ok(); + } + return R.error(); + } +} diff --git a/clouddo-base/src/main/java/com/bootdo/clouddobase/dao/LogDao.java b/clouddo-base/src/main/java/com/bootdo/clouddobase/dao/LogDao.java new file mode 100644 index 0000000..922d4c5 --- /dev/null +++ b/clouddo-base/src/main/java/com/bootdo/clouddobase/dao/LogDao.java @@ -0,0 +1,31 @@ +package com.bootdo.clouddobase.dao; + +import com.bootdo.clouddocommon.dto.LogDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +/** + * 系统日志 + * @author chglee + * @email 1992lcg@163.com + * @date 2017-10-03 15:45:42 + */ +@Mapper +public interface LogDao { + + LogDO get(Long id); + + List list(Map map); + + int count(Map map); + + int save(LogDO log); + + int update(LogDO log); + + int remove(Long id); + + int batchRemove(Long[] ids); +} diff --git a/clouddo-base/src/main/java/com/bootdo/clouddobase/service/LogService.java b/clouddo-base/src/main/java/com/bootdo/clouddobase/service/LogService.java new file mode 100644 index 0000000..0bcd170 --- /dev/null +++ b/clouddo-base/src/main/java/com/bootdo/clouddobase/service/LogService.java @@ -0,0 +1,22 @@ +package com.bootdo.clouddobase.service; + + +import com.bootdo.clouddocommon.dto.LogDO; +import com.bootdo.clouddocommon.utils.Query; +import org.springframework.stereotype.Service; + +import java.util.List; + + +@Service +public interface LogService { + int save(LogDO logDO); + + List queryList(Query query); + + int count(Query query); + + int remove(Long id); + + int batchRemove(Long[] ids); +} diff --git a/clouddo-base/src/main/java/com/bootdo/clouddobase/service/impl/LogServiceImpl.java b/clouddo-base/src/main/java/com/bootdo/clouddobase/service/impl/LogServiceImpl.java new file mode 100644 index 0000000..6d292e3 --- /dev/null +++ b/clouddo-base/src/main/java/com/bootdo/clouddobase/service/impl/LogServiceImpl.java @@ -0,0 +1,46 @@ +package com.bootdo.clouddobase.service.impl; + + +import com.bootdo.clouddocommon.dto.LogDO; +import com.bootdo.clouddocommon.utils.Query; +import com.bootdo.clouddobase.dao.LogDao; +import com.bootdo.clouddobase.service.LogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class LogServiceImpl implements LogService { + @Autowired + LogDao logMapper; + + @Async + @Override + public int save(LogDO logDO) { + return logMapper.save(logDO); + } + + @Override + public List queryList(Query query) { + List logs = logMapper.list(query); + return logs; + } + + @Override + public int count(Query query) { + return logMapper.count(query); + } + + @Override + public int remove(Long id) { + int count = logMapper.remove(id); + return count; + } + + @Override + public int batchRemove(Long[] ids) { + return logMapper.batchRemove(ids); + } +} diff --git a/clouddo-base/src/main/resources/application.yml b/clouddo-base/src/main/resources/application.yml new file mode 100644 index 0000000..4cedf53 --- /dev/null +++ b/clouddo-base/src/main/resources/application.yml @@ -0,0 +1,15 @@ +eureka: + client: + serviceUrl: + defaultZone: http://localhost:8001/eureka/ +spring: + application: + name: api-base + datasource: + url: jdbc:mysql://127.0.0.1:3306/clouddo?useUnicode=true&characterEncoding=utf8 + username: root + password: root +mybatis: + mapper-locations: mapper/**Mapper.xml + configuration: + map-underscore-to-camel-case: true \ No newline at end of file diff --git a/clouddo-base/src/main/resources/mapper/LogMapper.xml b/clouddo-base/src/main/resources/mapper/LogMapper.xml new file mode 100644 index 0000000..e1a4c31 --- /dev/null +++ b/clouddo-base/src/main/resources/mapper/LogMapper.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + insert into sys_log + ( + `user_id`, + `username`, + `operation`, + `time`, + `method`, + `params`, + `ip`, + `gmt_create` + ) + values + ( + #{userId}, + #{username}, + #{operation}, + #{time}, + #{method}, + #{params}, + #{ip}, + #{gmtCreate} + ) + + + + update sys_log + + `user_id` = #{userId}, + `username` = #{username}, + `operation` = #{operation}, + `time` = #{time}, + `method` = #{method}, + `params` = #{params}, + `ip` = #{ip}, + `gmt_create` = #{gmtCreate} + + where id = #{id} + + + + delete from sys_log where id = #{value} + + + + delete from sys_log where id in + + #{id} + + + + \ No newline at end of file diff --git a/clouddo-base/src/main/resources/mybatis/LogMapper.xml b/clouddo-base/src/main/resources/mybatis/LogMapper.xml new file mode 100644 index 0000000..e1a4c31 --- /dev/null +++ b/clouddo-base/src/main/resources/mybatis/LogMapper.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + insert into sys_log + ( + `user_id`, + `username`, + `operation`, + `time`, + `method`, + `params`, + `ip`, + `gmt_create` + ) + values + ( + #{userId}, + #{username}, + #{operation}, + #{time}, + #{method}, + #{params}, + #{ip}, + #{gmtCreate} + ) + + + + update sys_log + + `user_id` = #{userId}, + `username` = #{username}, + `operation` = #{operation}, + `time` = #{time}, + `method` = #{method}, + `params` = #{params}, + `ip` = #{ip}, + `gmt_create` = #{gmtCreate} + + where id = #{id} + + + + delete from sys_log where id = #{value} + + + + delete from sys_log where id in + + #{id} + + + + \ No newline at end of file diff --git a/clouddo-base/src/test/java/com/bootdo/clouddobase/ClouddoLogApplicationTests.java b/clouddo-base/src/test/java/com/bootdo/clouddobase/ClouddoLogApplicationTests.java new file mode 100644 index 0000000..535cab3 --- /dev/null +++ b/clouddo-base/src/test/java/com/bootdo/clouddobase/ClouddoLogApplicationTests.java @@ -0,0 +1,16 @@ +package com.bootdo.clouddobase; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class ClouddoLogApplicationTests { + + @Test + public void contextLoads() { + } + +} -- Gitee From d090baa5463c01cb0de55939c3a0e489f2025b42 Mon Sep 17 00:00:00 2001 From: lcg0124 <7G9v8384> Date: Fri, 25 May 2018 15:43:37 +0800 Subject: [PATCH 28/36] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88v0.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 + clouddo-admin/clouddo.sql | 228 ++++++++++-------- .../clouddoadmin/ClouddoAdminApplication.java | 20 +- .../clouddoadmin/config/AuthConfig.java | 1 + .../controller/LoginController.java | 2 + .../controller/TestController.java | 23 ++ .../com/bootdo/clouddoadmin/rpc/TestRpc.java | 15 ++ .../clouddocms/ClouddoCmsApplication.java | 14 +- .../bootdo/clouddocms/config/AuthConfig.java | 29 +++ .../bootdo/clouddocms/config/WebConfig.java | 19 ++ .../clouddocms/controller/FileController.java | 34 +++ .../src/main/resources/application.yml | 12 +- clouddo-common/pom.xml | 162 +++++++------ .../bootdo/clouddocommon/annotation/Log.java | 12 + .../clouddocommon/aspect/LogAspect.java | 86 +++++++ .../clouddocommon/aspect/WebLogAspect.java | 45 ++++ .../constants/CommonConstants.java | 1 + .../com/bootdo/clouddocommon/dto/LogDO.java | 112 +++++++++ .../clouddocommon/filter/ContextFilter.java | 108 +++++---- .../intercepter/AuthIntercepter.java | 1 - .../clouddocommon/service/LogRpcService.java | 15 ++ .../bootdo/clouddocommon/utils/FileUtils.java | 58 +++++ .../clouddocommon/utils/HttpContextUtils.java | 12 + .../clouddocommon/utils/HttpServletUtils.java | 16 ++ .../bootdo/clouddocommon/utils/IPUtils.java | 32 +++ .../bootdo/clouddocommon/utils/JsonUtils.java | 163 ++++++------- .../clouddocommon/utils/StringUtils.java | 7 + .../clouddozuul/ClouddoZuulApplication.java | 1 - .../clouddozuul/filter/AccessFilter.java | 10 +- .../clouddozuul/prc/admin/MenuService.java | 6 +- .../src/main/resources/application.yml | 4 + pom.xml | 1 + 32 files changed, 911 insertions(+), 342 deletions(-) create mode 100644 clouddo-admin/src/main/java/com/bootdo/clouddoadmin/controller/TestController.java create mode 100644 clouddo-admin/src/main/java/com/bootdo/clouddoadmin/rpc/TestRpc.java create mode 100644 clouddo-cms/src/main/java/com/bootdo/clouddocms/config/AuthConfig.java create mode 100644 clouddo-cms/src/main/java/com/bootdo/clouddocms/config/WebConfig.java create mode 100644 clouddo-common/src/main/java/com/bootdo/clouddocommon/annotation/Log.java create mode 100644 clouddo-common/src/main/java/com/bootdo/clouddocommon/aspect/LogAspect.java create mode 100644 clouddo-common/src/main/java/com/bootdo/clouddocommon/dto/LogDO.java create mode 100644 clouddo-common/src/main/java/com/bootdo/clouddocommon/service/LogRpcService.java create mode 100644 clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/FileUtils.java create mode 100644 clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/HttpContextUtils.java create mode 100644 clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/HttpServletUtils.java create mode 100644 clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/IPUtils.java create mode 100644 clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/StringUtils.java diff --git a/.gitignore b/.gitignore index 46dd41b..697ec7d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,7 @@ /.idea/ /clouddo.iml /clouddo-*/clouddo-*.iml +/clouddo-*/mvnw +/clouddo-*/mvnw.cmd +/clouddo-*/.mvn/ +/clouddo-base/mvnw diff --git a/clouddo-admin/clouddo.sql b/clouddo-admin/clouddo.sql index e3e7c3c..6d3daf9 100644 --- a/clouddo-admin/clouddo.sql +++ b/clouddo-admin/clouddo.sql @@ -10,11 +10,30 @@ Target Server Type : MYSQL Target Server Version : 50721 File Encoding : 65001 -Date: 2018-04-09 18:13:51 +Date: 2018-05-25 15:34:34 */ SET FOREIGN_KEY_CHECKS=0; +-- ---------------------------- +-- Table structure for `cms_file` +-- ---------------------------- +DROP TABLE IF EXISTS `cms_file`; +CREATE TABLE `cms_file` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `type` int(11) DEFAULT NULL COMMENT '文件类型', + `url` varchar(200) DEFAULT NULL COMMENT 'URL地址', + `create_date` datetime DEFAULT NULL COMMENT '创建时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=147 DEFAULT CHARSET=utf8 COMMENT='文件上传'; + +-- ---------------------------- +-- Records of cms_file +-- ---------------------------- +INSERT INTO `cms_file` VALUES ('144', '1', 'http://localhost:8004/files/11/20/9fb01430-28e6-4a18-90ec-3e784ba23a6a', '2018-05-25 15:20:04'); +INSERT INTO `cms_file` VALUES ('145', '1', 'http://localhost:8004/files/45/44/26f1385f-c227-482a-84ad-4d97ee25ef0d', '2018-05-25 15:20:29'); +INSERT INTO `cms_file` VALUES ('146', '1', 'http://localhost:8004/files/99/45/c8ea7174-1ebb-4c7c-864d-8a1defa57ff8', '2018-05-25 15:21:16'); + -- ---------------------------- -- Table structure for `sys_dept` -- ---------------------------- @@ -183,32 +202,6 @@ INSERT INTO `sys_dict` VALUES ('119', '交流', 'communication', 'blog_type', ' INSERT INTO `sys_dict` VALUES ('120', '文章', 'article', 'blog_type', '博客类型', null, null, null, null, null, null, '', ''); INSERT INTO `sys_dict` VALUES ('121', '编码', 'code', 'hobby', '爱好', null, null, null, null, null, null, '', ''); --- ---------------------------- --- Table structure for `sys_file` --- ---------------------------- -DROP TABLE IF EXISTS `sys_file`; -CREATE TABLE `sys_file` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT, - `type` int(11) DEFAULT NULL COMMENT '文件类型', - `url` varchar(200) DEFAULT NULL COMMENT 'URL地址', - `create_date` datetime DEFAULT NULL COMMENT '创建时间', - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=139 DEFAULT CHARSET=utf8 COMMENT='文件上传'; - --- ---------------------------- --- Records of sys_file --- ---------------------------- -INSERT INTO `sys_file` VALUES ('110', '0', '/files/d64a62e3-6821-48f1-bac6-a1b9945f4afb.jpg', '2017-10-14 16:20:17'); -INSERT INTO `sys_file` VALUES ('111', '0', '/files/aa2c3dc6-495f-48cc-8e12-446eceb2535e.jpg', '2017-10-14 16:20:21'); -INSERT INTO `sys_file` VALUES ('114', '0', '/files/84c29777-11bc-44b9-818d-859f2d04d417.jpg', '2017-10-20 09:27:18'); -INSERT INTO `sys_file` VALUES ('117', '0', '/files/40073f7e-82ec-43f2-b9d3-fd9068916d4b.jpg', '2017-10-20 11:53:47'); -INSERT INTO `sys_file` VALUES ('118', '0', '/files/a973499e-3ec7-4d43-8a52-b6f6517c77e3.jpg', '2017-10-20 11:53:52'); -INSERT INTO `sys_file` VALUES ('125', '0', '/files/e2901e59-2e65-45a0-9fd8-284c88133cdd.jpg', '2017-10-20 11:54:20'); -INSERT INTO `sys_file` VALUES ('127', '0', '/files/1a42a630-5186-44c1-8378-5f974652d7c8.jpg', '2017-10-20 13:20:49'); -INSERT INTO `sys_file` VALUES ('132', '0', '/files/e6f13526-e31c-4ebe-a3cf-5fd88dd10be6.jpg', '2017-12-18 20:19:51'); -INSERT INTO `sys_file` VALUES ('134', '0', '/files/cd016e72-77f7-4425-afe2-b79dfbdc3ae9.jpeg', '2017-12-18 22:44:07'); -INSERT INTO `sys_file` VALUES ('138', '0', '/files/9ec12ee7-65b5-4cc5-9900-d2ec6185b336.jpg', '2017-12-19 19:55:27'); - -- ---------------------------- -- Table structure for `sys_log` -- ---------------------------- @@ -224,30 +217,61 @@ CREATE TABLE `sys_log` ( `ip` varchar(64) DEFAULT NULL COMMENT 'IP地址', `gmt_create` datetime DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8 COMMENT='系统日志'; +) ENGINE=InnoDB AUTO_INCREMENT=80 DEFAULT CHARSET=utf8 COMMENT='系统日志'; -- ---------------------------- -- Records of sys_log -- ---------------------------- -INSERT INTO `sys_log` VALUES ('1', '2', 'test', '登录', '0', 'com.bootdo.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2017-12-26 11:33:58'); -INSERT INTO `sys_log` VALUES ('2', '2', 'test', '请求访问主页', '286', 'com.bootdo.system.controller.LoginController.index()', null, '127.0.0.1', '2017-12-26 11:33:59'); -INSERT INTO `sys_log` VALUES ('3', '1', 'admin', '登录', '3', 'com.bootdo.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2017-12-26 11:55:59'); -INSERT INTO `sys_log` VALUES ('4', '1', 'admin', '请求访问主页', '32', 'com.bootdo.system.controller.LoginController.index()', null, '127.0.0.1', '2017-12-26 11:55:59'); -INSERT INTO `sys_log` VALUES ('5', '1', 'admin', '请求访问主页', '11', 'com.bootdo.system.controller.LoginController.index()', null, '127.0.0.1', '2017-12-26 11:56:56'); -INSERT INTO `sys_log` VALUES ('6', '2', 'test', '登录', '22', 'com.bootdo.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2017-12-26 12:00:43'); -INSERT INTO `sys_log` VALUES ('7', '2', 'test', '请求访问主页', '79', 'com.bootdo.system.controller.LoginController.index()', null, '127.0.0.1', '2017-12-26 12:00:43'); -INSERT INTO `sys_log` VALUES ('8', '2', 'test', '请求访问主页', '15', 'com.bootdo.system.controller.LoginController.index()', null, '127.0.0.1', '2017-12-26 12:00:52'); -INSERT INTO `sys_log` VALUES ('9', '1', 'admin', '登录', '8', 'com.bootdo.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2017-12-26 12:01:03'); -INSERT INTO `sys_log` VALUES ('10', '1', 'admin', '请求访问主页', '17', 'com.bootdo.system.controller.LoginController.index()', null, '127.0.0.1', '2017-12-26 12:01:03'); -INSERT INTO `sys_log` VALUES ('11', '1', 'admin', '请求访问主页', '17', 'com.bootdo.system.controller.LoginController.index()', null, '127.0.0.1', '2017-12-26 12:01:22'); -INSERT INTO `sys_log` VALUES ('12', '1', 'admin', '请求访问主页', '10', 'com.bootdo.system.controller.LoginController.index()', null, '127.0.0.1', '2017-12-26 12:16:26'); -INSERT INTO `sys_log` VALUES ('13', '1', 'admin', '登录', '8', 'com.bootdo.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2017-12-26 12:23:19'); -INSERT INTO `sys_log` VALUES ('14', '1', 'admin', '请求访问主页', '32', 'com.bootdo.system.controller.LoginController.index()', null, '127.0.0.1', '2017-12-26 12:23:20'); -INSERT INTO `sys_log` VALUES ('15', '1', 'admin', '登录', '10', 'com.bootdo.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2017-12-26 12:34:03'); -INSERT INTO `sys_log` VALUES ('16', '1', 'admin', '请求访问主页', '81', 'com.bootdo.system.controller.LoginController.index()', null, '127.0.0.1', '2017-12-26 12:34:04'); INSERT INTO `sys_log` VALUES ('17', '-1', '获取用户信息为空', '登录', '16', 'com.bootdo.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2017-12-26 20:26:22'); INSERT INTO `sys_log` VALUES ('18', '1', 'admin', '登录', '4', 'com.bootdo.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2017-12-26 20:26:28'); -INSERT INTO `sys_log` VALUES ('19', '1', 'admin', '请求访问主页', '52', 'com.bootdo.system.controller.LoginController.index()', null, '127.0.0.1', '2017-12-26 20:26:29'); +INSERT INTO `sys_log` VALUES ('32', '0', '', '登录', '14', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-21 14:09:31'); +INSERT INTO `sys_log` VALUES ('33', '0', '', '登录', '324', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-21 16:18:28'); +INSERT INTO `sys_log` VALUES ('34', '0', '', '登录', '18', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-21 16:18:30'); +INSERT INTO `sys_log` VALUES ('35', '0', '', '登录', '23', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-21 16:22:40'); +INSERT INTO `sys_log` VALUES ('36', '0', '', '登录', '13', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-21 16:42:45'); +INSERT INTO `sys_log` VALUES ('37', '0', '', '登录', '43', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-21 19:59:12'); +INSERT INTO `sys_log` VALUES ('38', '0', '', '登录', '564', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-21 19:59:10'); +INSERT INTO `sys_log` VALUES ('39', '0', '', '登录', '403', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 10:49:47'); +INSERT INTO `sys_log` VALUES ('40', '0', '', '登录', '21', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 10:49:49'); +INSERT INTO `sys_log` VALUES ('41', '0', '', '登录', '20', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 10:49:58'); +INSERT INTO `sys_log` VALUES ('42', '0', '', '登录', '58', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 13:40:36'); +INSERT INTO `sys_log` VALUES ('43', '0', '', '登录', '63', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 15:56:11'); +INSERT INTO `sys_log` VALUES ('44', '0', '', '登录', '16', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 16:19:07'); +INSERT INTO `sys_log` VALUES ('45', '0', '', '登录', '63', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 16:53:31'); +INSERT INTO `sys_log` VALUES ('46', '0', '', '登录', '93', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 16:53:31'); +INSERT INTO `sys_log` VALUES ('47', '0', '', '登录', '115', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 16:53:31'); +INSERT INTO `sys_log` VALUES ('48', '0', '', '登录', '101', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 16:53:31'); +INSERT INTO `sys_log` VALUES ('49', '0', '', '登录', '87', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 16:53:31'); +INSERT INTO `sys_log` VALUES ('50', '0', '', '登录', '78', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 16:53:31'); +INSERT INTO `sys_log` VALUES ('51', '0', '', '登录', '77', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 16:53:31'); +INSERT INTO `sys_log` VALUES ('52', '0', '', '登录', '82', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 16:53:31'); +INSERT INTO `sys_log` VALUES ('53', '0', '', '登录', '139', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 16:53:31'); +INSERT INTO `sys_log` VALUES ('54', '0', '', '登录', '96', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 16:53:31'); +INSERT INTO `sys_log` VALUES ('55', '0', '', '登录', '140', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 16:53:31'); +INSERT INTO `sys_log` VALUES ('56', '0', '', '登录', '90', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 16:53:31'); +INSERT INTO `sys_log` VALUES ('57', '0', '', '登录', '127', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 16:53:31'); +INSERT INTO `sys_log` VALUES ('58', '0', '', '登录', '88', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 16:53:31'); +INSERT INTO `sys_log` VALUES ('59', '0', '', '登录', '203', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 16:53:31'); +INSERT INTO `sys_log` VALUES ('60', '0', '', '登录', '137', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 16:53:31'); +INSERT INTO `sys_log` VALUES ('61', '0', '', '登录', '115', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 16:53:31'); +INSERT INTO `sys_log` VALUES ('62', '0', '', '登录', '123', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 16:53:31'); +INSERT INTO `sys_log` VALUES ('63', '0', '', '登录', '107', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 16:53:31'); +INSERT INTO `sys_log` VALUES ('64', '0', '', '登录', '293', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 16:53:51'); +INSERT INTO `sys_log` VALUES ('65', '0', '', '登录', '18', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-22 16:53:53'); +INSERT INTO `sys_log` VALUES ('66', '0', '', '登录', '25', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-23 17:24:27'); +INSERT INTO `sys_log` VALUES ('67', '0', '', '登录', '1393', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-23 17:24:26'); +INSERT INTO `sys_log` VALUES ('68', '0', '', '登录', '347', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-24 16:34:20'); +INSERT INTO `sys_log` VALUES ('69', '0', '', '登录', '29', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-24 16:34:32'); +INSERT INTO `sys_log` VALUES ('70', '0', '', '登录', '76', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-24 17:10:27'); +INSERT INTO `sys_log` VALUES ('71', '0', '', '登录', '19', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-24 17:11:44'); +INSERT INTO `sys_log` VALUES ('72', '0', '', '登录', '395', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-25 10:56:03'); +INSERT INTO `sys_log` VALUES ('73', '0', '', '登录', '20', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-25 10:56:27'); +INSERT INTO `sys_log` VALUES ('74', '0', '', '登录', '28', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-25 11:02:43'); +INSERT INTO `sys_log` VALUES ('75', '0', '', '登录', '25', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-25 11:48:28'); +INSERT INTO `sys_log` VALUES ('76', '0', '', '登录', '423', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-25 13:56:11'); +INSERT INTO `sys_log` VALUES ('77', '0', '', '登录', '28', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-25 13:56:13'); +INSERT INTO `sys_log` VALUES ('78', '0', '', '登录', '47', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-25 14:27:59'); +INSERT INTO `sys_log` VALUES ('79', '0', '', '登录', '26', 'com.bootdo.clouddoadmin.controller.LoginController.login()', null, '127.0.0.1', '2018-05-25 14:28:03'); -- ---------------------------- -- Table structure for `sys_menu` @@ -267,7 +291,7 @@ CREATE TABLE `sys_menu` ( `gmt_modified` datetime DEFAULT NULL COMMENT '修改时间', `redirect` varchar(20) DEFAULT NULL, PRIMARY KEY (`menu_id`) -) ENGINE=InnoDB AUTO_INCREMENT=81 DEFAULT CHARSET=utf8 COMMENT='菜单管理'; +) ENGINE=InnoDB AUTO_INCREMENT=91 DEFAULT CHARSET=utf8 COMMENT='菜单管理'; -- ---------------------------- -- Records of sys_menu @@ -276,28 +300,35 @@ INSERT INTO `sys_menu` VALUES ('2', '3', '系统菜单', '/admin/menu', 'admin:m INSERT INTO `sys_menu` VALUES ('3', '0', '系统管理', null, null, '0', 'fa fa-desktop', '1', '2017-08-09 23:06:55', null, '2017-08-14 14:13:43', null); INSERT INTO `sys_menu` VALUES ('6', '3', '用户管理', '/admin/user', 'admin:user:user', '1', 'fa fa-user', '0', '2017-08-10 00:00:00', null, null, null); INSERT INTO `sys_menu` VALUES ('7', '3', '角色管理', '/admin/role', 'admin:role:role', '1', 'fa fa-paw', '1', '2017-08-10 00:00:00', null, null, null); -INSERT INTO `sys_menu` VALUES ('12', '6', '新增', '', 'sys:user:add', '2', '', '0', '2017-08-14 10:51:35', null, null, null); -INSERT INTO `sys_menu` VALUES ('13', '6', '编辑', '', 'sys:user:edit', '2', '', '0', '2017-08-14 10:52:06', null, null, null); -INSERT INTO `sys_menu` VALUES ('14', '6', '删除', null, 'sys:user:remove', '2', null, '0', '2017-08-14 10:52:24', null, null, null); -INSERT INTO `sys_menu` VALUES ('15', '7', '新增', '', 'sys:role:add', '2', '', '0', '2017-08-14 10:56:37', null, null, null); +INSERT INTO `sys_menu` VALUES ('12', '6', '新增', '/api-admin/user', 'admin:user:add', '2', '', '0', '2017-08-14 00:00:00', null, null, null); +INSERT INTO `sys_menu` VALUES ('13', '6', '编辑', '/api-admin/user', 'admin:user:edit', '2', '', '0', '2017-08-14 00:00:00', null, null, null); +INSERT INTO `sys_menu` VALUES ('14', '6', '删除', '/api-admin/user', 'admin:user:remove', '2', null, '0', '2017-08-14 00:00:00', null, null, null); +INSERT INTO `sys_menu` VALUES ('15', '7', '新增', '/api-admin/role', 'admin:role:add', '2', '', '0', '2017-08-14 00:00:00', null, null, null); INSERT INTO `sys_menu` VALUES ('20', '2', '新增', '/api-admin/menu', 'admin:menu:add', '2', '', '0', '2017-08-14 00:00:00', null, null, null); INSERT INTO `sys_menu` VALUES ('21', '2', '编辑', '/api-admin/menu', 'admin:menu:edit', '2', '', '0', '2017-08-14 00:00:00', null, null, null); INSERT INTO `sys_menu` VALUES ('22', '2', '删除', '/api-admin/menu', 'admin:menu:remove', '2', '', '0', '2017-08-14 00:00:00', null, null, null); -INSERT INTO `sys_menu` VALUES ('24', '6', '批量删除', '', 'sys:user:batchRemove', '2', '', '0', '2017-08-14 17:27:18', null, null, null); -INSERT INTO `sys_menu` VALUES ('25', '6', '停用', null, 'sys:user:disable', '2', null, '0', '2017-08-14 17:27:43', null, null, null); -INSERT INTO `sys_menu` VALUES ('26', '6', '重置密码', '', 'sys:user:resetPwd', '2', '', '0', '2017-08-14 17:28:34', null, null, null); -INSERT INTO `sys_menu` VALUES ('55', '7', '编辑', '', 'sys:role:edit', '2', '', null, null, null, null, null); -INSERT INTO `sys_menu` VALUES ('56', '7', '删除', '', 'sys:role:remove', '2', null, null, null, null, null, null); +INSERT INTO `sys_menu` VALUES ('24', '6', '批量删除', '/api-admin/user', 'admin:user:batchRemove', '2', '', '0', '2017-08-14 00:00:00', null, null, null); +INSERT INTO `sys_menu` VALUES ('25', '6', '停用', '/api-admin/user/disable', 'admin:user:disable', '2', null, '0', '2017-08-14 00:00:00', null, null, null); +INSERT INTO `sys_menu` VALUES ('26', '6', '重置密码', '/api-admin/user/resetPwd', 'admin:user:resetPwd', '2', '', '0', '2017-08-14 00:00:00', null, null, null); +INSERT INTO `sys_menu` VALUES ('55', '7', '编辑', '/api-admin/role', 'admin:role:edit', '2', '', null, null, null, null, null); +INSERT INTO `sys_menu` VALUES ('56', '7', '删除', '/api-admin/role', 'admin:role:remove', '2', null, null, null, null, null, null); INSERT INTO `sys_menu` VALUES ('61', '2', '批量删除', '/api-admin/menu/batchRemove', 'admin:menu:batchRemove', '2', null, null, null, null, null, null); -INSERT INTO `sys_menu` VALUES ('62', '7', '批量删除', '', 'sys:role:batchRemove', '2', null, null, null, null, null, null); -INSERT INTO `sys_menu` VALUES ('73', '3', '部门管理', '/admin/api/user/currentUser', 'admin:dept:dept', '1', 'fa fa-users', '3', null, null, null, null); +INSERT INTO `sys_menu` VALUES ('62', '7', '批量删除', '/api-admin/role/batchRemove', 'admin:role:batchRemove', '2', null, null, null, null, null, null); INSERT INTO `sys_menu` VALUES ('74', '73', '清除缓存', '/admin/api/menu/clearCache', 'system:sysDept:add', '1', null, '1', null, null, null, null); -INSERT INTO `sys_menu` VALUES ('75', '73', '刪除', 'system/sysDept/remove', 'system:sysDept:remove', '2', null, '2', null, null, null, null); INSERT INTO `sys_menu` VALUES ('76', '73', '编辑', '/admin/api/user/currentUser', 'system:sysDept:edit', '2', null, '3', null, null, null, null); INSERT INTO `sys_menu` VALUES ('77', '2', '列表', '/api-admin/menu', 'admin:menu:list', '2', null, null, null, null, null, null); -INSERT INTO `sys_menu` VALUES ('78', '0', '内容管理', null, null, '0', null, null, null, null, null, null); -INSERT INTO `sys_menu` VALUES ('79', '0', '基础信息', null, null, '0', null, null, null, null, null, null); +INSERT INTO `sys_menu` VALUES ('78', '0', '内容管理', null, null, '0', 'fa fa-th-list', null, null, null, null, null); INSERT INTO `sys_menu` VALUES ('80', '79', '数据字典', '/a', null, '1', null, null, null, null, null, null); +INSERT INTO `sys_menu` VALUES ('81', '78', '文件管理', '/cms/file', null, '1', null, null, null, null, null, null); +INSERT INTO `sys_menu` VALUES ('82', '81', '列表', '/api-cms/file', 'cms:file', '2', null, null, null, null, null, null); +INSERT INTO `sys_menu` VALUES ('83', '78', '博客管理', '/cms/content', 'cms:content', '1', null, null, null, null, null, null); +INSERT INTO `sys_menu` VALUES ('84', '0', '基础信息', null, null, '0', 'fa fa-bars', null, null, null, null, null); +INSERT INTO `sys_menu` VALUES ('85', '84', '系统日志', '/base/log', null, '1', null, null, null, null, null, null); +INSERT INTO `sys_menu` VALUES ('86', '85', '列表', '/api-base/log', null, '2', null, null, null, null, null, null); +INSERT INTO `sys_menu` VALUES ('87', '81', '上传', '/file/upload', null, '2', null, null, null, null, null, null); +INSERT INTO `sys_menu` VALUES ('88', '0', '系统监控', null, null, '0', 'fa fa-video-camera', null, null, null, null, null); +INSERT INTO `sys_menu` VALUES ('89', '88', '服务注册', 'http://localhost:8001', null, '1', null, null, null, null, null, null); +INSERT INTO `sys_menu` VALUES ('90', '0', '系统工具', null, null, '0', 'fa fa-wrench', null, null, null, null, null); -- ---------------------------- -- Table structure for `sys_role` @@ -312,7 +343,7 @@ CREATE TABLE `sys_role` ( `gmt_create` datetime DEFAULT NULL COMMENT '创建时间', `gmt_modified` datetime DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`role_id`) -) ENGINE=InnoDB AUTO_INCREMENT=58 DEFAULT CHARSET=utf8 COMMENT='角色'; +) ENGINE=InnoDB AUTO_INCREMENT=57 DEFAULT CHARSET=utf8 COMMENT='角色'; -- ---------------------------- -- Records of sys_role @@ -330,7 +361,7 @@ CREATE TABLE `sys_role_menu` ( `role_id` bigint(20) DEFAULT NULL COMMENT '角色ID', `menu_id` bigint(20) DEFAULT NULL COMMENT '菜单ID', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=2998 DEFAULT CHARSET=utf8 COMMENT='角色与菜单对应关系'; +) ENGINE=InnoDB AUTO_INCREMENT=3225 DEFAULT CHARSET=utf8 COMMENT='角色与菜单对应关系'; -- ---------------------------- -- Records of sys_role_menu @@ -484,30 +515,36 @@ INSERT INTO `sys_role_menu` VALUES ('2343', '77', '84'); INSERT INTO `sys_role_menu` VALUES ('2344', '77', '72'); INSERT INTO `sys_role_menu` VALUES ('2345', '77', '-1'); INSERT INTO `sys_role_menu` VALUES ('2346', '77', '77'); -INSERT INTO `sys_role_menu` VALUES ('2974', '1', '78'); -INSERT INTO `sys_role_menu` VALUES ('2975', '1', '3'); -INSERT INTO `sys_role_menu` VALUES ('2976', '1', '73'); -INSERT INTO `sys_role_menu` VALUES ('2977', '1', '76'); -INSERT INTO `sys_role_menu` VALUES ('2978', '1', '75'); -INSERT INTO `sys_role_menu` VALUES ('2979', '1', '74'); -INSERT INTO `sys_role_menu` VALUES ('2980', '1', '7'); -INSERT INTO `sys_role_menu` VALUES ('2981', '1', '62'); -INSERT INTO `sys_role_menu` VALUES ('2982', '1', '56'); -INSERT INTO `sys_role_menu` VALUES ('2983', '1', '55'); -INSERT INTO `sys_role_menu` VALUES ('2984', '1', '15'); -INSERT INTO `sys_role_menu` VALUES ('2985', '1', '6'); -INSERT INTO `sys_role_menu` VALUES ('2986', '1', '26'); -INSERT INTO `sys_role_menu` VALUES ('2987', '1', '25'); -INSERT INTO `sys_role_menu` VALUES ('2988', '1', '24'); -INSERT INTO `sys_role_menu` VALUES ('2989', '1', '14'); -INSERT INTO `sys_role_menu` VALUES ('2990', '1', '13'); -INSERT INTO `sys_role_menu` VALUES ('2991', '1', '12'); -INSERT INTO `sys_role_menu` VALUES ('2992', '1', '2'); -INSERT INTO `sys_role_menu` VALUES ('2993', '1', '77'); -INSERT INTO `sys_role_menu` VALUES ('2994', '1', '61'); -INSERT INTO `sys_role_menu` VALUES ('2995', '1', '22'); -INSERT INTO `sys_role_menu` VALUES ('2996', '1', '21'); -INSERT INTO `sys_role_menu` VALUES ('2997', '1', '20'); +INSERT INTO `sys_role_menu` VALUES ('3195', '1', '90'); +INSERT INTO `sys_role_menu` VALUES ('3196', '1', '88'); +INSERT INTO `sys_role_menu` VALUES ('3197', '1', '89'); +INSERT INTO `sys_role_menu` VALUES ('3198', '1', '84'); +INSERT INTO `sys_role_menu` VALUES ('3199', '1', '85'); +INSERT INTO `sys_role_menu` VALUES ('3200', '1', '86'); +INSERT INTO `sys_role_menu` VALUES ('3201', '1', '78'); +INSERT INTO `sys_role_menu` VALUES ('3202', '1', '83'); +INSERT INTO `sys_role_menu` VALUES ('3203', '1', '81'); +INSERT INTO `sys_role_menu` VALUES ('3204', '1', '87'); +INSERT INTO `sys_role_menu` VALUES ('3205', '1', '82'); +INSERT INTO `sys_role_menu` VALUES ('3206', '1', '3'); +INSERT INTO `sys_role_menu` VALUES ('3207', '1', '7'); +INSERT INTO `sys_role_menu` VALUES ('3208', '1', '62'); +INSERT INTO `sys_role_menu` VALUES ('3209', '1', '56'); +INSERT INTO `sys_role_menu` VALUES ('3210', '1', '55'); +INSERT INTO `sys_role_menu` VALUES ('3211', '1', '15'); +INSERT INTO `sys_role_menu` VALUES ('3212', '1', '6'); +INSERT INTO `sys_role_menu` VALUES ('3213', '1', '26'); +INSERT INTO `sys_role_menu` VALUES ('3214', '1', '25'); +INSERT INTO `sys_role_menu` VALUES ('3215', '1', '24'); +INSERT INTO `sys_role_menu` VALUES ('3216', '1', '14'); +INSERT INTO `sys_role_menu` VALUES ('3217', '1', '13'); +INSERT INTO `sys_role_menu` VALUES ('3218', '1', '12'); +INSERT INTO `sys_role_menu` VALUES ('3219', '1', '2'); +INSERT INTO `sys_role_menu` VALUES ('3220', '1', '77'); +INSERT INTO `sys_role_menu` VALUES ('3221', '1', '61'); +INSERT INTO `sys_role_menu` VALUES ('3222', '1', '22'); +INSERT INTO `sys_role_menu` VALUES ('3223', '1', '21'); +INSERT INTO `sys_role_menu` VALUES ('3224', '1', '20'); -- ---------------------------- -- Table structure for `sys_task` @@ -561,7 +598,7 @@ CREATE TABLE `sys_user` ( `city` varchar(255) DEFAULT NULL COMMENT '所在城市', `district` varchar(255) DEFAULT NULL COMMENT '所在地区', PRIMARY KEY (`user_id`) -) ENGINE=InnoDB AUTO_INCREMENT=158 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=157 DEFAULT CHARSET=utf8; -- ---------------------------- -- Records of sys_user @@ -570,9 +607,9 @@ INSERT INTO `sys_user` VALUES ('1', 'admin', '超级管理员', 'd0af8fa1272ef5a INSERT INTO `sys_user` VALUES ('2', 'test', '临时用户', '6cf3bb3deba2aadbd41ec9a22511084e', '6', 'test@bootdo.com', null, '1', '1', '2017-08-14 13:43:05', '2017-08-14 21:15:36', null, null, null, null, null, null, null, null); INSERT INTO `sys_user` VALUES ('36', 'ldh', '刘德华', 'bfd9394475754fbe45866eba97738c36', '7', 'ldh@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null); INSERT INTO `sys_user` VALUES ('123', 'zxy', '张学友', '35174ba93f5fe7267f1fb3c1bf903781', '6', 'zxy@bootdo', null, '0', null, null, null, null, null, null, null, null, null, null, null); -INSERT INTO `sys_user` VALUES ('124', 'wyf', '吴亦凡', 'e179e6f687bbd57b9d7efc4746c8090a', '6', 'wyf@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null); -INSERT INTO `sys_user` VALUES ('130', 'lh', '鹿晗', '7924710cd673f68967cde70e188bb097', '9', 'lh@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null); -INSERT INTO `sys_user` VALUES ('131', 'lhc', '令狐冲', 'd515538e17ecb570ba40344b5618f5d4', '6', 'lhc@bootdo.com', null, '0', null, null, null, null, null, null, null, null, null, null, null); +INSERT INTO `sys_user` VALUES ('124', 'wyf', '吴亦凡', 'e179e6f687bbd57b9d7efc4746c8090a', '6', 'wyf@bootdo.com', null, '1', null, null, null, null, '2018-04-11 00:00:00', null, null, null, null, null, null); +INSERT INTO `sys_user` VALUES ('130', 'lh', '鹿晗', '7924710cd673f68967cde70e188bb097', '9', 'lh@bootdo.com', null, '1', null, null, null, null, '2018-04-11 00:00:00', null, null, null, null, null, null); +INSERT INTO `sys_user` VALUES ('131', 'lhc', '令狐冲', 'd515538e17ecb570ba40344b5618f5d4', '6', 'lhc@bootdo.com', null, '0', null, null, null, null, '2018-04-11 00:00:00', null, null, null, null, null, null); INSERT INTO `sys_user` VALUES ('132', 'lyf', '刘亦菲', '7fdb1d9008f45950c1620ba0864e5fbd', '13', 'lyf@bootdo.com', null, '1', null, null, null, null, '2018-03-15 00:00:00', null, null, null, null, null, null); INSERT INTO `sys_user` VALUES ('134', 'lyh', '李彦宏', 'dc26092b3244d9d432863f2738180e19', '8', 'lyh@bootdo.com', null, '1', null, null, null, null, '2018-03-18 00:00:00', null, null, null, null, null, null); INSERT INTO `sys_user` VALUES ('135', 'wjl', '王健林', '3967697dfced162cf6a34080259b83aa', '6', 'wjl@bootod.com', null, '1', null, null, null, null, '2018-03-19 00:00:00', null, null, null, null, null, null); @@ -603,7 +640,7 @@ CREATE TABLE `sys_user_role` ( `user_id` bigint(20) DEFAULT NULL COMMENT '用户ID', `role_id` bigint(20) DEFAULT NULL COMMENT '角色ID', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=158 DEFAULT CHARSET=utf8 COMMENT='用户与角色对应关系'; +) ENGINE=InnoDB AUTO_INCREMENT=166 DEFAULT CHARSET=utf8 COMMENT='用户与角色对应关系'; -- ---------------------------- -- Records of sys_user_role @@ -625,10 +662,8 @@ INSERT INTO `sys_user_role` VALUES ('86', '33', '52'); INSERT INTO `sys_user_role` VALUES ('87', '34', '50'); INSERT INTO `sys_user_role` VALUES ('88', '34', '51'); INSERT INTO `sys_user_role` VALUES ('89', '34', '52'); -INSERT INTO `sys_user_role` VALUES ('106', '124', '1'); INSERT INTO `sys_user_role` VALUES ('110', '1', '1'); INSERT INTO `sys_user_role` VALUES ('111', '2', '1'); -INSERT INTO `sys_user_role` VALUES ('123', '130', '1'); INSERT INTO `sys_user_role` VALUES ('124', null, '48'); INSERT INTO `sys_user_role` VALUES ('127', '123', '48'); INSERT INTO `sys_user_role` VALUES ('132', '36', '48'); @@ -638,8 +673,11 @@ INSERT INTO `sys_user_role` VALUES ('152', '135', '1'); INSERT INTO `sys_user_role` VALUES ('153', '134', '1'); INSERT INTO `sys_user_role` VALUES ('154', '134', '48'); INSERT INTO `sys_user_role` VALUES ('155', '134', '56'); -INSERT INTO `sys_user_role` VALUES ('156', '131', '48'); -INSERT INTO `sys_user_role` VALUES ('157', '131', '1'); +INSERT INTO `sys_user_role` VALUES ('158', '131', '48'); +INSERT INTO `sys_user_role` VALUES ('159', '131', '1'); +INSERT INTO `sys_user_role` VALUES ('160', '130', '1'); +INSERT INTO `sys_user_role` VALUES ('164', '124', '56'); +INSERT INTO `sys_user_role` VALUES ('165', '124', '48'); -- ---------------------------- -- Table structure for `sys_user_token` diff --git a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/ClouddoAdminApplication.java b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/ClouddoAdminApplication.java index bb1b3f7..649536f 100644 --- a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/ClouddoAdminApplication.java +++ b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/ClouddoAdminApplication.java @@ -1,25 +1,19 @@ package com.bootdo.clouddoadmin; -import com.bootdo.clouddocommon.filter.ContextFilter; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.cache.annotation.EnableCaching; -import org.springframework.context.annotation.Bean; +import org.springframework.cloud.netflix.feign.EnableFeignClients; import org.springframework.scheduling.annotation.EnableScheduling; +@EnableFeignClients(basePackages = {"com.bootdo"}) @EnableCaching @EnableScheduling -@SpringBootApplication +@SpringBootApplication(scanBasePackages = {"com.bootdo.clouddoadmin", "com.bootdo.clouddocommon"}) public class ClouddoAdminApplication { - public static void main(String[] args) { - SpringApplication.run(ClouddoAdminApplication.class, args); - } - @Bean - public FilterRegistrationBean filterRegistrationBean(){ - FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(new ContextFilter()); - filterRegistrationBean.addUrlPatterns("/*"); - return filterRegistrationBean; - } + public static void main(String[] args) { + SpringApplication.run(ClouddoAdminApplication.class, args); + } + } diff --git a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/config/AuthConfig.java b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/config/AuthConfig.java index ac7ad1a..0e14b9a 100644 --- a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/config/AuthConfig.java +++ b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/config/AuthConfig.java @@ -21,6 +21,7 @@ public class AuthConfig extends WebMvcConfigurerAdapter { // 排除配置 addInterceptor.excludePathPatterns("/error"); addInterceptor.excludePathPatterns("/login**"); + addInterceptor.excludePathPatterns("/test**"); // 拦截配置 addInterceptor.addPathPatterns("/**"); diff --git a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/controller/LoginController.java b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/controller/LoginController.java index b4d9f64..61a5431 100644 --- a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/controller/LoginController.java +++ b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/controller/LoginController.java @@ -5,6 +5,7 @@ import com.bootdo.clouddoadmin.service.MenuService; import com.bootdo.clouddoadmin.service.TokenService; import com.bootdo.clouddoadmin.service.UserService; import com.bootdo.clouddoadmin.utils.MD5Utils; +import com.bootdo.clouddocommon.annotation.Log; import com.bootdo.clouddocommon.context.FilterContextHandler; import com.bootdo.clouddocommon.dto.LoginDTO; import com.bootdo.clouddocommon.dto.UserToken; @@ -35,6 +36,7 @@ public class LoginController { @Autowired MenuService menuService; + @Log("登录") @PostMapping("/login") R login(@Valid @RequestBody LoginDTO loginDTO, HttpServletRequest request, HttpServletResponse response) { String username = loginDTO.getUsername().trim(); diff --git a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/controller/TestController.java b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/controller/TestController.java new file mode 100644 index 0000000..ed76fc1 --- /dev/null +++ b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/controller/TestController.java @@ -0,0 +1,23 @@ +package com.bootdo.clouddoadmin.controller; + +import com.bootdo.clouddoadmin.rpc.TestRpc; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping +public class TestController { + @Autowired + TestRpc testRpc; + + @GetMapping("test") + String test() { + return testRpc.test(); + } + @GetMapping("test1") + String test1() { + return "1111"; + } +} diff --git a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/rpc/TestRpc.java b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/rpc/TestRpc.java new file mode 100644 index 0000000..c1e4d8c --- /dev/null +++ b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/rpc/TestRpc.java @@ -0,0 +1,15 @@ +package com.bootdo.clouddoadmin.rpc; + +import com.bootdo.clouddocommon.dto.MenuDTO; +import com.bootdo.clouddocommon.intercepter.FeignIntercepter; +import feign.Headers; +import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +import java.util.List; + +@FeignClient(name = "course", configuration = FeignIntercepter.class) +public interface TestRpc { + @GetMapping("/test/testRpc/test") + String test(); +} diff --git a/clouddo-cms/src/main/java/com/bootdo/clouddocms/ClouddoCmsApplication.java b/clouddo-cms/src/main/java/com/bootdo/clouddocms/ClouddoCmsApplication.java index 0478b0a..44ef819 100644 --- a/clouddo-cms/src/main/java/com/bootdo/clouddocms/ClouddoCmsApplication.java +++ b/clouddo-cms/src/main/java/com/bootdo/clouddocms/ClouddoCmsApplication.java @@ -1,6 +1,5 @@ package com.bootdo.clouddocms; -import com.bootdo.clouddocommon.filter.ContextFilter; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.FilterRegistrationBean; @@ -13,13 +12,8 @@ import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication public class ClouddoCmsApplication { - public static void main(String[] args) { - SpringApplication.run(ClouddoCmsApplication.class, args); - } - @Bean - public FilterRegistrationBean filterRegistrationBean(){ - FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(new ContextFilter()); - filterRegistrationBean.addUrlPatterns("/*"); - return filterRegistrationBean; - } + public static void main(String[] args) { + SpringApplication.run(ClouddoCmsApplication.class, args); + } + } diff --git a/clouddo-cms/src/main/java/com/bootdo/clouddocms/config/AuthConfig.java b/clouddo-cms/src/main/java/com/bootdo/clouddocms/config/AuthConfig.java new file mode 100644 index 0000000..dd7a153 --- /dev/null +++ b/clouddo-cms/src/main/java/com/bootdo/clouddocms/config/AuthConfig.java @@ -0,0 +1,29 @@ +package com.bootdo.clouddocms.config; + +import com.bootdo.clouddocommon.intercepter.AuthIntercepter; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; + +@Configuration +public class AuthConfig implements WebMvcConfigurer { + @Bean + public AuthIntercepter authIntercepter() { + return new AuthIntercepter(); + } + + @Override + public void addInterceptors(InterceptorRegistry registry) { + InterceptorRegistration addInterceptor = registry.addInterceptor(authIntercepter()); + + // 排除配置 + addInterceptor.excludePathPatterns("/error"); + addInterceptor.excludePathPatterns("/files/**"); + + // 拦截配置 + addInterceptor.addPathPatterns("/**"); + } +} diff --git a/clouddo-cms/src/main/java/com/bootdo/clouddocms/config/WebConfig.java b/clouddo-cms/src/main/java/com/bootdo/clouddocms/config/WebConfig.java new file mode 100644 index 0000000..c7b5613 --- /dev/null +++ b/clouddo-cms/src/main/java/com/bootdo/clouddocms/config/WebConfig.java @@ -0,0 +1,19 @@ +package com.bootdo.clouddocms.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Component +public class WebConfig implements WebMvcConfigurer { + @Value("${app.filePath}") + String filePath; + + @Value("${app.pre}") + String pre; + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + registry.addResourceHandler(pre+"/**").addResourceLocations("file:///"+filePath); + } +} diff --git a/clouddo-cms/src/main/java/com/bootdo/clouddocms/controller/FileController.java b/clouddo-cms/src/main/java/com/bootdo/clouddocms/controller/FileController.java index 3e1c1cb..ba0a89e 100644 --- a/clouddo-cms/src/main/java/com/bootdo/clouddocms/controller/FileController.java +++ b/clouddo-cms/src/main/java/com/bootdo/clouddocms/controller/FileController.java @@ -1,9 +1,15 @@ package com.bootdo.clouddocms.controller; +import java.io.IOException; +import java.util.Date; import java.util.List; import java.util.Map; +import java.util.UUID; +import com.bootdo.clouddocommon.context.FilterContextHandler; +import com.bootdo.clouddocommon.utils.FileUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.ui.Model; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -15,6 +21,7 @@ import com.bootdo.clouddocms.service.FileService; import com.bootdo.clouddocommon.utils.PageUtils; import com.bootdo.clouddocommon.utils.Query; import com.bootdo.clouddocommon.utils.R; +import org.springframework.web.multipart.MultipartFile; /** * 文件上传 @@ -27,6 +34,11 @@ import com.bootdo.clouddocommon.utils.R; @RestController @RequestMapping("/file") public class FileController { + @Value("${app.filePath}") + String filePath; + + @Value("${app.pre}") + String filePre; @Autowired private FileService fileService; @@ -37,6 +49,28 @@ public class FileController { return R.data(fileDTO); } + @GetMapping("getToken") + public R getToken() { + return R.ok().put("token", FilterContextHandler.getToken()).put("url", "http://localhost:8002/api-cms/file/upload") + .put("key", UUID.randomUUID().toString()); + } + + @PostMapping("upload") + public R upload(MultipartFile file, String key) { + try { + String resPath = FileUtils.saveFile(file.getBytes(), filePath, key); + fileService.save(new FileDO() {{ + setCreateDate(new Date()); + setUrl("http://localhost:8004" + filePre + "/"+resPath); + setType(1); + }}); + return R.ok().put("resPath", resPath); + } catch (IOException e) { + e.printStackTrace(); + return R.error("文件上传失败"); + } + } + /** * 分页查询 */ diff --git a/clouddo-cms/src/main/resources/application.yml b/clouddo-cms/src/main/resources/application.yml index 7e21774..7b4a123 100644 --- a/clouddo-cms/src/main/resources/application.yml +++ b/clouddo-cms/src/main/resources/application.yml @@ -2,9 +2,6 @@ eureka: client: serviceUrl: defaultZone: http://localhost:8001/eureka/ -security: - basic: - enabled: false server: port: 8004 spring: @@ -17,7 +14,14 @@ spring: jackson: date-format: yyyy-MM-dd time-zone: GMT+8 + servlet: + multipart: + max-file-size: 100Mb + max-request-size: 100Mb mybatis: mapper-locations: mapper/**Mapper.xml configuration: - map-underscore-to-camel-case: true \ No newline at end of file + map-underscore-to-camel-case: true +app: + filePath: c:/var/uploaded_files/ + pre: /files \ No newline at end of file diff --git a/clouddo-common/pom.xml b/clouddo-common/pom.xml index 66c12ac..2a756da 100644 --- a/clouddo-common/pom.xml +++ b/clouddo-common/pom.xml @@ -1,93 +1,109 @@ - 4.0.0 - - com.bootdo - clouddo-common - 0.0.1-SNAPSHOT - jar - - clouddo-common - Demo project for Spring Boot - - - org.springframework.boot - spring-boot-starter-parent - 1.5.9.RELEASE - - - - - UTF-8 - UTF-8 - 1.8 - Edgware.RELEASE - 1.2.0.Final - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.cloud - spring-cloud-starter-feign - - - - org.springframework.boot - spring-boot-starter-test - test - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.bootdo + clouddo-common + 0.0.1-SNAPSHOT + jar + + clouddo-common + Demo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 1.5.9.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + Edgware.RELEASE + 1.2.0.Final + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.cloud + spring-cloud-starter-feign + + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.springframework.boot + spring-boot-starter-aop + org.springframework.boot spring-boot-autoconfigure 1.5.6.RELEASE - - io.jsonwebtoken - jjwt - 0.7.0 - + + + io.jsonwebtoken + jjwt + 0.7.0 + com.fasterxml classmate 1.3.4 - - org.mapstruct - mapstruct-jdk8 - ${org.mapstruct.version} - + + org.mapstruct + mapstruct-jdk8 + ${org.mapstruct.version} + + + org.apache.commons + commons-lang3 + RELEASE + + + com.alibaba + fastjson + RELEASE + - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/annotation/Log.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/annotation/Log.java new file mode 100644 index 0000000..94a7d60 --- /dev/null +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/annotation/Log.java @@ -0,0 +1,12 @@ +package com.bootdo.clouddocommon.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface Log { + String value() default ""; +} diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/aspect/LogAspect.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/aspect/LogAspect.java new file mode 100644 index 0000000..3941031 --- /dev/null +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/aspect/LogAspect.java @@ -0,0 +1,86 @@ +package com.bootdo.clouddocommon.aspect; + +import com.bootdo.clouddocommon.annotation.Log; +import com.bootdo.clouddocommon.context.FilterContextHandler; +import com.bootdo.clouddocommon.dto.LogDO; +import com.bootdo.clouddocommon.service.LogRpcService; +import com.bootdo.clouddocommon.utils.HttpContextUtils; +import com.bootdo.clouddocommon.utils.IPUtils; +import com.bootdo.clouddocommon.utils.JSONUtils; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Pointcut; +import org.aspectj.lang.reflect.MethodSignature; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.servlet.http.HttpServletRequest; +import java.lang.reflect.Method; +import java.util.Date; + +@Aspect +@Component +public class LogAspect { + private static final Logger logger = LoggerFactory.getLogger(LogAspect.class); + + @Autowired + LogRpcService logService; + + + @Pointcut("@annotation(com.bootdo.clouddocommon.annotation.Log)") + public void logPointCut() { + } + + @Around("logPointCut()") + public Object around(ProceedingJoinPoint point) throws Throwable { + long beginTime = System.currentTimeMillis(); + // 执行方法 + Object result = point.proceed(); + // 执行时长(毫秒) + long time = System.currentTimeMillis() - beginTime; + //异步保存日志 + saveLog(point, time); + return result; + } + + void saveLog(ProceedingJoinPoint joinPoint, long time) throws InterruptedException { + MethodSignature signature = (MethodSignature) joinPoint.getSignature(); + Method method = signature.getMethod(); + LogDO sysLog = new LogDO(); + Log syslog = method.getAnnotation(Log.class); + if (syslog != null) { + // 注解上的描述 + sysLog.setOperation(syslog.value()); + } + // 请求的方法名 + String className = joinPoint.getTarget().getClass().getName(); + String methodName = signature.getName(); + sysLog.setMethod(className + "." + methodName + "()"); + // 请求的参数 + Object[] args = joinPoint.getArgs(); + try { + String params = JSONUtils.beanToJson(args[0]).substring(0, 4999); + sysLog.setParams(params); + } catch (Exception e) { + + } + // 获取request + HttpServletRequest request = HttpContextUtils.getHttpServletRequest(); + // 设置IP地址 + sysLog.setIp(IPUtils.getIpAddr(request)); + // 用户名 + + sysLog.setUserId(Long.parseLong(FilterContextHandler.getUserID() == null ? "000000" : FilterContextHandler.getUserID())); + sysLog.setUsername(FilterContextHandler.getUsername() == null ? "" : FilterContextHandler.getUsername()); + sysLog.setTime((int) time); + // 系统当前时间 + Date date = new Date(); + sysLog.setGmtCreate(date); + // 保存系统日志 + logService.save(sysLog); + } +} + diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/aspect/WebLogAspect.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/aspect/WebLogAspect.java index c591e75..4d0189c 100644 --- a/clouddo-common/src/main/java/com/bootdo/clouddocommon/aspect/WebLogAspect.java +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/aspect/WebLogAspect.java @@ -1,4 +1,49 @@ package com.bootdo.clouddocommon.aspect; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.util.Arrays; + +@Aspect +@Component public class WebLogAspect { + private static final Logger logger = LoggerFactory.getLogger(WebLogAspect.class); + + @Pointcut("execution( * com.bootdo..controller.*.*(..))")//两个..代表所有子目录，最后括号里的两个..代表所有参数 + public void logPointCut() { + } + + @Before("logPointCut()") + public void doBefore(JoinPoint joinPoint){ + ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + HttpServletRequest request = requestAttributes.getRequest(); + logger.info("请求地址 : " +request.getRequestURL().toString()); + logger.info("HTTP METHOD : " + request.getMethod()); + // 获取真实的ip地址 + //logger.info("IP : " + IPAddressUtil.getClientIpAddress(request)); + logger.info("CLASS_METHOD : " + joinPoint.getSignature().getDeclaringTypeName() + "." + + joinPoint.getSignature().getName()); + logger.info("参数 : " + Arrays.toString(joinPoint.getArgs())); + } + @AfterReturning(returning = "ret", pointcut = "logPointCut()")// returning的值和doAfterReturning的参数名一致 + public void doAfterReturning(Object ret) throws Throwable { + // 处理完请求，返回内容(返回值太复杂时，打印的是物理存储空间的地址) + logger.debug("返回值 : " + ret); + } + + @Around("logPointCut()") + public Object doAround(ProceedingJoinPoint pjp) throws Throwable { + long startTime = System.currentTimeMillis(); + Object ob = pjp.proceed();// ob 为方法的返回值 + logger.info("耗时 : " + (System.currentTimeMillis() - startTime)); + return ob; + } } diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/constants/CommonConstants.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/constants/CommonConstants.java index 0808697..501e547 100644 --- a/clouddo-common/src/main/java/com/bootdo/clouddocommon/constants/CommonConstants.java +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/constants/CommonConstants.java @@ -7,4 +7,5 @@ public class CommonConstants { public final static String CONTEXT_NAME="contextName"; public final static String JWT_PRIVATE_KEY ="wwwbootdocom"; public final static String RENEWAL_TIME = "renewalTime"; + public final static String TOKEN = "token"; } diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/dto/LogDO.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/dto/LogDO.java new file mode 100644 index 0000000..26f2466 --- /dev/null +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/dto/LogDO.java @@ -0,0 +1,112 @@ +package com.bootdo.clouddocommon.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +public class LogDO { + private Long id; + + private Long userId; + + private String username; + + private String operation; + + private Integer time; + + private String method; + + private String params; + + private String ip; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date gmtCreate; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username == null ? null : username.trim(); + } + + public String getOperation() { + return operation; + } + + public void setOperation(String operation) { + this.operation = operation == null ? null : operation.trim(); + } + + public Integer getTime() { + return time; + } + + public void setTime(Integer time) { + this.time = time; + } + + public String getMethod() { + return method; + } + + public void setMethod(String method) { + this.method = method == null ? null : method.trim(); + } + + public String getParams() { + return params; + } + + public void setParams(String params) { + this.params = params == null ? null : params.trim(); + } + + public String getIp() { + return ip; + } + + public void setIp(String ip) { + this.ip = ip == null ? null : ip.trim(); + } + + public Date getGmtCreate() { + return gmtCreate; + } + + public void setGmtCreate(Date gmtCreate) { + this.gmtCreate = gmtCreate; + } + + @Override + public String toString() { + return "LogDO{" + + "id=" + id + + ", userId=" + userId + + ", username='" + username + '\'' + + ", operation='" + operation + '\'' + + ", time=" + time + + ", method='" + method + '\'' + + ", params='" + params + '\'' + + ", ip='" + ip + '\'' + + ", gmtCreate=" + gmtCreate + + '}'; + } +} \ No newline at end of file diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/filter/ContextFilter.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/filter/ContextFilter.java index dbc54c0..c443e5d 100644 --- a/clouddo-common/src/main/java/com/bootdo/clouddocommon/filter/ContextFilter.java +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/filter/ContextFilter.java @@ -1,52 +1,56 @@ -package com.bootdo.clouddocommon.filter; - -import com.bootdo.clouddocommon.constants.CommonConstants; -import com.bootdo.clouddocommon.context.FilterContextHandler; -import com.bootdo.clouddocommon.dto.UserToken; -import com.bootdo.clouddocommon.utils.JsonUtils; -import com.bootdo.clouddocommon.utils.JwtUtils; -import com.bootdo.clouddocommon.utils.R; - -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; - -public class ContextFilter implements Filter { - @Override - public void init(FilterConfig filterConfig) throws ServletException { - - } - - @Override - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { - HttpServletRequest request = (HttpServletRequest) servletRequest; - HttpServletResponse response = (HttpServletResponse) servletResponse; - response.setCharacterEncoding("utf-8"); - response.setContentType("application/json;charset=UTF-8"); - if (request.getRequestURI().startsWith("/login")) { - filterChain.doFilter(request, response); - return; - } - String token = request.getHeader(CommonConstants.CONTEXT_TOKEN); - UserToken userToken = null; - try { - userToken = JwtUtils.getInfoFromToken(token); - } catch (Exception e) { - PrintWriter printWriter = response.getWriter(); - printWriter.write(JsonUtils.toJson(R.error403())); - return; - } - FilterContextHandler.setToken(token); - FilterContextHandler.setUsername(userToken.getUsername()); - FilterContextHandler.setName(userToken.getName()); - FilterContextHandler.setUserID(userToken.getUserId()); - filterChain.doFilter(request, response); - } - - @Override - public void destroy() { - - } -} +//package com.bootdo.clouddocommon.filter; +// +//import com.bootdo.clouddocommon.constants.CommonConstants; +//import com.bootdo.clouddocommon.context.FilterContextHandler; +//import com.bootdo.clouddocommon.dto.UserToken; +//import com.bootdo.clouddocommon.utils.JSONUtils; +//import com.bootdo.clouddocommon.utils.JwtUtils; +//import com.bootdo.clouddocommon.utils.R; +//import com.bootdo.clouddocommon.utils.StringUtils; +// +//import javax.servlet.*; +//import javax.servlet.http.HttpServletRequest; +//import javax.servlet.http.HttpServletResponse; +//import java.io.IOException; +//import java.io.PrintWriter; +// +//public class ContextFilter implements Filter { +// @Override +// public void init(FilterConfig filterConfig) throws ServletException { +// +// } +// +// @Override +// public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { +// HttpServletRequest request = (HttpServletRequest) servletRequest; +// HttpServletResponse response = (HttpServletResponse) servletResponse; +// response.setCharacterEncoding("utf-8"); +// response.setContentType("application/json;charset=UTF-8"); +// if (request.getRequestURI().startsWith("/test")) { +// filterChain.doFilter(request, response); +// return; +// } +// String token = request.getHeader(CommonConstants.CONTEXT_TOKEN); +// if(StringUtils.isBlank(token)){ +// token = request.getParameter(CommonConstants.TOKEN); +// } +// UserToken userToken = null; +// try { +// userToken = JwtUtils.getInfoFromToken(token); +// } catch (Exception e) { +// PrintWriter printWriter = response.getWriter(); +// printWriter.write(JSONUtils.beanToJson(R.error401())); +// return; +// } +// FilterContextHandler.setToken(token); +// FilterContextHandler.setUsername(userToken.getUsername()); +// FilterContextHandler.setName(userToken.getName()); +// FilterContextHandler.setUserID(userToken.getUserId()); +// filterChain.doFilter(request, response); +// } +// +// @Override +// public void destroy() { +// +// } +//} diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/intercepter/AuthIntercepter.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/intercepter/AuthIntercepter.java index fb4c120..a56f475 100644 --- a/clouddo-common/src/main/java/com/bootdo/clouddocommon/intercepter/AuthIntercepter.java +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/intercepter/AuthIntercepter.java @@ -14,7 +14,6 @@ public class AuthIntercepter extends HandlerInterceptorAdapter { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - HandlerMethod handlerMethod = (HandlerMethod) handler; String token = request.getHeader(CommonConstants.CONTEXT_TOKEN); UserToken userToken = JwtUtils.getInfoFromToken(token); FilterContextHandler.setToken(token); diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/service/LogRpcService.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/service/LogRpcService.java new file mode 100644 index 0000000..5dd51b4 --- /dev/null +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/service/LogRpcService.java @@ -0,0 +1,15 @@ +package com.bootdo.clouddocommon.service; + +import com.bootdo.clouddocommon.dto.LogDO; +import com.bootdo.clouddocommon.intercepter.FeignIntercepter; +import com.bootdo.clouddocommon.utils.R; +import feign.Headers; +import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; + +@Headers("Content-Type:application/json") +@FeignClient(name = "api-base", configuration = FeignIntercepter.class) +public interface LogRpcService { + @PostMapping("log/save") + R save(LogDO logDO); +} diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/FileUtils.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/FileUtils.java new file mode 100644 index 0000000..3f1b2bf --- /dev/null +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/FileUtils.java @@ -0,0 +1,58 @@ +package com.bootdo.clouddocommon.utils; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.channels.FileChannel; +import java.util.UUID; + +public class FileUtils { + public static String saveFile(byte[] file, String filePath, String fileName) { + int random = (int) (Math.random() * 100 + 1); + int random1 = (int) (Math.random() * 100 + 1); + filePath = filePath + random + File.separator + random1 + File.separator; + File targetFile = new File(filePath); + if (!targetFile.exists()) { + targetFile.mkdirs(); + } + FileOutputStream fileOutputStream = null; + try { + fileOutputStream = new FileOutputStream(filePath + fileName); + FileChannel fileChannel = fileOutputStream.getChannel(); + ByteBuffer buf = ByteBuffer.wrap(file); + while (fileChannel.write(buf) != 0) { + } + } catch (Exception e) { + + } finally { + if (fileOutputStream != null) { + try { + fileOutputStream.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + //url + return random + "/" + random1 + "/" + fileName; + } + + public static boolean deleteFile(String fileName) { + File file = new File(fileName); + // 如果文件路径所对应的文件存在，并且是一个文件，则直接删除 + if (file.exists() && file.isFile()) { + if (file.delete()) { + return true; + } else { + return false; + } + } else { + return false; + } + } + + public static String renameToUUID(String fileName) { + return UUID.randomUUID() + "." + fileName.substring(fileName.lastIndexOf(".") + 1); + } +} diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/HttpContextUtils.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/HttpContextUtils.java new file mode 100644 index 0000000..93b7f87 --- /dev/null +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/HttpContextUtils.java @@ -0,0 +1,12 @@ +package com.bootdo.clouddocommon.utils; + +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; + +public class HttpContextUtils { + public static HttpServletRequest getHttpServletRequest() { + return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + } +} diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/HttpServletUtils.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/HttpServletUtils.java new file mode 100644 index 0000000..4c8800f --- /dev/null +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/HttpServletUtils.java @@ -0,0 +1,16 @@ +package com.bootdo.clouddocommon.utils; + +import org.apache.commons.lang.StringUtils; + +import javax.servlet.http.HttpServletRequest; + +public class HttpServletUtils { + public static boolean jsAjax(HttpServletRequest req){ + //判断是否为ajax请求，默认不是 + boolean isAjaxRequest = false; + if(!StringUtils.isBlank(req.getHeader("x-requested-with")) && req.getHeader("x-requested-with").equals("XMLHttpRequest")){ + isAjaxRequest = true; + } + return isAjaxRequest; + } +} diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/IPUtils.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/IPUtils.java new file mode 100644 index 0000000..10d4243 --- /dev/null +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/IPUtils.java @@ -0,0 +1,32 @@ +package com.bootdo.clouddocommon.utils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.servlet.http.HttpServletRequest; + +public class IPUtils { + private static Logger logger = LoggerFactory.getLogger(IPUtils.class); + + /** + * 获取IP地址 + * + * 使用Nginx等反向代理软件， 则不能通过request.getRemoteAddr()获取IP地址 + * 如果使用了多级反向代理的话，X-Forwarded-For的值并不止一个，而是一串IP地址，X-Forwarded-For中第一个非unknown的有效IP字符串，则为真实IP地址 + */ + public static String getIpAddr(HttpServletRequest request) { + + String ip = request.getHeader("x-forwarded-for"); + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("Proxy-Client-IP"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("WL-Proxy-Client-IP"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getRemoteAddr(); + } + return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : ip; + } + +} diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/JsonUtils.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/JsonUtils.java index c3b9590..463e425 100644 --- a/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/JsonUtils.java +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/JsonUtils.java @@ -1,98 +1,85 @@ package com.bootdo.clouddocommon.utils; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; -import java.io.StringWriter; import java.util.HashMap; import java.util.Map; -public class JsonUtils { - private static ObjectMapper mapper = new ObjectMapper(); +public class JSONUtils { + /** + * Bean对象转JSON + * + * @param object + * @param dataFormatString + * @return + */ + public static String beanToJson(Object object, String dataFormatString) { + if (object != null) { + if (StringUtils.isEmpty(dataFormatString)) { + return JSONObject.toJSONString(object); + } + return JSON.toJSONStringWithDateFormat(object, dataFormatString); + } else { + return null; + } + } - public static String toString(Object obj){ - return toJson(obj); - } + /** + * Bean对象转JSON + * + * @param object + * @return + */ + public static String beanToJson(Object object) { + if (object != null) { + return JSON.toJSONString(object); + } else { + return null; + } + } - public static String toJson(Object obj){ - try{ - StringWriter writer = new StringWriter(); - mapper.writeValue(writer, obj); - return writer.toString(); - }catch(Exception e){ - throw new RuntimeException("序列化对象【"+obj+"】时出错", e); - } - } + /** + * String转JSON字符串 + * + * @param key + * @param value + * @return + */ + public static String stringToJsonByFastjson(String key, String value) { + if (StringUtils.isEmpty(key) || StringUtils.isEmpty(value)) { + return null; + } + Map map = new HashMap(16); + map.put(key, value); + return beanToJson(map, null); + } - public static T toBean(Class entityClass, String jsonString){ - try { - return mapper.readValue(jsonString, entityClass); - } catch (Exception e) { - throw new RuntimeException("JSON【"+jsonString+"】转对象时出错", e); - } - } + /** + * 将json字符串转换成对象 + * + * @param json + * @param clazz + * @return + */ + public static Object jsonToBean(String json, Object clazz) { + if (StringUtils.isEmpty(json) || clazz == null) { + return null; + } + return JSON.parseObject(json, clazz.getClass()); + } - /** - * 用于对象通过其他工具已转为JSON的字符形式，这里不需要再加上引号 - * @param obj - * @param isObject - */ - public static String getJsonSuccess(String obj, boolean isObject){ - String jsonString = null; - if(obj == null){ - jsonString = "{\"success\":true}"; - }else{ - jsonString = "{\"success\":true,\"data\":"+obj+"}"; - } - return jsonString; - } - - public static String getJsonSuccess(Object obj){ - return getJsonSuccess(obj, null); - } - - public static String getJsonSuccess(Object obj, String message) { - if(obj == null){ - return "{\"success\":true,\"message\":\""+message+"\"}"; - }else{ - try{ - Map map = new HashMap(); - map.put("success", true); - return "{\"success\":true,"+toString(obj)+",\"message\":\""+message+"\"}"; - }catch(Exception e){ - throw new RuntimeException("序列化对象【"+obj+"】时出错", e); - } - } - } - - public static String getJsonError(Object obj){ - return getJsonError(obj, null); - } - - public static String getJsonError(Object obj, String message) { - if(obj == null){ - return "{\"success\":false,\"message\":\""+message+"\"}"; - }else{ - try{ - obj = parseIfException(obj); - return "{\"success\":false,\"data\":"+toString(obj)+",\"message\":\""+message+"\"}"; - }catch(Exception e){ - throw new RuntimeException("序列化对象【"+obj+"】时出错", e); - } - } - } - - public static Object parseIfException(Object obj){ - if(obj instanceof Exception){ - return getErrorMessage((Exception) obj, null); - } - return obj; - } - - public static String getErrorMessage(Exception e, String defaultMessage){ - return defaultMessage != null ? defaultMessage : null; - } - - public static ObjectMapper getMapper() { - return mapper; - } -} \ No newline at end of file + /** + * json字符串转map + * + * @param json + * @return + */ + @SuppressWarnings("unchecked") + public static Map jsonToMap(String json) { + if (StringUtils.isEmpty(json)) { + return null; + } + return JSON.parseObject(json, Map.class); + } +} diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/StringUtils.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/StringUtils.java new file mode 100644 index 0000000..24b4a0e --- /dev/null +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/StringUtils.java @@ -0,0 +1,7 @@ +package com.bootdo.clouddocommon.utils; + +/** + * @author bootdo + */ +public class StringUtils extends org.apache.commons.lang3.StringUtils{ +} diff --git a/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/ClouddoZuulApplication.java b/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/ClouddoZuulApplication.java index cf272e2..de6267a 100644 --- a/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/ClouddoZuulApplication.java +++ b/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/ClouddoZuulApplication.java @@ -16,7 +16,6 @@ import org.springframework.web.filter.CorsFilter; @EnableZuulProxy @EnableEurekaClient @SpringBootApplication -@ComponentScan(basePackages = {"com.bootdo"}) public class ClouddoZuulApplication { public static void main(String[] args) { diff --git a/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/filter/AccessFilter.java b/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/filter/AccessFilter.java index dffd251..1ddf169 100644 --- a/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/filter/AccessFilter.java +++ b/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/filter/AccessFilter.java @@ -4,13 +4,16 @@ import com.bootdo.clouddocommon.constants.CommonConstants; import com.bootdo.clouddocommon.context.FilterContextHandler; import com.bootdo.clouddocommon.dto.MenuDTO; import com.bootdo.clouddocommon.dto.UserToken; -import com.bootdo.clouddocommon.utils.JsonUtils; +import com.bootdo.clouddocommon.utils.JSONUtils; import com.bootdo.clouddocommon.utils.JwtUtils; import com.bootdo.clouddocommon.utils.R; +import com.bootdo.clouddocommon.utils.StringUtils; import com.bootdo.clouddozuul.prc.admin.MenuService; import com.netflix.zuul.ZuulFilter; import com.netflix.zuul.context.RequestContext; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.multipart.MultipartRequest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -55,6 +58,9 @@ public class AccessFilter extends ZuulFilter { return null; } String accessToken = request.getHeader(CommonConstants.CONTEXT_TOKEN); + if(null == accessToken || accessToken == ""){ + accessToken = request.getParameter(CommonConstants.TOKEN); + } if (null == accessToken) { setFailedRequest(R.error401(), 200); return null; @@ -91,7 +97,7 @@ public class AccessFilter extends ZuulFilter { PrintWriter out = null; try{ out = response.getWriter(); - out.write(JsonUtils.toJson(body)); + out.write(JSONUtils.beanToJson(body)); out.flush(); }catch(IOException e){ e.printStackTrace(); diff --git a/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/prc/admin/MenuService.java b/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/prc/admin/MenuService.java index d92c76d..f015ace 100644 --- a/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/prc/admin/MenuService.java +++ b/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/prc/admin/MenuService.java @@ -5,12 +5,12 @@ import com.bootdo.clouddocommon.intercepter.FeignIntercepter; import feign.Headers; import org.springframework.cloud.netflix.feign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; import java.util.List; + @Headers("Content-Type:application/json") -@FeignClient(name = "api-admin",configuration = FeignIntercepter.class) +@FeignClient(name = "api-admin", configuration = FeignIntercepter.class) public interface MenuService { - @GetMapping ("/menu/userMenus") + @GetMapping("/menu/userMenus") List userMenus(); } diff --git a/clouddo-zuul/src/main/resources/application.yml b/clouddo-zuul/src/main/resources/application.yml index 34740a3..1f12656 100644 --- a/clouddo-zuul/src/main/resources/application.yml +++ b/clouddo-zuul/src/main/resources/application.yml @@ -7,6 +7,10 @@ server: spring: application: name: zuul + servlet: + multipart: + max-file-size: 100Mb + max-request-size: 100Mb diff --git a/pom.xml b/pom.xml index 903beae..302a918 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,7 @@ clouddo-zuul clouddo-admin clouddo-cms + clouddo-base -- Gitee From 580044ed6ba8eb15611f165ff739178a1229ef1a Mon Sep 17 00:00:00 2001 From: lcg0124 <1992lcg@163.com> Date: Fri, 25 May 2018 15:50:05 +0800 Subject: [PATCH 29/36] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 47abea5..27b926a 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,12 @@ 3.启动clouddo-zuul 网关 -4.启动clouddo-admin 权限微服务 +4.启动clouddo-base 基础微服务 -5.启动前端项目 https://gitee.com/lcg0124/clouddo-view.git +5.启动clouddo-admin 权限微服务 + +6.启动clouddo-cms 内容管理微服务 + +7.启动前端项目 https://gitee.com/lcg0124/clouddo-view.git ### 系统截图 -![输入图片说明](https://gitee.com/uploads/images/2018/0411/144753_cbc377fb_1204498.png "屏幕截图.png") \ No newline at end of file +![输入图片说明](https://gitee.com/uploads/images/2018/0525/154945_23b93b75_1204498.png "屏幕截图.png") -- Gitee From c73639badf50c3049c2b29b46c744a25c3a9136e Mon Sep 17 00:00:00 2001 From: lcg0124 <7G9v8384> Date: Thu, 28 Jun 2018 17:21:18 +0800 Subject: [PATCH 30/36] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88v0.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clouddoadmin/controller/MenuController.java | 2 ++ .../clouddoadmin/controller/UserController.java | 2 ++ clouddo-admin/src/main/resources/application.yml | 4 +++- .../clouddocommon/ClouddoCommonApplication.java | 14 ++++++++++++++ .../clouddocommon/intercepter/AuthIntercepter.java | 4 ++++ .../intercepter/FeignIntercepter.java | 5 +++++ .../utils/{JsonUtils.java => JSONUtils.java} | 0 clouddo-server/pom.xml | 2 +- clouddo-zuul/pom.xml | 6 +++--- clouddo-zuul/src/main/resources/application.yml | 3 +++ 10 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 clouddo-common/src/main/java/com/bootdo/clouddocommon/ClouddoCommonApplication.java rename clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/{JsonUtils.java => JSONUtils.java} (100%) diff --git a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/controller/MenuController.java b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/controller/MenuController.java index 2ab1e04..1dcab5d 100644 --- a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/controller/MenuController.java +++ b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/controller/MenuController.java @@ -3,6 +3,7 @@ package com.bootdo.clouddoadmin.controller; import com.bootdo.clouddoadmin.domain.MenuDO; import com.bootdo.clouddoadmin.domain.Tree; import com.bootdo.clouddoadmin.service.MenuService; +import com.bootdo.clouddocommon.annotation.Log; import com.bootdo.clouddocommon.context.FilterContextHandler; import com.bootdo.clouddocommon.dto.MenuDTO; import com.bootdo.clouddocommon.utils.R; @@ -23,6 +24,7 @@ public class MenuController { @Autowired MenuService menuService; + @Log("访问菜单") @GetMapping("tree") Tree tree(){ return menuService.getTree(); diff --git a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/controller/UserController.java b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/controller/UserController.java index bcd515c..31380ce 100644 --- a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/controller/UserController.java +++ b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/controller/UserController.java @@ -7,6 +7,7 @@ import com.bootdo.clouddoadmin.dto.do2dto.UserConvert; import com.bootdo.clouddoadmin.service.RoleService; import com.bootdo.clouddoadmin.service.UserService; import com.bootdo.clouddoadmin.utils.MD5Utils; +import com.bootdo.clouddocommon.annotation.Log; import com.bootdo.clouddocommon.context.FilterContextHandler; import com.bootdo.clouddocommon.dto.LoginUserDTO; import com.bootdo.clouddocommon.utils.PageUtils; @@ -66,6 +67,7 @@ public class UserController extends BaseController { * @param params * @return */ + @Log("获取用户列表") @GetMapping() R listByPage(@RequestParam Map params) { Query query = new Query(params); diff --git a/clouddo-admin/src/main/resources/application.yml b/clouddo-admin/src/main/resources/application.yml index 218dff5..b341fd1 100644 --- a/clouddo-admin/src/main/resources/application.yml +++ b/clouddo-admin/src/main/resources/application.yml @@ -20,4 +20,6 @@ spring: mybatis: mapper-locations: mapper/**Mapper.xml configuration: - map-underscore-to-camel-case: true \ No newline at end of file + map-underscore-to-camel-case: true +logging: + level: debug \ No newline at end of file diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/ClouddoCommonApplication.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/ClouddoCommonApplication.java new file mode 100644 index 0000000..c03e2d7 --- /dev/null +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/ClouddoCommonApplication.java @@ -0,0 +1,14 @@ +package com.bootdo.clouddocommon; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ClouddoCommonApplication { + + public static void main(String[] args) { + SpringApplication.run(ClouddoCommonApplication.class, args); + } + + +} diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/intercepter/AuthIntercepter.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/intercepter/AuthIntercepter.java index a56f475..d1b8021 100644 --- a/clouddo-common/src/main/java/com/bootdo/clouddocommon/intercepter/AuthIntercepter.java +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/intercepter/AuthIntercepter.java @@ -4,6 +4,8 @@ import com.bootdo.clouddocommon.constants.CommonConstants; import com.bootdo.clouddocommon.context.FilterContextHandler; import com.bootdo.clouddocommon.dto.UserToken; import com.bootdo.clouddocommon.utils.JwtUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; @@ -11,12 +13,14 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; public class AuthIntercepter extends HandlerInterceptorAdapter { + private static final Logger logger = LoggerFactory.getLogger(HandlerInterceptorAdapter.class); @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { String token = request.getHeader(CommonConstants.CONTEXT_TOKEN); UserToken userToken = JwtUtils.getInfoFromToken(token); FilterContextHandler.setToken(token); + logger.info("------设置token"+Thread.currentThread().getId()); FilterContextHandler.setUsername(userToken.getUsername()); FilterContextHandler.setName(userToken.getName()); FilterContextHandler.setUserID(userToken.getUserId()); diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/intercepter/FeignIntercepter.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/intercepter/FeignIntercepter.java index 6c77906..71406aa 100644 --- a/clouddo-common/src/main/java/com/bootdo/clouddocommon/intercepter/FeignIntercepter.java +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/intercepter/FeignIntercepter.java @@ -4,10 +4,15 @@ import com.bootdo.clouddocommon.constants.CommonConstants; import com.bootdo.clouddocommon.context.FilterContextHandler; import feign.RequestInterceptor; import feign.RequestTemplate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class FeignIntercepter implements RequestInterceptor { + private static final Logger logger = LoggerFactory.getLogger(RequestInterceptor.class); + @Override public void apply(RequestTemplate requestTemplate) { + logger.info("------feign设置token" + Thread.currentThread().getId()); requestTemplate.header(CommonConstants.CONTEXT_TOKEN, FilterContextHandler.getToken()); } } \ No newline at end of file diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/JsonUtils.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/JSONUtils.java similarity index 100% rename from clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/JsonUtils.java rename to clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/JSONUtils.java diff --git a/clouddo-server/pom.xml b/clouddo-server/pom.xml index 1e5f31b..e72cf00 100644 --- a/clouddo-server/pom.xml +++ b/clouddo-server/pom.xml @@ -5,7 +5,7 @@ com.bootdo clouddo-server - 0.0.1-SNAPSHOT + 0.0.1 jar clouddo-server diff --git a/clouddo-zuul/pom.xml b/clouddo-zuul/pom.xml index 1d7476c..782e980 100644 --- a/clouddo-zuul/pom.xml +++ b/clouddo-zuul/pom.xml @@ -5,16 +5,16 @@ com.bootdo clouddo-zuul - 0.0.1-SNAPSHOT + 0.0.1 jar clouddo-zuul - Demo project for Spring Boot + 公用包 org.springframework.boot spring-boot-starter-parent - 1.5.9.RELEASE + 1.5.10.RELEASE diff --git a/clouddo-zuul/src/main/resources/application.yml b/clouddo-zuul/src/main/resources/application.yml index 1f12656..0fc5810 100644 --- a/clouddo-zuul/src/main/resources/application.yml +++ b/clouddo-zuul/src/main/resources/application.yml @@ -11,6 +11,9 @@ spring: multipart: max-file-size: 100Mb max-request-size: 100Mb +ribbon: + ReadTimeout: 60000 + ConnectTimeout: 60000 -- Gitee From 8407f5b892474e9dee4d9968ba6628b2824c60f4 Mon Sep 17 00:00:00 2001 From: lcg0124 <7G9v8384> Date: Thu, 19 Jul 2018 13:51:13 +0800 Subject: [PATCH 31/36] =?UTF-8?q?=E8=A7=A3=E5=86=B3install=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clouddo-common/pom.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/clouddo-common/pom.xml b/clouddo-common/pom.xml index 2a756da..e012085 100644 --- a/clouddo-common/pom.xml +++ b/clouddo-common/pom.xml @@ -95,15 +95,15 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - - + + + + + + + + + -- Gitee From 0fec9fe3d77ec326d9ad667b5ac80e23306d1a01 Mon Sep 17 00:00:00 2001 From: lcg0124 <7G9v8384> Date: Mon, 23 Jul 2018 11:50:21 +0800 Subject: [PATCH 32/36] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clouddocommon/ClouddoCommonApplication.java | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 clouddo-common/src/main/java/com/bootdo/clouddocommon/ClouddoCommonApplication.java diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/ClouddoCommonApplication.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/ClouddoCommonApplication.java deleted file mode 100644 index c03e2d7..0000000 --- a/clouddo-common/src/main/java/com/bootdo/clouddocommon/ClouddoCommonApplication.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.bootdo.clouddocommon; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class ClouddoCommonApplication { - - public static void main(String[] args) { - SpringApplication.run(ClouddoCommonApplication.class, args); - } - - -} -- Gitee From d655df5296ccd9ba5f7eb74eedfb266e59cf4d6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=98=A5=E5=85=89?= <1992lcg@163.com> Date: Tue, 24 Jul 2018 13:41:02 +0800 Subject: [PATCH 33/36] =?UTF-8?q?=E5=BC=82=E6=AD=A5=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bootdo/clouddocommon/config/AsyncConfig.java | 9 +++++++++ .../com/bootdo/clouddocommon/service/LogRpcService.java | 2 ++ 2 files changed, 11 insertions(+) create mode 100644 clouddo-common/src/main/java/com/bootdo/clouddocommon/config/AsyncConfig.java diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/config/AsyncConfig.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/config/AsyncConfig.java new file mode 100644 index 0000000..13c07ba --- /dev/null +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/config/AsyncConfig.java @@ -0,0 +1,9 @@ +package com.bootdo.clouddocommon.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.EnableAsync; + +@Configuration +@EnableAsync +public class AsyncConfig { +} diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/service/LogRpcService.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/service/LogRpcService.java index 5dd51b4..e351e74 100644 --- a/clouddo-common/src/main/java/com/bootdo/clouddocommon/service/LogRpcService.java +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/service/LogRpcService.java @@ -5,11 +5,13 @@ import com.bootdo.clouddocommon.intercepter.FeignIntercepter; import com.bootdo.clouddocommon.utils.R; import feign.Headers; import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.scheduling.annotation.Async; import org.springframework.web.bind.annotation.PostMapping; @Headers("Content-Type:application/json") @FeignClient(name = "api-base", configuration = FeignIntercepter.class) public interface LogRpcService { + @Async @PostMapping("log/save") R save(LogDO logDO); } -- Gitee From 43ba6bb415725aa00a36c6c5eec37b511310d6e0 Mon Sep 17 00:00:00 2001 From: lcg0124 <1992lcg@163.com> Date: Thu, 26 Jul 2018 12:07:03 +0800 Subject: [PATCH 34/36] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 27b926a..2ee10d0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ### 项目介绍 - clouddo是基于springcloud和vue微服务，前端分离的后台管理框架，可以作为springcloud和vue的入门学习框架，亦可以作为一个基础脚手架进行二次开发 + clouddo是基于springcloud和vue微服务，前后端分离的后台管理框架，可以作为springcloud和vue的入门学习框架，亦可以作为一个基础脚手架进行二次开发 ### 使用说明 -- Gitee From 79dc1dea00222b5123e0d247084d6e6b8f00a9f5 Mon Sep 17 00:00:00 2001 From: xiaoming Date: Thu, 20 Sep 2018 19:51:17 +0800 Subject: [PATCH 35/36] =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=8D=87=E7=BA=A7=20sp?= =?UTF-8?q?ringboot=E7=BB=9F=E4=B8=80=E5=8D=87=E8=87=B32.0.4.RELEASE?= =?UTF-8?q?=E7=89=88=E6=9C=AC=EF=BC=8Cspringcloud=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=8D=87=E8=87=B3Finchley.SR1=E7=89=88=E6=9C=AC=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=90=E4=BA=9B=E4=BB=8Espringboot1.0?= =?UTF-8?q?=E5=8D=87=E8=87=B32.0=20jar=E5=BC=95=E7=94=A8=E5=8F=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=8C=85=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=8C=E4=BB=A5=E5=8F=8Ayml=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E6=9F=90=E4=BA=9B=E9=85=8D=E7=BD=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clouddo-admin/pom.xml | 6 +++--- .../clouddoadmin/ClouddoAdminApplication.java | 2 +- .../java/com/bootdo/clouddoadmin/rpc/TestRpc.java | 6 +----- clouddo-admin/src/main/resources/application.yml | 10 +++++----- clouddo-base/pom.xml | 6 +++--- clouddo-cms/pom.xml | 4 ++-- clouddo-common/pom.xml | 8 ++++---- .../clouddocommon/service/LogRpcService.java | 2 +- .../clouddocommon/utils/HttpServletUtils.java | 2 -- clouddo-server/pom.xml | 6 +++--- clouddo-zuul/pom.xml | 14 +++++++------- .../bootdo/clouddozuul/ClouddoZuulApplication.java | 3 +-- .../bootdo/clouddozuul/prc/admin/MenuService.java | 2 +- 13 files changed, 32 insertions(+), 39 deletions(-) diff --git a/clouddo-admin/pom.xml b/clouddo-admin/pom.xml index 3f5f6bf..823d693 100644 --- a/clouddo-admin/pom.xml +++ b/clouddo-admin/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.9.RELEASE + 2.0.4.RELEASE @@ -22,14 +22,14 @@ UTF-8 UTF-8 1.8 - Edgware.RELEASE + Finchley.SR1 1.1.0.Final org.springframework.cloud - spring-cloud-starter-eureka-server + spring-cloud-starter-netflix-eureka-server diff --git a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/ClouddoAdminApplication.java b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/ClouddoAdminApplication.java index 649536f..3a278f0 100644 --- a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/ClouddoAdminApplication.java +++ b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/ClouddoAdminApplication.java @@ -3,7 +3,7 @@ package com.bootdo.clouddoadmin; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; -import org.springframework.cloud.netflix.feign.EnableFeignClients; +import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.scheduling.annotation.EnableScheduling; @EnableFeignClients(basePackages = {"com.bootdo"}) diff --git a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/rpc/TestRpc.java b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/rpc/TestRpc.java index c1e4d8c..092808e 100644 --- a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/rpc/TestRpc.java +++ b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/rpc/TestRpc.java @@ -1,13 +1,9 @@ package com.bootdo.clouddoadmin.rpc; -import com.bootdo.clouddocommon.dto.MenuDTO; import com.bootdo.clouddocommon.intercepter.FeignIntercepter; -import feign.Headers; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; -import java.util.List; - @FeignClient(name = "course", configuration = FeignIntercepter.class) public interface TestRpc { @GetMapping("/test/testRpc/test") diff --git a/clouddo-admin/src/main/resources/application.yml b/clouddo-admin/src/main/resources/application.yml index b341fd1..f5b1ce1 100644 --- a/clouddo-admin/src/main/resources/application.yml +++ b/clouddo-admin/src/main/resources/application.yml @@ -2,9 +2,9 @@ eureka: client: serviceUrl: defaultZone: http://localhost:8001/eureka/ -security: - basic: - enabled: false +#security: +# basic: +# enabled: false server: port: 8005 spring: @@ -21,5 +21,5 @@ mybatis: mapper-locations: mapper/**Mapper.xml configuration: map-underscore-to-camel-case: true -logging: - level: debug \ No newline at end of file +#logging: +# level: debug \ No newline at end of file diff --git a/clouddo-base/pom.xml b/clouddo-base/pom.xml index 592de6a..6990c63 100644 --- a/clouddo-base/pom.xml +++ b/clouddo-base/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.9.RELEASE + 2.0.4.RELEASE @@ -22,13 +22,13 @@ UTF-8 UTF-8 1.8 - Edgware.RELEASE + Finchley.SR1 org.springframework.cloud - spring-cloud-starter-eureka-server + spring-cloud-starter-netflix-eureka-server diff --git a/clouddo-cms/pom.xml b/clouddo-cms/pom.xml index 59663cd..593a6e5 100644 --- a/clouddo-cms/pom.xml +++ b/clouddo-cms/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.0.RELEASE + 2.0.4.RELEASE @@ -22,7 +22,7 @@ UTF-8 UTF-8 1.8 - Finchley.M8 + Finchley.SR1 diff --git a/clouddo-common/pom.xml b/clouddo-common/pom.xml index e012085..ec6e2cc 100644 --- a/clouddo-common/pom.xml +++ b/clouddo-common/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.9.RELEASE + 2.0.4.RELEASE @@ -22,7 +22,7 @@ UTF-8 UTF-8 1.8 - Edgware.RELEASE + Finchley.SR1 1.2.0.Final @@ -34,7 +34,7 @@ org.springframework.cloud - spring-cloud-starter-feign + spring-cloud-starter-openfeign @@ -73,7 +73,7 @@ org.apache.commons commons-lang3 - RELEASE + 3.7 com.alibaba diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/service/LogRpcService.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/service/LogRpcService.java index e351e74..b8ca8f8 100644 --- a/clouddo-common/src/main/java/com/bootdo/clouddocommon/service/LogRpcService.java +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/service/LogRpcService.java @@ -4,7 +4,7 @@ import com.bootdo.clouddocommon.dto.LogDO; import com.bootdo.clouddocommon.intercepter.FeignIntercepter; import com.bootdo.clouddocommon.utils.R; import feign.Headers; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.scheduling.annotation.Async; import org.springframework.web.bind.annotation.PostMapping; diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/HttpServletUtils.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/HttpServletUtils.java index 4c8800f..22132ce 100644 --- a/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/HttpServletUtils.java +++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/HttpServletUtils.java @@ -1,7 +1,5 @@ package com.bootdo.clouddocommon.utils; -import org.apache.commons.lang.StringUtils; - import javax.servlet.http.HttpServletRequest; public class HttpServletUtils { diff --git a/clouddo-server/pom.xml b/clouddo-server/pom.xml index e72cf00..a590071 100644 --- a/clouddo-server/pom.xml +++ b/clouddo-server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.9.RELEASE + 2.0.4.RELEASE @@ -22,13 +22,13 @@ UTF-8 UTF-8 1.8 - Edgware.RELEASE + Finchley.SR1 org.springframework.cloud - spring-cloud-starter-eureka-server + spring-cloud-starter-netflix-eureka-server diff --git a/clouddo-zuul/pom.xml b/clouddo-zuul/pom.xml index 782e980..15f25a5 100644 --- a/clouddo-zuul/pom.xml +++ b/clouddo-zuul/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.10.RELEASE + 2.0.4.RELEASE @@ -22,22 +22,22 @@ UTF-8 UTF-8 1.8 - Edgware.RELEASE + Finchley.SR1 org.springframework.cloud - spring-cloud-starter-eureka-server + spring-cloud-starter-netflix-eureka-server org.springframework.cloud - spring-cloud-starter-zuul + spring-cloud-starter-netflix-zuul org.springframework.cloud - spring-cloud-starter-feign + spring-cloud-starter-openfeign @@ -59,12 +59,12 @@ org.springframework.cloud - spring-cloud-starter-ribbon + spring-cloud-starter-netflix-ribbon org.springframework.cloud - spring-cloud-starter-hystrix + spring-cloud-starter-netflix-hystrix diff --git a/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/ClouddoZuulApplication.java b/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/ClouddoZuulApplication.java index de6267a..9fb8901 100644 --- a/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/ClouddoZuulApplication.java +++ b/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/ClouddoZuulApplication.java @@ -4,10 +4,9 @@ import com.bootdo.clouddozuul.filter.AccessFilter; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.netflix.eureka.EnableEurekaClient; -import org.springframework.cloud.netflix.feign.EnableFeignClients; import org.springframework.cloud.netflix.zuul.EnableZuulProxy; +import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; diff --git a/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/prc/admin/MenuService.java b/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/prc/admin/MenuService.java index f015ace..9937ca4 100644 --- a/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/prc/admin/MenuService.java +++ b/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/prc/admin/MenuService.java @@ -3,7 +3,7 @@ package com.bootdo.clouddozuul.prc.admin; import com.bootdo.clouddocommon.dto.MenuDTO; import com.bootdo.clouddocommon.intercepter.FeignIntercepter; import feign.Headers; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import java.util.List; -- Gitee From cf2083fe3b9739c63fcfe70d94ca7f7a700f7033 Mon Sep 17 00:00:00 2001 From: xiaoming Date: Fri, 21 Sep 2018 16:38:22 +0800 Subject: [PATCH 36/36] =?UTF-8?q?=E8=A7=A3=E5=86=B3springboot=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E8=87=B32.x=E5=AF=BC=E8=87=B4=E5=89=8D=E5=8F=B0?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=87=BA=E7=8E=B0401=E9=94=99=E8=AF=AFBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bootdo/clouddoadmin/ClouddoAdminApplication.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/ClouddoAdminApplication.java b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/ClouddoAdminApplication.java index 3a278f0..997615e 100644 --- a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/ClouddoAdminApplication.java +++ b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/ClouddoAdminApplication.java @@ -1,7 +1,9 @@ package com.bootdo.clouddoadmin; import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; import org.springframework.cache.annotation.EnableCaching; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.scheduling.annotation.EnableScheduling; @@ -10,6 +12,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; @EnableCaching @EnableScheduling @SpringBootApplication(scanBasePackages = {"com.bootdo.clouddoadmin", "com.bootdo.clouddocommon"}) +@EnableAutoConfiguration(exclude = {SecurityAutoConfiguration.class}) public class ClouddoAdminApplication { public static void main(String[] args) { -- Gitee