diff --git a/README.md b/README.md
index 5d69373..bd5af3d 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
Jeecg-Boot 快速开发平台(前后端分离版本)
===============
-当前最新版本： 1.1（发布日期：20190415）
+当前最新版本： 2.0.0（发布日期：20190520）
项目介绍：
-----------------------------------
@@ -52,11 +52,11 @@ Jeecg-Boot快速开发平台，可以应用在任何J2EE项目的开发中，尤
-----------------------------------
#### 后端
-- 基础框架：Spring Boot 2.0.3.RELEASE
+- 基础框架：Spring Boot 2.1.3.RELEASE
- 持久层框架：Mybatis-plus_3.0.6
-- 安全框架：Apache Shiro 1.4.0-RC2，Jwt_3.4.1
+- 安全框架：Apache Shiro 1.4.0，Jwt_3.7.0
- 数据库连接池：阿里巴巴Druid 1.1.10
@@ -89,7 +89,7 @@ Jeecg-Boot快速开发平台，可以应用在任何J2EE项目的开发中，尤
- 依赖管理：Maven
-- 数据库：MySQL5.0 & Oracle 11g
+- 数据库：MySQL5.0 & Oracle 11g & Sqlserver2005
- 缓存：Redis
@@ -120,6 +120,7 @@ Jeecg-Boot快速开发平台，可以应用在任何J2EE项目的开发中，尤
│ ├─角色管理
│ ├─菜单管理
│ ├─权限设置（支持按钮权限、数据权限）
+│ ├─表单权限（控制字段禁用、隐藏）
│ ├─部门管理
│ └─字典管理
├─智能化功能
@@ -130,11 +131,11 @@ Jeecg-Boot快速开发平台，可以应用在任何J2EE项目的开发中，尤
│ ├─高级查询器（弹窗自动组合查询条件）
│ ├─Excel导入导出工具集成（支持单表，一对多 导入导出）
│ ├─平台移动自适应支持
-├─Online在线开发
-│ ├─Online在线表单(暂未开源)
-│ ├─Online在线图表(暂未开源)
+├─Online在线开发(暂未开源)
+│ ├─Online在线表单
+│ ├─Online在线图表
+│ ├─Online图表模板配置
│ ├─Online在线报表
-│ ├─消息中心（支持短信、邮件、微信推送等等）
├─系统监控
│ ├─性能扫描监控
│ │ ├─监控 Redis
@@ -142,9 +143,11 @@ Jeecg-Boot快速开发平台，可以应用在任何J2EE项目的开发中，尤
│ │ ├─jvm
│ │ ├─服务器信息
│ │ ├─请求追踪
+│ │ ├─磁盘监控
│ ├─定时任务
│ ├─系统日志
-│ ├─数据日志（记录数据变更情况，可进行版本对比查看数据变更记录）
+│ ├─消息中心（支持短信、邮件、微信推送等等）
+│ ├─数据日志（记录数据快照，可对比快照，查看数据变更情况）
│ ├─系统通知
│ ├─SQL监控
│ ├─swagger-ui(在线接口文档)
@@ -166,9 +169,14 @@ Jeecg-Boot快速开发平台，可以应用在任何J2EE项目的开发中，尤
│ └─一对多TAB例子
│ └─内嵌table例子
│ └─常用选择组件
-│ └─一对多JEditable
+│ └─异步树table
│ └─接口模拟测试
│ └─一对多JEditable
+│ └─图片拖拽排序
+│ └─图片翻页
+│ └─图片预览
+│ └─PDF预览
+│ └─分屏功能
│─封装通用组件
│ ├─行编辑表格JEditableTable
│ └─省略显示组件
@@ -177,7 +185,15 @@ Jeecg-Boot快速开发平台，可以应用在任何J2EE项目的开发中，尤
│ └─通用选择用户组件
│ └─通过组织机构选择用户组件
│ └─报表组件封装
-│ └─等等组件
+│ └─字典组件
+│ └─下拉多选组件
+│ └─选人组件
+│ └─选部门组件
+│ └─通过部门选人组件
+│ └─封装曲线、柱状图、饼状图、折线图等等报表的组件（经过封装，使用简单）
+│ └─在线code编辑器
+│ └─上传文件组件
+│ └─等等
│─更多页面模板
│ ├─各种高级表单
│ ├─各种列表效果
@@ -242,7 +258,7 @@ Jeecg-Boot快速开发平台，可以应用在任何J2EE项目的开发中，尤
- jdk8
- mysql
- redis
-- 数据库脚步：jeecg-boot\docs\jeecg-boot_1.1.0-20190415.sql
+- 数据库脚步：jeecg-boot\docs\jeecg-boot-mysql.sql
- 默认登录账号： admin/123456
diff --git a/V2.0 版本升级日志.txt b/V2.0 版本升级日志.txt
new file mode 100644
index 0000000..422d496
--- /dev/null
+++ b/V2.0 版本升级日志.txt
@@ -0,0 +1,82 @@
+�汾������־
+
+1.java��Ŀ�ṹ�ع�������maven��ģ��module����
+2.���ݿ����ר����칤����֧��mysql��oracle��SqlServer�ṩ�˶�Ӧ�ű�
+3.����Ȩ��ʵ�֣��ɿ����ֶ����ء��ֶν��ã�
+4.����Ȩ�����ƣ�ʵ����֯�����Զ�ע�������û�ӵ�жಿ�Ų���ѡ���ŵ�¼���� �ȵȣ�
+5.���Ƽ�ǿ�б༭����ؼ� JEditableTable
+6.���Ƶ���������������shiroȨ���ƣ������ȡ������¼������
+7.��װJTreeTable������첽�������б�
+8.���ƴ�ӡ�����֧��canvas��������Ӧ��ӡ
+9.��½������֤��
+10.��װ��ͨ������û�ѡ��ؼ�������ѡ�������ѡ����û����������
+11.��Ϣģ��֧�ָ��ı��༭��
+12.���Ӳ˵�Ĭ��·�����ͣ����ܲ����ݹ��ܵ�bug��
+13.�ֵ��ǩ֧��disabled���ԡ�֧��radio����
+14.���ҳ���ع�
+15.�������̼�ع���
+16.��������pdfԤ������
+17.������������
+18.����û����������ϴ�ͼƬ����ͼƬ������
+19.����������ģ�幦�����ƣ���ע���Զ�����swaagerUI�ӿ��ĵ�
+20.����boostrap���swaggerUI�����ĵ�
+21.�ع����߶�ʱ����,����bug���
+22.springboot�汾����2.1.3
+23.�ع���ȡ�û��˵���Ȩ������ͨ��token��ȡ���ӿڸ���ȫ
+24.online���뵼����һ�Զࣩ����
+25.��ע�Ͳ��淶��
+26.����autopoi�汾�������������·������
+27.�����ҵIJ��Ź�������
+28.��ҳ�˵��Ż���֧�ֵ����������Ϸ��˵�ģʽ֧��IE
+29.ͼƬԤ�����
+30.ͼƬ��ҳ����
+31.ͼƬ��ק����ʾ��
+32.����������ַ�װ��ʾ������
+33.��ѡcheckbox�����װ
+34.�ṩ���ݿ��չ��ܣ���¼����ÿ�α������
+35.ͼ�α�����װ������ƣ��ṩ��Ӧ��ʾ�����ĵ�
+36.��װJCodeEditor��������߱���༭��
+37.��װ������ѡ���
+
+Issues����嵥��
+
+https://github.com/zhangdaiscott/jeecg-boot/issues/104
+https://github.com/zhangdaiscott/jeecg-boot/issues/97
+https://github.com/zhangdaiscott/jeecg-boot/issues/90
+https://github.com/zhangdaiscott/jeecg-boot/issues/89
+https://github.com/zhangdaiscott/jeecg-boot/issues/87
+https://github.com/zhangdaiscott/jeecg-boot/issues/82
+https://github.com/zhangdaiscott/jeecg-boot/issues/81
+https://github.com/zhangdaiscott/jeecg-boot/issues/79
+https://github.com/zhangdaiscott/jeecg-boot/issues/77
+https://github.com/zhangdaiscott/jeecg-boot/issues/73
+https://github.com/zhangdaiscott/jeecg-boot/issues/70
+https://github.com/zhangdaiscott/jeecg-boot/issues/65
+https://github.com/zhangdaiscott/jeecg-boot/issues/61
+https://github.com/zhangdaiscott/jeecg-boot/issues/38
+
+
+
+
+v1.1������v2.0 ��������������
+
+ 1. ����js����
+ src/mixins/JEditableTableOneToManyMixin.js --rename--> JEditableTableMixin.js
+ �ķ����� ȫ������JEditableTableOneToManyMixin�滻ΪJEditableTableMixin
+
+
+ 2.excel������
+ ��Ҫ����headers��������Ϊ���뵼��������shiro����
+ ��<a-upload ��ǩ���� :headers="tokenHeader"
+ 3.excel����������Ҫ�ƶ������ļ�����
+ handleExportXls('����excel����')
+
+ 4. ��ʽ��ͻ����
+ ȫ������ant-layout-contentɾ������һ�δ���
+
+ .ant-layout-content {
+ margin: 12px 16px 0 !important;
+ }
+
+ 5.����ҳ����ʽû��scoped�ļ���
+ <style scoped>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/.eslintignore b/ant-design-jeecg-vue/.eslintignore
new file mode 100644
index 0000000..dbc8690
--- /dev/null
+++ b/ant-design-jeecg-vue/.eslintignore
@@ -0,0 +1 @@
+/src
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/LICENSE b/ant-design-jeecg-vue/LICENSE
index 03c5fe3..22a76de 100644
--- a/ant-design-jeecg-vue/LICENSE
+++ b/ant-design-jeecg-vue/LICENSE
@@ -1,6 +1,6 @@
MIT License
-Copyright (c) 2019 jeecg-boot
+Copyright (c) 2019 DaiHao Zhang
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/ant-design-jeecg-vue/README.md b/ant-design-jeecg-vue/README.md
index 4401249..d1cd3b2 100644
--- a/ant-design-jeecg-vue/README.md
+++ b/ant-design-jeecg-vue/README.md
@@ -1,7 +1,7 @@
Ant Design Jeecg Vue
====
-当前最新版本： 1.1.0（发布日期：20190415）
+当前最新版本： 2.0.0（发布日期：20190518）
Overview
----
diff --git a/ant-design-jeecg-vue/package.json b/ant-design-jeecg-vue/package.json
index 3ea0328..26e9452 100644
--- a/ant-design-jeecg-vue/package.json
+++ b/ant-design-jeecg-vue/package.json
@@ -1,6 +1,6 @@
{
"name": "vue-antd-jeecg",
- "version": "1.1.0",
+ "version": "2.0.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve --open",
@@ -15,6 +15,8 @@
"ant-design-vue": "^1.3.1",
"apexcharts": "^3.6.5",
"axios": "^0.18.0",
+ "clipboard": "^2.0.4",
+ "codemirror": "^5.46.0",
"dayjs": "^1.8.0",
"enquire.js": "^2.1.6",
"js-cookie": "^2.2.0",
@@ -29,10 +31,14 @@
"vue-class-component": "^6.0.0",
"vue-cropper": "^0.4.8",
"vue-i18n": "^8.7.0",
+ "vue-loader": "^15.7.0",
"vue-ls": "^3.2.0",
- "vue-print-nb-jeecg": "^1.0.5",
+ "vue-photo-preview": "^1.1.3",
+ "vue-print-nb-jeecg": "^1.0.7",
"vue-property-decorator": "^7.3.0",
"vue-router": "^3.0.1",
+ "vue-splitpane": "^1.0.4",
+ "vuedraggable": "^2.20.0",
"vuex": "^3.0.1",
"vuex-class": "^0.3.1"
},
diff --git a/ant-design-jeecg-vue/public/index.html b/ant-design-jeecg-vue/public/index.html
index 9b938e5..581cbae 100644
--- a/ant-design-jeecg-vue/public/index.html
+++ b/ant-design-jeecg-vue/public/index.html
@@ -224,6 +224,7 @@
window._CONFIG = {};
window._CONFIG['domianURL'] = 'http://localhost:8080/jeecg-boot';
window._CONFIG['imgDomainURL'] = 'http://localhost:8080/jeecg-boot/sys/common/view';
+ window._CONFIG['pdfDomainURL'] = 'http://localhost:8080/jeecg-boot/sys/common/pdf/pdfPreviewIframe';
</script>
</head>
diff --git a/ant-design-jeecg-vue/src/api/api.js b/ant-design-jeecg-vue/src/api/api.js
index 5306ff0..c26eca9 100644
--- a/ant-design-jeecg-vue/src/api/api.js
+++ b/ant-design-jeecg-vue/src/api/api.js
@@ -5,7 +5,6 @@ import { getAction,deleteAction,putAction,postAction} from '@/api/manage'
////图片预览请求地址
// const imgView = "http://localhost:8080/jeecg-boot/sys/common/view/";
-
//角色管理
const addRole = (params)=>postAction("/sys/role/add",params);
const editRole = (params)=>putAction("/sys/role/edit",params);
@@ -39,7 +38,8 @@ const queryTreeListForRole = (params)=>getAction("/sys/role/queryTreeList",param
const queryListAsync = (params)=>getAction("/sys/permission/queryListAsync",params);
const queryRolePermission = (params)=>getAction("/sys/permission/queryRolePermission",params);
const saveRolePermission = (params)=>postAction("/sys/permission/saveRolePermission",params);
-const queryPermissionsByUser = (params)=>getAction("/sys/permission/queryByUser",params);
+//const queryPermissionsByUser = (params)=>getAction("/sys/permission/queryByUser",params);
+const queryPermissionsByUser = (params)=>getAction("/sys/permission/getUserPermissionByToken",params);
const loadAllRoleIds = (params)=>getAction("/sys/permission/loadAllRoleIds",params);
const getPermissionRuleList = (params)=>getAction("/sys/permission/getPermRuleListByPermId",params);
const queryPermissionRule = (params)=>getAction("/sys/permission/queryPermissionRule",params);
@@ -130,7 +130,7 @@ export {
queryUserByDepId,
queryUserRoleMap,
duplicateCheck,
- queryTreeListForRole
+ queryTreeListForRole,
}
diff --git a/ant-design-jeecg-vue/src/assets/less/common.css b/ant-design-jeecg-vue/src/assets/less/common.less
index 717295a..62f28a8 100644
--- a/ant-design-jeecg-vue/src/assets/less/common.css
+++ b/ant-design-jeecg-vue/src/assets/less/common.less
@@ -1,9 +1,12 @@
-/*列表上方操作按钮*/
+/*列表上方操作按钮区域*/
.ant-card-body .table-operator {
margin-bottom: 18px;
}
-
+/** Button按钮间距 */
+.table-operator .ant-btn {
+ margin-right: 6px
+}
/*列表td的padding设置 可以控制列表大小*/
.ant-table-tbody .ant-table-row td {
padding-top: 15px;
@@ -26,4 +29,14 @@
height: 90% !important;
overflow-y: hidden
}
-
+/*列表中有图片的加这个样式 参考用户管理*/
+.anty-img-wrap {
+ height: 25px;
+ position: relative;
+}
+.anty-img-wrap > img {
+ max-height: 100%;
+}
+/*列表中范围查询样式*/
+.query-group-cust{width: calc(50% - 10px)}
+.query-group-split-cust:before{content:"~";width: 20px;display: inline-block;text-align: center}
diff --git a/ant-design-jeecg-vue/src/assets/pdf4.jpg b/ant-design-jeecg-vue/src/assets/pdf4.jpg
new file mode 100644
index 0000000..10166e0
--- /dev/null
+++ b/ant-design-jeecg-vue/src/assets/pdf4.jpg
diff --git a/ant-design-jeecg-vue/src/components/bpm/DynamicComponent.vue b/ant-design-jeecg-vue/src/components/bpm/DynamicComponent.vue
new file mode 100644
index 0000000..99f80e4
--- /dev/null
+++ b/ant-design-jeecg-vue/src/components/bpm/DynamicComponent.vue
@@ -0,0 +1,35 @@
+
+<template>
+ <component ref="compModel" :is="comp" :formData="formData" v-if="comp" @ok="callBackOk" @close="callBackClose"></component>
+</template>
+<script>
+ export default {
+ name: 'DynamicComponent',
+ data () {
+ return {
+ compName: this.path
+ }
+ },
+ computed: {
+ comp: function () {
+ return () => import(`@/views/${this.compName}.vue`)
+ }
+ },
+ props: ['path','formData'],
+ methods: {
+ add () {
+ this.$refs.compModel.add();
+ },
+ callBackClose () {
+ this.$emit('close');
+ },
+ handleOk () {
+ this.$refs.compModel.handleOk();
+ },
+ callBackOk(){
+ this.$emit('ok');
+ this.close();
+ },
+ }
+ }
+</script>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/bpm/FormCommonModal.vue b/ant-design-jeecg-vue/src/components/bpm/FormCommonModal.vue
new file mode 100644
index 0000000..91bb19e
--- /dev/null
+++ b/ant-design-jeecg-vue/src/components/bpm/FormCommonModal.vue
@@ -0,0 +1,72 @@
+<template>
+ <a-modal
+ :title="title"
+ :width="width"
+ :visible="visible"
+ :confirmLoading="confirmLoading"
+ @ok="handleOk"
+ @cancel="handleCancel"
+ destroyOnClose
+ cancelText="关闭">
+ <a-spin :spinning="confirmLoading">
+ <dynamic-component ref="dynamiclink" :path="path" :formData="formData" @ok="callBackOk" @close="callBackClose"></dynamic-component>
+ </a-spin>
+ </a-modal>
+</template>
+
+<script>
+
+ import DynamicComponent from "./DynamicComponent";
+
+ export default {
+ name: "FormCommonModal",
+ props: ['path'],
+ components: {
+ DynamicComponent
+ },
+ data () {
+ return {
+ title:"操作",
+ width:"80%",
+ visible: false,
+ confirmLoading: false,
+ formData:{},
+ }
+ },
+ created () {
+ },
+ methods: {
+ add () {
+ this.formData =[];
+ this.title = "新增";
+ this.visible = true;
+ this.$refs.dynamiclink.add();
+ },
+ edit (record) {
+ var data = {
+ dataId:record.id,
+ }
+ this.formData = data;
+ this.visible = true;
+ },
+ callBackClose () {
+ this.$emit('close');
+ this.visible = false;
+ },
+ handleOk () {
+ this.$refs.dynamiclink.handleOk();
+ },
+ callBackOk(){
+ this.$emit('ok');
+ this.callBackClose();
+ },
+ handleCancel () {
+ this.callBackClose()
+ },
+ }
+ }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/bpm/ProcNodeInfoModel.vue b/ant-design-jeecg-vue/src/components/bpm/ProcNodeInfoModel.vue
new file mode 100644
index 0000000..2094ac7
--- /dev/null
+++ b/ant-design-jeecg-vue/src/components/bpm/ProcNodeInfoModel.vue
@@ -0,0 +1,120 @@
+<template>
+ <a-modal
+ :title="title"
+ :width="280"
+ :visible="visible"
+ :confirmLoading="confirmLoading"
+ :bodyStyle ="bodyStyle"
+ :mask = "false"
+ destroyOnClose
+ :footer="null"
+ @cancel="handleCancel"
+ cancelText="关闭">
+
+ <a-spin :spinning="confirmLoading">
+ <div style="height: 300px;overflow: hidden;overflow-y: auto;overflow-x: auto;">
+ <template v-for="(item, key, index) in nodeInfos">
+ <table class="gridtable">
+ <tbody>
+ <tr>
+ <th width="90">任务名称</th>
+ <td width="150">{{ item.taskName}}</td>
+ </tr>
+ <tr>
+ <th width="90">执行人</th>
+ <td width="150">{{ item.taskAssigneeId}}</td>
+ </tr>
+ <tr>
+ <th width="90">开始时间</th>
+ <td width="150">{{ item.taskBeginTime }}</td>
+ </tr>
+ <tr>
+ <th width="90">结束时间</th>
+ <td width="150">{{ item.taskEndTime }}</td>
+ </tr>
+ <tr>
+ <th width="90">耗时</th>
+ <td width="150">{{ item.durationStr }}</td>
+ </tr>
+ <tr>
+ <th width="90">意见</th>
+ <td width="150">{{ item.remarks }}</td>
+ </tr>
+ </tbody>
+ </table>
+ </template>
+ </div>
+ </a-spin>
+ </a-modal>
+</template>
+
+<script>
+ import { httpAction } from '@/api/manage'
+ import pick from 'lodash.pick'
+
+ export default {
+ name: "ProcNodeInfoModel",
+ data () {
+ return {
+ title:"任务审批详情",
+ visible: false,
+ bodyStyle:{
+ padding: "0",
+ },
+ confirmLoading: false,
+ validatorRules:{
+ },
+ nodeInfos:[],
+ }
+ },
+ created () {
+ },
+ methods: {
+ showInfo(record,taskId) {
+ this.nodeInfos = [];
+ for (var item of record) {
+ if(item.taskId == taskId){
+ this.nodeInfos.push(item);
+ }
+ }
+ this.visible = true;
+ },
+ close() {
+ this.nodeInfos = [];
+ this.visible = false;
+ },
+ handleCancel () {
+ this.nodeInfos = [];
+ this.visible = false;
+ },
+
+ }
+ }
+</script>
+
+<style scoped>
+ table.gridtable {
+ margin: 0 auto;
+ margin-top: 10px;
+ font-family: verdana,arial,sans-serif;
+ font-size:12px;
+ color:#333333;
+ border-width: 1px;
+ border-color: #ddd;
+ border-collapse: collapse;
+ }
+ table.gridtable th {
+ border-width: 1px;
+ padding: 8px;
+ border-style: solid;
+ border-color: #ddd;
+ background-color: #eee;
+ }
+ table.gridtable td {
+ border-width: 1px;
+ padding: 8px;
+ border-style: solid;
+ border-color: #ddd;
+ background-color: #ffffff;
+ }
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/bpm/ProcessInstPicModal.vue b/ant-design-jeecg-vue/src/components/bpm/ProcessInstPicModal.vue
new file mode 100644
index 0000000..3cada19
--- /dev/null
+++ b/ant-design-jeecg-vue/src/components/bpm/ProcessInstPicModal.vue
@@ -0,0 +1,136 @@
+<template>
+ <a-modal
+ :title="title"
+ :width="900"
+ :visible="visible"
+ :confirmLoading="confirmLoading"
+ @cancel="handleCancel"
+ :bodyStyle="bodyStyle"
+ style="top: 50px;"
+ destroyOnClose
+ :footer="null"
+ cancelText="关闭">
+
+ <a-spin :spinning="confirmLoading">
+ <img :src="picUrl" alt="流程图" usemap="#planetmap"/>
+ <map name="planetmap">
+ <template v-for="(item, key, index) in nodePositionInfo.positionList">
+ <area shape="rect" :coords="item.coords" title="Venus" @mouseover="showNodeInfo(nodePositionInfo.hisTasks,item.id)">
+ </template>
+ </map>
+ </a-spin>
+ <proc-node-info-model ref="nodeInfoModel"></proc-node-info-model>
+ </a-modal>
+</template>
+
+<script>
+ import { getAction } from '@/api/manage'
+ import qs from 'qs';
+ import ProcNodeInfoModel from "./ProcNodeInfoModel.vue";
+
+ export default {
+ components: {ProcNodeInfoModel},
+ name: "ProcessInstPicModal",
+ data () {
+ return {
+ title:"操作",
+ visible: false,
+ nodePositionInfo:{},
+ model: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+ bodyStyle:{
+ "overflow-y":"auto",
+ "overflow-x":"auto",
+ height:(window.innerHeight-280)+"px",
+ },
+ confirmLoading: false,
+ picUrl:"",
+ url: {
+ getProcessInfo: "/process/extActFlowData/getProcessInfo",
+ getNodePositionInfo:"/act/task/getNodePositionInfo",
+ },
+ }
+ },
+ created () {
+ },
+ methods: {
+ preview(flowCode,dataId){
+ this.visible = true;
+ var params = {
+ flowCode:flowCode,
+ dataId:dataId
+ };//查询条件
+ this.confirmLoading = true;
+ getAction(this.url.getProcessInfo,params).then((res)=>{
+ if(res.success){
+ var processInstanceId = res.result.processInstanceId;
+ this.picUrl = this.getResourceURL(processInstanceId);
+ this.getNodePositionInfoData(processInstanceId);
+ console.log("---流程图----",this.picUrl)
+ }else{
+ this.$message.warning(res.message);
+ }
+ }).catch(e => {
+ console.error(e)
+ }).then(() => {
+ this.confirmLoading = false;
+ })
+
+
+ },
+ close () {
+ this.$emit('close');
+ this.visible = false;
+ },
+ handleCancel () {
+ this.close()
+ },
+ // 获取静态资源访问地址
+ getResourceURL(processInstanceId) {
+ var params = qs.stringify({
+ //'token': Cookies.get('token'),
+ '_t': Date.parse(new Date())/1000,
+ 'processInstanceId': processInstanceId
+ })
+ return `${window._CONFIG['domianURL']}/act/process/processPic?${params}`
+ },
+ // 获取静态资源访问地址
+ getResourceURL(processInstanceId) {
+ var params = qs.stringify({
+ //'token': Cookies.get('token'),
+ '_t': Date.parse(new Date())/1000,
+ 'processInstanceId': processInstanceId
+ })
+ return `${window._CONFIG['domianURL']}/act/process/processPic?${params}`
+ },
+
+ // 查询坐标信息数据
+ getNodePositionInfoData(processInstanceId) {
+ var params = {processInstanceId:processInstanceId};//查询条件
+ getAction(this.url.getNodePositionInfo,params).then(res => {
+ if (res.success) {
+ this.nodePositionInfo = res.result
+ }
+ }).catch(e => {
+ console.error(e)
+ }).then(() => {
+ })
+ },
+ showNodeInfo(data,taskId){
+ this.$refs.nodeInfoModel.close();
+ this.$refs.nodeInfoModel.showInfo(data,taskId);
+ },
+ }
+ }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/chart/AreaChartTy.vue b/ant-design-jeecg-vue/src/components/chart/AreaChartTy.vue
index ea1b42f..1d813eb 100644
--- a/ant-design-jeecg-vue/src/components/chart/AreaChartTy.vue
+++ b/ant-design-jeecg-vue/src/components/chart/AreaChartTy.vue
@@ -1,12 +1,12 @@
<template>
- <div :style="{ padding: '0 0 32px 32px' }">
+ <div :style="{ padding: '0' }">
<h4 :style="{ marginBottom: '20px' }">{{ title }}</h4>
<v-chart ref="chart" :forceFit="true" :height="height" :data="dataSource" :scale="scale">
- <v-tooltip/>
+ <v-tooltip :shared="false"/>
<v-axis/>
- <v-line position="x*y" :size="lineSize"/>
- <v-area position="x*y"/>
+ <v-line position="x*y" :size="lineSize" :color="lineColor"/>
+ <v-area position="x*y" :color="color"/>
</v-chart>
</div>
@@ -38,6 +38,16 @@
type: String,
default: 'y'
},
+ // Y轴最小值
+ min: {
+ type: Number,
+ default: 0
+ },
+ // Y轴最大值
+ max: {
+ type: Number,
+ default: null
+ },
// 图表高度
height: {
type: Number,
@@ -47,13 +57,23 @@
lineSize: {
type: Number,
default: 2
+ },
+ // 面积的颜色
+ color: {
+ type: String,
+ default: ''
+ },
+ // 线的颜色
+ lineColor: {
+ type: String,
+ default: ''
}
},
computed: {
scale() {
return [
{ dataKey: 'x', title: this.x, alias: this.x },
- { dataKey: 'y', title: this.y, alias: this.y }
+ { dataKey: 'y', title: this.y, alias: this.y, min: this.min, max: this.max }
]
}
},
diff --git a/ant-design-jeecg-vue/src/components/chart/Bar.vue b/ant-design-jeecg-vue/src/components/chart/Bar.vue
index 0b0f096..52832d4 100644
--- a/ant-design-jeecg-vue/src/components/chart/Bar.vue
+++ b/ant-design-jeecg-vue/src/components/chart/Bar.vue
@@ -1,7 +1,7 @@
<template>
<div :style="{ padding: '0 0 32px 32px' }">
<h4 :style="{ marginBottom: '20px' }">{{ title }}</h4>
- <v-chart :forceFit="true" :height="height" :data="dataSource" :padding="padding">
+ <v-chart :forceFit="true" :height="height" :data="dataSource" :scale="scale" :padding="padding">
<v-tooltip/>
<v-axis/>
<v-bar position="x*y"/>
@@ -19,6 +19,10 @@
type: Array,
required: true
},
+ yaxisText: {
+ type: String,
+ default: 'y'
+ },
title: {
type: String,
default: ''
@@ -31,6 +35,14 @@
data() {
return { padding: ['auto', 'auto', '40', '50'] }
},
+ computed: {
+ scale() {
+ return [{
+ dataKey: 'y',
+ alias: this.yaxisText
+ }]
+ }
+ },
mounted() {
triggerWindowResizeEvent()
}
diff --git a/ant-design-jeecg-vue/src/components/chart/BarAndLine.vue b/ant-design-jeecg-vue/src/components/chart/BarAndLine.vue
new file mode 100644
index 0000000..459b1e4
--- /dev/null
+++ b/ant-design-jeecg-vue/src/components/chart/BarAndLine.vue
@@ -0,0 +1,57 @@
+<template>
+ <div :style="{ padding: '0 0 32px 32px' }">
+ <h4 :style="{ marginBottom: '20px' }">{{ title }}</h4>
+ <v-chart :forceFit="true" :height="height" :data="data" :scale="scale">
+ <v-tooltip/>
+ <v-legend/>
+ <v-axis/>
+ <v-bar position="type*bar"/>
+ <v-line position="type*line" color="#2fc25b" :size="3"/>
+ </v-chart>
+ </div>
+</template>
+
+<script>
+
+ export default {
+ name: 'BarMultid',
+ props: {
+ title: {
+ type: String,
+ default: ''
+ },
+ dataSource: {
+ type: Array,
+ default: () => [
+ { type: '10:10', bar: 2, line: 2 },
+ { type: '10:15', bar: 6, line: 3 },
+ { type: '10:20', bar: 2, line: 5 },
+ { type: '10:25', bar: 9, line: 1 },
+ { type: '10:30', bar: 2, line: 3 },
+ { type: '10:35', bar: 2, line: 1 },
+ { type: '10:40', bar: 1, line: 2 }
+ ]
+ },
+ height: {
+ type: Number,
+ default: 400
+ }
+ },
+ data() {
+ return {
+ scale: [{
+ dataKey: 'bar',
+ min: 0
+ }, {
+ dataKey: 'line',
+ min: 0
+ }]
+ }
+ },
+ computed: {
+ data() {
+ return this.dataSource
+ }
+ }
+ }
+</script>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/chart/BarMultid.vue b/ant-design-jeecg-vue/src/components/chart/BarMultid.vue
index 1edfac3..ffc49c1 100644
--- a/ant-design-jeecg-vue/src/components/chart/BarMultid.vue
+++ b/ant-design-jeecg-vue/src/components/chart/BarMultid.vue
@@ -1,7 +1,7 @@
<template>
<div :style="{ padding: '0 0 32px 32px' }">
<h4 :style="{ marginBottom: '20px' }">{{ title }}</h4>
- <v-chart :forceFit="true" :height="height" :data="data" :padding="['auto', 'auto', '40', '50']">
+ <v-chart :forceFit="true" :height="height" :data="data">
<v-tooltip />
<v-axis />
<v-legend />
@@ -13,11 +13,6 @@
<script>
import { DataSet } from '@antv/data-set'
- const sourceDataConst = [
- { type: 'Jeecg', 'Jan.': 18.9, 'Feb.': 28.8, 'Mar.': 39.3, 'Apr.': 81.4, 'May': 47, 'Jun.': 20.3, 'Jul.': 24, 'Aug.': 35.6 },
- { type: 'Jeebt', 'Jan.': 12.4, 'Feb.': 23.2, 'Mar.': 34.5, 'Apr.': 99.7, 'May': 52.6, 'Jun.': 35.5, 'Jul.': 37.4, 'Aug.': 42.4 }
- ];
- const fieldsConst = ['Jan.', 'Feb.', 'Mar.', 'Apr.', 'May', 'Jun.', 'Jul.', 'Aug.'];
export default {
name: 'BarMultid',
props: {
@@ -26,12 +21,15 @@
default: ''
},
dataSource:{
- type:Array,
- default:()=>[]
+ type: Array,
+ default: () => [
+ { type: 'Jeecg', 'Jan.': 18.9, 'Feb.': 28.8, 'Mar.': 39.3, 'Apr.': 81.4, 'May': 47, 'Jun.': 20.3, 'Jul.': 24, 'Aug.': 35.6 },
+ { type: 'Jeebt', 'Jan.': 12.4, 'Feb.': 23.2, 'Mar.': 34.5, 'Apr.': 99.7, 'May': 52.6, 'Jun.': 35.5, 'Jul.': 37.4, 'Aug.': 42.4 }
+ ]
},
fields:{
- type:Array,
- default:()=>[]
+ type: Array,
+ default: () => ['Jan.', 'Feb.', 'Mar.', 'Apr.', 'May', 'Jun.', 'Jul.', 'Aug.']
},
height: {
type: Number,
@@ -40,35 +38,28 @@
},
data() {
return {
- data:"",
adjust: [{
type: 'dodge',
- marginRatio: 1 / 32,
- }],
- };
- },
- watch: {
- 'dataSource': function () {
- this.drawChart();
+ marginRatio: 1 / 32
+ }]
}
},
- mounted(){
- this.drawChart()
- },
- methods:{
- drawChart(){
- let temp = sourceDataConst;
- if(this.dataSource && this.dataSource.length>0){
- temp = this.dataSource
- }
- const dv = new DataSet.View().source(temp);
+ computed: {
+ data() {
+ const dv = new DataSet.View().source(this.dataSource)
dv.transform({
type: 'fold',
- fields:(!this.fields||this.fields.length==0)?fieldsConst:this.fields,
+ fields: this.fields,
key: 'x',
- value: 'y',
- });
- this.data=dv.rows;
+ value: 'y'
+ })
+
+ // bar 使用不了 - 和 / 所以替换下
+ return dv.rows.map(row => {
+ row.x = row.x.replace(/[-/]/g, '_')
+ return row
+ })
+
}
}
}
diff --git a/ant-design-jeecg-vue/src/components/chart/DashChartDemo.vue b/ant-design-jeecg-vue/src/components/chart/DashChartDemo.vue
index 101c9f7..07d9b8c 100644
--- a/ant-design-jeecg-vue/src/components/chart/DashChartDemo.vue
+++ b/ant-design-jeecg-vue/src/components/chart/DashChartDemo.vue
@@ -1,6 +1,6 @@
<template>
<div :style="{ padding: '0 0 32px 32px' }">
- <v-chart :forceFit="true" :height="height" :data="data" :scale="scale">
+ <v-chart :forceFit="true" :height="350" :data="chartData" :scale="scale">
<v-coord type="polar" :startAngle="-202.5" :endAngle="22.5" :radius="0.75"></v-coord>
<v-axis
dataKey="value"
@@ -45,7 +45,7 @@
</template>
<script>
- import {registerShape} from 'viser-vue';
+ import { registerShape } from 'viser-vue';
registerShape('point', 'pointer', {
draw(cfg, container) {
@@ -87,67 +87,64 @@
nice: false,
}];
- const sourceData = [
- {value: 6.7},
+ const data = [
+ { value: 7.0 },
];
export default {
- name: "DashChartDemo",
- props: {
- value: {
+ name:"DashChartDemo",
+ props:{
+ datasource:{
type: Number,
- default: 6.7
+ default:7
},
title: {
type: String,
default: ''
- },
- height: {
- type: Number,
- default: 254
}
},
- created() {
- if (!this.value) {
- this.data = sourceData;
- } else {
- this.data = [
- {value: this.value},
+ created(){
+ if(!this.datasource){
+ this.chartData = data;
+ }else{
+ this.chartData = [
+ { value: this.datasource },
];
}
- this.getData()
+ this.getChartData()
},
watch: {
- 'value': function (val) {
- this.data = [
- {value: val},
+ 'datasource': function (val) {
+ this.chartData = [
+ { value: val},
];
- this.getData();
+ this.getChartData();
}
},
- methods: {
- getData() {
- if (this.data && this.data.length > 0) {
- this.abcd = this.data[0].value * 10
- } else {
+ methods:{
+ getChartData(){
+ if(this.chartData && this.chartData.length>0){
+ this.abcd = this.chartData[0].value * 10
+ }else{
this.abcd = 70
}
},
- getHtmlGuideHtml() {
+ getHtmlGuideHtml(){
return '<div style="width: 300px;text-align: center;">\n' +
- '<p style="font-size: 14px;color: #545454;margin: 0;">' + this.title + '</p>\n' +
- '<p style="font-size: 36px;color: #545454;margin: 0;">' + this.abcd + '%</p>\n' +
+ '<p style="font-size: 14px;color: #545454;margin: 0;">'+this.title+'</p>\n' +
+ '<p style="font-size: 36px;color: #545454;margin: 0;">'+this.abcd+'%</p>\n' +
'</div>'
},
- getArcGuide2End() {
- return [this.data[0].value, 0.945]
+ getArcGuide2End(){
+ return [this.chartData[0].value, 0.945]
}
},
data() {
return {
- data: [],
+ chartData:[],
+ height: 400,
scale: scale,
- abcd: 70,
+ abcd:70,
axisLabel: {
offset: -16,
textStyle: {
diff --git a/ant-design-jeecg-vue/src/components/chart/LineChartMultid.vue b/ant-design-jeecg-vue/src/components/chart/LineChartMultid.vue
index 66e6138..3189794 100644
--- a/ant-design-jeecg-vue/src/components/chart/LineChartMultid.vue
+++ b/ant-design-jeecg-vue/src/components/chart/LineChartMultid.vue
@@ -1,12 +1,12 @@
<template>
<div :style="{ padding: '0 0 32px 32px' }">
<h4 :style="{ marginBottom: '20px' }">{{ title }}</h4>
- <v-chart :force-fit="true" :height="height" :data="data" :scale="scale" :padding="['auto', 'auto', '40', '50']">
- <v-tooltip />
- <v-axis />
- <v-legend />
- <v-line position="type*y" color="x" />
- <v-point position="type*y" color="x" :size="4" :v-style="style" :shape="'circle'" />
+ <v-chart :force-fit="true" :height="height" :data="data" :scale="scale">
+ <v-tooltip/>
+ <v-axis/>
+ <v-legend/>
+ <v-line position="type*y" color="x"/>
+ <v-point position="type*y" color="x" :size="4" :v-style="style" :shape="'circle'"/>
</v-chart>
</div>
</template>
@@ -14,23 +14,6 @@
<script>
import { DataSet } from '@antv/data-set'
- const sourceDataConst = [
- { type: 'Jan', jeecg: 7.0, jeebt: 3.9 },
- { type: 'Feb', jeecg: 6.9, jeebt: 4.2 },
- { type: 'Mar', jeecg: 9.5, jeebt: 5.7 },
- { type: 'Apr', jeecg: 14.5, jeebt: 8.5 },
- { type: 'May', jeecg: 18.4, jeebt: 11.9 },
- { type: 'Jun', jeecg: 21.5, jeebt: 15.2 },
- { type: 'Jul', jeecg: 25.2, jeebt: 17.0 },
- { type: 'Aug', jeecg: 26.5, jeebt: 16.6 },
- { type: 'Sep', jeecg: 23.3, jeebt: 14.2 },
- { type: 'Oct', jeecg: 18.3, jeebt: 10.3 },
- { type: 'Nov', jeecg: 13.9, jeebt: 6.6 },
- { type: 'Dec', jeecg: 9.6, jeebt: 4.8 }
- ];
-
-
-
export default {
name: 'LineChartMultid',
props: {
@@ -38,58 +21,52 @@
type: String,
default: ''
},
- dataSource:{
- type:Array,
- default:()=>[]
+ dataSource: {
+ type: Array,
+ default: () => [
+ { type: 'Jan', jeecg: 7.0, jeebt: 3.9 },
+ { type: 'Feb', jeecg: 6.9, jeebt: 4.2 },
+ { type: 'Mar', jeecg: 9.5, jeebt: 5.7 },
+ { type: 'Apr', jeecg: 14.5, jeebt: 8.5 },
+ { type: 'May', jeecg: 18.4, jeebt: 11.9 },
+ { type: 'Jun', jeecg: 21.5, jeebt: 15.2 },
+ { type: 'Jul', jeecg: 25.2, jeebt: 17.0 },
+ { type: 'Aug', jeecg: 26.5, jeebt: 16.6 },
+ { type: 'Sep', jeecg: 23.3, jeebt: 14.2 },
+ { type: 'Oct', jeecg: 18.3, jeebt: 10.3 },
+ { type: 'Nov', jeecg: 13.9, jeebt: 6.6 },
+ { type: 'Dec', jeecg: 9.6, jeebt: 4.8 }
+ ]
},
- fields:{
- type:Array,
+ fields: {
+ type: Array,
default: () => ['jeecg', 'jeebt']
},
- height:{
- type:Number,
- default:254
+ height: {
+ type: Number,
+ default: 254
}
},
data() {
return {
- data:"",
scale: [{
dataKey: 'x',
min: 0,
max: 1
}],
- style: { stroke: '#fff', lineWidth: 1 },
- };
- },
- watch: {
- 'dataSource': function () {
- this.drawChart();
+ style: { stroke: '#fff', lineWidth: 1 }
}
},
- mounted(){
- this.drawChart()
- },
- methods:{
- drawChart(){
- let temp = sourceDataConst;
- if (this.dataSource && this.dataSource.length > 0) {
- temp = this.dataSource.map(item => {
- // 为了防止直接修改源数据导致报错
- let obj = Object.assign({}, item)
- obj.type = obj.x
- return obj
- })
- }
- const dv = new DataSet.View().source(temp);
+ computed: {
+ data() {
+ const dv = new DataSet.View().source(this.dataSource)
dv.transform({
type: 'fold',
fields: this.fields,
key: 'x',
- value: 'y',
- });
-
- this.data=dv.rows;
+ value: 'y'
+ })
+ return dv.rows
}
}
}
diff --git a/ant-design-jeecg-vue/src/components/chart/Pie.vue b/ant-design-jeecg-vue/src/components/chart/Pie.vue
index 7cebf40..b5f3742 100644
--- a/ant-design-jeecg-vue/src/components/chart/Pie.vue
+++ b/ant-design-jeecg-vue/src/components/chart/Pie.vue
@@ -11,20 +11,6 @@
<script>
const DataSet = require('@antv/data-set')
- const sourceData = [
- { item: '事例一', percent: 40 },
- { item: '事例二', percent: 21 },
- { item: '事例三', percent: 17 },
- { item: '事例四', percent: 13 },
- { item: '事例五', percent: 9 }
- ]
-
- const scale = [{
- dataKey: 'percent',
- min: 0,
- formatter: '.0%'
- }]
-
export default {
props: {
title: {
@@ -37,37 +23,22 @@
},
dataSource: {
type: Array,
- default: () => []
- }
- },
- created() {
- this.change()
- },
- watch: {
- 'dataSource': function() {
- this.change()
- }
- },
- methods: {
- change() {
- if (this.dataSource.length === 0) {
- this.data = sourceData
- } else {
- const dv = new DataSet.View().source(this.dataSource)
- dv.transform({
- type: 'percent',
- field: 'count',
- dimension: 'item',
- as: 'percent'
- })
- this.data = dv.rows
- }
+ default: () => [
+ { item: '示例一', count: 40 },
+ { item: '示例二', count: 21 },
+ { item: '示例三', count: 17 },
+ { item: '示例四', count: 13 },
+ { item: '示例五', count: 9 }
+ ]
}
},
data() {
return {
- data: '',
- scale,
+ scale: [{
+ dataKey: 'percent',
+ min: 0,
+ formatter: '.0%'
+ }],
pieStyle: {
stroke: '#fff',
lineWidth: 1
@@ -78,6 +49,19 @@
}
}]
}
+ },
+ computed: {
+ data() {
+ let dv = new DataSet.View().source(this.dataSource)
+ // 计算数据百分比
+ dv.transform({
+ type: 'percent',
+ field: 'count',
+ dimension: 'item',
+ as: 'percent'
+ })
+ return dv.rows
+ }
}
}
</script>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/chart/README.md b/ant-design-jeecg-vue/src/components/chart/README.md
index 20c74a8..d2789c8 100644
--- a/ant-design-jeecg-vue/src/components/chart/README.md
+++ b/ant-design-jeecg-vue/src/components/chart/README.md
@@ -35,6 +35,45 @@ import Bar from '@/components/chart/Bar'
]
```
+##### 代码示例
+
+```html
+<template>
+ <bar title="柱状图" :dataSource="dataSource" :height="420"/>
+</template>
+
+<script>
+ import Bar from '@/components/chart/Bar'
+
+ export default {
+ name: 'ChartDemo',
+ components: {
+ Bar
+ },
+ data() {
+ return {
+ dataSource: [
+ {
+ "x": "1月",
+ "y": 320
+ },
+ {
+ "x": "2月",
+ "y": 457
+ },
+ {
+ "x": "3月",
+ "y": 182
+ }
+ ]
+ }
+ }
+ }
+</script>
+
+<style></style>
+```
+
## 多列柱状图
##### 引用方式
diff --git a/ant-design-jeecg-vue/src/components/dict/JDictSelectTag.vue b/ant-design-jeecg-vue/src/components/dict/JDictSelectTag.vue
index fe93b01..057e6fc 100644
--- a/ant-design-jeecg-vue/src/components/dict/JDictSelectTag.vue
+++ b/ant-design-jeecg-vue/src/components/dict/JDictSelectTag.vue
@@ -1,7 +1,15 @@
<template>
- <a-select :placeholder="placeholder" :value="value" @change="handleInput">
+ <a-radio-group v-if="tagType=='radio'" @change="handleInput" :value="value" :disabled="disabled">
+ <a-radio v-for="(item, key) in dictOptions" :key="key" :value="item.value">{{ item.text }}</a-radio>
+ </a-radio-group>
+
+ <a-select v-else-if="tagType=='select'" :placeholder="placeholder" :disabled="disabled" :value="value" @change="handleInput">
<a-select-option value="">请选择</a-select-option>
- <a-select-option v-for="(item, key) in dictOptions" :key="key" :value="item.value">{{ item.text }}</a-select-option>
+ <a-select-option v-for="(item, key) in dictOptions" :key="key" :value="item.value">
+ <span style="display: inline-block;width: 100%" :title=" item.text || item.label ">
+ {{ item.text || item.label }}
+ </span>
+ </a-select-option>
</a-select>
</template>
@@ -14,15 +22,23 @@
dictCode: String,
placeholder: String,
triggerChange: Boolean,
- value: String,// 1.接收一个 value prop
+ disabled: Boolean,
+ value: String,
+ type: String
},
data() {
return {
dictOptions: [],
+ tagType:""
}
},
created() {
console.log(this.dictCode);
+ if(!this.type || this.type==="list"){
+ this.tagType = "select"
+ }else{
+ this.tagType = this.type
+ }
//获取字典数据
this.initDictData();
},
@@ -36,13 +52,25 @@
}
})
},
- handleInput(val) {
+ handleInput(e) {
+ let val;
+ if(this.tagType=="radio"){
+ val = e.target.value
+ }else{
+ val = e
+ }
console.log(val);
if(this.triggerChange){
this.$emit('change', val);
}else{
this.$emit('input', val);
}
+ },
+ setCurrentDictOptions(dictOptions){
+ this.dictOptions = dictOptions
+ },
+ getCurrentDictOptions(){
+ return this.dictOptions
}
}
}
diff --git a/ant-design-jeecg-vue/src/components/dict/JMultiSelectTag.vue b/ant-design-jeecg-vue/src/components/dict/JMultiSelectTag.vue
new file mode 100644
index 0000000..93180b5
--- /dev/null
+++ b/ant-design-jeecg-vue/src/components/dict/JMultiSelectTag.vue
@@ -0,0 +1,92 @@
+<template>
+ <a-checkbox-group v-if="tagType=='checkbox'" @change="onChange" :value="arrayValue" :disabled="disabled">
+ <a-checkbox v-for="(item, key) in dictOptions" :key="key" :value="item.value">{{ item.text || item.label }}</a-checkbox>
+ </a-checkbox-group>
+
+ <a-select
+ v-else-if="tagType=='select'"
+ :value="arrayValue"
+ @change="onChange"
+ :disabled="disabled"
+ mode="multiple"
+ :placeholder="placeholder">
+ <a-select-option
+ v-for="(item,index) in dictOptions"
+ :key="index"
+ :value="item.value">
+ <span style="display: inline-block;width: 100%" :title=" item.text || item.label ">
+ {{ item.text || item.label }}
+ </span>
+ </a-select-option>
+ </a-select>
+
+</template>
+
+<script>
+ import {ajaxGetDictItems} from '@/api/api'
+ export default {
+ name: 'JMultiSelectTag',
+ props: {
+ dictCode: String,
+ placeholder: String,
+ triggerChange: Boolean,
+ disabled: Boolean,
+ value: String,
+ type: String,
+ options:Array
+ },
+ data() {
+ return {
+ dictOptions: [],
+ tagType:"",
+ arrayValue:!this.value?[]:this.value.split(",")
+ }
+ },
+ created() {
+ if(!this.type || this.type==="list_multi"){
+ this.tagType = "select"
+ }else{
+ this.tagType = this.type
+ }
+ //获取字典数据
+ this.initDictData();
+ },
+ watch:{
+ value (val) {
+ if(!val){
+ this.arrayValue = []
+ }else{
+ this.arrayValue = this.value.split(",")
+ }
+ }
+ },
+ methods: {
+ initDictData() {
+ if(this.options && this.options.length>0){
+ this.dictOptions = [...this.options]
+ }else{
+ //根据字典Code, 初始化字典数组
+ ajaxGetDictItems(this.dictCode, null).then((res) => {
+ if (res.success) {
+ this.dictOptions = res.result;
+ }
+ })
+ }
+
+ },
+ onChange (selectedValue) {
+ if(this.triggerChange){
+ this.$emit('change', selectedValue.join(","));
+ }else{
+ this.$emit('input', selectedValue.join(","));
+ }
+ },
+ setCurrentDictOptions(dictOptions){
+ this.dictOptions = dictOptions
+ },
+ getCurrentDictOptions(){
+ return this.dictOptions
+ }
+ }
+ }
+</script>
diff --git a/ant-design-jeecg-vue/src/components/dict/JSearchSelectTag.vue b/ant-design-jeecg-vue/src/components/dict/JSearchSelectTag.vue
new file mode 100644
index 0000000..8468b68
--- /dev/null
+++ b/ant-design-jeecg-vue/src/components/dict/JSearchSelectTag.vue
@@ -0,0 +1,170 @@
+<template>
+
+ <a-select
+ v-if="async"
+ showSearch
+ labelInValue
+ @search="loadData"
+ :placeholder="placeholder"
+ v-model="selectedAsyncValue"
+ style="width: 100%"
+ :filterOption="false"
+ @change="handleAsyncChange"
+ :notFoundContent="loading ? undefined : null"
+ >
+ <a-spin v-if="loading" slot="notFoundContent" size="small"/>
+ <a-select-option v-for="d in options" :key="d.value" :value="d.value">{{ d.text }}</a-select-option>
+ </a-select>
+
+ <a-select
+ v-else
+ showSearch
+ :placeholder="placeholder"
+ optionFilterProp="children"
+ style="width: 100%"
+ @change="handleChange"
+ :filterOption="filterOption"
+ v-model="selectedValue"
+ :notFoundContent="loading ? undefined : null">
+ <a-spin v-if="loading" slot="notFoundContent" size="small"/>
+ <a-select-option v-for="d in options" :key="d.value" :value="d.value">{{ d.text }}</a-select-option>
+ </a-select>
+
+</template>
+
+<script>
+ import { ajaxGetDictItems } from '@/api/api'
+ import debounce from 'lodash/debounce';
+ import { getAction } from '../../api/manage'
+
+ export default {
+ name: 'JSearchSelectTag',
+ props:{
+ triggerChange: Boolean,
+ disabled: Boolean,
+ value: String,
+ dictCode: String,
+ dictOptions: Array,
+ async: Boolean,
+ placeholder:{
+ type:String,
+ default:"请选择",
+ required:false
+ }
+ },
+ data(){
+ this.loadData = debounce(this.loadData, 800);//消抖
+ this.lastLoad = 0;
+ return {
+ loading:false,
+ selectedValue:[],
+ selectedAsyncValue:[],
+ options: [],
+ }
+ },
+ created(){
+ this.initDictData();
+ },
+ watch:{
+ "value":{
+ immediate:true,
+ handler(val){
+ if(!val){
+ this.selectedValue=[]
+ this.selectedAsyncValue=[]
+ }else{
+ this.initSelectValue()
+ }
+ }
+ }
+ },
+ methods:{
+ initSelectValue(){
+ if(this.async){
+ if(!this.selectedAsyncValue || !this.selectedAsyncValue.key || this.selectedAsyncValue.key!=this.value){
+ console.log("这才请求后台")
+ getAction(`/sys/dict/loadDictItem/${this.dictCode}`,{key:this.value}).then(res=>{
+ if(res.success){
+ let obj = {
+ key:this.value,
+ label:res.result
+ }
+ this.selectedAsyncValue = {...obj}
+ }
+ })
+ }
+ }else{
+ this.selectedValue = this.value
+ }
+ },
+ loadData(value){
+ console.log("数据加载",value)
+ this.lastLoad +=1
+ const currentLoad = this.lastLoad
+ this.options = []
+ this.loading=true
+ // 字典code格式：table,text,code
+ getAction(`/sys/dict/loadDict/${this.dictCode}`,{keyword:value}).then(res=>{
+ this.loading=false
+ if(res.success){
+ if(currentLoad!=this.lastLoad){
+ return
+ }
+ this.options = res.result
+ console.log("我是第一个",res)
+ }else{
+ this.$message.warning(res.message)
+ }
+
+ })
+
+ },
+ initDictData(){
+ if(!this.async){
+ //如果字典项集合有数据
+ if(this.dictOptions && this.dictOptions.length>0){
+ this.options = [...this.dictOptions]
+ }else{
+ //根据字典Code, 初始化字典数组
+ ajaxGetDictItems(this.dictCode, null).then((res) => {
+ if (res.success) {
+ this.options = res.result;
+ }
+ })
+ }
+ }
+ },
+ filterOption(input, option) {
+ return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+ },
+ handleChange (selectedValue) {
+ console.log("selectedValue",selectedValue)
+ this.selectedValue = selectedValue
+ this.callback()
+ },
+ handleAsyncChange(selectedObj){
+ this.selectedAsyncValue = selectedObj
+ this.selectedValue = selectedObj.key
+ this.callback()
+ },
+ callback(){
+ if(this.triggerChange){
+ this.$emit('change', this.selectedValue);
+ }else{
+ this.$emit('input', this.selectedValue);
+ }
+ },
+ setCurrentDictOptions(dictOptions){
+ this.options = dictOptions
+ },
+ getCurrentDictOptions(){
+ return this.options
+ }
+
+ }
+ }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/jeecg/JCheckbox.vue b/ant-design-jeecg-vue/src/components/jeecg/JCheckbox.vue
index 70f2d78..f3e4d6e 100644
--- a/ant-design-jeecg-vue/src/components/jeecg/JCheckbox.vue
+++ b/ant-design-jeecg-vue/src/components/jeecg/JCheckbox.vue
@@ -15,6 +15,7 @@
required: false,
default: false
},
+ /*label value*/
options:{
type: Array,
required: true
diff --git a/ant-design-jeecg-vue/src/components/jeecg/JCodeEditor.vue b/ant-design-jeecg-vue/src/components/jeecg/JCodeEditor.vue
new file mode 100644
index 0000000..fa9da77
--- /dev/null
+++ b/ant-design-jeecg-vue/src/components/jeecg/JCodeEditor.vue
@@ -0,0 +1,409 @@
+<template>
+ <div v-bind="fullScreenParentProps">
+ <a-icon v-if="fullScreen" class="full-screen-icon" type="fullscreen" @click="()=>fullCoder=!fullCoder"/>
+
+ <div class="code-editor-cust full-screen-child">
+ <textarea ref="textarea"></textarea>
+ <span @click="nullTipClick" class="null-tip" :class="{'null-tip-hidden':hasCode}" :style="nullTipStyle">{{ placeholderShow }}</span>
+ <template v-if="languageChange">
+ <a-select v-model="mode" size="small" class="code-mode-select" @change="changeMode" placeholder="请选择主题">
+ <a-select-option
+ v-for="mode in modes"
+ :key="mode.value"
+ :value="mode.value">
+ {{ mode.label }}
+ </a-select-option>
+ </a-select>
+ </template>
+
+ </div>
+ </div>
+</template>
+
+<script type="text/ecmascript-6">
+ // 引入全局实例
+ import _CodeMirror from 'codemirror'
+
+ // 核心样式
+ import 'codemirror/lib/codemirror.css'
+ // 引入主题后还需要在 options 中指定主题才会生效 darcula gruvbox-dark hopscotch monokai
+ import 'codemirror/theme/panda-syntax.css'
+ //提示css
+ import "codemirror/addon/hint/show-hint.css";
+
+ // 需要引入具体的语法高亮库才会有对应的语法高亮效果
+ // codemirror 官方其实支持通过 /addon/mode/loadmode.js 和 /mode/meta.js 来实现动态加载对应语法高亮库
+ // 但 vue 貌似没有无法在实例初始化后再动态加载对应 JS ，所以此处才把对应的 JS 提前引入
+ import 'codemirror/mode/javascript/javascript.js'
+ import 'codemirror/mode/css/css.js'
+ import 'codemirror/mode/xml/xml.js'
+ import 'codemirror/mode/clike/clike.js'
+ import 'codemirror/mode/markdown/markdown.js'
+ import 'codemirror/mode/python/python.js'
+ import 'codemirror/mode/r/r.js'
+ import 'codemirror/mode/shell/shell.js'
+ import 'codemirror/mode/sql/sql.js'
+ import 'codemirror/mode/swift/swift.js'
+ import 'codemirror/mode/vue/vue.js'
+
+ // 尝试获取全局实例
+ const CodeMirror = window.CodeMirror || _CodeMirror
+
+ export default {
+ name: 'JCodeEditor',
+ props: {
+ // 外部传入的内容，用于实现双向绑定
+ value: {
+ type: String,
+ default: ''
+ },
+ // 外部传入的语法类型
+ language: {
+ type: String,
+ default: null
+ },
+ languageChange:{
+ type: Boolean,
+ default:false,
+ required:false
+ },
+ placeholder: {
+ type: String,
+ default: null
+ },
+ // 显示行号
+ lineNumbers: {
+ type: Boolean,
+ default: true
+ },
+ // 是否显示全屏按钮
+ fullScreen: {
+ type: Boolean,
+ default: false
+ },
+ // 全屏以后的z-index
+ zIndex: {
+ type: [Number, String],
+ default: 999
+ }
+ },
+ data () {
+ return {
+ // 内部真实的内容
+ code: '',
+ hasCode:false,
+ // 默认的语法类型
+ mode: 'javascript',
+ // 编辑器实例
+ coder: null,
+ // 默认配置
+ options: {
+ // 缩进格式
+ tabSize: 2,
+ // 主题，对应主题库 JS 需要提前引入
+ theme: 'panda-syntax',
+ line: true,
+ // extraKeys: {'Ctrl': 'autocomplete'},//自定义快捷键
+ hintOptions: {
+ tables: {
+ users: ['name', 'score', 'birthDate'],
+ countries: ['name', 'population', 'size']
+ }
+ },
+ },
+ // 支持切换的语法高亮类型，对应 JS 已经提前引入
+ // 使用的是 MIME-TYPE ，不过作为前缀的 text/ 在后面指定时写死了
+ modes: [{
+ value: 'css',
+ label: 'CSS'
+ }, {
+ value: 'javascript',
+ label: 'Javascript'
+ }, {
+ value: 'html',
+ label: 'XML/HTML'
+ }, {
+ value: 'x-java',
+ label: 'Java'
+ }, {
+ value: 'x-objectivec',
+ label: 'Objective-C'
+ }, {
+ value: 'x-python',
+ label: 'Python'
+ }, {
+ value: 'x-rsrc',
+ label: 'R'
+ }, {
+ value: 'x-sh',
+ label: 'Shell'
+ }, {
+ value: 'x-sql',
+ label: 'SQL'
+ }, {
+ value: 'x-swift',
+ label: 'Swift'
+ }, {
+ value: 'x-vue',
+ label: 'Vue'
+ }, {
+ value: 'markdown',
+ label: 'Markdown'
+ }],
+ // code 编辑器 是否全屏
+ fullCoder: false
+ }
+ },
+ watch: {
+ // value: {
+ // immediate: false,
+ // handler(value) {
+ // this._getCoder().then(() => {
+ // this.coder.setValue(value)
+ // })
+ // }
+ // },
+ language: {
+ immediate: true,
+ handler(language) {
+ this._getCoder().then(() => {
+ // 尝试从父容器获取语法类型
+ if (language) {
+ // 获取具体的语法类型对象
+ let modeObj = this._getLanguage(language)
+
+ // 判断父容器传入的语法是否被支持
+ if (modeObj) {
+ this.mode = modeObj.label
+ this.coder.setOption('mode', `text/${modeObj.value}`)
+ }
+ }
+ })
+ }
+ }
+ },
+ computed: {
+ placeholderShow() {
+ if (this.placeholder == null) {
+ return `请在此输入${this.language}代码`
+ } else {
+ return this.placeholder
+ }
+ },
+ nullTipStyle(){
+ if (this.lineNumbers) {
+ return { left: '36px' }
+ } else {
+ return { left: '12px' }
+ }
+ },
+ // coder 配置
+ coderOptions() {
+ return {
+ tabSize: this.options.tabSize,
+ theme: this.options.theme,
+ lineNumbers: this.lineNumbers,
+ line: true,
+ hintOptions: this.options.hintOptions
+ }
+ },
+ fullScreenParentProps(){
+ let props = {
+ class: ['full-screen-parent', this.fullCoder ? 'full-screen' : ''],
+ style: {}
+ }
+ if (this.fullCoder) {
+ props.style['z-index'] = this.zIndex
+ }
+ return props
+ }
+ },
+ mounted () {
+ // 初始化
+ this._initialize()
+ },
+ methods: {
+ // 初始化
+ _initialize () {
+ // 初始化编辑器实例，传入需要被实例化的文本域对象和默认配置
+ this.coder = CodeMirror.fromTextArea(this.$refs.textarea, this.coderOptions)
+ // 编辑器赋值
+ this.coder.setValue(this.value || this.code)
+ if(this.value||this.code){
+ this.hasCode=true
+ }else{
+ this.hasCode=false
+ }
+ // 支持双向绑定
+ this.coder.on('change', (coder) => {
+ this.code = coder.getValue()
+ if(this.code){
+ this.hasCode=true
+ }else{
+ this.hasCode=false
+ }
+ if (this.$emit) {
+ this.$emit('input', this.code)
+ }
+ })
+ this.coder.on('focus', () => {
+ this.hasCode=true
+ })
+ this.coder.on('blur', () => {
+ if(this.code){
+ this.hasCode=true
+ }else{
+ this.hasCode=false
+ }
+ })
+
+ /* this.coder.on('cursorActivity',()=>{
+ this.coder.showHint()
+ })*/
+
+ },
+ getCodeContent(){
+ return this.code
+ },
+ setCodeContent(val){
+ this.coder.setValue(val)
+ },
+ // 获取当前语法类型
+ _getLanguage (language) {
+ // 在支持的语法类型列表中寻找传入的语法类型
+ return this.modes.find((mode) => {
+ // 所有的值都忽略大小写，方便比较
+ let currentLanguage = language.toLowerCase()
+ let currentLabel = mode.label.toLowerCase()
+ let currentValue = mode.value.toLowerCase()
+
+ // 由于真实值可能不规范，例如 java 的真实值是 x-java ，所以讲 value 和 label 同时和传入语法进行比较
+ return currentLabel === currentLanguage || currentValue === currentLanguage
+ })
+ },
+ _getCoder() {
+ let _this = this
+ return new Promise((resolve) => {
+ (function get() {
+ if (_this.coder) {
+ resolve(_this.coder)
+ } else {
+ setTimeout(get, 10)
+ }
+ })()
+ })
+ },
+ // 更改模式
+ changeMode (val) {
+ // 修改编辑器的语法配置
+ this.coder.setOption('mode', `text/${val}`)
+
+ // 获取修改后的语法
+ let label = this._getLanguage(val).label.toLowerCase()
+
+ // 允许父容器通过以下函数监听当前的语法值
+ this.$emit('language-change', label)
+ },
+ nullTipClick(){
+ this.coder.focus()
+ }
+ }
+ }
+</script>
+
+<style lang="less">
+ .code-editor-cust{
+ flex-grow:1;
+ display:flex;
+ position:relative;
+ height:100%;
+ .CodeMirror{
+ flex-grow:1;
+ z-index:1;
+ .CodeMirror-code{
+ line-height:19px;
+ }
+
+ }
+ .code-mode-select{
+ position:absolute;
+ z-index:2;
+ right:10px;
+ top:10px;
+ max-width:130px;
+ }
+ .CodeMirror{
+ height: auto;
+ min-height:100%;
+ }
+ .null-tip{
+ position: absolute;
+ top: 4px;
+ left: 36px;
+ z-index: 10;
+ color: #ffffffc9;
+ line-height: initial;
+ }
+ .null-tip-hidden{
+ display: none;
+ }
+ }
+
+ /* 全屏样式 */
+ .full-screen-parent {
+ position: relative;
+
+ .full-screen-icon {
+ opacity: 0;
+ color: black;
+ width: 20px;
+ height: 20px;
+ line-height: 24px;
+ background-color: white;
+ position: absolute;
+ top: 2px;
+ right: 2px;
+ z-index: 9;
+ cursor: pointer;
+ transition: opacity 0.3s;
+ }
+
+ &:hover {
+ .full-screen-icon {
+ opacity: 1;
+
+ &:hover {
+ background-color: rgba(255, 255, 255, 0.88);
+ }
+ }
+ }
+
+ &.full-screen {
+ position: fixed;
+ top: 10px;
+ left: 10px;
+ width: calc(100% - 20px);
+ height: calc(100% - 20px);
+ padding: 10px;
+ background-color: #f5f5f5;
+
+ .full-screen-icon {
+ top: 12px;
+ right: 12px;
+ }
+ .full-screen-child {
+ height: 100%;
+ max-height: 100%;
+ min-height: 100%;
+ }
+ }
+
+ .full-screen-child {
+ min-height: 120px;
+ max-height: 320px;
+ }
+
+ }
+
+
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/jeecg/JDate.vue b/ant-design-jeecg-vue/src/components/jeecg/JDate.vue
index 7d6322c..f7f2b21 100644
--- a/ant-design-jeecg-vue/src/components/jeecg/JDate.vue
+++ b/ant-design-jeecg-vue/src/components/jeecg/JDate.vue
@@ -6,6 +6,7 @@
:value="momVal"
:showTime="showTime"
:format="dateFormat"
+ :getCalendarContainer="getCalendarContainer"
/>
</template>
<script>
@@ -41,6 +42,10 @@
type: Boolean,
required: false,
default: false
+ },
+ getCalendarContainer: {
+ type: Function,
+ default: () => document.body
}
},
data () {
diff --git a/ant-design-jeecg-vue/src/components/jeecg/JEditableTable.vue b/ant-design-jeecg-vue/src/components/jeecg/JEditableTable.vue
index 7eefc45..aaeb7be 100644
--- a/ant-design-jeecg-vue/src/components/jeecg/JEditableTable.vue
+++ b/ant-design-jeecg-vue/src/components/jeecg/JEditableTable.vue
@@ -1,5 +1,5 @@
<!-- JEditableTable -->
-<!-- @version 1.3 -->
+<!-- @version 1.4 -->
<!-- @author sjlei -->
<template>
<a-spin :spinning="loading">
@@ -23,8 +23,8 @@
<div :id="`${caseId}inputTable`" class="input-table">
<!-- 渲染表头 -->
- <div class="thead">
- <div class="tr">
+ <div class="thead" ref="thead">
+ <div class="tr" :style="{width: this.realTrWidth}">
<!-- 左侧固定td -->
<div v-if="rowSelection" class="td td-cb" :style="style.tdLeft">
<!--:indeterminate="true"-->
@@ -49,162 +49,232 @@
</template>
</div>
</div>
- <!-- 渲染主体 body -->
- <div :id="`${caseId}tbody`" class="tbody" :style="tbodyStyle">
- <!-- 扩展高度 -->
- <div class="tr-expand" :style="`height:${getExpandHeight}px; z-index:${loading?'11':'9'};`"></div>
- <!-- 无数据时显示 -->
- <div v-if="rows.length===0" class="tr-nodata">
- <span>暂无数据</span>
- </div>
- <!-- 动态生成tr -->
- <template v-for="(row,rowIndex) in rows">
- <!-- tr 只加载可见的和预加载的总共十条数据 -->
- <div
- v-if="
- rowIndex >= parseInt(`${(scrollTop-rowHeight) / rowHeight}`) &&
- (parseInt(`${scrollTop / rowHeight}`) + 9) > rowIndex
- "
- :id="`${caseId}tbody-tr-${rowIndex}`"
- :data-idx="rowIndex"
- class="tr"
- :class="selectedRowIds.indexOf(row.id) !== -1 ? 'tr-checked' : ''"
- :style="buildTrStyle(rowIndex)"
- :key="row.id">
- <!-- 左侧固定td -->
- <div v-if="rowSelection" class="td td-cb" :style="style.tdLeft">
- <!-- 此 v-for 只是为了拼接 id 字符串 -->
- <template v-for="(id,i) in [`${row.id}`]">
- <a-checkbox
- :id="id"
- :key="i"
- :checked="selectedRowIds.indexOf(id) !== -1"
- @change="handleChangeLeftCheckbox"/>
- </template>
- </div>
- <div v-if="rowNumber" class="td td-num" :style="style.tdLeft">
- <span>{{ rowIndex+1 }}</span>
- </div>
- <!-- 右侧动态生成td -->
- <div
- class="td"
- v-for="col in columns"
- :key="col.key"
- :style="buildTdStyle(col)">
-
- <!-- 此 v-for 只是为了拼接 id 字符串 -->
- <template v-for="(id,i) in [`${col.key}${row.id}`]">
-
- <!-- native input -->
- <label :key="i" v-if="col.type === formTypes.input || col.type === formTypes.inputNumber">
- <a-tooltip
- :id="id"
- placement="top"
- :title="(tooltips[id] || {}).title"
- :visible="(tooltips[id] || {}).visible || false"
- :autoAdjustOverflow="true">
-
- <input
- :id="id"
- v-bind="buildProps(row,col)"
- :data-input-number="col.type === formTypes.inputNumber"
- :placeholder="replaceProps(col, col.placeholder)"
- @input="(e)=>{handleInputCommono(e.target,rowIndex,row,col)}"
- @mouseover="()=>{handleMouseoverCommono(row,col)}"
- @mouseout="()=>{handleMouseoutCommono(row,col)}"/>
+ <div class="scroll-view" ref="scrollView" :style="{'max-height':maxHeight+'px'}">
- </a-tooltip>
- </label>
- <!-- checkbox -->
- <template v-else-if="col.type === formTypes.checkbox">
+ <!-- 渲染主体 body -->
+ <div :id="`${caseId}tbody`" class="tbody" :style="tbodyStyle">
+ <!-- 扩展高度 -->
+ <div class="tr-expand" :style="`height:${getExpandHeight}px; z-index:${loading?'11':'9'};`"></div>
+ <!-- 无数据时显示 -->
+ <div v-if="rows.length===0" class="tr-nodata">
+ <span>暂无数据</span>
+ </div>
+ <!-- 动态生成tr -->
+ <template v-for="(row,rowIndex) in rows">
+ <!-- tr 只加载可见的和预加载的总共十条数据 -->
+ <div
+ v-if="
+ rowIndex >= parseInt(`${(scrollTop-rowHeight) / rowHeight}`) &&
+ (parseInt(`${scrollTop / rowHeight}`) + 9) > rowIndex
+ "
+ :id="`${caseId}tbody-tr-${rowIndex}`"
+ :data-idx="rowIndex"
+ class="tr"
+ :class="selectedRowIds.indexOf(row.id) !== -1 ? 'tr-checked' : ''"
+ :style="buildTrStyle(rowIndex)"
+ :key="row.id">
+ <!-- 左侧固定td -->
+ <div v-if="rowSelection" class="td td-cb" :style="style.tdLeft">
+ <!-- 此 v-for 只是为了拼接 id 字符串 -->
+ <template v-for="(id,i) in [`${row.id}`]">
<a-checkbox
- :key="i"
:id="id"
- v-bind="buildProps(row,col)"
- :checked="checkboxValues[id]"
- @change="handleChangeCheckboxCommon"
- />
- </template>
- <!-- select -->
- <template v-else-if="col.type === formTypes.select">
- <!-- select 真身 -->
- <a-tooltip
:key="i"
- :id="id"
- placement="top"
- :title="(tooltips[id] || {}).title"
- :visible="(tooltips[id] || {}).visible || false"
- :autoAdjustOverflow="true">
-
- <span
- @mouseover="()=>{handleMouseoverCommono(row,col)}"
- @mouseout="()=>{handleMouseoutCommono(row,col)}">
+ :checked="selectedRowIds.indexOf(id) !== -1"
+ @change="handleChangeLeftCheckbox"/>
+ </template>
+ </div>
+ <div v-if="rowNumber" class="td td-num" :style="style.tdLeft">
+ <span>{{ rowIndex+1 }}</span>
+ </div>
+ <!-- 右侧动态生成td -->
+ <div
+ class="td"
+ v-for="col in columns"
+ :key="col.key"
+ :style="buildTdStyle(col)">
+
+ <!-- 此 v-for 只是为了拼接 id 字符串 -->
+ <template v-for="(id,i) in [`${col.key}${row.id}`]">
+
+ <!-- native input -->
+ <label :key="i" v-if="col.type === formTypes.input || col.type === formTypes.inputNumber">
+ <a-tooltip
+ :id="id"
+ placement="top"
+ :title="(tooltips[id] || {}).title"
+ :visible="(tooltips[id] || {}).visible || false"
+ :autoAdjustOverflow="true">
- <a-select
+ <input
:id="id"
- :key="i"
v-bind="buildProps(row,col)"
- style="width: 100%;"
- :value="selectValues[id]"
+ :data-input-number="col.type === formTypes.inputNumber"
:placeholder="replaceProps(col, col.placeholder)"
- @change="(v)=>handleChangeSelectCommon(v,id,row,col)">
+ @input="(e)=>{handleInputCommono(e.target,rowIndex,row,col)}"
+ @mouseover="()=>{handleMouseoverCommono(row,col)}"
+ @mouseout="()=>{handleMouseoutCommono(row,col)}"/>
+
+ </a-tooltip>
- <template v-for="(opt,optKey) in col.options">
- <a-select-option :value="opt.value" :key="optKey">{{ opt.title }}</a-select-option>
+ </label>
+ <!-- checkbox -->
+ <template v-else-if="col.type === formTypes.checkbox">
+ <a-checkbox
+ :key="i"
+ :id="id"
+ v-bind="buildProps(row,col)"
+ :checked="checkboxValues[id]"
+ @change="(e)=>handleChangeCheckboxCommon(e,row,col)"
+ />
+ </template>
+ <!-- select -->
+ <template v-else-if="col.type === formTypes.select">
+ <!-- select 真身 -->
+ <a-tooltip
+ :key="i"
+ :id="id"
+ placement="top"
+ :title="(tooltips[id] || {}).title"
+ :visible="(tooltips[id] || {}).visible || false"
+ :autoAdjustOverflow="true">
+
+ <span
+ @mouseover="()=>{handleMouseoverCommono(row,col)}"
+ @mouseout="()=>{handleMouseoutCommono(row,col)}">
+
+ <a-select
+ :id="id"
+ :key="i"
+ v-bind="buildProps(row,col)"
+ style="width: 100%;"
+ :value="selectValues[id]"
+ :options="col.options"
+ :getPopupContainer="getParentContainer"
+ :placeholder="replaceProps(col, col.placeholder)"
+ @change="(v)=>handleChangeSelectCommon(v,id,row,col)">
+
+ <!--<template v-for="(opt,optKey) in col.options">-->
+ <!--<a-select-option :value="opt.value" :key="optKey">{{ opt.title }}</a-select-option>-->
+ <!--</template>-->
+ </a-select>
+ </span>
+ </a-tooltip>
+ </template>
+ <!-- date -->
+ <template v-else-if="col.type === formTypes.date || col.type === formTypes.datetime">
+ <a-tooltip
+ :key="i"
+ :id="id"
+ placement="top"
+ :title="(tooltips[id] || {}).title"
+ :visible="(tooltips[id] || {}).visible || false"
+ :autoAdjustOverflow="true">
+
+ <span
+ @mouseover="()=>{handleMouseoverCommono(row,col)}"
+ @mouseout="()=>{handleMouseoutCommono(row,col)}">
+
+ <j-date
+ :id="id"
+ :key="i"
+ v-bind="buildProps(row,col)"
+ style="width: 100%;"
+ :value="jdateValues[id]"
+ :getCalendarContainer="getParentContainer"
+ :placeholder="replaceProps(col, col.placeholder)"
+ :trigger-change="true"
+ :showTime="col.type === formTypes.datetime"
+ :dateFormat="col.type === formTypes.date? 'YYYY-MM-DD':'YYYY-MM-DD HH:mm:ss'"
+ @change="(v)=>handleChangeJDateCommon(v,id,row,col,col.type === formTypes.datetime)"/>
+
+ </span>
+ </a-tooltip>
+ </template>
+
+ <div v-else-if="col.type === formTypes.upload" :key="i">
+ <template v-if="uploadValues[id] != null" v-for="(file,fileKey) of [(uploadValues[id]||{})]">
+ <a-input
+ :key="fileKey"
+ :readOnly="true"
+ :value="file.name"
+ >
+
+ <template slot="addonBefore" style="width: 30px">
+ <a-tooltip v-if="file.status==='uploading'" :title="`上传中(${Math.floor(file.percent)}%)`">
+ <a-icon type="loading"/>
+ </a-tooltip>
+ <a-tooltip v-else-if="file.status==='done'" title="上传完成">
+ <a-icon type="check-circle" style="color:#00DB00;"/>
+ </a-tooltip>
+ <a-tooltip v-else title="上传失败">
+ <a-icon type="exclamation-circle" style="color:red;"/>
+ </a-tooltip>
</template>
- </a-select>
- </span>
- </a-tooltip>
- </template>
- <!-- date -->
- <template v-else-if="col.type === formTypes.date || col.type === formTypes.datetime">
- <a-tooltip
- :key="i"
- :id="id"
- placement="top"
- :title="(tooltips[id] || {}).title"
- :visible="(tooltips[id] || {}).visible || false"
- :autoAdjustOverflow="true">
- <span
- @mouseover="()=>{handleMouseoverCommono(row,col)}"
- @mouseout="()=>{handleMouseoutCommono(row,col)}">
+ <template slot="addonAfter" style="width: 30px">
+ <a-tooltip title="删除并重新上传">
+ <a-icon
+ v-if="file.status!=='uploading'"
+ type="close-circle"
+ style="cursor: pointer;"
+ @click="()=>handleClickDelFile(id)"/>
+ </a-tooltip>
+ </template>
- <j-date
- :id="id"
- :key="i"
- v-bind="buildProps(row,col)"
- style="width: 100%;"
- :value="jdateValues[id]"
- :placeholder="replaceProps(col, col.placeholder)"
- :trigger-change="true"
- :showTime="col.type === formTypes.datetime"
- :dateFormat="col.type === formTypes.date? 'YYYY-MM-DD':'YYYY-MM-DD HH:mm:ss'"
- @change="(v)=>handleChangeJDateCommon(v,id,row,col)"/>
+ </a-input>
+ </template>
- </span>
- </a-tooltip>
- </template>
+ <div :hidden="uploadValues[id] != null">
- <!-- else (normal) -->
- <span v-else :key="i">{{ col.defaultValue }}</span>
- </template>
+ <a-upload
+ name="file"
+ :data="{'isup':1}"
+ :multiple="false"
+ :action="col.action"
+ :headers="uploadGetHeaders(row,col)"
+ :showUploadList="false"
+ v-bind="buildProps(row,col)"
+ @change="(v)=>handleChangeUpload(v,id,row,col)"
+ >
+ <a-button icon="upload">{{ col.placeholder }}</a-button>
+ </a-upload>
+ </div>
+
+ </div>
+
+ <div v-else-if="col.type === formTypes.slot" :key="i">
+ <slot
+ :name="col.slotName || col.key"
+ :text="inputValues[rowIndex][col.key]"
+ :column="col"
+ :rowId="removeCaseId(row.id)"
+ :getValue="()=>_getValueForSlot(row.id)"
+ :target="getVM()"
+ />
+ </div>
+
+ <!-- else (normal) -->
+ <span v-else :key="i">{{ inputValues[rowIndex][col.key] }}</span>
+ </template>
+ </div>
</div>
- </div>
- <!-- -- tr end -- -->
+ <!-- -- tr end -- -->
- </template>
+ </template>
+ </div>
</div>
</div>
</a-spin>
</template>
<script>
-
+ import Vue from 'vue'
+ import { ACCESS_TOKEN } from '@/store/mutation-types'
import { FormTypes, VALIDATE_NO_PASSED } from '@/utils/JEditableTableUtil'
import { cloneObject, randomString } from '@/utils/util'
import JDate from '@/components/jeecg/JDate'
@@ -270,7 +340,8 @@
},
// 存储各个div的style
style: {
- tbody: { left: '0px', 'max-height': '400px' },
+ // 'max-height': '400px'
+ tbody: { left: '0px' },
// 左侧固定td的style
tdLeft: { 'min-width': '4%', 'max-width': '45px' }
},
@@ -288,6 +359,8 @@
checkboxValues: {},
// 绑定 jdate 的值
jdateValues: {},
+ // file 信息
+ uploadValues: {},
// 绑定左侧选择框已选择的id
selectedRowIds: [],
// 存储被删除行的id
@@ -331,7 +404,8 @@
},
tbodyStyle() {
let style = Object.assign({}, this.style.tbody)
- style['max-height'] = `${this.maxHeight}px`
+ // style['max-height'] = `${this.maxHeight}px`
+ style['width'] = this.realTrWidth
return style
},
showClearSelectButton() {
@@ -340,6 +414,30 @@
if (this.disabledRows.hasOwnProperty(key)) count++
}
return count > 0
+ },
+ accessToken() {
+ return Vue.ls.get(ACCESS_TOKEN)
+ },
+ realTrWidth() {
+ let calcWidth = 'calc('
+ this.columns.forEach((column, i) => {
+ let { width } = column
+ if (typeof width === 'number') {
+ calcWidth += width + 'px'
+ } else if (typeof width === 'string') {
+ calcWidth += width
+ } else {
+ calcWidth += '120px'
+ }
+
+ if (i < this.columns.length - 1) {
+ calcWidth += ' + '
+ }
+
+ })
+ calcWidth += ')'
+ console.log('calcWidth: ', calcWidth)
+ return calcWidth
}
},
// 侦听器
@@ -371,11 +469,35 @@
}
} else if (column.type === FormTypes.select) {
- selectValues[inputId] = sourceValue ? sourceValue : undefined
-
+ if (sourceValue) {
+ // 判断是否是多选
+ selectValues[inputId] = (column.props || {})['mode'] === 'multiple' ? sourceValue.split(',') : sourceValue
+ } else {
+ selectValues[inputId] = undefined
+ }
+ // 兼容 旧版本 options
+ if (column.options instanceof Array) {
+ column.options = column.options.map(item => {
+ if (item) {
+ return {
+ text: item.text || item.title,
+ title: item.text || item.title,
+ value: item.value
+ }
+ }
+ return {}
+ })
+ }
} else if (column.type === FormTypes.date || column.type === FormTypes.datetime) {
jdateValues[inputId] = sourceValue
+ } else if (column.type === FormTypes.slot) {
+ if (sourceValue !== 0 && !sourceValue) {
+ value[column.key] = column.defaultValue
+ } else {
+ value[column.key] = sourceValue
+ }
+
} else {
value[column.key] = sourceValue
}
@@ -430,8 +552,22 @@
vm.syncScrollBar(event.target.scrollLeft)
}
this.el.tbody.onscroll = function(event) {
+ // vm.recalcTrHiddenItem(event.target.scrollTop)
+ }
+
+ let { thead, scrollView } = this.$refs
+ scrollView.onscroll = function(event) {
+
+ // console.log(event.target.scrollTop, ' - ', event.target.scrollLeft)
+
+ thead.scrollLeft = event.target.scrollLeft
+
+ // vm.recalcTrHiddenItem(event.target.scrollTop)
+
vm.recalcTrHiddenItem(event.target.scrollTop)
+
}
+
},
methods: {
@@ -455,15 +591,16 @@
/** 同步滚动条状态 */
syncScrollBar(scrollLeft) {
- this.style.tbody.left = `${scrollLeft}px`
- this.el.tbody.scrollLeft = scrollLeft
+ // this.style.tbody.left = `${scrollLeft}px`
+ // this.el.tbody.scrollLeft = scrollLeft
},
/** 重置滚动条位置，参数留空则滚动到上次记录的位置 */
resetScrollTop(top) {
+ let { scrollView } = this.$refs
if (top != null && typeof top === 'number') {
- this.el.tbody.scrollTop = top
+ scrollView.scrollTop = top
} else {
- this.el.tbody.scrollTop = this.scrollTop
+ scrollView.scrollTop = this.scrollTop
}
},
/** 重新计算需要隐藏或显示的tr */
@@ -481,16 +618,24 @@
})
}
},
+ /** 生成id */
+ generateId(rows) {
+ if (!(rows instanceof Array)) {
+ rows = this.rows || []
+ }
+ let timestamp = new Date().getTime()
+ return `${this.caseId}${timestamp}${rows.length}`
+ },
/** push 一条数据 */
push(record, update = true, rows) {
if (!(rows instanceof Array)) {
rows = cloneObject(this.rows) || []
}
-
if (record.id == null) {
- let timestamp = new Date().getTime()
- record.id = `${this.caseId}${timestamp}${rows.length}`
+ record.id = this.generateId(rows)
+ // let timestamp = new Date().getTime()
+ // record.id = `${this.caseId}${timestamp}${rows.length}`
}
if (record.id.indexOf(this.caseId) === -1) {
record.id = this.caseId + record.id
@@ -524,11 +669,18 @@
if (selected !== 0 && !selected) {
selected = undefined
}
+ // 判断多选
+ if (typeof selected === 'string' && (column.props || {})['mode'] === 'multiple') {
+ selected = selected.split(',')
+ }
selectValues[inputId] = recordHasValue ? record[key] : selected
} else if (column.type === FormTypes.date || column.type === FormTypes.datetime) {
jdateValues[inputId] = recordHasValue ? record[key] : column.defaultValue
+ } else if (column.type === FormTypes.slot) {
+ value[key] = recordHasValue ? record[key] : (column.defaultValue || '')
+
} else {
value[key] = recordHasValue ? record[key] : ''
}
@@ -568,10 +720,12 @@
},
/** 添加一行 */
add(num = 1, forceScrollToBottom = false) {
- let timestamp = new Date().getTime()
+ // let timestamp = new Date().getTime()
let rows = this.rows
+ let row
for (let i = 0; i < num; i++) {
- let row = { id: `${this.caseId}${timestamp}${rows.length}` }
+ // row = { id: `${this.caseId}${timestamp}${rows.length}` }
+ row = { id: this.generateId(rows) }
rows = this.push(row, false, rows)
}
this.rows = rows
@@ -579,6 +733,15 @@
this.$nextTick(() => {
this.updateFormValues()
})
+ // 触发add事件
+ this.$emit('added', {
+ row: (() => {
+ let r = Object.assign({}, row)
+ r.id = this.removeCaseId(r.id)
+ return r
+ })(),
+ target: this
+ })
// 设置滚动条位置
let tbody = this.el.tbody
let offsetHeight = tbody.offsetHeight
@@ -592,8 +755,6 @@
this.$nextTick(() => {
tbody.scrollTop = tbody.scrollHeight
})
- // 触发add事件
- this.$emit('added')
},
/** 删除被选中的行 */
removeSelectedRows() {
@@ -607,7 +768,7 @@
if (typeof id === 'string') {
ids = [id]
} else {
- throw `InputTable.removeRows() 函数需要的参数可以是string或Array类型，但提供的却是${typeof id}`
+ throw `JEditableTable.removeRows() 函数需要的参数可以是string或Array类型，但提供的却是${typeof id}`
}
}
@@ -616,7 +777,7 @@
// 找到每个id对应的真实index并删除
const findAndDelete = (arr) => {
for (let i = 0; i < arr.length; i++) {
- if (arr[i].id === removeId) {
+ if (arr[i].id === removeId || arr[i].id === this.caseId + removeId) {
arr.splice(i, 1)
return true
}
@@ -624,24 +785,52 @@
}
// 找到rows对应的index，并删除
if (findAndDelete(rows)) {
+ // 找到values对应的index，并删除
+ findAndDelete(this.inputValues)
// 将caseId去除
- this.deleteIds.push(removeId.split(this.caseId)[1])
+ let id = this.removeCaseId(removeId)
+ this.deleteIds.push(id)
}
- // 找到values对应的index，并删除
- findAndDelete(this.inputValues)
})
this.rows = rows
this.$emit('deleted', this.getDeleteIds())
+ this.$nextTick(() => {
+ // 更新formValues
+ this.updateFormValues()
+ })
return true
},
- /** 获取表格表单里的值 */
- getValues(callback, validate = true) {
+ /** 获取表格表单里的值（同步版） */
+ getValuesSync(options = {}) {
+ let { validate, rowIds } = options
+ if (typeof validate !== 'boolean') validate = true
+ if (!(rowIds instanceof Array)) rowIds = null
+ // console.log('options:', { validate, rowIds })
+
let error = 0
- let valueArray = cloneObject(this.inputValues)
+ let inputValues = cloneObject(this.inputValues)
let tooltips = Object.assign({}, this.tooltips)
let notPassedIds = cloneObject(this.notPassedIds)
- valueArray.forEach(value => {
+ // 用于存储合并后的值
+ let values = []
+ // 遍历inputValues来获取每行的值
+ for (let value of inputValues) {
+ let rowIdsFlag = false
+ // 如果带有rowIds，那么就只存这几行的数据
+ if (rowIds == null) {
+ rowIdsFlag = true
+ } else {
+ for (let rowId of rowIds) {
+ if (rowId === value.id || `${this.caseId}${rowId}` === value.id) {
+ rowIdsFlag = true
+ break
+ }
+ }
+ }
+
+ if (!rowIdsFlag) continue
+
this.columns.forEach(column => {
let inputId = column.key + value.id
if (column.type === FormTypes.checkbox) {
@@ -653,46 +842,65 @@
}
} else if (column.type === FormTypes.select) {
- value[column.key] = this.selectValues[inputId]
+ let selected = this.selectValues[inputId]
+ if (selected instanceof Array) {
+ value[column.key] = cloneObject(selected)
+ } else {
+ value[column.key] = selected
+ }
} else if (column.type === FormTypes.date || column.type === FormTypes.datetime) {
value[column.key] = this.jdateValues[inputId]
+ } else if (column.type === FormTypes.upload) {
+ value[column.key] = cloneObject(this.uploadValues[inputId] || null)
+
}
// 检查表单验证
- if (validate) {
+ if (validate === true) {
let results = this.validateOneInput(value[column.key], value, column, notPassedIds, false)
tooltips[inputId] = results[0]
if (tooltips[inputId].visible) {
- if (error++ === 0) {
- // let element = document.getElementById(inputId)
- // while (element.className !== 'tr') {
- // element = element.parentElement
- // }
- // this.jumpToId(inputId, element)
- }
+ error++
+ // if (error++ === 0) {
+ // let element = document.getElementById(inputId)
+ // while (element.className !== 'tr') {
+ // element = element.parentElement
+ // }
+ // this.jumpToId(inputId, element)
+ // }
}
tooltips[inputId].visible = false
notPassedIds = results[1]
}
})
// 将caseId去除
- value.id = value.id.split(this.caseId)[1]
- })
+ value.id = this.removeCaseId(value.id)
+ values.push(value)
+
+ }
+
this.tooltips = tooltips
this.notPassedIds = notPassedIds
- if (typeof callback === 'function') callback(error, valueArray)
+ return { error, values }
+ },
+
+ /** 获取表格表单里的值 */
+ getValues(callback, validate = true, rowIds) {
+ let result = this.getValuesSync({ validate, rowIds })
+ if (typeof callback === 'function') {
+ callback(result.error, result.values)
+ }
},
/** getValues的Promise版 */
- getValuesPromise(validate = true) {
+ getValuesPromise(validate = true, rowIds) {
return new Promise((resolve, reject) => {
- this.getValues((error, values) => {
- if (error === 0) {
- resolve(values)
- } else {
- reject(VALIDATE_NO_PASSED)
- }
- }, validate)
+ let { error, values } = this.getValuesSync({ validate, rowIds })
+ if (error === 0) {
+ resolve(values)
+ } else {
+ reject(VALIDATE_NO_PASSED)
+ }
})
},
/** 获取被删除项的id */
@@ -710,6 +918,16 @@
})
})
},
+ /** Sync 获取所有的数据，包括values、deleteIds */
+ getAllSync(validate, rowIds) {
+ let result = this.getValuesSync({ validate, rowIds })
+ result.deleteIds = this.getDeleteIds()
+ return result
+ },
+ // slot 获取值
+ _getValueForSlot(rowId) {
+ return this.getValuesSync({ rowIds: [rowId] }).values[0]
+ },
/** 设置某行某列的值 */
setValues(values) {
@@ -722,8 +940,10 @@
this.inputValues.forEach(value => {
// 在inputValues中找到了该字段
if (`${this.caseId}${rowKey}` === value.id) {
- edited = true
- value[newValueKey] = newValue
+ if (value.hasOwnProperty(newValueKey)) {
+ edited = true
+ value[newValueKey] = newValue
+ }
}
})
let modelKey = `${newValueKey}${this.caseId}${rowKey}`
@@ -764,6 +984,7 @@
// console.log(this.el.tbody.scrollTop, element.offsetTop)
// }
// },
+
/** 验证单个表单 */
validateOneInput(value, row, column, notPassedIds, update = false) {
let tooltips = Object.assign({}, this.tooltips)
@@ -934,10 +1155,13 @@
/** input事件 */
handleInputCommono(target, index, row, column) {
let { value, dataset, selectionStart } = target
-
+ let type = FormTypes.input
+ let change = true
if (`${dataset.inputNumber}` === 'true') {
+ type = FormTypes.inputNumber
let replace = value.replace(/[^0-9]/g, '')
if (value !== replace) {
+ change = false
value = replace
target.value = replace
if (typeof selectionStart === 'number') {
@@ -950,19 +1174,51 @@
this.inputValues[index][column.key] = value
// 做单个表单验证
this.validateOneInput(value, row, column, this.notPassedIds, true)
+
+ // 触发valueChange 事件
+ if (change) {
+ this.elemValueChange(type, row, column, value)
+ }
},
- handleChangeCheckboxCommon(event) {
+ handleChangeCheckboxCommon(event, row, column) {
let { id, checked } = event.target
this.checkboxValues = this.bindValuesChange(checked, id, 'checkboxValues')
+
+ // 触发valueChange 事件
+ this.elemValueChange(FormTypes.checkbox, row, column, checked)
},
handleChangeSelectCommon(value, id, row, column) {
this.selectValues = this.bindValuesChange(value, id, 'selectValues')
// 做单个表单验证
this.validateOneInput(value, row, column, this.notPassedIds, true)
+
+ // 触发valueChange 事件
+ this.elemValueChange(FormTypes.select, row, column, value)
},
- handleChangeJDateCommon(value, id, row, column) {
+ handleChangeJDateCommon(value, id, row, column, showTime) {
this.jdateValues = this.bindValuesChange(value, id, 'jdateValues')
this.validateOneInput(value, row, column, this.notPassedIds, true)
+
+ // 触发valueChange 事件
+ if (showTime) {
+ this.elemValueChange(FormTypes.datetime, row, column, value)
+ } else {
+ this.elemValueChange(FormTypes.date, row, column, value)
+ }
+ },
+ handleChangeUpload(info, id, row, column) {
+ let { file } = info
+ let value = {
+ name: file.name,
+ type: file.type,
+ size: file.size,
+ status: file.status,
+ percent: file.percent
+ }
+ if (column.responseName && file.response) {
+ value['responseName'] = file.response[column.responseName]
+ }
+ this.uploadValues = this.bindValuesChange(value, id, 'uploadValues')
},
/** 记录用到数据绑定的组件的值 */
bindValuesChange(value, id, key) {
@@ -979,6 +1235,29 @@
this.tooltips = tooltips
},
+ /** value 触发valueChange事件 */
+ elemValueChange(type, rowSource, columnSource, value) {
+ let column = Object.assign({}, columnSource)
+ // 将caseId去除
+ let row = Object.assign({}, rowSource)
+ row.id = this.removeCaseId(row.id)
+ // 获取整行的数据
+ let { values } = this.getValuesSync({ validate: false, rowIds: [row.id] })
+ if (values.length > 0) {
+ Object.assign(row, values[0])
+ }
+ this.$emit('valueChange', { type, row, column, value, target: this })
+ },
+
+ /** 将caseId去除 */
+ removeCaseId(id) {
+ return id.split(this.caseId)[1]
+ },
+
+ handleClickDelFile(id) {
+ this.uploadValues[id] = null
+ },
+
/* --- common function end --- */
/* --- 以下是辅助方法，多用于动态构造页面中的数据 --- */
@@ -986,6 +1265,22 @@
/** 辅助方法：打印日志 */
log: console.log,
+ getVM() {
+ return this
+ },
+
+ /** 辅助方法：指定a-select 和 j-data 的父容器 */
+ getParentContainer(node) {
+ if (this.$el && this.$el.nodeType !== 8) {
+ return this.$el
+ }
+ let doc = document.getElementById(this.caseId + 'inputTable')
+ if (doc != null) {
+ return doc
+ }
+ return node.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode
+ },
+
/** 辅助方法：替换${...}变量 */
replaceProps(col, value) {
if (value && typeof value === 'string') {
@@ -1039,6 +1334,14 @@
props['disabled'] = ((this.disabledRowIds || []).indexOf(row.id) !== -1)
}
return props
+ },
+ /** upload 辅助方法：获取 headers */
+ uploadGetHeaders(row, column) {
+ let headers = {}
+ if (column.token === true) {
+ headers['X-Access-Token'] = this.accessToken
+ }
+ return headers
}
}
@@ -1056,36 +1359,6 @@
}
- @scrollBarSize: 12px;
-
- /* 定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
- ::-webkit-scrollbar {
- width: @scrollBarSize;
- height: @scrollBarSize;
- background-color: transparent;
- }
-
- /* 定义滚动条轨道 */
- ::-webkit-scrollbar-track {
- background-color: #f0f0f0;
- }
-
- /* 定义滑块 */
- ::-webkit-scrollbar-thumb {
- border-radius: @scrollBarSize;
- background-color: #eee;
- box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
-
- &:hover {
- background-color: #bbb;
- }
-
- &:active {
- background-color: #888;
- }
-
- }
-
/* 设定边框参数 */
@borderColor: #e8e8e8;
@border: 1px solid @borderColor;
@@ -1094,7 +1367,7 @@
.input-table {
max-width: 100%;
- overflow-x: auto;
+ overflow-x: hidden;
overflow-y: hidden;
position: relative;
border: @border;
@@ -1106,6 +1379,8 @@
}
.td {
+
+ /*border-right: 1px solid red;*/
/*color: white;*/
/*background-color: black;*/
/*margin-right: @spacing !important;*/
@@ -1129,9 +1404,22 @@
.thead {
overflow-y: scroll;
+ overflow-x: hidden;
border-bottom: @border;
+ /** 隐藏thead的滑块 */
+ &::-webkit-scrollbar-thumb {
+ box-shadow: none !important;
+ background-color: transparent !important;
+ }
+
+ .tr {
+ min-width: 100%;
+ overflow-y: scroll;
+ }
+
.td {
+ /*flex: 1;*/
padding: 8px @spacing;
justify-content: center;
}
@@ -1143,9 +1431,10 @@
top: 0;
left: 0;
overflow-x: hidden;
- overflow-y: scroll;
+ overflow-y: hidden;
min-height: 61px;
- max-height: 400px;
+ /*max-height: 400px;*/
+ min-width: 100%;
.tr-nodata {
color: #999;
@@ -1180,8 +1469,8 @@
}
.td {
+ /*flex: 1;*/
padding: 14px 0 14px @spacing;
-
justify-content: center;
&:last-child {
@@ -1243,6 +1532,56 @@
}
+ .scroll-view {
+ overflow: auto;
+ overflow-y: scroll;
+ }
+
+ .thead, .thead .tr, .scroll-view {
+ @scrollBarSize: 6px;
+ /* 定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
+ &::-webkit-scrollbar {
+ width: @scrollBarSize;
+ height: @scrollBarSize;
+ background-color: transparent;
+ }
+ /* 定义滚动条轨道 */
+ &::-webkit-scrollbar-track {
+ background-color: #f0f0f0;
+ }
+ /* 定义滑块 */
+ &::-webkit-scrollbar-thumb {
+ background-color: #eee;
+ box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+
+ &:hover {
+ background-color: #bbb;
+ }
+
+ &:active {
+ background-color: #888;
+ }
+ }
+
+ }
+
+ .thead .tr {
+
+ &::-webkit-scrollbar-track {
+ background-color: transparent;
+ }
+
+ /* IE模式下隐藏 */
+ -ms-overflow-style: none;
+ -ms-scroll-chaining: chained;
+ -ms-content-zooming: zoom;
+ -ms-scroll-rails: none;
+ -ms-content-zoom-limit-min: 100%;
+ -ms-content-zoom-limit-max: 500%;
+ -ms-scroll-snap-type: proximity;
+ -ms-scroll-snap-points-x: snapList(100%, 200%, 300%, 400%, 500%);
+ }
+
}
</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/jeecg/JEditor.vue b/ant-design-jeecg-vue/src/components/jeecg/JEditor.vue
index 90d5cd5..6dbf553 100644
--- a/ant-design-jeecg-vue/src/components/jeecg/JEditor.vue
+++ b/ant-design-jeecg-vue/src/components/jeecg/JEditor.vue
@@ -30,6 +30,11 @@
type: String,
required:false
},
+ triggerChange:{
+ type: Boolean,
+ default: false,
+ required:false
+ },
disabled: {
type: Boolean,
default: false
@@ -82,7 +87,13 @@
},
myValue(newValue) {
console.log(newValue)
- this.$emit('input', newValue)
+ if(this.triggerChange){
+ console.log(1)
+ this.$emit('change', newValue)
+ }else{
+ console.log(2)
+ this.$emit('input', newValue)
+ }
}
}
}
diff --git a/ant-design-jeecg-vue/src/components/jeecg/JGraphicCode.vue b/ant-design-jeecg-vue/src/components/jeecg/JGraphicCode.vue
new file mode 100644
index 0000000..e19ce05
--- /dev/null
+++ b/ant-design-jeecg-vue/src/components/jeecg/JGraphicCode.vue
@@ -0,0 +1,163 @@
+<template>
+ <div class="gc-canvas" @click="reloadPic">
+ <canvas id="gc-canvas" :width="contentWidth" :height="contentHeight"></canvas>
+ </div>
+</template>
+
+<script>
+ export default {
+ name: 'JGraphicCode',
+ props: {
+ length:{
+ type: Number,
+ default: 4
+ },
+ fontSizeMin: {
+ type: Number,
+ default: 20
+ },
+ fontSizeMax: {
+ type: Number,
+ default: 45
+ },
+ backgroundColorMin: {
+ type: Number,
+ default: 180
+ },
+ backgroundColorMax: {
+ type: Number,
+ default: 240
+ },
+ colorMin: {
+ type: Number,
+ default: 50
+ },
+ colorMax: {
+ type: Number,
+ default: 160
+ },
+ lineColorMin: {
+ type: Number,
+ default: 40
+ },
+ lineColorMax: {
+ type: Number,
+ default: 180
+ },
+ dotColorMin: {
+ type: Number,
+ default: 0
+ },
+ dotColorMax: {
+ type: Number,
+ default: 255
+ },
+ contentWidth: {
+ type: Number,
+ default:136
+ },
+ contentHeight: {
+ type: Number,
+ default: 38
+ }
+ },
+ methods: {
+ // 生成一个随机数
+ randomNum (min, max) {
+ return Math.floor(Math.random() * (max - min) + min)
+ },
+ // 生成一个随机的颜色
+ randomColor (min, max) {
+ let r = this.randomNum(min, max)
+ let g = this.randomNum(min, max)
+ let b = this.randomNum(min, max)
+ return 'rgb(' + r + ',' + g + ',' + b + ')'
+ },
+ drawPic () {
+ this.randomCode()
+ let canvas = document.getElementById('gc-canvas')
+ let ctx = canvas.getContext('2d')
+ ctx.textBaseline = 'bottom'
+ // 绘制背景
+ ctx.fillStyle = this.randomColor(this.backgroundColorMin, this.backgroundColorMax)
+ ctx.fillRect(0, 0, this.contentWidth, this.contentHeight)
+ // 绘制文字
+ for (let i = 0; i < this.code.length; i++) {
+ this.drawText(ctx, this.code[i], i)
+ }
+ this.drawLine(ctx)
+ this.drawDot(ctx)
+ this.$emit("success",this.code)
+ },
+ drawText (ctx, txt, i) {
+ ctx.fillStyle = this.randomColor(this.colorMin, this.colorMax)
+ let fontSize = this.randomNum(this.fontSizeMin, this.fontSizeMax)
+ ctx.font = fontSize + 'px SimHei'
+ let padding = 10;
+ let offset = (this.contentWidth-40)/(this.code.length-1)
+ let x=padding;
+ if(i>0){
+ x = padding+(i*offset)
+ }
+ //let x = (i + 1) * (this.contentWidth / (this.code.length + 1))
+ let y = this.randomNum(this.fontSizeMax, this.contentHeight - 5)
+ if(fontSize>40){
+ y=40
+ }
+ var deg = this.randomNum(-10,10)
+ // 修改坐标原点和旋转角度
+ ctx.translate(x, y)
+ ctx.rotate(deg * Math.PI / 180)
+ ctx.fillText(txt, 0, 0)
+ // 恢复坐标原点和旋转角度
+ ctx.rotate(-deg * Math.PI / 180)
+ ctx.translate(-x, -y)
+ },
+ drawLine (ctx) {
+ // 绘制干扰线
+ for (let i = 0; i <1; i++) {
+ ctx.strokeStyle = this.randomColor(this.lineColorMin, this.lineColorMax)
+ ctx.beginPath()
+ ctx.moveTo(this.randomNum(0, this.contentWidth), this.randomNum(0, this.contentHeight))
+ ctx.lineTo(this.randomNum(0, this.contentWidth), this.randomNum(0, this.contentHeight))
+ ctx.stroke()
+ }
+ },
+ drawDot (ctx) {
+ // 绘制干扰点
+ for (let i = 0; i < 100; i++) {
+ ctx.fillStyle = this.randomColor(0, 255)
+ ctx.beginPath()
+ ctx.arc(this.randomNum(0, this.contentWidth), this.randomNum(0, this.contentHeight), 1, 0, 2 * Math.PI)
+ ctx.fill()
+ }
+ },
+ reloadPic(){
+ this.drawPic()
+ },
+ randomCode(){
+ let random = ''
+ //去掉了I l i o O
+ let str = "QWERTYUPLKJHGFDSAZXCVBNMqwertyupkjhgfdsazxcvbnm1234567890"
+ for(let i = 0; i < this.length; i++) {
+ let index = Math.floor(Math.random()*57);
+ random += str[index];
+ }
+ this.code = random
+ }
+ },
+ mounted () {
+ this.drawPic()
+ },
+ data(){
+ return {
+ code:""
+ }
+ }
+
+ }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/jeecg/JSelectMultiple.vue b/ant-design-jeecg-vue/src/components/jeecg/JSelectMultiple.vue
index 323ad32..f320d04 100644
--- a/ant-design-jeecg-vue/src/components/jeecg/JSelectMultiple.vue
+++ b/ant-design-jeecg-vue/src/components/jeecg/JSelectMultiple.vue
@@ -4,7 +4,7 @@
v-for="(item,index) in options"
:key="index"
:value="item.value">
- {{ item.text }}
+ {{ item.text || item.label }}
</a-select-option>
</a-select>
</template>
diff --git a/ant-design-jeecg-vue/src/components/jeecg/JSlider.vue b/ant-design-jeecg-vue/src/components/jeecg/JSlider.vue
new file mode 100644
index 0000000..a5873f3
--- /dev/null
+++ b/ant-design-jeecg-vue/src/components/jeecg/JSlider.vue
@@ -0,0 +1,111 @@
+<template>
+ <div class="drag" ref="dragDiv">
+ <div class="drag_bg"></div>
+ <div class="drag_text">{{confirmWords}}</div>
+ <div ref="moveDiv" @mousedown="mousedownFn($event)" :class="{'handler_ok_bg':confirmSuccess}" class="handler handler_bg" style="border: 0.5px solid #fff;height: 34px;position: absolute;top: 0px;left: 0px;"></div>
+ </div>
+</template>
+
+<script>
+ export default {
+ name:"JSlider",
+ data(){
+ return {
+ beginClientX:0, /*距离屏幕左端距离*/
+ mouseMoveStata:false, /*触发拖动状态 判断*/
+ maxwidth:'', /*拖动最大宽度，依据滑块宽度算出来的*/
+ confirmWords:'拖动滑块验证', /*滑块文字*/
+ confirmSuccess:false /*验证成功判断*/
+ }
+ },
+ methods: {
+ isSuccess(){
+ return this.confirmSuccess
+ },
+ mousedownFn:function (e) {
+ if(!this.confirmSuccess){
+ e.preventDefault && e.preventDefault(); //阻止文字选中等 浏览器默认事件
+ this.mouseMoveStata = true;
+ this.beginClientX = e.clientX;
+ }
+ }, //mousedoen 事件
+ successFunction(){
+ this.confirmSuccess = true
+ this.confirmWords = '验证通过';
+ if(window.addEventListener){
+ document.getElementsByTagName('html')[0].removeEventListener('mousemove',this.mouseMoveFn);
+ document.getElementsByTagName('html')[0].removeEventListener('mouseup',this.moseUpFn);
+ }else {
+ document.getElementsByTagName('html')[0].removeEventListener('mouseup',()=>{});
+ }
+ document.getElementsByClassName('drag_text')[0].style.color = '#fff'
+ document.getElementsByClassName('handler')[0].style.left = this.maxwidth + 'px';
+ document.getElementsByClassName('drag_bg')[0].style.width = this.maxwidth + 'px';
+
+ this.$emit("onSuccess",true)
+ }, //验证成功函数
+ mouseMoveFn(e){
+ if(this.mouseMoveStata){
+ let width = e.clientX - this.beginClientX;
+ if(width>0 && width<=this.maxwidth){
+ document.getElementsByClassName('handler')[0].style.left = width + 'px';
+ document.getElementsByClassName('drag_bg')[0].style.width = width + 'px';
+ }else if(width>this.maxwidth){
+ this.successFunction();
+ }
+ }
+ }, //mousemove事件
+ moseUpFn(e){
+ this.mouseMoveStata = false;
+ var width = e.clientX - this.beginClientX;
+ if(width<this.maxwidth){
+ document.getElementsByClassName('handler')[0].style.left = 0 + 'px';
+ document.getElementsByClassName('drag_bg')[0].style.width = 0 + 'px';
+ }
+ } //mouseup事件
+ },
+ mounted(){
+ this.maxwidth = this.$refs.dragDiv.clientWidth - this.$refs.moveDiv.clientWidth;
+ document.getElementsByTagName('html')[0].addEventListener('mousemove',this.mouseMoveFn);
+ document.getElementsByTagName('html')[0].addEventListener('mouseup',this.moseUpFn)
+ }
+ }
+</script>
+
+<style scoped>
+ .drag{
+ position: relative;
+ background-color: #e8e8e8;
+ width: 100%;
+ height: 34px;
+ line-height: 34px;
+ text-align: center;
+ }
+ .handler{
+ width: 40px;
+ height: 32px;
+ border: 1px solid #ccc;
+ cursor: move;
+ }
+ .handler_bg{
+ background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTEyNTVEMURGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTEyNTVEMUNGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo2MTc5NzNmZS02OTQxLTQyOTYtYTIwNi02NDI2YTNkOWU5YmUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+YiRG4AAAALFJREFUeNpi/P//PwMlgImBQkA9A+bOnfsIiBOxKcInh+yCaCDuByoswaIOpxwjciACFegBqZ1AvBSIS5OTk/8TkmNEjwWgQiUgtQuIjwAxUF3yX3xyGIEIFLwHpKyAWB+I1xGSwxULIGf9A7mQkBwTlhBXAFLHgPgqEAcTkmNCU6AL9d8WII4HOvk3ITkWJAXWUMlOoGQHmsE45ViQ2KuBuASoYC4Wf+OUYxz6mQkgwAAN9mIrUReCXgAAAABJRU5ErkJggg==") no-repeat center;
+ }
+ .handler_ok_bg{
+ background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NDlBRDI3NjVGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NDlBRDI3NjRGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDphNWEzMWNhMC1hYmViLTQxNWEtYTEwZS04Y2U5NzRlN2Q4YTEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+k+sHwwAAASZJREFUeNpi/P//PwMyKD8uZw+kUoDYEYgloMIvgHg/EM/ptHx0EFk9I8wAoEZ+IDUPiIMY8IN1QJwENOgj3ACo5gNAbMBAHLgAxA4gQ5igAnNJ0MwAVTsX7IKyY7L2UNuJAf+AmAmJ78AEDTBiwGYg5gbifCSxFCZoaBMCy4A4GOjnH0D6DpK4IxNSVIHAfSDOAeLraJrjgJp/AwPbHMhejiQnwYRmUzNQ4VQgDQqXK0ia/0I17wJiPmQNTNBEAgMlQIWiQA2vgWw7QppBekGxsAjIiEUSBNnsBDWEAY9mEFgMMgBk00E0iZtA7AHEctDQ58MRuA6wlLgGFMoMpIG1QFeGwAIxGZo8GUhIysmwQGSAZgwHaEZhICIzOaBkJkqyM0CAAQDGx279Jf50AAAAAABJRU5ErkJggg==") no-repeat center;
+ }
+ .drag_bg{
+ background-color: #7ac23c;
+ height: 34px;
+ width: 0px;
+ }
+ .drag_text{
+ position: absolute;
+ top: 0px;
+ width: 100%;text-align: center;
+ -moz-user-select: none;
+ -webkit-user-select: none;
+ user-select: none;
+ -o-user-select:none;
+ -ms-user-select:none;
+ }
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/jeecg/JTreeTable.vue b/ant-design-jeecg-vue/src/components/jeecg/JTreeTable.vue
new file mode 100644
index 0000000..1d8d031
--- /dev/null
+++ b/ant-design-jeecg-vue/src/components/jeecg/JTreeTable.vue
@@ -0,0 +1,96 @@
+<template>
+ <a-table
+ :rowKey="rowKey"
+ :columns="columns"
+ :dataSource="dataSource"
+ v-bind="tableProps"
+ @expand="handleExpand"/>
+</template>
+
+<script>
+ import { getAction } from '@/api/manage'
+
+ export default {
+ name: 'JTreeTable',
+ props: {
+ rowKey: {
+ type: String,
+ default: 'id'
+ },
+ columns: {
+ type: Array,
+ required: true
+ },
+ url: {
+ type: String,
+ required: true
+ },
+ childrenUrl: {
+ type: String,
+ default: null
+ },
+ tableProps: {
+ type: Object,
+ default: () => {
+ }
+ }
+ },
+ data() {
+ return {
+ dataSource: []
+ }
+ },
+ computed: {
+ getChildrenUrl() {
+ if (this.childrenUrl) {
+ return this.childrenUrl
+ } else {
+ return this.url
+ }
+ }
+ },
+ created() {
+ this.loadData()
+ },
+ methods: {
+
+ /** 加载数据*/
+ loadData(id = '0', first = true, url = this.url) {
+ return getAction(url, { id }).then(res => {
+ let dataSource = res.result.map(item => {
+ // 判断是否标记了带有子级
+ if (item.hasChildren === true) {
+ // 定义默认展开时显示的loading子级，实际子级数据只在展开时加载
+ let loadChild = { id: `${item.id}_loadChild`, name: 'loading...', isLoading: true }
+ item.children = [loadChild]
+ }
+ return item
+ })
+ if (first) {
+ this.dataSource = dataSource
+ }
+ return Promise.resolve(dataSource)
+ })
+ },
+
+ /** 点击展开图标时触发 */
+ handleExpand(expanded, record) {
+ // 判断是否是展开状态
+ if (expanded) {
+ // 判断子级的首个项的标记是否是“正在加载中”，如果是就加载数据
+ if (record.children[0].isLoading === true) {
+ this.loadData(record.id, false, this.getChildrenUrl).then(dataSource => {
+ // 处理好的数据可直接赋值给children
+ record.children = dataSource
+ })
+ }
+ }
+ }
+
+ }
+ }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/jeecg/JUpload.vue b/ant-design-jeecg-vue/src/components/jeecg/JUpload.vue
new file mode 100644
index 0000000..b4cca3c
--- /dev/null
+++ b/ant-design-jeecg-vue/src/components/jeecg/JUpload.vue
@@ -0,0 +1,172 @@
+<template>
+ <a-upload
+ name="file"
+ :multiple="true"
+ :action="uploadAction"
+ :headers="headers"
+ :data="{'isup':1,'bizPath':bizPath}"
+ :fileList="fileList"
+ :beforeUpload="beforeUpload"
+ @change="handleChange">
+ <a-button>
+ <a-icon type="upload" />{{ text }}
+ </a-button>
+ </a-upload>
+</template>
+
+<script>
+
+ import Vue from 'vue'
+ import { ACCESS_TOKEN } from "@/store/mutation-types"
+
+ const FILE_TYPE_ALL = "all"
+ const FILE_TYPE_IMG = "image"
+ const FILE_TYPE_TXT = "file"
+ const uidGenerator=()=>{
+ return '-'+parseInt(Math.random()*10000+1,10);
+ }
+ const getFileName=(path)=>{
+ if(path.lastIndexOf("\\")>=0){
+ let reg=new RegExp("\\\\","g");
+ path = path.replace(reg,"/");
+ }
+ return path.substring(path.lastIndexOf("/")+1);
+ }
+ export default {
+ name: 'JUpload',
+ data(){
+ return {
+ uploadAction:window._CONFIG['domianURL']+"/sys/common/upload",
+ urlDownload:window._CONFIG['domianURL'] + "/sys/common/download/",
+ headers:{},
+ fileList: []
+ }
+ },
+ props:{
+ text:{
+ type:String,
+ required:false,
+ default:"点击上传"
+ },
+ fileType:{
+ type:String,
+ required:false,
+ default:FILE_TYPE_ALL
+ },
+ /*这个属性用于控制文件上传的业务路径*/
+ bizPath:{
+ type:String,
+ required:false,
+ default:"temp"
+ },
+ value:{
+ type:String,
+ required:false
+ },
+ triggerChange:{
+ type: Boolean,
+ required: false,
+ default: false
+ },
+ },
+ watch:{
+ value(val){
+ this.initFileList(val)
+ }
+ },
+ created(){
+ const token = Vue.ls.get(ACCESS_TOKEN);
+ this.headers = {"X-Access-Token":token}
+ },
+
+ methods:{
+ initFileList(paths){
+ if(!paths || paths.length==0){
+ return [];
+ }
+ let fileList = [];
+ let arr = paths.split(",")
+ for(var a=0;a<arr.length;a++){
+ fileList.push({
+ uid:uidGenerator(),
+ name:getFileName(arr[a]),
+ status: 'done',
+ url: this.urlDownload+arr[a],
+ response:{
+ status:"history",
+ message:arr[a]
+ }
+ })
+ }
+ this.fileList = fileList
+ },
+ handlePathChange(){
+ let uploadFiles = this.fileList
+ let path = ''
+ if(!uploadFiles || uploadFiles.length==0){
+ path = ''
+ }
+ let arr = [];
+
+ for(var a=0;a<uploadFiles.length;a++){
+ arr.push(uploadFiles[a].response.message)
+ }
+ if(arr.length>0){
+ path = arr.join(",")
+ }
+ if(this.triggerChange){
+ this.$emit('change', path);
+ }else{
+ this.$emit('input', path);
+ }
+ },
+ beforeUpload(file){
+ var fileType = file.type;
+ if(fileType===FILE_TYPE_IMG){
+ if(fileType.indexOf('image')<0){
+ this.$message.warning('请上传图片');
+ return false;
+ }
+ }else if(fileType===FILE_TYPE_TXT){
+ if(fileType.indexOf('image')>=0){
+ this.$message.warning('请上传文件');
+ return false;
+ }
+ }
+ //TODO 扩展功能验证文件大小
+ return true
+ },
+ handleChange(info) {
+ console.log("--文件列表改变--")
+ let fileList = info.fileList
+ if(info.file.status==='done'){
+ if(info.file.response.success){
+ fileList = fileList.map((file) => {
+ if (file.response) {
+ file.url = this.urlDownload+file.response.message;
+ }
+ return file;
+ });
+ }
+ this.$message.success(`${info.file.name} 上传成功!`);
+ }else if (info.file.status === 'error') {
+ this.$message.error(`${info.file.name} 上传失败.`);
+ }else if(info.file.status === 'removed'){
+ this.handleDelete(info.file)
+ }
+ this.fileList = fileList
+ if(info.file.status==='done' || info.file.status === 'removed'){
+ this.handlePathChange()
+ }
+ },
+ handleDelete(file){
+ //如有需要新增 删除逻辑
+ console.log(file)
+ },
+ }
+ }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/jeecg/README.md b/ant-design-jeecg-vue/src/components/jeecg/README.md
index 0947e1c..d309fbd 100644
--- a/ant-design-jeecg-vue/src/components/jeecg/README.md
+++ b/ant-design-jeecg-vue/src/components/jeecg/README.md
@@ -196,3 +196,87 @@ this.$refs.superQueryModal.show();
modaltoggleFlag:true,
```
+# <a-select/> 下拉选项滚动错位的解决方法
+
+## 问题描述
+
+当使用了 `a-modal` 或其他带有滚动条的组件时，使用`a-select`组件并打开下拉框时滚动滚动条，就会导致错位的问题产生。
+
+## 解决方法
+
+大多数情况下，在 `a-select` 上添加一个 `getPopupContainer` 属性，值为`node => node.parentNode`即可解决。
+但是如果遇到 `a-select` 标签层级过深的情况，可能仍然会显示异常，只需要多加几个`.parentNode` （例：node => node.parentNode.parentNode.parentNode）多尝试几次直到解决问题即可。
+
+### 代码示例
+
+```html
+<a-select
+ placeholder="请选择展示模板"
+ :options="dicts.displayTemplate"
+ :getPopupContainer="node => node.parentNode"
+/>
+```
+
+# JAsyncTreeList 异步数列表组件使用说明
+
+## 引入组件
+
+```js
+import JTreeTable from '@/components/jeecg/JTreeTable'
+export default {
+ components: { JTreeTable }
+}
+```
+
+## 所需参数
+
+| 参数 | 类型 | 必填 | 说明 |
+|-------------|--------|-----|------------------------------------------------------------|
+| rowKey | String | 非必填 | 表格行 key 的取值，默认为"id" |
+| columns | Array | 必填 | 表格列的配置描述，具体见Antd官方文档 |
+| url | String | 必填 | 数据查询url |
+| childrenUrl | String | 非必填 | 查询子级时的url，若不填则使用url参数查询子级 |
+| tableProps | Object | 非必填 | 自定义给内部table绑定的props |
+
+## 代码示例
+
+```html
+<template>
+ <a-card :bordered="false">
+ <j-tree-table :url="url" :columns="columns" :tableProps="tableProps"/>
+ </a-card>
+</template>
+
+<script>
+ import JTreeTable from '@/components/jeecg/JTreeTable'
+
+ export default {
+ name: 'AsyncTreeTable',
+ components: { JTreeTable },
+ data() {
+ return {
+ url: '/api/asynTreeList',
+ columns: [
+ { title: '菜单名称', dataIndex: 'name' },
+ { title: '组件', dataIndex: 'component' },
+ { title: '排序', dataIndex: 'orderNum' }
+ ],
+ selectedRowKeys: []
+ }
+ },
+ computed: {
+ tableProps() {
+ let _this = this
+ return {
+ // 列表项是否可选择
+ // 配置项见：https://vue.ant.design/components/table-cn/#rowSelection
+ rowSelection: {
+ selectedRowKeys: _this.selectedRowKeys,
+ onChange: (selectedRowKeys) => _this.selectedRowKeys = selectedRowKeys
+ }
+ }
+ }
+ }
+ }
+</script>
+```
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/jeecg/README_JEditableTable.md b/ant-design-jeecg-vue/src/components/jeecg/README_JEditableTable.md
index 2604410..b25dce8 100644
--- a/ant-design-jeecg-vue/src/components/jeecg/README_JEditableTable.md
+++ b/ant-design-jeecg-vue/src/components/jeecg/README_JEditableTable.md
@@ -15,16 +15,16 @@
### columns 参数详解
-| 参数 | 类型 | 必填 | 说明 |
-|---------------|--------|----|----------------------------------------------------------------------|
-| title | string | ✔️ | 表格列头显示的问题 |
-| key | string | ✔️ | 列数据在数据项中对应的 key，必须是唯一的 |
-| type | string | ✔️ | 表单的类型，可以通过`JEditableTableUtil.FormTypes`赋值 |
+| 参数 | 类型 | 必填 | 说明 |
+|---------------|--------|----|---------------------------------------------------------------------------------|
+| title | string | ✔️ | 表格列头显示的问题 |
+| key | string | ✔️ | 列数据在数据项中对应的 key，必须是唯一的 |
+| type | string | ✔️ | 表单的类型，可以通过`JEditableTableUtil.FormTypes`赋值 |
| width | string | | 列的宽度，可以是百分比，也可以是`px`或其他单位，建议设置为百分比，且每一列的宽度加起来不应超过100%，否则可能会不能达到预期的效果。留空会自动计算百分比 |
-| placeholder | string | | 表单预期值的提示信息，可以使用`${...}`变量替换文本（详见`${...} 变量使用方式`） |
-| defaultValue | string | | 默认值，在新增一行时生效 |
-| validateRules | array | | 表单验证规则，配置方式见[validateRules 配置规则](#validaterules-配置规则) |
-| props | object | | 设置添加给表单元素的自定义属性，例如:`props:{title: 'show title'}` |
+| placeholder | string | | 表单预期值的提示信息，可以使用`${...}`变量替换文本（详见`${...} 变量使用方式`） |
+| defaultValue | string | | 默认值，在新增一行时生效 |
+| validateRules | array | | 表单验证规则，配置方式见[validateRules 配置规则](#validaterules-配置规则) |
+| props | object | | 设置添加给表单元素的自定义属性，例如:`props:{title: 'show title'}` |
#### 当 type=checkbox 时所需的参数
@@ -41,10 +41,25 @@
##### options 所需参数
-| 参数 | 类型 | 必填 | 说明 |
-|-------|--------|----|------|
-| title | string | ✔️ | 显示标题 |
-| value | string | ✔️ | 真实值 |
+| 参数 | 类型 | 必填 | 说明 |
+|-----------|------------|----|-----------------------------------------------|
+| text | string | ✔️ | 显示标题 |
+| value | string | ✔️ | 真实值 |
+| ~~title~~ | ~~string~~ | | ~~显示标题（已废弃，若同时填写了 title 和 text 那么优先使用 text）~~ |
+
+#### 当 type=upload 时所需的参数
+
+| 参数 | 类型 | 必填 | 说明 |
+|--------------|---------|----|------------------------------------------------|
+| action | string | ✔️ | 上传文件路径 |
+| token | boolean | | 上传的时候是否传递token |
+| responseName | string | ✔️ | 若要从上传成功后从response中取出返回的文件名，那么这里填后台返回的包含文件名的字段名 |
+
+#### 当 type=slot 时所需的参数
+
+| 参数 | 类型 | 必填 | 说明 |
+|--------------|---------|----|------------------------------------------------|
+| slot | string | ✔️ | slot的名称 |
### validateRules 配置规则
@@ -128,18 +143,53 @@
|----------|----------|----|-----------------------------------------------------------------------------------------------|
| callback | function | ✔️ | 获取值的回调方法，会传入`error`和`values`两个参数。`error`：未通过验证的数量，当等于`0`时代表验证通过；`values`：获取的值（即使未通过验证该字段也有数据） |
| validate | boolean | | 是否进行表单验证，默认为`true`，设为`false`则代表忽略表单验证 |
+| rowIds | array | | 默认返回所有行的数据，如果传入了`rowIds`，那么就会只返回与该`rowIds`相匹配的数据，如果没有匹配的数据，就会返回空数组 |
- `返回值:` 无
+
+### getValuesSync
+
+`getValues`的同步版，会直接将获取到的数据返回
+
+- `参数:`
+
+| 参数名 | 类型 | 必填 | 说明 |
+|---------|--------|----|-------------|
+| options | object | | 选项，详见下方所需参数 |
+
+- - `options` 所需参数
+
+| 参数名 | 类型 | 必填 | 说明 |
+|----------|---------|----|--------------------------------------------------------------------|
+| validate | boolean | | 是否进行表单验证，默认为`true`，设为`false`则代表忽略表单验证 |
+| rowIds | array | | 默认返回所有行的数据，如果传入了`rowIds`，那么就会只返回与该`rowIds`相匹配的数据，如果没有匹配的数据，就会返回空数组 |
+
+- `返回值:` object
+ - `error` 未通过验证的数量，当等于`0`时代表验证通过
+ - `values` 获取的值（即使未通过验证该字段也有数据）
+
+- `使用示例`
+
+```js
+let { error, values } = this.$refs.editableTable.getValuesSync({ validate: true, rowIds: ['rowId1', 'rowId2'] })
+if (error === 0) {
+ console.log('表单验证通过，数据：', values);
+} else {
+ console.log('未通过表单验证，数据：', values);
+}
+```
+
### getValuesPromise
`getValues`的promise版，会在`resolve`中传入获取到的值，会在`reject`中传入失败原因，例如`VALIDATE_NO_PASSED`
- `参数:`
-| 参数名 | 类型 | 必填 | 说明 |
-|----------|---------|----|---------------------------|
-| validate | boolean | | 同`getValues`的`validate`参数 |
+| 参数名 | 类型 | 必填 | 说明 |
+|----------|---------|----|--------------------------------------------------------------------|
+| validate | boolean | | 同`getValues`的`validate`参数 |
+| rowIds | array | | 默认返回所有行的数据，如果传入了`rowIds`，那么就会只返回与该`rowIds`相匹配的数据，如果没有匹配的数据，就会返回空数组 |
- `返回值:` Promise
@@ -219,6 +269,8 @@ setValues([
- `select` 显示选择器（下拉框）
- `date` 日期选择器
- `datetime` 日期时间选择器
+- `upload` 上传组件（文件域）
+- `slot` 自定义插槽
### VALIDATE_NO_PASSED
@@ -284,7 +336,7 @@ validateTables(cases).then((all) => {
### 为什么使用了ATab组件后，切换选项卡会导致白屏或滚动条位置会归零？
在ATab组件中确实会导致滚动条位置归零，且不会触发`onscroll`方法，所以无法动态加载行，导致白屏的问题出现。
-解决方法是在ATab组件的`onChange`事件触发时执行`resetScrollTop()`即可，但是需要注意的是：代码主动改变ATab的`activeKey`不会触发`onChange`事件，还需要你手动调用下
+解决方法是在ATab组件的`onChange`事件触发时执行实例提供的`resetScrollTop()`方法即可，但是需要注意的是：代码主动改变ATab的`activeKey`不会触发`onChange`事件，还需要你手动调用下。
- `示例`
@@ -322,7 +374,11 @@ methods: {
/*--- 忽略部分代码片段 ---*/
```
-----
+### slot(自定义插槽)如何使用？
+
+代码示例请看：[示例四(slot)](#示例四(slot))
+
+----------------------------------------------------------------------------------------
## 示例一
@@ -393,4 +449,57 @@ this.$refs.editableTable.getValues((error, values) => {
this.$message.error('验证未通过')
}
})
+```
+
+## 示例四(slot)
+
+```html
+<template>
+ <j-editable-table :columns="columns" :dataSource="dataSource">
+ <!-- 定义插槽 -->
+ <!-- 这种定义插槽的写法是vue推荐的新版写法（https://cn.vuejs.org/v2/guide/components-slots.html#具名插槽），旧版已被废弃的写法不再支持 -->
+ <!-- 若webstorm这样写报错，请看这篇文章：https://blog.csdn.net/lxq_9532/article/details/81870651 -->
+ <template v-slot:action="props">
+ <a @click="handleDelete(props)">删除</a>
+ </template>
+ </j-editable-table>
+</template>
+<script>
+ import { FormTypes } from '@/utils/JEditableTableUtil'
+ import JEditableTable from '@/components/jeecg/JEditableTable'
+ export default {
+ components: { JEditableTable },
+ data() {
+ return {
+ columns: [
+ // ...
+ {
+ title: '操作',
+ key: 'action',
+ width: '8%',
+ type: FormTypes.slot, // 定义该列为 自定义插值列
+ slot: 'action' // slot 的名称，对应 v-slot 冒号后面和等号前面的内容
+ }
+ ]
+ }
+ },
+ methods: {
+ /* a 标签的点击事件，删除当前选中的行 */
+ handleDelete(props) {
+ // 参数解释
+ // props.text ：当前值，可能是defaultValue定义的值，也可能是从dataSource中取出的值
+ // props.rowId ：当前选中行的id，如果是新增行则是临时id
+ // props.column ：当前操作的列
+ // props.getValue ：这是一个function，执行后可以获取当前行的所有值（禁止在template中使用）
+ // 例：const value = props.getValue()
+ // props.target ：触发当前事件的实例，可直接调用该实例内的方法（禁止在template中使用）
+ // 例：target.add()
+
+ // 使用实例：删除当前操作的行
+ let { rowId, target } = props
+ target.removeRows(rowId)
+ }
+ }
+ }
+</script>
```
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/jeecgbiz/JSearchUserByDep.vue b/ant-design-jeecg-vue/src/components/jeecgbiz/JSearchUserByDep.vue
index e3dc7e0..c937c42 100644
--- a/ant-design-jeecg-vue/src/components/jeecgbiz/JSearchUserByDep.vue
+++ b/ant-design-jeecg-vue/src/components/jeecgbiz/JSearchUserByDep.vue
@@ -29,7 +29,7 @@
用户账号:
<a-input-search
:style="{width:'150px',marginBottom:'15px'}"
- placeholder="请输入用户名搜索"
+ placeholder="请输入用户账号"
v-model="queryParam.username"
@search="onSearch"
></a-input-search>
@@ -194,13 +194,13 @@
},
searchReset(num) {
let that = this;
+ if(num !== 0){
+ that.queryParam = {};
+ that.loadData(1);
+ }
that.selectedRowKeys = [];
that.userNameArr = [];
- that.queryParam = {};
that.selectedKeys = [];
- if(num !== 0){
- that.loadData();
- }
},
close() {
this.searchReset(0);
diff --git a/ant-design-jeecg-vue/src/components/jeecgbiz/JSelectDepart.vue b/ant-design-jeecg-vue/src/components/jeecgbiz/JSelectDepart.vue
new file mode 100644
index 0000000..26bceb4
--- /dev/null
+++ b/ant-design-jeecg-vue/src/components/jeecgbiz/JSelectDepart.vue
@@ -0,0 +1,125 @@
+<template>
+ <div class="components-input-demo-presuffix">
+ <!---->
+ <a-input @click="openModal" placeholder="请点击选择部门" v-model="departNames" readOnly :disabled="disabled">
+ <a-icon slot="prefix" type="cluster" title="部门选择控件"/>
+ <a-icon v-if="departIds" slot="suffix" type="close-circle" @click="handleEmpty" title="清空"/>
+ </a-input>
+
+ <j-select-depart-modal
+ ref="innerDepartSelectModal"
+ :modal-width="modalWidth"
+ :multi="multi"
+ :rootOpened="rootOpened"
+ :depart-id="value"
+ @ok="handleOK"
+ @initComp="initComp"/>
+ </div>
+</template>
+
+<script>
+ import JSelectDepartModal from './modal/JSelectDepartModal'
+ export default {
+ name: 'JSelectDepart',
+ components:{
+ JSelectDepartModal
+ },
+ props:{
+ modalWidth:{
+ type:Number,
+ default:500,
+ required:false
+ },
+ multi:{
+ type:Boolean,
+ default:false,
+ required:false
+ },
+ rootOpened:{
+ type:Boolean,
+ default:true,
+ required:false
+ },
+ value:{
+ type:String,
+ required:false
+ },
+ triggerChange:{
+ type: Boolean,
+ required: false,
+ default: false
+ },
+ disabled:{
+ type: Boolean,
+ required: false,
+ default: false
+ }
+ },
+ data(){
+ return {
+ visible:false,
+ confirmLoading:false,
+ departNames:"",
+ departIds:''
+ }
+ },
+ mounted(){
+ this.departIds = this.value
+ },
+ watch:{
+ value(val){
+ this.departIds = val
+ }
+ },
+ methods:{
+ initComp(departNames){
+ this.departNames = departNames
+ },
+ openModal(){
+ this.$refs.innerDepartSelectModal.show()
+ },
+ handleOK(rows,idstr){
+ console.log("当前选中部门",rows)
+ console.log("当前选中部门ID",idstr)
+ if(!rows){
+ this.departNames = ''
+ this.departIds=''
+ }else{
+ let temp = ''
+ for(let item of rows){
+ temp+=','+item.departName
+ }
+ this.departNames = temp.substring(1)
+ this.departIds=idstr
+ }
+
+ if(this.triggerChange){
+ this.$emit("change",this.departIds)
+ }else{
+ this.$emit("input",this.departIds)
+ }
+ },
+ getDepartNames(){
+ return this.departNames
+ },
+ handleEmpty(){
+ this.handleOK('')
+ }
+ }
+ }
+</script>
+
+<style scoped>
+ .components-input-demo-presuffix .anticon-close-circle {
+ cursor: pointer;
+ color: #ccc;
+ transition: color 0.3s;
+ font-size: 12px;
+ }
+ .components-input-demo-presuffix .anticon-close-circle:hover {
+ color: #f5222d;
+ }
+ .components-input-demo-presuffix .anticon-close-circle:active {
+ color: #666;
+ }
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/jeecgbiz/JSelectMultiUser.vue b/ant-design-jeecg-vue/src/components/jeecgbiz/JSelectMultiUser.vue
new file mode 100644
index 0000000..00f6ced
--- /dev/null
+++ b/ant-design-jeecg-vue/src/components/jeecgbiz/JSelectMultiUser.vue
@@ -0,0 +1,70 @@
+<template>
+ <div style="width: 100%;">
+ <a-select
+ mode="multiple"
+ placeholder="Please select"
+ :value="nameList"
+ style="width: calc(100% - 178px);">
+ </a-select>
+ <span style="display: inline-block;width:170px;float: right;overflow: hidden;">
+ <a-button type="primary" @click="handleSelect" icon="search" style="width: 81px">选择</a-button>
+ <a-button type="primary" @click="selectReset" icon="reload" style="margin-left: 8px;width: 81px">清空</a-button>
+ </span>
+
+ <!-- 选择多个用户支持排序 -->
+ <j-select-multi-user-modal ref="selectModal" @selectFinished="selectOK"/>
+ </div>
+</template>
+
+<script>
+ import JSelectMultiUserModal from './modal/JSelectMultiUserModal'
+ export default {
+ name: 'JSelectMultiUser',
+ components:{ JSelectMultiUserModal },
+ props:{
+ value:{
+ type:String,
+ required:false
+ },
+ triggerChange:{
+ type: Boolean,
+ required: false,
+ default: false
+ }
+ },
+ data(){
+ return {
+ selectList: [],
+ }
+ },
+ computed: {
+ nameList: function () {
+ var names = [];
+ for (var a = 0; a < this.selectList.length; a++) {
+ names.push(this.selectList[a].name);
+ }
+ let nameStr = ''
+ if(names.length>0){
+ nameStr = names.join(",")
+ }
+ if(this.triggerChange){
+ this.$emit("change",nameStr)
+ }else{
+ this.$emit("input",nameStr)
+ }
+ return names;
+ }
+ },
+ methods:{
+ handleSelect: function () {
+ this.$refs.selectModal.add();
+ },
+ selectReset() {
+ this.selectList = [];
+ },
+ selectOK: function (data) {
+ this.selectList = data;
+ }
+ }
+ }
+</script>
diff --git a/ant-design-jeecg-vue/src/components/jeecgbiz/SelectMultipleUserModal.vue b/ant-design-jeecg-vue/src/components/jeecgbiz/JSelectMultipleUser.vue
index 70d65b2..c9b5de9 100644
--- a/ant-design-jeecg-vue/src/components/jeecgbiz/SelectMultipleUserModal.vue
+++ b/ant-design-jeecg-vue/src/components/jeecgbiz/JSelectMultipleUser.vue
@@ -10,7 +10,7 @@
cancelText="关闭">
<a-row :gutter="18">
<a-col :span="16">
- <a-card title="选择人员" :bordered=true>
+ <a-card title="选择人员" :bordered="true">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline">
@@ -51,7 +51,7 @@
</a-card>
</a-col>
<a-col :span="8">
- <a-card title="用户选择" :bordered=true>
+ <a-card title="用户选择" :bordered="true">
<!-- table区域-begin -->
<div>
<a-table
diff --git a/ant-design-jeecg-vue/src/components/jeecgbiz/JSelectUserByDep.vue b/ant-design-jeecg-vue/src/components/jeecgbiz/JSelectUserByDep.vue
new file mode 100644
index 0000000..0ec741c
--- /dev/null
+++ b/ant-design-jeecg-vue/src/components/jeecgbiz/JSelectUserByDep.vue
@@ -0,0 +1,76 @@
+<template>
+ <div>
+ <a-input-search
+ v-model="selectedDepUsers"
+ placeholder="请先选择用户"
+ disabled
+ @search="onSearchDepUser">
+ <a-button slot="enterButton" :disabled="disabled">选择用户</a-button>
+ </a-input-search>
+ <j-select-user-by-dep-modal
+ ref="selectModal"
+ :modal-width="modalWidth"
+ @ok="onSearchDepUserCallBack" />
+ </div>
+</template>
+
+<script>
+ import JSelectUserByDepModal from './modal/JSelectUserByDepModal'
+ export default {
+ name: 'JSelectUserByDep',
+ components: { JSelectUserByDepModal },
+ props:{
+ modalWidth:{
+ type:Number,
+ default:1250,
+ required:false
+ },
+ value:{
+ type:String,
+ required:false
+ },
+ triggerChange:{
+ type: Boolean,
+ required: false,
+ default: false
+ },
+ disabled:{
+ type: Boolean,
+ required: false,
+ default: false
+ }
+ },
+ data() {
+ return {
+ selectedDepUsers:"",
+ }
+ },
+ mounted(){
+ this.selectedDepUsers = this.value
+ },
+ watch:{
+ value(val){
+ this.selectedDepUsers = val
+ }
+ },
+ methods: {
+ //通过组织机构筛选选择用户
+ onSearchDepUser() {
+ this.$refs.selectModal.showModal()
+ this.onSearchDepUserCallBack('')
+ },
+ onSearchDepUserCallBack(selectedDepUsers) {
+ this.selectedDepUsers = selectedDepUsers
+ if(this.triggerChange){
+ this.$emit("change",selectedDepUsers)
+ }else{
+ this.$emit("input",selectedDepUsers)
+ }
+ }
+ }
+ }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/jeecgbiz/SearchUserByDepModal.vue b/ant-design-jeecg-vue/src/components/jeecgbiz/SearchUserByDepModal.vue
deleted file mode 100644
index 20c9768..0000000
--- a/ant-design-jeecg-vue/src/components/jeecgbiz/SearchUserByDepModal.vue
+++ /dev/null
@@ -1,308 +0,0 @@
-<template>
- <a-modal
- :width="modalWidth"
- :visible="visible"
- :title="title"
- @ok="handleSubmit"
- @cancel="close"
- cancelText="关闭"
- style="margin-top: -70px"
- wrapClassName="ant-modal-cust-warp"
- >
- <a-row :gutter="10" style="background-color: #ececec; padding: 10px; margin: -10px">
- <a-col :md="6" :sm="24">
- <a-card :bordered="false">
- <!--组织机构-->
- <a-directory-tree
- selectable
- :selectedKeys="selectedKeys"
- :checkStrictly="true"
- @select="this.onSelect"
- :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
- :treeData="departTree"
- />
- </a-card>
- </a-col>
- <a-col :md="18" :sm="24">
- <a-card :bordered="false">
- 用户账号:
- <a-input-search
- :style="{width:'150px',marginBottom:'15px'}"
- placeholder=""
- v-model="queryParam.username"
- @search="onSearch"
- />
- <a-button @click="searchReset" style="margin-left: 10px" icon="redo">重置</a-button>
- <!--用户列表-->
- <a-table
- ref="table"
- :scroll="scrollTrigger"
- size="middle"
- rowKey="id"
- :columns="columns"
- :dataSource="dataSource"
- :pagination="ipagination"
- style="background-color: white"
- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
- @change="handleTableChange">
- </a-table>
- </a-card>
- </a-col>
- </a-row>
- </a-modal>
-</template>
-
-<script>
- import { filterObj } from '@/utils/util'
- import { queryDepartTreeList, getUserList, queryUserByDepId, queryUserRoleMap } from '@/api/api'
-
- export default {
- name: 'SearchUserByDepModal',
- components: {
- },
- data() {
- return {
- queryParam: {},
- columns: [
- {
- title: '用户账号',
- align: 'center',
- dataIndex: 'username'
- },
- {
- title: '真实姓名',
- align: 'center',
- dataIndex: 'realname'
- },
- {
- title: '角色名称',
- align: 'center',
- dataIndex: 'roleName'
- },
- {
- title: '性别',
- align: 'center',
- dataIndex: 'sex',
- customRender: function(text) {
- if (text === 1) {
- return '男'
- } else if (text === 2) {
- return '女'
- } else {
- return text
- }
- }
- },
- {
- title: '手机号码',
- align: 'center',
- dataIndex: 'phone'
- },
- {
- title: '邮箱',
- align: 'center',
- dataIndex: 'email'
- }
- ],
- scrollTrigger:{},
- dataSource: [],
- selectedKeys: [],
- userNames: [],
- departName: '',
- userRolesMap: {},
- title: '',
- ipagination: {
- current: 1,
- pageSize: 10,
- pageSizeOptions: ['10', '20', '30'],
- showTotal: (total, range) => {
- return range[0] + '-' + range[1] + ' 共' + total + '条'
- },
- showQuickJumper: true,
- showSizeChanger: true,
- total: 0
- },
- isorter: {
- column: 'createTime',
- order: 'desc'
- },
- selectedRowKeys: [],
- selectedRows: [],
- userData: [],
- modalWidth: 1250,
- departTree: [],
- visible: false,
- form: this.$form.createForm(this),
- }
- },
- created() {
- // 该方法触发屏幕自适应
- this.resetScreenSize();
- },
- methods: {
- loadData(arg) {
- if (arg === 1) {
- this.ipagination.current = 1;
- }
- let params = this.getQueryParams();//查询条件
- getUserList(params).then((res) => {
- if (res.success) {
- this.dataSource = res.result.records;
- this.assignRoleName(this.dataSource);
- this.userData = res.result.records;
- this.ipagination.total = res.result.total;
- }
- })
- queryUserRoleMap().then((res) => {
- if (res.success) {
- this.userRolesMap = res.result;
- }
- })
- },
- // 触发屏幕自适应
- resetScreenSize(){
- let screenWidth = document.body.clientWidth;
- if(screenWidth < 500){
- this.scrollTrigger = {x : 800};
- }else{
- this.scrollTrigger = {};
- }
- },
- showModal() {
- this.visible = true;
- this.assignRoleName(this.dataSource);
- this.queryDepartTree();
- this.form.resetFields();
- this.loadData(1);
- },
- getQueryParams() {
- let param = Object.assign({}, this.queryParam, this.isorter);
- param.field = this.getQueryField();
- param.pageNo = this.ipagination.current;
- param.pageSize = this.ipagination.pageSize;
- return filterObj(param);
- },
- getQueryField() {
- let str = 'id,';
- for (let a = 0; a < this.columns.length; a++) {
- str += ',' + this.columns[a].dataIndex;
- }
- return str;
- },
- searchReset(num) {
- let that = this;
- if(num !== 0){
- that.loadData(1);
- }
- that.selectedRowKeys = [];
- that.userNames = [];
- that.queryParam = {};
- that.selectedKeys = [];
- that.userNames = [];
- },
- close() {
- this.$emit('close');
- this.searchReset(0);
- this.visible = false;
- },
- handleTableChange(pagination, filters, sorter) {
- //TODO 筛选
- if (Object.keys(sorter).length > 0) {
- this.isorter.column = sorter.field;
- this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc';
- }
- this.ipagination = pagination;
- this.loadData();
- },
- handleSubmit() {
- const that = this;
- for (let i = 0, len = this.selectedRowKeys.length; i < len; i++) {
- this.getUserNames(this.selectedRowKeys[i]);
- }
- that.$emit('ok', that.userNames.join(','));
- that.close();
- },
- // 遍历匹配,获取用户真实姓名
- getUserNames(rowId) {
- let dataSource = this.dataSource;
- for (let i = 0, len = dataSource.length; i < len; i++) {
- if (rowId === dataSource[i].id) {
- this.userNames.push(dataSource[i].realname);
- }
- }
- },
- // 点击树节点,筛选出对应的用户
- onSelect(selectedKeys) {
- if (selectedKeys[0] != null) {
- this.queryUser(selectedKeys) // 调用方法根据选选择的id查询用户信息
- if (this.selectedKeys[0] !== selectedKeys[0]) {
- this.selectedKeys = [selectedKeys[0]];
- }
- }
- },
- onSelectChange(selectedRowKeys, selectionRows) {
- this.selectedRowKeys = selectedRowKeys;
- this.selectionRows = selectionRows;
- },
- onSearch() {
- this.loadData(1);
- },
- // 根据选择的id来查询用户信息
- queryUser(selectedKeys) {
- queryUserByDepId({ id: selectedKeys.toString() }).then((res) => {
- if (res.success) {
- this.ipagination.total = res.result.length;
- this.dataSource = res.result;
- this.assignRoleName(this.dataSource);
- }
- })
- },
- // 传入用户id,找到匹配的角色名称
- queryUserRole(userId) {
- let map = this.userRolesMap;
- let roleName = [];
- for (var key in map) {
- if (userId === key) {
- roleName.push(map[key]);
- }
- }
- return roleName.join(',');
- },
- queryDepartTree() {
- queryDepartTreeList().then((res) => {
- if (res.success) {
- this.departTree = res.result;
- }
- })
- },
- // 为角色名称赋值
- assignRoleName(data) {
- let userId = '';
- let role = '';
- for (let i = 0, length = data.length; i < length; i++) {
- userId = this.dataSource[i].id;
- role = this.queryUserRole(userId);
- this.dataSource[i].roleName = role;
- }
- },
- modalFormOk() {
- this.loadData();
- }
- }
- }
-</script>
-
-<style scoped>
- .ant-table-tbody .ant-table-row td {
- padding-top: 10px;
- padding-bottom: 10px;
- }
-
- #components-layout-demo-custom-trigger .trigger {
- font-size: 18px;
- line-height: 64px;
- padding: 0 24px;
- cursor: pointer;
- transition: color .3s;
- }
-</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/jeecgbiz/modal/JSelectDepartModal.vue b/ant-design-jeecg-vue/src/components/jeecgbiz/modal/JSelectDepartModal.vue
new file mode 100644
index 0000000..71f6759
--- /dev/null
+++ b/ant-design-jeecg-vue/src/components/jeecgbiz/modal/JSelectDepartModal.vue
@@ -0,0 +1,216 @@
+<template>
+ <a-modal
+ title="选择部门"
+ :width="modalWidth"
+ :visible="visible"
+ :confirmLoading="confirmLoading"
+ @ok="handleSubmit"
+ @cancel="handleCancel"
+ cancelText="关闭">
+ <a-spin tip="Loading..." :spinning="false">
+ <a-input-search style="margin-bottom: 1px" placeholder="请输入部门名称按回车进行搜索" @search="onSearch" />
+ <a-tree
+ checkable
+ :treeData="treeData"
+ :checkStrictly="true"
+ @check="onCheck"
+ @select="onSelect"
+ @expand="onExpand"
+ :autoExpandParent="autoExpandParent"
+ :expandedKeys="expandedKeys"
+ :checkedKeys="checkedKeys">
+
+ <template slot="title" slot-scope="{title}">
+ <span v-if="title.indexOf(searchValue) > -1">
+ {{title.substr(0, title.indexOf(searchValue))}}
+ <span style="color: #f50">{{searchValue}}</span>
+ {{title.substr(title.indexOf(searchValue) + searchValue.length)}}
+ </span>
+ <span v-else>{{title}}</span>
+ </template>
+ </a-tree>
+
+ </a-spin>
+ </a-modal>
+</template>
+
+<script>
+ import { queryDepartTreeList } from '@/api/api'
+ export default {
+ name: 'JSelectDepartModal',
+ props:['modalWidth','multi','rootOpened','departId'],
+ data(){
+ return {
+ visible:false,
+ confirmLoading:false,
+ treeData:[],
+ autoExpandParent:true,
+ expandedKeys:[],
+ dataList:[],
+ checkedKeys:[],
+ checkedRows:[],
+ searchValue:""
+ }
+ },
+ created(){
+ this.loadDepart();
+ },
+ watch:{
+ departId(){
+ this.initDepartComponent()
+ }
+ },
+ methods:{
+ show(){
+ this.visible=true
+ this.checkedRows=[]
+ this.checkedKeys=[]
+ console.log("this.multi",this.multi)
+ },
+ loadDepart(){
+ queryDepartTreeList().then(res=>{
+ if(res.success){
+ let arr = [...res.result]
+ this.reWriterWithSlot(arr)
+ this.treeData = arr
+ this.initDepartComponent()
+ if(this.rootOpened){
+ this.initExpandedKeys(res.result)
+ }
+ }
+ })
+ },
+ initDepartComponent(){
+ let names = ''
+ if(this.departId){
+ let currDepartId = this.departId
+ for(let item of this.dataList){
+ if(currDepartId.indexOf(item.key)>=0){
+ names+=","+item.title
+ }
+ }
+ if(names){
+ names = names.substring(1)
+ }
+ }
+ this.$emit("initComp",names)
+ },
+ reWriterWithSlot(arr){
+ for(let item of arr){
+ if(item.children && item.children.length>0){
+ this.reWriterWithSlot(item.children)
+ let temp = Object.assign({},item)
+ temp.children = {}
+ this.dataList.push(temp)
+ }else{
+ this.dataList.push(item)
+ item.scopedSlots={ title: 'title' }
+ }
+ }
+ },
+ initExpandedKeys(arr){
+ if(arr && arr.length>0){
+ let keys = []
+ for(let item of arr){
+ if(item.children && item.children.length>0){
+ keys.push(item.id)
+ }
+ }
+ this.expandedKeys=[...keys]
+ }else{
+ this.expandedKeys=[]
+ }
+ },
+ onCheck (checkedKeys,info) {
+ if(!this.multi){
+ let arr = checkedKeys.checked.filter(item=>{
+ return this.checkedKeys.indexOf(item)<0
+ })
+ this.checkedKeys = [...arr]
+ this.checkedRows=[info.node.dataRef]
+ }else{
+ this.checkedKeys = checkedKeys.checked
+ this.checkedRows.push(info.node.dataRef)
+ }
+ //this.$emit("input",this.checkedKeys.join(","))
+ //console.log(this.checkedKeys.join(","))
+ },
+ onSelect (selectedKeys,info) {
+ console.log(selectedKeys)
+ let keys = []
+ keys.push(selectedKeys[0])
+ if(!this.checkedKeys || this.checkedKeys.length==0 || !this.multi){
+ this.checkedKeys = [...keys]
+ this.checkedRows=[info.node.dataRef]
+ }else{
+ let currKey = info.node.dataRef.key
+ if(this.checkedKeys.indexOf(currKey)>=0){
+ this.checkedKeys = this.checkedKeys.filter(item=>{
+ return item !=currKey
+ })
+ this.checkedRows=this.checkedRows.filter(item=>{
+ return item.key !=currKey
+ })
+ }else{
+ this.checkedRows.push(info.node.dataRef)
+ this.checkedKeys.push(...keys)
+ }
+ }
+ },
+ onExpand (expandedKeys) {
+ this.expandedKeys = expandedKeys
+ this.autoExpandParent = false
+ },
+ handleSubmit(){
+ if(!this.checkedKeys || this.checkedKeys.length==0){
+ this.$emit("ok",'')
+ }else{
+ this.$emit("ok",this.checkedRows,this.checkedKeys.join(","))
+ }
+ this.handleClear()
+ },
+ handleCancel(){
+ this.handleClear()
+ },
+ handleClear(){
+ this.visible=false
+ this.checkedKeys=[]
+ },
+ getParentKey(currKey,treeData){
+ let parentKey
+ for (let i = 0; i < treeData.length; i++) {
+ const node = treeData[i]
+ if (node.children) {
+ if (node.children.some(item => item.key === currKey)) {
+ parentKey = node.key
+ } else if (this.getParentKey(currKey, node.children)) {
+ parentKey = this.getParentKey(currKey, node.children)
+ }
+ }
+ }
+ return parentKey
+ },
+ onSearch(value){
+ const expandedKeys = this.dataList.map((item) => {
+ if (item.title.indexOf(value) > -1) {
+ return this.getParentKey(item.key,this.treeData)
+ }
+ return null
+ }).filter((item, i, self) => item && self.indexOf(item) === i)
+
+ Object.assign(this, {
+ expandedKeys,
+ searchValue: value,
+ autoExpandParent: true,
+ })
+
+
+ }
+ }
+ }
+
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/jeecgbiz/modal/JSelectMultiUserModal.vue b/ant-design-jeecg-vue/src/components/jeecgbiz/modal/JSelectMultiUserModal.vue
new file mode 100644
index 0000000..e55fd71
--- /dev/null
+++ b/ant-design-jeecg-vue/src/components/jeecgbiz/modal/JSelectMultiUserModal.vue
@@ -0,0 +1,274 @@
+<template>
+ <a-modal
+ centered
+ :title="title"
+ :width="1000"
+ :visible="visible"
+ @ok="handleOk"
+ @cancel="handleCancel"
+ cancelText="关闭">
+ <a-row :gutter="18">
+ <a-col :span="16">
+ <a-card title="选择人员" :bordered="true">
+ <!-- 查询区域 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline">
+ <a-row :gutter="24">
+
+ <a-col :span="10">
+ <a-form-item label="姓名">
+ <a-input placeholder="请输入姓名" v-model="queryParam.name"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="8" >
+ <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+ <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+ </span>
+ </a-col>
+
+ </a-row>
+ </a-form>
+ </div>
+ <!-- table区域-begin -->
+ <div>
+ <a-table
+ size="small"
+ bordered
+ rowKey="id"
+ :columns="columns1"
+ :dataSource="dataSource1"
+ :pagination="ipagination"
+ :loading="loading"
+ :scroll="{ y: 240 }"
+ :rowSelection="{selectedRowKeys: selectedRowKeys,onSelectAll:onSelectAll,onSelect:onSelect,onChange: onSelectChange}"
+ @change="handleTableChange">
+
+ </a-table>
+ </div>
+ <!-- table区域-end -->
+ </a-card>
+ </a-col>
+ <a-col :span="8">
+ <a-card title="用户选择" :bordered="true">
+ <!-- table区域-begin -->
+ <div>
+ <a-table
+ size="small"
+ bordered
+ rowKey="id"
+ :columns="columns2"
+ :dataSource="dataSource2"
+ :loading="loading"
+ :scroll="{ y: 240 }"
+ >
+ <span slot="action" slot-scope="text, record">
+ <a-button type="primary" size="small" @click="handleDelete(record)" icon="delete">删除</a-button>
+ </span>
+ </a-table>
+ </div>
+ <!-- table区域-end -->
+ </a-card>
+ </a-col>
+ </a-row>
+ </a-modal>
+</template>
+
+<script>
+ import { filterObj } from '@/utils/util'
+ import { getAction } from '@/api/manage'
+
+ export default {
+ name: 'JSelectMultiUserModal',
+ data () {
+ return {
+ title: "用户列表",
+ names: [],
+ visible: false,
+ placement: 'right',
+ description: '人员管理页面',
+ // 查询条件
+ queryParam: {},
+ // 表头
+ columns1: [
+ {
+ title: '#',
+ dataIndex: '',
+ key:'rowIndex',
+ width:50,
+ align:"center",
+ customRender:function (t,r,index) {
+ return parseInt(index)+1;
+ }
+ },
+ {
+ title: '姓名',
+ align:"center",
+ width:113,
+ dataIndex: 'name'
+ },
+ {
+ title: '年龄',
+ align:"center",
+ width:100,
+ dataIndex: 'age'
+ },
+ {
+ title: '出生日期',
+ align:"center",
+ width:100,
+ dataIndex: 'birthday'
+ }
+ ],
+ columns2: [
+
+ {
+ title: '用户账号',
+ align:"center",
+ width:100,
+ dataIndex: 'name'
+ },
+ {
+ title: '操作',
+ dataIndex: 'action',
+ align:"center",
+ width:100,
+ scopedSlots: { customRender: 'action' },
+ }
+ ],
+ //数据集
+ dataSource1:[],
+ dataSource2:[],
+ // 分页参数
+ ipagination:{
+ current: 1,
+ pageSize: 10,
+ pageSizeOptions: ['10', '20', '30'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 共" + total + "条"
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
+ isorter:{
+ column: 'createTime',
+ order: 'desc',
+ },
+ loading:false,
+ selectedRowKeys: [],
+ selectedRows: [],
+ url: {
+ list: "/test/jeecgDemo/list",
+ },
+
+ }
+ },
+ created() {
+ this.loadData();
+ },
+ methods: {
+ searchQuery(){
+ this.loadData(1);
+ },
+ searchReset(){
+ this.queryParam={};
+ this.loadData(1);
+ },
+ handleCancel() {
+ this.visible = false;
+ },
+ handleOk() {
+ this.$emit("selectFinished",this.dataSource2);
+ this.visible = false;
+ },
+ add() {
+ this.visible = true;
+ },
+ loadData (arg){
+ //加载数据 若传入参数1则加载第一页的内容
+ if(arg===1){
+ this.ipagination.current = 1;
+ }
+ var params = this.getQueryParams();//查询条件
+ getAction(this.url.list,params).then((res)=>{
+ if(res.success){
+ this.dataSource1 = res.result.records;
+ this.ipagination.total = res.result.total;
+ }
+ })
+ },
+ getQueryParams(){
+ var param = Object.assign({}, this.queryParam,this.isorter);
+ param.field = this.getQueryField();
+ param.pageNo = this.ipagination.current;
+ param.pageSize = this.ipagination.pageSize;
+ return filterObj(param);
+ },
+ getQueryField(){
+ //TODO 字段权限控制
+ },
+ onSelectAll (selected, selectedRows, changeRows) {
+ if(selected===true){
+ for(var a = 0;a<changeRows.length;a++){
+ this.dataSource2.push(changeRows[a]);
+ }
+ }else{
+ for(var b = 0;b<changeRows.length;b++){
+ this.dataSource2.splice(this.dataSource2.indexOf(changeRows[b]),1);
+ }
+ }
+ // console.log(selected, selectedRows, changeRows);
+ },
+ onSelect (record,selected) {
+ if(selected===true){
+ this.dataSource2.push(record);
+ }else{
+ var index = this.dataSource2.indexOf(record);
+ //console.log();
+ if(index >=0 ){
+ this.dataSource2.splice(this.dataSource2.indexOf(record),1);
+ }
+
+ }
+ },
+ onSelectChange (selectedRowKeys,selectedRows) {
+ this.selectedRowKeys = selectedRowKeys;
+ this.selectionRows = selectedRows;
+ },
+ onClearSelected(){
+ this.selectedRowKeys = [];
+ this.selectionRows = [];
+ },
+ handleDelete: function(record){
+ this.dataSource2.splice(this.dataSource2.indexOf(record),1);
+ },
+ handleTableChange(pagination, filters, sorter){
+ //分页、排序、筛选变化时触发
+ console.log(sorter);
+ //TODO 筛选
+ if (Object.keys(sorter).length>0){
+ this.isorter.column = sorter.field;
+ this.isorter.order = "ascend"==sorter.order?"asc":"desc"
+ }
+ this.ipagination = pagination;
+ this.loadData();
+ }
+ }
+ }
+</script>
+<style lang="less" scoped>
+ .ant-card-body .table-operator{
+ margin-bottom: 18px;
+ }
+ .ant-table-tbody .ant-table-row td{
+ padding-top:15px;
+ padding-bottom:15px;
+ }
+ .anty-row-operator button{margin: 0 5px}
+ .ant-btn-danger{background-color: #ffffff}
+
+ .ant-modal-cust-warp{height: 100%}
+ .ant-modal-cust-warp .ant-modal-body{height:calc(100% - 110px) !important;overflow-y: auto}
+ .ant-modal-cust-warp .ant-modal-content{height:90% !important;overflow-y: hidden}
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/jeecgbiz/JSearchUserByDepModal.vue b/ant-design-jeecg-vue/src/components/jeecgbiz/modal/JSelectUserByDepModal.vue
index f4982b7..afd8a77 100644
--- a/ant-design-jeecg-vue/src/components/jeecgbiz/JSearchUserByDepModal.vue
+++ b/ant-design-jeecg-vue/src/components/jeecgbiz/modal/JSelectUserByDepModal.vue
@@ -1,5 +1,4 @@
<template>
-
<a-modal
:width="modalWidth"
:visible="visible"
@@ -29,11 +28,11 @@
用户账号:
<a-input-search
:style="{width:'150px',marginBottom:'15px'}"
- placeholder="请输入用户名搜索"
+ placeholder="请输入用户账号"
v-model="queryParam.username"
@search="onSearch"
- />
- <a-button @click="searchReset" style="margin-left: 20px" icon="redo">重置</a-button>
+ ></a-input-search>
+ <a-button @click="searchReset(1)" style="margin-left: 20px" icon="redo">重置</a-button>
<!--用户列表-->
<a-table
ref="table"
@@ -50,19 +49,20 @@
</a-col>
</a-row>
</a-modal>
-
</template>
<script>
import { filterObj } from '@/utils/util'
import { queryDepartTreeList, getUserList, queryUserByDepId, queryUserRoleMap } from '@/api/api'
-
export default {
- name: 'JSearchUserByDepModal',
+ name: 'JSelectUserByDepModal',
components: {},
+ props:['modalWidth'],
data() {
return {
- queryParam: {},
+ queryParam: {
+ username:"",
+ },
columns: [
{
title: '用户账号',
@@ -106,12 +106,11 @@
],
scrollTrigger: {},
dataSource: [],
- userDataSource:[],
selectedKeys: [],
userNameArr: [],
departName: '',
userRolesMap: {},
- title: '',
+ title: '根据部门选择用户',
ipagination: {
current: 1,
pageSize: 10,
@@ -129,7 +128,6 @@
},
selectedRowKeys: [],
selectedRows: [],
- modalWidth: 1250,
departTree: [],
visible: false,
form: this.$form.createForm(this)
@@ -149,7 +147,6 @@
getUserList(params).then((res) => {
if (res.success) {
this.dataSource = res.result.records;
- this.userDataSource = res.result.records;
this.assignRoleName(this.dataSource);
this.ipagination.total = res.result.total;
}
@@ -194,12 +191,12 @@
},
searchReset(num) {
let that = this;
- if (num !== 0) {
- that.dataSource = that.userDataSource;
+ if(num !== 0){
+ that.queryParam = {};
+ that.loadData(1);
}
that.selectedRowKeys = [];
that.userNameArr = [];
- that.queryParam = {};
that.selectedKeys = [];
},
close() {
diff --git a/ant-design-jeecg-vue/src/components/layouts/IframeFReportView.vue b/ant-design-jeecg-vue/src/components/layouts/IframeFReportView.vue
new file mode 100644
index 0000000..c51e5b1
--- /dev/null
+++ b/ant-design-jeecg-vue/src/components/layouts/IframeFReportView.vue
@@ -0,0 +1,47 @@
+<template>
+
+ <iframe :id="id" :src="url" frameborder="0" width="100%" height="800px" scrolling="auto" style="background-color: #fff;"></iframe>
+
+</template>
+
+<script>
+ import PageLayout from '../page/PageLayout'
+ import RouteView from './RouteView'
+
+ export default {
+ name: "IframePageContent",
+ data () {
+ return {
+ url: "",
+ id:""
+ }
+ },
+ created () {
+ this.goUrl()
+ },
+ updated () {
+ this.goUrl()
+ },
+ watch: {
+ $route(to, from) {
+ this.goUrl();
+ }
+ },
+ methods: {
+ goUrl () {
+ let url = this.$route.meta.url
+ let id = this.$route.path
+ this.id = id
+ //url = "http://www.baidu.com"
+ console.log("------url------"+url)
+ if (url !== null && url !== undefined) {
+ this.url = url;
+ //window.open(this.url);
+ }
+ }
+ }
+ }
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/layouts/TabLayout.vue b/ant-design-jeecg-vue/src/components/layouts/TabLayout.vue
index 1ef77ab..0fa0755 100644
--- a/ant-design-jeecg-vue/src/components/layouts/TabLayout.vue
+++ b/ant-design-jeecg-vue/src/components/layouts/TabLayout.vue
@@ -1,5 +1,5 @@
<template>
- <global-layout>
+ <global-layout @dynamicRouterShow="dynamicRouterShow">
<contextmenu :itemList="menuItemList" :visible.sync="menuVisible" @select="onMenuSelect"/>
<a-tabs
@contextmenu.native="e => onContextmenu(e)"
@@ -15,7 +15,7 @@
<span slot="tab" :pagekey="page.fullPath">{{ page.meta.title }}</span>
</a-tab-pane>
</a-tabs>
- <div style="margin: 24px 24px 0;">
+ <div style="margin: 12px 12px 0;">
<transition name="page-toggle">
<keep-alive v-if="multipage">
<router-view/>
@@ -30,7 +30,6 @@
import GlobalLayout from '@/components/page/GlobalLayout'
import Contextmenu from '@/components/menu/Contextmenu'
import { mixin, mixinDevice } from '@/utils/mixin.js'
- import { topNavScrollToSelectItem } from '@/utils/util'
const indexKey = '/dashboard/analysis'
@@ -86,23 +85,20 @@
this.activePage = newRoute.fullPath
if (!this.multipage) {
this.linkList = [newRoute.fullPath]
- this.pageList = [newRoute]
+ this.pageList = [Object.assign({},newRoute)]
} else if (this.linkList.indexOf(newRoute.fullPath) < 0) {
this.linkList.push(newRoute.fullPath)
- this.pageList.push(newRoute)
+ this.pageList.push(Object.assign({},newRoute))
} else if (this.linkList.indexOf(newRoute.fullPath) >= 0) {
let oldIndex = this.linkList.indexOf(newRoute.fullPath)
- this.pageList.splice(oldIndex, 1, newRoute)
+ let oldPositionRoute = this.pageList[oldIndex]
+ this.pageList.splice(oldIndex, 1, Object.assign({},newRoute,{meta:oldPositionRoute.meta}))
}
},
'activePage': function(key) {
let index = this.linkList.lastIndexOf(key)
- var waitRouter = this.pageList[index]
- this.$router.push({
- path: waitRouter.path,
- name: waitRouter.name,
- params: waitRouter.params
- })
+ let waitRouter = this.pageList[index]
+ this.$router.push(Object.assign({},waitRouter));
},
'multipage': function(newVal) {
if (!newVal) {
@@ -114,12 +110,6 @@
methods: {
changePage(key) {
this.activePage = key
- // 只有当前模式是顶部菜单时才执行定位
- if (this.layoutMode === 'topmenu') {
- setTimeout(() => {
- topNavScrollToSelectItem(document)
- }, 100)
- }
},
editPage(key, action) {
this[action](key)
@@ -208,7 +198,17 @@
if (this.linkList.indexOf(this.activePage < 0)) {
this.activePage = this.linkList[this.linkList.length - 1]
}
+ },
+ //update-begin-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title
+ dynamicRouterShow(key,title){
+ let keyIndex = this.linkList.indexOf(key)
+ if(keyIndex>=0){
+ let currRouter = this.pageList[keyIndex]
+ let meta = Object.assign({},currRouter.meta,{title:title})
+ this.pageList.splice(keyIndex, 1, Object.assign({},currRouter,{meta:meta}))
+ }
}
+ //update-end-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title
}
}
</script>
diff --git a/ant-design-jeecg-vue/src/components/menu/SideMenu.vue b/ant-design-jeecg-vue/src/components/menu/SideMenu.vue
index 3fbcaf8..968f044 100644
--- a/ant-design-jeecg-vue/src/components/menu/SideMenu.vue
+++ b/ant-design-jeecg-vue/src/components/menu/SideMenu.vue
@@ -3,7 +3,7 @@
:class="['sider', isDesktop() ? null : 'shadow', theme, fixSiderbar ? 'ant-fixed-sidemenu' : null ]"
width="200px"
:collapsible="collapsible"
- v-model="collapsed"
+ v-model="collapsed"
:trigger="null">
<logo />
<s-menu
@@ -12,7 +12,8 @@
:theme="theme"
@select="onSelect"
:mode="mode"
- style="padding: 0;"></s-menu>
+ :style="smenuStyle">
+ </s-menu>
</a-layout-sider>
</template>
@@ -53,10 +54,92 @@
required: true
}
},
+ computed:{
+ smenuStyle() {
+ let style = { 'padding': '0' }
+ if (this.fixSiderbar) {
+ style['height'] = 'calc(100% - 59px)'
+ style['overflow'] = 'auto'
+ style['overflow-x'] = 'hidden'
+ }
+ return style
+ }
+ },
methods: {
onSelect (obj) {
this.$emit('menuSelect', obj)
}
}
}
-</script>
\ No newline at end of file
+</script>
+<style lang="scss" scoped>
+
+ /* update_begin author:sunjianlei date:20190509 for: 修改侧边导航栏滚动条的样式 */
+ .sider {
+ $scrollBarSize: 10px;
+
+ ul.ant-menu {
+
+ /* 定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
+ &::-webkit-scrollbar {
+ width: $scrollBarSize;
+ height: $scrollBarSize;
+ background-color: transparent;
+ display: none;
+ }
+
+ & .-o-scrollbar {
+ display: none;
+ }
+
+ /* 兼容IE */
+ -ms-overflow-style: none;
+ -ms-scroll-chaining: chained;
+ -ms-content-zooming: zoom;
+ -ms-scroll-rails: none;
+ -ms-content-zoom-limit-min: 100%;
+ -ms-content-zoom-limit-max: 500%;
+ -ms-scroll-snap-type: proximity;
+ -ms-scroll-snap-points-x: snapList(100%, 200%, 300%, 400%, 500%);
+
+ /* 定义滚动条轨道 */
+ &::-webkit-scrollbar-track {
+ background-color: transparent;
+ }
+
+ /* 定义滑块 */
+ &::-webkit-scrollbar-thumb {
+ border-radius: $scrollBarSize;
+ background-color: #eee;
+ box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.1);
+
+ &:hover {
+ background-color: #dddddd;
+ }
+
+ &:active {
+ background-color: #bbbbbb;
+ }
+ }
+ }
+
+ /** 暗色系滚动条样式 */
+ &.dark ul.ant-menu {
+ &::-webkit-scrollbar-thumb {
+ background-color: #666666;
+
+ &:hover {
+ background-color: #808080;
+ }
+
+ &:active {
+ background-color: #999999;
+ }
+ }
+ }
+
+ }
+
+ /* update_end author:sunjianlei date:20190509 for: 修改侧边导航栏滚动条的样式 */
+
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/menu/index.js b/ant-design-jeecg-vue/src/components/menu/index.js
index 59b0cf6..ecf7095 100644
--- a/ant-design-jeecg-vue/src/components/menu/index.js
+++ b/ant-design-jeecg-vue/src/components/menu/index.js
@@ -34,149 +34,155 @@ export default {
}
},
computed: {
- rootSubmenuKeys: (vm) => {
- let keys = []
+ rootSubmenuKeys: vm => {
+ const keys = []
vm.menu.forEach(item => keys.push(item.path))
return keys
}
},
- created () {
+ mounted () {
this.updateMenu()
},
watch: {
collapsed (val) {
if (val) {
- this.cachedOpenKeys = this.openKeys
+ this.cachedOpenKeys = this.openKeys.concat()
this.openKeys = []
} else {
this.openKeys = this.cachedOpenKeys
}
},
- '$route': function () {
+ $route: function () {
this.updateMenu()
}
},
methods: {
- renderIcon: function (h, icon) {
- return icon === 'none' || icon === undefined ? null
- : h(Icon, { props: { type: icon !== undefined ? icon : '' } })
- },
- renderMenuItem: function (h, menu, pIndex, index) {
- // 判断是否带参数路由URL,是的话，采用path跳转方式
- if(menu.route && menu.route === '0'){
- return h(Item, { key: menu.path ? menu.path : 'item_' + pIndex + '_' + index },
- [
- h(
- 'router-link',
- //--update-begin----author:scott---date:20190320------for:改造菜单路由跳转规则，原来是跳转到组件，现在改造成跳转URL（为了支持参数URL菜单）------
- { attrs: { to: { path: menu.path } } },
- //--update-end----author:scott---date:20190320------for:改造菜单路由跳转规则，原来是跳转到组件，现在改造成跳转URL（为了支持参数URL菜单）------
- [
- this.renderIcon(h, menu.meta.icon),
- h('span', [ menu.meta.title ])
- ]
- )
- ]
- )
- }else{
- // 默认采用组件跳转方式
- return h(Item, { key: menu.path ? menu.path : 'item_' + pIndex + '_' + index },
- [
- h(
- 'router-link',
- { attrs: { to: { name: menu.name } } },
- [
- this.renderIcon(h, menu.meta.icon),
- h('span', [ menu.meta.title ])
- ]
- )
- ]
- )
- }
+ // select menu item
+ onOpenChange (openKeys) {
- },
- renderSubMenu: function (h, menu, pIndex, index) {
- const this2_ = this;
- let subItem = [ h('span',
- { slot: 'title' },
- [
- this.renderIcon(h, menu.meta.icon),
- h('span', [ menu.meta.title ])
- ]
- ) ]
- let itemArr = []
- let pIndex_ = pIndex + '_' + index
- if (!menu.alwaysShow) {
- menu.children.forEach(function (item, i) {
- itemArr.push(this2_.renderItem(h, item, pIndex_, i))
- })
- }
- return h(
- SubMenu,
- { key: menu.path ? menu.path : 'submenu_' + pIndex + '_' + index },
- subItem.concat(itemArr)
- )
- },
- renderItem: function (h, menu, pIndex, index) {
- if (!menu.hidden) {
- return menu.children && !menu.alwaysShow ? this.renderSubMenu(h, menu, pIndex, index) : this.renderMenuItem(h, menu, pIndex, index)
+ // 在水平模式下时执行，并且不再执行后续
+ if (this.mode === 'horizontal') {
+ this.openKeys = openKeys
+ return
}
- },
- renderMenu: function (h, menuTree) {
- const this2_ = this
- let menuArr = []
- menuTree.forEach(function (menu, i) {
- if (!menu.hidden) {
- menuArr.push(this2_.renderItem(h, menu, '0', i))
- }
- })
- return menuArr
- },
- onOpenChange (openKeys) {
- const latestOpenKey = openKeys.find(key => this.openKeys.indexOf(key) === -1)
- if (this.rootSubmenuKeys.indexOf(latestOpenKey) === -1) {
+ // 非水平模式时
+ const latestOpenKey = openKeys.find(key => !this.openKeys.includes(key))
+ if (!this.rootSubmenuKeys.includes(latestOpenKey)) {
this.openKeys = openKeys
} else {
- this.openKeys = latestOpenKey ? [ latestOpenKey ] : []
+ this.openKeys = latestOpenKey ? [latestOpenKey] : []
}
},
updateMenu () {
- let routes = this.$route.matched.concat()
- if (routes.length >= 4 && this.$route.meta.hidden) {
+ const routes = this.$route.matched.concat()
+ const { hidden } = this.$route.meta
+ if (routes.length >= 3 && hidden) {
routes.pop()
- this.selectedKeys = [ routes[2].path ]
+ this.selectedKeys = [routes[routes.length - 1].path]
} else {
- this.selectedKeys = [ routes.pop().path ]
+ this.selectedKeys = [routes.pop().path]
}
-
- let openKeys = []
+ const openKeys = []
if (this.mode === 'inline') {
- routes.forEach((item) => {
+ routes.forEach(item => {
openKeys.push(item.path)
})
}
+ //update-begin-author:taoyan date:20190510 for:online表单菜单点击展开的一级目录不对
+ if(!this.selectedKeys || this.selectedKeys[0].indexOf(":")<0){
+ this.collapsed ? (this.cachedOpenKeys = openKeys) : (this.openKeys = openKeys)
+ }
+ //update-end-author:taoyan date:20190510 for:online表单菜单点击展开的一级目录不对
+ },
- this.collapsed ? this.cachedOpenKeys = openKeys : this.openKeys = openKeys
+ // render
+ renderItem (menu) {
+ if (!menu.hidden) {
+ return menu.children && !menu.hideChildrenInMenu ? this.renderSubMenu(menu) : this.renderMenuItem(menu)
+ }
+ return null
+ },
+ renderMenuItem (menu) {
+ const target = menu.meta.target || null
+ const tag = target && 'a' || 'router-link'
+ let props = { to: { name: menu.name } }
+ if(menu.route && menu.route === '0'){
+ props = { to: { path: menu.path } }
+ }
+
+ const attrs = { href: menu.path, target: menu.meta.target }
+
+ if (menu.children && menu.hideChildrenInMenu) {
+ // 把有子菜单的 并且 父菜单是要隐藏子菜单的
+ // 都给子菜单增加一个 hidden 属性
+ // 用来给刷新页面时， selectedKeys 做控制用
+ menu.children.forEach(item => {
+ item.meta = Object.assign(item.meta, { hidden: true })
+ })
+ }
+
+ return (
+ <Item {...{ key: menu.path }}>
+ <tag {...{ props, attrs }}>
+ {this.renderIcon(menu.meta.icon)}
+ <span>{menu.meta.title}</span>
+ </tag>
+ </Item>
+ )
+ },
+ renderSubMenu (menu) {
+ const itemArr = []
+ if (!menu.hideChildrenInMenu) {
+ menu.children.forEach(item => itemArr.push(this.renderItem(item)))
+ }
+ return (
+ <SubMenu {...{ key: menu.path }}>
+ <span slot="title">
+ {this.renderIcon(menu.meta.icon)}
+ <span>{menu.meta.title}</span>
+ </span>
+ {itemArr}
+ </SubMenu>
+ )
+ },
+ renderIcon (icon) {
+ if (icon === 'none' || icon === undefined) {
+ return null
+ }
+ const props = {}
+ typeof (icon) === 'object' ? props.component = icon : props.type = icon
+ return (
+ <Icon {... { props } }/>
+ )
}
},
- render (h) {
- return h(
- Menu,
- {
- props: {
- theme: this.$props.theme,
- mode: this.$props.mode,
- openKeys: this.openKeys,
- selectedKeys: this.selectedKeys
- },
- on: {
- openChange: this.onOpenChange,
- select: (obj) => {
- this.selectedKeys = obj.selectedKeys
- this.$emit('select', obj)
- }
- }
- }, this.renderMenu(h, this.menu)
+
+ render () {
+ const { mode, theme, menu } = this
+ const props = {
+ mode: mode,
+ theme: theme,
+ openKeys: this.openKeys
+ }
+ const on = {
+ select: obj => {
+ this.selectedKeys = obj.selectedKeys
+ this.$emit('select', obj)
+ },
+ openChange: this.onOpenChange
+ }
+
+ const menuTree = menu.map(item => {
+ if (item.hidden) {
+ return null
+ }
+ return this.renderItem(item)
+ })
+ // {...{ props, on: on }}
+ return (
+ <Menu vModel={this.selectedKeys} {...{ props, on: on }}>
+ {menuTree}
+ </Menu>
)
}
-}
\ No newline at end of file
+}
diff --git a/ant-design-jeecg-vue/src/components/page/GlobalHeader.vue b/ant-design-jeecg-vue/src/components/page/GlobalHeader.vue
index 926db82..18c50d8 100644
--- a/ant-design-jeecg-vue/src/components/page/GlobalHeader.vue
+++ b/ant-design-jeecg-vue/src/components/page/GlobalHeader.vue
@@ -27,13 +27,11 @@
<div class="header-index-wide">
<div class="header-index-left" :style="topMenuStyle.headerIndexLeft">
<logo class="top-nav-header" :show-title="device !== 'mobile'" :style="topMenuStyle.topNavHeader"/>
- <div v-if="device !== 'mobile'" id="top-nav-scroll-view" :style="topMenuStyle.scrollView">
- <div id="top-nav-scroll-width" :style="topMenuStyle.scrollWidth">
- <s-menu
- mode="horizontal"
- :menu="menus"
- :theme="theme"></s-menu>
- </div>
+ <div v-if="device !== 'mobile'" :style="topMenuStyle.topSmenuStyle">
+ <s-menu
+ mode="horizontal"
+ :menu="menus"
+ :theme="theme"></s-menu>
</div>
<a-icon
v-else
@@ -54,7 +52,6 @@
import Logo from '../tools/Logo'
import { mixin } from '@/utils/mixin.js'
- import { topNavScrollToSelectItem } from '@/utils/util'
export default {
name: 'GlobalHeader',
@@ -93,19 +90,12 @@
data() {
return {
headerBarFixed: false,
- //update-begin--author:sunjianlei---date:20190408------for: 顶部导航栏增加横向滚动条-----
+ //update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
topMenuStyle: {
headerIndexLeft: {},
topNavHeader: {},
headerIndexRight: {},
- scrollView: {
- 'overflow-x': 'auto',
- 'overflow-y': 'hidden'
- },
- scrollWidth: {
- // 设置这么宽是为了让顶部菜单首次加载时充分展开，方便计算真实宽度
- 'width': '10000px'
- }
+ topSmenuStyle: {}
}
}
},
@@ -119,19 +109,18 @@
/** 监听导航栏模式变化 */
mode(newVal) {
if (newVal === 'topmenu') {
- this.calcTopMenuScrollWidth()
+ this.buildTopMenuStyle()
}
}
},
- //update-end--author:sunjianlei---date:20190408------for: 顶部导航栏增加横向滚动条-----
+ //update-end--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
mounted() {
window.addEventListener('scroll', this.handleScroll)
- //update-begin--author:sunjianlei---date:20190408------for: 顶部导航栏增加横向滚动条-----
+ //update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
if (this.mode === 'topmenu') {
this.buildTopMenuStyle()
- this.calcTopMenuScrollWidth()
}
- //update-end--author:sunjianlei---date:20190408------for: 顶部导航栏增加横向滚动条-----
+ //update-end--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
},
methods: {
handleScroll() {
@@ -149,67 +138,25 @@
toggle() {
this.$emit('toggle')
},
- //update-begin--author:sunjianlei---date:20190408------for: 顶部导航栏增加横向滚动条-----
+ //update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
buildTopMenuStyle() {
if (this.mode === 'topmenu') {
if (this.device === 'mobile') {
// 手机端需要清空样式，否则显示会错乱
this.topMenuStyle.topNavHeader = {}
+ this.topMenuStyle.topSmenuStyle = {}
this.topMenuStyle.headerIndexRight = {}
this.topMenuStyle.headerIndexLeft = {}
} else {
let rightWidth = '360px'
this.topMenuStyle.topNavHeader = { 'min-width': '165px' }
+ this.topMenuStyle.topSmenuStyle = { 'width': 'calc(100% - 165px)' }
this.topMenuStyle.headerIndexRight = { 'min-width': rightWidth }
this.topMenuStyle.headerIndexLeft = { 'width': `calc(100% - ${rightWidth})` }
- // 由于首次从mobile设备下切换到desktop设备没有初始化TopMenuScrollWidth，所以这里需要计算一下
- if (this.topMenuStyle.scrollWidth['width'] === '10000px') {
- this.calcTopMenuScrollWidth()
- }
}
}
- },
- /** 计算滚动条的宽度 */
- calcTopMenuScrollWidth() {
- // 非顶部菜单时不计算宽度
- if (this.mode !== 'topmenu') return
- let count = 0
- let timer = setInterval(() => {
- count++
- let scrollWidth = document.getElementById('top-nav-scroll-width')
- if (scrollWidth == null) {
- clearInterval(timer)
- return
- }
- let menu = scrollWidth.getElementsByClassName('ant-menu')[0]
- if (menu) {
- let widthCount = 0
- let menuItems = menu.getElementsByTagName('li')
- for (let item of menuItems) {
- if (item.className.indexOf('ant-menu-overflowed-submenu') === -1) {
- widthCount += item.offsetWidth
- }
- }
- // 由于首次从侧边菜单模式下切换到顶部菜单模式下没有buildTopMenuStyle，所以这里需要build一下
- if (this.topMenuStyle.scrollWidth['width'] === '10000px') {
- // 防止递归调用
- this.$nextTick(() => {
- this.buildTopMenuStyle()
- })
- }
- this.topMenuStyle.scrollWidth['width'] = `${widthCount + 10}px`
- // 将滚动条位置滚动到当前选中的菜单处
- if (count === 1) {
- topNavScrollToSelectItem(document)
- }
- }
- // 校准数据三次再关闭定时器
- if (count === 3) {
- clearInterval(timer)
- }
- }, 100)
}
- //update-end--author:sunjianlei---date:20190408------for: 顶部导航栏增加横向滚动条-----
+ //update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
}
}
</script>
@@ -268,52 +215,4 @@
/* update_end author:scott date:20190220 for: 缩小首页布局顶部的高度*/
- /* update_begin author:sunjianlei date:20190408 for: 修改顶部导航栏滚动条的样式 */
- #top-nav-scroll-view {
- $scrollBarSize: 8px;
-
- /* 定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
- &::-webkit-scrollbar {
- width: $scrollBarSize;
- height: $scrollBarSize;
- background-color: transparent;
- }
-
- /* 定义滚动条轨道 */
- &::-webkit-scrollbar-track {
- background-color: transparent;
- }
-
- /* 定义滑块 */
- &::-webkit-scrollbar-thumb {
- border-radius: $scrollBarSize;
- background-color: #eee;
- box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.1);
-
- &:hover {
- background-color: #dddddd;
- }
-
- &:active {
- background-color: #bbbbbb;
- }
- }
- }
-
- /** 暗色系滚动条样式 */
- .dark #top-nav-scroll-view {
- &::-webkit-scrollbar-thumb {
- background-color: #666666;
-
- &:hover {
- background-color: #808080;
- }
-
- &:active {
- background-color: #999999;
- }
- }
- }
-
- /* update_end author:sunjianlei date:20190408 for: 修改顶部导航栏滚动条的样式 */
</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/page/GlobalLayout.vue b/ant-design-jeecg-vue/src/components/page/GlobalLayout.vue
index 05d3367..7f8530e 100644
--- a/ant-design-jeecg-vue/src/components/page/GlobalLayout.vue
+++ b/ant-design-jeecg-vue/src/components/page/GlobalLayout.vue
@@ -24,6 +24,7 @@
v-else
mode="inline"
:menus="menus"
+ @menuSelect="myMenuSelect"
:theme="navTheme"
:collapsed="collapsed"
:collapsible="true"></side-menu>
@@ -98,6 +99,7 @@
data() {
return {
collapsed: false,
+ activeMenu:{},
menus: []
}
},
@@ -136,9 +138,26 @@
if (!this.isDesktop()) {
this.collapsed = false
}
+ },
+ //update-begin-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title
+ myMenuSelect(value){
+ //此处触发动态路由被点击事件
+ this.findMenuBykey(this.menus,value.key)
+ this.$emit("dynamicRouterShow",value.key,this.activeMenu.meta.title)
+ },
+ findMenuBykey(menus,key){
+ for(let i of menus){
+ if(i.path==key){
+ this.activeMenu = {...i}
+ }else if(i.children && i.children.length>0){
+ this.findMenuBykey(i.children,key)
+ }
+ }
}
+ //update-end-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title
}
}
+
</script>
<style lang="scss">
diff --git a/ant-design-jeecg-vue/src/components/setting/SettingDrawer.vue b/ant-design-jeecg-vue/src/components/setting/SettingDrawer.vue
index ba5f127..fe7023d 100644
--- a/ant-design-jeecg-vue/src/components/setting/SettingDrawer.vue
+++ b/ant-design-jeecg-vue/src/components/setting/SettingDrawer.vue
@@ -114,7 +114,7 @@
</a-list-item-meta>
</a-list-item>
<a-list-item >
- <a-switch slot="actions" size="small" :disabled="(layoutMode === 'topmenu')" :defaultChecked="fixSiderbar" @change="handleFixSiderbar" />
+ <a-switch slot="actions" size="small" :disabled="(layoutMode === 'topmenu')" :checked="dataFixSiderbar" @change="handleFixSiderbar" />
<a-list-item-meta>
<div slot="title" :style="{ textDecoration: layoutMode === 'topmenu' ? 'line-through' : 'unset' }">固定侧边菜单</div>
</a-list-item-meta>
@@ -179,7 +179,8 @@
return {
visible: true,
colorList,
- }
+ dataFixSiderbar: false
+ }
},
watch: {
@@ -244,9 +245,9 @@
},
handleFixSiderbar (fixed) {
if (this.layoutMode === 'topmenu') {
- this.$store.dispatch('ToggleFixSiderbar', false)
- return;
+ fixed = false
}
+ this.dataFixSiderbar = fixed
this.$store.dispatch('ToggleFixSiderbar', fixed)
}
},
diff --git a/ant-design-jeecg-vue/src/components/tools/HeaderNotice.vue b/ant-design-jeecg-vue/src/components/tools/HeaderNotice.vue
index 8662428..59a05ec 100644
--- a/ant-design-jeecg-vue/src/components/tools/HeaderNotice.vue
+++ b/ant-design-jeecg-vue/src/components/tools/HeaderNotice.vue
@@ -5,19 +5,20 @@
:autoAdjustOverflow="true"
:arrowPointAtCenter="true"
overlayClassName="header-notice-wrapper"
+ @visibleChange="handleHoverChange"
:overlayStyle="{ width: '300px', top: '50px' }">
<template slot="content">
<a-spin :spinning="loadding">
<a-tabs>
- <a-tab-pane tab="通知" key="1">
- <a-list>
+ <a-tab-pane :tab="msg1Title" key="1">
+ <!--<a-list>
<a-list-item>
<a-list-item-meta title="你收到了 14 份新周报" description="一年前">
<a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png"/>
</a-list-item-meta>
</a-list-item>
<a-list-item>
- <a-list-item-meta title="你推荐的 曲妮妮 已通过第三轮面试" description="一年前">
+ <a-list-item-meta title="你推荐的 IT大牛 已通过第三轮面试" description="一年前">
<a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/OKJXDXrmkNshAMvwtvhu.png"/>
</a-list-item-meta>
</a-list-item>
@@ -26,34 +27,107 @@
<a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/kISTdvpyTAhtGxpovNWd.png"/>
</a-list-item-meta>
</a-list-item>
+ </a-list>-->
+ <a-list>
+ <a-list-item :key="index" v-for="(record, index) in announcement1">
+ <div style="margin-left: 5%;width: 80%">
+ <p><a @click="showAnnouncement(record)">标题：{{ record.titile }}</a></p>
+ <p style="color: rgba(0,0,0,.45);margin-bottom: 0px">{{ record.createTime }} 发布</p>
+ </div>
+ <div style="text-align: right">
+ <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'L'" color="blue">一般消息</a-tag>
+ <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'M'" color="orange">重要消息</a-tag>
+ <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'H'" color="red">紧急消息</a-tag>
+ </div>
+ </a-list-item>
+ <div style="margin-top: 5px;text-align: center">
+ <a-button @click="toMyAnnouncement()" type="dashed" block>查看更多</a-button>
+ </div>
</a-list>
</a-tab-pane>
- <a-tab-pane tab="消息" key="2">
- 123
- </a-tab-pane>
- <a-tab-pane tab="待办" key="3">
- 123
+ <a-tab-pane :tab="msg2Title" key="2">
+ <a-list>
+ <a-list-item :key="index" v-for="(record, index) in announcement2">
+ <div style="margin-left: 5%;width: 80%">
+ <p><a @click="showAnnouncement(record)">标题：{{ record.titile }}</a></p>
+ <p style="color: rgba(0,0,0,.45);margin-bottom: 0px">{{ record.createTime }} 发布</p>
+ </div>
+ <div style="text-align: right">
+ <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'L'" color="blue">一般消息</a-tag>
+ <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'M'" color="orange">重要消息</a-tag>
+ <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'H'" color="red">紧急消息</a-tag>
+ </div>
+ </a-list-item>
+ <div style="margin-top: 5px;text-align: center">
+ <a-button @click="toMyAnnouncement()" type="dashed" block>查看更多</a-button>
+ </div>
+ </a-list>
</a-tab-pane>
</a-tabs>
</a-spin>
</template>
<span @click="fetchNotice" class="header-notice">
- <a-badge count="12">
+ <a-badge :count="msgTotal">
<a-icon style="font-size: 16px; padding: 4px" type="bell" />
</a-badge>
</span>
+ <show-announcement ref="ShowAnnouncement" @ok="modalFormOk"></show-announcement>
</a-popover>
</template>
<script>
+ import { getAction,putAction } from '@/api/manage'
+ import ShowAnnouncement from './ShowAnnouncement'
+
export default {
name: "HeaderNotice",
+ components: {
+ ShowAnnouncement,
+ },
data () {
return {
- loadding: false
+ loadding: false,
+ url:{
+ listCementByUser:"/sys/annountCement/listByUser",
+ editCementSend:"/system/sysAnnouncementSend/editByAnntIdAndUserId",
+ },
+ hovered: false,
+ announcement1:[],
+ announcement2:[],
+ msg1Count:"3",
+ msg2Count:"0",
+ msg1Title:"通知(3)",
+ msg2Title:"",
+ }
+ },
+ computed:{
+ msgTotal () {
+ return parseInt(this.msg1Count)+parseInt(this.msg2Count);
}
},
+ created() {
+ this.loadData();
+ this.timer();
+ },
methods: {
+ timer() {
+ return setInterval(()=>{
+ this.loadData()
+ },60000)
+ },
+ loadData (){
+ // 获取系统消息
+ getAction(this.url.listCementByUser).then((res)=>{
+ if(res.success){
+ this.announcement1 = res.result.anntMsgList;
+ this.msg1Count = res.result.anntMsgTotal;
+ this.msg1Title = "通知("+res.result.anntMsgTotal+")";
+ this.announcement2 = res.result.sysMsgList;
+ this.msg2Count = res.result.sysMsgTotal;
+ this.msg2Title = "系统消息("+res.result.sysMsgTotal+")";
+ }
+ });
+ },
fetchNotice () {
if (this.loadding) {
this.loadding = false
@@ -62,8 +136,30 @@
this.loadding = true
setTimeout(() => {
this.loadding = false
- }, 2000)
- }
+ }, 200)
+ },
+ showAnnouncement(record){
+ putAction(this.url.editCementSend,{anntId:record.id}).then((res)=>{
+ if(res.success){
+ this.loadData();
+ }
+ });
+ this.hovered = false;
+ this.$refs.ShowAnnouncement.detail(record);
+ },
+ toMyAnnouncement(){
+
+ this.$router.push({
+ path: '/isps/userAnnouncement',
+ name: 'isps-userAnnouncement'
+ });
+ },
+ modalFormOk(){
+ },
+ handleHoverChange (visible) {
+ this.hovered = visible;
+ },
+
}
}
</script>
diff --git a/ant-design-jeecg-vue/src/components/tools/ShowAnnouncement.vue b/ant-design-jeecg-vue/src/components/tools/ShowAnnouncement.vue
new file mode 100644
index 0000000..b786e21
--- /dev/null
+++ b/ant-design-jeecg-vue/src/components/tools/ShowAnnouncement.vue
@@ -0,0 +1,97 @@
+<template>
+ <a-modal
+ :title="title"
+ :width="600"
+ :visible="visible"
+ @cancel="handleCancel"
+ :okButtonProps="okButtonProps"
+ cancelText="关闭">
+
+ <div class="message">
+ <div class="title">{{ record.titile }}</div>
+ <div class="createBy">发布人：{{ record.sender }}</div>
+ <div class="sendTime">发布时间：{{ record.sendTime }}</div>
+ <a-divider />
+ <p v-html="record.msgContent"></p>
+ </div>
+
+ </a-modal>
+</template>
+
+<script>
+ export default {
+ name: "SysAnnouncementModal",
+ components: {
+ },
+ data () {
+ return {
+ title:"通知消息",
+ record: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+ visible: false,
+ okButtonProps:{
+ style: {
+ display:"none"
+ },
+ }
+ }
+ },
+ created () {
+ },
+ methods: {
+ detail (record) {
+ this.visible = true;
+ this.record = record;
+ },
+ handleCancel () {
+ this.visible = false;
+ },
+ }
+ }
+</script>
+
+<style scoped>
+ .message{
+ width: 90%;
+ margin-left: 5%;
+ margin-right: 5%;
+ min-height: 200px;
+ }
+ .title{
+ width: 100%;
+ font-size: 16px;
+ text-align: center;
+ font-weight: bolder;
+ margin-bottom: 10px;
+ }
+ .createBy {
+ width: 50%;
+ text-align: left;
+ padding-left: 5%;
+ float: left;
+ }
+ .sendTime{
+ width: 50%;
+ text-align: right;
+ padding-right: 5%;
+ float: right;
+ }
+ .message .ant-divider .ant-divider-horizontal .ant-divider-with-text-right{
+ font-size: 16px;
+ font-weight: lighter!important;
+ }
+ .message p{
+ font-size: 16px;
+ }
+ .message .ant-divider-horizontal{
+ margin-top: 40px;
+ margin-bottom: 8px;
+ }
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/components/tools/UserMenu.vue b/ant-design-jeecg-vue/src/components/tools/UserMenu.vue
index 92fb7f2..34a48e9 100644
--- a/ant-design-jeecg-vue/src/components/tools/UserMenu.vue
+++ b/ant-design-jeecg-vue/src/components/tools/UserMenu.vue
@@ -1,7 +1,9 @@
<template>
<div class="user-wrapper" :class="theme">
<span class="action">
- <a-icon type="question-circle-o"></a-icon>
+ <a class="logout_title" target="_blank" href="http://jeecg-boot.mydoc.io">
+ <a-icon type="question-circle-o"></a-icon>
+ </a>
</span>
<header-notice class="action"/>
<a-dropdown>
@@ -17,11 +19,15 @@
</router-link>
</a-menu-item>
<a-menu-item key="1">
- <router-link :to="{ name: 'account-settings' }">
+ <router-link :to="{ name: 'account-settings-base' }">
<a-icon type="setting"/>
<span>账户设置</span>
</router-link>
</a-menu-item>
+ <a-menu-item key="2" @click="updatePassword">
+ <a-icon type="setting"/>
+ <span>密码修改</span>
+ </a-menu-item>
<!-- <a-menu-item key="2" disabled>
<a-icon type="setting"/>
<span>测试</span>
@@ -41,18 +47,22 @@
<span v-if="isDesktop()"> 退出登录</span>
</a>
</span>
+ <user-password ref="userPassword"></user-password>
</div>
</template>
<script>
import HeaderNotice from './HeaderNotice'
+ import UserPassword from './UserPassword'
import { mapActions, mapGetters } from 'vuex'
import { mixinDevice } from '@/utils/mixin.js'
+
export default {
name: "UserMenu",
mixins: [mixinDevice],
components: {
- HeaderNotice
+ HeaderNotice,
+ UserPassword
},
props: {
theme: {
@@ -63,7 +73,7 @@
},
methods: {
...mapActions(["Logout"]),
- ...mapGetters(["nickname", "avatar"]),
+ ...mapGetters(["nickname", "avatar","userInfo"]),
getAvatar(){
console.log('url = '+ window._CONFIG['imgDomainURL']+"/"+this.avatar())
return window._CONFIG['imgDomainURL']+"/"+this.avatar()
@@ -89,6 +99,10 @@
},
});
},
+ updatePassword(){
+ let username = this.userInfo().username
+ this.$refs.userPassword.show(username)
+ },
}
}
</script>
diff --git a/ant-design-jeecg-vue/src/components/tools/UserPassword.vue b/ant-design-jeecg-vue/src/components/tools/UserPassword.vue
new file mode 100644
index 0000000..12b5f12
--- /dev/null
+++ b/ant-design-jeecg-vue/src/components/tools/UserPassword.vue
@@ -0,0 +1,157 @@
+<template>
+ <a-modal
+ :title="title"
+ :width="modalWidth"
+ :visible="visible"
+ :confirmLoading="confirmLoading"
+ @ok="handleOk"
+ @cancel="handleCancel"
+ cancelText="关闭"
+ >
+ <a-spin :spinning="confirmLoading">
+ <a-form :form="form">
+
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="旧密码">
+ <a-input type="password" placeholder="请输入旧密码" v-decorator="[ 'oldpassword', validatorRules.oldpassword]" />
+ </a-form-item>
+
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="新密码">
+ <a-input type="password" placeholder="请输入新密码" v-decorator="[ 'password', validatorRules.password]" />
+ </a-form-item>
+
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="确认新密码">
+ <a-input type="password" @blur="handleConfirmBlur" placeholder="请确认新密码" v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
+ </a-form-item>
+
+ </a-form>
+ </a-spin>
+ </a-modal>
+</template>
+
+<script>
+
+ import { putAction } from '@/api/manage'
+
+ export default {
+ name: "UserPassword",
+ data () {
+ return {
+ title:"修改密码",
+ modalWidth:800,
+ visible: false,
+ confirmLoading: false,
+ validatorRules:{
+ oldpassword:{
+ rules: [{
+ required: true, message: '请输入旧密码!',
+ }],
+ },
+ password:{
+ rules: [{
+ required: true, message: '请输入新密码!',
+ }, {
+ validator: this.validateToNextPassword,
+ }],
+ },
+ confirmpassword:{
+ rules: [{
+ required: true, message: '请确认新密码!',
+ }, {
+ validator: this.compareToFirstPassword,
+ }],
+ }
+ },
+ confirmDirty:false,
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+
+ form:this.$form.createForm(this),
+ url: "sys/user/updatePassword",
+ username:"",
+ }
+ },
+ methods: {
+ show(uname){
+ if(!uname){
+ this.$message.warning("当前系统无登陆用户!");
+ return
+ }else{
+ this.username = uname
+ this.form.resetFields();
+ this.visible = true;
+ }
+ },
+ handleCancel () {
+ this.close()
+ },
+ close () {
+ this.$emit('close');
+ this.visible = false;
+ this.disableSubmit = false;
+ this.selectedRole = [];
+ },
+ handleOk () {
+ const that = this;
+ // 触发表单验证
+ this.form.validateFields((err, values) => {
+ if (!err) {
+ that.confirmLoading = true;
+ let params = Object.assign({username:this.username},values)
+ console.log("修改密码提交数据",params)
+ putAction(this.url,params).then((res)=>{
+ if(res.success){
+ console.log(res)
+ that.$message.success(res.message);
+ that.close();
+ }else{
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ })
+ }
+ })
+ },
+ validateToNextPassword (rule, value, callback) {
+ const form = this.form;
+ if (value && this.confirmDirty) {
+ form.validateFields(['confirm'], { force: true })
+ }
+ callback();
+ },
+ compareToFirstPassword (rule, value, callback) {
+ const form = this.form;
+ if (value && value !== form.getFieldValue('password')) {
+ callback('两次输入的密码不一样！');
+ } else {
+ callback()
+ }
+ },
+ handleConfirmBlur (e) {
+ const value = e.target.value
+ this.confirmDirty = this.confirmDirty || !!value
+ }
+
+ }
+ }
+</script>
+
+<style scoped>
+
+</style>
+
diff --git a/ant-design-jeecg-vue/src/config/router.config.js b/ant-design-jeecg-vue/src/config/router.config.js
index cbce627..1acb1bf 100644
--- a/ant-design-jeecg-vue/src/config/router.config.js
+++ b/ant-design-jeecg-vue/src/config/router.config.js
@@ -13,366 +13,61 @@ export const asyncRouterMap = [
meta: { title: '首页' },
redirect: '/dashboard/workplace',
children: [
-
-
- // //系统监控
- // {
- // path: '/sysmonitor',
- // name: 'sysmonitor',
- // redirect: '/sysmonitor',
- // component: RouteView,
- // meta: { title: '系统监控', icon: 'dashboard', permission: [ 'dashboard' ] },
- // children: [
- // {
- // path: '/sys/dataLog-list',
- // name: 'DataLogList',
- // component: () => import('@/views/system/DataLogList'),
- // meta: { title: '数据日志', permission: [ 'dashboard' ] }
- // },
- // {
- // path: 'http://localhost:8080/jeecg-boot/druid/',
- // name: 'druid',
- // component: () => import('@/views/jeecg/tablist/JeecgOrderDMainList'),
- // meta: { title: 'SQL监控', permission: [ 'dashboard' ] }
- // },
- // {
- // path: '/isystem/QuartzJobList',
- // name: 'QuartzJobList',
- // component: () => import('@/views/system/QuartzJobList'),
- // meta: { title: '定时任务', permission: [ 'dashboard' ] }
- // },
- // ]
- // },
- //
- //
- // //jeecg demo
+ // // account
// {
- // path: '/jeecg',
- // name: 'jeecg',
- // redirect: '/jeecg',
+ // path: '/account',
// component: RouteView,
- // meta: { title: 'JEECG案例', icon: 'dashboard', permission: [ 'dashboard' ] },
+ // name: 'account',
+ // meta: { title: '个人页', icon: 'user', keepAlive: true, permission: [ 'user' ] },
// children: [
// {
- // path: '/jeecg/JeecgDemoList',
- // name: 'DemoList',
- // component: () => import('@/views/jeecg/JeecgDemoList'),
- // meta: { title: '单表模型示例', permission: [ 'dashboard' ] }
- // },
- // {
- // path: '/jeecg/tablist/JeecgOrderDMainList',
- // name: 'JeecgOrderDMainList',
- // component: () => import('@/views/jeecg/tablist/JeecgOrderDMainList'),
- // meta: { title: '一对多Tab示例', permission: [ 'dashboard' ] }
- // },
- // {
- // path: '/jeecg/FlowTest',
- // name: 'FlowTest',
- // component: () => import('@/views/jeecg/FlowTest'),
- // meta: { title: '数据回执模拟', permission: [ 'dashboard' ] }
- // },
- // {
- // path: '/jeecg/PrintDemo',
- // name: 'PrintDemo',
- // component: () => import('@/views/jeecg/PrintDemo'),
- // meta: { title: '打印测试', permission: [ 'dashboard' ] }
- // },
- // {
- // path: '/jeecg/JeecgOrderMainList',
- // name: 'JeecgOrderMainList',
- // component: () => import('@/views/jeecg/JeecgOrderMainList'),
- // meta: { title: '一对多示例', permission: [ 'dashboard' ] }
- // },
- // {
- // path: 'http://www.baidu.com',
- // name: 'baidu',
- // component: () => import('@/components/layouts/IframePageView'),
- // meta: { title: '百度', permission: [ 'dashboard' ] }
- // },
- // {
- // path: 'http://localhost:8080/jeecg-boot/auto/cgform/list',
- // name: 'cgformtest',
- // component: () => import('@/components/layouts/IframePageView'),
- // meta: { title: 'online表单测试', permission: [ 'dashboard' ] }
+ // path: '/account/center',
+ // name: 'center',
+ // component: () => import('@/views/account/center/Index'),
+ // meta: { title: '个人中心', keepAlive: true, permission: [ 'user' ] }
// },
// {
- // path: '/jeecg/helloworld',
- // name: 'helloworld',
- // hidden : true,
- // component: () => import('@/views/jeecg/helloworld'),
- // meta: { title: 'helloworld', permission: [ 'dashboard' ] }
+ // path: '/account/settings',
+ // name: 'settings',
+ // component: () => import('@/views/account/settings/Index'),
+ // meta: { title: '个人设置', hideHeader: true, keepAlive: true, permission: [ 'user' ] },
+ // redirect: '/account/settings/base',
+ // alwaysShow: true,
+ // children: [
+ // {
+ // path: '/account/settings/base',
+ // name: 'BaseSettings',
+ // component: () => import('@/views/account/settings/BaseSetting'),
+ // meta: { title: '基本设置', hidden: true, keepAlive: true, permission: [ 'user' ] }
+ // },
+ // {
+ // path: '/account/settings/security',
+ // name: 'SecuritySettings',
+ // component: () => import('@/views/account/settings/Security'),
+ // meta: { title: '安全设置', hidden: true, keepAlive: true, permission: [ 'user' ] }
+ // },
+ // {
+ // path: '/account/settings/custom',
+ // name: 'CustomSettings',
+ // component: () => import('@/views/account/settings/Custom'),
+ // meta: { title: '个性化设置', hidden: true, keepAlive: true, permission: [ 'user' ] }
+ // },
+ // {
+ // path: '/account/settings/binding',
+ // name: 'BindingSettings',
+ // component: () => import('@/views/account/settings/Binding'),
+ // meta: { title: '账户绑定', hidden: true, keepAlive: true, permission: [ 'user' ] }
+ // },
+ // {
+ // path: '/account/settings/notification',
+ // name: 'NotificationSettings',
+ // component: () => import('@/views/account/settings/Notification'),
+ // meta: { title: '新消息通知', hidden: true, keepAlive: true, permission: [ 'user' ] }
+ // },
+ // ]
// },
// ]
- // },
-
- // dashboard
- {
- path: '/dashboard',
- name: 'dashboard',
- redirect: '/dashboard/workplace',
- component: RouteView,
- meta: { title: '仪表盘', icon: 'dashboard', permission: [ 'dashboard' ] },
- children: [
- {
- path: '/dashboard/analysis',
- name: 'Analysis',
- component: () => import('@/views/dashboard/Analysis'),
- meta: { title: '分析页', permission: [ 'dashboard' ] }
- },
- {
- path: '/dashboard/monitor',
- name: 'Monitor',
- hidden: true,
- component: () => import('@/views/dashboard/Monitor'),
- meta: { title: '监控页', permission: [ 'dashboard' ] }
- },
- {
- path: '/dashboard/workplace',
- name: 'Workplace',
- component: () => import('@/views/dashboard/Workplace'),
- meta: { title: '工作台', permission: [ 'dashboard' ] }
- }
- ]
- },
-
- // forms
- {
- path: '/form',
- redirect: '/form/basic-form',
- component: PageView,
- meta: { title: '表单页', icon: 'form', permission: [ 'form' ] },
- children: [
- {
- path: '/form/base-form',
- name: 'BaseForm',
- component: () => import('@/views/form/BasicForm'),
- meta: { title: '基础表单', permission: [ 'form' ] }
- },
- {
- path: '/form/step-form',
- name: 'StepForm',
- component: () => import('@/views/form/stepForm/StepForm'),
- meta: { title: '分步表单', permission: [ 'form' ] }
- },
- {
- path: '/form/advanced-form',
- name: 'AdvanceForm',
- component: () => import('@/views/form/advancedForm/AdvancedForm'),
- meta: { title: '高级表单', permission: [ 'form' ] }
- }
- ]
- },
-
- // list
- {
- path: '/list',
- name: 'list',
- component: PageView,
- redirect: '/list/query-list',
- meta: { title: '列表页', icon: 'table', permission: [ 'table' ] },
- children: [
- {
- path: '/list/query-list',
- name: 'QueryList',
- component: () => import('@/views/list/TableList'),
- meta: { title: '查询表格', permission: [ 'table' ] }
- },
- {
- path: '/list/edit-table',
- name: 'EditList',
- component: () => import('@/views/list/TableInnerEditList'),
- meta: { title: '内联编辑表格', permission: [ 'table' ] }
- },
- {
- path: '/list/user-list',
- name: 'UserList',
- component: () => import('@/views/list/UserList'),
- meta: { title: '用户列表', permission: [ 'table' ] }
- },
- {
- path: '/list/role-list',
- name: 'RoleList',
- component: () => import('@/views/list/RoleList'),
- meta: { title: '角色列表', permission: [ 'table' ] }
- },
- {
- path: '/list/permission-list',
- name: 'PermissionList',
- component: () => import('@/views/list/PermissionList'),
- meta: { title: '权限列表', permission: [ 'table' ] }
- },
- {
- path: '/list/basic-list',
- name: 'BasicList',
- component: () => import('@/views/list/StandardList'),
- meta: { title: '标准列表', permission: [ 'table' ] }
- },
- {
- path: '/list/card',
- name: 'CardList',
- component: () => import('@/views/list/CardList'),
- meta: { title: '卡片列表', permission: [ 'table' ] }
- },
- {
- path: '/list/search',
- name: 'SearchList',
- component: () => import('@/views/list/search/SearchLayout'),
- redirect: '/list/search/article',
- meta: { title: '搜索列表', permission: [ 'table' ] },
- children: [
- {
- path: '/list/search/article',
- name: 'SearchArticles',
- component: () => import('../views/list/TableList'),
- meta: { title: '搜索列表（文章）', permission: [ 'table' ] }
- },
- {
- path: '/list/search/project',
- name: 'SearchProjects',
- component: () => import('../views/list/TableList'),
- meta: { title: '搜索列表（项目）', permission: [ 'table' ] }
- },
- {
- path: '/list/search/application',
- name: 'SearchApplications',
- component: () => import('../views/list/TableList'),
- meta: { title: '搜索列表（应用）', permission: [ 'table' ] }
- },
- ]
- },
- ]
- },
-
- // profile
- {
- path: '/profile',
- name: 'profile',
- component: RouteView,
- redirect: '/profile/basic',
- meta: { title: '详情页', icon: 'profile', permission: [ 'profile' ] },
- children: [
- {
- path: '/profile/basic',
- name: 'ProfileBasic',
- component: () => import('@/views/profile/basic/Index'),
- meta: { title: '基础详情页', permission: [ 'profile' ] }
- },
- {
- path: '/profile/advanced',
- name: 'ProfileAdvanced',
- component: () => import('@/views/profile/advanced/Advanced'),
- meta: { title: '高级详情页', permission: [ 'profile' ] }
- }
- ]
- },
-
- // result
- {
- path: '/result',
- name: 'result',
- component: PageView,
- redirect: '/result/success',
- meta: { title: '结果页', icon: 'check-circle-o', permission: [ 'result' ] },
- children: [
- {
- path: '/result/success',
- name: 'ResultSuccess',
- component: () => import(/* webpackChunkName: "result" */ '@/views/result/Success'),
- meta: { title: '成功', hiddenHeaderContent: true, permission: [ 'result' ] }
- },
- {
- path: '/result/fail',
- name: 'ResultFail',
- component: () => import(/* webpackChunkName: "result" */ '@/views/result/Error'),
- meta: { title: '失败', hiddenHeaderContent: true, permission: [ 'result' ] }
- }
- ]
- },
-
- // Exception
- {
- path: '/exception',
- name: 'exception',
- component: RouteView,
- redirect: '/exception/403',
- meta: { title: '异常页', icon: 'warning', permission: [ 'exception' ] },
- children: [
- {
- path: '/exception/403',
- name: 'Exception403',
- component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/403'),
- meta: { title: '403', permission: [ 'exception' ] }
- },
- {
- path: '/exception/404',
- name: 'Exception404',
- component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404'),
- meta: { title: '404', permission: [ 'exception' ] }
- },
- {
- path: '/exception/500',
- name: 'Exception500',
- component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/500'),
- meta: { title: '500', permission: [ 'exception' ] }
- }
- ]
- },
-
- // account
- {
- path: '/account',
- component: RouteView,
- name: 'account',
- meta: { title: '个人页', icon: 'user', keepAlive: true, permission: [ 'user' ] },
- children: [
- {
- path: '/account/center',
- name: 'center',
- component: () => import('@/views/account/center/Index'),
- meta: { title: '个人中心', keepAlive: true, permission: [ 'user' ] }
- },
- {
- path: '/account/settings',
- name: 'settings',
- component: () => import('@/views/account/settings/Index'),
- meta: { title: '个人设置', hideHeader: true, keepAlive: true, permission: [ 'user' ] },
- redirect: '/account/settings/base',
- alwaysShow: true,
- children: [
- {
- path: '/account/settings/base',
- name: 'BaseSettings',
- component: () => import('@/views/account/settings/BaseSetting'),
- meta: { title: '基本设置', hidden: true, keepAlive: true, permission: [ 'user' ] }
- },
- {
- path: '/account/settings/security',
- name: 'SecuritySettings',
- component: () => import('@/views/account/settings/Security'),
- meta: { title: '安全设置', hidden: true, keepAlive: true, permission: [ 'user' ] }
- },
- {
- path: '/account/settings/custom',
- name: 'CustomSettings',
- component: () => import('@/views/account/settings/Custom'),
- meta: { title: '个性化设置', hidden: true, keepAlive: true, permission: [ 'user' ] }
- },
- {
- path: '/account/settings/binding',
- name: 'BindingSettings',
- component: () => import('@/views/account/settings/Binding'),
- meta: { title: '账户绑定', hidden: true, keepAlive: true, permission: [ 'user' ] }
- },
- {
- path: '/account/settings/notification',
- name: 'NotificationSettings',
- component: () => import('@/views/account/settings/Notification'),
- meta: { title: '新消息通知', hidden: true, keepAlive: true, permission: [ 'user' ] }
- },
- ]
- },
- ]
- }
+ // }
]
},
{
@@ -449,5 +144,4 @@ export const constantRouterMap = [
path: '/404',
component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404')
},
-
]
diff --git a/ant-design-jeecg-vue/src/main.js b/ant-design-jeecg-vue/src/main.js
index 6a5e8d6..40a321a 100644
--- a/ant-design-jeecg-vue/src/main.js
+++ b/ant-design-jeecg-vue/src/main.js
@@ -16,6 +16,9 @@ import Print from 'vue-print-nb-jeecg'
/*import '@babel/polyfill'*/
import VueApexCharts from 'vue-apexcharts'
+import preview from 'vue-photo-preview'
+import 'vue-photo-preview/dist/skin.css'
+
import {
ACCESS_TOKEN,
DEFAULT_COLOR,
@@ -26,12 +29,14 @@ import {
DEFAULT_FIXED_HEADER,
DEFAULT_FIXED_HEADER_HIDDEN,
DEFAULT_FIXED_SIDEMENU,
- DEFAULT_CONTENT_WIDTH_TYPE
+ DEFAULT_CONTENT_WIDTH_TYPE,
+ DEFAULT_MULTI_PAGE
} from "@/store/mutation-types"
import config from '@/defaultSettings'
import JDictSelectTag from './components/dict/index.js'
import hasPermission from '@/utils/hasPermission'
+import vueBus from '@/utils/vueBus';
Vue.config.productionTip = false
Vue.use(Storage, config.storageOptions)
@@ -43,6 +48,8 @@ Vue.use(JDictSelectTag)
Vue.use(Print)
Vue.use(VueApexCharts)
Vue.component('apexchart', VueApexCharts)
+Vue.use(preview)
+Vue.use(vueBus);
new Vue({
router,
@@ -58,6 +65,7 @@ new Vue({
store.commit('TOGGLE_WEAK', Vue.ls.get(DEFAULT_COLOR_WEAK, config.colorWeak))
store.commit('TOGGLE_COLOR', Vue.ls.get(DEFAULT_COLOR, config.primaryColor))
store.commit('SET_TOKEN', Vue.ls.get(ACCESS_TOKEN))
+ store.commit('SET_MULTI_PAGE',Vue.ls.get(DEFAULT_MULTI_PAGE,true))
},
render: h => h(App)
}).$mount('#app')
diff --git a/ant-design-jeecg-vue/src/mixins/DisabledAuthFilterMixin.js b/ant-design-jeecg-vue/src/mixins/DisabledAuthFilterMixin.js
new file mode 100644
index 0000000..61f6404
--- /dev/null
+++ b/ant-design-jeecg-vue/src/mixins/DisabledAuthFilterMixin.js
@@ -0,0 +1,22 @@
+/**
+ *
+ */
+import { disabledAuthFilter } from "@/utils/authFilter"
+
+export const DisabledAuthFilterMixin = {
+ props: ['formData'],
+ data(){
+ return {
+
+ }
+ },
+ created() {
+
+ },
+ methods:{
+ disabledAuth(code){
+ return disabledAuthFilter(code,this.formData);
+ },
+ }
+
+}
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/mixins/JEditableTableOneToManyMixin.js b/ant-design-jeecg-vue/src/mixins/JEditableTableMixin.js
index f6c7ad8..ab7ed35 100644
--- a/ant-design-jeecg-vue/src/mixins/JEditableTableOneToManyMixin.js
+++ b/ant-design-jeecg-vue/src/mixins/JEditableTableMixin.js
@@ -2,7 +2,7 @@ import JEditableTable from '@/components/jeecg/JEditableTable'
import { VALIDATE_NO_PASSED, getRefPromise, validateFormAndTables } from '@/utils/JEditableTableUtil'
import { httpAction, getAction } from '@/api/manage'
-export const JEditableTableOneToManyMixin = {
+export const JEditableTableMixin = {
components: {
JEditableTable
},
@@ -48,6 +48,7 @@ export const JEditableTableOneToManyMixin = {
/** 当点击新增按钮时调用此方法 */
add() {
+ if (typeof this.addBefore === 'function') this.addBefore()
// 默认新增空数据
let rowNum = this.addDefaultRowNum
if (typeof rowNum !== 'number') {
@@ -57,7 +58,7 @@ export const JEditableTableOneToManyMixin = {
this.eachAllTable((item) => {
item.add(rowNum)
})
-
+ if (typeof this.addAfter === 'function') this.addAfter(this.model)
this.edit({})
},
/** 当点击了编辑（修改）按钮时调用此方法 */
diff --git a/ant-design-jeecg-vue/src/mixins/JeecgListMixin.js b/ant-design-jeecg-vue/src/mixins/JeecgListMixin.js
index 3640b3f..9a64825 100644
--- a/ant-design-jeecg-vue/src/mixins/JeecgListMixin.js
+++ b/ant-design-jeecg-vue/src/mixins/JeecgListMixin.js
@@ -4,11 +4,16 @@
* data中url定义 list为查询列表 delete为删除单条记录 deleteBatch为批量删除
*/
import { filterObj } from '@/utils/util';
-import { deleteAction, getAction } from '@/api/manage'
+import { deleteAction, getAction,downFile } from '@/api/manage'
+import Vue from 'vue'
+import { ACCESS_TOKEN } from "@/store/mutation-types"
+
export const JeecgListMixin = {
data(){
return {
- /* 查询条件 */
+ //token header
+ tokenHeader: {'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)},
+ /* 查询条件-请不要在queryParam中声明非字符串值的属性 */
queryParam: {},
/* 数据源 */
dataSource:[],
@@ -42,7 +47,7 @@ export const JeecgListMixin = {
/* 高级查询条件生效状态 */
superQueryFlag:false,
/* 高级查询条件 */
- superQueryParams:"",
+ superQueryParams:""
}
},
created() {
@@ -61,11 +66,13 @@ export const JeecgListMixin = {
this.ipagination.current = 1;
}
var params = this.getQueryParams();//查询条件
+ this.loading = true;
getAction(this.url.list, params).then((res) => {
if (res.success) {
this.dataSource = res.result.records;
this.ipagination.total = res.result.total;
}
+ this.loading = false;
})
},
initDictConfig(){
@@ -198,22 +205,73 @@ export const JeecgListMixin = {
this.$refs.modalForm.disableSubmit = true;
},
/* 导出 */
- handleExportXls(){
+ handleExportXls2(){
let paramsStr = encodeURI(JSON.stringify(this.getQueryParams()));
let url = `${window._CONFIG['domianURL']}/${this.url.exportXlsUrl}?paramsStr=${paramsStr}`;
window.location.href = url;
},
+ handleExportXls(fileName){
+ if(!fileName || typeof fileName != "string"){
+ fileName = "导出文件"
+ }
+ let param = {...this.queryParam};
+ if(this.selectedRowKeys && this.selectedRowKeys.length>0){
+ param['selections'] = this.selectedRowKeys.join(",")
+ }
+ console.log("导出参数",param)
+ downFile(this.url.exportXlsUrl,param).then((data)=>{
+ if (!data) {
+ this.$message.warning("文件下载失败")
+ return
+ }
+ if (typeof window.navigator.msSaveBlob !== 'undefined') {
+ window.navigator.msSaveBlob(new Blob([data]), fileName+'.xls')
+ }else{
+ let url = window.URL.createObjectURL(new Blob([data]))
+ let link = document.createElement('a')
+ link.style.display = 'none'
+ link.href = url
+ link.setAttribute('download', fileName+'.xls')
+ document.body.appendChild(link)
+ link.click()
+ document.body.removeChild(link); //下载完成移除元素
+ window.URL.revokeObjectURL(url); //释放掉blob对象
+ }
+ })
+ },
/* 导入 */
handleImportExcel(info){
if (info.file.status !== 'uploading') {
console.log(info.file, info.fileList);
}
if (info.file.status === 'done') {
- this.$message.success(`${info.file.name} 文件上传成功`);
- this.loadData();
+ if(info.file.response.success){
+ this.$message.success(`${info.file.name} 文件上传成功`);
+ this.loadData();
+ } else {
+ this.$message.error(`${info.file.name} ${info.file.response.message}.`);
+ }
} else if (info.file.status === 'error') {
- this.$message.error(`${info.file.name} 文件上传失败.`);
+ this.$message.error(`文件上传失败: ${info.file.msg} `);
+ }
+ },
+ /* 图片预览 */
+ getImgView(text){
+ if(text && text.indexOf(",")>0){
+ text = text.substring(0,text.indexOf(","))
+ }
+ return window._CONFIG['imgDomainURL']+"/"+text
+ },
+ /* 文件下载 */
+ uploadFile(text){
+ if(!text){
+ this.$message.warning("未知的文件")
+ return;
+ }
+ if(text.indexOf(",")>0){
+ text = text.substring(0,text.indexOf(","))
}
+ window.open(window._CONFIG['domianURL'] + "/sys/common/download/"+text);
},
}
diff --git a/ant-design-jeecg-vue/src/permission.js b/ant-design-jeecg-vue/src/permission.js
index 7bfed1b..36fc7a8 100644
--- a/ant-design-jeecg-vue/src/permission.js
+++ b/ant-design-jeecg-vue/src/permission.js
@@ -22,7 +22,7 @@ router.beforeEach((to, from, next) => {
} else {
if (store.getters.permissionList.length === 0) {
store.dispatch('GetPermissionList').then(res => {
- const menuData = res.result;
+ const menuData = res.result.menu;
console.log(res.message)
if (menuData === null || menuData === "" || menuData === undefined) {
return;
@@ -45,10 +45,10 @@ router.beforeEach((to, from, next) => {
})
})
.catch(() => {
- notification.error({
+ /* notification.error({
message: '系统提示',
description: '请求用户信息失败，请重试！'
- })
+ })*/
store.dispatch('Logout').then(() => {
next({ path: '/user/login', query: { redirect: to.fullPath } })
})
diff --git a/ant-design-jeecg-vue/src/store/modules/app.js b/ant-design-jeecg-vue/src/store/modules/app.js
index e2a0b74..e7912e6 100644
--- a/ant-design-jeecg-vue/src/store/modules/app.js
+++ b/ant-design-jeecg-vue/src/store/modules/app.js
@@ -8,7 +8,8 @@ import {
DEFAULT_FIXED_HEADER,
DEFAULT_FIXED_SIDEMENU,
DEFAULT_FIXED_HEADER_HIDDEN,
- DEFAULT_CONTENT_WIDTH_TYPE
+ DEFAULT_CONTENT_WIDTH_TYPE,
+ DEFAULT_MULTI_PAGE
} from "@/store/mutation-types"
const app = {
@@ -75,6 +76,7 @@ const app = {
state.weak = flag
},
SET_MULTI_PAGE (state, multipageFlag) {
+ Vue.ls.set(DEFAULT_MULTI_PAGE, multipageFlag)
state.multipage = multipageFlag
}
},
diff --git a/ant-design-jeecg-vue/src/store/modules/user.js b/ant-design-jeecg-vue/src/store/modules/user.js
index 05000ea..ac33fe2 100644
--- a/ant-design-jeecg-vue/src/store/modules/user.js
+++ b/ant-design-jeecg-vue/src/store/modules/user.js
@@ -1,6 +1,6 @@
import Vue from 'vue'
import { login, logout } from "@/api/login"
-import { ACCESS_TOKEN, USER_NAME,USER_INFO } from "@/store/mutation-types"
+import { ACCESS_TOKEN, USER_NAME,USER_INFO,USER_AUTH,SYS_BUTTON_AUTH } from "@/store/mutation-types"
import { welcome } from "@/utils/util"
import { queryPermissionsByUser } from '@/api/api'
@@ -50,7 +50,7 @@ const user = {
commit('SET_INFO', userInfo)
commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname, welcome: welcome() })
commit('SET_AVATAR', userInfo.avatar)
- resolve()
+ resolve(response)
}else{
reject(response)
}
@@ -63,10 +63,15 @@ const user = {
// 获取用户信息
GetPermissionList({ commit }) {
return new Promise((resolve, reject) => {
- let username = Vue.ls.get(USER_NAME);
- let params = {username:username};
+ let v_token = Vue.ls.get(ACCESS_TOKEN);
+ let params = {token:v_token};
queryPermissionsByUser(params).then(response => {
- const menuData = response.result;
+ const menuData = response.result.menu;
+ const authData = response.result.auth;
+ const allAuthData = response.result.allAuth;
+ //Vue.ls.set(USER_AUTH,authData);
+ sessionStorage.setItem(USER_AUTH,JSON.stringify(authData));
+ sessionStorage.setItem(SYS_BUTTON_AUTH,JSON.stringify(allAuthData));
if (menuData && menuData.length > 0) {
commit('SET_PERMISSIONLIST', menuData)
} else {
diff --git a/ant-design-jeecg-vue/src/store/mutation-types.js b/ant-design-jeecg-vue/src/store/mutation-types.js
index 2fa98ae..7c1beb8 100644
--- a/ant-design-jeecg-vue/src/store/mutation-types.js
+++ b/ant-design-jeecg-vue/src/store/mutation-types.js
@@ -8,8 +8,11 @@ export const DEFAULT_FIXED_HEADER = 'DEFAULT_FIXED_HEADER'
export const DEFAULT_FIXED_SIDEMENU= 'DEFAULT_FIXED_SIDEMENU'
export const DEFAULT_FIXED_HEADER_HIDDEN = 'DEFAULT_FIXED_HEADER_HIDDEN'
export const DEFAULT_CONTENT_WIDTH_TYPE = 'DEFAULT_CONTENT_WIDTH_TYPE'
+export const DEFAULT_MULTI_PAGE = 'DEFAULT_MULTI_PAGE'
export const USER_NAME = 'Login_Username'
export const USER_INFO = 'Login_Userinfo'
+export const USER_AUTH = 'LOGIN_USER_BUTTON_AUTH'
+export const SYS_BUTTON_AUTH = 'SYS_BUTTON_AUTH'
export const CONTENT_WIDTH_TYPE = {
Fluid: 'Fluid',
diff --git a/ant-design-jeecg-vue/src/utils/JEditableTableUtil.js b/ant-design-jeecg-vue/src/utils/JEditableTableUtil.js
index b443383..8b93e33 100644
--- a/ant-design-jeecg-vue/src/utils/JEditableTableUtil.js
+++ b/ant-design-jeecg-vue/src/utils/JEditableTableUtil.js
@@ -5,7 +5,9 @@ const FormTypes = {
checkbox: 'checkbox',
select: 'select',
date: 'date',
- datetime: 'datetime'
+ datetime: 'datetime',
+ upload: 'upload',
+ slot: 'slot'
}
const VALIDATE_NO_PASSED = Symbol()
export { FormTypes, VALIDATE_NO_PASSED }
diff --git a/ant-design-jeecg-vue/src/utils/authFilter.js b/ant-design-jeecg-vue/src/utils/authFilter.js
new file mode 100644
index 0000000..8740e7a
--- /dev/null
+++ b/ant-design-jeecg-vue/src/utils/authFilter.js
@@ -0,0 +1,112 @@
+
+import { USER_AUTH,SYS_BUTTON_AUTH } from "@/store/mutation-types"
+
+export function disabledAuthFilter(code,formData) {
+ if(nodeDisabledAuth(code,formData)){
+ return true;
+ }else{
+ return globalDisabledAuth(code);
+ }
+}
+
+function nodeDisabledAuth(code,formData){
+ console.log("页面权限禁用--NODE--开始");
+ var permissionList = [];
+ try {
+ var obj = formData;
+ //console.log("页面权限禁用--NODE--开始",obj);
+ if (obj) {
+ let bpmList = obj.permissionList;
+ for (var bpm of bpmList) {
+ if(bpm.type == '2') {
+ permissionList.push(bpm);
+ }
+ }
+ }
+ } catch (e) {
+ //console.log("页面权限异常----", e);
+ }
+ if (permissionList === null || permissionList === "" || permissionList === undefined||permissionList.length<=0) {
+ return false;
+ }
+ let permissions = [];
+ for (var item of permissionList) {
+ if(item.type == '2') {
+ permissions.push(item.action);
+ }
+ }
+ //console.log("页面权限----"+code);
+ if (!permissions.includes(code)) {
+ return false;
+ }else{
+ for (var item2 of permissionList) {
+ if(code === item2.action){
+ console.log("页面权限禁用--NODE--生效");
+ return true;
+ }
+ }
+ }
+ return false;
+}
+
+function globalDisabledAuth(code){
+ console.log("页面禁用权限--Global--开始");
+
+ var permissionList = [];
+ var allPermissionList = [];
+
+ //let authList = Vue.ls.get(USER_AUTH);
+ let authList = JSON.parse(sessionStorage.getItem(USER_AUTH) || "[]");
+ for (var auth of authList) {
+ if(auth.type == '2') {
+ permissionList.push(auth);
+ }
+ }
+ //console.log("页面禁用权限--Global--",sessionStorage.getItem(SYS_BUTTON_AUTH));
+ let allAuthList = JSON.parse(sessionStorage.getItem(SYS_BUTTON_AUTH) || "[]");
+ for (var gauth of allAuthList) {
+ if(gauth.type == '2') {
+ allPermissionList.push(gauth);
+ }
+ }
+ //设置全局配置是否有命中
+ var gFlag = false;//禁用命中
+ var invalidFlag = false;//无效命中
+ if(allPermissionList != null && allPermissionList != "" && allPermissionList != undefined && allPermissionList.length > 0){
+ for (var itemG of allPermissionList) {
+ if(code === itemG.action){
+ if(itemG.status == '0'){
+ invalidFlag = true;
+ break;
+ }else{
+ gFlag = true;
+ break;
+ }
+ }
+ }
+ }
+ if(invalidFlag){
+ return false;
+ }
+ if (permissionList === null || permissionList === "" || permissionList === undefined||permissionList.length<=0) {
+ return gFlag;
+ }
+ let permissions = [];
+ for (var item of permissionList) {
+ if(item.type == '2') {
+ permissions.push(item.action);
+ }
+ }
+ //console.log("页面禁用权限----"+code);
+ if (!permissions.includes(code)) {
+ return gFlag;
+ }else{
+ for (var item2 of permissionList) {
+ if(code === item2.action){
+ console.log("页面权限解除禁用--Global--生效");
+ gFlag = false;
+ }
+ }
+ return gFlag;
+ }
+}
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/utils/hasPermission.js b/ant-design-jeecg-vue/src/utils/hasPermission.js
index 52aafbb..e8cb5cf 100644
--- a/ant-design-jeecg-vue/src/utils/hasPermission.js
+++ b/ant-design-jeecg-vue/src/utils/hasPermission.js
@@ -1,27 +1,116 @@
+import { USER_AUTH,SYS_BUTTON_AUTH } from "@/store/mutation-types"
+
const hasPermission = {
install (Vue, options) {
console.log(options);
Vue.directive('has', {
inserted: (el, binding, vnode)=>{
- console.log("页面权限----",el);
- let permissionList = vnode.context.$route.meta.permissionList;
- if (permissionList === null || permissionList === "" || permissionList === undefined) {
- el.parentNode.removeChild(el)
- return
- }
- let permissions = [];
- for (var item of permissionList) {
- permissions.push(item.action);
- }
- //console.log("页面权限----"+permissions);
- //console.log("页面权限----"+binding.value);
- if (!permissions.includes(binding.value)) {
- //if(el.parentNode)
- el.parentNode.removeChild(el)
- }
+ console.log("页面权限控制----");
+ //节点权限处理，如果命中则不进行全局权限处理
+ if(!filterNodePermission(el, binding, vnode)){
+ filterGlobalPermission(el, binding, vnode);
+ }
}
});
}
};
+/**
+ * 全局权限控制
+ */
+export function filterNodePermission(el, binding, vnode) {
+ console.log("页面权限--NODE--");
+
+ var permissionList = [];
+ try {
+ var obj = vnode.context.$props.formData;
+ if (obj) {
+ let bpmList = obj.permissionList;
+ for (var bpm of bpmList) {
+ if(bpm.type != '2') {
+ permissionList.push(bpm);
+ }
+ }
+ }
+ } catch (e) {
+ //console.log("页面权限异常----", e);
+ }
+ if (permissionList === null || permissionList === "" || permissionList === undefined||permissionList.length<=0) {
+ //el.parentNode.removeChild(el)
+ return false;
+ }
+ let permissions = [];
+ for (var item of permissionList) {
+ if(item.type != '2') {
+ permissions.push(item.action);
+ }
+ }
+ //console.log("页面权限----"+permissions);
+ //console.log("页面权限----"+binding.value);
+ if (!permissions.includes(binding.value)) {
+ //el.parentNode.removeChild(el)
+ return false;
+ }else{
+ for (var item2 of permissionList) {
+ if(binding.value === item2.action){
+ return true;
+ }
+ }
+ }
+ return false;
+}
+
+/**
+ * 全局权限控制
+ */
+export function filterGlobalPermission(el, binding, vnode) {
+ console.log("页面权限--Global--");
+
+ var permissionList = [];
+ var allPermissionList = [];
+
+ //let authList = Vue.ls.get(USER_AUTH);
+ let authList = JSON.parse(sessionStorage.getItem(USER_AUTH) || "[]");
+ for (var auth of authList) {
+ if(auth.type != '2') {
+ permissionList.push(auth);
+ }
+ }
+ //console.log("页面权限--Global--",sessionStorage.getItem(SYS_BUTTON_AUTH));
+ let allAuthList = JSON.parse(sessionStorage.getItem(SYS_BUTTON_AUTH) || "[]");
+ for (var gauth of allAuthList) {
+ if(gauth.type != '2') {
+ allPermissionList.push(gauth);
+ }
+ }
+ //设置全局配置是否有命中
+ var invalidFlag = false;//无效命中
+ if(allPermissionList != null && allPermissionList != "" && allPermissionList != undefined && allPermissionList.length > 0){
+ for (var itemG of allPermissionList) {
+ if(binding.value === itemG.action){
+ if(itemG.status == '0'){
+ invalidFlag = true;
+ break;
+ }
+ }
+ }
+ }
+ if(invalidFlag){
+ return;
+ }
+ if (permissionList === null || permissionList === "" || permissionList === undefined||permissionList.length<=0) {
+ el.parentNode.removeChild(el);
+ return;
+ }
+ let permissions = [];
+ for (var item of permissionList) {
+ if(item.type != '2'){
+ permissions.push(item.action);
+ }
+ }
+ if (!permissions.includes(binding.value)) {
+ el.parentNode.removeChild(el);
+ }
+}
+
export default hasPermission;
diff --git a/ant-design-jeecg-vue/src/utils/util.js b/ant-design-jeecg-vue/src/utils/util.js
index 5072374..014b6ed 100644
--- a/ant-design-jeecg-vue/src/utils/util.js
+++ b/ant-design-jeecg-vue/src/utils/util.js
@@ -136,8 +136,8 @@ function generateChildRouters (data) {
//--update-begin----author:scott---date:20190320------for:根据后台菜单配置，判断是否路由菜单字段，动态选择是否生成路由（为了支持参数URL菜单）------
//判断是否生成路由
if(item.route && item.route === '0'){
- console.log(' 不生成路由 item.route： '+item.route);
- console.log(' 不生成路由 item.path： '+item.path);
+ //console.log(' 不生成路由 item.route： '+item.route);
+ //console.log(' 不生成路由 item.path： '+item.path);
}else{
routers.push(menu);
}
@@ -157,12 +157,30 @@ export function cloneObject(obj) {
/**
* 随机生成数字
- * @param min 最小值
- * @param max 最大值
+ *
+ * 示例：生成长度为 12 的随机数：randomNumber(12)
+ * 示例：生成 3~23 之间的随机数：randomNumber(3, 23)
+ *
+ * @param1 最小值 | 长度
+ * @param2 最大值
* @return int 生成后的数字
*/
-export function randomNumber(min, max) {
- return Math.floor(Math.random() * (max - min + 1) + min)
+export function randomNumber() {
+ // 生成 最小值 到 最大值 区间的随机数
+ const random = (min, max) => {
+ return Math.floor(Math.random() * (max - min + 1) + min)
+ }
+ if (arguments.length === 1) {
+ let [length] = arguments
+ // 生成指定长度的随机数字，首位一定不是 0
+ let nums = [...Array(length).keys()].map((i) => (i > 0 ? random(0, 9) : random(1, 9)))
+ return parseInt(nums.join(''))
+ } else if (arguments.length >= 2) {
+ let [min, max] = arguments
+ return random(min, max)
+ } else {
+ return Number.NaN
+ }
}
/**
@@ -192,35 +210,12 @@ export function randomUUID() {
}
/**
- * 【顶部导航栏模式】
- * @date 2019-04-08
- * 顶部导航栏滚动条位置滚动到选中的菜单处
- * @param doc document 对象
+ * 下划线转驼峰
+ * @param string
+ * @returns {*}
*/
-export function topNavScrollToSelectItem(doc) {
- let scrollWidth = doc.getElementById('top-nav-scroll-width')
- if (scrollWidth == null) return
- let menu = scrollWidth.getElementsByClassName('ant-menu')[0]
- if (menu) {
- let menuItems = menu.getElementsByTagName('li')
- for (let item of menuItems) {
- let index1 = item.className.indexOf('ant-menu-item-selected') !== -1
- let index2 = item.className.indexOf('ant-menu-submenu-selected') !== -1
- if (index1 || index2) {
- // scrollLeft = 选中项left - 选中项width - (第一个隐藏的div的宽度)
- let scrollLeft = (item.offsetLeft - item.offsetWidth - (index1 ? 100 : 60))
- let scrollView = doc.getElementById('top-nav-scroll-view')
- // scrollTo() 方法存在兼容性问题
- if (typeof scrollView.scrollTo === 'function') {
- scrollView.scrollTo({
- left: scrollLeft,
- behavior: 'smooth'
- })
- } else {
- scrollView.scrollLeft = scrollLeft
- }
- break
- }
- }
- }
+export function underLine2CamelCase(string){
+ return string.replace( /_([a-z])/g, function( all, letter ) {
+ return letter.toUpperCase();
+ });
}
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/utils/vueBus.js b/ant-design-jeecg-vue/src/utils/vueBus.js
new file mode 100644
index 0000000..95235a0
--- /dev/null
+++ b/ant-design-jeecg-vue/src/utils/vueBus.js
@@ -0,0 +1,5 @@
+import Bus from 'vue';
+let install = function (Vue) {
+ Vue.prototype.$bus = new Bus()
+}
+export default { install };
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/jeecg/ImagPreview.vue b/ant-design-jeecg-vue/src/views/jeecg/ImagPreview.vue
new file mode 100644
index 0000000..063428c
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/jeecg/ImagPreview.vue
@@ -0,0 +1,119 @@
+<template>
+ <a-card :bordered="false">
+ <a-col :span="18">
+ <a-spin tip="Loading..." :spinning="spinning">
+ <div>
+ <a-row>
+ <a-col :span="18">
+ <p>
+ <a-divider orientation="left">组一</a-divider>
+ </p>
+ </a-col>
+ <a-col :span="6"></a-col>
+ <!-- 预览区域 -->
+ <a-col :span="12">
+ <template>
+ <div v-for="(fileDetail,index) in dataSource[0].fileDetails" :key="index">
+ <div style="float: left;width:104px;height:104px;margin-right: 10px;margin: 0 8px 8px 0;">
+ <div
+ style="width: 100%;height: 100%;position: relative;padding: 8px;border: 1px solid #d9d9d9;border-radius: 4px;">
+ <img style="width: 100%;" :src="fileDetail.imgUrl" :preview="dataSource[0].key">
+ </div>
+ </div>
+ </div>
+ </template>
+ </a-col>
+ </a-row>
+ </div>
+ <div>
+ <a-row>
+ <a-col :span="18">
+ <p>
+ <a-divider orientation="left">组二</a-divider>
+ </p>
+ </a-col>
+ <a-col :span="6"></a-col>
+ <!-- 预览区域 -->
+ <a-col :span="12">
+ <template>
+ <div v-for="(fileDetail,index) in dataSource[1].fileDetails" :key="index">
+ <div style="float: left;width:104px;height:104px;margin-right: 10px;margin: 0 8px 8px 0;">
+ <div
+ style="width: 100%;height: 100%;position: relative;padding: 8px;border: 1px solid #d9d9d9;border-radius: 4px;">
+ <img style="width: 100%;" :src="fileDetail.imgUrl" :preview="dataSource[1].key">
+ </div>
+ </div>
+ </div>
+ </template>
+ </a-col>
+ </a-row>
+ </div>
+ </a-spin>
+ <p></p>
+ </a-col>
+ </a-card>
+</template>
+
+<script>
+
+ import ARow from 'ant-design-vue/es/grid/Row'
+
+ export default {
+ name: 'ImagPreview',
+ components: {
+ ARow
+ },
+ data() {
+ return {
+ description: '电子档补扫页面',
+ spinning:false,
+ //数据集
+ dataSource: [{
+ key:0,
+ fileDetails:[
+ {
+ imgUrl:"https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2735633715,2749454924&fm=27&gp=0.jpg"
+ },
+ {
+ imgUrl:"https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=3967239004,1951414302&fm=27&gp=0.jpg"
+ },
+ {
+ imgUrl:"https://ss0.bdstatic.com/6Ox1bjeh1BF3odCf/it/u=3660968530,985748925&fm=191&app=48&size=h300&n=0&g=4n&f=JPEG?sec=1853310920&t=5e64af964be378c6c2a3b0acc65dfe24"
+ }
+ ]
+ },{
+ key:1,
+ fileDetails:[
+ {
+ imgUrl:"https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=889120611,3801177793&fm=27&gp=0.jpg"
+ },
+ {
+ imgUrl:"https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2445468140,2491956848&fm=27&gp=0.jpg"
+ }
+ ]
+ },
+ ],
+ url: {
+ },
+
+ }
+ },
+ created() {
+ },
+ methods: {
+ }
+ }
+</script>
+<style scoped>
+ .table-operator {
+ margin-bottom: 10px
+ }
+
+ .clName .ant-tree li span.ant-tree-switcher, .ant-tree li span.ant-tree-iconEle {
+ width: 10px !important;
+ }
+
+ .clName .ant-tree li .ant-tree-node-content-wrapper.ant-tree-node-selected {
+ background-color: #1890FF !important;
+ }
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/jeecg/ImgDragSort.vue b/ant-design-jeecg-vue/src/views/jeecg/ImgDragSort.vue
new file mode 100644
index 0000000..e6aa5f8
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/jeecg/ImgDragSort.vue
@@ -0,0 +1,75 @@
+<template>
+ <a-card>
+ <draggable @end="end" :options="{animation: 300}" v-model="dataSource" style="display: inline-block">
+ <template v-for="(data,index) in dataSource">
+ <div style="float: left;width:150px;height:150px;margin-right: 10px;margin: 0 8px 8px 0;" :key="index">
+ <div style="width: 100%;height: 100%;position: relative;padding: 8px;border: 1px solid #d9d9d9;border-radius: 4px;">
+ <img style="width: 100%;" :src="data.filePath" preview="index">
+ </div>
+ </div>
+ </template>
+ <a-button @click="sureChange" type="primary" style="margin-top: 115px">确定</a-button>
+ </draggable>
+ <br/>
+ <a-row>
+ <a-col :span="12">
+ <p>拖拽前json数据：</p>
+ <textarea rows="25" style="width: 780px">{{ oldDateSource }}</textarea>
+ </a-col>
+ <a-col :span="12">
+ <p>拖拽后json数据：</p>
+ <textarea rows="25" style="width: 780px">{{ newDateSource }}</textarea>
+ </a-col>
+ </a-row>
+ </a-card>
+</template>
+
+<script>
+ import draggable from 'vuedraggable'
+ import ARow from 'ant-design-vue/es/grid/Row'
+ import ACol from 'ant-design-vue/es/grid/Col'
+
+ export default {
+ name: 'ImgDragSort',
+ components:{
+ ACol,
+ ARow,
+ draggable
+ },
+ data() {
+ return {
+ description: '图片拖拽排序',
+ spinning: false,
+ //数据集
+ dataSource: [
+ {id:'000',sort: 0,filePath: 'https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2735633715,2749454924&fm=27&gp=0.jpg'},
+ {id:'111',sort: 1,filePath: 'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=3967239004,1951414302&fm=27&gp=0.jpg'},
+ {id:'222',sort: 2,filePath: 'https://ss0.bdstatic.com/6Ox1bjeh1BF3odCf/it/u=3660968530,985748925&fm=191&app=48&size=h300&n=0&g=4n&f=JPEG?sec=1853310920&t=5e64af964be378c6c2a3b0acc65dfe24'},
+ {id:'333',sort: 3,filePath: 'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=889120611,3801177793&fm=27&gp=0.jpg'},
+ {id:'444',sort: 4,filePath: 'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2445468140,2491956848&fm=27&gp=0.jpg'}
+ ],
+ oldDateSource:[],
+ newDateSource:[],
+ }
+ },
+ created(){
+ this.oldDateSource = this.dataSource;
+ },
+ methods:{
+ end: function (evt) {
+ console.log("拖动前的位置"+evt.oldIndex);
+ console.log("拖动后的位置"+evt.newIndex);
+ },
+ sureChange(){
+ for(var i=0;i<this.dataSource.length;i++){
+ this.dataSource[i].sort = i;
+ }
+ this.newDateSource = this.dataSource;
+ }
+ }
+ }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/jeecg/ImgTurnPage.vue b/ant-design-jeecg-vue/src/views/jeecg/ImgTurnPage.vue
new file mode 100644
index 0000000..460bf94
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/jeecg/ImgTurnPage.vue
@@ -0,0 +1,147 @@
+<template>
+ <a-card title="树形结构图片翻页查看" style="min-width: 800px;overflow-x:auto ">
+ <a-row>
+ <!-- 左侧文件树 -->
+ <a-col :span="5">
+ <a-tree
+ showLine
+ :treeData="treeData"
+ :expandedKeys="[expandedKeys[0]]"
+ :selectedKeys="selectedKeys"
+ :style="{'height':'500px','border-right':'2px solid #c1c1c1','overflow-y':'auto'}"
+ @expand="onExpand"
+ @select="this.onSelect"
+ >
+ </a-tree>
+ </a-col>
+
+ <!--右侧缩略图-->
+ <a-col :span="19">
+ <a-row style="margin-top: 10px">
+ <a-col :span="24" style="padding-left: 2%;margin-bottom: 10px">
+ <a-button @click="prev" type="primary"><a-icon type="left" />上一页</a-button>
+ <a-button @click="next" type="primary" style="margin-left: 8px">下一页<a-icon type="right" /></a-button>
+ <span style="margin-left: 15%;font-weight: bolder">{{ navName }}</span>
+ </a-col>
+ <a-col :span="24" style="padding-left: 2%;">
+ <img :src="imgUrl" preview>
+ </a-col>
+ </a-row>
+ </a-col>
+ </a-row>
+ </a-card>
+</template>
+
+<script>
+ import draggable from 'vuedraggable'
+
+ export default {
+ name: 'ImgTurnPage',
+ components:{
+ draggable
+ },
+ data() {
+ return {
+ description: '图片翻页',
+ //数据集
+ treeData: [{
+ title: '第一页',
+ key: '0-0',
+ children: [{
+ title: '1页',
+ key: '0-0-0',
+ imgUrl:'https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2735633715,2749454924&fm=27&gp=0.jpg'
+ }, {
+ title: '2页',
+ key: '0-0-1',
+ imgUrl:'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=3967239004,1951414302&fm=27&gp=0.jpg'
+ }]
+ },{
+ title: '第二页',
+ key: '0-1',
+ children: [{
+ title: '1页',
+ key: '0-1-0',
+ imgUrl:'https://ss0.bdstatic.com/6Ox1bjeh1BF3odCf/it/u=3660968530,985748925&fm=191&app=48&size=h300&n=0&g=4n&f=JPEG?sec=1853310920&t=5e64af964be378c6c2a3b0acc65dfe24'
+ }, {
+ title: '2页',
+ key: '0-1-1',
+ imgUrl:'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=889120611,3801177793&fm=27&gp=0.jpg'
+ }]
+ },{
+ title: '第三页',
+ key: '0-2',
+ children: [{
+ title: '1页',
+ key: '0-2-0',
+ imgUrl:'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2445468140,2491956848&fm=27&gp=0.jpg'
+ }]
+ }],
+ selectedKeys:[],
+ expandedKeys:[],
+ sort:0,
+ imgUrl:'',
+ navName:'',
+ imgList:[],
+ }
+ },
+ created(){
+ this.getImgList();
+ },
+ methods: {
+ getImgList(){
+ var count = 0;
+ for(var i=0;i<this.treeData.length;i++){
+ for(var j=0;j<this.treeData[i].children.length;j++){
+ this.imgList.push({key:this.treeData[i].children[j].key,pkey:this.treeData[i].key,sort:count++,
+ imgUrl:this.treeData[i].children[j].imgUrl,navName:this.treeData[i].title+"/"+this.treeData[i].children[j].title})
+ }
+ }
+ this.setValue(this.imgList[this.sort]);
+ },
+ onSelect (selectedKeys, info) {
+ for(var i=0;i<this.imgList.length;i++){
+ if(this.imgList[i].key === selectedKeys[0]){
+ this.sort = this.imgList[i].sort;
+ this.setValue(this.imgList[i]);
+ break;
+ }
+ }
+ },
+ onExpand (expandedKeys) {
+ this.expandedKeys = [];
+ if(expandedKeys !== null && expandedKeys !== ''){
+ this.expandedKeys[0] = expandedKeys[1];
+ }
+ },
+ prev(){
+ if(this.sort === 0){
+ this.sort = this.imgList.length-1;
+ }else{
+ this.sort = this.sort - 1;
+ }
+ this.setValue(this.imgList[this.sort]);
+ },
+ next(){
+ if(this.sort === this.imgList.length-1){
+ this.sort = 0;
+ }else{
+ this.sort = this.sort + 1;
+ }
+ this.setValue(this.imgList[this.sort]);
+ },
+ // 设置受控节点值
+ setValue(value){
+ this.selectedKeys = [];
+ this.imgUrl = value.imgUrl;
+ this.selectedKeys[0] = value.key;
+ this.expandedKeys[0] = value.pkey;
+ this.navName = value.navName;
+ }
+ }
+ }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/jeecg/JSearchUserByDepList.vue b/ant-design-jeecg-vue/src/views/jeecg/JSearchUserByDepList.vue
deleted file mode 100644
index 250ab33..0000000
--- a/ant-design-jeecg-vue/src/views/jeecg/JSearchUserByDepList.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-<template>
- <div>
- <a-input-search
- v-model="this.selectedUserNames"
- placeholder="请先选择用户"
- disabled
- @search="onSearch"
- size="large">
- <a-button slot="enterButton">选择用户</a-button>
- </a-input-search>
-
- <j-search-user-by-dep-modal ref="JSearchUserByDepModal" @ok="modalFormOk"></j-search-user-by-dep-modal>
- </div>
-</template>
-
-<script>
- import JSearchUserByDepModal from '@/components/jeecgbiz/JSearchUserByDepModal'
-
- export default {
- name: 'JSearchUserByDepList',
- components: {
- JSearchUserByDepModal,
- },
- data() {
- return {
- selectedUserNames: '',
- }
- },
- methods: {
- onSearch() {
- this.$refs.JSearchUserByDepModal.showModal();
- this.selectedUserNames = '';
- this.$refs.JSearchUserByDepModal.title = '根据部门查询用户';
- },
- modalFormOk(selectedValue) {
- this.selectedUserNames = selectedValue;
- }
- }
- }
-</script>
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/jeecg/JeecgDemoList.vue b/ant-design-jeecg-vue/src/views/jeecg/JeecgDemoList.vue
index 02c2135..7fe882a 100644
--- a/ant-design-jeecg-vue/src/views/jeecg/JeecgDemoList.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/JeecgDemoList.vue
@@ -61,8 +61,8 @@
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="plus" @click="jump">创建单据</a-button>
<a-button type="primary" icon="plus" @click="onetomany">一对多</a-button>
- <a-button type="primary" icon="download" @click="exportXls">导出</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="download" @click="handleExportXls('demo')">导出</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0">
@@ -231,28 +231,12 @@
list: "/test/jeecgDemo/list",
delete: "/test/jeecgDemo/delete",
deleteBatch: "/test/jeecgDemo/deleteBatch",
+ exportXlsUrl: "/test/jeecgDemo/exportXls"
},
fieldList:superQueryFieldList
}
},
methods: {
- exportXls(){
- let paramsStr = encodeURI(JSON.stringify(this.getQueryParams()));
- console.log('paramsStr: ' + paramsStr)
- let url = `${window._CONFIG['domianURL']}/test/jeecgDemo/exportXls?paramsStr=${paramsStr}`;
- window.location.href = url;
- },
- handleImportExcel(info){
- if (info.file.status !== 'uploading') {
- console.log(info.file, info.fileList);
- }
- if (info.file.status === 'done') {
- this.$message.success(`${info.file.name} 文件上传成功`);
- this.loadData();
- } else if (info.file.status === 'error') {
- this.$message.error(`${info.file.name} 文件上传失败.`);
- }
- },
initDictConfig() {
console.log("--我才是真的方法!--")
//初始化字典 - 性别
diff --git a/ant-design-jeecg-vue/src/views/jeecg/JeecgEditableTableExample.vue b/ant-design-jeecg-vue/src/views/jeecg/JeecgEditableTableExample.vue
index 8bb1a2e..979116a 100644
--- a/ant-design-jeecg-vue/src/views/jeecg/JeecgEditableTableExample.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/JeecgEditableTableExample.vue
@@ -23,18 +23,23 @@
:rowSelection="true"
:actionButton="true"
style="margin-top: 8px;"
- @selectRowChange="handleSelectRowChange"/>
+ @selectRowChange="handleSelectRowChange">
+
+ <template v-slot:action="props">
+ <a @click="handleDelete(props)">{{ props.text }}</a>
+ </template>
+
+ </j-editable-table>
</a-card>
</template>
<script>
-
-
+ import moment from 'moment'
import JEditableTable from '@/components/jeecg/JEditableTable'
import { FormTypes } from '@/utils/JEditableTableUtil'
- import { randomUUID, randomString, randomNumber } from '@/utils/util'
+ import { randomUUID, randomNumber } from '@/utils/util'
export default {
name: 'JeecgEditableTableExample',
@@ -48,7 +53,8 @@
{
title: '字段名称',
key: 'dbFieldName',
- width: '19%',
+ // width: '19%',
+ width: '300px',
type: FormTypes.input,
defaultValue: '',
placeholder: '请输入${title}',
@@ -64,18 +70,21 @@
]
},
{
- title: '字段备注',
- key: 'dbFieldTxt',
- width: '19%',
- type: FormTypes.input,
- defaultValue: '',
- placeholder: '请输入${title}',
- validateRules: [{ required: true, message: '请输入${title}' }]
+ title: '文件域',
+ key: 'upload',
+ type: FormTypes.upload,
+ // width: '19%',
+ width: '300px',
+ placeholder: '点击上传',
+ token: true,
+ responseName: 'message',
+ action: window._CONFIG['domianURL'] + '/sys/common/upload'
},
{
title: '字段类型',
key: 'dbFieldType',
- width: '18%',
+ // width: '18%',
+ width: '300px',
type: FormTypes.select,
options: [ // 下拉选项
{ title: 'String', value: 'string' },
@@ -86,32 +95,61 @@
defaultValue: '',
placeholder: '请选择${title}',
validateRules: [{ required: true, message: '请选择${title}' }]
+ }, {
+ title: '多选测试',
+ key: 'multipleSelect',
+ // width: '18%',
+ width: '300px',
+ type: FormTypes.select,
+ props: { 'mode': 'multiple' }, // 支持多选
+ options: [
+ { title: 'String', value: 'string' },
+ { title: 'Integer', value: 'int' },
+ { title: 'Double', value: 'double' },
+ { title: 'Boolean', value: 'boolean' }
+ ],
+ defaultValue: ['int', 'boolean'], // 多个默认项
+ // defaultValue: 'string,double,int', // 也可使用这种方式
+ placeholder: '这里可以多选',
+ validateRules: [{ required: true, message: '请选择${title}' }]
},
{
title: '字段长度',
key: 'dbLength',
- width: '8%',
+ // width: '8%',
+ width: '100px',
type: FormTypes.inputNumber,
defaultValue: 32,
placeholder: '${title}',
validateRules: [{ required: true, message: '请输入${title}' }]
},
{
- title: '默认值',
- key: 'dbDefaultVal',
- width: '22%',
- type: FormTypes.input,
- defaultValue: '',
- placeholder: '请输入${title}',
- validateRules: [{ required: true, message: '请输入${title}' }]
+ title: '日期',
+ key: 'datetime',
+ // width: '22%',
+ width: '320px',
+ type: FormTypes.datetime,
+ defaultValue: '2019-4-30 14:52:22',
+ placeholder: '请选择${title}',
+ validateRules: [{ required: true, message: '请选择${title}' }]
},
{
title: '可以为空',
key: 'isNull',
- width: '8%',
+ // width: '8%',
+ width: '100px',
type: FormTypes.checkbox,
customValue: ['Y', 'N'], // true ,false
defaultChecked: false
+ },
+ {
+ title: '操作',
+ key: 'action',
+ // width: '8%',
+ width: '100px',
+ type: FormTypes.slot,
+ slot: 'action',
+ defaultValue:"删除"
}
],
@@ -161,26 +199,44 @@
randomData(size, loading = false) {
if (loading) {
this.loading = true
- setTimeout(() => {
- this.loading = false
- }, 3000)
}
+ let randomDatetime = () => {
+ let time = parseInt(randomNumber(1000, 9999999999999))
+ return moment(new Date(time)).format('YYYY-MM-DD HH:mm:ss')
+ }
+
+ let begin = Date.now()
let values = []
for (let i = 0; i < size; i++) {
values.push({
id: randomUUID(),
dbFieldName: `name_${i + 1}`,
- dbFieldTxt: randomString(10),
+ // dbFieldTxt: randomString(10),
+ multipleSelect: ['string', ['int', 'double', 'boolean'][randomNumber(0, 2)]],
dbFieldType: ['string', 'int', 'double', 'boolean'][randomNumber(0, 3)],
dbLength: randomNumber(0, 233),
- dbDefaultVal: randomString(8),
+ datetime: randomDatetime(),
isNull: ['Y', 'N'][randomNumber(0, 1)]
})
}
+
this.dataSource = values
- }
+ let end = Date.now()
+ let diff = end - begin
+ if (loading && diff < size) {
+ setTimeout(() => {
+ this.loading = false
+ }, size - diff)
+ }
+
+ },
+
+ handleDelete(props) {
+ let { rowId, target } = props
+ target.removeRows(rowId)
+ }
}
}
diff --git a/ant-design-jeecg-vue/src/views/jeecg/JeecgOrderMainList.vue b/ant-design-jeecg-vue/src/views/jeecg/JeecgOrderMainList.vue
index 1953458..e0a3952 100644
--- a/ant-design-jeecg-vue/src/views/jeecg/JeecgOrderMainList.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/JeecgOrderMainList.vue
@@ -34,8 +34,8 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
- <a-button type="primary" icon="download" @click="exportXls">导出</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="download" @click="handleExportXls('一对多示例')">导出</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
@@ -163,27 +163,11 @@
list: "/test/jeecgOrderMain/list",
delete: "/test/jeecgOrderMain/delete",
deleteBatch: "/test/jeecgOrderMain/deleteBatch",
+ exportXlsUrl: "/test/jeecgOrderMain/exportXls",
}
}
},
methods: {
- exportXls(){
- let paramsStr = encodeURI(JSON.stringify(this.getQueryParams()));
- console.log('paramsStr: ' + paramsStr)
- let url = `${window._CONFIG['domianURL']}/test/jeecgOrderMain/exportXls?paramsStr=${paramsStr}`;
- window.location.href = url;
- },
- handleImportExcel(info){
- if (info.file.status !== 'uploading') {
- console.log(info.file, info.fileList);
- }
- if (info.file.status === 'done') {
- this.$message.success(`${info.file.name} 文件上传成功`);
- this.loadData();
- } else if (info.file.status === 'error') {
- this.$message.error(`${info.file.name} 文件上传失败.`);
- }
- }
}
}
</script>
diff --git a/ant-design-jeecg-vue/src/views/jeecg/JeecgPdfView.vue b/ant-design-jeecg-vue/src/views/jeecg/JeecgPdfView.vue
new file mode 100644
index 0000000..2066915
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/jeecg/JeecgPdfView.vue
@@ -0,0 +1,122 @@
+<template>
+ <a-card :bordered="false">
+ <!-- 左侧文件树 -->
+ <a-col :span="4" class="clName">
+ <a-tree
+ :treeData="treeData"
+ :defaultExpandAll="defaultExpandAll"
+ @select="this.onSelect"
+ style="height: 500px;overflow-y: auto;"
+ >
+ </a-tree>
+ </a-col>
+ <!-- 中间面板 -->
+ <a-col :span="2"/>
+ <!--右侧缩略图-->
+ <a-col :span="18">
+ <a-spin tip="Loading..." :spinning="spinning">
+ <div v-for="(file, key) in dataSource" :key="key">
+ <a-row>
+ <a-col :span="24"><p><a-divider orientation="left">{{ file.fileName }}</a-divider></p></a-col>
+ <!-- 预览区域 -->
+ <a-col :span="24">
+ <template v-if="file.filePdfPath">
+ <div style="float: left;width:104px;height:104px;margin-right: 10px;margin: 0 8px 8px 0;">
+ <div style="width: 100%;height: 100%;position: relative;padding: 8px;" @click="pdfPreview(file.title)">
+ <img style="width: 100%;" src="~@/assets/pdf4.jpg">
+ </div>
+ </div>
+ </template>
+ <template v-else>
+ (暂无材料，点击右侧"选择文件"或"扫描上传"上传文件)
+ </template>
+ </a-col>
+ </a-row>
+ </div>
+ </a-spin>
+ </a-col>
+ <pdf-preview-modal ref="pdfmodal"></pdf-preview-modal >
+ </a-card>
+</template>
+
+<script>
+
+ import { getAction } from '@/api/manage'
+ import { ACCESS_TOKEN } from "@/store/mutation-types"
+ import Vue from 'vue'
+ import PdfPreviewModal from './modules/PdfPreviewModal'
+ const mockdata=[{
+ "id": "1",
+ "key": "1",
+ "title": "实例.pdf",
+ "fileCode": "shili",
+ "fileName": "实例",
+ "filePdfPath": "实例"
+ }]
+
+ export default {
+ name: "JeecgPdfView",
+ components:{
+ PdfPreviewModal
+ },
+ data () {
+ return {
+ description: 'PDF预览页面',
+ // 文件类型集
+ treeData:[{
+ title: '所有PDF电子档',
+ key: '0-0',
+ children: mockdata }],
+ // 文件数据集
+ dataSource: mockdata,
+ allData:mockdata,
+ // 上传文件集
+ defaultExpandAll: true,
+ // 加载中
+ spinning:false,
+ url: {
+ pdfList: "/api/pdfList",
+ },
+ }
+ },
+ created() {
+ //this.loadData();
+ },
+ methods: {
+ loadData (){
+ this.spinning = false;
+ getAction(this.url.pdfList).then((res)=>{
+ if(res.length>0){
+ this.allData = res;
+ this.dataSource = res;
+ this.treeData[0].children = res;
+ }
+ this.spinning = false;
+ })
+ },
+ pdfPreview:function(title){
+ const token = Vue.ls.get(ACCESS_TOKEN);
+ this.headers = {"X-Access-Token":token}
+ this.$refs.pdfmodal.previewFiles(title,token);
+ },
+ // 选择文件类型
+ onSelect (selectedKeys, info) {
+ this.dataSource = [];
+ if(selectedKeys[0] === undefined || selectedKeys[0] === '0-0'){
+ this.dataSource = this.allData;
+ }else{
+ this.dataSource.push(info.node._props.dataRef);
+ }
+ console.log("SELECT-->dataSource",this.dataSource );
+ },
+ // model回调
+ modalFormOk () {
+ this.loadData();
+ },
+ },
+ }
+</script>
+
+<style scoped>
+ .clName .ant-tree li span.ant-tree-switcher, .ant-tree li span.ant-tree-iconEle{width:10px}
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/jeecg/JeecgTreeTable.vue b/ant-design-jeecg-vue/src/views/jeecg/JeecgTreeTable.vue
new file mode 100644
index 0000000..bd717d1
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/jeecg/JeecgTreeTable.vue
@@ -0,0 +1,49 @@
+<template>
+ <a-card :bordered="false">
+ <j-tree-table :url="url" :columns="columns" :tableProps="tableProps"/>
+ </a-card>
+</template>
+
+<script>
+ import JTreeTable from '@/components/jeecg/JTreeTable'
+
+ export default {
+ name: 'JeecgTreeTable',
+ components: { JTreeTable },
+ data() {
+ return {
+ url: '/api/asynTreeList',
+ columns: [
+ {
+ title: '菜单名称',
+ dataIndex: 'name'
+ },
+ {
+ title: '组件',
+ dataIndex: 'component'
+ },
+ {
+ title: '排序',
+ dataIndex: 'orderNum'
+ }
+ ],
+ selectedRowKeys: []
+ }
+ },
+ computed: {
+ tableProps() {
+ let _this = this
+ return {
+ // 列表项是否可选择
+ // https://vue.ant.design/components/table-cn/#rowSelection
+ rowSelection: {
+ selectedRowKeys: _this.selectedRowKeys,
+ onChange: (selectedRowKeys) => _this.selectedRowKeys = selectedRowKeys
+ }
+ }
+ }
+ }
+ }
+</script>
+
+<style scoped></style>
diff --git a/ant-design-jeecg-vue/src/views/jeecg/JoaDemoList.vue b/ant-design-jeecg-vue/src/views/jeecg/JoaDemoList.vue
new file mode 100644
index 0000000..b7cc680
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/jeecg/JoaDemoList.vue
@@ -0,0 +1,250 @@
+<template>
+ <a-card :bordered="false">
+
+ <!-- 查询区域 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline">
+ <a-row :gutter="24">
+
+ <a-col :md="6" :sm="8" class="1">
+ <a-form-item label="请假人">
+ <a-input placeholder="请输入请假人" v-model="queryParam.name"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :md="6" :sm="8" class="1">
+ <a-form-item label="请假天数">
+ <a-input placeholder="请输入请假天数" v-model="queryParam.days"></a-input>
+ </a-form-item>
+ </a-col>
+ <template v-if="toggleSearchStatus">
+ <a-col :md="6" :sm="8">
+ <a-form-item label="开始时间">
+ <a-input placeholder="请输入开始时间" v-model="queryParam.beginDate"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :md="6" :sm="8">
+ <a-form-item label="请假结束时间">
+ <a-input placeholder="请输入请假结束时间" v-model="queryParam.endDate"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :md="6" :sm="8">
+ <a-form-item label="请假原因">
+ <a-input placeholder="请输入请假原因" v-model="queryParam.reason"></a-input>
+ </a-form-item>
+ </a-col>
+ </template>
+ <a-col :md="6" :sm="8" >
+ <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+ <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+ <a @click="handleToggleSearch" style="margin-left: 8px">
+ {{ toggleSearchStatus ? '收起' : '展开' }}
+ <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+ </a>
+ </span>
+ </a-col>
+
+ </a-row>
+ </a-form>
+ </div>
+
+ <!-- 操作按钮区域 -->
+ <div class="table-operator">
+ <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+ <a-button type="primary" icon="download" @click="handleExportXls">导出</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="import">导入</a-button>
+ </a-upload>
+ <a-dropdown v-if="selectedRowKeys.length > 0">
+ <a-menu slot="overlay">
+ <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+ </a-menu>
+ <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+ </a-dropdown>
+ </div>
+
+ <!-- table区域-begin -->
+ <div>
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+ <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+ </div>
+
+ <a-table
+ ref="table"
+ size="middle"
+ bordered
+ rowKey="id"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ @change="handleTableChange">
+
+ <span slot="action" slot-scope="text, record">
+ <template v-if="record.bpmStatus === '1'">
+ <a @click="handleEdit(record)">编辑</a>
+ <a-divider type="vertical"/>
+ <a @click="startProcess(record)">提交流程</a>
+ <a-divider type="vertical"/>
+ </template>
+ <a-dropdown>
+ <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+ <a-menu slot="overlay">
+ <a-menu-item v-if="record.bpmStatus === '1'">
+ <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+ <a>删除</a>
+ </a-popconfirm>
+ </a-menu-item>
+ <a-menu-item v-else @click="handlePreviewPic(record)">审批进度</a-menu-item>
+ </a-menu>
+ </a-dropdown>
+ </span>
+
+ </a-table>
+ </div>
+ <!-- table区域-end -->
+
+ <!-- 表单区域 -->
+ <form-common-modal ref="modalForm" :path="path" @ok="modalFormOk"></form-common-modal>
+ <!-- 审批流程 -->
+ <process-inst-pic-modal ref="processInstPicModal"></process-inst-pic-modal>
+
+ </a-card>
+</template>
+
+<script>
+ import { postAction } from '@/api/manage'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import JDate from '@/components/jeecg/JDate.vue'
+ import FormCommonModal from "@/components/bpm/FormCommonModal";
+ import ProcessInstPicModal from "@/components/bpm/ProcessInstPicModal";
+
+ export default {
+ name: "JoaDemoList",
+ mixins:[JeecgListMixin],
+ components: {
+ FormCommonModal,
+ ProcessInstPicModal,
+ JDate
+ },
+ data () {
+ return {
+ description: '流程测试管理页面',
+ // 表头
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key:'rowIndex',
+ width:60,
+ align:"center",
+ customRender:function (t,r,index) {
+ return parseInt(index)+1;
+ }
+ },
+ {
+ title: '请假人',
+ align:"center",
+ dataIndex: 'name'
+ },
+ {
+ title: '请假天数',
+ align:"center",
+ dataIndex: 'days'
+ },
+ {
+ title: '开始时间',
+ align:"center",
+ dataIndex: 'beginDate'
+ },
+ {
+ title: '结束时间',
+ align:"center",
+ dataIndex: 'endDate'
+ },
+ {
+ title: '请假原因',
+ align:"center",
+ dataIndex: 'reason'
+ },
+ {
+ title: '流程状态',
+ align:"center",
+ dataIndex: 'bpmStatus',
+ customRender:function (text) {
+ if(text=='1'){
+ return "待提交";
+ }else if(text=='2'){
+ return "处理中";
+ }else if(text=='3'){
+ return "已完成";
+ }else if(text=='4'){
+ return "已作废";
+ }else{
+ return text;
+ }
+ }
+ },
+ {
+ title: '操作',
+ dataIndex: 'action',
+ align:"center",
+ scopedSlots: { customRender: 'action' },
+ }
+ ],
+ flowCode:"dev_joa_demo_001",
+ path:"jeecg/modules/JoaDemoForm",
+ url: {
+ list: "/test/joaDemo/list",
+ delete: "/test/joaDemo/delete",
+ deleteBatch: "/test/joaDemo/deleteBatch",
+ exportXlsUrl: "test/joaDemo/exportXls",
+ importExcelUrl: "test/joaDemo/importExcel",
+ startProcess: "/process/extActProcess/startMutilProcess",
+ },
+ }
+ },
+ computed: {
+ importExcelUrl: function(){
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ }
+ },
+ methods: {
+ startProcess: function(record){
+ var that = this;
+ this.$confirm({
+ title:"提示",
+ content:"确认提交流程吗?",
+ onOk: function(){
+ var param = {
+ flowCode:that.flowCode,
+ id:record.id,
+ formUrl:that.path,
+ formUrlMobile:that.path
+ }
+ postAction(that.url.startProcess,param).then((res)=>{
+ if(res.success){
+ that.$message.success(res.message);
+ that.loadData();
+ that.onClearSelected();
+ }else{
+ that.$message.warning(res.message);
+ }
+ });
+ }
+ });
+ },
+ handlePreviewPic: function(record){
+ var flowCode = this.flowCode;
+ var dataId = record.id;
+ this.$refs.processInstPicModal.preview(flowCode,dataId);
+ this.$refs.processInstPicModal.title="流程图";
+ },
+ }
+ }
+</script>
+<style scoped>
+ @import '~@assets/less/common.less'
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/jeecg/RowspanTable.vue b/ant-design-jeecg-vue/src/views/jeecg/RowspanTable.vue
new file mode 100644
index 0000000..3b27b94
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/jeecg/RowspanTable.vue
@@ -0,0 +1,285 @@
+<template>
+ <a-card :bordered="false">
+ <!-- table区域-begin -->
+ <a-table
+ ref="table"
+ size="default"
+ bordered
+ rowKey="id"
+ :columns="columns"
+ :pagination="false"
+ :dataSource="dataSource">
+
+ </a-table>
+ <!-- table区域-end -->
+
+
+ </a-card>
+</template>
+
+<script>
+
+ export default {
+ name: "RowspanTable",
+ components: {
+ },
+ data() {
+ return {
+ description: '存放位置设置表管理页面',
+ levelNum:{},
+ gridNum:0,
+ boxNum:0,
+ cabinetNo:"",
+ // 表头
+ columns: [ {
+ title: '分组一',
+ align: "center",
+ dataIndex: 'cabinetNo',
+ customRender: (value, row, index) => {
+ const obj = {
+ children: value,
+ attrs: {},
+ };
+ if(index===0){
+ obj.attrs.rowSpan = this.dataSource.length;
+ }else{
+ obj.attrs.rowSpan = 0;
+ }
+ return obj;
+ },
+ },
+ {
+ title: '分组二',
+ align: "center",
+ dataIndex: 'levelNo',
+ customRender: (value, row, index) => {
+ const obj = {
+ children: value,
+ attrs: {},
+ };
+ //当前列跨行的条数
+ var a = parseInt(this.levelNum);
+ var b = parseInt(this.gridNum)*parseInt(this.boxNum);
+ console.log(a);
+ for(var c=0;c<=a;c++){
+ if(index === (c*b)){
+ console.log(1);
+ console.log(c*b);
+ obj.attrs.rowSpan = b;
+ break;
+ }else{
+ obj.attrs.rowSpan = 0;
+ }
+ }
+ return obj;
+ }
+ },
+ {
+ title: '分组三',
+ align: "center",
+ dataIndex: 'gridNo',
+ customRender: (value, row, index) => {
+ const obj = {
+ children: value,
+ attrs: {},
+ };
+ var a = parseInt(this.levelNum)*parseInt(this.gridNum);
+ var b = parseInt(this.boxNum);
+ for(var c=0;c<=a;c++){
+ if(index === (c*b)){
+ obj.attrs.rowSpan = b;
+ break;
+ }else{
+ obj.attrs.rowSpan = 0;
+ }
+ }
+ return obj;
+ },
+ }, {
+ title: '字段一',
+ align: "center",
+ dataIndex: 'boxNo'
+ }, {
+ title: '字段二',
+ align: 'center',
+ dataIndex: 'storedNum'
+ }, {
+ title: '字段三',
+ align: "center",
+ dataIndex: 'maxNum'
+ },],
+ //数据集
+ dataSource: [{
+ "id": "cb1dfd12cbeca3f8ba121439ee7e2411",
+ "attributeId": "e62831f314e1390edbd884e9d9e6aca6",
+ "cabinetNo": "1",
+ "levelNo": "1",
+ "gridNo": "1",
+ "boxNo": "1",
+ "storedNum": 2,
+ "maxNum": 2,
+ "unitNum": 2,
+ "assignStatus": "1",
+ "storageStatus": "1",
+ "remark": null,
+ "createBy": "admin",
+ "createTime": "2019-04-02",
+ "updateBy": "admin",
+ "updateTime": "2019-04-02"
+ }, {
+ "id": "f903d50d02904b14175dccf2a7948777",
+ "attributeId": "e62831f314e1390edbd884e9d9e6aca6",
+ "cabinetNo": "1",
+ "levelNo": "1",
+ "gridNo": "1",
+ "boxNo": "2",
+ "storedNum": 2,
+ "maxNum": 2,
+ "unitNum": 2,
+ "assignStatus": "1",
+ "storageStatus": "1",
+ "remark": null,
+ "createBy": "admin",
+ "createTime": "2019-04-02",
+ "updateBy": "admin",
+ "updateTime": "2019-04-02"
+ }, {
+ "id": "4f04c0ca4202535d678871b07e706cf6",
+ "attributeId": "e62831f314e1390edbd884e9d9e6aca6",
+ "cabinetNo": "1",
+ "levelNo": "1",
+ "gridNo": "2",
+ "boxNo": "1",
+ "storedNum": 2,
+ "maxNum": 2,
+ "unitNum": 2,
+ "assignStatus": "1",
+ "storageStatus": "1",
+ "remark": null,
+ "createBy": "admin",
+ "createTime": "2019-04-02",
+ "updateBy": "admin",
+ "updateTime": "2019-04-02"
+ }, {
+ "id": "d0c91dabedfc03efad0126e50ea72e80",
+ "attributeId": "e62831f314e1390edbd884e9d9e6aca6",
+ "cabinetNo": "1",
+ "levelNo": "1",
+ "gridNo": "2",
+ "boxNo": "2",
+ "storedNum": 2,
+ "maxNum": 2,
+ "unitNum": 2,
+ "assignStatus": "1",
+ "storageStatus": "1",
+ "remark": null,
+ "createBy": "admin",
+ "createTime": "2019-04-02",
+ "updateBy": "admin",
+ "updateTime": "2019-04-08"
+ }, {
+ "id": "1e8bfcbe4352afbab8878f9fd368e007",
+ "attributeId": "e62831f314e1390edbd884e9d9e6aca6",
+ "cabinetNo": "1",
+ "levelNo": "2",
+ "gridNo": "1",
+ "boxNo": "1",
+ "storedNum": 1,
+ "maxNum": 2,
+ "unitNum": 1,
+ "assignStatus": "1",
+ "storageStatus": "0",
+ "remark": null,
+ "createBy": "admin",
+ "createTime": "2019-04-02",
+ "updateBy": "admin",
+ "updateTime": "2019-04-08"
+ }, {
+ "id": "d76087d8d3ebc7a59d43458588f26941",
+ "attributeId": "e62831f314e1390edbd884e9d9e6aca6",
+ "cabinetNo": "1",
+ "levelNo": "2",
+ "gridNo": "1",
+ "boxNo": "2",
+ "storedNum": 0,
+ "maxNum": 2,
+ "unitNum": 0,
+ "assignStatus": "1",
+ "storageStatus": "0",
+ "remark": null,
+ "createBy": "admin",
+ "createTime": "2019-04-02",
+ "updateBy": "admin",
+ "updateTime": "2019-04-02"
+ }, {
+ "id": "7bf7754f12e1bf95edcd501cc6b85e62",
+ "attributeId": "e62831f314e1390edbd884e9d9e6aca6",
+ "cabinetNo": "1",
+ "levelNo": "2",
+ "gridNo": "2",
+ "boxNo": "1",
+ "storedNum": 0,
+ "maxNum": 2,
+ "unitNum": 0,
+ "assignStatus": "1",
+ "storageStatus": "0",
+ "remark": null,
+ "createBy": "admin",
+ "createTime": "2019-04-02",
+ "updateBy": "admin",
+ "updateTime": "2019-04-02"
+ }, {
+ "id": "9cd08d733657d5b286bec870f12f6ecf",
+ "attributeId": "e62831f314e1390edbd884e9d9e6aca6",
+ "cabinetNo": "1",
+ "levelNo": "2",
+ "gridNo": "2",
+ "boxNo": "2",
+ "storedNum": 0,
+ "maxNum": 2,
+ "unitNum": 0,
+ "assignStatus": "1",
+ "storageStatus": "0",
+ "remark": null,
+ "createBy": "admin",
+ "createTime": "2019-04-02",
+ "updateBy": "admin",
+ "updateTime": "2019-04-02"
+ }],
+ isorter: {
+ column: 'createTime',
+ order: 'desc',
+ },
+ url: {
+ },
+ }
+ },
+ created() {
+ this.loadData();
+ },
+ methods: {
+ loadData(){
+ this.levelNum=4;
+ this.gridNum = 2;
+ this.boxNum = 2;
+
+ }
+ }
+ }
+</script>
+<style scoped>
+ .ant-card-body .table-operator{
+ margin-bottom: 18px;
+ }
+ .ant-table-tbody .ant-table-row td{
+ padding-top:15px;
+ padding-bottom:15px;
+ }
+ .anty-row-operator button{margin: 0 5px}
+ .ant-btn-danger{background-color: #ffffff}
+
+ .ant-modal-cust-warp{height: 100%}
+ .ant-modal-cust-warp .ant-modal-body{height:calc(100% - 110px) !important;overflow-y: auto}
+ .ant-modal-cust-warp .ant-modal-content{height:90% !important;overflow-y: hidden}
+</style>
+
diff --git a/ant-design-jeecg-vue/src/views/jeecg/SearchUserByDepList.vue b/ant-design-jeecg-vue/src/views/jeecg/SearchUserByDepList.vue
deleted file mode 100644
index 4c4ab63..0000000
--- a/ant-design-jeecg-vue/src/views/jeecg/SearchUserByDepList.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-<template>
- <div>
- <a-input-search
- v-model="this.selectedUserNames"
- placeholder="请先选择用户"
- disabled
- @search="onSearch"
- size="large">
- <a-button slot="enterButton">选择用户</a-button>
- </a-input-search>
-
- <j-search-user-by-dep ref="JSearchUserByDep" @ok="modalFormOk"></j-search-user-by-dep>
- </div>
-</template>
-
-<script>
- import JSearchUserByDep from '@/components/jeecgbiz/JSearchUserByDep'
-
- export default {
- name: 'SearchUserByDepList',
- components: {
- JSearchUserByDep,
- },
- data() {
- return {
- selectedUserNames: '',
- }
- },
- methods: {
- onSearch() {
- this.$refs.JSearchUserByDep.showModal();
- this.selectedUserNames = '';
- this.$refs.JSearchUserByDep.title = '根据部门查询用户';
- },
- modalFormOk(selectedValue) {
- this.selectedUserNames = selectedValue;
- }
- }
- }
-</script>
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/jeecg/SelectDemo.vue b/ant-design-jeecg-vue/src/views/jeecg/SelectDemo.vue
index c6aafec..c888d5a 100644
--- a/ant-design-jeecg-vue/src/views/jeecg/SelectDemo.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/SelectDemo.vue
@@ -2,7 +2,7 @@
<a-card :bordered="false" style="height:100%">
<div class="table-page-search-wrapper">
- <a-form layout="inline">
+ <a-form layout="inline" :form="form">
<!-- 选择多个用户，可排序 -->
<a-row :gutter="24">
<a-col :span="12">
@@ -10,7 +10,7 @@
<a-select
mode="multiple"
placeholder="Please select"
- :value=nameList
+ :value="nameList"
@change="handleChange"
>
</a-select>
@@ -41,63 +41,325 @@
</a-col>
</a-row>
+ <!-- 通过部门筛选，选择人 -->
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-item label="性别">
+ <j-dict-select-tag title="性别" dictCode="sex" disabled/>
+ </a-form-item>
+ </a-col>
+ </a-row>
+
+ <!-- 部门选择控件 -->
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-item label="选择部门">
+ <j-select-depart v-decorator="['departId']" :trigger-change="true"></j-select-depart>
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">选中的部门ID(v-decorator):{{ getDepartIdValue() }}</a-col>
+ </a-row>
+
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-item label="选择部门">
+ <j-select-depart v-model="departId"></j-select-depart>
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">选中的部门ID(v-model):{{ departId }}</a-col>
+ </a-row>
+
+ <!-- 用户选择控件 -->
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-item label="选择用户">
+ <j-select-user-by-dep v-model="userRealName"></j-select-user-by-dep>
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">选中的用户(v-model):{{ userRealName }}</a-col>
+ </a-row>
+
+ <!-- 用户选择控件 -->
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-item label="选择用户">
+ <j-select-multi-user v-model="multiUser"></j-select-multi-user>
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">选中的用户(v-model):{{ multiUser }}</a-col>
+ </a-row>
+
+ <!-- JCheckbox -->
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-item label="多选组合">
+ <j-checkbox
+ v-model="jcheckbox.values"
+ :options="jcheckbox.options"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">多选组合(v-model)：{{ jcheckbox.values }}</a-col>
+ </a-row>
+
+ <!-- JCodeEditor -->
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-item label="代码输入框" style="min-height: 120px">
+ <j-code-editor
+ language="javascript"
+ v-model="jcodedditor.value"
+ :fullScreen="true"
+ style="min-height: 100px"/>
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">代码输入框(v-model)：{{ jcodedditor.value }}</a-col>
+ </a-row>
+
+ <!-- JDate -->
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-item label="日期选择框">
+ <j-date v-model="jdate.value" :showTime="true" dateFormat="YYYY-MM-DD HH:mm:ss"/>
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">日期选择框(v-model)：{{ jdate.value }}</a-col>
+ </a-row>
+
+ <!-- JEditor -->
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-item label="富文本编辑器" style="min-height: 300px">
+ <j-editor v-model="jeditor.value"/>
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">富文本编辑器(v-model)：{{ jeditor.value }}</a-col>
+ </a-row>
+
+ <!-- JEllipsis -->
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-item label="过长剪切">
+ <j-ellipsis :value="jellipsis.value" :length="30"/>
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">过长剪切：{{ jellipsis.value }}</a-col>
+ </a-row>
+
+ <!-- JGraphicCode -->
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-item label="验证码">
+ <j-graphic-code @success="generateCode"/>
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">验证码：{{ jgraphicCode.value }}</a-col>
+ </a-row>
+
+ <!-- JSlider -->
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-item label="滑块验证码">
+ <j-slider @onSuccess="handleJSliderSuccess"/>
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">滑块验证码验证通过：{{ jslider.value }}</a-col>
+ </a-row>
+
+ <!-- JSelectMultiple -->
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-item label="多选下拉框">
+ <j-select-multiple v-model="jselectMultiple.value" :options="jselectMultiple.options"/>
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">多选下拉框(v-model)：{{ jselectMultiple.value }}</a-col>
+ </a-row>
+
+ <!-- JSelectMultiple -->
+ <a-row :gutter="24">
+ <a-col>
+
+ <a-form-item label="最大化弹窗">
+ <a-button @click="()=>modal.visible=true">最大化弹窗</a-button>
+ </a-form-item>
+
+ <a-modal
+ :visible="modal.visible"
+ :width="modal.width"
+ :style="modal.style"
+ @ok="()=>modal.visible=false"
+ @cancel="()=>modal.visible=false">
+
+ <template slot="title">
+ <div style="width: 100%;height:20px;padding-right:32px;">
+ <div style="float: left;">{{ modal.title }}</div>
+ <div style="float: right;">
+ <a-button
+ icon="fullscreen"
+ style="width:56px;height:100%;border:0"
+ @click="handleClickToggleFullScreen"/>
+ </div>
+ </div>
+ </template>
+
+ <template v-for="(i,k) of 30">
+ <p :key="k">这是主体内容，高度是自适应的</p>
+ </template>
+
+ </a-modal>
+
+ </a-col>
+ </a-row>
+
</a-form>
</div>
<!-- 选择多个用户支持排序 -->
- <select-multiple-user-modal ref="selectDemoModal" @selectFinished="selectOK"></select-multiple-user-modal>
+ <j-select-multiple-user ref="selectDemoModal" @selectFinished="selectOK"></j-select-multiple-user>
<!-- 通过部门筛选，选择人 -->
- <search-user-by-dep-modal ref="SearchUserByDepModal" @ok="onSearchDepUserCallBack"></search-user-by-dep-modal>
+ <j-search-user-by-dep ref="JSearchUserByDep" @ok="onSearchDepUserCallBack"></j-search-user-by-dep>
</a-card>
</template>
<script>
- import SelectMultipleUserModal from '@/components/jeecgbiz/SelectMultipleUserModal'
- import SearchUserByDepModal from '@/components/jeecgbiz/SearchUserByDepModal'
+ import JSelectMultipleUser from '@/components/jeecgbiz/JSelectMultipleUser'
+ import JSearchUserByDep from '@/components/jeecgbiz/JSearchUserByDep'
+ import JDictSelectTag from '../../components/dict/JDictSelectTag.vue'
+ import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
+ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
+ import JSelectMultiUser from '@/components/jeecgbiz/JSelectMultiUser'
+ import JCheckbox from '@/components/jeecg/JCheckbox'
+ import JCodeEditor from '@/components/jeecg/JCodeEditor'
+ import JDate from '@/components/jeecg/JDate'
+ import JEditor from '@/components/jeecg/JEditor'
+ import JEllipsis from '@/components/jeecg/JEllipsis'
+ import JGraphicCode from '@/components/jeecg/JGraphicCode'
+ import JSlider from '@/components/jeecg/JSlider'
+ import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
export default {
- name: "SelectDemo",
+ name: 'SelectDemo',
components: {
- SelectMultipleUserModal,
- SearchUserByDepModal
+ JDictSelectTag,
+ JSelectMultipleUser,
+ JSearchUserByDep,
+ JSelectDepart,
+ JSelectUserByDep,
+ JSelectMultiUser,
+ JCheckbox,
+ JCodeEditor,
+ JDate, JEditor, JEllipsis, JGraphicCode, JSlider, JSelectMultiple
},
data() {
return {
selectList: [],
- selectedDepUsers: ''
+ selectedDepUsers: '',
+ form: this.$form.createForm(this),
+ departId: '4f1765520d6346f9bd9c79e2479e5b12,57197590443c44f083d42ae24ef26a2c',
+ userRealName: '',
+ multiUser: '',
+ jcheckbox: {
+ values: 'spring,jeecgboot',
+ options: [
+ { label: 'Jeecg', value: 'jeecg' },
+ { label: 'Jeecg-Boot', value: 'jeecgboot' },
+ { label: 'Spring', value: 'spring', disabled: true },
+ { label: 'MyBaits', value: 'mybatis' }
+ ]
+ },
+ jcodedditor: {
+ value: `function sayHi(word) {
+ alert(word)
+}
+sayHi('hello, world!')`
+ },
+ jdate: {
+ value: '2019-5-10 15:33:06'
+ },
+ jeditor: {
+ value: '<h2 style="text-align: center;">富文本编辑器</h2> <p>这里是富文本编辑器。</p>'
+ },
+ jellipsis: {
+ value: '这是一串很长很长的文字段落。这是一串很长很长的文字段落。这是一串很长很长的文字段落。这是一串很长很长的文字段落。'
+ },
+ jgraphicCode: {
+ value: ''
+ },
+ jslider: {
+ value: false
+ },
+ jselectMultiple: {
+ options: [
+ { text: '字符串', value: 'String' },
+ { text: '整数型', value: 'Integer' },
+ { text: '浮点型', value: 'Double' },
+ { text: '布尔型', value: 'Boolean' }
+ ],
+ value: 'Integer,Boolean'
+ },
+ modal: {
+ title: '这里是标题',
+ visible: false,
+ width: '100%',
+ style: { top: '20px' },
+ fullScreen: true
+ }
}
},
computed: {
- nameList: function () {
- var names = [];
+ nameList: function() {
+
+ var names = []
for (var a = 0; a < this.selectList.length; a++) {
- names.push(this.selectList[a].name);
+ names.push(this.selectList[a].name)
}
- return names;
+ return names
}
},
methods: {
handleChange() {
},
- selectOK: function (data) {
- this.selectList = data;
+ getDepartIdValue() {
+ return this.form.getFieldValue('departId')
},
- handleSelect: function () {
- this.$refs.selectDemoModal.add();
+ selectOK: function(data) {
+ this.selectList = data
+ },
+ handleSelect: function() {
+ this.$refs.selectDemoModal.add()
},
selectReset() {
- this.selectList = [];
+ this.selectList = []
},
//通过组织机构筛选选择用户
onSearchDepUser() {
- this.$refs.SearchUserByDepModal.showModal()
+ this.$refs.JSearchUserByDep.showModal()
this.selectedDepUsers = ''
- this.$refs.SearchUserByDepModal.selectedKeys = []
- this.$refs.SearchUserByDepModal.title = '根据部门查询用户'
+ this.$refs.JSearchUserByDep.title = '根据部门查询用户'
},
onSearchDepUserCallBack(selectedDepUsers) {
this.selectedDepUsers = selectedDepUsers
+ },
+ generateCode(value) {
+ this.jgraphicCode.value = value.toLowerCase()
+ },
+ handleJSliderSuccess(value) {
+ this.jslider.value = value
+ },
+ /** 切换全屏显示 */
+ handleClickToggleFullScreen() {
+ let mode = !this.modal.fullScreen
+ if (mode) {
+ this.modal.width = '100%'
+ this.modal.style.top = '20px'
+ } else {
+ this.modal.width = '1200px'
+ this.modal.style.top = '50px'
+ }
+ this.modal.fullScreen = mode
}
+
}
}
</script>
diff --git a/ant-design-jeecg-vue/src/views/jeecg/SplitPanel.vue b/ant-design-jeecg-vue/src/views/jeecg/SplitPanel.vue
new file mode 100644
index 0000000..8d128fb
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/jeecg/SplitPanel.vue
@@ -0,0 +1,32 @@
+<template>
+ <a-card>
+ <a-button @click="splitPane" type="primary" icon="desktop">点我分屏</a-button>
+
+ <split-panel-modal ref="splitPanelModal"></split-panel-modal>
+ </a-card>
+</template>
+
+<script>
+ import SplitPanelModal from './modules/SplitPanelModal'
+
+ export default {
+ name: 'SplitPanel',
+ components:{
+ SplitPanelModal,
+ },
+ data() {
+ return {
+ description: '分屏',
+ }
+ },
+ methods:{
+ splitPane(){
+ this.$refs.splitPanelModal.show();
+ }
+ }
+ }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/jeecg/TableExpandeSub.vue b/ant-design-jeecg-vue/src/views/jeecg/TableExpandeSub.vue
index 249fa6d..a7ba3b0 100644
--- a/ant-design-jeecg-vue/src/views/jeecg/TableExpandeSub.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/TableExpandeSub.vue
@@ -237,10 +237,6 @@
margin-bottom: 18px;
}
- .ant-layout-content {
- margin: 12px 16px 0 !important;
- }
-
.ant-table-tbody .ant-table-row td {
padding-top: 15px;
padding-bottom: 15px;
diff --git a/ant-design-jeecg-vue/src/views/jeecg/modules/JoaDemoForm.vue b/ant-design-jeecg-vue/src/views/jeecg/modules/JoaDemoForm.vue
new file mode 100644
index 0000000..f817c4b
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/jeecg/modules/JoaDemoForm.vue
@@ -0,0 +1,160 @@
+<template>
+
+ <a-form :form="form">
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="请假人">
+ <a-input placeholder="请输入请假人" v-decorator="['name', {}]" />
+ </a-form-item>
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="请假天数">
+ <a-input-number v-decorator="[ 'days', {}]" />
+ </a-form-item>
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="开始时间">
+ <a-date-picker showTime format='YYYY-MM-DD' v-decorator="[ 'beginDate', {}]" />
+ </a-form-item>
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="请假结束时间">
+ <a-date-picker showTime format='YYYY-MM-DD' v-decorator="[ 'endDate', {}]" />
+ </a-form-item>
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="请假原因">
+ <a-input placeholder="请输入请假原因" v-decorator="['reason', {}]" />
+ </a-form-item>
+ </a-form>
+</template>
+
+<script>
+ import { httpAction,getAction } from '@/api/manage'
+ import moment from "moment"
+ import pick from 'lodash.pick'
+ import JDate from '@/components/jeecg/JDate.vue'
+
+ export default {
+ name: "JoaDemoModal",
+ components: { JDate },
+ props: ['formData'],
+ data () {
+ return {
+ title:"操作",
+ visible: false,
+ model: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+
+ confirmLoading: false,
+ form: this.$form.createForm(this),
+ validatorRules:{
+ name:{},
+ days:{},
+ beginDate:{},
+ endDate:{},
+ reason:{},
+ bpmStatus:{},
+ },
+ url: {
+ queryById: "/test/joaDemo/queryById",
+ add: "/test/joaDemo/add",
+ edit: "/test/joaDemo/edit",
+ },
+ }
+ },
+ created () {
+ console.log("form start");
+ console.log("formdata",this.formData);
+ if(this.formData.dataId){
+ var params = {id:this.formData.dataId};//查询条件
+ getAction(this.url.queryById,params).then((res)=>{
+ if(res.success){
+ console.log("获取表单数据",res);
+ this.edit (res.result);
+ }
+ })
+ }
+ },
+ methods: {
+ add () {
+ this.edit({});
+ },
+ edit (record) {
+ this.form.resetFields();
+ this.model = Object.assign({}, record);
+ this.visible = true;
+ this.$nextTick(() => {
+ this.form.setFieldsValue(pick(this.model,'name','days','reason','bpmStatus'))
+ //时间格式化
+ this.form.setFieldsValue({beginDate:this.model.beginDate?moment(this.model.beginDate):null})
+ this.form.setFieldsValue({endDate:this.model.endDate?moment(this.model.endDate):null})
+ });
+
+ },
+ close () {
+ this.$emit('close');
+ this.visible = false;
+ },
+ handleOk () {
+ const that = this;
+ // 触发表单验证
+ this.form.validateFields((err, values) => {
+ if (!err) {
+ that.confirmLoading = true;
+ let httpurl = '';
+ let method = '';
+ if(!this.model.id){
+ httpurl+=this.url.add;
+ method = 'post';
+ }else{
+ httpurl+=this.url.edit;
+ method = 'put';
+ }
+ let formData = Object.assign(this.model, values);
+ //时间格式化
+ formData.beginDate = formData.beginDate?formData.beginDate.format('YYYY-MM-DD HH:mm:ss'):null;
+ formData.endDate = formData.endDate?formData.endDate.format('YYYY-MM-DD HH:mm:ss'):null;
+
+ console.log(formData)
+ httpAction(httpurl,formData,method).then((res)=>{
+ if(res.success){
+ that.$message.success(res.message);
+ that.$emit('ok');
+ }else{
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.close();
+ })
+
+
+
+ }
+ })
+ },
+ handleCancel () {
+ this.close()
+ },
+
+
+ }
+ }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/jeecg/modules/PdfPreviewModal.vue b/ant-design-jeecg-vue/src/views/jeecg/modules/PdfPreviewModal.vue
new file mode 100644
index 0000000..1e232e4
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/jeecg/modules/PdfPreviewModal.vue
@@ -0,0 +1,56 @@
+<template>
+ <div style="display: none">
+ <iframe
+ :id="id"
+ :src="url"
+ frameborder="0"
+ width="100%"
+ height="550px"
+ scrolling="auto">
+ </iframe>
+ </div>
+</template>
+
+<script>
+ import Vue from 'vue'
+ import { ACCESS_TOKEN } from "@/store/mutation-types"
+
+ export default {
+ name: "PdfPreviewModal",
+ data () {
+ return {
+ url: window._CONFIG['pdfDomainURL'],
+ id:"pdfPreviewIframe",
+ headers:{}
+ }
+ },
+ created () {
+ const token = Vue.ls.get(ACCESS_TOKEN);
+ this.headers = {"X-Access-Token":token}
+ },
+ computed:{
+
+ },
+ mounted(){
+ window.addEventListener('message', this.handleScanFileMessage);
+ },
+ methods: {
+ handleScanFileMessage (event) {
+ // 根据上面制定的结构来解析iframe内部发回来的数据
+ const data = event.data;
+ console.log(data);
+ },
+
+ previewFiles (title,token) {
+ var iframe = document.getElementById("pdfPreviewIframe");
+ var json = {"title":title,"token":token};
+ iframe.contentWindow.postMessage(json, "*");
+ },
+
+ }
+ }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/jeecg/modules/SplitPanelA.vue b/ant-design-jeecg-vue/src/views/jeecg/modules/SplitPanelA.vue
new file mode 100644
index 0000000..96b6b4b
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/jeecg/modules/SplitPanelA.vue
@@ -0,0 +1,27 @@
+<template>
+ <a-card style="min-width: 500px;overflow-x: auto">
+ <p>我是左侧页面</p>
+ <img-turn-page></img-turn-page>
+ </a-card>
+</template>
+
+<script>
+ import ImgTurnPage from '../ImgTurnPage'
+ export default {
+ name: "SplitPanelAModal",
+ components:{
+ ImgTurnPage
+ },
+ data () {
+ return {
+ }
+ },
+ created () {
+ },
+ methods: {
+ }
+ }
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/jeecg/modules/SplitPanelB.vue b/ant-design-jeecg-vue/src/views/jeecg/modules/SplitPanelB.vue
new file mode 100644
index 0000000..9008b00
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/jeecg/modules/SplitPanelB.vue
@@ -0,0 +1,27 @@
+<template>
+ <a-card style="min-width: 500px;overflow-x: auto">
+ <p>我是右侧页面</p>
+ <img-turn-page></img-turn-page>
+ </a-card>
+</template>
+
+<script>
+ import ImgTurnPage from '../ImgTurnPage'
+ export default {
+ name: "SplitPanelAModal",
+ components:{
+ ImgTurnPage
+ },
+ data () {
+ return {
+ }
+ },
+ created () {
+ },
+ methods: {
+ }
+ }
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/jeecg/modules/SplitPanelModal.vue b/ant-design-jeecg-vue/src/views/jeecg/modules/SplitPanelModal.vue
new file mode 100644
index 0000000..a63702a
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/jeecg/modules/SplitPanelModal.vue
@@ -0,0 +1,63 @@
+<template>
+ <a-modal
+ title="分屏"
+ :width="modalWidth"
+ :visible="visible"
+ :bodyStyle="bodyStyle"
+ style="top: 0px;"
+ @ok="handleOk"
+ @cancel="handleCancel"
+ cancelText="关闭">
+
+ <split-pane :min-percent='20' :default-percent='50' split="vertical">
+ <template slot="paneL">
+ <split-panel-a></split-panel-a>
+ </template>
+ <template slot="paneR">
+ <split-panel-b></split-panel-b>
+ </template>
+ </split-pane>
+
+ </a-modal>
+</template>
+
+<script>
+ import splitPane from 'vue-splitpane'
+ import SplitPanelA from './SplitPanelA'
+ import SplitPanelB from './SplitPanelB'
+ export default {
+ name: "SplitPanelModal",
+ components:{
+ splitPane,
+ SplitPanelA,
+ SplitPanelB
+ },
+ data () {
+ return {
+ visible: false,
+ bodyStyle:{
+ padding: "0",
+ height:(window.innerHeight-150)+"px"
+ },
+ modalWidth:800,
+ }
+ },
+ created () {
+ this.modalWidth = window.innerWidth-0;
+ },
+ methods: {
+ show () {
+ this.visible = true;
+ },
+ handleOk(){
+
+ },
+ handleCancel () {
+ this.visible = false;
+ },
+ }
+ }
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/jeecg/report/ArchivesStatisticst.vue b/ant-design-jeecg-vue/src/views/jeecg/report/ArchivesStatisticst.vue
index 326fc28..0903dc5 100644
--- a/ant-design-jeecg-vue/src/views/jeecg/report/ArchivesStatisticst.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/report/ArchivesStatisticst.vue
@@ -12,7 +12,7 @@
</a-radio-group>
</a-col>
<a-col :span="14">
- <a-form v-if="barType === 'month'" layout="inline" style="margin-top: -4px">
+ <a-form v-if="barType === 'month' && false" layout="inline" style="margin-top: -4px">
<a-form-item label="月份区间">
<a-range-picker
:placeholder="['开始月份', '结束月份']"
@@ -25,7 +25,7 @@
<a-button style="margin-top: 2px;margin-left: 8px" type="primary" icon="reload" @click="searchReset">重置</a-button>
</a-form>
</a-col>
- <bar class="statistic" title="档案统计" :dataSource="countSource"/>
+ <bar class="statistic" title="档案统计" :dataSource="countSource" :height="400"/>
</a-row>
</a-tab-pane>
@@ -40,7 +40,7 @@
</a-radio-group>
</a-col>
<a-col :span="14">
- <a-form v-if="pieType === 'month'" layout="inline" style="margin-top: -4px">
+ <a-form v-if="pieType === 'month' && false" layout="inline" style="margin-top: -4px">
<a-row :gutter="24">
<a-form-item label="月份区间">
<a-range-picker
@@ -55,7 +55,7 @@
</a-row>
</a-form>
</a-col>
- <pie class="statistic" title="档案统计" :dataSource="countSource"/>
+ <pie class="statistic" title="档案统计" :dataSource="countSource" :height="450"/>
</a-row>
</a-tab-pane>
</a-tabs>
diff --git a/ant-design-jeecg-vue/src/views/jeecg/report/ViserChartDemo.vue b/ant-design-jeecg-vue/src/views/jeecg/report/ViserChartDemo.vue
index dabc532..63ee4fb 100644
--- a/ant-design-jeecg-vue/src/views/jeecg/report/ViserChartDemo.vue
+++ b/ant-design-jeecg-vue/src/views/jeecg/report/ViserChartDemo.vue
@@ -63,6 +63,10 @@
<a-tab-pane tab="Liquid" key="14">
<liquid :height="height"/>
</a-tab-pane>
+ <!-- BarAndLine -->
+ <a-tab-pane tab="BarAndLine" key="15">
+ <bar-and-line :height="height"/>
+ </a-tab-pane>
</a-tabs>
</a-card>
</template>
@@ -82,13 +86,14 @@
import RankList from '@/components/chart/RankList'
import TransferBar from '@/components/chart/TransferBar'
import Trend from '@/components/chart/Trend'
+ import BarAndLine from '@/components/chart/BarAndLine'
export default {
name: 'ViserChartDemo',
components: {
Bar, MiniBar, BarMultid, AreaChartTy, LineChartMultid,
Pie, Radar, DashChartDemo, MiniProgress, RankList,
- TransferBar, Trend, Liquid, MiniArea
+ TransferBar, Trend, Liquid, MiniArea, BarAndLine
},
data() {
return {
diff --git a/ant-design-jeecg-vue/src/views/modules/message/SysMessageList.vue b/ant-design-jeecg-vue/src/views/modules/message/SysMessageList.vue
index f181af2..60d6528 100644
--- a/ant-design-jeecg-vue/src/views/modules/message/SysMessageList.vue
+++ b/ant-design-jeecg-vue/src/views/modules/message/SysMessageList.vue
@@ -6,13 +6,13 @@
<a-form layout="inline">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
- <a-form-item label="推送标题">
- <a-input placeholder="请输入推送标题" v-model="queryParam.esTitle"></a-input>
+ <a-form-item label="消息标题">
+ <a-input placeholder="请输入消息标题" v-model="queryParam.esTitle"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="8">
- <a-form-item label="推送内容">
- <a-input placeholder="请输入推送内容" v-model="queryParam.esContent"></a-input>
+ <a-form-item label="发送内容">
+ <a-input placeholder="请输入发送内容" v-model="queryParam.esContent"></a-input>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
@@ -40,8 +40,8 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" v-show="show" type="primary" icon="plus">新增</a-button>
- <a-button type="primary" v-show="show" icon="download" @click="handleExportXls">导出</a-button>
- <a-upload v-show="show" name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl"
+ <a-button type="primary" v-show="show" icon="download" @click="handleExportXls('消息')">导出</a-button>
+ <a-upload v-show="show" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
@@ -84,14 +84,13 @@
</span>
<span slot="action" slot-scope="text, record">
- <a v-show="show" @click="handleEdit(record)">编辑</a>
-
+ <a href="javascript:;" @click="handleDetail(record)">详情</a>
<a-divider type="vertical"/>
<a-dropdown>
<a class="ant-dropdown-link">更多<a-icon type="down"/></a>
<a-menu slot="overlay">
- <a-menu-item>
- <a href="javascript:;" @click="handleDetail(record)">详情</a>
+ <a-menu-item v-show="show">
+ <a @click="handleEdit(record)">编辑</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -163,19 +162,8 @@
},
{
title: '发送状态',
- align: "center",
- dataIndex: 'esSendStatus',
- customRender: function (text) {
- if(text=='0') {
- return "未发送";
- }
- if(text=='1') {
- return "发送成功";
- }
- if(text=='2') {
- return "发送失败";
- }
- }
+ align: 'center',
+ dataIndex: 'esSendStatus_dictText'
},
{
title: '发送时间',
@@ -184,19 +172,8 @@
},
{
title: '发送方式',
- align: "center",
- dataIndex: 'esType',
- customRender: function (text) {
- if(text=='1') {
- return "短信";
- }
- if(text=='2') {
- return "邮件";
- }
- if(text=='3') {
- return "微信";
- }
- }
+ align: 'center',
+ dataIndex: 'esType_dictText'
},
{
title: '操作',
diff --git a/ant-design-jeecg-vue/src/views/modules/message/SysMessageTemplateList.vue b/ant-design-jeecg-vue/src/views/modules/message/SysMessageTemplateList.vue
index 7fd2612..6393cfd 100644
--- a/ant-design-jeecg-vue/src/views/modules/message/SysMessageTemplateList.vue
+++ b/ant-design-jeecg-vue/src/views/modules/message/SysMessageTemplateList.vue
@@ -46,8 +46,8 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls">导出</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl"
+ <a-button type="primary" icon="download" @click="handleExportXls('消息模板')">导出</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
diff --git a/ant-design-jeecg-vue/src/views/modules/message/modules/SysMessageModal.vue b/ant-design-jeecg-vue/src/views/modules/message/modules/SysMessageModal.vue
index f2fb690..fcfb40c 100644
--- a/ant-design-jeecg-vue/src/views/modules/message/modules/SysMessageModal.vue
+++ b/ant-design-jeecg-vue/src/views/modules/message/modules/SysMessageModal.vue
@@ -107,6 +107,7 @@
confirmLoading: false,
form: this.$form.createForm(this),
validatorRules: {},
+ disableSubmit: true,
url: {
add: "/message/sysMessage/add",
edit: "/message/sysMessage/edit",
diff --git a/ant-design-jeecg-vue/src/views/modules/message/modules/SysMessageTemplateModal.vue b/ant-design-jeecg-vue/src/views/modules/message/modules/SysMessageTemplateModal.vue
index 5f2fc2c..da3ed2e 100644
--- a/ant-design-jeecg-vue/src/views/modules/message/modules/SysMessageTemplateModal.vue
+++ b/ant-design-jeecg-vue/src/views/modules/message/modules/SysMessageTemplateModal.vue
@@ -17,7 +17,8 @@
label="模板CODE">
<a-input
:disabled="disable"
- v-decorator="['templateCode', {} ]"
+ placeholder="请输入模板编码"
+ v-decorator="['templateCode', validatorRules.templateCode ]"
/>
</a-form-item>
<a-form-item
@@ -29,23 +30,31 @@
v-decorator="['templateName', validatorRules.templateName]"
/>
</a-form-item>
+
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="模板类型">
+ <j-dict-select-tag @change="handleChangeTemplateType" :triggerChange="true" dictCode="msgType" v-decorator="['templateType', validatorRules.templateType ]" placeholder="请选择模板类型">
+ </j-dict-select-tag>
+ </a-form-item>
+
<a-form-item
+ v-show="!useEditor"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="模板内容">
- <a-textarea
- placeholder="请输入模板内容"
- v-decorator="['templateContent', validatorRules.templateContent ]"
- :autosize="{ minRows: 8, maxRows: 8 }"
- />
+ <a-textarea placeholder="请输入模板内容" v-decorator="['templateContent', validatorRules.templateContent ]" :autosize="{ minRows: 8, maxRows: 8 }" />
</a-form-item>
+
<a-form-item
+ v-show="useEditor"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
- label="模板类型">
- <j-dict-select-tag :triggerChange="true" dictCode="msgType" v-decorator="['templateType', validatorRules.templateType ]" placeholder="请选择模板类型">
- </j-dict-select-tag>
+ label="模板内容">
+ <j-editor v-model="templateEditorContent"></j-editor>
</a-form-item>
+
</a-form>
</a-spin>
</a-modal>
@@ -54,9 +63,14 @@
<script>
import {httpAction} from '@/api/manage'
import pick from 'lodash.pick'
+ import { duplicateCheck } from '@/api/api'
+ import JEditor from '@/components/jeecg/JEditor'
export default {
name: "SysMessageTemplateModal",
+ components:{
+ JEditor
+ },
data() {
return {
title: "操作",
@@ -74,14 +88,17 @@
confirmLoading: false,
form: this.$form.createForm(this),
validatorRules: {
- templateName: {rules: [{required: true, message: '请输入模板标题!'}]},
- templateContent: {rules: [{required: true, message: '请输入模板内容!'}]},
- templateType: {rules: [{required: true, message: '请输入模板类型!'}]},
+ templateCode: {rules: [{required: true, message: '请输入模板CODE!' },{validator: this.validateTemplateCode}]},
+ templateName: {rules: [{required: true, message: '请输入模板标题!'}]},
+ templateContent: {rules: []},
+ templateType: {rules: [{required: true, message: '请输入模板类型!'}]},
},
url: {
add: "/message/sysMessageTemplate/add",
edit: "/message/sysMessageTemplate/edit",
},
+ useEditor:false,
+ templateEditorContent:""
}
},
created() {
@@ -94,12 +111,20 @@
edit(record) {
this.form.resetFields();
this.model = Object.assign({}, record);
+ this.useEditor = (record.templateType==2)
+ if(this.useEditor){
+ this.templateEditorContent=record.templateContent
+ }else{
+ this.templateEditorContent=''
+ }
this.visible = true;
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model, 'templateCode', 'templateContent', 'templateName', 'templateTestJson', 'templateType'))
- //时间格式化
+ if(this.useEditor){
+ this.form.setFieldsValue(pick(this.model, 'templateCode', 'templateName', 'templateTestJson', 'templateType'))
+ }else{
+ this.form.setFieldsValue(pick(this.model, 'templateCode', 'templateContent', 'templateName', 'templateTestJson', 'templateType'))
+ }
});
-
},
close() {
this.$emit('close');
@@ -125,6 +150,9 @@
let formData = Object.assign(this.model, values);
//时间格式化
+ if(this.useEditor){
+ formData.templateContent=this.templateEditorContent
+ }
console.log(formData)
httpAction(httpurl, formData, method).then((res) => {
if (res.success) {
@@ -142,10 +170,29 @@
}
})
},
+ validateTemplateCode(rule, value, callback){
+ var params = {
+ tableName: "sys_sms_template",
+ fieldName: "template_code",
+ fieldVal: value,
+ dataId: this.model.id
+ }
+ duplicateCheck(params).then((res)=>{
+ if(res.success){
+ callback();
+ }else{
+ callback(res.message);
+ }
+ })
+
+ },
handleCancel() {
this.close()
},
-
+ handleChangeTemplateType(value){
+ //如果是邮件类型那么则改变模板内容是富文本编辑器
+ this.useEditor = value==2
+ }
}
}
diff --git a/ant-design-jeecg-vue/src/views/modules/monitor/DiskMonitoring.vue b/ant-design-jeecg-vue/src/views/modules/monitor/DiskMonitoring.vue
new file mode 100644
index 0000000..717d1b2
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/modules/monitor/DiskMonitoring.vue
@@ -0,0 +1,49 @@
+<template>
+ <a-card title="磁盘监控">
+ <a-row>
+ <template v-if="diskInfo && diskInfo.length>0">
+ <a-col :span="8" v-for="(item,index) in diskInfo" :key=" 'diskInfo'+index ">
+ <dash-chart-demo :title="item.name" :datasource="item.restPPT"></dash-chart-demo>
+ </a-col>
+ </template>
+ </a-row>
+ </a-card>
+</template>
+
+<script>
+ import { getAction } from '@/api/manage'
+ import DashChartDemo from '@/components/chart/DashChartDemo'
+ import ARow from 'ant-design-vue/es/grid/Row'
+
+ export default {
+ name: 'DiskMonitoring',
+ components:{
+ ARow,
+ DashChartDemo,
+ },
+ data() {
+ return {
+ description: '磁盘监控',
+ //数据集
+ diskInfo:[],
+ url:{
+ queryDiskInfo:'actuator/redis/queryDiskInfo',
+ }
+ }
+ },
+ created() {
+ getAction(this.url.queryDiskInfo).then((res)=>{
+ if(res.success){
+ for(var i=0;i<res.result.length;i++){
+ res.result[i].restPPT = res.result[i].restPPT/10;
+ }
+ this.diskInfo = res.result;
+ }
+ })
+ }
+ }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/modules/monitor/HttpTrace.vue b/ant-design-jeecg-vue/src/views/modules/monitor/HttpTrace.vue
new file mode 100644
index 0000000..2035489
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/modules/monitor/HttpTrace.vue
@@ -0,0 +1,148 @@
+<template>
+ <a-skeleton active :loading="loading" :paragraph="{rows: 17}">
+ <a-card :bordered="false" class="card-area">
+
+ <a-alert type="info" :showIcon="true">
+ <div slot="message">
+ 共追踪到 {{ dataSource.length }} 条近期HTTP请求记录
+ <a-divider type="vertical"/>
+ <a @click="handleClickUpdate">立即刷新</a>
+ </div>
+ </a-alert>
+
+ <!-- 表格区域 -->
+ <a-table
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="pagination"
+ :loading="tableLoading"
+ :scroll="{ x: 900 }"
+ style="margin-top: 20px;"
+ @change="handleTableChange">
+
+ <template slot="timeTaken" slot-scope="text">
+ <a-tag v-if="text < 500" color="green">{{ text }} ms</a-tag>
+ <a-tag v-else-if="text < 1000" color="cyan">{{ text }} ms</a-tag>
+ <a-tag v-else-if="text < 1500" color="orange">{{ text }} ms</a-tag>
+ <a-tag v-else color="red">{{ text }} ms</a-tag>
+ </template>
+
+ <template slot="responseStatus" slot-scope="text">
+ <a-tag v-if="text < 200" color="pink">{{ text }} ms</a-tag>
+ <a-tag v-else-if="text < 201" color="green">{{ text }} ms</a-tag>
+ <a-tag v-else-if="text < 399" color="cyan">{{ text }} ms</a-tag>
+ <a-tag v-else-if="text < 403" color="orange">{{ text }} ms</a-tag>
+ <a-tag v-else-if="text < 501" color="red">{{ text }} ms</a-tag>
+ <span v-else>{{ text }} ms</span>
+ </template>
+
+ <template slot="requestMethod" slot-scope="text">
+ <a-tag v-if="text === 'GET'" color="#87d068">{{ text }}</a-tag>
+ <a-tag v-else-if="text === 'POST'" color="#2db7f5">{{ text }}</a-tag>
+ <a-tag v-else-if="text === 'PUT'" color="#ffba5a">{{ text }}</a-tag>
+ <a-tag v-else-if="text === 'DELETE'" color="#f50">{{ text }}</a-tag>
+ <span v-else>{{ text }} ms</span>
+ </template>
+
+ </a-table>
+
+ </a-card>
+ </a-skeleton>
+</template>
+
+<script>
+ import moment from 'moment'
+ import { getAction } from '@/api/manage'
+
+ moment.locale('zh-cn')
+
+ export default {
+ data() {
+ return {
+ advanced: false,
+ dataSource: [],
+ pagination: {
+ defaultPageSize: 10,
+ defaultCurrent: 1,
+ pageSizeOptions: ['10', '20', '30', '40', '100'],
+ showQuickJumper: true,
+ showSizeChanger: true,
+ showTotal: (total, range) => `显示 ${range[0]} ~ ${range[1]} 条记录，共 ${total} 条记录`
+ },
+ loading: true,
+ tableLoading: true
+ }
+ },
+ computed: {
+ columns() {
+ return [{
+ title: '请求时间',
+ dataIndex: 'timestamp',
+ customRender(text) {
+ return moment(text).format('YYYY-MM-DD HH:mm:ss')
+ }
+ }, {
+ title: '请求方法',
+ dataIndex: 'request.method',
+ scopedSlots: { customRender: 'requestMethod' },
+ filters: [
+ { text: 'GET', value: 'GET' },
+ { text: 'POST', value: 'POST' },
+ { text: 'PUT', value: 'PUT' },
+ { text: 'DELETE', value: 'DELETE' }
+ ],
+ filterMultiple: true,
+ onFilter: (value, record) => record.request.method.includes(value)
+ }, {
+ title: '请求URL',
+ dataIndex: 'request.uri',
+ customRender(text) {
+ return text.split('?')[0]
+ }
+ }, {
+ title: '响应状态',
+ dataIndex: 'response.status',
+ scopedSlots: { customRender: 'responseStatus' }
+ }, {
+ title: '请求耗时',
+ dataIndex: 'timeTaken',
+ scopedSlots: { customRender: 'timeTaken' }
+ }]
+ }
+ },
+ mounted() {
+ this.fetch()
+ },
+ methods: {
+
+ handleClickUpdate() {
+ this.fetch()
+ },
+
+ handleTableChange() {
+ this.fetch()
+ },
+
+ fetch() {
+ this.tableLoading = true
+ getAction('actuator/httptrace').then((data) => {
+ let filterData = []
+ for (let d of data.traces) {
+ if (d.request.method !== 'OPTIONS' && d.request.uri.indexOf('httptrace') === -1) {
+ filterData.push(d)
+ }
+ }
+ this.dataSource = filterData
+ }).catch((e) => {
+ console.error(e)
+ this.$message.error('获取HTTP信息失败')
+ }).finally(() => {
+ this.loading = false
+ this.tableLoading = false
+ })
+ }
+
+ }
+ }
+</script>
+<style></style>
diff --git a/ant-design-jeecg-vue/src/views/modules/monitor/JvmInfo.vue b/ant-design-jeecg-vue/src/views/modules/monitor/JvmInfo.vue
new file mode 100644
index 0000000..66e15cf
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/modules/monitor/JvmInfo.vue
@@ -0,0 +1,169 @@
+<template>
+ <a-skeleton active :loading="loading" :paragraph="{rows: 17}">
+ <a-card :bordered="false">
+
+ <a-alert type="info" :showIcon="true">
+ <div slot="message">
+ 上次更新时间：{{ this.time }}
+ <a-divider type="vertical"/>
+ <a @click="handleClickUpdate">立即更新</a>
+ </div>
+ </a-alert>
+
+ <a-table
+ rowKey="id"
+ size="middle"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="false"
+ :loading="tableLoading"
+ style="margin-top: 20px;">
+
+ <template slot="param" slot-scope="text, record">
+ <a-tag :color="textInfo[record.param].color">{{ text }}</a-tag>
+ </template>
+
+ <template slot="text" slot-scope="text, record">
+ {{ textInfo[record.param].text }}
+ </template>
+
+ <template slot="value" slot-scope="text, record">
+ {{ text }} {{ textInfo[record.param].unit }}
+ </template>
+
+ </a-table>
+ </a-card>
+ </a-skeleton>
+</template>
+<script>
+ import moment from 'moment'
+ import { getAction } from '@/api/manage'
+
+ moment.locale('zh-cn')
+
+ export default {
+ data() {
+ return {
+ time: '',
+ loading: true,
+ tableLoading: true,
+ columns: [{
+ title: '参数',
+ width: '30%',
+ dataIndex: 'param',
+ scopedSlots: { customRender: 'param' }
+ }, {
+ title: '描述',
+ width: '40%',
+ dataIndex: 'text',
+ scopedSlots: { customRender: 'text' }
+ }, {
+ title: '当前值',
+ width: '30%',
+ dataIndex: 'value',
+ scopedSlots: { customRender: 'value' }
+ }],
+ dataSource: [],
+ // 列表通过 textInfo 渲染出颜色、描述和单位
+ textInfo: {
+ 'jvm.memory.max': { color: 'purple', text: 'JVM 最大内存', unit: 'MB' },
+ 'jvm.memory.committed': { color: 'purple', text: 'JVM 可用内存', unit: 'MB' },
+ 'jvm.memory.used': { color: 'purple', text: 'JVM 已用内存', unit: 'MB' },
+ 'jvm.buffer.memory.used': { color: 'cyan', text: 'JVM 缓冲区已用内存', unit: 'MB' },
+ 'jvm.buffer.count': { color: 'cyan', text: '当前缓冲区数量', unit: '个' },
+ 'jvm.threads.daemon': { color: 'green', text: 'JVM 守护线程数量', unit: '个' },
+ 'jvm.threads.live': { color: 'green', text: 'JVM 当前活跃线程数量', unit: '个' },
+ 'jvm.threads.peak': { color: 'green', text: 'JVM 峰值线程数量', unit: '个' },
+ 'jvm.classes.loaded': { color: 'orange', text: 'JVM 已加载 Class 数量', unit: '个' },
+ 'jvm.classes.unloaded': { color: 'orange', text: 'JVM 未加载 Class 数量', unit: '个' },
+ 'jvm.gc.memory.allocated': { color: 'pink', text: 'GC 时, 年轻代分配的内存空间', unit: 'MB' },
+ 'jvm.gc.memory.promoted': { color: 'pink', text: 'GC 时, 老年代分配的内存空间', unit: 'MB' },
+ 'jvm.gc.max.data.size': { color: 'pink', text: 'GC 时, 老年代的最大内存空间', unit: 'MB' },
+ 'jvm.gc.live.data.size': { color: 'pink', text: 'FullGC 时, 老年代的内存空间', unit: 'MB' },
+ 'jvm.gc.pause.count': { color: 'blue', text: '系统启动以来GC 次数', unit: '次' },
+ 'jvm.gc.pause.totalTime': { color: 'blue', text: '系统启动以来GC 总耗时', unit: '秒' }
+ },
+ // 当一条记录中需要取出多条数据的时候需要配置该字段
+ moreInfo: {
+ 'jvm.gc.pause': ['.count', '.totalTime']
+ }
+ }
+ },
+ mounted() {
+ this.loadTomcatInfo()
+ },
+ methods: {
+
+ handleClickUpdate() {
+ this.loadTomcatInfo()
+ },
+
+ loadTomcatInfo() {
+ this.tableLoading = true
+ this.time = moment().format('YYYY年MM月DD日 HH时mm分ss秒')
+ Promise.all([
+ getAction('actuator/metrics/jvm.memory.max'),
+ getAction('actuator/metrics/jvm.memory.committed'),
+ getAction('actuator/metrics/jvm.memory.used'),
+ getAction('actuator/metrics/jvm.buffer.memory.used'),
+ getAction('actuator/metrics/jvm.buffer.count'),
+ getAction('actuator/metrics/jvm.threads.daemon'),
+ getAction('actuator/metrics/jvm.threads.live'),
+ getAction('actuator/metrics/jvm.threads.peak'),
+ getAction('actuator/metrics/jvm.classes.loaded'),
+ getAction('actuator/metrics/jvm.classes.unloaded'),
+ getAction('actuator/metrics/jvm.gc.memory.allocated'),
+ getAction('actuator/metrics/jvm.gc.memory.promoted'),
+ getAction('actuator/metrics/jvm.gc.max.data.size'),
+ getAction('actuator/metrics/jvm.gc.live.data.size'),
+ getAction('actuator/metrics/jvm.gc.pause')
+ ]).then((res) => {
+
+ let info = []
+ res.forEach((value, id) => {
+ let more = this.moreInfo[value.name]
+ if (!(more instanceof Array)) {
+ more = ['']
+ }
+ more.forEach((item, idx) => {
+ let param = value.name + item
+ let val = value.measurements[idx].value
+
+ if (param === 'jvm.memory.max'
+ || param === 'jvm.memory.committed'
+ || param === 'jvm.memory.used'
+ || param === 'jvm.buffer.memory.used'
+ || param === 'jvm.gc.memory.allocated'
+ || param === 'jvm.gc.memory.promoted'
+ || param === 'jvm.gc.max.data.size'
+ || param === 'jvm.gc.live.data.size'
+ ) {
+ val = this.convert(val, Number)
+ }
+ info.push({ id: param + id, param, text: 'false value', value: val })
+ })
+ })
+ this.dataSource = info
+
+
+ }).catch((e) => {
+ console.error(e)
+ this.$message.error('获取JVM信息失败')
+ }).finally(() => {
+ this.loading = false
+ this.tableLoading = false
+ })
+ },
+
+ convert(value, type) {
+ if (type === Number) {
+ return Number(value / 1048576).toFixed(3)
+ } else if (type === Date) {
+ return moment(value * 1000).format('YYYY-MM-DD HH:mm:ss')
+ }
+ return value
+ }
+ }
+ }
+</script>
+<style></style>
diff --git a/ant-design-jeecg-vue/src/views/modules/monitor/RedisInfo.vue b/ant-design-jeecg-vue/src/views/modules/monitor/RedisInfo.vue
new file mode 100644
index 0000000..e0845f9
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/modules/monitor/RedisInfo.vue
@@ -0,0 +1,177 @@
+<template>
+ <a-skeleton active :loading="loading" :paragraph="{rows: 17}">
+ <a-card>
+ <!-- Radis 信息实时监控 -->
+ <a-row :gutter="8">
+ <a-col :sm="24" :xl="12">
+ <area-chart-ty v-bind="memory"/>
+ </a-col>
+ <a-col :sm="24" :xl="12">
+ <area-chart-ty v-bind="key"/>
+ </a-col>
+ </a-row>
+
+ <h3>Redis 详细信息</h3>
+ <a-table
+ :loading="tableLoading"
+ :columns="columns"
+ :dataSource="redisInfo"
+ :pagination="false"/>
+
+ </a-card>
+ </a-skeleton>
+</template>
+<script>
+ import moment from 'moment'
+ import { getAction } from '@/api/manage'
+ import AreaChartTy from '@/components/chart/AreaChartTy'
+
+ export default {
+ name: 'RedisInfo',
+ components: {
+ AreaChartTy
+ },
+ data() {
+ return {
+ loading: true,
+ tableLoading: true,
+ timer: null,
+ millisec: 3000,
+ key: {
+ title: 'Radis Key 实时数量（个）',
+ dataSource: [],
+ y: '数量（个）',
+ height: 340,
+ max: 100,
+ color: '#FF6987',
+ lineSize: 8,
+ lineColor: '#DC143C'
+ },
+ memory: {
+ title: 'Radis 内存实时占用情况（KB）',
+ dataSource: [],
+ y: '内存（KB）',
+ max: 3000,
+ height: 340,
+ lineSize: 8
+ },
+ redisInfo: [],
+ columns: [{
+ title: 'Key',
+ align: 'center',
+ dataIndex: 'key'
+ }, {
+ title: 'Description',
+ align: 'left',
+ dataIndex: 'description'
+ }, {
+ title: 'Value',
+ align: 'center',
+ dataIndex: 'value'
+ }],
+ url: {
+ keysSize: '/actuator/redis/keysSize',
+ memoryInfo: '/actuator/redis/memoryInfo',
+ info: '/actuator/redis/info'
+ }
+ }
+ },
+ watch: {
+ // '$route'(to, from) {
+ // console.log(to, from)
+ // let path = '/monitor/redis/info'
+ // if (to.path === path) this.openTimer(), console.log('to')
+ // if (from.path === path) this.closeTimer(), console.log('from'),
+ // this.$destroy()
+ // }
+ },
+ mounted() {
+ this.openTimer()
+ this.loadRedisInfo()
+ setTimeout(() => {
+ this.loadData()
+ }, 1000)
+ },
+ beforeDestroy() {
+ this.closeTimer()//, console.log('beforeDestroy')
+ },
+ methods: {
+
+ /** 开启定时器 */
+ openTimer() {
+ this.loadData()
+ this.closeTimer()
+ this.timer = setInterval(() => {
+ if (this.$route.path === '/monitor/redis/info') {
+ this.loadData()
+ }
+ }, this.millisec)
+ },
+
+ /** 关闭定时器 */
+ closeTimer() {
+ if (this.timer) clearInterval(this.timer)
+ },
+
+ /** 查询数据 */
+ loadData() {
+ Promise.all([
+ getAction(this.url.keysSize),
+ getAction(this.url.memoryInfo)
+ ]).then((res) => {
+ let time = moment().format('hh:mm:ss')
+
+ let [{ dbSize: currentSize }, memoryInfo] = res
+ let currentMemory = memoryInfo.used_memory / 1000
+
+ // push 数据
+ this.key.dataSource.push({ x: time, y: currentSize })
+ this.memory.dataSource.push({ x: time, y: currentMemory })
+ // 最大长度为6
+ if (this.key.dataSource.length > 6) {
+ this.key.dataSource.splice(0, 1)
+ this.memory.dataSource.splice(0, 1)
+ }
+
+ // 计算最大值阈值
+ let maxKey = this.getMaxValue(this.key.dataSource, 'y')
+ this.key.max = Math.floor(maxKey) + 10
+ let maxMemory = this.getMaxValue(this.memory.dataSource, 'y')
+ this.memory.max = Math.floor(maxMemory) + 100
+
+ }).catch((e) => {
+ console.error(e)
+ this.closeTimer()
+ this.$message.error('获取 Redis 信息失败')
+ }).finally(() => {
+ this.loading = false
+ })
+
+ },
+
+ getMaxValue(dataSource, f) {
+ let maxValue = null
+ dataSource.forEach(item => {
+ let value = Number.parseInt(item[f])
+ if (maxValue == null) {
+ maxValue = value
+ } else if (value > maxValue) {
+ maxValue = value
+ }
+ })
+ return maxValue
+ },
+
+ loadRedisInfo() {
+ this.tableLoading = true
+ getAction(this.url.info).then((res) => {
+ this.redisInfo = res.result
+ }).finally(() => {
+ this.tableLoading = false
+ })
+ }
+
+ }
+ }
+</script>
+<style></style>
diff --git a/ant-design-jeecg-vue/src/views/modules/monitor/RedisTerminal.vue b/ant-design-jeecg-vue/src/views/modules/monitor/RedisTerminal.vue
new file mode 100644
index 0000000..e671afa
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/modules/monitor/RedisTerminal.vue
@@ -0,0 +1,13 @@
+<template>
+ <div>
+ <div>Redis终端</div>
+ </div>
+</template>
+<script>
+export default {
+ name: 'RedisTerminal'
+}
+</script>
+<style>
+
+</style>
diff --git a/ant-design-jeecg-vue/src/views/modules/monitor/SystemInfo.vue b/ant-design-jeecg-vue/src/views/modules/monitor/SystemInfo.vue
new file mode 100644
index 0000000..2d15f11
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/modules/monitor/SystemInfo.vue
@@ -0,0 +1,137 @@
+<template>
+ <a-skeleton active :loading="loading" :paragraph="{rows: 17}">
+ <a-card :bordered="false">
+
+ <a-alert type="info" :showIcon="true">
+ <div slot="message">
+ 上次更新时间：{{ this.time }}
+ <a-divider type="vertical"/>
+ <a @click="handleClickUpdate">立即更新</a>
+ </div>
+ </a-alert>
+
+ <a-table
+ rowKey="id"
+ size="middle"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="false"
+ :loading="tableLoading"
+ style="margin-top: 20px;">
+
+ <template slot="param" slot-scope="text, record">
+ <a-tag :color="textInfo[record.param].color">{{ text }}</a-tag>
+ </template>
+
+ <template slot="text" slot-scope="text, record">
+ {{ textInfo[record.param].text }}
+ </template>
+
+ <template slot="value" slot-scope="text, record">
+ {{ text }} {{ textInfo[record.param].unit }}
+ </template>
+
+ </a-table>
+ </a-card>
+ </a-skeleton>
+</template>
+<script>
+ import moment from 'moment'
+ import { getAction } from '@/api/manage'
+
+ moment.locale('zh-cn')
+
+ export default {
+ data() {
+ return {
+ time: '',
+ loading: true,
+ tableLoading: true,
+ columns: [{
+ title: '参数',
+ width: '30%',
+ dataIndex: 'param',
+ scopedSlots: { customRender: 'param' }
+ }, {
+ title: '描述',
+ width: '40%',
+ dataIndex: 'text',
+ scopedSlots: { customRender: 'text' }
+ }, {
+ title: '当前值',
+ width: '30%',
+ dataIndex: 'value',
+ scopedSlots: { customRender: 'value' }
+ }],
+ dataSource: [],
+ // 列表通过 textInfo 渲染出颜色、描述和单位
+ textInfo: {
+ 'system.cpu.count': { color: 'green', text: 'CPU 数量', unit: '核' },
+ 'system.cpu.usage': { color: 'green', text: '系统 CPU 使用率', unit: '%' },
+ 'process.start.time': { color: 'purple', text: '应用启动时间点', unit: '' },
+ 'process.uptime': { color: 'purple', text: '应用已运行时间', unit: '秒' },
+ 'process.cpu.usage': { color: 'purple', text: '当前应用 CPU 使用率', unit: '%' }
+ },
+ // 当一条记录中需要取出多条数据的时候需要配置该字段
+ moreInfo: {}
+ }
+ },
+ mounted() {
+ this.loadTomcatInfo()
+ },
+ methods: {
+
+ handleClickUpdate() {
+ this.loadTomcatInfo()
+ },
+
+ loadTomcatInfo() {
+ this.tableLoading = true
+ this.time = moment().format('YYYY年MM月DD日 HH时mm分ss秒')
+ Promise.all([
+ getAction('actuator/metrics/system.cpu.count'),
+ getAction('actuator/metrics/system.cpu.usage'),
+ getAction('actuator/metrics/process.start.time'),
+ getAction('actuator/metrics/process.uptime'),
+ getAction('actuator/metrics/process.cpu.usage')
+ ]).then((res) => {
+ let info = []
+ res.forEach((value, id) => {
+ let more = this.moreInfo[value.name]
+ if (!(more instanceof Array)) {
+ more = ['']
+ }
+ more.forEach((item, idx) => {
+ let param = value.name + item
+ let val = value.measurements[idx].value
+ if (param === 'system.cpu.usage' || param === 'process.cpu.usage') {
+ val = this.convert(val, Number)
+ }
+ if (param === 'process.start.time') {
+ val = this.convert(val, Date)
+ }
+ info.push({ id: param + id, param, text: 'false value', value: val })
+ })
+ })
+ this.dataSource = info
+ }).catch((e) => {
+ console.error(e)
+ this.$message.error('获取服务器信息失败')
+ }).finally(() => {
+ this.loading = false
+ this.tableLoading = false
+ })
+ },
+
+ convert(value, type) {
+ if (type === Number) {
+ return Number(value * 100).toFixed(2)
+ } else if (type === Date) {
+ return moment(value * 1000).format('YYYY-MM-DD HH:mm:ss')
+ }
+ return value
+ }
+ }
+ }
+</script>
+<style></style>
diff --git a/ant-design-jeecg-vue/src/views/modules/monitor/TomcatInfo.vue b/ant-design-jeecg-vue/src/views/modules/monitor/TomcatInfo.vue
new file mode 100644
index 0000000..5885be9
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/modules/monitor/TomcatInfo.vue
@@ -0,0 +1,149 @@
+<template>
+ <a-skeleton active :loading="loading" :paragraph="{rows: 17}">
+ <a-card :bordered="false">
+
+ <a-alert type="info" :showIcon="true">
+ <div slot="message">
+ 上次更新时间：{{ this.time }}
+ <a-divider type="vertical"/>
+ <a @click="handleClickUpdate">立即更新</a>
+ </div>
+ </a-alert>
+
+ <a-table
+ rowKey="id"
+ size="middle"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="false"
+ :loading="tableLoading"
+ style="margin-top: 20px;">
+
+ <template slot="param" slot-scope="text, record">
+ <a-tag :color="textInfo[record.param].color">{{ text }}</a-tag>
+ </template>
+
+ <template slot="text" slot-scope="text, record">
+ {{ textInfo[record.param].text }}
+ </template>
+
+ <template slot="value" slot-scope="text, record">
+ {{ text }} {{ textInfo[record.param].unit }}
+ </template>
+
+ </a-table>
+
+ </a-card>
+ </a-skeleton>
+</template>
+<script>
+ import moment from 'moment'
+ import { getAction } from '@/api/manage'
+
+ moment.locale('zh-cn')
+
+ export default {
+ data() {
+ return {
+ time: '',
+ loading: true,
+ tableLoading: true,
+ columns: [{
+ title: '参数',
+ width: '30%',
+ dataIndex: 'param',
+ scopedSlots: { customRender: 'param' }
+ }, {
+ title: '描述',
+ width: '40%',
+ dataIndex: 'text',
+ scopedSlots: { customRender: 'text' }
+ }, {
+ title: '当前值',
+ width: '30%',
+ dataIndex: 'value',
+ scopedSlots: { customRender: 'value' }
+ }],
+ dataSource: [],
+ // 列表通过 textInfo 渲染出颜色、描述和单位
+ textInfo: {
+ 'tomcat.sessions.created': { color: 'green', text: 'tomcat 已创建 session 数', unit: '个' },
+ 'tomcat.sessions.expired': { color: 'green', text: 'tomcat 已过期 session 数', unit: '个' },
+ 'tomcat.sessions.active.current': { color: 'green', text: 'tomcat 当前活跃 session 数', unit: '个' },
+ 'tomcat.sessions.active.max': { color: 'green', text: 'tomcat 活跃 session 数峰值', unit: '个' },
+ 'tomcat.sessions.rejected': { color: 'green', text: '超过session 最大配置后，拒绝的 session 个数', unit: '个' },
+
+ 'tomcat.global.sent': { color: 'purple', text: '发送的字节数', unit: 'bytes' },
+ 'tomcat.global.request.max': { color: 'purple', text: 'request 请求最长耗时', unit: '秒' },
+ 'tomcat.global.request.count': { color: 'purple', text: '全局 request 请求次数', unit: '次' },
+ 'tomcat.global.request.totalTime': { color: 'purple', text: '全局 request 请求总耗时', unit: '秒' },
+
+ 'tomcat.servlet.request.max': { color: 'cyan', text: 'servlet 请求最长耗时', unit: '秒' },
+ 'tomcat.servlet.request.count': { color: 'cyan', text: 'servlet 总请求次数', unit: '次' },
+ 'tomcat.servlet.request.totalTime': { color: 'cyan', text: 'servlet 请求总耗时', unit: '秒' },
+
+ 'tomcat.threads.current': { color: 'pink', text: 'tomcat 当前线程数（包括守护线程）', unit: '个' },
+ 'tomcat.threads.config.max': { color: 'pink', text: 'tomcat 配置的线程最大数', unit: '个' }
+ },
+ // 当一条记录中需要取出多条数据的时候需要配置该字段
+ moreInfo: {
+ 'tomcat.global.request': ['.count', '.totalTime'],
+ 'tomcat.servlet.request': ['.count', '.totalTime']
+ }
+ }
+ },
+ mounted() {
+ this.loadTomcatInfo()
+ },
+ methods: {
+
+ handleClickUpdate() {
+ this.loadTomcatInfo()
+ },
+
+ loadTomcatInfo() {
+ this.tableLoading = true
+ this.time = moment().format('YYYY年MM月DD日 HH时mm分ss秒')
+ Promise.all([
+ getAction('actuator/metrics/tomcat.sessions.created'),
+ getAction('actuator/metrics/tomcat.sessions.expired'),
+ getAction('actuator/metrics/tomcat.sessions.active.current'),
+ getAction('actuator/metrics/tomcat.sessions.active.max'),
+ getAction('actuator/metrics/tomcat.sessions.rejected'),
+ getAction('actuator/metrics/tomcat.global.sent'),
+ getAction('actuator/metrics/tomcat.global.request.max'),
+ getAction('actuator/metrics/tomcat.global.request'),
+ // 2.1.3.RELEASE 无此API
+ //getAction('actuator/metrics/tomcat.servlet.request'),
+ // getAction('actuator/metrics/tomcat.servlet.request.max'),
+ getAction('actuator/metrics/tomcat.threads.current'),
+ getAction('actuator/metrics/tomcat.threads.config.max')
+ ]).then((res) => {
+ let tomcatInfo = []
+ res.forEach((value, id) => {
+ let more = this.moreInfo[value.name]
+ if (!(more instanceof Array)) {
+ more = ['']
+ }
+ more.forEach((item, idx) => {
+ let param = value.name + item
+ tomcatInfo.push({
+ id: param + id, param,
+ text: 'false value',
+ value: value.measurements[idx].value
+ })
+ })
+ })
+ this.dataSource = tomcatInfo
+ }).catch((e) => {
+ console.error(e)
+ this.$message.error('获取Tomcat信息失败')
+ }).finally(() => {
+ this.loading = false
+ this.tableLoading = false
+ })
+ }
+ }
+ }
+</script>
+<style></style>
diff --git a/ant-design-jeecg-vue/src/views/modules/online/cgreport/auto/OnlCgreportAutoList.vue b/ant-design-jeecg-vue/src/views/modules/online/cgreport/auto/OnlCgreportAutoList.vue
deleted file mode 100644
index 95ddc2c..0000000
--- a/ant-design-jeecg-vue/src/views/modules/online/cgreport/auto/OnlCgreportAutoList.vue
+++ /dev/null
@@ -1,208 +0,0 @@
-<template>
- <a-card :bordered="false" style="height: 100%">
-
- <div class="table-page-search-wrapper">
- <a-form layout="inline">
- <a-row :gutter="24" v-if="queryInfo && queryInfo.length>0">
- <template v-for="(item,index) in queryInfo">
- <template v-if=" item.hidden==='1' ">
- <a-col :md="6" :sm="8" :key=" 'query'+index " v-show="toggleSearchStatus">
- <onl-cgreport-query-form-item :queryParam="queryParam" :item="item" :dictOptions="dictOptions"></onl-cgreport-query-form-item>
- </a-col>
- </template>
- <template v-else>
- <a-col :md="6" :sm="8" :key=" 'query'+index ">
- <onl-cgreport-query-form-item :queryParam="queryParam" :item="item" :dictOptions="dictOptions"></onl-cgreport-query-form-item>
- </a-col>
- </template>
- </template>
-
- <a-col :md="6" :sm="8">
- <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
- <a-button type="primary" @click="searchByQuery" icon="search">查询</a-button>
- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
- <a @click="handleToggleSearch" style="margin-left: 8px">
- {{ toggleSearchStatus ? '收起' : '展开' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
- </a>
- </span>
- </a-col>
- </a-row>
- </a-form>
- </div>
-
-
- <div class="table-operator" style="margin-bottom: 10px">
- <a-button type="primary" icon="plus" @click="exportExcel">导出</a-button>
- </div>
-
-
- <a-table
- ref="table"
- size="middle"
- bordered
- rowKey="id"
- :columns="table.columns"
- :dataSource="table.dataSource"
- :pagination="table.pagination"
- :loading="table.loading"
- :rowSelection="{selectedRowKeys: table.selectedRowKeys, onChange: handleChangeInTableSelect}"
- @change="handleChangeInTable"
- style="min-height: 300px"
- >
-
- </a-table>
-
- </a-card>
-</template>
-
-<script>
- import {getAction} from '@/api/manage'
- import OnlCgreportQueryFormItem from './OnlCgreportQueryFormItem.vue';
- import {filterObj} from '@/utils/util';
-
- export default {
- name: 'OnlCgreportAutoList',
- components: {
- OnlCgreportQueryFormItem
- },
- data() {
- return {
- // 查询参数
- queryInfo: [],
- queryParam: {},
- sorter: {
- column: 'createTime',
- order: 'desc',
- },
- dictOptions: {},
- toggleSearchStatus: false, // 高级搜索 展开/关闭
- reportCode: '',
- description: '在线报表功能测试页面',
- url: {
- getColumns: '/online/cgreport/api/getColumns/',
- getData: '/online/cgreport/api/getData/',
- getQueryInfo: '/online/cgreport/api/getQueryInfo/'
- },
- table: {
- loading: true,
- // 表头
- columns: [],
- //数据集
- dataSource: [],
- // 选择器
- selectedRowKeys: [],
- selectionRows: [],
- // 分页参数
- pagination: {
- current: 1,
- pageSize: 10,
- pageSizeOptions: ['10', '20', '30'],
- showTotal: (total, range) => {
- return range[0] + '-' + range[1] + ' 共' + total + '条'
- },
- showQuickJumper: true,
- showSizeChanger: true,
- total: 0
- }
- }
- }
- },
- mounted() {
- this.loadData()
- this.initQueryInfo();
- },
- watch: {
- '$route'(to, from) {
- // 刷新参数放到这里去触发，就可以刷新相同界面了
- this.loadData()
- this.initQueryInfo();
- }
- },
- methods: {
- initQueryInfo() {
- getAction(`${this.url.getQueryInfo}${this.reportCode}`).then((res) => {
- console.log("获取查询条件", res);
- if (res.success) {
- this.queryInfo = res.result
- } else {
- this.$message.warning(res.message)
- }
- })
- },
- loadData(arg) {
- if (arg == 1) {
- this.table.pagination.current = 1
- }
- let params = this.getQueryParams();//查询条件
- console.log(params)
-
- //获取报表ID
- this.reportCode = this.$route.params.code;
- console.log(' 动态报表 reportCode ： ' + this.reportCode);
- this.table.loading = true
- Promise.all([
- getAction(`${this.url.getColumns}${this.reportCode}`),
- getAction(`${this.url.getData}${this.reportCode}`, params)
- ]).then(results => {
- let [{result: {columns}}, {result: data}] = results
- this.table.columns = columns
- if (data) {
- this.table.pagination.total = Number(data.total)
- this.table.dataSource = data.records
- } else {
- this.table.pagination.total = 0
- this.table.dataSource = []
- }
- }).catch((e) => {
- console.error(e)
- this.$message.error('查询失败')
- }).then(() => {
- this.table.loading = false
- })
- },
- getQueryParams() {
- let param = Object.assign({}, this.queryParam, this.sorter);
- param.pageNo = this.table.pagination.current;
- param.pageSize = this.table.pagination.pageSize;
- return filterObj(param);
- },
- searchByQuery() {
- this.loadData(1);
- },
- searchReset() {
- this.queryParam = {}
- this.loadData(1);
- },
- handleToggleSearch() {
- this.toggleSearchStatus = !this.toggleSearchStatus;
- },
- exportExcel() {
- let url = `${window._CONFIG['domianURL']}/online/cgreport/api/exportXls/${this.reportCode}`;
- window.location.href = url;
- },
- handleChangeInTableSelect(selectedRowKeys, selectionRows) {
- this.table.selectedRowKeys = selectedRowKeys
- this.table.selectionRows = selectionRows
- },
- handleChangeInTable(pagination, filters, sorter) {
- //分页、排序、筛选变化时触发
- if (Object.keys(sorter).length > 0) {
- this.sorter.column = sorter.field
- this.sorter.order = 'ascend' == sorter.order ? 'asc' : 'desc'
- }
- this.table.pagination = pagination
- this.loadData()
- }
-
- }
- }
-</script>
-<style scoped>
- .div {
- display: flex;
- align-items: center;
- height: 500px
- }
-
-</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/modules/online/cgreport/auto/OnlCgreportQueryFormItem.vue b/ant-design-jeecg-vue/src/views/modules/online/cgreport/auto/OnlCgreportQueryFormItem.vue
deleted file mode 100644
index c76fd93..0000000
--- a/ant-design-jeecg-vue/src/views/modules/online/cgreport/auto/OnlCgreportQueryFormItem.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<template>
- <a-form-item v-if="item.view=='date'" :label="item.label">
- <template v-if="single_mode===item.mode">
- <j-date :placeholder=" '请选择'+item.label " v-model="queryParam[item.field]"></j-date>
- </template>
- <template v-else>
- <j-date placeholder="请选择开始日期" v-model="queryParam[item.field+'_begin']" style="width:calc(50% - 15px);"></j-date>
- <span class="group-query-strig">~</span>
- <j-date placeholder="请选择结束日期" v-model="queryParam[item.field+'_end']" style="width:calc(50% - 15px);"></j-date>
- </template>
- </a-form-item>
-
- <a-form-item v-else-if="item.view=='datetime'" :label="item.label">
- <template v-if="single_mode===item.mode">
- <j-date :placeholder=" '请选择'+item.label " :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" v-model="queryParam[item.field]"></j-date>
- </template>
- <template v-else>
- <j-date placeholder="请选择开始时间" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" v-model="queryParam[item.field+'_begin']" style="width:calc(50% - 15px);"></j-date>
- <span class="group-query-strig">~</span>
- <j-date placeholder="请选择开始时间" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" v-model="queryParam[item.field+'_end']" style="width:calc(50% - 15px);"></j-date>
- </template>
- </a-form-item>
-
- <a-form-item v-else-if=" item.view=='list' || item.view=='radio' " :label="item.label">
- <a-select :placeholder=" '请选择'+item.label " v-model="queryParam[item.field]">
- <a-select-option
- v-for="(op,opIndex) in dictOptions[item.field]"
- :key="opIndex"
- :value="op.value">
- {{ op.text }}
- </a-select-option>
- </a-select>
- </a-form-item>
-
- <a-form-item v-else-if=" item.view=='checkbox'" :label="item.label">
- <j-select-multiple :placeholder=" '请选择'+item.label " :options="dictOptions[item.field]" v-model="queryParam[item.field]"></j-select-multiple>
- </a-form-item>
-
- <a-form-item v-else :label="item.label">
- <template v-if="single_mode===item.mode">
- <a-input :placeholder=" '请输入'+item.label " v-model="queryParam[item.field]"></a-input>
- </template>
- <template v-else>
- <a-input :placeholder=" '请输入开始'+item.label " v-model="queryParam[item.field+'_begin']" style="width:calc(50% - 15px);"></a-input>
- <span class="group-query-strig">~</span>
- <a-input :placeholder=" '请输入结束'+item.label " v-model="queryParam[item.field+'_end']" style="width:calc(50% - 15px);"></a-input>
- </template>
- </a-form-item>
-
-</template>
-
-<script>
- import JDate from '@/components/jeecg/JDate.vue'
- import JSelectMultiple from '@/components/jeecg/JSelectMultiple.vue';
-
- export default {
- name: 'OnlineQueryFormItem',
- props:{
- item:{
- type:Object,
- default:()=>{},
- required:true
- },
- dictOptions:{
- type:Object,
- default:()=>{},
- required:true
- },
- queryParam:{
- type:Object,
- default:()=>{},
- required:true
- }
- },
- components:{
- JDate,
- JSelectMultiple
- },
- data(){
- return {
- single_mode:"single"
- }
- },
- }
-</script>
-
-<style scoped>
- .group-query-strig{
- width:30px;text-align: center;display: inline-block;
- }
-</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/modules/online/cgreport/modules/OnlCgreportHeadModal.vue b/ant-design-jeecg-vue/src/views/modules/online/cgreport/modules/OnlCgreportHeadModal.vue
deleted file mode 100644
index 508ec02..0000000
--- a/ant-design-jeecg-vue/src/views/modules/online/cgreport/modules/OnlCgreportHeadModal.vue
+++ /dev/null
@@ -1,562 +0,0 @@
-<template>
- <a-modal
- :title="title"
- :width="1200"
- :visible="visible"
- :confirmLoading="confirmLoading"
- :destroyOnClose="true"
- :maskClosable="false"
- cancelText="关闭"
- style="top: 40px;"
- @ok="handleOk"
- @cancel="handleCancel"
-
- >
-
- <a-spin :spinning="confirmLoading">
- <a-form :form="form" layout="inline">
- <a-list>
- <!-- 编码、名称、数据源 -->
- <a-row :gutter="gutter" style="width: 100%;">
- <a-col :span="7">
- <a-form-item
- style="width: 100%"
- :labelCol="threeCol.label"
- :wrapperCol="threeCol.wrapper"
- label="编码"
- >
- <a-input placeholder="请输入编码" v-decorator="['code', validatorRules.code ]"/>
- </a-form-item>
- </a-col>
-
-
- <a-col :span="8">
- <a-form-item
- style="width: 100%"
- :labelCol="threeCol.label"
- :wrapperCol="threeCol.wrapper"
- label="名称"
- >
- <a-input placeholder="请输入名称" v-decorator="['name', validatorRules.name ]"/>
- </a-form-item>
-
- </a-col>
- <a-col :span="8">
- <a-form-item
- style="width: 100%"
- :labelCol="threeCol.label"
- :wrapperCol="threeCol.wrapper"
- >
- <!--label="数据源"-->
-
- <!--<a-select width="100%" style="width: 100%;" v-decorator="['dbSource', validatorRules.name ]">-->
- <!--<a-select-option value="0">请选择</a-select-option>-->
- <!--<a-select-option value="SAP_DB">SAP_DB</a-select-option>-->
- <!--<a-select-option value="jeewx-yunying">jeewx-yunying</a-select-option>-->
- <!--</a-select>-->
-
- </a-form-item>
- </a-col>
- </a-row>
- <!-- 查询SQL -->
- <a-row :gutter="gutter" style="width: 100%;">
- <a-col :span="20">
- <a-form-item
- style="width: 100%"
- :labelCol="oneCol.label"
- :wrapperCol="oneCol.wrapper"
- label="报表SQL">
- <a-textarea
- rows="3"
- placeholder="请输入查询SQL"
- v-decorator="['cgrSql', validatorRules.cgrSql ]">
-
- <!-- --- [ fix warning；by:sunjianlei；date:2019-03-24；for: Warning: `getFieldDecorator` will override `value`, so please don't set `value and v-model` directly and use `setFieldsValue` to set it. ]--- -->
- <!-- v-model="reportSql" -->
- <!-- --- [ fix warning；by:sunjianlei；date:2019-03-24；for: Warning: `getFieldDecorator` will override `value`, so please don't set `value and v-model` directly and use `setFieldsValue` to set it. ]--- -->
-
- </a-textarea>
- </a-form-item>
- </a-col>
- <a-col :span="4">
- <a-popover title="使用指南" trigger="hover">
- <template slot="content">
- 您可以键入“”作为一个参数，这里abc是参数的名称。例如：<br>
- select * from table where id = ${abc}。<br>
- select * from table where id like concat('%',${abc},'%')。(mysql模糊查询)<br>
- select * from table where id like '%'||${abc}||'%'。(oracle模糊查询)<br>
- select * from table where id like '%'+${abc}+'%'。(sqlserver模糊查询)<br>
- <span style="color: red;">注：参数只支持动态报表，popup暂不支持</span>
- </template>
- <a-icon type="question-circle"/>
- </a-popover>
- <a-button type="primary" @click="handleSQLAnalyze">SQL解析</a-button>
- </a-col>
- </a-row>
- <a-divider style="margin-bottom: 1px"/>
- <!-- 描述 -->
- <a-list-item style="display: none">
- <a-row :gutter="gutter" style="width: 100%;;">
- <a-col :span="24">
- <a-form-item
- style="width: 100%"
- :labelCol="oneCol.label"
- :wrapperCol="oneCol.wrapper"
- label="描述">
- <a-textarea placeholder="请输入描述" v-decorator="['content']"/>
- </a-form-item>
- </a-col>
- </a-row>
- </a-list-item>
- <!-- 返回值字段、返回文本字段、返回类型 -->
- <a-list-item>
- <a-row :gutter="gutter" style="width: 100%;">
- <a-col :span="24/3">
- <a-form-item
- style="width: 100%"
- :labelCol="threeCol.label"
- :wrapperCol="threeCol.wrapper"
- label="返回值字段"
- >
- <a-input placeholder="请输入返回值字段" v-decorator="['returnValField', {}]"/>
- </a-form-item>
- </a-col>
- <a-col :span="24/3">
- <a-form-item
- style="width: 100%"
- :labelCol="threeCol.label"
- :wrapperCol="threeCol.wrapper"
- label="返回文本字段"
- >
- <a-input placeholder="请输入返回文本字段" v-decorator="['returnTxtField', {}]"/>
- </a-form-item>
- </a-col>
- <a-col :span="24/3">
- <a-form-item
- style="width: 100%"
- :labelCol="threeCol.label"
- :wrapperCol="threeCol.wrapper"
- label="返回类型"
- >
- <a-select
- v-decorator="[ 'returnType', {}]"
- width="100%"
- style="width:100%"
- placeholder="请选择返回类型"
- >
- <a-select-option value="1">单选</a-select-option>
- <a-select-option value="2">多选</a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- </a-row>
- </a-list-item>
- </a-list>
- </a-form>
-
- <a-tabs v-model="activeKey" @change="handleChangeTab">
- <!-- 动态报表配置明细 -->
- <a-tab-pane tab="动态报表配置明细" :forceRender="true" key="1">
- <j-editable-table
- ref="editableTable1"
- :loading="tab1.loading"
- :columns="tab1.columns"
- :dataSource="tab1.dataSource"
- :rowNumber="true"
- :rowSelection="true"
- :actionButton="true"
- :maxHeight="300"/>
- </a-tab-pane>
- <!-- 报表参数 -->
- <a-tab-pane tab="报表参数" :forceRender="true" key="2">
- <j-editable-table
- ref="editableTable2"
- :loading="tab2.loading"
- :columns="tab2.columns"
- :dataSource="tab2.dataSource"
- :rowNumber="true"
- :rowSelection="true"
- :actionButton="true"
- :maxHeight="300"/>
- </a-tab-pane>
-
-
- </a-tabs>
-
- </a-spin>
- </a-modal>
-</template>
-
-<script>
-
- import JEditableTable from '@/components/jeecg/JEditableTable'
- import { FormTypes, validateTables, VALIDATE_NO_PASSED } from '@/utils/JEditableTableUtil'
-
- import { getAction, httpAction } from '@/api/manage'
- import pick from 'lodash.pick'
-
- export default {
- name: 'OnlCgreportHeadModal',
- components: {
- JEditableTable
- },
- data() {
- return {
- title: '操作',
- visible: false,
- model: {},
- reportSql: '',
- gutter: 0,
- oneCol: {
- label: { span: 3 },
- wrapper: { span: 24 - 3 }
- },
- threeCol: {
- label: { span: 9 },
- wrapper: { span: 24 - 9 }
- },
- confirmLoading: false,
- form: this.$form.createForm(this),
- validatorRules: {
- code: {
- rules: [
- { required: true, message: '请输入编码!' },
- { pattern: /^[a-z|A-Z][a-z|A-Z|\d|_|-]{0,}$/, message: '编码必须以字母开头，可包含数字、下划线、横杠' }
- ]
- },
- name: { rules: [{ required: true, message: '请输入报表名称!' }] },
- cgrSql: { rules: [{ required: true, message: '请输入查询SQL!' }] }
- },
- url: {
- add: '/online/cgreport/head/add',
- edit: '/online/cgreport/head/editAll',
- sql: '/online/cgreport/head/parseSql',
- param: {
- listByHeadId: '/online/cgreport/param/listByHeadId'
- },
- item: {
- listByHeadId: '/online/cgreport/item/listByHeadId'
- }
-
- },
- activeKey: '1',
- tab1: {
- loading: false,
- columns: [
- {
- title: '字段名',
- width: '13%',
- key: 'fieldName',
- type: FormTypes.input,
- defaultValue: '',
- placeholder: '请输入${title}',
- validateRules: [{ required: true, message: '${title}不能为空' }]
- },
- {
- title: '排序',
- width: '7%',
- key: 'orderNum',
- type: FormTypes.inputNumber,
- defaultValue: 0,
- placeholder: '${title}',
- validateRules: [{ required: true, message: '${title}' }]
- },
- {
- title: '字段文本',
- width: '13%',
- key: 'fieldTxt',
- type: FormTypes.input,
- placeholder: '请输入${title}',
- defaultValue: '',
- validateRules: [{ required: true, message: '${title}不能为空' }]
- },
- {
- title: '类型',
- width: '13%',
- key: 'fieldType',
- type: FormTypes.select,
- options: [ // 下拉选项
- { title: '数值类型', value: 'Integer' },
- { title: '日期类型', value: 'Date' },
- { title: '字符类型', value: 'String' },
- { title: '长整型', value: 'Long' }
- ],
- defaultValue: 'String',
- placeholder: '请选择${title}',
- validateRules: [{ required: true, message: '${title}不能为空' }]
- },
- {
- title: '是否显示',
- width: '3%',
- key: 'isShow',
- type: FormTypes.checkbox,
- customValue: ['1', '0'], // true ,false
- defaultChecked: true
- },
- {
- title: '字段href',
- width: '12%',
- key: 'fieldHref',
- type: FormTypes.input,
- defaultValue: '',
- placeholder: '请输入${title}'
- },
- {
- title: '查询模式',
- width: '12%',
- key: 'searchMode',
- type: FormTypes.select,
- options: [
- { title: '单条件查询', value: 'single' },
- { title: '范围查询', value: 'group' }
- ],
- defaultValue: '',
- placeholder: '请选择${title}'
- },
- {
- title: '取值表达式',
- width: '12%',
- key: 'replaceVal',
- type: FormTypes.input,
- defaultValue: '',
- placeholder: '请输入${title}'
- },
- {
- title: '字典code',
- width: '12%',
- key: 'dictCode',
- type: FormTypes.input,
- defaultValue: '',
- placeholder: '请输入${title}'
- },
- {
- title: '是否查询',
- width: '3%',
- key: 'isSearch',
- type: FormTypes.checkbox,
- customValue: ['1', '0'],
- defaultChecked: false
- }
- ],
- dataSource: []
- },
- tab2: {
- loading: false,
- columns: [
- {
- width: '23%',
- title: '参数',
- key: 'paramName',
- type: FormTypes.input,
- defaultValue: '',
- placeholder: '请输入${title}',
- validateRules: [{ required: true, message: '${title}不能为空' }]
- },
- {
- width: '23%',
- title: '参数文本',
- key: 'paramTxt',
- type: FormTypes.input,
- defaultValue: '',
- placeholder: '请输入${title}',
- validateRules: [{ required: true, message: '${title}不能为空' }]
- },
- {
- width: '23%',
- title: '默认值',
- key: 'paramValue',
- type: FormTypes.input,
- defaultValue: '',
- placeholder: '请输入${title}'
- },
- {
- width: '23%',
- title: '排序',
- key: 'orderNum',
- type: FormTypes.inputNumber,
- defaultValue: 0,
- placeholder: '${title}',
- validateRules: [{ required: true, message: '${title}不能为空' }]
- }
- ],
- dataSource: []
- }
- }
- },
- methods: {
- add() {
- this.edit({})
- },
- edit(record) {
- this.form.resetFields()
- this.model = Object.assign({}, record)
- this.visible = true
- this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model,
- 'code',
- 'name',
- 'cgrSql',
- 'returnValField',
- 'returnTxtField',
- 'returnType',
- // 'dbSource',
- 'content'
- ))
- })
- this.reportSql = this.model.cgrSql
- // 查询出param
- if (record.id) {
- this.requestData(record.id)
- }
-
- },
- /** 关闭窗口，并初始化所有的表 */
- close() {
- this.visible = false
- // 初始化
- if (this.$refs.editableTable1) {
- ['1', '2'].forEach(key => {
- this.$refs['editableTable' + key].initialize()
- this['tab' + key].dataSource = []
- })
- }
- this.activeKey = '1'
- this.$emit('close')
- },
-
- /** 点击确定按钮，提交数据 */
- handleOk() {
- this.validateFields()
- },
- /** 点击关闭按钮 */
- handleCancel() {
- this.close()
- },
-
- /** 根据headId查询item和param */
- requestData(headId) {
- this.requestTabData(this.url.item.listByHeadId, headId, this.tab1)
- this.requestTabData(this.url.param.listByHeadId, headId, this.tab2)
- },
- /** 查询某个tab的数据 */
- requestTabData(url, headId, tab) {
- tab.loading = true
- getAction(url, { headId }).then(res => {
- tab.dataSource = res.result || []
- }).finally(() => {
- tab.loading = false
- })
- },
-
- /** SQL解析 */
- handleSQLAnalyze() {
- this.confirmLoading = true
-
- // --- [ fix warning；by:sunjianlei；date:2019-03-24；for: Warning: `getFieldDecorator` will override `value`, so please don't set `value and v-model` directly and use `setFieldsValue` to set it. ]
- // var param = { 'sql': this.reportSql }
- // let param = { 'sql': reportSql }
- // --- [ fix warning；by:sunjianlei；date:2019-03-24；for: Warning: `getFieldDecorator` will override `value`, so please don't set `value and v-model` directly and use `setFieldsValue` to set it. ]
-
- let reportSql = this.form.getFieldValue('cgrSql') || ''
- let param = { 'sql': reportSql }
- getAction(this.url.sql, param).then(res => {
- // console.log(res)
- if (res.success) {
- this.$message.success('解析成功')
- this.tab1.dataSource = res.result.fields || []
- }
- }).finally(() => {
- this.confirmLoading = false
- })
- },
-
- /** 切换tab选项卡的时候重置editableTable的滚动条状态 */
- handleChangeTab(key) {
- this.$refs[`editableTable${key}`].resetScrollTop()
- },
-
- /** 触发表单验证 */
- validateFields() {
- let options = {}
- new Promise((resolve, reject) => {
- // 触发表单验证
- this.form.validateFields((err, values) => {
- err ? reject(VALIDATE_NO_PASSED) : resolve(values)
- })
- }).then(values => {
- options.head = Object.assign(this.model, values)
- return this.validateTableFields()
- }).then(opt => {
- Object.assign(options, opt)
- let formData = this.classifyIntoFormData(options)
- return this.requestAddOrEdit(formData)
- })
- },
-
- /** 发起请求新增或修改的请求 */
- requestAddOrEdit(formData) {
- // 判断是add还是edit
- let method = 'post', url = this.url.add
- if (this.model.id) {
- method = 'put'
- url = this.url.edit
- }
- // 发起请求
- this.confirmLoading = true
- httpAction(url, formData, method).then((res) => {
- if (res.success) {
- this.$message.success(res.message)
- this.$emit('ok')
- this.close()
- } else {
- this.$message.warning(res.message)
- }
- }).finally(() => {
- this.confirmLoading = false
- })
- },
-
- /** 将数据整理成后台能识别的formData */
- classifyIntoFormData(options) {
- let formData = pick(options, 'head')
-
- formData.items = options.table1.values
- formData.deleteItemIds = options.table1.deleteIds.join(',')
-
- formData.params = options.table2.values
- formData.deleteParamIds = options.table2.deleteIds.join(',')
-
- return formData
- },
-
- /** 验证并获取所有表的数据 */
- validateTableFields() {
- let _this = this
- return new Promise((resolve, reject) => {
- let cases = []
- cases.push(_this.$refs.editableTable1)
- cases.push(_this.$refs.editableTable2)
- validateTables(cases).then((all) => {
- let options = {}
- all.forEach((item, index) => {
- options[`table${index + 1}`] = item
- })
- resolve(options)
- }).catch((e = {}) => {
- // 判断表单验证是否未通过
- if (e.error === VALIDATE_NO_PASSED) {
- // 未通过就跳转到相应的tab选项卡
- _this.activeKey = (e.index + 1).toString()
- }
- reject(e)
- })
- })
- }
-
- }
- }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/system/DataLogList.vue b/ant-design-jeecg-vue/src/views/system/DataLogList.vue
index db518f9..cd3ece2 100644
--- a/ant-design-jeecg-vue/src/views/system/DataLogList.vue
+++ b/ant-design-jeecg-vue/src/views/system/DataLogList.vue
@@ -129,45 +129,6 @@
}
</script>
-
<style scoped>
- .ant-card-body .table-operator {
- margin-bottom: 18px;
- }
-
- .ant-table-tbody .ant-table-row td {
- padding-top: 15px;
- padding-bottom: 15px;
- }
-
- .anty-row-operator button {
- margin: 0 5px
- }
-
- .ant-btn-danger {
- background-color: #ffffff
- }
-
- .ant-modal-cust-warp {
- height: 100%
- }
-
- .ant-modal-cust-warp .ant-modal-body {
- height: calc(100% - 110px) !important;
- overflow-y: auto
- }
-
- .ant-modal-cust-warp .ant-modal-content {
- height: 90% !important;
- overflow-y: hidden
- }
-
- .anty-img-wrap {
- height: 25px;
- position: relative;
- }
-
- .anty-img-wrap > img {
- max-height: 100%;
- }
+ @import '~@assets/less/common.less'
</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/system/DepartList.vue b/ant-design-jeecg-vue/src/views/system/DepartList.vue
index d69fbb3..3504864 100644
--- a/ant-design-jeecg-vue/src/views/system/DepartList.vue
+++ b/ant-design-jeecg-vue/src/views/system/DepartList.vue
@@ -2,12 +2,17 @@
<a-row :gutter="10">
<a-col :md="12" :sm="24">
<a-card :bordered="false">
+
<!-- 按钮操作区域 -->
<a-row style="margin-left: 14px">
- <a-button @click="handleAdd(2)" type="primary">添加子部门</a-button>
- <a-button @click="handleAdd(1)" type="default">添加一级部门</a-button>
+ <!--<a-button @click="handleAdd(2)" type="primary">添加子部门</a-button>-->
+ <a-button @click="handleAdd(1)" type="primary">添加一级部门</a-button>
+ <a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="import">导入</a-button>
+ </a-upload>
<a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
- <a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>
+ <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
</a-row>
<div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
<a-alert type="info" :showIcon="true">
@@ -71,6 +76,12 @@
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
+ label="机构编码">
+ <a-input disabled placeholder="请输入机构编码" v-decorator="['orgCode', validatorRules.orgCode ]"/>
+ </a-form-item>
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
label="排序">
<a-input-number v-decorator="[ 'departOrder',{'initialValue':0}]"/>
</a-form-item>
@@ -105,8 +116,9 @@
<script>
import DepartModal from './modules/DepartModal'
import pick from 'lodash.pick'
- import { queryDepartTreeList, searchByKeywords, deleteByDepartId } from '@/api/api'
- import { httpAction, deleteAction } from '@/api/manage'
+ import {queryDepartTreeList, searchByKeywords, deleteByDepartId} from '@/api/api'
+ import {httpAction, deleteAction} from '@/api/manage'
+ import {JeecgListMixin} from '@/mixins/JeecgListMixin'
// 表头
const columns = [
{
@@ -120,7 +132,7 @@
},
{
title: '机构编码',
- dataIndex: 'orgCode'
+ dataIndex: 'orgCode',
},
{
title: '手机号',
@@ -143,11 +155,12 @@
title: '操作',
align: 'center',
dataIndex: 'action',
- scopedSlots: { customRender: 'action' }
+ scopedSlots: {customRender: 'action'}
}
]
export default {
name: 'DepartList',
+ mixins: [JeecgListMixin],
components: {
DepartModal
},
@@ -175,30 +188,40 @@
currSelected: {},
form: this.$form.createForm(this),
labelCol: {
- xs: { span: 24 },
- sm: { span: 5 }
+ xs: {span: 24},
+ sm: {span: 5}
},
wrapperCol: {
- xs: { span: 24 },
- sm: { span: 16 }
+ xs: {span: 24},
+ sm: {span: 16}
},
graphDatasource: {
nodes: [],
edges: []
},
validatorRules: {
- departName: { rules: [{ required: true, message: '请输入机构/部门名称!' }] },
- orgCode: { rules: [{ required: true, message: '请输入机构编码!' }] },
- mobile: { rules: [{ validator: this.validateMobile }] }
+ departName: {rules: [{required: true, message: '请输入机构/部门名称!'}]},
+ orgCode: {rules: [{required: true, message: '请输入机构编码!'}]},
+ mobile: {rules: [{validator: this.validateMobile}]}
},
url: {
delete: '/sysdepart/sysDepart/delete',
edit: '/sysdepart/sysDepart/edit',
- deleteBatch: '/sysdepart/sysDepart/deleteBatch'
- }
+ deleteBatch: '/sysdepart/sysDepart/deleteBatch',
+ exportXlsUrl: "sysdepart/sysDepart/exportXls",
+ importExcelUrl: "sysdepart/sysDepart/importExcel",
+ },
+ }
+ },
+ computed: {
+ importExcelUrl: function () {
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
}
},
methods: {
+ loadData() {
+ this.refresh();
+ },
loadTree() {
var that = this
that.treeData = []
@@ -257,7 +280,7 @@
addRootNode() {
this.$refs.nodeModal.add(this.currFlowId, '')
},
- batchDel: function() {
+ batchDel: function () {
console.log(this.checkedKeys)
if (this.checkedKeys.length <= 0) {
this.$message.warning('请选择一条记录！')
@@ -270,8 +293,8 @@
this.$confirm({
title: '确认删除',
content: '确定要删除所选中的 ' + this.checkedKeys.length + ' 条数据?',
- onOk: function() {
- deleteAction(that.url.deleteBatch, { ids: ids }).then((res) => {
+ onOk: function () {
+ deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
if (res.success) {
that.$message.success(res.message)
that.loadTree()
@@ -287,7 +310,7 @@
onSearch(value) {
let that = this
if (value) {
- searchByKeywords({ keyWord: value }).then((res) => {
+ searchByKeywords({keyWord: value}).then((res) => {
if (res.success) {
that.departTree = []
for (let i = 0; i < res.result.length; i++) {
@@ -332,8 +355,8 @@
},
// 触发onSelect事件时,为部门树右侧的form表单赋值
setValuesToForm(record) {
- this.form.getFieldDecorator('fax', { initialValue: '' })
- this.form.setFieldsValue(pick(record, 'departName', 'departOrder', 'mobile', 'fax', 'address', 'memo'))
+ this.form.getFieldDecorator('fax', {initialValue: ''})
+ this.form.setFieldsValue(pick(record, 'departName', 'orgCode', 'departOrder', 'mobile', 'fax', 'address', 'memo'))
},
getCurrSelectedTitle() {
return !this.currSelected.title ? '' : this.currSelected.title
@@ -368,6 +391,8 @@
if (res.success) {
this.$message.success('保存成功!')
this.loadTree()
+ } else {
+ this.$message.error(res.message)
}
})
}
@@ -404,7 +429,7 @@
}
},
handleDelete() {
- deleteByDepartId({ id: this.rightClickSelectedKey }).then((resp) => {
+ deleteByDepartId({id: this.rightClickSelectedKey}).then((resp) => {
if (resp.success) {
this.$message.success('删除成功!')
this.loadTree()
@@ -415,7 +440,7 @@
},
selectDirectiveOk(record) {
console.log('选中指令数据', record)
- this.nodeSettingForm.setFieldsValue({ directiveCode: record.directiveCode })
+ this.nodeSettingForm.setFieldsValue({directiveCode: record.directiveCode})
this.currSelected.sysCode = record.sysCode
},
getFlowGraphData(node) {
@@ -433,17 +458,21 @@
this.getFlowGraphData(temp)
}
}
- }
+ },
},
created() {
this.currFlowId = this.$route.params.id
this.currFlowName = this.$route.params.name
- this.loadTree()
- }
+ // this.loadTree()
+ },
}
</script>
<style scoped>
+ .ant-card-body .table-operator {
+ margin: 15px;
+ }
+
.anty-form-btn {
width: 100%;
text-align: center;
@@ -453,10 +482,6 @@
margin: 0 5px;
}
- .anty-node-layout .ant-layout-content {
- margin: 0 !important;
- }
-
.anty-node-layout .ant-layout-header {
padding-right: 0
}
diff --git a/ant-design-jeecg-vue/src/views/system/DepartList2.vue b/ant-design-jeecg-vue/src/views/system/DepartList2.vue
index 7ccebf7..5a04716 100644
--- a/ant-design-jeecg-vue/src/views/system/DepartList2.vue
+++ b/ant-design-jeecg-vue/src/views/system/DepartList2.vue
@@ -2,17 +2,22 @@
<a-card :bordered="false">
<!-- 查询区域 -->
- <!--
--->
+ <!--
+ -->
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
- <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+ <a-menu-item key="1" @click="batchDel">
+ <a-icon type="delete"/>
+ 删除
+ </a-menu-item>
</a-menu>
- <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+ <a-button style="margin-left: 8px"> 批量操作
+ <a-icon type="down"/>
+ </a-button>
</a-dropdown>
</div>
@@ -37,9 +42,9 @@
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
- <a-divider type="vertical" />
+ <a-divider type="vertical"/>
<a-dropdown>
- <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+ <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
<a-menu slot="overlay">
<a-menu-item>
<a href="javascript:;" @click="handleDetail(record)">详情</a>
@@ -64,85 +69,85 @@
<script>
import SysDepartModal from './modules/DepartModal'
-/* import { filterObj } from '@/utils/util'
- , queryByFactories*/
- import { queryDepartTreeList} from '@/api/api'
- import { deleteAction } from '@/api/manage'
+ /* import { filterObj } from '@/utils/util'
+ , queryByFactories*/
+ import {queryDepartTreeList} from '@/api/api'
+ import {deleteAction} from '@/api/manage'
- // 表头
- const columns = [
- {
- title: '机构名称',
- dataIndex: 'departName',
- },
- {
- title: '机构类型',
- align:"center",
- dataIndex: 'orgType'
- },
- {
- title: '机构编码',
- dataIndex: 'orgCode'
- },
- {
- title: '手机号',
- dataIndex: 'mobile'
- },
- {
- title: '传真',
- dataIndex: 'fax'
- },
- {
- title: '地址',
- dataIndex: 'address'
- },
- {
- title:'排序',
- align:'center',
- dataIndex:'departOrder'
- },
- {
- title: '操作',
- align:"center",
- dataIndex: 'action',
- scopedSlots: { customRender: 'action' },
- }
- ];
+ // 表头
+ const columns = [
+ {
+ title: '机构名称',
+ dataIndex: 'departName',
+ },
+ {
+ title: '机构类型',
+ align: "center",
+ dataIndex: 'orgType'
+ },
+ {
+ title: '机构编码',
+ dataIndex: 'orgCode'
+ },
+ {
+ title: '手机号',
+ dataIndex: 'mobile'
+ },
+ {
+ title: '传真',
+ dataIndex: 'fax'
+ },
+ {
+ title: '地址',
+ dataIndex: 'address'
+ },
+ {
+ title: '排序',
+ align: 'center',
+ dataIndex: 'departOrder'
+ },
+ {
+ title: '操作',
+ align: "center",
+ dataIndex: 'action',
+ scopedSlots: {customRender: 'action'},
+ }
+ ];
export default {
name: "DepartList2",
components: {
SysDepartModal
},
- data () {
- return {
- description: 'jeecg 生成SysDepart代码管理页面',
- // 查询条件
- queryParam: {},
+ data() {
+ return {
+ description: 'jeecg 生成SysDepart代码管理页面',
+ // 查询条件
+ queryParam: {},
//数据集
- factories:'',
- dataSource:[],
- columns:columns,
+ factories: '',
+ dataSource: [],
+ columns: columns,
// 分页参数
-/* ipagination:{
- current: 1,
- pageSize: 5,
- pageSizeOptions: ['5', '10', '20'],
- showTotal: (total, range) => {
- return range[0] + "-" + range[1] + " 共" + total + "条"
- },
- showQuickJumper: true,
- showSizeChanger: true,
- total: 0
- },*/
- isorter:{
+ /* ipagination:{
+ current: 1,
+ pageSize: 5,
+ pageSizeOptions: ['5', '10', '20'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 共" + total + "条"
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },*/
+ isorter: {
column: 'createTime',
order: 'desc',
},
- loading:false,
+ loading: false,
selectedRowKeys: [],
selectedRows: [],
- url: {
+ url: {
list: "/sysdepart/sysDepart/list",
delete: "/sysdepart/sysDepart/delete",
deleteBatch: "/sysdepart/sysDepart/deleteBatch",
@@ -154,69 +159,69 @@
this.loadData();
},
methods: {
- loadData (){
+ loadData() {
this.dataSource = [];
- queryDepartTreeList().then((res)=>{
- if(res.success){
- this.dataSource = res.result;
- }
- })
+ queryDepartTreeList().then((res) => {
+ if (res.success) {
+ this.dataSource = res.result;
+ }
+ })
},
- getQueryField(){
+ getQueryField() {
//TODO 字段权限控制
var str = "id,";
- for(var a = 0;a<this.columns.length;a++){
- str+=","+this.columns[a].dataIndex;
+ for (var a = 0; a < this.columns.length; a++) {
+ str += "," + this.columns[a].dataIndex;
}
return str;
},
- onSelectChange (selectedRowKeys,selectionRows) {
+ onSelectChange(selectedRowKeys, selectionRows) {
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
},
- onClearSelected(){
+ onClearSelected() {
this.selectedRowKeys = [];
this.selectionRows = [];
},
//TODO getQueryParams
- handleDelete:function(id){
+ handleDelete: function (id) {
var that = this;
- deleteAction(that.url.delete,{id: id}).then((res)=>{
- if(res.success){
+ deleteAction(that.url.delete, {id: id}).then((res) => {
+ if (res.success) {
that.$message.success(res.message);
that.loadData();
- }else{
+ } else {
that.$message.warning(res.message);
}
});
},
- handleDetail(record){
+ handleDetail(record) {
this.$refs.sysDepartModal.edit(record);
- this.$refs.sysDepartModal.title="详情";
+ this.$refs.sysDepartModal.title = "详情";
this.$refs.sysDepartModal.disableSubmit = true;
},
- batchDel: function(){
- if(this.selectedRowKeys.length<=0){
+ batchDel: function () {
+ if (this.selectedRowKeys.length <= 0) {
this.$message.warning('请选择一条记录！');
- return ;
- }else{
+ return;
+ } else {
var ids = "";
- for(var a =0;a<this.selectedRowKeys.length;a++){
- ids+=this.selectedRowKeys[a]+",";
+ for (var a = 0; a < this.selectedRowKeys.length; a++) {
+ ids += this.selectedRowKeys[a] + ",";
}
var that = this;
this.$confirm({
- title:"确认删除",
- content:"是否删除选中数据?",
- onOk: function(){
- deleteAction(that.url.deleteBatch,{ids: ids}).then((res)=>{
- if(res.success){
+ title: "确认删除",
+ content: "是否删除选中数据?",
+ onOk: function () {
+ deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
+ if (res.success) {
that.$message.success(res.message);
that.loadData();
that.onClearSelected();
- }else{
+ } else {
that.$message.warning(res.message);
}
});
@@ -224,26 +229,26 @@
});
}
},
- handleEdit:function(record){
+ handleEdit: function (record) {
this.$refs.sysDepartModal.edit(record);
- this.$refs.sysDepartModal.title="编辑";
+ this.$refs.sysDepartModal.title = "编辑";
},
- handleAdd(){
+ handleAdd() {
this.$refs.sysDepartModal.add();
- this.$refs.sysDepartModal.title="新增";
+ this.$refs.sysDepartModal.title = "新增";
},
- handleTableChange(pagination, filters, sorter){
+ handleTableChange(pagination, filters, sorter) {
//分页、排序、筛选变化时触发
console.log(sorter);
//TODO 筛选
- if (Object.keys(sorter).length>0){
+ if (Object.keys(sorter).length > 0) {
this.isorter.column = sorter.field;
- this.isorter.order = "ascend"==sorter.order?"asc":"desc"
+ this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
}
/*this.ipagination = pagination;*/
this.loadData();
},
- modalFormOk () {
+ modalFormOk() {
// 新增/修改 成功时，重载列表
this.loadData();
}
@@ -251,17 +256,5 @@
}
</script>
<style scoped>
- .ant-card-body .table-operator{
- margin-bottom: 18px;
- }
- .ant-table-tbody .ant-table-row td{
- padding-top:15px;
- padding-bottom:15px;
- }
- .anty-row-operator button{margin: 0 5px}
- .ant-btn-danger{background-color: #ffffff}
-
- .ant-modal-cust-warp{height: 100%}
- .ant-modal-cust-warp .ant-modal-body{height:calc(100% - 110px) !important;overflow-y: auto}
- .ant-modal-cust-warp .ant-modal-content{height:90% !important;overflow-y: hidden}
+ @import '~@assets/less/common.less'
</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/system/DepartUserList.vue b/ant-design-jeecg-vue/src/views/system/DepartUserList.vue
new file mode 100644
index 0000000..7b7c79f
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/system/DepartUserList.vue
@@ -0,0 +1,194 @@
+<template>
+ <a-row :gutter="10">
+ <a-col :md="8" :sm="24">
+ <a-card :bordered="false">
+ <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
+ <a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入部门名称"/>
+ <!-- 树-->
+
+ <template>
+
+ <!--组织机构-->
+ <a-directory-tree
+ selectable
+ :selectedKeys="selectedKeys"
+ :checkStrictly="true"
+ @select="onSelect"
+ :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
+ :treeData="departTree"
+ />
+
+ </template>
+
+ </div>
+ </a-card>
+ </a-col>
+ <a-col :md="16" :sm="24">
+ <a-card :bordered="false">
+ <a-tabs defaultActiveKey="2" @change="callback">
+ <a-tab-pane tab="基本信息" key="1" forceRender>
+ <Dept-Base-Info ref="DeptBaseInfo"></Dept-Base-Info>
+ </a-tab-pane>
+ <a-tab-pane tab="用户信息" key="2">
+ <Dept-User-Info ref="DeptUserInfo"></Dept-User-Info>
+ </a-tab-pane>
+ </a-tabs>
+ </a-card>
+ </a-col>
+ </a-row>
+</template>
+<script>
+ import DeptBaseInfo from './modules/DeptBaseInfo'
+ import DeptUserInfo from './modules/DeptUserInfo'
+ import {queryDepartTreeList, searchByKeywords} from '@/api/api'
+ import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+
+ export default {
+ name: 'DepartUserList',
+ mixins: [JeecgListMixin],
+ components: {
+ DeptBaseInfo,
+ DeptUserInfo,
+ },
+ data() {
+ return {
+ currentDeptId: '',
+ iExpandedKeys: [],
+ loading: false,
+ autoExpandParent: true,
+ currFlowId: '',
+ currFlowName: '',
+ disable: true,
+ treeData: [],
+ visible: false,
+ departTree: [],
+ rightClickSelectedKey: '',
+ hiding: true,
+ model: {},
+ dropTrigger: '',
+ depart: {},
+ disableSubmit: false,
+ checkedKeys: [],
+ selectedKeys: [],
+ autoIncr: 1,
+ currSelected: {},
+ form: this.$form.createForm(this),
+ labelCol: {
+ xs: {span: 24},
+ sm: {span: 5}
+ },
+ wrapperCol: {
+ xs: {span: 24},
+ sm: {span: 16}
+ },
+ graphDatasource: {
+ nodes: [],
+ edges: []
+ },
+ }
+ },
+ methods: {
+ callback(key) {
+ console.log(key)
+ },
+ loadData() {
+ this.refresh();
+ },
+ loadTree() {
+ var that = this
+ that.treeData = []
+ that.departTree = []
+ queryDepartTreeList().then((res) => {
+ if (res.success) {
+ for (let i = 0; i < res.result.length; i++) {
+ let temp = res.result[i]
+ that.treeData.push(temp)
+ that.departTree.push(temp)
+ that.setThisExpandedKeys(temp)
+ // console.log(temp.id)
+ }
+ this.loading = false
+ }
+ })
+ },
+ setThisExpandedKeys(node) {
+ if (node.children && node.children.length > 0) {
+ this.iExpandedKeys.push(node.key)
+ for (let a = 0; a < node.children.length; a++) {
+ this.setThisExpandedKeys(node.children[a])
+ }
+ }
+ },
+ refresh() {
+ this.loading = true
+ this.loadTree()
+ },
+
+ onExpand(expandedKeys) {
+ // console.log('onExpand', expandedKeys)
+ // if not set autoExpandParent to false, if children expanded, parent can not collapse.
+ // or, you can remove all expanded children keys.
+ this.iExpandedKeys = expandedKeys
+ this.autoExpandParent = false
+ },
+
+ onSearch(value) {
+ let that = this
+ if (value) {
+ searchByKeywords({keyWord: value}).then((res) => {
+ if (res.success) {
+ that.departTree = []
+ for (let i = 0; i < res.result.length; i++) {
+ let temp = res.result[i]
+ that.departTree.push(temp)
+ }
+ } else {
+ that.$message.warning(res.message)
+ }
+ })
+ } else {
+ that.loadTree()
+ }
+
+ },
+ onCheck(checkedKeys, e) {
+ let record = e.node.dataRef;
+ // console.log('onCheck', checkedKeys, e);
+ this.checkedKeys = [];
+ // if (e.checked === true) {
+ this.currentDeptId = record.id;
+ this.checkedKeys.push(record.id);
+
+ this.$refs.DeptBaseInfo.open(record);
+ this.$refs.DeptUserInfo.open(record);
+ // }
+ // else {
+ // this.checkedKeys = [];
+ // this.$refs.DeptBaseInfo.clearForm();
+ // this.$refs.DeptUserInfo.clearList();
+ // }
+
+ this.hiding = false;
+ // this.checkedKeys = checkedKeys.checked
+ },
+ onSelect(selectedKeys, e) {
+ if (this.selectedKeys[0] !== selectedKeys[0]) {
+ this.selectedKeys = [selectedKeys[0]];
+ }
+ let record = e.node.dataRef;
+ this.checkedKeys.push(record.id);
+ this.$refs.DeptBaseInfo.open(record);
+ this.$refs.DeptUserInfo.onClearSelected();
+ this.$refs.DeptUserInfo.open(record);
+ },
+ },
+ created() {
+ this.currFlowId = this.$route.params.id
+ this.currFlowName = this.$route.params.name
+ // this.loadTree()
+ },
+ }
+</script>
+<style scoped>
+ @import '~@assets/less/common.less'
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/system/DictList.vue b/ant-design-jeecg-vue/src/views/system/DictList.vue
index 66e7331..79c5081 100644
--- a/ant-design-jeecg-vue/src/views/system/DictList.vue
+++ b/ant-design-jeecg-vue/src/views/system/DictList.vue
@@ -22,18 +22,16 @@
</span>
</a-col>
</a-row>
- <a-row>
- <a-col :md="24" :sm="24">
- <a-button style="margin-bottom: 20px" @click="handleAdd" type="primary" icon="plus">添加</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls">导出</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl"
- @change="handleImportExcel">
- <a-button type="primary" icon="import">导入</a-button>
- </a-upload>
- </a-col>
- </a-row>
</a-form>
+ <div class="table-operator" style="border-top: 5px">
+ <a-button @click="handleAdd" type="primary" icon="plus">添加</a-button>
+ <a-button type="primary" icon="download" @click="handleExportXls('字典信息')">导出</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="import">导入</a-button>
+ </a-upload>
+ </div>
+
<a-table
ref="table"
rowKey="id"
@@ -43,16 +41,18 @@
:pagination="ipagination"
:loading="loading"
@change="handleTableChange">
- <span slot="action" slot-scope="text, record">
- <a @click="handleEdit(record)">
- <a-icon type="edit"/>
- 编辑
- </a>
- <a-divider type="vertical"/>
- <a @click="editDictItem(record)"><a-icon type="setting"/> 字典配置</a>
- <a-divider type="vertical"/>
- <a @click="handleDelete(record.id)">删除</a>
- </span>
+ <span slot="action" slot-scope="text, record">
+ <a @click="handleEdit(record)">
+ <a-icon type="edit"/>
+ 编辑
+ </a>
+ <a-divider type="vertical"/>
+ <a @click="editDictItem(record)"><a-icon type="setting"/> 字典配置</a>
+ <a-divider type="vertical"/>
+ <a-popconfirm title="确定删除吗?" @confirm="() =>handleDelete(record.id)">
+ <a>删除</a>
+ </a-popconfirm>
+ </span>
</a-table>
</div>
@@ -66,7 +66,6 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import DictModal from './modules/DictModal'
import DictItemList from './DictItemList'
- import {delDict} from '@/api/api'
export default {
name: "DictList",
@@ -145,25 +144,6 @@
param.pageSize = this.ipagination.pageSize;
return filterObj(param);
},
- //删除字典类型
- handleDel(record) {
- let that = this;
- that.$confirm({
- title: "确认删除",
- content: "您确定要删除 " + record.dictName + " 字典类型?",
- onOk: function () {
- delDict({id: record.id}).then((res) => {
- if (res.success) {
- that.$message.success(res.message);
- that.loadData();
- that.cancelDict();
- } else {
- that.$message.warning(res.message);
- }
- });
- },
- });
- },
//取消选择
cancelDict() {
this.dict = "";
@@ -189,18 +169,6 @@
},
}
</script>
-
<style scoped>
- /** Button按钮间距 */
- .ant-btn {
- margin-left: 3px
- }
-
- .table-operator {
- margin-bottom: 10px
- }
-
- .ant-tree li span.ant-tree-switcher, .ant-tree li span.ant-tree-iconEle {
- width: 0px
- }
+ @import '~@assets/less/common.less'
</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/system/LogList.vue b/ant-design-jeecg-vue/src/views/system/LogList.vue
index ca4423d..67a5757 100644
--- a/ant-design-jeecg-vue/src/views/system/LogList.vue
+++ b/ant-design-jeecg-vue/src/views/system/LogList.vue
@@ -194,14 +194,5 @@
}
</script>
<style scoped>
- .ant-card-body .table-operator{
- margin-bottom: 18px;
- }
- .ant-table-tbody .ant-table-row td{
- padding-top:15px;
- padding-bottom:15px;
- }
- .anty-row-operator button{margin: 0 5px}
- .ant-btn-danger{background-color: #ffffff}
- .ant-divider-horizontal{margin: 10px 0;}
+ @import '~@assets/less/common.less'
</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/system/PermissionDataRuleList.vue b/ant-design-jeecg-vue/src/views/system/PermissionDataRuleList.vue
index dd715d7..1d3bb4c 100644
--- a/ant-design-jeecg-vue/src/views/system/PermissionDataRuleList.vue
+++ b/ant-design-jeecg-vue/src/views/system/PermissionDataRuleList.vue
@@ -9,10 +9,10 @@
<!-- 抽屉内容的border -->
<div
:style="{
- padding:'10px',
- border: '1px solid #e9e9e9',
- background: '#fff',
- }">
+ padding:'10px',
+ border: '1px solid #e9e9e9',
+ background: '#fff',
+ }">
<div class="table-page-search-wrapper">
<a-form>
<a-row :gutter="12">
@@ -27,10 +27,10 @@
</a-form-item>
</a-col>
<a-col :md="7" :sm="8">
- <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
- <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
- </span>
+ <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+ <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+ </span>
</a-col>
</a-row>
<a-row>
@@ -46,14 +46,15 @@
size="middle"
:columns="columns"
:dataSource="dataSource"
- :loading="loading">
+ :loading="loading"
+ :rowClassName="getRowClassname">
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">
<a-icon type="edit"/>编辑
</a>
<a-divider type="vertical"/>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
- <a>删除</a>
+ <a>删除</a>
</a-popconfirm>
</span>
</a-table>
@@ -167,10 +168,18 @@
this.drawerWidth = 650
}
},
+ getRowClassname(record){
+ if(record.status!=1){
+ return "data-rule-invalid"
+ }
+ }
}
}
</script>
-<style scoped>
-
+<style>
+ .data-rule-invalid{
+ background: #f4f4f4;
+ color: #bababa;
+ }
</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/system/PermissionList.vue b/ant-design-jeecg-vue/src/views/system/PermissionList.vue
index 1c0eb07..bdfd794 100644
--- a/ant-design-jeecg-vue/src/views/system/PermissionList.vue
+++ b/ant-design-jeecg-vue/src/views/system/PermissionList.vue
@@ -6,7 +6,6 @@
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button
@click="batchDel"
- style="margin-left:8px"
v-if="selectedRowKeys.length > 0"
ghost
type="primary"
@@ -57,11 +56,11 @@
</a-dropdown>
</span>
<!-- 字符串超长截取省略号显示 -->
- <span slot="url" slot-scope="text, record">
+ <span slot="url" slot-scope="text">
<j-ellipsis :value="text" :length="25"/>
</span>
<!-- 字符串超长截取省略号显示-->
- <span slot="component" slot-scope="text, record">
+ <span slot="component" slot-scope="text">
<j-ellipsis :value="text"/>
</span>
</a-table>
@@ -176,5 +175,5 @@
}
</script>
<style scoped>
- @import '../../assets/less/common.css';
+ @import '~@assets/less/common.less'
</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/system/QuartzJobList.vue b/ant-design-jeecg-vue/src/views/system/QuartzJobList.vue
index fcc5c3c..b957172 100644
--- a/ant-design-jeecg-vue/src/views/system/QuartzJobList.vue
+++ b/ant-design-jeecg-vue/src/views/system/QuartzJobList.vue
@@ -35,9 +35,8 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls">导出</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl"
- @change="handleImportExcel">
+ <a-button type="primary" icon="download" @click="handleExportXls('定时任务信息')">导出</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0">
@@ -92,7 +91,7 @@
</span>
<!-- 状态渲染模板 -->
- <template slot="customRenderStatus" slot-scope="status, record">
+ <template slot="customRenderStatus" slot-scope="status">
<a-tag v-if="status==0" color="green">已启动</a-tag>
<a-tag v-if="status==-1" color="orange">已暂停</a-tag>
</template>
@@ -107,7 +106,7 @@
<script>
import QuartzJobModal from './modules/QuartzJobModal'
- import { postAction } from '@/api/manage'
+ import { getAction } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JEllipsis from "@/components/jeecg/JEllipsis";
@@ -219,7 +218,7 @@
title:"确认暂停",
content:"是否暂停选中任务?",
onOk: function(){
- postAction(that.url.pause,record).then((res)=>{
+ getAction(that.url.pause,{jobClassName:record.jobClassName}).then((res)=>{
if(res.success){
that.$message.success(res.message);
that.loadData();
@@ -239,7 +238,7 @@
title:"确认启动",
content:"是否启动选中任务?",
onOk: function(){
- postAction(that.url.resume,record).then((res)=>{
+ getAction(that.url.resume,{jobClassName:record.jobClassName}).then((res)=>{
if(res.success){
that.$message.success(res.message);
that.loadData();
@@ -255,22 +254,5 @@
}
</script>
<style scoped>
- /** Button按钮间距 */
- .ant-btn {
- margin-left: 3px
- }
-
- .ant-card-body .table-operator {
- margin-bottom: 18px;
- }
- .ant-table-tbody .ant-table-row td{
- padding-top:10px;
- padding-bottom:10px;
- }
- .anty-row-operator button{margin: 0 5px}
- .ant-btn-danger{background-color: #ffffff}
-
- .ant-modal-cust-warp{height: 100%}
- .ant-modal-cust-warp .ant-modal-body{height:calc(100% - 110px) !important;overflow-y: auto}
- .ant-modal-cust-warp .ant-modal-content{height:90% !important;overflow-y: hidden}
+ @import '~@assets/less/common.less'
</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/system/RoleList.vue b/ant-design-jeecg-vue/src/views/system/RoleList.vue
index e9fe668..8f446dc 100644
--- a/ant-design-jeecg-vue/src/views/system/RoleList.vue
+++ b/ant-design-jeecg-vue/src/views/system/RoleList.vue
@@ -11,9 +11,11 @@
<a-input placeholder="请输入名称查询" v-model="queryParam.roleName"></a-input>
</a-form-item>
</a-col>
- <a-col :md="6" :sm="8">
+ <a-col :md="10" :sm="12">
<a-form-item label="创建时间" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
- <a-range-picker @change="onChangeDate" v-model="queryParam.createTimeIsRange"/>
+ <j-date v-model="queryParam.createTime_begin" :showTime="true" date-format="YYYY-MM-DD HH:mm:ss" style="width:45%" placeholder="请选择开始时间" ></j-date>
+ <span style="width: 10px;">~</span>
+ <j-date v-model="queryParam.createTime_end" :showTime="true" date-format="YYYY-MM-DD HH:mm:ss" style="width:45%" placeholder="请选择结束时间"></j-date>
</a-form-item>
</a-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -29,8 +31,8 @@
<!-- 操作按钮区域 -->
<div class="table-operator" style="margin-top: 5px">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls">导出</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
@@ -99,20 +101,22 @@
import RoleModal from './modules/RoleModal'
import UserRoleModal from './modules/UserRoleModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import JDate from '@/components/jeecg/JDate'
export default {
name: "RoleList",
mixins:[JeecgListMixin],
components: {
RoleModal,
- UserRoleModal
+ UserRoleModal,
+ JDate
},
data () {
return {
description: '角色管理页面',
// 查询条件
- queryParam: {roleName:'',createTimeIsRange:[]},
+ queryParam: {roleName:'',},
// 表头
columns: [
{
@@ -163,7 +167,7 @@
list: "/sys/role/list",
delete: "/sys/role/delete",
deleteBatch: "/sys/role/deleteBatch",
- exportXlsUrl: "sys/role/exportXls",
+ exportXlsUrl: "/sys/role/exportXls",
importExcelUrl: "sys/role/importExcel",
},
}
@@ -185,21 +189,5 @@
}
</script>
<style scoped>
- /** Button按钮间距 */
- .ant-btn {
- margin-left: 3px
- }
- .ant-card-body .table-operator{
- margin-bottom: 18px;
- }
- .ant-table-tbody .ant-table-row td{
- padding-top:15px;
- padding-bottom:15px;
- }
- .anty-row-operator button{margin: 0 5px}
- .ant-btn-danger{background-color: #ffffff}
-
- .ant-modal-cust-warp{height: 100%}
- .ant-modal-cust-warp .ant-modal-body{height:calc(100% - 110px) !important;overflow-y: auto}
- .ant-modal-cust-warp .ant-modal-content{height:90% !important;overflow-y: hidden}
+ @import '~@assets/less/common.less'
</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/system/RoleUserList.vue b/ant-design-jeecg-vue/src/views/system/RoleUserList.vue
new file mode 100644
index 0000000..15d6bae
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/system/RoleUserList.vue
@@ -0,0 +1,497 @@
+<template>
+ <a-row :gutter="10">
+ <a-col :md="leftColMd" :sm="24" style="margin-bottom: 20px">
+ <a-card :bordered="false">
+ <!-- 查询区域 -->
+ <div class="table-page-search-wrapper">
+ <!-- 搜索区域 -->
+ <a-form layout="inline">
+ <a-row :gutter="24">
+ <a-col :md="12" :sm="12">
+ <a-form-item label="角色名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+ <a-input placeholder="" v-model="queryParam.roleName"></a-input>
+ </a-form-item>
+ </a-col>
+ <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+ <a-col :md="12" :sm="24">
+ <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 21px">查询</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+ </a-col>
+ </span>
+ </a-row>
+ </a-form>
+ </div>
+ <!-- 操作按钮区域 -->
+ <div class="table-operator" style="margin: -8px 0 10px 2px">
+ <a-button @click="handleAdd" type="primary" icon="plus">角色录入</a-button>
+ <a-button @click="handleEdit(model1)" type="primary" icon="plus">角色编辑</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="import">导入</a-button>
+ </a-upload>
+ <a-button type="primary" icon="download" @click="handleExportXls">导出</a-button>
+ </div>
+
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <i class="anticon anticon-info-circle ant-alert-icon">
+ </i> 已选择 <a><b>{{ selectedRowKeys1.length }}</b></a>项
+ <a style="margin-left: 24px" @click="onClearSelected1">清空</a>
+ </div>
+
+ <div style="margin-top: 15px">
+ <a-table
+ style="height:500px"
+ ref="table"
+ size="middle"
+ bordered
+ rowKey="id"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ :rowSelection="{selectedRowKeys: selectedRowKeys1, onChange: onSelectChange1, type:'radio'}"
+ @change="handleTableChange">
+ <span slot="action" slot-scope="text, record">
+ <a @click="handleOpen(record)">用户</a>
+ <a-divider type="vertical"/>
+ <a-dropdown>
+ <a class="ant-dropdown-link">
+ 更多 <a-icon type="down"/>
+ </a>
+ <a-menu slot="overlay">
+ <a-menu-item>
+ <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete1(record.id)">
+ <a>删除</a>
+ </a-popconfirm>
+ </a-menu-item>
+ </a-menu>
+ </a-dropdown>
+ </span>
+ </a-table>
+ </div>
+ </a-card>
+ </a-col>
+ <a-col :md="rightColMd" :sm="24">
+ <a-card :bordered="false">
+ <!-- 查询区域 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline">
+ <a-row :gutter="24">
+
+ <a-col :md="12" :sm="12">
+ <a-form-item label="用户账号">
+ <a-input placeholder="" v-model="queryParam2.username"></a-input>
+ </a-form-item>
+ </a-col>
+ <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+ <a-col :md="9" :sm="24">
+ <a-button type="primary" @click="searchQuery2" icon="search" style="margin-left: 21px">查询</a-button>
+ <a-button type="primary" @click="searchReset2" icon="reload" style="margin-left: 8px">重置</a-button>
+
+ </a-col>
+ </span>
+ </a-row>
+ </a-form>
+ </div>
+ <!-- 操作按钮区域 -->
+ <div class="table-operator" :md="24" :sm="24" style="margin: -25px 0px 10px 2px">
+ <a-button @click="handleAdd2" type="primary" icon="plus" style="margin-top: 16px">用户录入</a-button>
+ <!--<a-button @click="handleEdit2" type="primary" icon="edit" style="margin-top: 16px">用户编辑</a-button>-->
+ <a-button @click="handleAddUserRole" type="primary" icon="plus" style="margin-top: 16px">添加已有用户</a-button>
+
+ <a-dropdown v-if="selectedRowKeys2.length > 0">
+ <a-menu slot="overlay">
+ <a-menu-item key="1" @click="batchDel2">
+ <a-icon type="delete"/>
+ 删除
+ </a-menu-item>
+ </a-menu>
+ <a-button style="margin-left: 8px"> 批量操作
+ <a-icon type="down"/>
+ </a-button>
+ </a-dropdown>
+ </div>
+ <!-- table区域-begin -->
+ <div>
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
+ selectedRowKeys2.length }}</a>项
+ <a style="margin-left: 24px" @click="onClearSelected2">清空</a>
+ </div>
+ <a-table
+ style="height:500px"
+ ref="table2"
+ bordered
+ size="middle"
+ rowKey="id"
+ :columns="columns2"
+ :dataSource="dataSource2"
+ :pagination="ipagination2"
+ :loading="loading2"
+ :rowSelection="{selectedRowKeys: selectedRowKeys2, onChange: onSelectChange2}"
+ @change="handleTableChange2">
+ <span slot="action" slot-scope="text, record">
+ <a @click="handleEdit2(record)">编辑</a>
+ <a-divider type="vertical"/>
+ <a-dropdown>
+ <a class="ant-dropdown-link">
+ 更多 <a-icon type="down"/>
+ </a>
+ <a-menu slot="overlay">
+ <a-menu-item>
+ <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete2(record.id)">
+ <a>删除</a>
+ </a-popconfirm>
+ </a-menu-item>
+ </a-menu>
+ </a-dropdown>
+ </span>
+ </a-table>
+ </div>
+ <!-- 表单区域 -->
+ <role-modal ref="modalForm" @ok="modalFormOk"></role-modal>
+ <user-modal ref="modalForm2" @ok="modalFormOk2"></user-modal>
+ <Select-User-Modal ref="selectUserModal" @selectFinished="selectOK"></Select-User-Modal>
+ </a-card>
+ </a-col>
+ </a-row>
+</template>
+<script>
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import { deleteAction, postAction, getAction } from '@/api/manage'
+ import SelectUserModal from './modules/SelectUserModal'
+ import RoleModal from './modules/RoleModal'
+ import UserModal from './modules/UserModal'
+ import { filterObj } from '@/utils/util'
+
+ export default {
+ name: 'RoleUserList',
+ mixins: [JeecgListMixin],
+ components: {
+ SelectUserModal,
+ RoleModal,
+ UserModal
+ },
+ data() {
+ return {
+ model1: {},
+ model2: {},
+ currentRoleId: '',
+ queryParam1: {},
+ queryParam2: {},
+ dataSource1: [],
+ dataSource2: [],
+ ipagination1: {
+ current: 1,
+ pageSize: 10,
+ pageSizeOptions: ['10', '20', '30'],
+ showTotal: (total, range) => {
+ return range[0] + '-' + range[1] + ' 共' + total + '条'
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
+ ipagination2: {
+ current: 1,
+ pageSize: 10,
+ pageSizeOptions: ['10', '20', '30'],
+ showTotal: (total, range) => {
+ return range[0] + '-' + range[1] + ' 共' + total + '条'
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
+ isorter1: {
+ column: 'createTime',
+ order: 'desc'
+ },
+ isorter2: {
+ column: 'createTime',
+ order: 'desc'
+ },
+ filters1: {},
+ filters2: {},
+ loading1: false,
+ loading2: false,
+ selectedRowKeys1: [],
+ selectedRowKeys2: [],
+ selectionRows1: [],
+ selectionRows2: [],
+ columns:
+ [
+ {
+ title: '角色编码',
+ align: 'center',
+ dataIndex: 'roleCode'
+ },
+ {
+ title: '角色名称',
+ align: 'center',
+ dataIndex: 'roleName'
+ },
+ {
+ title: '操作',
+ dataIndex: 'action',
+ align: 'center',
+ scopedSlots: { customRender: 'action' }
+ }
+ ],
+ columns2: [{
+ title: '用户账号',
+ align: 'center',
+ dataIndex: 'username',
+ width: 120
+ },
+ {
+ title: '用户名称',
+ align: 'center',
+ width: 100,
+ dataIndex: 'realname'
+ },
+ {
+ title: '状态',
+ align: 'center',
+ width: 80,
+ dataIndex: 'status_dictText'
+ },
+
+ {
+ title: '操作',
+ dataIndex: 'action',
+ scopedSlots: { customRender: 'action' },
+ align: 'center',
+ width: 120
+ }],
+
+
+ url: {
+ list: '/sys/role/list',
+ delete: '/sys/role/delete',
+ list2: '/sys/user/userRoleList',
+ addUserRole: '/sys/user/addSysUserRole',
+ delete2: '/sys/user/deleteUserRole',
+ deleteBatch2: '/sys/user/deleteUserRoleBatch',
+ exportXlsUrl: 'sys/role/exportXls',
+ importExcelUrl: 'sys/role/importExcel'
+ }
+ }
+ },
+ computed: {
+ importExcelUrl: function() {
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+ },
+ leftColMd() {
+ return this.selectedRowKeys1.length === 0 ? 24 : 12
+ },
+ rightColMd() {
+ return this.selectedRowKeys1.length === 0 ? 0 : 12
+ }
+ },
+ methods: {
+ onSelectChange2(selectedRowKeys, selectionRows) {
+ this.selectedRowKeys2 = selectedRowKeys
+ this.selectionRows2 = selectionRows
+ },
+ onClearSelected2() {
+ this.selectedRowKeys2 = []
+ this.selectionRows2 = []
+ },
+ onClearSelected1() {
+ this.selectedRowKeys1 = []
+ this.selectionRows1 = []
+ },
+ onSelectChange1(selectedRowKeys, selectionRows) {
+ this.selectedRowKeys1 = selectedRowKeys
+ this.selectionRows1 = selectionRows
+ this.model1 = Object.assign({}, selectionRows[0])
+ console.log(this.model1)
+ this.currentRoleId = selectedRowKeys[0]
+ this.loadData2()
+ },
+ onClearSelected() {
+ },
+
+ getQueryParams2() {
+ //获取查询条件
+ let sqp = {}
+ if (this.superQueryParams2) {
+ sqp['superQueryParams'] = encodeURI(this.superQueryParams2)
+ }
+ var param = Object.assign(sqp, this.queryParam2, this.isorter2, this.filters2)
+ param.field = this.getQueryField2()
+ param.pageNo = this.ipagination2.current
+ param.pageSize = this.ipagination2.pageSize
+ return filterObj(param)
+ },
+ getQueryField2() {
+ //TODO 字段权限控制
+ var str = 'id,'
+ this.columns2.forEach(function(value) {
+ str += ',' + value.dataIndex
+ })
+ return str
+ },
+ handleEdit2: function(record) {
+ this.$refs.modalForm2.edit(record)
+ this.$refs.modalForm2.title = '编辑'
+ },
+ handleAdd2: function() {
+ if (this.currentRoleId == '') {
+ this.$message.error('请选择一个角色!')
+ } else {
+ this.$refs.modalForm2.roleDisabled = true
+ this.$refs.modalForm2.roleId = this.currentRoleId
+
+ this.$refs.modalForm2.add()
+
+ this.$refs.modalForm2.title = '新增'
+ }
+ },
+ modalFormOk2() {
+ // 新增/修改 成功时，重载列表
+ this.loadData2()
+ },
+ loadData2(arg) {
+ if (!this.url.list2) {
+ this.$message.error('请设置url.list2属性!')
+ return
+ }
+ //加载数据 若传入参数1则加载第一页的内容
+ if (arg === 1) {
+ this.ipagination2.current = 1
+ }
+ if (this.currentRoleId === '') return
+ let params = this.getQueryParams2()//查询条件
+ params.roleId = this.currentRoleId
+ this.loading2 = true
+ getAction(this.url.list2, params).then((res) => {
+ if (res.success) {
+ this.dataSource2 = res.result.records
+ this.ipagination2.total = res.result.total
+
+ }
+ this.loading2 = false
+ })
+
+ },
+ handleDelete1: function(id) {
+ this.handleDelete(id)
+ this.dataSource2 = []
+ this.currentRoleId = ''
+ },
+ handleDelete2: function(id) {
+ if (!this.url.delete2) {
+ this.$message.error('请设置url.delete2属性!')
+ return
+ }
+ var that = this
+ deleteAction(that.url.delete2, { roleId: this.currentRoleId, userId: id }).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message)
+ that.loadData2()
+ } else {
+ that.$message.warning(res.message)
+ }
+ })
+ },
+ batchDel2: function() {
+
+ if (!this.url.deleteBatch2) {
+ this.$message.error('请设置url.deleteBatch2属性!')
+ return
+ }
+ if (this.selectedRowKeys2.length <= 0) {
+ this.$message.warning('请选择一条记录！')
+ return
+ } else {
+ var ids = ''
+ for (var a = 0; a < this.selectedRowKeys2.length; a++) {
+ ids += this.selectedRowKeys2[a] + ','
+ }
+ var that = this
+ console.log(this.currentDeptId)
+ this.$confirm({
+ title: '确认删除',
+ content: '是否删除选中数据?',
+ onOk: function() {
+ deleteAction(that.url.deleteBatch2, { roleId: that.currentRoleId, userIds: ids }).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message)
+ that.loadData2()
+ that.onClearSelected()
+ } else {
+ that.$message.warning(res.message)
+ }
+ })
+ }
+ })
+ }
+ },
+ selectOK(data) {
+ let params = {}
+ params.roleId = this.currentRoleId
+ params.userIdList = []
+ for (var a = 0; a < data.length; a++) {
+ params.userIdList.push(data[a])
+ }
+ console.log(params)
+ postAction(this.url.addUserRole, params).then((res) => {
+ if (res.success) {
+ this.loadData2()
+ this.$message.success(res.message)
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ },
+
+ handleAddUserRole() {
+ if (this.currentRoleId == '') {
+ this.$message.error('请选择一个角色!')
+ } else {
+ this.$refs.selectUserModal.visible = true
+ }
+ },
+ handleOpen(record) {
+ this.selectedRowKeys1 = [record.id]
+ this.model1 = Object.assign({}, record)
+ this.currentRoleId = record.id
+ this.onClearSelected2()
+ this.loadData2()
+ },
+
+ handleEdit: function(record) {
+ if (this.currentRoleId == '') {
+ this.$message.error('请选择一个角色!')
+ } else {
+ this.$refs.modalForm.edit(record)
+ this.$refs.modalForm.title = '编辑'
+ }
+ },
+ searchQuery2() {
+ this.loadData2(1)
+ },
+ searchReset2() {
+ this.queryParam2 = {}
+ this.loadData2(1)
+ },
+ handleTableChange2(pagination, filters, sorter) {
+ //分页、排序、筛选变化时触发
+ //TODO 筛选
+ if (Object.keys(sorter).length > 0) {
+ this.isorter2.column = sorter.field
+ this.isorter2.order = 'ascend' == sorter.order ? 'asc' : 'desc'
+ }
+ this.ipagination2 = pagination
+ this.loadData2()
+ }
+ }
+ }
+</script>
+<style scoped>
+ /** Button按钮间距 */
+ .ant-btn {
+ margin-left: 8px
+ }
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/system/SysAnnouncementList.vue b/ant-design-jeecg-vue/src/views/system/SysAnnouncementList.vue
index 681f6bf..2d01c68 100644
--- a/ant-design-jeecg-vue/src/views/system/SysAnnouncementList.vue
+++ b/ant-design-jeecg-vue/src/views/system/SysAnnouncementList.vue
@@ -11,11 +11,11 @@
<a-input placeholder="请输入标题" v-model="queryParam.titile"></a-input>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <!--<a-col :span="6">
<a-form-item label="内容">
<a-input placeholder="请输入内容" v-model="queryParam.msgContent"></a-input>
</a-form-item>
- </a-col>
+ </a-col>-->
<a-col :span="8">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -31,8 +31,8 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls">导出</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="download" @click="handleExportXls('系统通告')">导出</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0">
@@ -136,12 +136,21 @@
align: "center",
dataIndex: 'titile'
},
- /*{
- title: '内容',
- align:"center",
- dataIndex: 'msgContent'
- },*/
{
+ title: '消息类型',
+ align: "center",
+ dataIndex: 'msgCategory',
+ customRender: function (text) {
+ if (text == '1') {
+ return "通知公告";
+ } else if (text == "2") {
+ return "系统消息";
+ } else {
+ return text;
+ }
+ }
+ },
+ /*{
title: '开始时间',
align: "center",
dataIndex: 'startTime'
@@ -150,7 +159,7 @@
title: '结束时间',
align: "center",
dataIndex: 'endTime'
- },
+ },*/
{
title: '发布人',
align: "center",
@@ -173,7 +182,7 @@
}
},
{
- title: '通告对象类型',
+ title: '通告对象',
align: "center",
dataIndex: 'msgType',
customRender: function (text) {
@@ -270,38 +279,5 @@
}
</script>
<style scoped>
- /** Button按钮间距 */
- .ant-btn {
- margin-left: 3px
- }
- .ant-card-body .table-operator {
- margin-bottom: 18px;
- }
-
- .ant-table-tbody .ant-table-row td {
- padding-top: 15px;
- padding-bottom: 15px;
- }
-
- .anty-row-operator button {
- margin: 0 5px
- }
-
- .ant-btn-danger {
- background-color: #ffffff
- }
-
- .ant-modal-cust-warp {
- height: 100%
- }
-
- .ant-modal-cust-warp .ant-modal-body {
- height: calc(100% - 110px) !important;
- overflow-y: auto
- }
-
- .ant-modal-cust-warp .ant-modal-content {
- height: 90% !important;
- overflow-y: hidden
- }
+ @import '~@assets/less/common.less'
</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/system/UserAnnouncementList.vue b/ant-design-jeecg-vue/src/views/system/UserAnnouncementList.vue
new file mode 100644
index 0000000..0172865
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/system/UserAnnouncementList.vue
@@ -0,0 +1,180 @@
+<template>
+ <a-card :bordered="false">
+ <!-- 查询区域 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline">
+ <a-row :gutter="24">
+
+ <a-col :span="6">
+ <a-form-item label="标题">
+ <a-input placeholder="请输入标题" v-model="queryParam.titile"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-item label="发布人">
+ <a-input placeholder="请输入发布人" v-model="queryParam.sender"></a-input>
+ </a-form-item>
+ </a-col>
+
+ <a-col :span="8" >
+ <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+ <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+ </span>
+ </a-col>
+
+ </a-row>
+ </a-form>
+ </div>
+
+ <div class="table-operator">
+ <a-button type="primary" @click="readAll" icon="book">全部标注已读</a-button>
+ </div>
+
+ <a-table
+ ref="table"
+ size="default"
+ bordered
+ rowKey="id"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ @change="handleTableChange">
+ <span slot="action" slot-scope="text, record">
+ <a @click="showAnnouncement(record)">查看</a>
+ </span>
+ </a-table>
+ <show-announcement ref="ShowAnnouncement"></show-announcement>
+ </a-card>
+</template>
+
+<script>
+ import { filterObj } from '@/utils/util'
+ import { getAction,putAction } from '@/api/manage'
+ import ShowAnnouncement from '@/components/tools/ShowAnnouncement'
+ import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+
+ export default {
+ name: "UserAnnouncementList",
+ mixins: [JeecgListMixin],
+ components: {
+ ShowAnnouncement
+ },
+ data () {
+ return {
+ description: '系统通告表管理页面',
+ queryParam: {},
+ columns: [{
+ title: '标题',
+ align:"center",
+ dataIndex: 'titile'
+ },{
+ title: '消息类型',
+ align: "center",
+ dataIndex: 'msgCategory',
+ customRender: function (text) {
+ if (text == '1') {
+ return "通知公告";
+ } else if (text == "2") {
+ return "系统消息";
+ } else {
+ return text;
+ }
+ }
+ },{
+ title: '发布人',
+ align:"center",
+ dataIndex: 'sender'
+ },{
+ title: '发布时间',
+ align:"center",
+ dataIndex: 'sendTime'
+ },{
+ title: '优先级',
+ align:"center",
+ dataIndex: 'priority',
+ customRender:function (text) {
+ if(text=='L'){
+ return "低";
+ }else if(text=="M"){
+ return "中";
+ }else if(text=="H"){
+ return "高";
+ } else {
+ return text;
+ }
+ }
+ },{
+ title: '阅读状态',
+ align:"center",
+ dataIndex: 'readFlag',
+ customRender:function (text) {
+ if(text=='0'){
+ return "未读";
+ }else if(text=="1"){
+ return "已读";
+ } else {
+ return text;
+ }
+ }
+ },{
+ title: '操作',
+ dataIndex: 'action',
+ align:"center",
+ scopedSlots: { customRender: 'action' },
+ }],
+ url: {
+ list: "/system/sysAnnouncementSend/getMyAnnouncementSend",
+ editCementSend:"system/sysAnnouncementSend/editByAnntIdAndUserId",
+ readAllMsg:"system/sysAnnouncementSend/readAll",
+ },
+ loading:false,
+ }
+ },
+ created() {
+ this.loadData();
+ },
+ methods: {
+
+ handleDetail: function(record){
+ this.$refs.sysAnnouncementModal.detail(record);
+ this.$refs.sysAnnouncementModal.title="查看";
+ },
+ showAnnouncement(record){
+ putAction(this.url.editCementSend,{anntId:record.anntId}).then((res)=>{
+ if(res.success){
+ this.loadData();
+ }
+ });
+ this.$refs.ShowAnnouncement.detail(record);
+ },
+ readAll(){
+ var that = this;
+ that.$confirm({
+ title:"确认操作",
+ content:"是否全部标注已读?",
+ onOk: function(){
+ putAction(that.url.readAllMsg).then((res)=>{
+ if(res.success){
+ that.$message.success(res.message);
+ that.loadData();
+ }
+ });
+ }
+ });
+ },
+ }
+ }
+</script>
+<style scoped>
+ .ant-card-body .table-operator{
+ margin-bottom: 18px;
+ }
+ .anty-row-operator button{margin: 0 5px}
+ .ant-btn-danger{background-color: #ffffff}z
+
+ .ant-modal-cust-warp{height: 100%}
+ .ant-modal-cust-warp .ant-modal-body{height:calc(100% - 110px) !important;overflow-y: auto}
+ .ant-modal-cust-warp .ant-modal-content{height:90% !important;overflow-y: hidden}
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/system/UserList.vue b/ant-design-jeecg-vue/src/views/system/UserList.vue
index d26aef8..91f3898 100644
--- a/ant-design-jeecg-vue/src/views/system/UserList.vue
+++ b/ant-design-jeecg-vue/src/views/system/UserList.vue
@@ -66,8 +66,8 @@
<div class="table-operator" style="border-top: 5px">
<a-button @click="handleAdd" v-has="'user:add'" type="primary" icon="plus">添加用户</a-button>
<a-button @click="handleSyncUser" type="primary" icon="plus">重新同步流程用户</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls">导出</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="download" @click="handleExportXls('用户信息')">导出</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0">
@@ -113,14 +113,14 @@
<template slot="avatarslot" slot-scope="text, record, index">
<div class="anty-img-wrap">
- <img :src="getAvatarView(record.avatar)"/>
+ <a-avatar shape="square" :src="getAvatarView(record.avatar)" icon="user"/>
</div>
</template>
<span slot="action" slot-scope="text, record">
- <a @click="handleEdit(record)">编辑</a>
+ <a @click="handleEdit(record)" v-has="'user:edit'">编辑</a>
- <a-divider type="vertical"/>
+ <a-divider type="vertical" v-has="'user:edit'"/>
<a-dropdown>
<a class="ant-dropdown-link">
@@ -153,6 +153,10 @@
</a-popconfirm>
</a-menu-item>
+ <a-menu-item>
+ <a href="javascript:;" @click="handleAgentSettings(record.username)">代理人</a>
+ </a-menu-item>
+
</a-menu>
</a-dropdown>
</span>
@@ -166,6 +170,7 @@
<password-modal ref="passwordmodal" @ok="passwordModalOk"></password-modal>
+ <sys-user-agent-modal ref="sysUserAgentModal"></sys-user-agent-modal>
</a-card>
</template>
@@ -175,11 +180,13 @@
import {putAction} from '@/api/manage';
import {frozenBatch} from '@/api/api'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+ import SysUserAgentModal from "./modules/SysUserAgentModal";
export default {
name: "UserList",
mixins: [JeecgListMixin],
components: {
+ SysUserAgentModal,
UserModal,
PasswordModal
},
@@ -269,7 +276,7 @@
list: "/sys/user/list",
delete: "/sys/user/delete",
deleteBatch: "/sys/user/deleteBatch",
- exportXlsUrl: "sys/user/exportXls",
+ exportXlsUrl: "/sys/user/exportXls",
importExcelUrl: "sys/user/importExcel",
},
}
@@ -334,6 +341,10 @@
handleChangePassword(username) {
this.$refs.passwordmodal.show(username);
},
+ handleAgentSettings(username){
+ this.$refs.sysUserAgentModal.agentSettings(username);
+ this.$refs.sysUserAgentModal.title = "用户代理人设置";
+ },
handleSyncUser() {
var that = this;
putAction(that.url.syncUser, {}).then((res) => {
@@ -352,52 +363,5 @@
}
</script>
<style scoped>
- /** Button按钮间距 */
- .ant-btn {
- margin-left: 3px
- }
- .ant-card-body {
- margin-bottom: 18px;
- }
-
- .table-operator button {
- margin-bottom: 18px;
- margin-right: 5px;
- }
-
- .ant-table-tbody .ant-table-row td {
- padding-top: 15px;
- padding-bottom: 15px;
- }
-
- .anty-row-operator button {
- margin: 0 5px
- }
-
- .ant-btn-danger {
- background-color: #ffffff
- }
-
- .ant-modal-cust-warp {
- height: 100%
- }
-
- .ant-modal-cust-warp .ant-modal-body {
- height: calc(100% - 110px) !important;
- overflow-y: auto
- }
-
- .ant-modal-cust-warp .ant-modal-content {
- height: 90% !important;
- overflow-y: hidden
- }
-
- .anty-img-wrap {
- height: 25px;
- position: relative;
- }
-
- .anty-img-wrap > img {
- max-height: 100%;
- }
+ @import '~@assets/less/common.less'
</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/system/modules/DeptBaseInfo.vue b/ant-design-jeecg-vue/src/views/system/modules/DeptBaseInfo.vue
new file mode 100644
index 0000000..9bb5cb9
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/system/modules/DeptBaseInfo.vue
@@ -0,0 +1,113 @@
+<template>
+ <a-card :visible="visible">
+ <a-form :form="form">
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="机构名称">
+ <a-input style="border:0px;" placeholder="" v-decorator="['departName', {}]"/>
+ </a-form-item>
+ <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级部门">
+ <a-tree-select
+ disabled
+ style="width:100%;border: 0px;border: none;outline:none;"
+ :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
+ :treeData="treeData"
+ v-model="model.parentId"
+ placeholder="无">
+ </a-tree-select>
+ </a-form-item>
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="机构编码">
+ <a-input style="border:0px;" placeholder="" v-decorator="['orgCode', {}]"/>
+ </a-form-item>
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="排序">
+ <a-input-number style="border:0px;" v-decorator="[ 'departOrder',{}]"/>
+ </a-form-item>
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="手机号">
+ <a-input style="border:0px;" placeholder="" v-decorator="['mobile', {}]"/>
+ </a-form-item>
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="地址">
+ <a-input style="border:0px;" placeholder="" v-decorator="['address', {}]"/>
+ </a-form-item>
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="备注">
+ <a-textarea style="border:0px;" placeholder="" v-decorator="['memo', {}]"/>
+ </a-form-item>
+ </a-form>
+ </a-card>
+</template>
+<script>
+ import pick from 'lodash.pick'
+ import {queryIdTree} from '@/api/api'
+
+ export default {
+ name: 'DeptBaseInfo',
+ components: {},
+ data() {
+ return {
+ departTree: [],
+ id: '',
+ model: {},
+ visible: false,
+ disable: true,
+ treeData: [],
+ form: this.$form.createForm(this),
+ labelCol: {
+ xs: {span: 24},
+ sm: {span: 3}
+ },
+ wrapperCol: {
+ xs: {span: 24},
+ sm: {span: 16}
+ },
+ }
+ },
+ created() {
+ this.loadTreeData();
+ },
+ methods: {
+ loadTreeData() {
+ queryIdTree().then((res) => {
+ if (res.success) {
+ for (let i = 0; i < res.result.length; i++) {
+ let temp = res.result[i];
+ this.treeData.push(temp);
+ }
+ }
+
+ })
+ },
+ open(record) {
+ this.form.resetFields();
+ this.model = Object.assign({}, record);
+ this.visible = true;
+ console.log("record:");
+ console.log(record);
+ this.$nextTick(() => {
+ this.form.setFieldsValue(pick(record, 'departName', 'parentId', 'orgCode', 'departOrder', 'mobile', 'fax', 'address', 'memo'));
+ });
+ },
+ clearForm() {
+ this.form.resetFields();
+ this.treeData = [];
+ },
+ }
+ }
+</script>
+<style scoped>
+ @import '~@assets/less/common.less'
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/system/modules/DeptUserInfo.vue b/ant-design-jeecg-vue/src/views/system/modules/DeptUserInfo.vue
new file mode 100644
index 0000000..4599a49
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/system/modules/DeptUserInfo.vue
@@ -0,0 +1,285 @@
+<template>
+ <a-card :bordered="false">
+ <!-- 查询区域 -->
+ <div class="table-page-search-wrapper">
+ <!-- 搜索区域 -->
+ <a-form layout="inline">
+ <a-row :gutter="10">
+ <a-col :md="10" :sm="12">
+ <a-form-item label="用户账号" style="margin-left:8px">
+ <a-input placeholder="请输入名称查询" v-model="queryParam.username"></a-input>
+ </a-form-item>
+ </a-col>
+ <!--<a-col :md="8" :sm="8">-->
+ <!--<a-form-item label="用户名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">-->
+ <!--<a-input placeholder="请输入名称查询" v-model="queryParam.realname"></a-input>-->
+ <!--</a-form-item>-->
+ <!--</a-col>-->
+ <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+ <a-col :md="6" :sm="24">
+ <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 18px">查询</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+ </a-col>
+ </span>
+ </a-row>
+ </a-form>
+ </div>
+ <!-- 操作按钮区域 -->
+ <div class="table-operator" :md="24" :sm="24" style="margin: -46px 0px 10px 2px">
+ <a-button @click="handleAdd" type="primary" icon="plus" style="margin-top: 16px">用户录入</a-button>
+ <!--<a-button @click="handleEdit" type="primary" icon="edit" style="margin-top: 16px">用户编辑</a-button>-->
+ <a-button @click="handleAddUserDepart" type="primary" icon="plus">添加已有用户</a-button>
+
+ <a-dropdown v-if="selectedRowKeys.length > 0">
+ <a-menu slot="overlay">
+ <a-menu-item key="1" @click="batchDel">
+ <a-icon type="delete"/>
+ 删除关系
+ </a-menu-item>
+ </a-menu>
+ <a-button style="margin-left: 8px"> 批量操作
+ <a-icon type="down"/>
+ </a-button>
+ </a-dropdown>
+ </div>
+
+ <!-- table区域-begin -->
+ <div>
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
+ selectedRowKeys.length }}</a>项
+ <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+ </div>
+
+ <a-table
+ ref="table"
+ size="middle"
+ bordered
+ rowKey="id"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ @change="handleTableChange">
+
+
+
+ <span slot="action" slot-scope="text, record">
+ <a @click="handleEdit(record)">编辑</a>
+
+ <a-divider type="vertical"/>
+
+ <a-dropdown>
+ <a class="ant-dropdown-link">
+ 更多 <a-icon type="down"/>
+ </a>
+ <a-menu slot="overlay">
+ <a-menu-item>
+ <a href="javascript:;" @click="handleDetail(record)">详情</a>
+ </a-menu-item>
+
+ <a-menu-item>
+ <a-popconfirm title="确定要删除关系吗?" @confirm="() => handleDelete(record.id)">
+ <a>删除关系</a>
+ </a-popconfirm>
+ </a-menu-item>
+ </a-menu>
+ </a-dropdown>
+ </span>
+
+
+ </a-table>
+ </div>
+ <!-- table区域-end -->
+
+ <!-- 表单区域 -->
+ <user-modal ref="modalForm" @ok="modalFormOk"></user-modal>
+ <Select-User-Modal ref="selectUserModal" @selectFinished="selectOK"></Select-User-Modal>
+ </a-card>
+</template>
+
+<script>
+ import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+ import {getAction, postAction, deleteAction} from '@/api/manage'
+ import SelectUserModal from './SelectUserModal'
+ import UserModal from './UserModal'
+
+ export default {
+ name: "DeptUserInfo",
+ mixins: [JeecgListMixin],
+ components: {
+ SelectUserModal,
+ UserModal
+ },
+ data() {
+ return {
+ description: '用户信息',
+ currentDeptId: '',
+ // 表头
+ columns: [{
+ title: '用户账号',
+ align: "center",
+ dataIndex: 'username'
+ },
+ {
+ title: '用户名称',
+ align: "center",
+ dataIndex: 'realname'
+ },
+ {
+ title: '操作',
+ dataIndex: 'action',
+ scopedSlots: {customRender: 'action'},
+ align: "center",
+ width: 170
+ }],
+ url: {
+ list: "/sys/user/departUserList",
+ edit: "/sys/user/editSysDepartWithUser",
+ delete: "/sys/user/deleteUserInDepart",
+ deleteBatch: "/sys/user/deleteUserInDepartBatch",
+ }
+ }
+ },
+ created() {
+ },
+
+ methods: {
+
+ loadData(arg) {
+ if (!this.url.list) {
+ this.$message.error("请设置url.list属性!")
+ return
+ }
+ //加载数据 若传入参数1则加载第一页的内容
+ if (arg === 1) {
+ this.ipagination.current = 1;
+ }
+ if (this.currentDeptId === '') return;
+ var params = this.getQueryParams();//查询条件
+ params.depId = this.currentDeptId;
+ getAction(this.url.list, params).then((res) => {
+ if (res.success) {
+ this.dataSource = res.result.records;
+ this.ipagination.total = res.result.total;
+ }
+ })
+ },
+ batchDel: function () {
+
+ if (!this.url.deleteBatch) {
+ this.$message.error("请设置url.deleteBatch属性!")
+ return
+ }
+ if (this.selectedRowKeys.length <= 0) {
+ this.$message.warning('请选择一条记录！');
+ return;
+ } else {
+ var ids = "";
+ for (var a = 0; a < this.selectedRowKeys.length; a++) {
+ ids += this.selectedRowKeys[a] + ",";
+ }
+ var that = this;
+ console.log(this.currentDeptId);
+ this.$confirm({
+ title: "确认删除",
+ content: "是否删除选中数据?",
+ onOk: function () {
+ deleteAction(that.url.deleteBatch, {depId: that.currentDeptId, userIds: ids}).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message);
+ that.loadData();
+ that.onClearSelected();
+ } else {
+ that.$message.warning(res.message);
+ }
+ });
+ }
+ });
+ }
+ },
+ handleDelete: function (id) {
+ if (!this.url.delete) {
+ this.$message.error("请设置url.delete属性!")
+ return
+ }
+ var that = this;
+ deleteAction(that.url.delete, {depId: this.currentDeptId, userId: id}).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message);
+ that.loadData();
+ } else {
+ that.$message.warning(res.message);
+ }
+ });
+ },
+ open(record) {
+ //console.log(record);
+ this.currentDeptId = record.id;
+ this.loadData(1);
+ },
+ clearList() {
+ this.currentDeptId = '';
+ this.dataSource = [];
+ },
+ hasSelectDept() {
+ if (this.currentDeptId == null) {
+ this.$message.error("请选择一个部门!")
+ return false;
+ }
+ return true;
+ },
+ handleAddUserDepart() {
+ if (this.currentDeptId == '') {
+ this.$message.error("请选择一个部门!")
+ } else {
+ this.$refs.selectUserModal.visible = true;
+ }
+ },
+ handleAdd: function () {
+ if (this.currentDeptId == '') {
+ this.$message.error("请选择一个部门!")
+ } else {
+ this.$refs.modalForm.departDisabled = true;
+ this.$refs.modalForm.deptId = this.currentDeptId;
+ this.$refs.modalForm.add();
+ this.$refs.modalForm.title = "新增";
+ }
+ },
+ selectOK(data) {
+ let params = {};
+ params.depId = this.currentDeptId;
+ params.userIdList = [];
+ for (var a = 0; a < data.length; a++) {
+ params.userIdList.push(data[a]);
+ }
+ console.log(params);
+ postAction(this.url.edit, params).then((res) => {
+ if (res.success) {
+ this.$message.success(res.message);
+ this.loadData();
+ } else {
+ this.$message.warning(res.message);
+ }
+ })
+ }
+ }
+ }
+</script>
+<style scoped>
+ /** Button按钮间距 */
+ .ant-btn {
+ margin-left: 3px
+ }
+
+ .ant-card {
+ margin-left: -30px;
+ margin-right: -30px;
+ }
+
+ .table-page-search-wrapper {
+ margin-top: -16px;
+ margin-bottom: 16px;
+ }
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/system/modules/DictItemModal.vue b/ant-design-jeecg-vue/src/views/system/modules/DictItemModal.vue
index 6d40f64..eb654dc 100644
--- a/ant-design-jeecg-vue/src/views/system/modules/DictItemModal.vue
+++ b/ant-design-jeecg-vue/src/views/system/modules/DictItemModal.vue
@@ -55,7 +55,7 @@
<script>
import pick from 'lodash.pick'
- import {addDictItem, editDictItem, getDictItemList} from '@/api/api'
+ import {addDictItem, editDictItem} from '@/api/api'
export default {
name: "DictItemModal",
@@ -104,20 +104,6 @@
this.form.setFieldsValue(pick(this.model, 'itemText', 'itemValue', 'description', 'sortOrder'))
});
},
- // 将查询字典对象数据的方法拆分出来,需要的时候再加载
- getDictItemList() {
- // 查询字典数据
- var params = this.getQueryParams();//查询条件
- getDictItemList(params).then((res) => {
- if (res.success) {
- this.dataSource = res.result.records;
- console.log(this.dataSource)
- this.ipagination.total = res.result.total;
- this.loadrefresh = false;
- this.loading = false;
- }
- })
- },
onChose(checked) {
if (checked) {
this.status = 1;
@@ -134,6 +120,9 @@
this.form.validateFields((err, values) => {
if (!err) {
that.confirmLoading = true;
+ values.itemText = (values.itemText || '').trim()
+ values.itemValue = (values.itemValue || '').trim()
+ values.description = (values.description || '').trim()
let formData = Object.assign(this.model, values);
formData.status = this.status;
let obj;
diff --git a/ant-design-jeecg-vue/src/views/system/modules/DictModal.vue b/ant-design-jeecg-vue/src/views/system/modules/DictModal.vue
index 95e9e26..934b217 100644
--- a/ant-design-jeecg-vue/src/views/system/modules/DictModal.vue
+++ b/ant-design-jeecg-vue/src/views/system/modules/DictModal.vue
@@ -39,33 +39,33 @@
<script>
import pick from 'lodash.pick'
- import {addDict, editDict, duplicateCheck} from '@/api/api'
+ import { addDict, editDict, duplicateCheck } from '@/api/api'
export default {
- name: "DictModal",
+ name: 'DictModal',
data() {
return {
value: 1,
- title: "操作",
+ title: '操作',
visible: false,
model: {},
labelCol: {
- xs: {span: 24},
- sm: {span: 5},
+ xs: { span: 24 },
+ sm: { span: 5 }
},
wrapperCol: {
- xs: {span: 24},
- sm: {span: 16},
+ xs: { span: 24 },
+ sm: { span: 16 }
},
confirmLoading: false,
form: this.$form.createForm(this),
validatorRules: {
- dictName: {rules: [{required: true, message: '请输入字典名称!'}]},
+ dictName: { rules: [{ required: true, message: '请输入字典名称!' }] },
dictCode: {
- rules: [{required: true, message: '请输入字典编码!'},
- {validator: this.validateDictCode,}]
- },
- },
+ rules: [{ required: true, message: '请输入字典编码!' },
+ { validator: this.validateDictCode }]
+ }
+ }
}
},
created() {
@@ -74,76 +74,79 @@
validateDictCode(rule, value, callback) {
// 重复校验
var params = {
- tableName: "sys_dict",
- fieldName: "dict_code",
+ tableName: 'sys_dict',
+ fieldName: 'dict_code',
fieldVal: value,
- dataId: this.model.id,
- };
+ dataId: this.model.id
+ }
duplicateCheck(params).then((res) => {
if (res.success) {
- callback();
+ callback()
} else {
- callback(res.message);
+ callback(res.message)
}
- });
+ })
},
handleChange(value) {
- this.model.status = value;
+ this.model.status = value
},
add() {
- this.edit({});
+ this.edit({})
},
edit(record) {
if (record.id) {
- this.visiblekey = true;
+ this.visiblekey = true
} else {
- this.visiblekey = false;
+ this.visiblekey = false
}
- this.form.resetFields();
- this.model = Object.assign({}, record);
- this.visible = true;
+ this.form.resetFields()
+ this.model = Object.assign({}, record)
+ this.visible = true
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model, 'dictName', 'dictCode', 'description'))
- });
+ })
},
// 确定
handleOk() {
- const that = this;
+ const that = this
// 触发表单验证
this.form.validateFields((err, values) => {
if (!err) {
- that.confirmLoading = true;
- let formData = Object.assign(this.model, values);
- let obj;
+ that.confirmLoading = true
+ values.dictName = (values.dictName || '').trim()
+ values.dictCode = (values.dictCode || '').trim()
+ values.description = (values.description || '').trim()
+ let formData = Object.assign(this.model, values)
+ let obj
console.log(formData)
if (!this.model.id) {
- formData.delFlag = "1";
- obj = addDict(formData);
+ formData.delFlag = '1'
+ obj = addDict(formData)
} else {
- obj = editDict(formData);
+ obj = editDict(formData)
}
obj.then((res) => {
if (res.success) {
- that.$message.success(res.message);
- that.$emit('ok');
+ that.$message.success(res.message)
+ that.$emit('ok')
} else {
- that.$message.warning(res.message);
+ that.$message.warning(res.message)
}
}).finally(() => {
- that.confirmLoading = false;
- that.close();
+ that.confirmLoading = false
+ that.close()
})
}
})
},
// 关闭
handleCancel() {
- this.close();
+ this.close()
},
close() {
- this.$emit('close');
- this.visible = false;
- },
+ this.$emit('close')
+ this.visible = false
+ }
}
}
</script>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/system/modules/PasswordModal.vue b/ant-design-jeecg-vue/src/views/system/modules/PasswordModal.vue
index d419f94..1ed7981 100644
--- a/ant-design-jeecg-vue/src/views/system/modules/PasswordModal.vue
+++ b/ant-design-jeecg-vue/src/views/system/modules/PasswordModal.vue
@@ -113,6 +113,11 @@
},
validateToNextPassword (rule, value, callback) {
const form = this.form;
+ const confirmpassword=form.getFieldValue('confirmpassword');
+ console.log("confirmpassword==>",confirmpassword);
+ if (value && confirmpassword && value !== confirmpassword) {
+ callback('两次输入的密码不一样！');
+ }
if (value && this.confirmDirty) {
form.validateFields(['confirm'], { force: true })
}
@@ -130,7 +135,6 @@
const value = e.target.value
this.confirmDirty = this.confirmDirty || !!value
}
-
}
}
</script>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/system/modules/PermissionDataRuleModal.vue b/ant-design-jeecg-vue/src/views/system/modules/PermissionDataRuleModal.vue
index 6e79c4b..cd7921f 100644
--- a/ant-design-jeecg-vue/src/views/system/modules/PermissionDataRuleModal.vue
+++ b/ant-design-jeecg-vue/src/views/system/modules/PermissionDataRuleModal.vue
@@ -36,12 +36,23 @@
label="规则值">
<a-input placeholder="请输入规则值" v-decorator="['ruleValue', validatorRules.ruleValue]"/>
</a-form-item>
+
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="状态">
+ <a-radio-group buttonStyle="solid" v-decorator="['status',{initialValue:'1'}]">
+ <a-radio-button value="1">有效</a-radio-button>
+ <a-radio-button value="0">无效</a-radio-button>
+ </a-radio-group>
+ </a-form-item>
+
</a-form>
</a-spin>
</a-modal>
</template>
<script>
- import {httpAction, getAction} from '@/api/manage'
+ import { httpAction } from '@/api/manage'
import pick from 'lodash.pick'
export default {
@@ -96,7 +107,7 @@
this.visible = true
this.initRuleCondition()
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model, 'ruleName', 'ruleColumn', 'ruleConditions', 'ruleValue'))
+ this.form.setFieldsValue(pick(this.model, 'status','ruleName', 'ruleColumn', 'ruleConditions', 'ruleValue'))
})
},
close() {
@@ -119,6 +130,12 @@
method = 'put'
}
let formData = Object.assign(this.model, values)
+ if(formData.ruleColumn && formData.ruleColumn.length>0){
+ formData.ruleColumn = formData.ruleColumn.trim()
+ }
+ if(formData.ruleValue && formData.ruleValue.length>0){
+ formData.ruleValue = formData.ruleValue.trim()
+ }
httpAction(httpurl, formData, method).then((res) => {
if (res.success) {
that.$message.success(res.message)
diff --git a/ant-design-jeecg-vue/src/views/system/modules/PermissionModal.vue b/ant-design-jeecg-vue/src/views/system/modules/PermissionModal.vue
index cac0d2f..506bef7 100644
--- a/ant-design-jeecg-vue/src/views/system/modules/PermissionModal.vue
+++ b/ant-design-jeecg-vue/src/views/system/modules/PermissionModal.vue
@@ -15,7 +15,7 @@
<a-radio-group @change="onChangeMenuType" v-decorator="['menuType',{'initialValue':0}]">
<a-radio :value="0">一级菜单</a-radio>
<a-radio :value="1">子菜单</a-radio>
- <a-radio :value="2">按钮/数据权限</a-radio>
+ <a-radio :value="2">按钮/权限</a-radio>
</a-radio-group>
</a-form-item>
@@ -75,6 +75,24 @@
</a-form-item>
<a-form-item
+ v-show="!show"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="授权策略">
+ <j-dict-select-tag v-decorator="['permsType', {}]" placeholder="请选择授权策略" :type="'radio'" :triggerChange="true" dictCode="global_perms_type"/>
+
+
+ </a-form-item>
+ <a-form-item
+ v-show="!show"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="状态">
+ <j-dict-select-tag v-decorator="['status', {}]" placeholder="请选择状态" :type="'radio'" :triggerChange="true" dictCode="valid_status"/>
+
+ </a-form-item>
+
+ <a-form-item
v-show="show"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -136,6 +154,7 @@
import {addPermission,editPermission,queryTreeList} from '@/api/api'
import Icons from './icon/Icons'
import pick from 'lodash.pick'
+ import { initDictOptions } from '@/components/dict/JDictSelectUtil'
export default {
name: "PermissionModal",
@@ -168,12 +187,14 @@
form: this.$form.createForm(this),
validatorRules:{
name:{rules: [{ required: true, message: '请输入菜单标题!' }]},
+ permsType:{rules: [{ required: true, message: '请输入授权策略!' }]},
sortNo:{rules: [{validator: this.validateNumber}]},
},
iconChooseVisible: false,
}
},
created () {
+ this.initDictConfig();
},
methods: {
loadTree(){
@@ -193,7 +214,7 @@
});
},
add () {
- this.edit();
+ this.edit({status:'1',permsType:'1'});
},
edit (record) {
this.resetScreenSize(); // 调用此方法,根据屏幕宽度自适应调整抽屉的宽度
@@ -224,12 +245,13 @@
}
this.show = true;
this.menuLabel = '菜单名称';
+ this.routeSwitch = true;
}
//----------------------------------------------------------------------------------------------
this.visible = true;
this.loadTree();
- let fieldsVal = pick(this.model,'name','perms','component','url','sortNo','menuType');
+ let fieldsVal = pick(this.model,'name','perms','permsType','component','url','sortNo','menuType','status');
this.$nextTick(() => {
this.form.setFieldsValue(fieldsVal)
});
@@ -312,6 +334,8 @@
this.drawerWidth = 700;
}
},
+ initDictConfig() {
+ },
}
}
</script>
diff --git a/ant-design-jeecg-vue/src/views/system/modules/RoleDataruleModal.vue b/ant-design-jeecg-vue/src/views/system/modules/RoleDataruleModal.vue
index 8897548..bb5b75b 100644
--- a/ant-design-jeecg-vue/src/views/system/modules/RoleDataruleModal.vue
+++ b/ant-design-jeecg-vue/src/views/system/modules/RoleDataruleModal.vue
@@ -1,7 +1,7 @@
<template>
<a-drawer
title="数据规则/按钮权限配置"
- width=365
+ width="365"
:closable="false"
@close="onClose"
:visible="visible"
@@ -75,8 +75,7 @@
},
saveDataruleForRole(){
if(!this.dataruleChecked || this.dataruleChecked.length==0){
- this.$message.warning("请现勾选数据权限然后保存!")
- return false;
+ this.$message.warning("请注意，现未勾选任何数据权限!")
}
let params = {
permissionId:this.functionId,
diff --git a/ant-design-jeecg-vue/src/views/system/modules/RoleModal.vue b/ant-design-jeecg-vue/src/views/system/modules/RoleModal.vue
index f8c934e..cf28e97 100644
--- a/ant-design-jeecg-vue/src/views/system/modules/RoleModal.vue
+++ b/ant-design-jeecg-vue/src/views/system/modules/RoleModal.vue
@@ -41,7 +41,7 @@
<script>
import pick from 'lodash.pick'
- import {addRole,editRole,checkRoleCode } from '@/api/api'
+ import {addRole,editRole,duplicateCheck } from '@/api/api'
export default {
name: "RoleModal",
@@ -133,14 +133,16 @@
callback("角色编码不可输入汉字!");
}else{
var params = {
- id:this.model.id,
- roleCode:value
+ tableName: "sys_role",
+ fieldName: "role_code",
+ fieldVal: value,
+ dataId: this.model.id,
};
- checkRoleCode(params).then((res)=>{
+ duplicateCheck(params).then((res)=>{
if(res.success){
callback();
}else{
- callback("角色编码已存在！");
+ callback(res.message);
}
});
}
diff --git a/ant-design-jeecg-vue/src/views/system/modules/SelectUserListModal.vue b/ant-design-jeecg-vue/src/views/system/modules/SelectUserListModal.vue
new file mode 100644
index 0000000..02d259a
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/system/modules/SelectUserListModal.vue
@@ -0,0 +1,266 @@
+<template>
+ <a-modal
+ :title="title"
+ :width="1200"
+ :visible="visible"
+ @ok="handleOk"
+ @cancel="handleCancel"
+ cancelText="关闭">
+
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline">
+ <a-row :gutter="24">
+
+ <a-col :span="6">
+ <a-form-item label="账号">
+ <a-input placeholder="请输入账号查询" v-model="queryParam.username"></a-input>
+ </a-form-item>
+ </a-col>
+
+ <a-col :span="6">
+ <a-form-item label="性别">
+ <a-select v-model="queryParam.sex" placeholder="请选择性别查询">
+ <a-select-option value="">请选择性别查询</a-select-option>
+ <a-select-option value="1">男性</a-select-option>
+ <a-select-option value="2">女性</a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
+
+
+ <template v-if="toggleSearchStatus">
+ <a-col :span="6">
+ <a-form-item label="邮箱">
+ <a-input placeholder="请输入邮箱查询" v-model="queryParam.email"></a-input>
+ </a-form-item>
+ </a-col>
+
+ <a-col :span="6">
+ <a-form-item label="手机号码">
+ <a-input placeholder="请输入手机号码查询" v-model="queryParam.phone"></a-input>
+ </a-form-item>
+ </a-col>
+
+ <a-col :span="6">
+ <a-form-item label="状态">
+ <a-select v-model="queryParam.status" placeholder="请选择用户状态查询">
+ <a-select-option value="">请选择用户状态</a-select-option>
+ <a-select-option value="1">正常</a-select-option>
+ <a-select-option value="2">解冻</a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
+ </template>
+
+ <a-col :span="6" >
+ <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+ <a-button type="primary" @click="searchByquery" icon="search">查询</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+ <a @click="handleToggleSearch" style="margin-left: 8px">
+ {{ toggleSearchStatus ? '收起' : '展开' }}
+ <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+ </a>
+ </span>
+ </a-col>
+
+ </a-row>
+ </a-form>
+ </div>
+
+ <a-table
+ ref="table"
+ rowKey="id"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ @change="handleTableChange"
+ >
+
+ </a-table>
+ </a-modal>
+</template>
+
+<script>
+ import { filterObj } from '@/utils/util';
+
+ import { getUserList } from '@/api/api'
+
+ export default {
+ name: "SelectUserListModal",
+ components: {
+ },
+ data () {
+ return {
+ title:"选择用户",
+ queryParam: {},
+ columns: [{
+ title: '用户账号',
+ align:"center",
+ dataIndex: 'username',
+ fixed:'left',
+ width:200
+ },{
+ title: '真实姓名',
+ align:"center",
+ dataIndex: 'realname',
+ },{
+ title: '性别',
+ align:"center",
+ dataIndex: 'sex',
+ customRender:function (text) {
+ if(text==1){
+ return "男";
+ }else if(text==2){
+ return "女";
+ }else{
+ return text;
+ }
+ }
+ },{
+ title: '手机号码',
+ align:"center",
+ dataIndex: 'phone'
+ },{
+ title: '邮箱',
+ align:"center",
+ dataIndex: 'email'
+ },{
+ title: '状态',
+ align:"center",
+ dataIndex: 'status',
+ customRender:function (text) {
+ if(text==1){
+ return "正常";
+ }else if(text==2){
+ return "冻结";
+ }else{
+ return text;
+ }
+ }
+ }],
+ dataSource:[],
+ ipagination:{
+ current: 1,
+ pageSize: 5,
+ pageSizeOptions: ['5', '10', '20'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 共" + total + "条"
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
+ isorter:{
+ column: 'createTime',
+ order: 'desc',
+ },
+ selectedRowKeys: [],
+ selectionRows: [],
+ visible:false,
+ toggleSearchStatus:false,
+ }
+ },
+ created() {
+ this.loadData();
+ },
+ methods: {
+ add (selectUser,userIds) {
+ this.visible = true;
+ this.edit(selectUser,userIds);
+ },
+ edit(selectUser,userIds){
+ this.selectionRows = selectUser;
+ this.selectedRowKeys = userIds.split(',');
+ },
+ loadData (arg){
+ if(arg===1){
+ this.ipagination.current = 1;
+ }
+ let params = this.getQueryParams();//查询条件
+ getUserList(params).then((res)=>{
+ if(res.success){
+ this.dataSource = res.result.records;
+ this.ipagination.total = res.result.total;
+ }
+ })
+ },
+ getQueryParams(){
+ let param = Object.assign({}, this.queryParam,this.isorter);
+ param.field = this.getQueryField();
+ param.current = this.ipagination.current;
+ param.pageSize = this.ipagination.pageSize;
+ return filterObj(param);
+ },
+ getQueryField(){
+ let str = "id,";
+ for(let a = 0;a<this.columns.length;a++){
+ str+=","+this.columns[a].dataIndex;
+ }
+ return str;
+ },
+ onSelectChange (selectedRowKeys,selectionRows) {
+ this.selectedRowKeys = selectedRowKeys;
+ console.log(this.selectedRowKeys);
+ this.selectionRows = selectionRows;
+ },
+ searchReset(){
+ let that = this;
+ Object.keys(that.queryParam).forEach(function(key){
+ that.queryParam[key] = '';
+ });
+ that.loadData(1);
+ },
+ handleTableChange(pagination, filters, sorter){
+ //TODO 筛选
+ if (Object.keys(sorter).length>0){
+ this.isorter.column = sorter.field;
+ this.isorter.order = "ascend"==sorter.order?"asc":"desc"
+ }
+ this.ipagination = pagination;
+ this.loadData();
+ },
+ handleCancel () {
+ this.selectionRows = [];
+ this.selectedRowKeys = [];
+ this.visible = false;
+ },
+ handleOk () {
+ this.$emit("choseUser",this.selectionRows);
+ this.handleCancel();
+ },
+ searchByquery(){
+ this.loadData(1);
+ },
+ searchReset(){
+ let that = this;
+ Object.keys(that.queryParam).forEach(function(key){
+ that.queryParam[key] = '';
+ });
+ that.loadData(1);
+ },
+ handleToggleSearch(){
+ this.toggleSearchStatus = !this.toggleSearchStatus;
+ },
+ }
+ }
+</script>
+<style scoped>
+ .ant-card-body .table-operator{
+ margin-bottom: 18px;
+ }
+
+ .ant-table-tbody .ant-table-row td{
+ padding-top:15px;
+ padding-bottom:15px;
+ }
+ .anty-row-operator button{margin: 0 5px}
+ .ant-btn-danger{background-color: #ffffff}
+
+ .ant-modal-cust-warp{height: 100%}
+ .ant-modal-cust-warp .ant-modal-body{height:calc(100% - 110px) !important;overflow-y: auto}
+ .ant-modal-cust-warp .ant-modal-content{height:90% !important;overflow-y: hidden}
+
+ .anty-img-wrap{height:25px;position: relative;}
+ .anty-img-wrap > img{max-height:100%;}
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/system/modules/SelectUserModal.vue b/ant-design-jeecg-vue/src/views/system/modules/SelectUserModal.vue
new file mode 100644
index 0000000..49fd6cf
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/system/modules/SelectUserModal.vue
@@ -0,0 +1,275 @@
+<template>
+ <div>
+ <a-modal
+ centered
+ :title="title"
+ :width="1000"
+ :visible="visible"
+ @ok="handleOk"
+ @cancel="handleCancel"
+ cancelText="关闭">
+
+
+ <!-- 查询区域 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline">
+ <a-row :gutter="24">
+
+ <a-col :span="10">
+ <a-form-item label="姓名">
+ <a-input placeholder="请输入姓名" v-model="queryParam.username"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="8">
+ <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+ <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+ </span>
+ </a-col>
+
+ </a-row>
+ </a-form>
+ </div>
+ <!-- table区域-begin -->
+ <div>
+ <a-table
+ size="small"
+ bordered
+ rowKey="id"
+ :columns="columns1"
+ :dataSource="dataSource1"
+ :pagination="ipagination"
+ :loading="loading"
+ :scroll="{ y: 240 }"
+ :rowSelection="{selectedRowKeys: selectedRowKeys,onSelectAll:onSelectAll,onSelect:onSelect,onChange: onSelectChange}"
+ @change="handleTableChange">
+
+ </a-table>
+ </div>
+ <!-- table区域-end -->
+
+
+ </a-modal>
+ </div>
+</template>
+
+<script>
+ import {filterObj} from '@/utils/util'
+ import {getAction} from '@/api/manage'
+
+ export default {
+ name: "SelectUserModal",
+ data() {
+ return {
+ title: "添加已有用户",
+ names: [],
+ visible: false,
+ placement: 'right',
+ description: '',
+ // 查询条件
+ queryParam: {},
+ // 表头
+ columns1: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 50,
+ align: "center",
+ customRender: function (t, r, index) {
+ return parseInt(index) + 1;
+ }
+ },
+ {
+ title: '用户账号',
+ align: "center",
+ width: 113,
+ dataIndex: 'username'
+ },
+ {
+ title: '用户名称',
+ align: "center",
+ width: 100,
+ dataIndex: 'realname'
+ },
+ {
+ title: '状态',
+ align: "center",
+ width: 100,
+ dataIndex: 'status'
+ }
+ ],
+ columns2: [
+ {
+ title: '用户账号',
+ align: "center",
+ dataIndex: 'username',
+
+ },
+ {
+ title: '用户名称',
+ align: "center",
+ dataIndex: 'realname',
+ },
+ {
+ title: '操作',
+ dataIndex: 'action',
+ align: "center",
+ width: 100,
+ scopedSlots: {customRender: 'action'},
+ }
+ ],
+ //数据集
+ dataSource1: [],
+ dataSource2: [],
+ // 分页参数
+ ipagination: {
+ current: 1,
+ pageSize: 10,
+ pageSizeOptions: ['10', '20', '30'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 共" + total + "条"
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
+ isorter: {
+ column: 'createTime',
+ order: 'desc',
+ },
+ loading: false,
+ selectedRowKeys: [],
+ selectedRows: [],
+ url: {
+ list: "/sys/user/list",
+ }
+ }
+ },
+ created() {
+ this.loadData();
+ },
+ methods: {
+ searchQuery() {
+ this.loadData(1);
+ },
+ searchReset() {
+ this.queryParam = {};
+ this.loadData(1);
+ },
+ handleCancel() {
+ this.visible = false;
+ },
+ handleOk() {
+ this.dataSource2 = this.selectedRowKeys;
+ console.log("data:" + this.dataSource2);
+ this.$emit("selectFinished", this.dataSource2);
+ this.visible = false;
+ },
+ add() {
+ this.visible = true;
+ },
+ loadData(arg) {
+ //加载数据 若传入参数1则加载第一页的内容
+ if (arg === 1) {
+ this.ipagination.current = 1;
+ }
+ var params = this.getQueryParams();//查询条件
+ getAction(this.url.list, params).then((res) => {
+ if (res.success) {
+ this.dataSource1 = res.result.records;
+ this.ipagination.total = res.result.total;
+ }
+ })
+ },
+ getQueryParams() {
+ var param = Object.assign({}, this.queryParam, this.isorter);
+ param.field = this.getQueryField();
+ param.pageNo = this.ipagination.current;
+ param.pageSize = this.ipagination.pageSize;
+ return filterObj(param);
+ },
+ getQueryField() {
+ //TODO 字段权限控制
+ },
+ onSelectAll(selected, selectedRows, changeRows) {
+ if (selected === true) {
+ for (var a = 0; a < changeRows.length; a++) {
+ this.dataSource2.push(changeRows[a]);
+ }
+ } else {
+ for (var b = 0; b < changeRows.length; b++) {
+ this.dataSource2.splice(this.dataSource2.indexOf(changeRows[b]), 1);
+ }
+ }
+ // console.log(selected, selectedRows, changeRows);
+ },
+ onSelect(record, selected) {
+ if (selected === true) {
+ this.dataSource2.push(record);
+ } else {
+ var index = this.dataSource2.indexOf(record);
+ //console.log();
+ if (index >= 0) {
+ this.dataSource2.splice(this.dataSource2.indexOf(record), 1);
+ }
+
+ }
+ },
+ onSelectChange(selectedRowKeys, selectedRows) {
+ this.selectedRowKeys = selectedRowKeys;
+ this.selectionRows = selectedRows;
+ },
+ onClearSelected() {
+ this.selectedRowKeys = [];
+ this.selectionRows = [];
+ },
+ handleDelete: function (record) {
+ this.dataSource2.splice(this.dataSource2.indexOf(record), 1);
+ },
+ handleTableChange(pagination, filters, sorter) {
+ //分页、排序、筛选变化时触发
+ console.log(sorter);
+ //TODO 筛选
+ if (Object.keys(sorter).length > 0) {
+ this.isorter.column = sorter.field;
+ this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
+ }
+ this.ipagination = pagination;
+ this.loadData();
+ }
+ }
+ }
+</script>
+<style lang="less" scoped>
+ .ant-card-body .table-operator {
+ margin-bottom: 18px;
+ }
+
+ .ant-table-tbody .ant-table-row td {
+ padding-top: 15px;
+ padding-bottom: 15px;
+ }
+
+ .anty-row-operator button {
+ margin: 0 5px
+ }
+
+ .ant-btn-danger {
+ background-color: #ffffff
+ }
+
+ .ant-modal-cust-warp {
+ height: 100%
+ }
+
+ .ant-modal-cust-warp .ant-modal-body {
+ height: calc(100% - 110px) !important;
+ overflow-y: auto
+ }
+
+ .ant-modal-cust-warp .ant-modal-content {
+ height: 90% !important;
+ overflow-y: hidden
+ }
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/system/modules/SysAnnouncementModal.vue b/ant-design-jeecg-vue/src/views/system/modules/SysAnnouncementModal.vue
index d0f8290..b5bc5a9 100644
--- a/ant-design-jeecg-vue/src/views/system/modules/SysAnnouncementModal.vue
+++ b/ant-design-jeecg-vue/src/views/system/modules/SysAnnouncementModal.vue
@@ -6,6 +6,7 @@
:confirmLoading="confirmLoading"
@ok="handleOk"
@cancel="handleCancel"
+ :okButtonProps="{ props: {disabled: disabled} }"
cancelText="关闭">
<a-spin :spinning="confirmLoading">
@@ -20,6 +21,18 @@
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
+ label="消息类型">
+ <a-select
+ v-decorator="[ 'msgCategory', validatorRules.msgCategory]"
+ placeholder="请选择消息类型"
+ :disabled="disableSubmit">
+ <a-select-option value="1">通知公告</a-select-option>
+ <a-select-option value="2">系统消息</a-select-option>
+ </a-select>
+ </a-form-item>
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
label="内容">
<!--<a-input placeholder="请输入内容" v-decorator="['msgContent', {}]" />-->
<a-textarea :rows="5" placeholder="..." v-decorator="[ 'msgContent', {} ]" />
@@ -54,7 +67,7 @@
:wrapperCol="wrapperCol"
label="通告对象类型">
<a-select
- v-decorator="[ 'msgType', {}]"
+ v-decorator="[ 'msgType', validatorRules.msgType]"
placeholder="请选择通告对象类型"
:disabled="disableSubmit"
@change="chooseMsgType">
@@ -67,24 +80,17 @@
:wrapperCol="wrapperCol"
label="指定用户"
v-if="userType">
- <a-input placeholder="请选择用户" v-decorator="['userIds',{}]" @click="selectUserIds" disabled="true" />
+ <a-select
+ mode="multiple"
+ style="width: 100%"
+ placeholder="请选择用户"
+ v-model="selectedUser"
+ @dropdownVisibleChange="selectUserIds">
+ </a-select>
</a-form-item>
- <!--<a-modal
- :title="用户选择"
- :width="800"
- :visible="visible"
- :confirmLoading="confirmLoading"
- @ok="handleSubmit"
- @cancel="handleCancel"
- cancelText="关闭"
- wrapClassName="ant-modal-cust-warp"
- style="top:5%;height: 95%;overflow-y: hidden" ref="modelSelectUser"
- >
- 123
-
- </a-modal>-->
</a-form>
</a-spin>
+ <select-user-list-modal ref="UserListModal" @choseUser="choseUser"></select-user-list-modal>
</a-modal>
</template>
@@ -92,8 +98,12 @@
import { httpAction } from '@/api/manage'
import pick from 'lodash.pick'
import moment from "moment"
+ import { getAction } from '@/api/manage'
+ import JDate from '@/components/jeecg/JDate'
+ import SelectUserListModal from "./SelectUserListModal";
export default {
+ components: {SelectUserListModal},
name: "SysAnnouncementModal",
data () {
return {
@@ -114,14 +124,19 @@
form: this.$form.createForm(this),
validatorRules:{
title:{rules: [{ required: true, message: '请输入标题!' }]},
+ msgCategory:{rules: [{ required: true, message: '请选择消息类型!' }]},
+ msgType:{rules: [{ required: true, message: '请选择通告对象类型!' }]},
},
url: {
+ queryByIds: "/sys/user/queryByIds",
add: "/sys/annountCement/add",
edit: "/sys/annountCement/edit",
},
userType:false,
- visible: false,
- confirmLoading: false,
+ userIds:[],
+ selectedUser:[],
+ disabled:false,
+ msgContent:"",
}
},
created () {
@@ -132,18 +147,38 @@
},
edit (record) {
this.form.resetFields();
- this.model = Object.assign({}, record);
+ this.disable = false;
this.visible = true;
+ this.getUser(record);
+ },
+ getUser(record){
+ this.model = Object.assign({}, record);
+ //this.model.msgContent.replace("<br/>","\n");
+ console.log(this.model.msgContent);
+ // 指定用户
+ if(record&&record.msgType === "USER"){
+ this.userType = true;
+ this.userIds = record.userIds;
+ getAction(this.url.queryByIds,{userIds:this.userIds}).then((res)=>{
+ if(res.success){
+ for(var i=0;i<res.result.length;i++){
+ this.selectedUser.push(res.result[i].realname);
+ }
+ this.$refs.UserListModal.edit(res.result,this.userIds);
+ }
+ });
+ }
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model,'titile','msgContent','priority','msgType'))
- //时间格式化
+ this.form.setFieldsValue(pick(this.model,'titile','msgContent','sender','priority','msgCategory','msgType','sendStatus','delFlag'))
this.form.setFieldsValue({startTime:this.model.startTime?moment(this.model.startTime):null})
this.form.setFieldsValue({endTime:this.model.endTime?moment(this.model.endTime):null})
+ this.form.setFieldsValue({sendTime:this.model.sendTime?moment(this.model.sendTime):null})
+ this.form.setFieldsValue({cancelTime:this.model.cancelTime?moment(this.model.cancelTime):null})
});
-
},
close () {
this.$emit('close');
+ this.selectedUser = [];
this.visible = false;
},
handleOk () {
@@ -162,6 +197,9 @@
method = 'put';
}
let formData = Object.assign(this.model, values);
+ if(this.userType){
+ formData.userIds = this.userIds;
+ }
//时间格式化
formData.startTime = formData.startTime?formData.startTime.format('YYYY-MM-DD HH:mm:ss'):null;
formData.endTime = formData.endTime?formData.endTime.format('YYYY-MM-DD HH:mm:ss'):null;
@@ -185,18 +223,37 @@
})
},
handleCancel () {
- this.close()
+ this.visible = false;
+ this.$emit('close');
+ this.resetUser();
+ },
+ resetUser (){
+ this.userType = false;
+ this.userIds = [];
+ this.selectedUser = [];
+ this.disabled = false;
+ this.$refs.UserListModal.edit(null,null);
+ },
+ selectUserIds() {
+ this.$refs.UserListModal.add(this.selectedUser,this.userIds);
},
chooseMsgType(value) {
if("USER" == value) {
this.userType = true;
} else {
this.userType = false;
+ this.selectedUser = [];
+ this.userIds = [];
}
},
- selectUserIds() {
- console.log(1);
- this.$refs.modalSelectUser.show();
+ // 子modal回调
+ choseUser:function(userList){
+ this.selectedUser = [];
+ this.userIds = [];
+ for(var i=0;i<userList.length;i++){
+ this.selectedUser.push(userList[i].realname);
+ this.userIds += userList[i].id+","
+ }
}
}
diff --git a/ant-design-jeecg-vue/src/views/system/modules/SysUserAgentModal.vue b/ant-design-jeecg-vue/src/views/system/modules/SysUserAgentModal.vue
new file mode 100644
index 0000000..104122d
--- /dev/null
+++ b/ant-design-jeecg-vue/src/views/system/modules/SysUserAgentModal.vue
@@ -0,0 +1,194 @@
+<template>
+ <a-modal
+ :title="title"
+ :width="800"
+ :visible="visible"
+ :confirmLoading="confirmLoading"
+ @ok="handleOk"
+ @cancel="handleCancel"
+ cancelText="关闭">
+
+ <a-spin :spinning="confirmLoading">
+ <a-form :form="form">
+
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="用户名">
+ <a-input placeholder="请输入用户名" v-decorator="['userName', {}]" readOnly="true"/>
+ </a-form-item>
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="代理人用户名">
+ <a-input-search
+ placeholder="请输入代理人用户名"
+ v-decorator="['agentUserName', validatorRules.agentUserName]"
+ readOnly="true"
+ @search="onSearchDepUser"
+ size="large">
+ <a-button slot="enterButton">选择用户</a-button>
+ </a-input-search>
+ </a-form-item>
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="代理开始时间">
+ <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'startTime', validatorRules.startTime]" />
+ </a-form-item>
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="代理结束时间">
+ <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'endTime', validatorRules.endTime]" />
+ </a-form-item>
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="状态">
+ <a-radio-group class="fontiframe" name="radioGroup" v-decorator="[ 'status', {}]">
+ <a-radio class="radioGroup" value="1">有效</a-radio>
+ <a-radio class="radioGroup" value="0">无效</a-radio>
+ </a-radio-group>
+ </a-form-item>
+
+ </a-form>
+
+ <!-- 通过部门筛选，选择人 -->
+ <j-search-user-by-dep ref="JSearchUserByDep" @ok="onSearchDepUserCallBack"></j-search-user-by-dep>
+ </a-spin>
+ </a-modal>
+</template>
+
+<script>
+ import { httpAction, getAction } from '@/api/manage'
+ import pick from 'lodash.pick'
+ import moment from "moment"
+ import JSearchUserByDep from '@/components/jeecgbiz/JSearchUserByDep'
+
+ export default {
+ name: "SysUserAgentModal",
+ components: {
+ JSearchUserByDep
+ },
+ data () {
+ return {
+ title:"操作",
+ visible: false,
+ model: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+ username:"",
+ confirmLoading: false,
+ form: this.$form.createForm(this),
+ validatorRules:{
+ agentUserName:{rules: [{ required: true, message: '请输入代理人用户名!' }]},
+ startTime:{rules: [{ required: true, message: '请输入代理开始时间!' }]},
+ endTime:{rules: [{ required: true, message: '请输入代理结束时间!' }]},
+ },
+ url: {
+ add: "/system/sysUserAgent/add",
+ edit: "/system/sysUserAgent/edit",
+ queryByUserName:"/system/sysUserAgent/queryByUserName",
+ },
+ }
+ },
+ created () {
+ },
+ methods: {
+ agentSettings(username){
+ this.username = username;
+ this.init();
+
+ },
+ init () {
+ var params = {userName:this.username};//查询条件
+ getAction(this.url.queryByUserName,params).then((res)=>{
+ if(res.success){
+ console.log("获取流程节点信息",res);
+ this.edit (res.result);
+ }else{
+ this.edit({userName:this.username,status:"0"});
+ }
+ })
+ },
+ edit (record) {
+ this.form.resetFields();
+ this.model = Object.assign({}, record);
+ this.visible = true;
+ this.$nextTick(() => {
+ this.form.setFieldsValue(pick(this.model,'userName','agentUserName','status'))
+ //时间格式化
+ this.form.setFieldsValue({startTime:this.model.startTime?moment(this.model.startTime):null})
+ this.form.setFieldsValue({endTime:this.model.endTime?moment(this.model.endTime):null})
+ });
+
+ },
+ close () {
+ this.$emit('close');
+ this.visible = false;
+ },
+ handleOk () {
+ const that = this;
+ // 触发表单验证
+ this.form.validateFields((err, values) => {
+ if (!err) {
+ that.confirmLoading = true;
+ let httpurl = '';
+ let method = '';
+ if(!this.model.id){
+ httpurl+=this.url.add;
+ method = 'post';
+ }else{
+ httpurl+=this.url.edit;
+ method = 'put';
+ }
+ let formData = Object.assign(this.model, values);
+ //时间格式化
+ formData.startTime = formData.startTime?formData.startTime.format('YYYY-MM-DD HH:mm:ss'):null;
+ formData.endTime = formData.endTime?formData.endTime.format('YYYY-MM-DD HH:mm:ss'):null;
+
+ console.log(formData)
+ httpAction(httpurl,formData,method).then((res)=>{
+ if(res.success){
+ that.$message.success(res.message);
+ //this.init();
+ }else{
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.close();
+ })
+
+
+
+ }
+ })
+ },
+ handleCancel () {
+ this.close()
+ },
+ //通过组织机构筛选选择用户
+ onSearchDepUser() {
+ this.$refs.JSearchUserByDep.showModal();
+ this.$refs.JSearchUserByDep.title = '根据部门查询用户';
+ this.$refs.JSearchUserByDep.type = 'radio'
+ },
+ onSearchDepUserCallBack(selectedDepUsers) {
+ this.form.setFieldsValue({agentUserName:selectedDepUsers});
+ }
+
+ }
+ }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/src/views/system/modules/UserModal.vue b/ant-design-jeecg-vue/src/views/system/modules/UserModal.vue
index 4c9fe08..c44996a 100644
--- a/ant-design-jeecg-vue/src/views/system/modules/UserModal.vue
+++ b/ant-design-jeecg-vue/src/views/system/modules/UserModal.vue
@@ -39,7 +39,7 @@
<a-form-item label="用户名字" :labelCol="labelCol" :wrapperCol="wrapperCol" >
<a-input placeholder="请输入用户名称" v-decorator="[ 'realname', validatorRules.realname]" />
</a-form-item>
-
+ <template v-show="!roleDisabled">
<a-form-item label="角色分配" :labelCol="labelCol" :wrapperCol="wrapperCol" >
<a-select
mode="multiple"
@@ -51,8 +51,10 @@
</a-select-option>
</a-select>
</a-form-item>
+ </template>
<!--部门分配-->
- <a-form-item label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" >
+ <template v-show="!departDisabled">
+ <a-form-item label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" >
<a-input-search
placeholder="点击右侧按钮选择部门"
v-model="checkedDepartNameString"
@@ -61,7 +63,7 @@
<a-button slot="enterButton" icon="search">选择</a-button>
</a-input-search>
</a-form-item>
-
+ </template>
<a-form-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-upload
listType="picture-card"
@@ -73,7 +75,7 @@
:beforeUpload="beforeUpload"
@change="handleChange"
>
- <img v-if="model.avatar" :src="getAvatarView()" alt="头像" style="height:104px;max-width:300px"/>
+ <img v-if="picUrl" :src="getAvatarView()" alt="头像" style="height:104px;max-width:300px"/>
<div v-else>
<a-icon :type="uploadLoading ? 'loading' : 'plus'" />
<div class="ant-upload-text">上传</div>
@@ -100,7 +102,11 @@
</a-form-item>
<a-form-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input placeholder="请输入手机号码" v-decorator="[ 'phone', validatorRules.phone]" />
+ <a-input placeholder="请输入手机号码" :disabled="disabledAuth('user:form:phone')" v-decorator="[ 'phone', validatorRules.phone]" />
+ </a-form-item>
+
+ <a-form-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <j-dict-select-tag v-decorator="['activitiSync', {}]" placeholder="请选择是否同步工作流引擎" :type="'radio'" :triggerChange="true" dictCode="activiti_sync"/>
</a-form-item>
</a-form>
@@ -123,8 +129,10 @@
// 引入搜索部门弹出框的组件
import departWindow from './DepartWindow'
import { ACCESS_TOKEN } from "@/store/mutation-types"
- import { getAction, httpAction } from '@/api/manage'
+ import { getAction, httpAction,putAction } from '@/api/manage'
import {addUser,editUser,queryUserRole,queryall,checkUsername } from '@/api/api'
+ import { disabledAuthFilter } from "@/utils/authFilter"
+
export default {
name: "RoleModal",
components: {
@@ -132,6 +140,10 @@
},
data () {
return {
+ departDisabled: false, //是否是我的部门调用该页面
+ deptId: '',
+ roleDisabled: false, //是否是角色维护调用该页面
+ roleId: '',
modalWidth:800,
drawerWidth:700,
modaltoggleFlag:true,
@@ -170,7 +182,7 @@
phone:{rules: [{validator: this.validatePhone}]},
email:{rules: [{type: 'email', message: '请输入正确格式的电子邮箱!',}]},
roles:{}
- // sex:{initialValue:((!this.model.sex)?"": (this.model.sex+""))}
+ // sex:{initialValue:((!this.model.sex)?"": (this.model.sex+""))}
},
title:"操作",
visible: false,
@@ -189,12 +201,15 @@
confirmLoading: false,
headers:{},
form:this.$form.createForm(this),
+ picUrl: "",
url: {
addUDepartIds:"/sys/user/addUDepartIds", // 引入为用户添加部门信息需要的url
editUDepartIds:"/sys/user/editUDepartIds", // 引入为用户更新部门信息需要的url
fileUpload: window._CONFIG['domianURL']+"/sys/common/upload",
imgerver: window._CONFIG['domianURL']+"/sys/common/view",
userWithDepart: "/sys/user/userDepartList", // 引入为指定用户查看部门信息需要的url
+ userId:"/sys/user/generateUserId", // 引入生成添加用户情况下的url
+ syncUserByUserName:"/process/extActProcess/doSyncUserByUserName",//同步用户到工作流
},
}
},
@@ -209,6 +224,9 @@
}
},
methods: {
+ disabledAuth(code){
+ return disabledAuthFilter(code);
+ },
//窗口最大化切换
toggleScreen(){
if(this.modaltoggleFlag){
@@ -244,8 +262,9 @@
this.userId=""
},
add () {
+ this.picUrl = "";
this.refresh()
- this.edit({});
+ this.edit({activitiSync:'1'});
},
edit (record) {
this.resetScreenSize(); // 调用此方法,根据屏幕宽度自适应调整抽屉的宽度
@@ -255,12 +274,13 @@
that.form.resetFields();
if(record.hasOwnProperty("id")){
that.loadUserRoles(record.id);
+ this.picUrl = "Has no pic url yet";
}
that.userId = record.id;
that.visible = true;
that.model = Object.assign({}, record);
that.$nextTick(() => {
- that.form.setFieldsValue(pick(this.model,'username','sex','realname','email','phone'))
+ that.form.setFieldsValue(pick(this.model,'username','sex','realname','email','phone','activitiSync'))
});
// 调用查询用户对应的部门信息的方法
that.checkedDepartKeys = [];
@@ -292,6 +312,13 @@
},
moment,
handleSubmit () {
+ if(this.departDisabled===true){
+ this.handleSubmitDepart();
+ return
+ }else if(this.roleDisabled===true){
+ this.handleSubmitRole()
+ return
+ }
const that = this;
// 触发表单验证
this.form.validateFields((err, values) => {
@@ -319,6 +346,97 @@
if(res.success){
that.$message.success(res.message);
that.$emit('ok');
+ //同步用户到工作流
+ this.handleSyncUser(this.model.username);
+ }else{
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.checkedDepartNames = [];
+ that.close();
+ })
+
+ }
+ })
+ },
+ // 提交表单（我的部门调用)
+ handleSubmitDepart(){
+ const that = this;
+ // 触发表单验证
+ this.form.validateFields((err, values) => {
+ if (!err) {
+ that.confirmLoading = true;
+ let avatar = that.model.avatar;
+ if (!values.birthday) {
+ values.birthday = '';
+ } else {
+ values.birthday = values.birthday.format(this.dateFormat);
+ }
+ let formData = Object.assign(this.model, values);
+ formData.avatar = avatar;
+ formData.selectedroles = this.roleId;
+
+ //生成userId
+ getAction(this.url.userId).then((res) => {
+ if (res.success) {
+ this.userId = res.result;
+ console.log("generateUserId:" + this.userId)
+ formData.id = that.userId;
+ console.log("formData.id:" + formData.id)
+ this.addDepartsToUser1(that, formData); // 调用根据当前用户添加部门信息的方法
+ addUser(formData).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message);
+ that.$emit('ok');
+ //同步用户到工作流
+ this.handleSyncUser(this.model.username);
+ } else {
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.checkedDepartNames = [];
+ that.close();
+ })
+ }
+ })
+ }
+ })
+ },
+ //提交表单（角色维护调用）
+ handleSubmitRole(){
+ const that = this;
+ // 触发表单验证
+ this.form.validateFields((err, values) => {
+ if (!err) {
+ that.confirmLoading = true;
+ let avatar = that.model.avatar;
+ if(!values.birthday){
+ values.birthday = '';
+ }else{
+ values.birthday = values.birthday.format(this.dateFormat);
+ }
+ let formData = Object.assign(this.model, values);
+ formData.avatar = avatar;
+ formData.selectedroles = this.selectedRole.length>0?this.selectedRole.join(","):'';
+ if(this.roleId!=''){
+ formData.selectedroles = this.roleId;
+ }
+ that.addDepartsToUser(that,formData); // 调用根据当前用户添加部门信息的方法
+ let obj;
+ if(!this.model.id){
+ formData.id = this.userId;
+ obj=addUser(formData);
+ }else{
+ obj=editUser(formData);
+ }
+ obj.then((res)=>{
+ if(res.success){
+ that.$message.success(res.message);
+ that.$emit('ok');
+ //同步用户到工作流
+ this.handleSyncUser(this.model.username);
}else{
that.$message.warning(res.message);
}
@@ -334,7 +452,6 @@
handleCancel () {
this.close()
},
-
// 根据当前用户添加部门信息的方法
addDepartsToUser(that,formData){
let httpurl = '';
@@ -354,8 +471,30 @@
}
})
},
+ // 根据当前用户添加部门信息的方法（我的部门调用）
+ addDepartsToUser1: function() {
+ let httpurl = ''
+ let method = ''
+ httpurl += this.url.addUDepartIds
+ method = 'post';
+ let departIdList = [];
+ departIdList.push(this.deptId);
+ httpAction(httpurl, { userId: this.userId, departIdList: departIdList }, method).then((res) => {
+ if (res.success) {
+ this.userId = ''
+ this.deptId = ''
+ this.departIdList = []
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ },
validateToNextPassword (rule, value, callback) {
const form = this.form;
+ const confirmpassword=form.getFieldValue('confirmpassword');
+ if (value && confirmpassword && value !== confirmpassword) {
+ callback('两次输入的密码不一样！');
+ }
if (value && this.confirmDirty) {
form.validateFields(['confirm'], { force: true })
}
@@ -410,6 +549,7 @@
//TODO 验证文件大小
},
handleChange (info) {
+ this.picUrl = "";
if (info.file.status === 'uploading') {
this.uploadLoading = true
return
@@ -420,6 +560,7 @@
console.log(response);
if(response.success){
this.model.avatar = response.message;
+ this.picUrl = "Has no pic url yet";
}else{
this.$message.warning(response.message);
}
@@ -455,6 +596,18 @@
this.drawerWidth = 700;
}
},
+ handleSyncUser(userName) {
+ try{
+ var that = this;
+ putAction(that.url.syncUserByUserName, {userName:userName}).then((res) => {
+ //if (res.success) {
+ //that.$message.success(res.message);
+ // } else {
+ //that.$message.warning(res.message);
+ //}
+ })
+ }catch (e){}
+ },
}
}
</script>
diff --git a/ant-design-jeecg-vue/src/views/system/modules/UserRoleModal.vue b/ant-design-jeecg-vue/src/views/system/modules/UserRoleModal.vue
index 8dadf4e..3ec6ae2 100644
--- a/ant-design-jeecg-vue/src/views/system/modules/UserRoleModal.vue
+++ b/ant-design-jeecg-vue/src/views/system/modules/UserRoleModal.vue
@@ -20,8 +20,8 @@
@select="onTreeNodeSelect"
:expandedKeys="expandedKeysss"
:checkStrictly="checkStrictly">
- <span slot="hasDatarule" slot-scope="{slotTitle,icon}">
- {{ slotTitle }}<a-icon v-if="icon" type="align-left" style="margin-left:5px;color: red;"></a-icon>
+ <span slot="hasDatarule" slot-scope="{slotTitle,ruleFlag}">
+ {{ slotTitle }}<a-icon v-if="ruleFlag" type="align-left" style="margin-left:5px;color: red;"></a-icon>
</span>
</a-tree>
</a-form-item>
@@ -132,8 +132,9 @@
handleSubmit(){
let that = this;
let params = {
+ roleId:that.roleId,
permissionIds:that.checkedKeys.join(","),
- roleId:that.roleId
+ lastpermissionIds:that.defaultCheckedKeys.join(","),
};
that.loading = true;
console.log("请求参数：",params);
diff --git a/ant-design-jeecg-vue/src/views/user/Login.vue b/ant-design-jeecg-vue/src/views/user/Login.vue
index 3a36a5d..c266486 100644
--- a/ant-design-jeecg-vue/src/views/user/Login.vue
+++ b/ant-design-jeecg-vue/src/views/user/Login.vue
@@ -1,43 +1,73 @@
<template>
<div class="main">
- <a-form class="user-layout-login" ref="formLogin" :autoFormCreate="(form)=>{this.form = form}" id="formLogin">
+ <a-form :form="form" class="user-layout-login" ref="formLogin" id="formLogin">
<a-tabs
:activeKey="customActiveKey"
:tabBarStyle="{ textAlign: 'center', borderBottom: 'unset' }"
@change="handleTabClick">
<a-tab-pane key="tab1" tab="账号密码登陆">
- <a-form-item
- fieldDecoratorId="username"
- :fieldDecoratorOptions="{rules: [{ required: true, message: '请输入帐户名或邮箱' }, { validator: this.handleUsernameOrEmail }], validateTrigger: 'change'}">
- <a-input size="large" type="text" placeholder="请输入帐户名 / jeecg">
+ <a-form-item>
+ <a-input
+ size="large"
+ v-decorator="['username',validatorRules.username,{ validator: this.handleUsernameOrEmail }]"
+ type="text"
+ placeholder="请输入帐户名 / jeecg">
<a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-item>
- <a-form-item
- fieldDecoratorId="password"
- :fieldDecoratorOptions="{rules: [{ required: true, message: '请输入密码' }], validateTrigger: 'blur'}">
- <a-input size="large" type="password" autocomplete="false" placeholder="密码 / 123456">
+ <a-form-item>
+ <a-input
+ v-decorator="['password',validatorRules.password]"
+ size="large"
+ type="password"
+ autocomplete="false"
+ placeholder="密码 / 123456">
<a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-item>
+
+ <a-row :gutter="0">
+ <a-col :span="14">
+ <a-form-item>
+ <a-input
+ v-decorator="['inputCode',validatorRules.inputCode]"
+ size="large"
+ type="text"
+ @change="inputCodeChange"
+ placeholder="请输入验证码">
+ <a-icon slot="prefix" v-if=" inputCodeContent==verifiedCode " type="smile" :style="{ color: 'rgba(0,0,0,.25)' }"/>
+ <a-icon slot="prefix" v-else type="frown" :style="{ color: 'rgba(0,0,0,.25)' }"/>
+ </a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="10">
+ <j-graphic-code @success="generateCode" style="float: right"></j-graphic-code>
+ </a-col>
+ </a-row>
+
+
</a-tab-pane>
<a-tab-pane key="tab2" tab="手机号登陆">
- <a-form-item
- fieldDecoratorId="mobile"
- :fieldDecoratorOptions="{rules: [{ required: true, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号' }], validateTrigger: 'change'}">
- <a-input size="large" type="text" placeholder="手机号">
+ <a-form-item>
+ <a-input
+ v-decorator="['mobile',validatorRules.mobile]"
+ size="large"
+ type="text"
+ placeholder="手机号">
<a-icon slot="prefix" type="mobile" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-item>
<a-row :gutter="16">
<a-col class="gutter-row" :span="16">
- <a-form-item
- fieldDecoratorId="captcha"
- :fieldDecoratorOptions="{rules: [{ required: true, message: '请输入验证码' }], validateTrigger: 'blur'}">
- <a-input size="large" type="text" placeholder="验证码">
+ <a-form-item>
+ <a-input
+ v-decorator="['captcha',validatorRules.captcha]"
+ size="large"
+ type="text"
+ placeholder="请输入验证码">
<a-icon slot="prefix" type="mail" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-item>
@@ -73,7 +103,7 @@
</a-button>
</a-form-item>
- <!-- <div class="user-login-other">
+ <!-- <div class="user-login-other">
<span>其他登陆方式</span>
<a><a-icon class="item-icon" type="alipay-circle"></a-icon></a>
<a><a-icon class="item-icon" type="taobao-circle"></a-icon></a>
@@ -89,6 +119,46 @@
:visible="stepCaptchaVisible"
@success="stepCaptchaSuccess"
@cancel="stepCaptchaCancel"></two-step-captcha>
+
+ <a-modal
+ title="登录部门选择"
+ :width="450"
+ :visible="departVisible"
+ :closable="false"
+ :maskClosable="false">
+
+ <template slot="footer">
+ <a-button type="primary" @click="departOk">确认</a-button>
+ </template>
+
+ <a-form>
+ <a-form-item
+ :labelCol="{span:4}"
+ :wrapperCol="{span:20}"
+ style="margin-bottom:10px"
+ :validate-status="validate_status">
+ <a-tooltip placement="topLeft" >
+ <template slot="title">
+ <span>您隶属于多部门，请选择登录部门</span>
+ </template>
+ <a-avatar style="backgroundColor:#87d068" icon="gold" />
+ </a-tooltip>
+ <a-select @change="departChange" :class="{'valid-error':validate_status=='error'}" placeholder="请选择登录部门" style="margin-left:10px;width: 80%">
+ <a-icon slot="suffixIcon" type="gold" />
+ <a-select-option
+ v-for="d in departList"
+ :key="d.id"
+ :value="d.orgCode">
+ {{ d.departName }}
+ </a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-form>
+
+
+
+ </a-modal>
+
</div>
</template>
@@ -100,10 +170,13 @@
import { timeFix } from "@/utils/util"
import Vue from 'vue'
import { ACCESS_TOKEN } from "@/store/mutation-types"
+ import JGraphicCode from '@/components/jeecg/JGraphicCode'
+ import { putAction } from '@/api/manage'
export default {
components: {
- TwoStepCaptcha
+ TwoStepCaptcha,
+ JGraphicCode
},
data () {
return {
@@ -113,7 +186,7 @@
loginType: 0,
requiredTwoStepCaptcha: false,
stepCaptchaVisible: false,
- form: null,
+ form: this.$form.createForm(this),
state: {
time: 60,
smsSendBtn: false,
@@ -125,6 +198,22 @@
mobile: "",
rememberMe: true
},
+ validatorRules:{
+ username:{rules: [{ required: true, message: '请输入用户名!',validator: 'click'}]},
+ password:{rules: [{ required: true, message: '请输入密码!',validator: 'click'}]},
+ mobile:{rules: [{validator:this.validateMobile}]},
+ captcha:{rule: [{ required: true, message: '请输入验证码!'}]},
+ inputCode:{rules: [{ required: true, message: '请输入验证码!'},{validator: this.validateInputCode}]}
+ },
+ verifiedCode:"",
+ inputCodeContent:"",
+ inputCodeNull:true,
+
+ departList:[],
+ departVisible:false,
+ departSelected:"",
+ currentUsername:"",
+ validate_status:""
}
},
created () {
@@ -137,8 +226,8 @@
// console.log('2step-code:', err)
// })
// update-end- --- author:scott ------ date:20190225 ---- for:暂时注释，未实现登录验证码功能
- // this.requiredTwoStepCaptcha = true
-
+ // this.requiredTwoStepCaptcha = true
+
},
methods: {
...mapActions([ "Login", "Logout" ]),
@@ -158,46 +247,43 @@
},
handleSubmit () {
let that = this
- let flag = false
-
let loginParams = {
remember_me: that.formLogin.rememberMe
};
// 使用账户密码登陆
if (that.customActiveKey === 'tab1') {
- that.form.validateFields([ 'username', 'password' ], { force: true }, (err, values) => {
+ that.form.validateFields([ 'username', 'password','inputCode' ], { force: true }, (err, values) => {
if (!err) {
- flag = true
- loginParams[!that.loginType ? 'email' : 'username'] = values.username
+ loginParams.username = values.username
//loginParams.password = md5(values.password)
loginParams.password = values.password
+ that.Login(loginParams).then((res) => {
+ this.departConfirm(res)
+ }).catch((err) => {
+ that.requestFailed(err);
+ })
+
}
})
- // 使用手机号登陆
+ // 使用手机号登陆
} else {
that.form.validateFields([ 'mobile', 'captcha' ], { force: true }, (err, values) => {
if (!err) {
- flag = true
loginParams = Object.assign(loginParams, values)
+ that.loginBtn = true
+ that.Login(loginParams).then(() => {
+ if (that.requiredTwoStepCaptcha) {
+ that.stepCaptchaVisible = true
+ } else {
+ that.loginSuccess()
+ }
+ }).catch((err) => {
+ that.requestFailed(err);
+ })
}
})
}
-
- if (!flag) return
-
- that.loginBtn = true
-
- that.Login(loginParams).then(() => {
- if (that.requiredTwoStepCaptcha) {
- that.stepCaptchaVisible = true
- } else {
- that.loginSuccess()
- }
- }).catch((err) => {
- that.requestFailed(err);
- })
-
},
getCaptcha (e) {
e.preventDefault()
@@ -262,6 +348,88 @@
});
this.loginBtn = false;
},
+ validateMobile(rule,value,callback){
+ if (!value || new RegExp(/^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/).test(value)){
+ callback();
+ }else{
+ callback("您的手机号码格式不正确!");
+ }
+
+ },
+ validateInputCode(rule,value,callback){
+ if(!value || this.verifiedCode==this.inputCodeContent){
+ callback();
+ }else{
+ callback("您输入的验证码不正确!");
+ }
+ },
+ generateCode(value){
+ this.verifiedCode = value.toLowerCase()
+ },
+ inputCodeChange(e){
+ this.inputCodeContent = e.target.value
+ if(!e.target.value||0==e.target.value){
+ this.inputCodeNull=true
+ }else{
+ this.inputCodeContent = this.inputCodeContent.toLowerCase()
+ this.inputCodeNull=false
+ }
+ },
+ departConfirm(res){
+ if(res.success){
+ let multi_depart = res.result.multi_depart
+ //0:无部门 1:一个部门 2:多个部门
+ if(multi_depart==0){
+ this.loginSuccess()
+ this.$notification.warn({
+ message: '提示',
+ description: `您尚未归属部门,请确认账号信息`,
+ duration:3
+ });
+ }else if(multi_depart==2){
+ this.departVisible=true
+ this.currentUsername=this.form.getFieldValue("username")
+ this.departList = res.result.departs
+ }else {
+ this.loginSuccess()
+ }
+ }else{
+ this.requestFailed(res)
+ this.Logout();
+ }
+ },
+ departOk(){
+ if(!this.departSelected){
+ this.validate_status='error'
+ return false
+ }
+ let obj = {
+ orgCode:this.departSelected,
+ username:this.form.getFieldValue("username")
+ }
+ putAction("/sys/selectDepart",obj).then(res=>{
+ if(res.success){
+ this.departClear()
+ this.loginSuccess()
+ }else{
+ this.requestFailed(res)
+ this.Logout().then(()=>{
+ this.departClear()
+ });
+ }
+ })
+ },
+ departClear(){
+ this.departList=[]
+ this.departSelected=""
+ this.currentUsername=""
+ this.departVisible=false
+ this.validate_status=''
+ },
+ departChange(value){
+ this.validate_status='success'
+ this.departSelected = value
+ }
}
}
</script>
@@ -314,4 +482,9 @@
}
}
+</style>
+<style>
+ .valid-error .ant-select-selection__placeholder{
+ color: #f5222d;
+ }
</style>
\ No newline at end of file
diff --git a/ant-design-jeecg-vue/yarn.lock b/ant-design-jeecg-vue/yarn.lock
deleted file mode 100644
index ba92e6f..0000000
--- a/ant-design-jeecg-vue/yarn.lock
+++ /dev/null
@@ -1,10218 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@ant-design/icons-vue@^1.0.1":
- version "1.0.1"
- resolved "https://registry.npmjs.org/@ant-design/icons-vue/-/icons-vue-1.0.1.tgz#343579219c04190831c9ca3826aec7361bb8b4d4"
- integrity sha512-WRlfa3t9/e2wwVw9FPRgJ/pan4Ttzd+JvgounFsXdpuyDm0q6djAwhjj7W/ZxWWU3XkArbcaXTMSslnn25804w==
- dependencies:
- ant-design-palettes "^1.1.3"
- babel-runtime "^6.26.0"
-
-"@ant-design/icons@^1.1.15":
- version "1.2.1"
- resolved "https://registry.npmjs.org/@ant-design/icons/-/icons-1.2.1.tgz#8e19301b1433ec67d6bbd0e892782e2ade561ff9"
- integrity sha512-gQx3nH6m1xvebOWh5xibhzVK02aoqHY7JUXUS4doAidSDRWsj5iwKC8Gq9DemDZ4T+bW6xO7jJZN1UsbvcW7Uw==
-
-"@antv/adjust@~0.1.0":
- version "0.1.0"
- resolved "http://registry.npm.taobao.org/@antv/adjust/download/@antv/adjust-0.1.0.tgz#c4bce8ba0aef7cd5b3bf271f75f434c07bd215a0"
- integrity sha1-xLzougrvfNWzvycfdfQ0wHvSFaA=
- dependencies:
- "@antv/util" "~1.3.1"
-
-"@antv/attr@~0.1.2":
- version "0.1.2"
- resolved "http://registry.npm.taobao.org/@antv/attr/download/@antv/attr-0.1.2.tgz#2eeb122fcaaf851a2d8749abc7c60519d3f77e37"
- integrity sha1-LusSL8qvhRoth0mrx8YFGdP3fjc=
- dependencies:
- "@antv/util" "~1.3.1"
-
-"@antv/component@~0.3.1":
- version "0.3.1"
- resolved "http://registry.npm.taobao.org/@antv/component/download/@antv/component-0.3.1.tgz#25eb53e3ed3a0f413896be2f83e7e704bfb6b097"
- integrity sha1-JetT4+06D0E4lr4vg+fnBL+2sJc=
- dependencies:
- "@antv/attr" "~0.1.2"
- "@antv/g" "~3.3.5"
- "@antv/util" "~1.3.1"
- wolfy87-eventemitter "~5.1.0"
-
-"@antv/coord@~0.1.0":
- version "0.1.0"
- resolved "http://registry.npm.taobao.org/@antv/coord/download/@antv/coord-0.1.0.tgz#48a80ae36d07552f96657e7f8095227c63f0c0a9"
- integrity sha1-SKgK420HVS+WZX5/gJUifGPwwKk=
- dependencies:
- "@antv/util" "~1.3.1"
-
-"@antv/data-set@^0.10.1":
- version "0.10.1"
- resolved "https://registry.yarnpkg.com/@antv/data-set/-/data-set-0.10.1.tgz#b8b103f166362508a91f69c8d0a989dbcf046ed5"
- integrity sha512-Pg2VO2i3euZke9sUZgU84Ywb/zrYQTBPMRKOgRJTvyBaTHJXAzbKYSJII5e+a2tkOR4t/sHcp0zE4Lwkrb4RRw==
- dependencies:
- "@antv/hierarchy" "~0.4.0"
- "@antv/util" "~1.3.1"
- d3-array "~1.2.0"
- d3-composite-projections "~1.2.0"
- d3-dsv "~1.0.5"
- d3-geo "~1.6.4"
- d3-geo-projection "~2.1.2"
- d3-hexjson "~1.0.1"
- d3-hierarchy "~1.1.5"
- d3-sankey "~0.7.1"
- d3-voronoi "~1.1.2"
- dagre "~0.8.2"
- point-at-length "~1.0.2"
- regression "~2.0.0"
- simple-statistics "~6.1.0"
- topojson-client "~3.0.0"
- wolfy87-eventemitter "~5.1.0"
-
-"@antv/g2-brush@^0.0.2":
- version "0.0.2"
- resolved "http://registry.npm.taobao.org/@antv/g2-brush/download/@antv/g2-brush-0.0.2.tgz#0b65f3ebbf82690202913d0b6759ab2900faa841"
- integrity sha1-C2Xz67+CaQICkT0LZ1mrKQD6qEE=
-
-"@antv/g2-plugin-slider@^2.1.0":
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/@antv/g2-plugin-slider/download/@antv/g2-plugin-slider-2.1.0.tgz#7f2f5879d33dcfb14dd2b955092ca198ad9152b9"
- integrity sha1-fy9YedM9z7FN0rlVCSyhmK2RUrk=
-
-"@antv/g2@^3.3.0":
- version "3.4.5"
- resolved "http://registry.npm.taobao.org/@antv/g2/download/@antv/g2-3.4.5.tgz#87b8b169f38af318b42e93c4cd5323f20d2d01fb"
- integrity sha1-h7ixafOK8xi0LpPEzVMj8g0tAfs=
- dependencies:
- "@antv/adjust" "~0.1.0"
- "@antv/attr" "~0.1.2"
- "@antv/component" "~0.3.1"
- "@antv/coord" "~0.1.0"
- "@antv/g" "~3.3.5"
- "@antv/scale" "~0.1.0"
- "@antv/util" "~1.3.1"
- venn.js "~0.2.20"
- wolfy87-eventemitter "~5.1.0"
-
-"@antv/g@~3.3.5":
- version "3.3.5"
- resolved "http://registry.npm.taobao.org/@antv/g/download/@antv/g-3.3.5.tgz#9959baad1b85199614e591c9926879afb1fbb943"
- integrity sha1-mVm6rRuFGZYU5ZHJkmh5r7H7uUM=
- dependencies:
- "@antv/gl-matrix" "~2.7.1"
- "@antv/util" "~1.3.1"
- d3-ease "~1.0.3"
- d3-interpolate "~1.1.5"
- d3-timer "~1.0.6"
- wolfy87-eventemitter "~5.1.0"
-
-"@antv/gl-matrix@^2.7.1", "@antv/gl-matrix@~2.7.1":
- version "2.7.1"
- resolved "http://registry.npm.taobao.org/@antv/gl-matrix/download/@antv/gl-matrix-2.7.1.tgz#acb8e37f7ab3df01345aba4372d7942be42eba14"
- integrity sha1-rLjjf3qz3wE0WrpDcteUK+QuuhQ=
-
-"@antv/hierarchy@~0.4.0":
- version "0.4.0"
- resolved "https://registry.yarnpkg.com/@antv/hierarchy/-/hierarchy-0.4.0.tgz#712b5b4477ee0b8b8db174c682b5356b0411aab6"
- integrity sha512-ols+m+Z8QA4895SWMTOSjVImOX4tEbWQTwJ0NE+WATc0WLSKs6D9y2yaR+ZWt6P60BMGVIKS6lIfabO3CwGgnQ==
- dependencies:
- "@antv/util" "~1.3.1"
-
-"@antv/scale@~0.1.0":
- version "0.1.0"
- resolved "http://registry.npm.taobao.org/@antv/scale/download/@antv/scale-0.1.0.tgz#2b5459a100f97aac04781376d53904ccab18aab7"
- integrity sha1-K1RZoQD5eqwEeBN21TkEzKsYqrc=
- dependencies:
- "@antv/util" "~1.3.1"
- fecha "~2.3.3"
-
-"@antv/util@~1.3.1":
- version "1.3.1"
- resolved "http://registry.npm.taobao.org/@antv/util/download/@antv/util-1.3.1.tgz#30a34b201ff9126ec0d58c72c8166a9c3e644ccd"
- integrity sha1-MKNLIB/5Em7A1YxyyBZqnD5kTM0=
- dependencies:
- "@antv/gl-matrix" "^2.7.1"
-
-"@babel/code-frame@7.0.0-beta.44":
- version "7.0.0-beta.44"
- resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz#2a02643368de80916162be70865c97774f3adbd9"
- integrity sha512-cuAuTTIQ9RqcFRJ/Y8PvTh+paepNcaGxwQwjIDRWPXmzzyAeCO4KqS9ikMvq0MCbRk6GlYKwfzStrcP3/jSL8g==
- dependencies:
- "@babel/highlight" "7.0.0-beta.44"
-
-"@babel/code-frame@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
- integrity sha1-BuKrGb21NThVWaq7W6WXKUgoAPg=
- dependencies:
- "@babel/highlight" "^7.0.0"
-
-"@babel/core@^7.0.0", "@babel/core@^7.1.2":
- version "7.1.6"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.1.6.tgz#3733cbee4317429bc87c62b29cf8587dba7baeb3"
- integrity sha512-Hz6PJT6e44iUNpAn8AoyAs6B3bl60g7MJQaI0rZEar6ECzh6+srYO1xlIdssio34mPaUtAb1y+XlkkSJzok3yw==
- dependencies:
- "@babel/code-frame" "^7.0.0"
- "@babel/generator" "^7.1.6"
- "@babel/helpers" "^7.1.5"
- "@babel/parser" "^7.1.6"
- "@babel/template" "^7.1.2"
- "@babel/traverse" "^7.1.6"
- "@babel/types" "^7.1.6"
- convert-source-map "^1.1.0"
- debug "^4.1.0"
- json5 "^2.1.0"
- lodash "^4.17.10"
- resolve "^1.3.2"
- semver "^5.4.1"
- source-map "^0.5.0"
-
-"@babel/generator@7.0.0-beta.44":
- version "7.0.0-beta.44"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.44.tgz#c7e67b9b5284afcf69b309b50d7d37f3e5033d42"
- integrity sha512-5xVb7hlhjGcdkKpMXgicAVgx8syK5VJz193k0i/0sLP6DzE6lRrU1K3B/rFefgdo9LPGMAOOOAWW4jycj07ShQ==
- dependencies:
- "@babel/types" "7.0.0-beta.44"
- jsesc "^2.5.1"
- lodash "^4.2.0"
- source-map "^0.5.0"
- trim-right "^1.0.1"
-
-"@babel/generator@^7.1.6":
- version "7.1.6"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.1.6.tgz#001303cf87a5b9d093494a4bf251d7b5d03d3999"
- integrity sha512-brwPBtVvdYdGxtenbQgfCdDPmtkmUBZPjUoK5SXJEBuHaA5BCubh9ly65fzXz7R6o5rA76Rs22ES8Z+HCc0YIQ==
- dependencies:
- "@babel/types" "^7.1.6"
- jsesc "^2.5.1"
- lodash "^4.17.10"
- source-map "^0.5.0"
- trim-right "^1.0.1"
-
-"@babel/helper-annotate-as-pure@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/helper-annotate-as-pure/download/@babel/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"
- integrity sha1-Mj053QtQ4Qx8Bsp9djjmhk2MXDI=
- dependencies:
- "@babel/types" "^7.0.0"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0":
- version "7.1.0"
- resolved "http://registry.npm.taobao.org/@babel/helper-builder-binary-assignment-operator-visitor/download/@babel/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"
- integrity sha1-a2lijf5Ah3mODE7Zjj1Kay+9L18=
- dependencies:
- "@babel/helper-explode-assignable-expression" "^7.1.0"
- "@babel/types" "^7.0.0"
-
-"@babel/helper-call-delegate@^7.1.0":
- version "7.1.0"
- resolved "http://registry.npm.taobao.org/@babel/helper-call-delegate/download/@babel/helper-call-delegate-7.1.0.tgz#6a957f105f37755e8645343d3038a22e1449cc4a"
- integrity sha1-apV/EF83dV6GRTQ9MDiiLhRJzEo=
- dependencies:
- "@babel/helper-hoist-variables" "^7.0.0"
- "@babel/traverse" "^7.1.0"
- "@babel/types" "^7.0.0"
-
-"@babel/helper-define-map@^7.1.0":
- version "7.1.0"
- resolved "http://registry.npm.taobao.org/@babel/helper-define-map/download/@babel/helper-define-map-7.1.0.tgz#3b74caec329b3c80c116290887c0dd9ae468c20c"
- integrity sha1-O3TK7DKbPIDBFikIh8DdmuRowgw=
- dependencies:
- "@babel/helper-function-name" "^7.1.0"
- "@babel/types" "^7.0.0"
- lodash "^4.17.10"
-
-"@babel/helper-explode-assignable-expression@^7.1.0":
- version "7.1.0"
- resolved "http://registry.npm.taobao.org/@babel/helper-explode-assignable-expression/download/@babel/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6"
- integrity sha1-U3+hP28WdN90WwwA7I/k6ZaByPY=
- dependencies:
- "@babel/traverse" "^7.1.0"
- "@babel/types" "^7.0.0"
-
-"@babel/helper-function-name@7.0.0-beta.44":
- version "7.0.0-beta.44"
- resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.44.tgz#e18552aaae2231100a6e485e03854bc3532d44dd"
- integrity sha512-MHRG2qZMKMFaBavX0LWpfZ2e+hLloT++N7rfM3DYOMUOGCD8cVjqZpwiL8a0bOX3IYcQev1ruciT0gdFFRTxzg==
- dependencies:
- "@babel/helper-get-function-arity" "7.0.0-beta.44"
- "@babel/template" "7.0.0-beta.44"
- "@babel/types" "7.0.0-beta.44"
-
-"@babel/helper-function-name@^7.1.0":
- version "7.1.0"
- resolved "http://registry.npm.taobao.org/@babel/helper-function-name/download/@babel/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
- integrity sha1-oM6wFoX3M1XUNgwSR/WCv6/I/1M=
- dependencies:
- "@babel/helper-get-function-arity" "^7.0.0"
- "@babel/template" "^7.1.0"
- "@babel/types" "^7.0.0"
-
-"@babel/helper-get-function-arity@7.0.0-beta.44":
- version "7.0.0-beta.44"
- resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.44.tgz#d03ca6dd2b9f7b0b1e6b32c56c72836140db3a15"
- integrity sha512-w0YjWVwrM2HwP6/H3sEgrSQdkCaxppqFeJtAnB23pRiJB5E/O9Yp7JAAeWBl+gGEgmBFinnTyOv2RN7rcSmMiw==
- dependencies:
- "@babel/types" "7.0.0-beta.44"
-
-"@babel/helper-get-function-arity@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/helper-get-function-arity/download/@babel/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
- integrity sha1-g1ctQyDipGVyY3NBE8QoaLZOScM=
- dependencies:
- "@babel/types" "^7.0.0"
-
-"@babel/helper-hoist-variables@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/helper-hoist-variables/download/@babel/helper-hoist-variables-7.0.0.tgz#46adc4c5e758645ae7a45deb92bab0918c23bb88"
- integrity sha1-Rq3ExedYZFrnpF3rkrqwkYwju4g=
- dependencies:
- "@babel/types" "^7.0.0"
-
-"@babel/helper-member-expression-to-functions@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/helper-member-expression-to-functions/download/@babel/helper-member-expression-to-functions-7.0.0.tgz#8cd14b0a0df7ff00f009e7d7a436945f47c7a16f"
- integrity sha1-jNFLCg33/wDwCefXpDaUX0fHoW8=
- dependencies:
- "@babel/types" "^7.0.0"
-
-"@babel/helper-module-imports@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/helper-module-imports/download/@babel/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d"
- integrity sha1-lggbcRHkhtpNLNlxrRpP4hbMLj0=
- dependencies:
- "@babel/types" "^7.0.0"
-
-"@babel/helper-module-transforms@^7.1.0":
- version "7.1.0"
- resolved "http://registry.npm.taobao.org/@babel/helper-module-transforms/download/@babel/helper-module-transforms-7.1.0.tgz#470d4f9676d9fad50b324cdcce5fbabbc3da5787"
- integrity sha1-Rw1PlnbZ+tULMkzczl+6u8PaV4c=
- dependencies:
- "@babel/helper-module-imports" "^7.0.0"
- "@babel/helper-simple-access" "^7.1.0"
- "@babel/helper-split-export-declaration" "^7.0.0"
- "@babel/template" "^7.1.0"
- "@babel/types" "^7.0.0"
- lodash "^4.17.10"
-
-"@babel/helper-optimise-call-expression@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/helper-optimise-call-expression/download/@babel/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5"
- integrity sha1-opIMVwKwc8Fd5REGIAqoytIEl9U=
- dependencies:
- "@babel/types" "^7.0.0"
-
-"@babel/helper-plugin-utils@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
- integrity sha1-u7P77phmHFaQNCN8wDlnupm08lA=
-
-"@babel/helper-regex@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/helper-regex/download/@babel/helper-regex-7.0.0.tgz#2c1718923b57f9bbe64705ffe5640ac64d9bdb27"
- integrity sha1-LBcYkjtX+bvmRwX/5WQKxk2b2yc=
- dependencies:
- lodash "^4.17.10"
-
-"@babel/helper-remap-async-to-generator@^7.1.0":
- version "7.1.0"
- resolved "http://registry.npm.taobao.org/@babel/helper-remap-async-to-generator/download/@babel/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f"
- integrity sha1-Nh2AghtvONp1vT8HheziCojF/n8=
- dependencies:
- "@babel/helper-annotate-as-pure" "^7.0.0"
- "@babel/helper-wrap-function" "^7.1.0"
- "@babel/template" "^7.1.0"
- "@babel/traverse" "^7.1.0"
- "@babel/types" "^7.0.0"
-
-"@babel/helper-replace-supers@^7.1.0":
- version "7.1.0"
- resolved "http://registry.npm.taobao.org/@babel/helper-replace-supers/download/@babel/helper-replace-supers-7.1.0.tgz#5fc31de522ec0ef0899dc9b3e7cf6a5dd655f362"
- integrity sha1-X8Md5SLsDvCJncmz589qXdZV82I=
- dependencies:
- "@babel/helper-member-expression-to-functions" "^7.0.0"
- "@babel/helper-optimise-call-expression" "^7.0.0"
- "@babel/traverse" "^7.1.0"
- "@babel/types" "^7.0.0"
-
-"@babel/helper-simple-access@^7.1.0":
- version "7.1.0"
- resolved "http://registry.npm.taobao.org/@babel/helper-simple-access/download/@babel/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c"
- integrity sha1-Ze65VMjCRb6qToWdphiPOdceWFw=
- dependencies:
- "@babel/template" "^7.1.0"
- "@babel/types" "^7.0.0"
-
-"@babel/helper-split-export-declaration@7.0.0-beta.44":
- version "7.0.0-beta.44"
- resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.44.tgz#c0b351735e0fbcb3822c8ad8db4e583b05ebd9dc"
- integrity sha512-aQ7QowtkgKKzPGf0j6u77kBMdUFVBKNHw2p/3HX/POt5/oz8ec5cs0GwlgM8Hz7ui5EwJnzyfRmkNF1Nx1N7aA==
- dependencies:
- "@babel/types" "7.0.0-beta.44"
-
-"@babel/helper-split-export-declaration@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/helper-split-export-declaration/download/@babel/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
- integrity sha1-Oq4oXAMRwqsJXZl7jJqUytVH2BM=
- dependencies:
- "@babel/types" "^7.0.0"
-
-"@babel/helper-wrap-function@^7.1.0":
- version "7.1.0"
- resolved "http://registry.npm.taobao.org/@babel/helper-wrap-function/download/@babel/helper-wrap-function-7.1.0.tgz#8cf54e9190706067f016af8f75cb3df829cc8c66"
- integrity sha1-jPVOkZBwYGfwFq+Pdcs9+CnMjGY=
- dependencies:
- "@babel/helper-function-name" "^7.1.0"
- "@babel/template" "^7.1.0"
- "@babel/traverse" "^7.1.0"
- "@babel/types" "^7.0.0"
-
-"@babel/helpers@^7.1.5":
- version "7.1.5"
- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.1.5.tgz#68bfc1895d685f2b8f1995e788dbfe1f6ccb1996"
- integrity sha512-2jkcdL02ywNBry1YNFAH/fViq4fXG0vdckHqeJk+75fpQ2OH+Az6076tX/M0835zA45E0Cqa6pV5Kiv9YOqjEg==
- dependencies:
- "@babel/template" "^7.1.2"
- "@babel/traverse" "^7.1.5"
- "@babel/types" "^7.1.5"
-
-"@babel/highlight@7.0.0-beta.44":
- version "7.0.0-beta.44"
- resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.44.tgz#18c94ce543916a80553edcdcf681890b200747d5"
- integrity sha512-Il19yJvy7vMFm8AVAh6OZzaFoAd0hbkeMZiX3P5HGD+z7dyI7RzndHB0dg6Urh/VAFfHtpOIzDUSxmY6coyZWQ==
- dependencies:
- chalk "^2.0.0"
- esutils "^2.0.2"
- js-tokens "^3.0.0"
-
-"@babel/highlight@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/highlight/download/@babel/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
- integrity sha1-9xDDjI1Fjm3ZogGvtjf8t4HOmeQ=
- dependencies:
- chalk "^2.0.0"
- esutils "^2.0.2"
- js-tokens "^4.0.0"
-
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.2", "@babel/parser@^7.1.6":
- version "7.1.6"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.6.tgz#16e97aca1ec1062324a01c5a6a7d0df8dd189854"
- integrity sha512-dWP6LJm9nKT6ALaa+bnL247GHHMWir3vSlZ2+IHgHgktZQx0L3Uvq2uAWcuzIe+fujRsYWBW2q622C5UvGK9iQ==
-
-"@babel/plugin-proposal-async-generator-functions@^7.1.0":
- version "7.1.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-proposal-async-generator-functions/download/@babel/plugin-proposal-async-generator-functions-7.1.0.tgz#41c1a702e10081456e23a7b74d891922dd1bb6ce"
- integrity sha1-QcGnAuEAgUVuI6e3TYkZIt0bts4=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
- "@babel/helper-remap-async-to-generator" "^7.1.0"
- "@babel/plugin-syntax-async-generators" "^7.0.0"
-
-"@babel/plugin-proposal-class-properties@^7.0.0":
- version "7.1.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.1.0.tgz#9af01856b1241db60ec8838d84691aa0bd1e8df4"
- integrity sha512-/PCJWN+CKt5v1xcGn4vnuu13QDoV+P7NcICP44BoonAJoPSGwVkgrXihFIQGiEjjPlUDBIw1cM7wYFLARS2/hw==
- dependencies:
- "@babel/helper-function-name" "^7.1.0"
- "@babel/helper-member-expression-to-functions" "^7.0.0"
- "@babel/helper-optimise-call-expression" "^7.0.0"
- "@babel/helper-plugin-utils" "^7.0.0"
- "@babel/helper-replace-supers" "^7.1.0"
- "@babel/plugin-syntax-class-properties" "^7.0.0"
-
-"@babel/plugin-proposal-decorators@^7.1.0":
- version "7.1.6"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.1.6.tgz#460c31edbd01953efe45d491583b3ec31661d689"
- integrity sha512-U42f8KhUbtlhUDyV/wK4Rq/wWh8vWyttYABckG/v0vVnMPvayOewZC/83CbVdmyP+UhEqI368FEQ7hHMfhBpQA==
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
- "@babel/helper-replace-supers" "^7.1.0"
- "@babel/helper-split-export-declaration" "^7.0.0"
- "@babel/plugin-syntax-decorators" "^7.1.0"
-
-"@babel/plugin-proposal-json-strings@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-proposal-json-strings/download/@babel/plugin-proposal-json-strings-7.0.0.tgz#3b4d7b5cf51e1f2e70f52351d28d44fc2970d01e"
- integrity sha1-O017XPUeHy5w9SNR0o1E/Clw0B4=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
- "@babel/plugin-syntax-json-strings" "^7.0.0"
-
-"@babel/plugin-proposal-object-rest-spread@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-proposal-object-rest-spread/download/@babel/plugin-proposal-object-rest-spread-7.0.0.tgz#9a17b547f64d0676b6c9cecd4edf74a82ab85e7e"
- integrity sha1-mhe1R/ZNBna2yc7NTt90qCq4Xn4=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
- "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
-
-"@babel/plugin-proposal-optional-catch-binding@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-proposal-optional-catch-binding/download/@babel/plugin-proposal-optional-catch-binding-7.0.0.tgz#b610d928fe551ff7117d42c8bb410eec312a6425"
- integrity sha1-thDZKP5VH/cRfULIu0EO7DEqZCU=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
- "@babel/plugin-syntax-optional-catch-binding" "^7.0.0"
-
-"@babel/plugin-proposal-unicode-property-regex@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-proposal-unicode-property-regex/download/@babel/plugin-proposal-unicode-property-regex-7.0.0.tgz#498b39cd72536cd7c4b26177d030226eba08cd33"
- integrity sha1-SYs5zXJTbNfEsmF30DAibroIzTM=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
- "@babel/helper-regex" "^7.0.0"
- regexpu-core "^4.2.0"
-
-"@babel/plugin-syntax-async-generators@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-syntax-async-generators/download/@babel/plugin-syntax-async-generators-7.0.0.tgz#bf0891dcdbf59558359d0c626fdc9490e20bc13c"
- integrity sha1-vwiR3Nv1lVg1nQxib9yUkOILwTw=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-class-properties@^7.0.0":
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.0.0.tgz#e051af5d300cbfbcec4a7476e37a803489881634"
- integrity sha512-cR12g0Qzn4sgkjrbrzWy2GE7m9vMl/sFkqZ3gIpAQdrvPDnLM8180i+ANDFIXfjHo9aqp0ccJlQ0QNZcFUbf9w==
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-decorators@^7.1.0":
- version "7.1.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.1.0.tgz#2fa7c1a7905a299c9853ebcef340306675f9cbdc"
- integrity sha512-uQvRSbgQ0nQg3jsmIixXXDCgSpkBolJ9X7NYThMKCcjvE8dN2uWJUzTUNNAeuKOjARTd+wUQV0ztXpgunZYKzQ==
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-dynamic-import@^7.0.0":
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.0.0.tgz#6dfb7d8b6c3be14ce952962f658f3b7eb54c33ee"
- integrity sha512-Gt9xNyRrCHCiyX/ZxDGOcBnlJl0I3IWicpZRC4CdC0P5a/I07Ya2OAMEBU+J7GmRFVmIetqEYRko6QYRuKOESw==
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-json-strings@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-syntax-json-strings/download/@babel/plugin-syntax-json-strings-7.0.0.tgz#0d259a68090e15b383ce3710e01d5b23f3770cbd"
- integrity sha1-DSWaaAkOFbODzjcQ4B1bI/N3DL0=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-jsx@^7.0.0":
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.0.0.tgz#034d5e2b4e14ccaea2e4c137af7e4afb39375ffd"
- integrity sha512-PdmL2AoPsCLWxhIr3kG2+F9v4WH06Q3z+NoGVpQgnUNGcagXHq5sB3OXxkSahKq9TLdNMN/AJzFYSOo8UKDMHg==
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-jsx@^7.2.0":
- version "7.2.0"
- resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz#0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7"
- integrity sha512-VyN4QANJkRW6lDBmENzRszvZf3/4AXaj9YR7GwrWeeN9tEBPuXbmDYVU9bYBN0D70zCWVwUy0HWq2553VCb6Hw==
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-object-rest-spread@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-syntax-object-rest-spread/download/@babel/plugin-syntax-object-rest-spread-7.0.0.tgz#37d8fbcaf216bd658ea1aebbeb8b75e88ebc549b"
- integrity sha1-N9j7yvIWvWWOoa6764t16I68VJs=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-optional-catch-binding@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-syntax-optional-catch-binding/download/@babel/plugin-syntax-optional-catch-binding-7.0.0.tgz#886f72008b3a8b185977f7cb70713b45e51ee475"
- integrity sha1-iG9yAIs6ixhZd/fLcHE7ReUe5HU=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-arrow-functions@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-arrow-functions/download/@babel/plugin-transform-arrow-functions-7.0.0.tgz#a6c14875848c68a3b4b3163a486535ef25c7e749"
- integrity sha1-psFIdYSMaKO0sxY6SGU17yXH50k=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-async-to-generator@^7.1.0":
- version "7.1.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-async-to-generator/download/@babel/plugin-transform-async-to-generator-7.1.0.tgz#109e036496c51dd65857e16acab3bafdf3c57811"
- integrity sha1-EJ4DZJbFHdZYV+FqyrO6/fPFeBE=
- dependencies:
- "@babel/helper-module-imports" "^7.0.0"
- "@babel/helper-plugin-utils" "^7.0.0"
- "@babel/helper-remap-async-to-generator" "^7.1.0"
-
-"@babel/plugin-transform-block-scoped-functions@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-block-scoped-functions/download/@babel/plugin-transform-block-scoped-functions-7.0.0.tgz#482b3f75103927e37288b3b67b65f848e2aa0d07"
- integrity sha1-SCs/dRA5J+NyiLO2e2X4SOKqDQc=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-block-scoping@^7.1.5":
- version "7.1.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.1.5.tgz#3e8e0bc9a5104519923302a24f748f72f2f61f37"
- integrity sha512-jlYcDrz+5ayWC7mxgpn1Wj8zj0mmjCT2w0mPIMSwO926eXBRxpEgoN/uQVRBfjtr8ayjcmS+xk2G1jaP8JjMJQ==
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
- lodash "^4.17.10"
-
-"@babel/plugin-transform-classes@^7.1.0":
- version "7.1.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-classes/download/@babel/plugin-transform-classes-7.1.0.tgz#ab3f8a564361800cbc8ab1ca6f21108038432249"
- integrity sha1-qz+KVkNhgAy8irHKbyEQgDhDIkk=
- dependencies:
- "@babel/helper-annotate-as-pure" "^7.0.0"
- "@babel/helper-define-map" "^7.1.0"
- "@babel/helper-function-name" "^7.1.0"
- "@babel/helper-optimise-call-expression" "^7.0.0"
- "@babel/helper-plugin-utils" "^7.0.0"
- "@babel/helper-replace-supers" "^7.1.0"
- "@babel/helper-split-export-declaration" "^7.0.0"
- globals "^11.1.0"
-
-"@babel/plugin-transform-computed-properties@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-computed-properties/download/@babel/plugin-transform-computed-properties-7.0.0.tgz#2fbb8900cd3e8258f2a2ede909b90e7556185e31"
- integrity sha1-L7uJAM0+gljyou3pCbkOdVYYXjE=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-destructuring@^7.0.0":
- version "7.1.3"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-destructuring/download/@babel/plugin-transform-destructuring-7.1.3.tgz#e69ff50ca01fac6cb72863c544e516c2b193012f"
- integrity sha1-5p/1DKAfrGy3KGPFROUWwrGTAS8=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-dotall-regex@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-dotall-regex/download/@babel/plugin-transform-dotall-regex-7.0.0.tgz#73a24da69bc3c370251f43a3d048198546115e58"
- integrity sha1-c6JNppvDw3AlH0Oj0EgZhUYRXlg=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
- "@babel/helper-regex" "^7.0.0"
- regexpu-core "^4.1.3"
-
-"@babel/plugin-transform-duplicate-keys@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-duplicate-keys/download/@babel/plugin-transform-duplicate-keys-7.0.0.tgz#a0601e580991e7cace080e4cf919cfd58da74e86"
- integrity sha1-oGAeWAmR58rOCA5M+RnP1Y2nToY=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-exponentiation-operator@^7.1.0":
- version "7.1.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-exponentiation-operator/download/@babel/plugin-transform-exponentiation-operator-7.1.0.tgz#9c34c2ee7fd77e02779cfa37e403a2e1003ccc73"
- integrity sha1-nDTC7n/XfgJ3nPo35AOi4QA8zHM=
- dependencies:
- "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-for-of@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-for-of/download/@babel/plugin-transform-for-of-7.0.0.tgz#f2ba4eadb83bd17dc3c7e9b30f4707365e1c3e39"
- integrity sha1-8rpOrbg70X3Dx+mzD0cHNl4cPjk=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-function-name@^7.1.0":
- version "7.1.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-function-name/download/@babel/plugin-transform-function-name-7.1.0.tgz#29c5550d5c46208e7f730516d41eeddd4affadbb"
- integrity sha1-KcVVDVxGII5/cwUW1B7t3Ur/rbs=
- dependencies:
- "@babel/helper-function-name" "^7.1.0"
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-literals@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-literals/download/@babel/plugin-transform-literals-7.0.0.tgz#2aec1d29cdd24c407359c930cdd89e914ee8ff86"
- integrity sha1-KuwdKc3STEBzWckwzdiekU7o/4Y=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-modules-amd@^7.1.0":
- version "7.1.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-modules-amd/download/@babel/plugin-transform-modules-amd-7.1.0.tgz#f9e0a7072c12e296079b5a59f408ff5b97bf86a8"
- integrity sha1-+eCnBywS4pYHm1pZ9Aj/W5e/hqg=
- dependencies:
- "@babel/helper-module-transforms" "^7.1.0"
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-modules-commonjs@^7.1.0":
- version "7.1.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-modules-commonjs/download/@babel/plugin-transform-modules-commonjs-7.1.0.tgz#0a9d86451cbbfb29bd15186306897c67f6f9a05c"
- integrity sha1-Cp2GRRy7+ym9FRhjBol8Z/b5oFw=
- dependencies:
- "@babel/helper-module-transforms" "^7.1.0"
- "@babel/helper-plugin-utils" "^7.0.0"
- "@babel/helper-simple-access" "^7.1.0"
-
-"@babel/plugin-transform-modules-systemjs@^7.0.0":
- version "7.1.3"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-modules-systemjs/download/@babel/plugin-transform-modules-systemjs-7.1.3.tgz#2119a3e3db612fd74a19d88652efbfe9613a5db0"
- integrity sha1-IRmj49thL9dKGdiGUu+/6WE6XbA=
- dependencies:
- "@babel/helper-hoist-variables" "^7.0.0"
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-modules-umd@^7.1.0":
- version "7.1.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-modules-umd/download/@babel/plugin-transform-modules-umd-7.1.0.tgz#a29a7d85d6f28c3561c33964442257cc6a21f2a8"
- integrity sha1-opp9hdbyjDVhwzlkRCJXzGoh8qg=
- dependencies:
- "@babel/helper-module-transforms" "^7.1.0"
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-new-target@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-new-target/download/@babel/plugin-transform-new-target-7.0.0.tgz#ae8fbd89517fa7892d20e6564e641e8770c3aa4a"
- integrity sha1-ro+9iVF/p4ktIOZWTmQeh3DDqko=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-object-super@^7.1.0":
- version "7.1.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-object-super/download/@babel/plugin-transform-object-super-7.1.0.tgz#b1ae194a054b826d8d4ba7ca91486d4ada0f91bb"
- integrity sha1-sa4ZSgVLgm2NS6fKkUhtStoPkbs=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
- "@babel/helper-replace-supers" "^7.1.0"
-
-"@babel/plugin-transform-parameters@^7.1.0":
- version "7.1.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-parameters/download/@babel/plugin-transform-parameters-7.1.0.tgz#44f492f9d618c9124026e62301c296bf606a7aed"
- integrity sha1-RPSS+dYYyRJAJuYjAcKWv2Bqeu0=
- dependencies:
- "@babel/helper-call-delegate" "^7.1.0"
- "@babel/helper-get-function-arity" "^7.0.0"
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-regenerator@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-regenerator/download/@babel/plugin-transform-regenerator-7.0.0.tgz#5b41686b4ed40bef874d7ed6a84bdd849c13e0c1"
- integrity sha1-W0Foa07UC++HTX7WqEvdhJwT4ME=
- dependencies:
- regenerator-transform "^0.13.3"
-
-"@babel/plugin-transform-runtime@^7.0.0", "@babel/plugin-transform-runtime@^7.1.0":
- version "7.1.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.1.0.tgz#9f76920d42551bb577e2dc594df229b5f7624b63"
- integrity sha512-WFLMgzu5DLQEah0lKTJzYb14vd6UiES7PTnXcvrPZ1VrwFeJ+mTbvr65fFAsXYMt2bIoOoC0jk76zY1S7HZjUg==
- dependencies:
- "@babel/helper-module-imports" "^7.0.0"
- "@babel/helper-plugin-utils" "^7.0.0"
- resolve "^1.8.1"
- semver "^5.5.1"
-
-"@babel/plugin-transform-shorthand-properties@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-shorthand-properties/download/@babel/plugin-transform-shorthand-properties-7.0.0.tgz#85f8af592dcc07647541a0350e8c95c7bf419d15"
- integrity sha1-hfivWS3MB2R1QaA1DoyVx79BnRU=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-spread@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-spread/download/@babel/plugin-transform-spread-7.0.0.tgz#93583ce48dd8c85e53f3a46056c856e4af30b49b"
- integrity sha1-k1g85I3YyF5T86RgVshW5K8wtJs=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-sticky-regex@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-sticky-regex/download/@babel/plugin-transform-sticky-regex-7.0.0.tgz#30a9d64ac2ab46eec087b8530535becd90e73366"
- integrity sha1-MKnWSsKrRu7Ah7hTBTW+zZDnM2Y=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
- "@babel/helper-regex" "^7.0.0"
-
-"@babel/plugin-transform-template-literals@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-template-literals/download/@babel/plugin-transform-template-literals-7.0.0.tgz#084f1952efe5b153ddae69eb8945f882c7a97c65"
- integrity sha1-CE8ZUu/lsVPdrmnriUX4gsepfGU=
- dependencies:
- "@babel/helper-annotate-as-pure" "^7.0.0"
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-typeof-symbol@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-typeof-symbol/download/@babel/plugin-transform-typeof-symbol-7.0.0.tgz#4dcf1e52e943e5267b7313bff347fdbe0f81cec9"
- integrity sha1-Tc8eUulD5SZ7cxO/80f9vg+Bzsk=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-unicode-regex@^7.0.0":
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/@babel/plugin-transform-unicode-regex/download/@babel/plugin-transform-unicode-regex-7.0.0.tgz#c6780e5b1863a76fe792d90eded9fcd5b51d68fc"
- integrity sha1-xngOWxhjp2/nktkO3tn81bUdaPw=
- dependencies:
- "@babel/helper-plugin-utils" "^7.0.0"
- "@babel/helper-regex" "^7.0.0"
- regexpu-core "^4.1.3"
-
-"@babel/polyfill@^7.2.5":
- version "7.2.5"
- resolved "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.2.5.tgz#6c54b964f71ad27edddc567d065e57e87ed7fa7d"
- integrity sha512-8Y/t3MWThtMLYr0YNC/Q76tqN1w30+b0uQMeFUYauG2UGTR19zyUtFrAzT23zNtBxPp+LbE5E/nwV/q/r3y6ug==
- dependencies:
- core-js "^2.5.7"
- regenerator-runtime "^0.12.0"
-
-"@babel/preset-env@^7.0.0", "@babel/preset-env@^7.1.0":
- version "7.1.6"
- resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.1.6.tgz#a0bf4b96b6bfcf6e000afc5b72b4abe7cc13ae97"
- integrity sha512-YIBfpJNQMBkb6MCkjz/A9J76SNCSuGVamOVBgoUkLzpJD/z8ghHi9I42LQ4pulVX68N/MmImz6ZTixt7Azgexw==
- dependencies:
- "@babel/helper-module-imports" "^7.0.0"
- "@babel/helper-plugin-utils" "^7.0.0"
- "@babel/plugin-proposal-async-generator-functions" "^7.1.0"
- "@babel/plugin-proposal-json-strings" "^7.0.0"
- "@babel/plugin-proposal-object-rest-spread" "^7.0.0"
- "@babel/plugin-proposal-optional-catch-binding" "^7.0.0"
- "@babel/plugin-proposal-unicode-property-regex" "^7.0.0"
- "@babel/plugin-syntax-async-generators" "^7.0.0"
- "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
- "@babel/plugin-syntax-optional-catch-binding" "^7.0.0"
- "@babel/plugin-transform-arrow-functions" "^7.0.0"
- "@babel/plugin-transform-async-to-generator" "^7.1.0"
- "@babel/plugin-transform-block-scoped-functions" "^7.0.0"
- "@babel/plugin-transform-block-scoping" "^7.1.5"
- "@babel/plugin-transform-classes" "^7.1.0"
- "@babel/plugin-transform-computed-properties" "^7.0.0"
- "@babel/plugin-transform-destructuring" "^7.0.0"
- "@babel/plugin-transform-dotall-regex" "^7.0.0"
- "@babel/plugin-transform-duplicate-keys" "^7.0.0"
- "@babel/plugin-transform-exponentiation-operator" "^7.1.0"
- "@babel/plugin-transform-for-of" "^7.0.0"
- "@babel/plugin-transform-function-name" "^7.1.0"
- "@babel/plugin-transform-literals" "^7.0.0"
- "@babel/plugin-transform-modules-amd" "^7.1.0"
- "@babel/plugin-transform-modules-commonjs" "^7.1.0"
- "@babel/plugin-transform-modules-systemjs" "^7.0.0"
- "@babel/plugin-transform-modules-umd" "^7.1.0"
- "@babel/plugin-transform-new-target" "^7.0.0"
- "@babel/plugin-transform-object-super" "^7.1.0"
- "@babel/plugin-transform-parameters" "^7.1.0"
- "@babel/plugin-transform-regenerator" "^7.0.0"
- "@babel/plugin-transform-shorthand-properties" "^7.0.0"
- "@babel/plugin-transform-spread" "^7.0.0"
- "@babel/plugin-transform-sticky-regex" "^7.0.0"
- "@babel/plugin-transform-template-literals" "^7.0.0"
- "@babel/plugin-transform-typeof-symbol" "^7.0.0"
- "@babel/plugin-transform-unicode-regex" "^7.0.0"
- browserslist "^4.1.0"
- invariant "^2.2.2"
- js-levenshtein "^1.1.3"
- semver "^5.3.0"
-
-"@babel/runtime-corejs2@^7.2.0":
- version "7.3.4"
- resolved "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.3.4.tgz#63f8bbc77622da202e9ea6f8f6e3bf28991832d9"
- integrity sha512-QwPuQE65kNxjsNKk34Rfgen2R5fk0J2So99SD45uXBp34QOfyz11SqVgJ4xvyCpnCIieSQ0X0hSSc9z/ymlJJw==
- dependencies:
- core-js "^2.5.7"
- regenerator-runtime "^0.12.0"
-
-"@babel/runtime@^7.0.0":
- version "7.1.5"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.1.5.tgz#4170907641cf1f61508f563ece3725150cc6fe39"
- integrity sha512-xKnPpXG/pvK1B90JkwwxSGii90rQGKtzcMt2gI5G6+M0REXaq6rOHsGC2ay6/d0Uje7zzvSzjEzfR3ENhFlrfA==
- dependencies:
- regenerator-runtime "^0.12.0"
-
-"@babel/template@7.0.0-beta.44":
- version "7.0.0-beta.44"
- resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.44.tgz#f8832f4fdcee5d59bf515e595fc5106c529b394f"
- integrity sha512-w750Sloq0UNifLx1rUqwfbnC6uSUk0mfwwgGRfdLiaUzfAOiH0tHJE6ILQIUi3KYkjiCDTskoIsnfqZvWLBDng==
- dependencies:
- "@babel/code-frame" "7.0.0-beta.44"
- "@babel/types" "7.0.0-beta.44"
- babylon "7.0.0-beta.44"
- lodash "^4.2.0"
-
-"@babel/template@^7.1.0", "@babel/template@^7.1.2":
- version "7.1.2"
- resolved "http://registry.npm.taobao.org/@babel/template/download/@babel/template-7.1.2.tgz#090484a574fef5a2d2d7726a674eceda5c5b5644"
- integrity sha1-CQSEpXT+9aLS13JqZ07O2lxbVkQ=
- dependencies:
- "@babel/code-frame" "^7.0.0"
- "@babel/parser" "^7.1.2"
- "@babel/types" "^7.1.2"
-
-"@babel/traverse@7.0.0-beta.44":
- version "7.0.0-beta.44"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.44.tgz#a970a2c45477ad18017e2e465a0606feee0d2966"
- integrity sha512-UHuDz8ukQkJCDASKHf+oDt3FVUzFd+QYfuBIsiNu/4+/ix6pP/C+uQZJ6K1oEfbCMv/IKWbgDEh7fcsnIE5AtA==
- dependencies:
- "@babel/code-frame" "7.0.0-beta.44"
- "@babel/generator" "7.0.0-beta.44"
- "@babel/helper-function-name" "7.0.0-beta.44"
- "@babel/helper-split-export-declaration" "7.0.0-beta.44"
- "@babel/types" "7.0.0-beta.44"
- babylon "7.0.0-beta.44"
- debug "^3.1.0"
- globals "^11.1.0"
- invariant "^2.2.0"
- lodash "^4.2.0"
-
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.1.5", "@babel/traverse@^7.1.6":
- version "7.1.6"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.1.6.tgz#c8db9963ab4ce5b894222435482bd8ea854b7b5c"
- integrity sha512-CXedit6GpISz3sC2k2FsGCUpOhUqKdyL0lqNrImQojagnUMXf8hex4AxYFRuMkNGcvJX5QAFGzB5WJQmSv8SiQ==
- dependencies:
- "@babel/code-frame" "^7.0.0"
- "@babel/generator" "^7.1.6"
- "@babel/helper-function-name" "^7.1.0"
- "@babel/helper-split-export-declaration" "^7.0.0"
- "@babel/parser" "^7.1.6"
- "@babel/types" "^7.1.6"
- debug "^4.1.0"
- globals "^11.1.0"
- lodash "^4.17.10"
-
-"@babel/types@7.0.0-beta.44":
- version "7.0.0-beta.44"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.44.tgz#6b1b164591f77dec0a0342aca995f2d046b3a757"
- integrity sha512-5eTV4WRmqbaFM3v9gHAIljEQJU4Ssc6fxL61JN+Oe2ga/BwyjzjamwkCVVAQjHGuAX8i0BWo42dshL8eO5KfLQ==
- dependencies:
- esutils "^2.0.2"
- lodash "^4.2.0"
- to-fast-properties "^2.0.0"
-
-"@babel/types@^7.0.0", "@babel/types@^7.1.2", "@babel/types@^7.1.5", "@babel/types@^7.1.6":
- version "7.1.6"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.1.6.tgz#0adb330c3a281348a190263aceb540e10f04bcce"
- integrity sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==
- dependencies:
- esutils "^2.0.2"
- lodash "^4.17.10"
- to-fast-properties "^2.0.0"
-
-"@intervolga/optimize-cssnano-plugin@^1.0.5":
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/@intervolga/optimize-cssnano-plugin/-/optimize-cssnano-plugin-1.0.6.tgz#be7c7846128b88f6a9b1d1261a0ad06eb5c0fdf8"
- integrity sha512-zN69TnSr0viRSU6cEDIcuPcP67QcpQ6uHACg58FiN9PDrU6SLyGW3MR4tiISbYxy1kDWAVPwD+XwQTWE5cigAA==
- dependencies:
- cssnano "^4.0.0"
- cssnano-preset-default "^4.0.0"
- postcss "^7.0.0"
-
-"@mrmlnc/readdir-enhanced@^2.2.1":
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
- integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
- dependencies:
- call-me-maybe "^1.0.1"
- glob-to-regexp "^0.3.0"
-
-"@nodelib/fs.stat@^1.1.2":
- version "1.1.3"
- resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
- integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
-
-"@soda/friendly-errors-webpack-plugin@^1.7.1":
- version "1.7.1"
- resolved "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.1.tgz#706f64bcb4a8b9642b48ae3ace444c70334d615d"
- integrity sha512-cWKrGaFX+rfbMrAxVv56DzhPNqOJPZuNIS2HGMELtgGzb+vsMzyig9mml5gZ/hr2BGtSLV+dP2LUEuAL8aG2mQ==
- dependencies:
- chalk "^1.1.3"
- error-stack-parser "^2.0.0"
- string-width "^2.0.0"
-
-"@tinymce/tinymce-vue@^2.0.0":
- version "2.0.0"
- resolved "https://registry.npmjs.org/@tinymce/tinymce-vue/-/tinymce-vue-2.0.0.tgz#41cea256f67f195ac52f71b1cc0bcbda850c86f0"
- integrity sha512-oUl8r1WvoLsy1NxpFMPNa8hZohkha6biNGLBAhtWUEIsqnmAhvosTPdVj2uroAlK7rjOcDTOy2jIkuNOsLuvtA==
- dependencies:
- vue "^2.5.17"
-
-"@types/d3-format@*":
- version "1.3.0"
- resolved "http://registry.npm.taobao.org/@types/d3-format/download/@types/d3-format-1.3.0.tgz#c5e115fac8e6861ce656fe9861892b22f6b0cfcb"
- integrity sha1-xeEV+sjmhhzmVv6YYYkrIvawz8s=
-
-"@types/events@*":
- version "3.0.0"
- resolved "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
- integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
-
-"@types/glob@^7.1.1":
- version "7.1.1"
- resolved "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
- integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
- dependencies:
- "@types/events" "*"
- "@types/minimatch" "*"
- "@types/node" "*"
-
-"@types/lodash@*":
- version "4.14.118"
- resolved "http://registry.npm.taobao.org/@types/lodash/download/@types/lodash-4.14.118.tgz#247bab39bfcc6d910d4927c6e06cbc70ec376f27"
- integrity sha1-JHurOb/MbZENSSfG4Gy8cOw3byc=
-
-"@types/minimatch@*":
- version "3.0.3"
- resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
- integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
-
-"@types/node@*":
- version "10.12.11"
- resolved "http://registry.npm.taobao.org/@types/node/download/@types/node-10.12.11.tgz#715c476c99a5f6898a1ae61caf9825e43c03912e"
- integrity sha1-cVxHbJml9omKGuYcr5gl5DwDkS4=
-
-"@types/node@^8.0.53":
- version "8.10.38"
- resolved "http://registry.npm.taobao.org/@types/node/download/@types/node-8.10.38.tgz#e05c201a668492e534b48102aca0294898f449f6"
- integrity sha1-4FwgGmaEkuU0tIECrKApSJj0SfY=
-
-"@vue/babel-helper-vue-jsx-merge-props@^1.0.0-beta.2":
- version "1.0.0-beta.2"
- resolved "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0-beta.2.tgz#f3e20d77b89ddb7a4b9b7a75372f05cd3ac22d92"
- integrity sha512-Yj92Q1GcGjjctecBfnBmVqKSlMdyZaVq10hlZB4HSd1DJgu4cWgpEImJSzcJRUCZmas6UigwE7f4IjJuQs+JvQ==
-
-"@vue/babel-plugin-transform-vue-jsx@^1.0.0-beta.2":
- version "1.0.0-beta.2"
- resolved "https://registry.npmjs.org/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.0.0-beta.2.tgz#6f7903fe66a34a02163f418c426cf419e862d97e"
- integrity sha512-fvAymRZAPHitomRE+jIipWRj0STXNSMqeOSdOFu9Ffjqg9WGOxSdCjORxexManfZ2y5QDv7gzI1xfgprsK3nlw==
- dependencies:
- "@babel/helper-module-imports" "^7.0.0"
- "@babel/plugin-syntax-jsx" "^7.2.0"
- "@vue/babel-helper-vue-jsx-merge-props" "^1.0.0-beta.2"
- html-tags "^2.0.0"
- lodash.kebabcase "^4.1.1"
- svg-tags "^1.0.0"
-
-"@vue/babel-preset-app@^3.5.0":
- version "3.5.0"
- resolved "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-3.5.0.tgz#7d1584baba0d633b72cb950308bb35a6b07389d4"
- integrity sha512-0zSE+5GcQ6pje39T5k4j7rw7rERGfFXvjHrcqcOS1WhO3UKDzA4dsivSRn0ESKueHej51m5Bg9O1D1OulQwykQ==
- dependencies:
- "@babel/plugin-proposal-class-properties" "^7.0.0"
- "@babel/plugin-proposal-decorators" "^7.1.0"
- "@babel/plugin-syntax-dynamic-import" "^7.0.0"
- "@babel/plugin-syntax-jsx" "^7.0.0"
- "@babel/plugin-transform-runtime" "^7.0.0"
- "@babel/preset-env" "^7.0.0"
- "@babel/runtime" "^7.0.0"
- "@babel/runtime-corejs2" "^7.2.0"
- "@vue/babel-preset-jsx" "^1.0.0-beta.2"
- babel-plugin-dynamic-import-node "^2.2.0"
- core-js "^2.6.5"
-
-"@vue/babel-preset-jsx@^1.0.0-beta.2":
- version "1.0.0-beta.2"
- resolved "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.0.0-beta.2.tgz#3e5dc2b73da58391c1c7327c2bd2ef154fe4e46e"
- integrity sha512-nZoAKBR/h6iPMQ66ieQcIdlpPBmqhtUUcgjBS541jIVxSog1rwzrc00jlsuecLonzUMWPU0PabyitsG74vhN1w==
- dependencies:
- "@vue/babel-helper-vue-jsx-merge-props" "^1.0.0-beta.2"
- "@vue/babel-plugin-transform-vue-jsx" "^1.0.0-beta.2"
- "@vue/babel-sugar-functional-vue" "^1.0.0-beta.2"
- "@vue/babel-sugar-inject-h" "^1.0.0-beta.2"
- "@vue/babel-sugar-v-model" "^1.0.0-beta.2"
- "@vue/babel-sugar-v-on" "^1.0.0-beta.2"
-
-"@vue/babel-sugar-functional-vue@^1.0.0-beta.2":
- version "1.0.0-beta.2"
- resolved "https://registry.npmjs.org/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.0.0-beta.2.tgz#8831f686e7614f282d5170b902483ef538deef38"
- integrity sha512-5qvi4hmExgjtrESDk0vflL69dIxkDAukJcYH9o4663E8Nh12Jpbmr+Ja8WmgkAPtTVhk90UVcVUFCCZLHBmhkQ==
- dependencies:
- "@babel/plugin-syntax-jsx" "^7.2.0"
-
-"@vue/babel-sugar-inject-h@^1.0.0-beta.2":
- version "1.0.0-beta.2"
- resolved "https://registry.npmjs.org/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.0.0-beta.2.tgz#5f92f994bf4b4126fad8633f554e8a426b51b413"
- integrity sha512-qGXZ6yE+1trk82xCVJ9j3shsgI+R2ePj3+o8b2Ee7JNaRqQvMfTwpgx5BRlk4q1+CTjvYexdqBS+q4Kg7sSxcg==
- dependencies:
- "@babel/plugin-syntax-jsx" "^7.2.0"
-
-"@vue/babel-sugar-v-model@^1.0.0-beta.2":
- version "1.0.0-beta.2"
- resolved "https://registry.npmjs.org/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.0.0-beta.2.tgz#051d3ae3ef5e70d514e09058ec5790f6a42e8c28"
- integrity sha512-63US3IMEtATJzzK2le/Na53Sk2bp3LHfwZ8eMFwbTaz6e2qeV9frBl3ZYaha64ghT4IDSbrDXUmm0J09EAzFfA==
- dependencies:
- "@babel/plugin-syntax-jsx" "^7.2.0"
- "@vue/babel-helper-vue-jsx-merge-props" "^1.0.0-beta.2"
- "@vue/babel-plugin-transform-vue-jsx" "^1.0.0-beta.2"
- camelcase "^5.0.0"
- html-tags "^2.0.0"
- svg-tags "^1.0.0"
-
-"@vue/babel-sugar-v-on@^1.0.0-beta.2":
- version "1.0.0-beta.2"
- resolved "https://registry.npmjs.org/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.0.0-beta.2.tgz#3e2d122e229b10017f091d178346b601d9245260"
- integrity sha512-XH/m3k11EKdMY0MrTg4+hQv8BFM8juzHT95chYkgxDmvDdVJnSCuf9+mcysEJttWD4PVuUGN7EHoIWsIhC0dRw==
- dependencies:
- "@babel/plugin-syntax-jsx" "^7.2.0"
- "@vue/babel-plugin-transform-vue-jsx" "^1.0.0-beta.2"
- camelcase "^5.0.0"
-
-"@vue/cli-overlay@^3.5.0":
- version "3.5.0"
- resolved "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-3.5.0.tgz#25a61ec5bf56bef6dca12eb0382a57af7b647d5e"
- integrity sha512-jjvJkhBE0mVAZjRyW/PXuy+ywTTRbVCZKN8WYcBN44BuKUYgBfLIUc29hUDmm/CesIZW5xMtPlFSWzRkz5uKcQ==
-
-"@vue/cli-plugin-babel@^3.3.0":
- version "3.5.0"
- resolved "https://registry.npmjs.org/@vue/cli-plugin-babel/-/cli-plugin-babel-3.5.0.tgz#0a572c4e73cad97f86684860e917cb3e3c883b79"
- integrity sha512-oCsuCzAIedjwTL8hvSmX9l4roHW198soaRkynho5r/yx2fkIeImN5dG+/YdnMbXAyui73zHA8vAoUfSBMNiQvQ==
- dependencies:
- "@babel/core" "^7.0.0"
- "@vue/babel-preset-app" "^3.5.0"
- "@vue/cli-shared-utils" "^3.5.0"
- babel-loader "^8.0.5"
- webpack ">=4 < 4.29"
-
-"@vue/cli-plugin-eslint@^3.3.0":
- version "3.5.0"
- resolved "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-3.5.0.tgz#c5529ace3925766ffb45d99f0fddcc019b0181b5"
- integrity sha512-tt5vjx3gT4KjIcwwsNK1FrvJHw6DkK8PA81oGBH7ARgf6HHXB80ruufwmddEhpn5MNKCsbvLkkUnVPs6t9WRUw==
- dependencies:
- "@vue/cli-shared-utils" "^3.5.0"
- babel-eslint "^10.0.1"
- eslint-loader "^2.1.2"
- globby "^9.0.0"
- webpack ">=4 < 4.29"
- optionalDependencies:
- eslint "^4.19.1"
- eslint-plugin-vue "^4.7.1"
-
-"@vue/cli-service@^3.3.0":
- version "3.5.0"
- resolved "https://registry.npmjs.org/@vue/cli-service/-/cli-service-3.5.0.tgz#ccc21c4764dfe3d374818073d0a023da939178be"
- integrity sha512-jSvO4woQbQZ59MNq1bSHz4yhzQBCN2EN0NsZLxcJ/nm1TT3UzKQG7WVfH37koXE90SA8AK412gx4eDWDFAyruQ==
- dependencies:
- "@intervolga/optimize-cssnano-plugin" "^1.0.5"
- "@soda/friendly-errors-webpack-plugin" "^1.7.1"
- "@vue/cli-overlay" "^3.5.0"
- "@vue/cli-shared-utils" "^3.5.0"
- "@vue/component-compiler-utils" "^2.6.0"
- "@vue/preload-webpack-plugin" "^1.1.0"
- "@vue/web-component-wrapper" "^1.2.0"
- acorn "^6.1.0"
- acorn-walk "^6.1.1"
- address "^1.0.3"
- autoprefixer "^9.4.8"
- cache-loader "^2.0.1"
- case-sensitive-paths-webpack-plugin "^2.2.0"
- chalk "^2.4.2"
- clipboardy "^1.2.3"
- cliui "^4.1.0"
- copy-webpack-plugin "^4.6.0"
- css-loader "^1.0.1"
- cssnano "^4.1.10"
- debug "^4.1.1"
- dotenv "^6.2.0"
- dotenv-expand "^4.2.0"
- escape-string-regexp "^1.0.5"
- file-loader "^3.0.1"
- fs-extra "^7.0.1"
- globby "^9.0.0"
- hash-sum "^1.0.2"
- html-webpack-plugin "^3.2.0"
- launch-editor-middleware "^2.2.1"
- lodash.defaultsdeep "^4.6.0"
- lodash.mapvalues "^4.6.0"
- lodash.transform "^4.6.0"
- mini-css-extract-plugin "^0.5.0"
- minimist "^1.2.0"
- ora "^3.1.0"
- portfinder "^1.0.20"
- postcss-loader "^3.0.0"
- read-pkg "^4.0.1"
- semver "^5.6.0"
- slash "^2.0.0"
- source-map-url "^0.4.0"
- ssri "^6.0.1"
- string.prototype.padend "^3.0.0"
- terser-webpack-plugin "^1.2.2"
- thread-loader "^2.1.2"
- url-loader "^1.1.2"
- vue-loader "^15.6.4"
- webpack ">=4 < 4.29"
- webpack-bundle-analyzer "^3.0.4"
- webpack-chain "^4.11.0"
- webpack-dev-server "^3.2.0"
- webpack-merge "^4.2.1"
- yorkie "^2.0.0"
-
-"@vue/cli-shared-utils@^3.5.0":
- version "3.5.0"
- resolved "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.5.0.tgz#95b97e13e32c14d5a0ab62322796a615752e843a"
- integrity sha512-+EIwVMTjdfRQVEtcIhpRjNsPB2ZlopiUktlPpx6oLQdlJXwBWkFQVwuXdXHtPYxB5Kzs3VPyUfhHxnPIbNw1+Q==
- dependencies:
- chalk "^2.4.1"
- execa "^1.0.0"
- joi "^14.3.0"
- launch-editor "^2.2.1"
- lru-cache "^5.1.1"
- node-ipc "^9.1.1"
- opn "^5.3.0"
- ora "^3.1.0"
- request "^2.87.0"
- request-promise-native "^1.0.7"
- semver "^5.5.0"
- string.prototype.padstart "^3.0.0"
-
-"@vue/component-compiler-utils@^2.5.1", "@vue/component-compiler-utils@^2.6.0":
- version "2.6.0"
- resolved "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-2.6.0.tgz#aa46d2a6f7647440b0b8932434d22f12371e543b"
- integrity sha512-IHjxt7LsOFYc0DkTncB7OXJL7UzwOLPPQCfEUNyxL2qt+tF12THV+EO33O1G2Uk4feMSWua3iD39Itszx0f0bw==
- dependencies:
- consolidate "^0.15.1"
- hash-sum "^1.0.2"
- lru-cache "^4.1.2"
- merge-source-map "^1.1.0"
- postcss "^7.0.14"
- postcss-selector-parser "^5.0.0"
- prettier "1.16.3"
- source-map "~0.6.1"
- vue-template-es2015-compiler "^1.9.0"
-
-"@vue/eslint-config-standard@^4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@vue/eslint-config-standard/-/eslint-config-standard-4.0.0.tgz#6be447ee674e3b0f733c584098fd9a22e6d76fcd"
- integrity sha512-bQghq1cw1BuMRHNhr3tRpAJx1tpGy0QtajQX873kLtA9YVuOIoXR7nAWnTN09bBHnSUh2N288vMsqPi2fI4Hzg==
- dependencies:
- eslint-config-standard "^12.0.0"
- eslint-plugin-import "^2.14.0"
- eslint-plugin-node "^8.0.0"
- eslint-plugin-promise "^4.0.1"
- eslint-plugin-standard "^4.0.0"
-
-"@vue/preload-webpack-plugin@^1.1.0":
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.0.tgz#d768dba004261c029b53a77c5ea2d5f9ee4f3cce"
- integrity sha512-rcn2KhSHESBFMPj5vc5X2pI9bcBNQQixvJXhD5gZ4rN2iym/uH2qfDSQfUS5+qwiz0a85TCkeUs6w6jxFDudbw==
-
-"@vue/web-component-wrapper@^1.2.0":
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/@vue/web-component-wrapper/-/web-component-wrapper-1.2.0.tgz#bb0e46f1585a7e289b4ee6067dcc5a6ae62f1dd1"
- integrity sha512-Xn/+vdm9CjuC9p3Ae+lTClNutrVhsXpzxvoTXXtoys6kVRX9FkueSUAqSWAyZntmVLlR4DosBV4pH8y5Z/HbUw==
-
-"@webassemblyjs/ast@1.7.11":
- version "1.7.11"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace"
- integrity sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==
- dependencies:
- "@webassemblyjs/helper-module-context" "1.7.11"
- "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
- "@webassemblyjs/wast-parser" "1.7.11"
-
-"@webassemblyjs/floating-point-hex-parser@1.7.11":
- version "1.7.11"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313"
- integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==
-
-"@webassemblyjs/helper-api-error@1.7.11":
- version "1.7.11"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a"
- integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==
-
-"@webassemblyjs/helper-buffer@1.7.11":
- version "1.7.11"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b"
- integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==
-
-"@webassemblyjs/helper-code-frame@1.7.11":
- version "1.7.11"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b"
- integrity sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==
- dependencies:
- "@webassemblyjs/wast-printer" "1.7.11"
-
-"@webassemblyjs/helper-fsm@1.7.11":
- version "1.7.11"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181"
- integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==
-
-"@webassemblyjs/helper-module-context@1.7.11":
- version "1.7.11"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209"
- integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==
-
-"@webassemblyjs/helper-wasm-bytecode@1.7.11":
- version "1.7.11"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06"
- integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==
-
-"@webassemblyjs/helper-wasm-section@1.7.11":
- version "1.7.11"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a"
- integrity sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==
- dependencies:
- "@webassemblyjs/ast" "1.7.11"
- "@webassemblyjs/helper-buffer" "1.7.11"
- "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
- "@webassemblyjs/wasm-gen" "1.7.11"
-
-"@webassemblyjs/ieee754@1.7.11":
- version "1.7.11"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b"
- integrity sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==
- dependencies:
- "@xtuc/ieee754" "^1.2.0"
-
-"@webassemblyjs/leb128@1.7.11":
- version "1.7.11"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63"
- integrity sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==
- dependencies:
- "@xtuc/long" "4.2.1"
-
-"@webassemblyjs/utf8@1.7.11":
- version "1.7.11"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82"
- integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==
-
-"@webassemblyjs/wasm-edit@1.7.11":
- version "1.7.11"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005"
- integrity sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==
- dependencies:
- "@webassemblyjs/ast" "1.7.11"
- "@webassemblyjs/helper-buffer" "1.7.11"
- "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
- "@webassemblyjs/helper-wasm-section" "1.7.11"
- "@webassemblyjs/wasm-gen" "1.7.11"
- "@webassemblyjs/wasm-opt" "1.7.11"
- "@webassemblyjs/wasm-parser" "1.7.11"
- "@webassemblyjs/wast-printer" "1.7.11"
-
-"@webassemblyjs/wasm-gen@1.7.11":
- version "1.7.11"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8"
- integrity sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==
- dependencies:
- "@webassemblyjs/ast" "1.7.11"
- "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
- "@webassemblyjs/ieee754" "1.7.11"
- "@webassemblyjs/leb128" "1.7.11"
- "@webassemblyjs/utf8" "1.7.11"
-
-"@webassemblyjs/wasm-opt@1.7.11":
- version "1.7.11"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7"
- integrity sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==
- dependencies:
- "@webassemblyjs/ast" "1.7.11"
- "@webassemblyjs/helper-buffer" "1.7.11"
- "@webassemblyjs/wasm-gen" "1.7.11"
- "@webassemblyjs/wasm-parser" "1.7.11"
-
-"@webassemblyjs/wasm-parser@1.7.11":
- version "1.7.11"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a"
- integrity sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==
- dependencies:
- "@webassemblyjs/ast" "1.7.11"
- "@webassemblyjs/helper-api-error" "1.7.11"
- "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
- "@webassemblyjs/ieee754" "1.7.11"
- "@webassemblyjs/leb128" "1.7.11"
- "@webassemblyjs/utf8" "1.7.11"
-
-"@webassemblyjs/wast-parser@1.7.11":
- version "1.7.11"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c"
- integrity sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==
- dependencies:
- "@webassemblyjs/ast" "1.7.11"
- "@webassemblyjs/floating-point-hex-parser" "1.7.11"
- "@webassemblyjs/helper-api-error" "1.7.11"
- "@webassemblyjs/helper-code-frame" "1.7.11"
- "@webassemblyjs/helper-fsm" "1.7.11"
- "@xtuc/long" "4.2.1"
-
-"@webassemblyjs/wast-printer@1.7.11":
- version "1.7.11"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813"
- integrity sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==
- dependencies:
- "@webassemblyjs/ast" "1.7.11"
- "@webassemblyjs/wast-parser" "1.7.11"
- "@xtuc/long" "4.2.1"
-
-"@xtuc/ieee754@^1.2.0":
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/@xtuc/ieee754/download/@xtuc/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
- integrity sha1-7vAUoxRa5Hehy8AM0eVSM23Ot5A=
-
-"@xtuc/long@4.2.1":
- version "4.2.1"
- resolved "http://registry.npm.taobao.org/@xtuc/long/download/@xtuc/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
- integrity sha1-XIXWYvdvodNFdXZsXc1mFavNMNg=
-
-abbrev@1:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/abbrev/download/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
- integrity sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg=
-
-abs-svg-path@~0.1.1:
- version "0.1.1"
- resolved "https://registry.yarnpkg.com/abs-svg-path/-/abs-svg-path-0.1.1.tgz#df601c8e8d2ba10d4a76d625e236a9a39c2723bf"
- integrity sha1-32Acjo0roQ1KdtYl4japo5wnI78=
-
-accepts@~1.3.4, accepts@~1.3.5:
- version "1.3.5"
- resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
- integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
- dependencies:
- mime-types "~2.1.18"
- negotiator "0.6.1"
-
-acorn-dynamic-import@^3.0.0:
- version "3.0.0"
- resolved "http://registry.npm.taobao.org/acorn-dynamic-import/download/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
- integrity sha1-kBzu5Mf6rvfgetKkfokGddpQong=
- dependencies:
- acorn "^5.0.0"
-
-acorn-jsx@^3.0.0:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
- integrity sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=
- dependencies:
- acorn "^3.0.4"
-
-acorn-jsx@^5.0.0:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e"
- integrity sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==
-
-acorn-walk@^6.1.1:
- version "6.1.1"
- resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913"
- integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==
-
-acorn@^3.0.4:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
- integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
-
-acorn@^5.0.0, acorn@^5.5.0, acorn@^5.6.2:
- version "5.7.3"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
- integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
-
-acorn@^6.0.2:
- version "6.0.4"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.4.tgz#77377e7353b72ec5104550aa2d2097a2fd40b754"
- integrity sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==
-
-acorn@^6.0.7, acorn@^6.1.0:
- version "6.1.1"
- resolved "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
- integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
-
-add-dom-event-listener@^1.0.2:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz#6a92db3a0dd0abc254e095c0f1dc14acbbaae310"
- integrity sha512-WCxx1ixHT0GQU9hb0KI/mhgRQhnU+U3GvwY6ZvVjYq8rsihIGoaIOUbY0yMPBxLH5MDtr0kz3fisWGNcbWW7Jw==
- dependencies:
- object-assign "4.x"
-
-address@^1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/address/-/address-1.0.3.tgz#b5f50631f8d6cec8bd20c963963afb55e06cbce9"
- integrity sha512-z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg==
-
-ajv-errors@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/ajv-errors/download/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59"
- integrity sha1-7PAh+hCP0X37Xms4Py3SM+Mf/Fk=
-
-ajv-keywords@^2.1.0:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
- integrity sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=
-
-ajv-keywords@^3.1.0:
- version "3.2.0"
- resolved "http://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
- integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
-
-ajv@^5.2.3, ajv@^5.3.0:
- version "5.5.2"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
- integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
- dependencies:
- co "^4.6.0"
- fast-deep-equal "^1.0.0"
- fast-json-stable-stringify "^2.0.0"
- json-schema-traverse "^0.3.0"
-
-ajv@^6.1.0, ajv@^6.5.5:
- version "6.6.1"
- resolved "http://registry.npm.taobao.org/ajv/download/ajv-6.6.1.tgz#6360f5ed0d80f232cc2b294c362d5dc2e538dd61"
- integrity sha1-Y2D17Q2A8jLMKylMNi1dwuU43WE=
- dependencies:
- fast-deep-equal "^2.0.1"
- fast-json-stable-stringify "^2.0.0"
- json-schema-traverse "^0.4.1"
- uri-js "^4.2.2"
-
-ajv@^6.9.1:
- version "6.10.0"
- resolved "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
- integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
- dependencies:
- fast-deep-equal "^2.0.1"
- fast-json-stable-stringify "^2.0.0"
- json-schema-traverse "^0.4.1"
- uri-js "^4.2.2"
-
-align-text@^0.1.1, align-text@^0.1.3:
- version "0.1.4"
- resolved "http://registry.npm.taobao.org/align-text/download/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
- integrity sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=
- dependencies:
- kind-of "^3.0.2"
- longest "^1.0.1"
- repeat-string "^1.5.2"
-
-alphanum-sort@^1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
- integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
-
-amdefine@>=0.0.4:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/amdefine/download/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
- integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
-
-ansi-colors@^3.0.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.1.0.tgz#dcfaacc90ef9187de413ec3ef8d5eb981a98808f"
- integrity sha512-hTv1qPdi+sVEk3jYsdjox5nQI0C9HTbjKShbCdYLKb1LOfNbb7wsF4d7OEKIZoxIHx02tSp3m94jcPW2EfMjmA==
-
-ansi-escapes@^3.0.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
- integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
-
-ansi-escapes@^3.2.0:
- version "3.2.0"
- resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
- integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
-
-ansi-html@0.0.7:
- version "0.0.7"
- resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
- integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
-
-ansi-regex@^2.0.0:
- version "2.1.1"
- resolved "http://registry.npm.taobao.org/ansi-regex/download/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
- integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
-ansi-regex@^3.0.0:
- version "3.0.0"
- resolved "http://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
- integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
-ansi-regex@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
- integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==
-
-ansi-regex@^4.1.0:
- version "4.1.0"
- resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
- integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
-
-ansi-styles@^2.2.1:
- version "2.2.1"
- resolved "http://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
- integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
- version "3.2.1"
- resolved "http://registry.npm.taobao.org/ansi-styles/download/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
- integrity sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=
- dependencies:
- color-convert "^1.9.0"
-
-ant-design-palettes@^1.1.3:
- version "1.1.3"
- resolved "https://registry.npmjs.org/ant-design-palettes/-/ant-design-palettes-1.1.3.tgz#84119b1a4d86363adc52a38d587e65336a0a27dd"
- integrity sha512-UpkkTp8egEN21KZNvY7sTcabLlkHvLvS71EVPk4CYi77Z9AaGGCaVn7i72tbOgWDrQp2wjIg8WgMbKBdK7GtWA==
- dependencies:
- tinycolor2 "^1.4.1"
-
-ant-design-vue@^1.3.1:
- version "1.3.5"
- resolved "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.3.5.tgz#3b191e3eeef676a26b2816eb2933e95e8936d1ff"
- integrity sha512-EPRdBv5UJAZfkpR+KPYB8dpwpDsfV94PiuFytTvaq8Vw8TolB61/a1xQYko+o8qv3DOohyjPGmUpINR8zyjueA==
- dependencies:
- "@ant-design/icons" "^1.1.15"
- "@ant-design/icons-vue" "^1.0.1"
- add-dom-event-listener "^1.0.2"
- array-tree-filter "^2.1.0"
- async-validator "^1.8.2"
- babel-helper-vue-jsx-merge-props "^2.0.3"
- babel-runtime "6.x"
- classnames "^2.2.5"
- component-classes "^1.2.6"
- dom-align "^1.7.0"
- dom-closest "^0.2.0"
- dom-scroll-into-view "^1.2.1"
- enquire.js "^2.1.6"
- intersperse "^1.0.0"
- is-negative-zero "^2.0.0"
- ismobilejs "^0.5.1"
- json2mq "^0.2.0"
- lodash "^4.17.5"
- moment "^2.21.0"
- mutationobserver-shim "^0.3.2"
- omit.js "^1.0.0"
- raf "^3.4.0"
- resize-observer-polyfill "^1.5.1"
- shallow-equal "^1.0.0"
- shallowequal "^1.0.2"
- vue-ref "^1.0.4"
- warning "^3.0.0"
-
-anymatch@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/anymatch/download/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
- integrity sha1-vLJLTzeTTZqnrBe0ra+J58du8us=
- dependencies:
- micromatch "^3.1.4"
- normalize-path "^2.1.1"
-
-apexcharts@^3.6.5:
- version "3.6.5"
- resolved "https://registry.npmjs.org/apexcharts/-/apexcharts-3.6.5.tgz#6ca9e2e501451d3fff436f8e8ae05fd12b5476b5"
- integrity sha512-HSDNjTPMEpQaM0MadPj9f6gNvBKSmQXuC100h4Ev2mQFjC1rJId6b1KgF2yKh0In+iXuTXxszI58ozWhKNkbYQ==
- dependencies:
- promise-polyfill "8.1.0"
- svg.draggable.js "^2.2.1"
- svg.easing.js "^2.0.0"
- svg.filter.js "^2.0.2"
- svg.js "^2.6.6"
- svg.pathmorphing.js "^0.1.3"
- svg.resize.js "^1.4.1"
- svg.select.js "^2.1.2"
-
-aproba@^1.0.3, aproba@^1.1.1:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/aproba/download/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
- integrity sha1-aALmJk79GMeQobDVF/DyYnvyyUo=
-
-arch@^2.1.0:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.1.tgz#8f5c2731aa35a30929221bb0640eed65175ec84e"
- integrity sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==
-
-are-we-there-yet@~1.1.2:
- version "1.1.5"
- resolved "http://registry.npm.taobao.org/are-we-there-yet/download/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
- integrity sha1-SzXClE8GKov82mZBB2A1D+nd/CE=
- dependencies:
- delegates "^1.0.0"
- readable-stream "^2.0.6"
-
-argparse@^1.0.7:
- version "1.0.10"
- resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
- integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
- dependencies:
- sprintf-js "~1.0.2"
-
-arr-diff@^4.0.0:
- version "4.0.0"
- resolved "http://registry.npm.taobao.org/arr-diff/download/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
- integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
-
-arr-flatten@^1.1.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/arr-flatten/download/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
- integrity sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=
-
-arr-union@^3.1.0:
- version "3.1.0"
- resolved "http://registry.npm.taobao.org/arr-union/download/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
- integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
-
-array-filter@~0.0.0:
- version "0.0.1"
- resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
- integrity sha1-fajPLiZijtcygDWB/SH2fKzS7uw=
-
-array-find-index@^1.0.1:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/array-find-index/download/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
- integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
-
-array-flatten@1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
- integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
-
-array-flatten@^2.1.0:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296"
- integrity sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=
-
-array-map@~0.0.0:
- version "0.0.0"
- resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
- integrity sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=
-
-array-reduce@~0.0.0:
- version "0.0.0"
- resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
- integrity sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=
-
-array-tree-filter@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/array-tree-filter/-/array-tree-filter-2.1.0.tgz#873ac00fec83749f255ac8dd083814b4f6329190"
- integrity sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw==
-
-array-union@^1.0.1, array-union@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
- integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
- dependencies:
- array-uniq "^1.0.1"
-
-array-uniq@^1.0.1:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
- integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
-
-array-unique@^0.3.2:
- version "0.3.2"
- resolved "http://registry.npm.taobao.org/array-unique/download/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
- integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
-
-arrify@^1.0.0, arrify@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
- integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
-
-asap@~2.0.3:
- version "2.0.6"
- resolved "http://registry.npm.taobao.org/asap/download/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
- integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
-
-asn1.js@^4.0.0:
- version "4.10.1"
- resolved "http://registry.npm.taobao.org/asn1.js/download/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
- integrity sha1-ucK/WAXx5kqt7tbfOiv6+1pz9aA=
- dependencies:
- bn.js "^4.0.0"
- inherits "^2.0.1"
- minimalistic-assert "^1.0.0"
-
-asn1@~0.2.3:
- version "0.2.4"
- resolved "http://registry.npm.taobao.org/asn1/download/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
- integrity sha1-jSR136tVO7M+d7VOWeiAu4ziMTY=
- dependencies:
- safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/assert-plus/download/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
- integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
-assert@^1.1.1:
- version "1.4.1"
- resolved "http://registry.npm.taobao.org/assert/download/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
- integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
- dependencies:
- util "0.10.3"
-
-assign-symbols@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/assign-symbols/download/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
- integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
-
-astral-regex@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
- integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
-
-async-each@^1.0.0:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/async-each/download/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
- integrity sha1-GdOGodntxufByF04iu28xW0zYC0=
-
-async-foreach@^0.1.3:
- version "0.1.3"
- resolved "http://registry.npm.taobao.org/async-foreach/download/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
- integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
-
-async-limiter@~1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
- integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
-
-async-validator@^1.8.2:
- version "1.10.0"
- resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-1.10.0.tgz#59a392a1b48565c2eb43faddb4e54d7d86dce293"
- integrity sha512-tjkUJ3OXURZbm1nrlU2QtH0XJe4YvhN1J9AYiKFN9ODBqt0AFIE6YZdZByrWG2SidPUOOK5KIAsqskqFj/43ZQ==
- dependencies:
- babel-runtime "6.x"
-
-async@^1.5.2:
- version "1.5.2"
- resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
- integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
-
-asynckit@^0.4.0:
- version "0.4.0"
- resolved "http://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
- integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
-atob@^2.1.1:
- version "2.1.2"
- resolved "http://registry.npm.taobao.org/atob/download/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
- integrity sha1-bZUX654DDSQ2ZmZR6GvZ9vE1M8k=
-
-autoprefixer@^9.4.8:
- version "9.4.10"
- resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.4.10.tgz#e1be61fc728bacac8f4252ed242711ec0dcc6a7b"
- integrity sha512-XR8XZ09tUrrSzgSlys4+hy5r2/z4Jp7Ag3pHm31U4g/CTccYPOVe19AkaJ4ey/vRd1sfj+5TtuD6I0PXtutjvQ==
- dependencies:
- browserslist "^4.4.2"
- caniuse-lite "^1.0.30000940"
- normalize-range "^0.1.2"
- num2fraction "^1.2.2"
- postcss "^7.0.14"
- postcss-value-parser "^3.3.1"
-
-aws-sign2@~0.7.0:
- version "0.7.0"
- resolved "http://registry.npm.taobao.org/aws-sign2/download/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
- integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
-
-aws4@^1.8.0:
- version "1.8.0"
- resolved "http://registry.npm.taobao.org/aws4/download/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
- integrity sha1-8OAD2cqef1nHpQiUXXsu+aBKVC8=
-
-axios@^0.18.0:
- version "0.18.0"
- resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102"
- integrity sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=
- dependencies:
- follow-redirects "^1.3.0"
- is-buffer "^1.1.5"
-
-babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
- version "6.26.0"
- resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
- integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
- dependencies:
- chalk "^1.1.3"
- esutils "^2.0.2"
- js-tokens "^3.0.2"
-
-babel-eslint@^10.0.1:
- version "10.0.1"
- resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.1.tgz#919681dc099614cd7d31d45c8908695092a1faed"
- integrity sha512-z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ==
- dependencies:
- "@babel/code-frame" "^7.0.0"
- "@babel/parser" "^7.0.0"
- "@babel/traverse" "^7.0.0"
- "@babel/types" "^7.0.0"
- eslint-scope "3.7.1"
- eslint-visitor-keys "^1.0.0"
-
-babel-eslint@^8.2.3:
- version "8.2.6"
- resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.6.tgz#6270d0c73205628067c0f7ae1693a9e797acefd9"
- integrity sha512-aCdHjhzcILdP8c9lej7hvXKvQieyRt20SF102SIGyY4cUIiw6UaAtK4j2o3dXX74jEmy0TJ0CEhv4fTIM3SzcA==
- dependencies:
- "@babel/code-frame" "7.0.0-beta.44"
- "@babel/traverse" "7.0.0-beta.44"
- "@babel/types" "7.0.0-beta.44"
- babylon "7.0.0-beta.44"
- eslint-scope "3.7.1"
- eslint-visitor-keys "^1.0.0"
-
-babel-helper-vue-jsx-merge-props@^2.0.3:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz#22aebd3b33902328e513293a8e4992b384f9f1b6"
- integrity sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==
-
-babel-loader@^8.0.0-beta.0:
- version "8.0.4"
- resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.4.tgz#7bbf20cbe4560629e2e41534147692d3fecbdce6"
- integrity sha512-fhBhNkUToJcW9nV46v8w87AJOwAJDz84c1CL57n3Stj73FANM/b9TbCUK4YhdOwEyZ+OxhYpdeZDNzSI29Firw==
- dependencies:
- find-cache-dir "^1.0.0"
- loader-utils "^1.0.2"
- mkdirp "^0.5.1"
- util.promisify "^1.0.0"
-
-babel-loader@^8.0.5:
- version "8.0.5"
- resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.5.tgz#225322d7509c2157655840bba52e46b6c2f2fe33"
- integrity sha512-NTnHnVRd2JnRqPC0vW+iOQWU5pchDbYXsG2E6DMXEpMfUcQKclF9gmf3G3ZMhzG7IG9ji4coL0cm+FxeWxDpnw==
- dependencies:
- find-cache-dir "^2.0.0"
- loader-utils "^1.0.2"
- mkdirp "^0.5.1"
- util.promisify "^1.0.0"
-
-babel-plugin-dynamic-import-node@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.2.0.tgz#c0adfb07d95f4a4495e9aaac6ec386c4d7c2524e"
- integrity sha512-fP899ELUnTaBcIzmrW7nniyqqdYWrWuJUyPWHxFa/c7r7hS6KC8FscNfLlBNIoPSc55kYMGEEKjPjJGCLbE1qA==
- dependencies:
- object.assign "^4.1.0"
-
-babel-plugin-transform-runtime@^6.23.0:
- version "6.23.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-runtime/download/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee"
- integrity sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=
- dependencies:
- babel-runtime "^6.22.0"
-
-babel-runtime@6.x, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0:
- version "6.26.0"
- resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
- integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
- dependencies:
- core-js "^2.4.0"
- regenerator-runtime "^0.11.0"
-
-babylon@7.0.0-beta.44:
- version "7.0.0-beta.44"
- resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d"
- integrity sha512-5Hlm13BJVAioCHpImtFqNOF2H3ieTOHd0fmFGMxOJ9jgeFqeAwsv3u5P5cR7CSeFrkgHsT19DgFJkHV0/Mcd8g==
-
-balanced-match@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
- integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-
-base64-js@^1.0.2:
- version "1.3.0"
- resolved "http://registry.npm.taobao.org/base64-js/download/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
- integrity sha1-yrHmEY8FEJXli1KBrqjBzSK/wOM=
-
-base@^0.11.1:
- version "0.11.2"
- resolved "http://registry.npm.taobao.org/base/download/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
- integrity sha1-e95c7RRbbVUakNuH+DxVi060io8=
- dependencies:
- cache-base "^1.0.1"
- class-utils "^0.3.5"
- component-emitter "^1.2.1"
- define-property "^1.0.0"
- isobject "^3.0.1"
- mixin-deep "^1.2.0"
- pascalcase "^0.1.1"
-
-batch@0.6.1:
- version "0.6.1"
- resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
- integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
-
-bcrypt-pbkdf@^1.0.0:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/bcrypt-pbkdf/download/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
- integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
- dependencies:
- tweetnacl "^0.14.3"
-
-bfj@^6.1.1:
- version "6.1.1"
- resolved "https://registry.yarnpkg.com/bfj/-/bfj-6.1.1.tgz#05a3b7784fbd72cfa3c22e56002ef99336516c48"
- integrity sha512-+GUNvzHR4nRyGybQc2WpNJL4MJazMuvf92ueIyA0bIkPRwhhQu3IfZQ2PSoVPpCBJfmoSdOxu5rnotfFLlvYRQ==
- dependencies:
- bluebird "^3.5.1"
- check-types "^7.3.0"
- hoopy "^0.1.2"
- tryer "^1.0.0"
-
-big.js@^3.1.3:
- version "3.2.0"
- resolved "http://registry.npm.taobao.org/big.js/download/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
- integrity sha1-pfwpi4G54Nyi5FiCR4S2XFK6WI4=
-
-binary-extensions@^1.0.0:
- version "1.12.0"
- resolved "http://registry.npm.taobao.org/binary-extensions/download/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14"
- integrity sha1-wteA9T1Fu6gxeokC1M7q86Y4WxQ=
-
-block-stream@*:
- version "0.0.9"
- resolved "http://registry.npm.taobao.org/block-stream/download/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
- integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
- dependencies:
- inherits "~2.0.0"
-
-bluebird@^3.1.1:
- version "3.5.2"
- resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a"
- integrity sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==
-
-bluebird@^3.5.1:
- version "3.5.3"
- resolved "http://registry.npm.taobao.org/bluebird/download/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
- integrity sha1-fQHG+WFsmlGrD4xUmnnf5uwz76c=
-
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
- version "4.11.8"
- resolved "http://registry.npm.taobao.org/bn.js/download/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
- integrity sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=
-
-body-parser@1.18.3:
- version "1.18.3"
- resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
- integrity sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=
- dependencies:
- bytes "3.0.0"
- content-type "~1.0.4"
- debug "2.6.9"
- depd "~1.1.2"
- http-errors "~1.6.3"
- iconv-lite "0.4.23"
- on-finished "~2.3.0"
- qs "6.5.2"
- raw-body "2.3.3"
- type-is "~1.6.16"
-
-bonjour@^3.5.0:
- version "3.5.0"
- resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
- integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU=
- dependencies:
- array-flatten "^2.1.0"
- deep-equal "^1.0.1"
- dns-equal "^1.0.0"
- dns-txt "^2.0.2"
- multicast-dns "^6.0.1"
- multicast-dns-service-types "^1.1.0"
-
-boolbase@^1.0.0, boolbase@~1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
- integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
-
-brace-expansion@^1.1.7:
- version "1.1.11"
- resolved "http://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
- integrity sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=
- dependencies:
- balanced-match "^1.0.0"
- concat-map "0.0.1"
-
-braces@^2.3.0, braces@^2.3.1:
- version "2.3.2"
- resolved "http://registry.npm.taobao.org/braces/download/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
- integrity sha1-WXn9PxTNUxVl5fot8av/8d+u5yk=
- dependencies:
- arr-flatten "^1.1.0"
- array-unique "^0.3.2"
- extend-shallow "^2.0.1"
- fill-range "^4.0.0"
- isobject "^3.0.1"
- repeat-element "^1.1.2"
- snapdragon "^0.8.1"
- snapdragon-node "^2.0.1"
- split-string "^3.0.2"
- to-regex "^3.0.1"
-
-brorand@^1.0.1:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/brorand/download/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
- integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
-
-browserify-aes@^1.0.0, browserify-aes@^1.0.4:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/browserify-aes/download/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
- integrity sha1-Mmc0ZC9APavDADIJhTu3CtQo70g=
- dependencies:
- buffer-xor "^1.0.3"
- cipher-base "^1.0.0"
- create-hash "^1.1.0"
- evp_bytestokey "^1.0.3"
- inherits "^2.0.1"
- safe-buffer "^5.0.1"
-
-browserify-cipher@^1.0.0:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/browserify-cipher/download/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
- integrity sha1-jWR0wbhwv9q807z8wZNKEOlPFfA=
- dependencies:
- browserify-aes "^1.0.4"
- browserify-des "^1.0.0"
- evp_bytestokey "^1.0.0"
-
-browserify-des@^1.0.0:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/browserify-des/download/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
- integrity sha1-OvTx9Zg5QDVy8cZiBDdfen9wPpw=
- dependencies:
- cipher-base "^1.0.1"
- des.js "^1.0.0"
- inherits "^2.0.1"
- safe-buffer "^5.1.2"
-
-browserify-rsa@^4.0.0:
- version "4.0.1"
- resolved "http://registry.npm.taobao.org/browserify-rsa/download/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
- integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
- dependencies:
- bn.js "^4.1.0"
- randombytes "^2.0.1"
-
-browserify-sign@^4.0.0:
- version "4.0.4"
- resolved "http://registry.npm.taobao.org/browserify-sign/download/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
- integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
- dependencies:
- bn.js "^4.1.1"
- browserify-rsa "^4.0.0"
- create-hash "^1.1.0"
- create-hmac "^1.1.2"
- elliptic "^6.0.0"
- inherits "^2.0.1"
- parse-asn1 "^5.0.0"
-
-browserify-zlib@^0.2.0:
- version "0.2.0"
- resolved "http://registry.npm.taobao.org/browserify-zlib/download/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
- integrity sha1-KGlFnZqjviRf6P4sofRuLn9U1z8=
- dependencies:
- pako "~1.0.5"
-
-browserslist@^4.0.0:
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.0.tgz#779a235bd1ace0f3841a9b294df4cd47ac046c9d"
- integrity sha512-j0jLqo+6ZhFWvTjEIcDyR8LIiN8pA3cUrT/SGAs0LPp/cKvkRpCnzuxtnAW+sOPLTic5wfb+TQvRX2RTN2wo4w==
- dependencies:
- caniuse-lite "^1.0.30000893"
- electron-to-chromium "^1.3.80"
- node-releases "^1.0.0-alpha.14"
-
-browserslist@^4.1.0:
- version "4.3.5"
- resolved "http://registry.npm.taobao.org/browserslist/download/browserslist-4.3.5.tgz#1a917678acc07b55606748ea1adf9846ea8920f7"
- integrity sha1-GpF2eKzAe1VgZ0jqGt+YRuqJIPc=
- dependencies:
- caniuse-lite "^1.0.30000912"
- electron-to-chromium "^1.3.86"
- node-releases "^1.0.5"
-
-browserslist@^4.4.2:
- version "4.4.2"
- resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.4.2.tgz#6ea8a74d6464bb0bd549105f659b41197d8f0ba2"
- integrity sha512-ISS/AIAiHERJ3d45Fz0AVYKkgcy+F/eJHzKEvv1j0wwKGKD9T3BrwKr/5g45L+Y4XIK5PlTqefHciRFcfE1Jxg==
- dependencies:
- caniuse-lite "^1.0.30000939"
- electron-to-chromium "^1.3.113"
- node-releases "^1.1.8"
-
-buffer-from@^1.0.0:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/buffer-from/download/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
- integrity sha1-MnE7wCj3XAL9txDXx7zsHyxgcO8=
-
-buffer-indexof@^1.0.0:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
- integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
-
-buffer-xor@^1.0.3:
- version "1.0.3"
- resolved "http://registry.npm.taobao.org/buffer-xor/download/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
- integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
-
-buffer@^4.3.0:
- version "4.9.1"
- resolved "http://registry.npm.taobao.org/buffer/download/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
- integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
- dependencies:
- base64-js "^1.0.2"
- ieee754 "^1.1.4"
- isarray "^1.0.0"
-
-builtin-modules@^1.0.0:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/builtin-modules/download/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
- integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
-
-builtin-status-codes@^3.0.0:
- version "3.0.0"
- resolved "http://registry.npm.taobao.org/builtin-status-codes/download/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
- integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
-
-bytes@3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
- integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
-
-cacache@^10.0.4:
- version "10.0.4"
- resolved "http://registry.npm.taobao.org/cacache/download/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
- integrity sha1-ZFI2eZnv+dQYiu/ZoU6dfGomNGA=
- dependencies:
- bluebird "^3.5.1"
- chownr "^1.0.1"
- glob "^7.1.2"
- graceful-fs "^4.1.11"
- lru-cache "^4.1.1"
- mississippi "^2.0.0"
- mkdirp "^0.5.1"
- move-concurrently "^1.0.1"
- promise-inflight "^1.0.1"
- rimraf "^2.6.2"
- ssri "^5.2.4"
- unique-filename "^1.1.0"
- y18n "^4.0.0"
-
-cacache@^11.0.2:
- version "11.3.1"
- resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.1.tgz#d09d25f6c4aca7a6d305d141ae332613aa1d515f"
- integrity sha512-2PEw4cRRDu+iQvBTTuttQifacYjLPhET+SYO/gEFMy8uhi+jlJREDAjSF5FWSdV/Aw5h18caHA7vMTw2c+wDzA==
- dependencies:
- bluebird "^3.5.1"
- chownr "^1.0.1"
- figgy-pudding "^3.1.0"
- glob "^7.1.2"
- graceful-fs "^4.1.11"
- lru-cache "^4.1.3"
- mississippi "^3.0.0"
- mkdirp "^0.5.1"
- move-concurrently "^1.0.1"
- promise-inflight "^1.0.1"
- rimraf "^2.6.2"
- ssri "^6.0.0"
- unique-filename "^1.1.0"
- y18n "^4.0.0"
-
-cache-base@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/cache-base/download/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
- integrity sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=
- dependencies:
- collection-visit "^1.0.0"
- component-emitter "^1.2.1"
- get-value "^2.0.6"
- has-value "^1.0.0"
- isobject "^3.0.1"
- set-value "^2.0.0"
- to-object-path "^0.3.0"
- union-value "^1.0.0"
- unset-value "^1.0.0"
-
-cache-loader@^2.0.1:
- version "2.0.1"
- resolved "https://registry.npmjs.org/cache-loader/-/cache-loader-2.0.1.tgz#5758f41a62d7c23941e3c3c7016e6faeb03acb07"
- integrity sha512-V99T3FOynmGx26Zom+JrVBytLBsmUCzVG2/4NnUKgvXN4bEV42R1ERl1IyiH/cvFIDA1Ytq2lPZ9tXDSahcQpQ==
- dependencies:
- loader-utils "^1.1.0"
- mkdirp "^0.5.1"
- neo-async "^2.6.0"
- normalize-path "^3.0.0"
- schema-utils "^1.0.0"
-
-call-me-maybe@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
- integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
-
-caller-path@^0.1.0:
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
- integrity sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=
- dependencies:
- callsites "^0.2.0"
-
-callsites@^0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
- integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
-
-callsites@^3.0.0:
- version "3.0.0"
- resolved "https://registry.npmjs.org/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3"
- integrity sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw==
-
-camel-case@3.0.x:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
- integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
- dependencies:
- no-case "^2.2.0"
- upper-case "^1.1.1"
-
-camelcase-keys@^2.0.0:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/camelcase-keys/download/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
- integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
- dependencies:
- camelcase "^2.0.0"
- map-obj "^1.0.0"
-
-camelcase@^1.0.2:
- version "1.2.1"
- resolved "http://registry.npm.taobao.org/camelcase/download/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
- integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
-
-camelcase@^2.0.0:
- version "2.1.1"
- resolved "http://registry.npm.taobao.org/camelcase/download/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
- integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
-
-camelcase@^3.0.0:
- version "3.0.0"
- resolved "http://registry.npm.taobao.org/camelcase/download/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
- integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
-
-camelcase@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
- integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
-
-camelcase@^5.0.0:
- version "5.2.0"
- resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.2.0.tgz#e7522abda5ed94cc0489e1b8466610e88404cf45"
- integrity sha512-IXFsBS2pC+X0j0N/GE7Dm7j3bsEBp+oTpb7F50dwEVX7rf3IgwO9XatnegTsDtniKCUtEJH4fSU6Asw7uoVLfQ==
-
-caniuse-api@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
- integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==
- dependencies:
- browserslist "^4.0.0"
- caniuse-lite "^1.0.0"
- lodash.memoize "^4.1.2"
- lodash.uniq "^4.5.0"
-
-caniuse-lite@^1.0.0:
- version "1.0.30000893"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000893.tgz#284b20932bd41b93e21626975f2050cb01561986"
- integrity sha512-kOddHcTEef+NgN/fs0zmX2brHTNATVOWMEIhlZHCuwQRtXobjSw9pAECc44Op4bTBcavRjkLaPrGomknH7+Jvg==
-
-caniuse-lite@^1.0.30000893, caniuse-lite@^1.0.30000912:
- version "1.0.30000913"
- resolved "http://registry.npm.taobao.org/caniuse-lite/download/caniuse-lite-1.0.30000913.tgz#560311ecf242eaf12159b720e64b11ebd759b5e4"
- integrity sha1-VgMR7PJC6vEhWbcg5ksR69dZteQ=
-
-caniuse-lite@^1.0.30000939, caniuse-lite@^1.0.30000940:
- version "1.0.30000943"
- resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000943.tgz#00b25bd5808edc2ed1cfb53533a6a6ff6ca014ee"
- integrity sha512-nJMjU4UaesbOHTcmz6VS+qaog++Fdepg4KAya5DL/AZrL/aaAZDGOOQ0AECtsJa09r4cJBdHZMive5mw8lnQ5A==
-
-case-sensitive-paths-webpack-plugin@^2.2.0:
- version "2.2.0"
- resolved "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.2.0.tgz#3371ef6365ef9c25fa4b81c16ace0e9c7dc58c3e"
- integrity sha512-u5ElzokS8A1pm9vM3/iDgTcI3xqHxuCao94Oz8etI3cf0Tio0p8izkDYbTIn09uP3yUUr6+veaE6IkjnTYS46g==
-
-caseless@~0.12.0:
- version "0.12.0"
- resolved "http://registry.npm.taobao.org/caseless/download/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
- integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-
-center-align@^0.1.1:
- version "0.1.3"
- resolved "http://registry.npm.taobao.org/center-align/download/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
- integrity sha1-qg0yYptu6XIgBBHL1EYckHvCt60=
- dependencies:
- align-text "^0.1.3"
- lazy-cache "^1.0.3"
-
-chalk@^1.1.1, chalk@^1.1.3:
- version "1.1.3"
- resolved "http://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
- integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
- dependencies:
- ansi-styles "^2.2.1"
- escape-string-regexp "^1.0.2"
- has-ansi "^2.0.0"
- strip-ansi "^3.0.0"
- supports-color "^2.0.0"
-
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1:
- version "2.4.1"
- resolved "http://registry.npm.taobao.org/chalk/download/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
- integrity sha1-GMSasWoDe26wFSzIPjRxM4IVtm4=
- dependencies:
- ansi-styles "^3.2.1"
- escape-string-regexp "^1.0.5"
- supports-color "^5.3.0"
-
-chalk@^2.4.2:
- version "2.4.2"
- resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
- integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
- dependencies:
- ansi-styles "^3.2.1"
- escape-string-regexp "^1.0.5"
- supports-color "^5.3.0"
-
-chardet@^0.4.0:
- version "0.4.2"
- resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
- integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=
-
-chardet@^0.7.0:
- version "0.7.0"
- resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
- integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-
-charenc@~0.0.1:
- version "0.0.2"
- resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
- integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
-
-check-types@^7.3.0:
- version "7.4.0"
- resolved "https://registry.yarnpkg.com/check-types/-/check-types-7.4.0.tgz#0378ec1b9616ec71f774931a3c6516fad8c152f4"
- integrity sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==
-
-chokidar@^2.0.0, chokidar@^2.0.2:
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
- integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==
- dependencies:
- anymatch "^2.0.0"
- async-each "^1.0.0"
- braces "^2.3.0"
- glob-parent "^3.1.0"
- inherits "^2.0.1"
- is-binary-path "^1.0.0"
- is-glob "^4.0.0"
- lodash.debounce "^4.0.8"
- normalize-path "^2.1.1"
- path-is-absolute "^1.0.0"
- readdirp "^2.0.0"
- upath "^1.0.5"
- optionalDependencies:
- fsevents "^1.2.2"
-
-chownr@^1.0.1, chownr@^1.1.1:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/chownr/download/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
- integrity sha1-VHJri4//TfBTxCGH6AH7RBLfFJQ=
-
-chrome-trace-event@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/chrome-trace-event/download/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
- integrity sha1-Rakb0sIMlBHwljtarrmhuV4JzEg=
- dependencies:
- tslib "^1.9.0"
-
-ci-info@^1.5.0:
- version "1.6.0"
- resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
- integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
-
-cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
- version "1.0.4"
- resolved "http://registry.npm.taobao.org/cipher-base/download/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
- integrity sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=
- dependencies:
- inherits "^2.0.1"
- safe-buffer "^5.0.1"
-
-circular-json@^0.3.1:
- version "0.3.3"
- resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
- integrity sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==
-
-class-utils@^0.3.5:
- version "0.3.6"
- resolved "http://registry.npm.taobao.org/class-utils/download/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
- integrity sha1-+TNprouafOAv1B+q0MqDAzGQxGM=
- dependencies:
- arr-union "^3.1.0"
- define-property "^0.2.5"
- isobject "^3.0.0"
- static-extend "^0.1.1"
-
-classnames@^2.2.5:
- version "2.2.6"
- resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
- integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
-
-clean-css@4.2.x:
- version "4.2.1"
- resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
- integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
- dependencies:
- source-map "~0.6.0"
-
-cli-cursor@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
- integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
- dependencies:
- restore-cursor "^2.0.0"
-
-cli-spinners@^2.0.0:
- version "2.0.0"
- resolved "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.0.0.tgz#4b078756fc17a8f72043fdc9f1f14bf4fa87e2df"
- integrity sha512-yiEBmhaKPPeBj7wWm4GEdtPZK940p9pl3EANIrnJ3JnvWyrPjcFcsEq6qRUuQ7fzB0+Y82ld3p6B34xo95foWw==
-
-cli-width@^2.0.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
- integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
-
-clipboardy@^1.2.3:
- version "1.2.3"
- resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-1.2.3.tgz#0526361bf78724c1f20be248d428e365433c07ef"
- integrity sha512-2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA==
- dependencies:
- arch "^2.1.0"
- execa "^0.8.0"
-
-cliui@^2.1.0:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/cliui/download/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
- integrity sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=
- dependencies:
- center-align "^0.1.1"
- right-align "^0.1.1"
- wordwrap "0.0.2"
-
-cliui@^3.2.0:
- version "3.2.0"
- resolved "http://registry.npm.taobao.org/cliui/download/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
- integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
- dependencies:
- string-width "^1.0.1"
- strip-ansi "^3.0.1"
- wrap-ansi "^2.0.0"
-
-cliui@^4.0.0, cliui@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
- integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
- dependencies:
- string-width "^2.1.1"
- strip-ansi "^4.0.0"
- wrap-ansi "^2.0.0"
-
-clone-deep@^2.0.1:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
- integrity sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==
- dependencies:
- for-own "^1.0.0"
- is-plain-object "^2.0.4"
- kind-of "^6.0.0"
- shallow-clone "^1.0.0"
-
-clone@^1.0.2:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
- integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
-
-clone@^2.1.1, clone@^2.1.2:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
- integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
-
-co@^4.6.0:
- version "4.6.0"
- resolved "http://registry.npm.taobao.org/co/download/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
- integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
-
-coa@~2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.1.tgz#f3f8b0b15073e35d70263fb1042cb2c023db38af"
- integrity sha512-5wfTTO8E2/ja4jFSxePXlG5nRu5bBtL/r1HCIpJW/lzT6yDtKl0u0Z4o/Vpz32IpKmBn7HerheEZQgA9N2DarQ==
- dependencies:
- q "^1.1.2"
-
-code-point-at@^1.0.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/code-point-at/download/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
- integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
-collection-visit@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/collection-visit/download/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
- integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
- dependencies:
- map-visit "^1.0.0"
- object-visit "^1.0.0"
-
-color-convert@^1.9.0, color-convert@^1.9.1:
- version "1.9.3"
- resolved "http://registry.npm.taobao.org/color-convert/download/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
- integrity sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg=
- dependencies:
- color-name "1.1.3"
-
-color-name@1.1.3:
- version "1.1.3"
- resolved "http://registry.npm.taobao.org/color-name/download/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
- integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
-color-name@^1.0.0:
- version "1.1.4"
- resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
- integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-color-string@^1.5.2:
- version "1.5.3"
- resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc"
- integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==
- dependencies:
- color-name "^1.0.0"
- simple-swizzle "^0.2.2"
-
-color@^3.0.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/color/-/color-3.1.0.tgz#d8e9fb096732875774c84bf922815df0308d0ffc"
- integrity sha512-CwyopLkuRYO5ei2EpzpIh6LqJMt6Mt+jZhO5VI5f/wJLZriXQE32/SSqzmrh+QB+AZT81Cj8yv+7zwToW8ahZg==
- dependencies:
- color-convert "^1.9.1"
- color-string "^1.5.2"
-
-colors@~1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
- integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
-
-combined-stream@^1.0.6, combined-stream@~1.0.6:
- version "1.0.7"
- resolved "http://registry.npm.taobao.org/combined-stream/download/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
- integrity sha1-LR0kMXr7ir6V1tLAsHtXgTU52Cg=
- dependencies:
- delayed-stream "~1.0.0"
-
-commander@2, commander@^2.18.0:
- version "2.19.0"
- resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
- integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
-
-commander@2.17.x, commander@~2.17.1:
- version "2.17.1"
- resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
- integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
-
-commondir@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/commondir/download/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
- integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
-
-component-classes@^1.2.6:
- version "1.2.6"
- resolved "https://registry.yarnpkg.com/component-classes/-/component-classes-1.2.6.tgz#c642394c3618a4d8b0b8919efccbbd930e5cd691"
- integrity sha1-xkI5TDYYpNiwuJGe/Mu9kw5c1pE=
- dependencies:
- component-indexof "0.0.3"
-
-component-emitter@^1.2.1:
- version "1.2.1"
- resolved "http://registry.npm.taobao.org/component-emitter/download/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
- integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
-
-component-indexof@0.0.3:
- version "0.0.3"
- resolved "https://registry.yarnpkg.com/component-indexof/-/component-indexof-0.0.3.tgz#11d091312239eb8f32c8f25ae9cb002ffe8d3c24"
- integrity sha1-EdCRMSI5648yyPJa6csAL/6NPCQ=
-
-compressible@~2.0.14:
- version "2.0.15"
- resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.15.tgz#857a9ab0a7e5a07d8d837ed43fe2defff64fe212"
- integrity sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==
- dependencies:
- mime-db ">= 1.36.0 < 2"
-
-compression@^1.5.2:
- version "1.7.3"
- resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
- integrity sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==
- dependencies:
- accepts "~1.3.5"
- bytes "3.0.0"
- compressible "~2.0.14"
- debug "2.6.9"
- on-headers "~1.0.1"
- safe-buffer "5.1.2"
- vary "~1.1.2"
-
-concat-map@0.0.1:
- version "0.0.1"
- resolved "http://registry.npm.taobao.org/concat-map/download/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
- integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-
-concat-stream@^1.5.0, concat-stream@^1.6.0:
- version "1.6.2"
- resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
- integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
- dependencies:
- buffer-from "^1.0.0"
- inherits "^2.0.3"
- readable-stream "^2.2.2"
- typedarray "^0.0.6"
-
-connect-history-api-fallback@^1.3.0:
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
- integrity sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=
-
-console-browserify@^1.1.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/console-browserify/download/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
- integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
- dependencies:
- date-now "^0.1.4"
-
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/console-control-strings/download/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
- integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
-consolidate@^0.15.1:
- version "0.15.1"
- resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
- integrity sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==
- dependencies:
- bluebird "^3.1.1"
-
-constants-browserify@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/constants-browserify/download/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
- integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
-
-contains-path@^0.1.0:
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
- integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=
-
-content-disposition@0.5.2:
- version "0.5.2"
- resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
- integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
-
-content-type@~1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
- integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
-
-contour_plot@^0.0.1:
- version "0.0.1"
- resolved "http://registry.npm.taobao.org/contour_plot/download/contour_plot-0.0.1.tgz#475870f032b8e338412aa5fc507880f0bf495c77"
- integrity sha1-R1hw8DK44zhBKqX8UHiA8L9JXHc=
-
-convert-source-map@^1.1.0:
- version "1.6.0"
- resolved "http://registry.npm.taobao.org/convert-source-map/download/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
- integrity sha1-UbU3qMQ+DwTewZk7/83VBOdYrCA=
- dependencies:
- safe-buffer "~5.1.1"
-
-cookie-signature@1.0.6:
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
- integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
-
-cookie@0.3.1:
- version "0.3.1"
- resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
- integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
-
-copy-concurrently@^1.0.0:
- version "1.0.5"
- resolved "http://registry.npm.taobao.org/copy-concurrently/download/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
- integrity sha1-kilzmMrjSTf8r9bsgTnBgFHwteA=
- dependencies:
- aproba "^1.1.1"
- fs-write-stream-atomic "^1.0.8"
- iferr "^0.1.5"
- mkdirp "^0.5.1"
- rimraf "^2.5.4"
- run-queue "^1.0.0"
-
-copy-descriptor@^0.1.0:
- version "0.1.1"
- resolved "http://registry.npm.taobao.org/copy-descriptor/download/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
- integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-
-copy-webpack-plugin@^4.6.0:
- version "4.6.0"
- resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz#e7f40dd8a68477d405dd1b7a854aae324b158bae"
- integrity sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==
- dependencies:
- cacache "^10.0.4"
- find-cache-dir "^1.0.0"
- globby "^7.1.1"
- is-glob "^4.0.0"
- loader-utils "^1.1.0"
- minimatch "^3.0.4"
- p-limit "^1.0.0"
- serialize-javascript "^1.4.0"
-
-core-js@^2.4.0, core-js@^2.5.7:
- version "2.5.7"
- resolved "http://registry.npm.taobao.org/core-js/download/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
- integrity sha1-+XJgj/DOrWi4QaFqky0LGDeRgU4=
-
-core-js@^2.6.5:
- version "2.6.5"
- resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
- integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
-
-core-util-is@1.0.2, core-util-is@~1.0.0:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/core-util-is/download/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
- integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
-cosmiconfig@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
- integrity sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==
- dependencies:
- is-directory "^0.3.1"
- js-yaml "^3.9.0"
- parse-json "^4.0.0"
- require-from-string "^2.0.1"
-
-cosmiconfig@^5.0.0:
- version "5.0.6"
- resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz#dca6cf680a0bd03589aff684700858c81abeeb39"
- integrity sha512-6DWfizHriCrFWURP1/qyhsiFvYdlJzbCzmtFWh744+KyWsJo5+kPzUZZaMRSSItoYc0pxFX7gEO7ZC1/gN/7AQ==
- dependencies:
- is-directory "^0.3.1"
- js-yaml "^3.9.0"
- parse-json "^4.0.0"
-
-create-ecdh@^4.0.0:
- version "4.0.3"
- resolved "http://registry.npm.taobao.org/create-ecdh/download/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
- integrity sha1-yREbbzMEXEaX8UR4f5JUzcd8Rf8=
- dependencies:
- bn.js "^4.1.0"
- elliptic "^6.0.0"
-
-create-hash@^1.1.0, create-hash@^1.1.2:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/create-hash/download/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
- integrity sha1-iJB4rxGmN1a8+1m9IhmWvjqe8ZY=
- dependencies:
- cipher-base "^1.0.1"
- inherits "^2.0.1"
- md5.js "^1.3.4"
- ripemd160 "^2.0.1"
- sha.js "^2.4.0"
-
-create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
- version "1.1.7"
- resolved "http://registry.npm.taobao.org/create-hmac/download/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
- integrity sha1-aRcMeLOrlXFHsriwRXLkfq0iQ/8=
- dependencies:
- cipher-base "^1.0.3"
- create-hash "^1.1.0"
- inherits "^2.0.1"
- ripemd160 "^2.0.0"
- safe-buffer "^5.0.1"
- sha.js "^2.4.8"
-
-cross-spawn@^3.0.0:
- version "3.0.1"
- resolved "http://registry.npm.taobao.org/cross-spawn/download/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
- integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=
- dependencies:
- lru-cache "^4.0.1"
- which "^1.2.9"
-
-cross-spawn@^5.0.1, cross-spawn@^5.1.0:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
- integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
- dependencies:
- lru-cache "^4.0.1"
- shebang-command "^1.2.0"
- which "^1.2.9"
-
-cross-spawn@^6.0.0, cross-spawn@^6.0.5:
- version "6.0.5"
- resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
- integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
- dependencies:
- nice-try "^1.0.4"
- path-key "^2.0.1"
- semver "^5.5.0"
- shebang-command "^1.2.0"
- which "^1.2.9"
-
-crypt@~0.0.1:
- version "0.0.2"
- resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
- integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
-
-crypto-browserify@^3.11.0:
- version "3.12.0"
- resolved "http://registry.npm.taobao.org/crypto-browserify/download/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
- integrity sha1-OWz58xN/A+S45TLFj2mCVOAPgOw=
- dependencies:
- browserify-cipher "^1.0.0"
- browserify-sign "^4.0.0"
- create-ecdh "^4.0.0"
- create-hash "^1.1.0"
- create-hmac "^1.1.0"
- diffie-hellman "^5.0.0"
- inherits "^2.0.1"
- pbkdf2 "^3.0.3"
- public-encrypt "^4.0.0"
- randombytes "^2.0.0"
- randomfill "^1.0.3"
-
-css-color-names@0.0.4, css-color-names@^0.0.4:
- version "0.0.4"
- resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
- integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=
-
-css-declaration-sorter@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz#c198940f63a76d7e36c1e71018b001721054cb22"
- integrity sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==
- dependencies:
- postcss "^7.0.1"
- timsort "^0.3.0"
-
-css-loader@^1.0.0, css-loader@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-1.0.1.tgz#6885bb5233b35ec47b006057da01cc640b6b79fe"
- integrity sha512-+ZHAZm/yqvJ2kDtPne3uX0C+Vr3Zn5jFn2N4HywtS5ujwvsVkyg0VArEXpl3BgczDA8anieki1FIzhchX4yrDw==
- dependencies:
- babel-code-frame "^6.26.0"
- css-selector-tokenizer "^0.7.0"
- icss-utils "^2.1.0"
- loader-utils "^1.0.2"
- lodash "^4.17.11"
- postcss "^6.0.23"
- postcss-modules-extract-imports "^1.2.0"
- postcss-modules-local-by-default "^1.2.0"
- postcss-modules-scope "^1.1.0"
- postcss-modules-values "^1.3.0"
- postcss-value-parser "^3.3.0"
- source-list-map "^2.0.0"
-
-css-select-base-adapter@~0.1.0:
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.0.tgz#0102b3d14630df86c3eb9fa9f5456270106cf990"
- integrity sha1-AQKz0UYw34bD65+p9UVicBBs+ZA=
-
-css-select@^1.1.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
- integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
- dependencies:
- boolbase "~1.0.0"
- css-what "2.1"
- domutils "1.5.1"
- nth-check "~1.0.1"
-
-css-select@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.0.0.tgz#7aa2921392114831f68db175c0b6a555df74bbd5"
- integrity sha512-MGhoq1S9EyPgZIGnts8Yz5WwUOyHmPMdlqeifsYs/xFX7AAm3hY0RJe1dqVlXtYPI66Nsk39R/sa5/ree6L2qg==
- dependencies:
- boolbase "^1.0.0"
- css-what "2.1"
- domutils "^1.7.0"
- nth-check "^1.0.1"
-
-css-selector-tokenizer@^0.7.0:
- version "0.7.1"
- resolved "http://registry.npm.taobao.org/css-selector-tokenizer/download/css-selector-tokenizer-0.7.1.tgz#a177271a8bca5019172f4f891fc6eed9cbf68d5d"
- integrity sha1-oXcnGovKUBkXL0+JH8bu2cv2jV0=
- dependencies:
- cssesc "^0.1.0"
- fastparse "^1.1.1"
- regexpu-core "^1.0.0"
-
-css-tree@1.0.0-alpha.28:
- version "1.0.0-alpha.28"
- resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.28.tgz#8e8968190d886c9477bc8d61e96f61af3f7ffa7f"
- integrity sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w==
- dependencies:
- mdn-data "~1.1.0"
- source-map "^0.5.3"
-
-css-tree@1.0.0-alpha.29:
- version "1.0.0-alpha.29"
- resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.29.tgz#3fa9d4ef3142cbd1c301e7664c1f352bd82f5a39"
- integrity sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==
- dependencies:
- mdn-data "~1.1.0"
- source-map "^0.5.3"
-
-css-unit-converter@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz#d9b9281adcfd8ced935bdbaba83786897f64e996"
- integrity sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=
-
-css-url-regex@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/css-url-regex/-/css-url-regex-1.1.0.tgz#83834230cc9f74c457de59eebd1543feeb83b7ec"
- integrity sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=
-
-css-what@2.1:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
- integrity sha1-lGfQMsOM+u+58teVASUwYvh/ob0=
-
-cssesc@^0.1.0:
- version "0.1.0"
- resolved "http://registry.npm.taobao.org/cssesc/download/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
- integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=
-
-cssesc@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-1.0.1.tgz#ef7bd8d0229ed6a3a7051ff7771265fe7330e0a8"
- integrity sha512-S2hzrpWvE6G/rW7i7IxJfWBYn27QWfOIncUW++8Rbo1VB5zsJDSVPcnI+Q8z7rhxT6/yZeLOCja4cZnghJrNGA==
-
-cssesc@^2.0.0:
- version "2.0.0"
- resolved "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"
- integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==
-
-cssnano-preset-default@^4.0.0, cssnano-preset-default@^4.0.2:
- version "4.0.3"
- resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.3.tgz#9bfd1b06d4aa3991ed958ad9b9ec25a179261705"
- integrity sha512-RYxcuQhGGybn+4twdn/c/A6Ephq31znqbWMdtjWdyC84IcqnXxBuLue0iNxHhwUr+eNtaJU4pJX8ro9F7Crw5w==
- dependencies:
- css-declaration-sorter "^4.0.1"
- cssnano-util-raw-cache "^4.0.1"
- postcss "^7.0.0"
- postcss-calc "^7.0.0"
- postcss-colormin "^4.0.2"
- postcss-convert-values "^4.0.1"
- postcss-discard-comments "^4.0.1"
- postcss-discard-duplicates "^4.0.2"
- postcss-discard-empty "^4.0.1"
- postcss-discard-overridden "^4.0.1"
- postcss-merge-longhand "^4.0.6"
- postcss-merge-rules "^4.0.2"
- postcss-minify-font-values "^4.0.2"
- postcss-minify-gradients "^4.0.1"
- postcss-minify-params "^4.0.1"
- postcss-minify-selectors "^4.0.1"
- postcss-normalize-charset "^4.0.1"
- postcss-normalize-display-values "^4.0.1"
- postcss-normalize-positions "^4.0.1"
- postcss-normalize-repeat-style "^4.0.1"
- postcss-normalize-string "^4.0.1"
- postcss-normalize-timing-functions "^4.0.1"
- postcss-normalize-unicode "^4.0.1"
- postcss-normalize-url "^4.0.1"
- postcss-normalize-whitespace "^4.0.1"
- postcss-ordered-values "^4.1.1"
- postcss-reduce-initial "^4.0.2"
- postcss-reduce-transforms "^4.0.1"
- postcss-svgo "^4.0.1"
- postcss-unique-selectors "^4.0.1"
-
-cssnano-preset-default@^4.0.7:
- version "4.0.7"
- resolved "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz#51ec662ccfca0f88b396dcd9679cdb931be17f76"
- integrity sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==
- dependencies:
- css-declaration-sorter "^4.0.1"
- cssnano-util-raw-cache "^4.0.1"
- postcss "^7.0.0"
- postcss-calc "^7.0.1"
- postcss-colormin "^4.0.3"
- postcss-convert-values "^4.0.1"
- postcss-discard-comments "^4.0.2"
- postcss-discard-duplicates "^4.0.2"
- postcss-discard-empty "^4.0.1"
- postcss-discard-overridden "^4.0.1"
- postcss-merge-longhand "^4.0.11"
- postcss-merge-rules "^4.0.3"
- postcss-minify-font-values "^4.0.2"
- postcss-minify-gradients "^4.0.2"
- postcss-minify-params "^4.0.2"
- postcss-minify-selectors "^4.0.2"
- postcss-normalize-charset "^4.0.1"
- postcss-normalize-display-values "^4.0.2"
- postcss-normalize-positions "^4.0.2"
- postcss-normalize-repeat-style "^4.0.2"
- postcss-normalize-string "^4.0.2"
- postcss-normalize-timing-functions "^4.0.2"
- postcss-normalize-unicode "^4.0.1"
- postcss-normalize-url "^4.0.1"
- postcss-normalize-whitespace "^4.0.2"
- postcss-ordered-values "^4.1.2"
- postcss-reduce-initial "^4.0.3"
- postcss-reduce-transforms "^4.0.2"
- postcss-svgo "^4.0.2"
- postcss-unique-selectors "^4.0.1"
-
-cssnano-util-get-arguments@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz#ed3a08299f21d75741b20f3b81f194ed49cc150f"
- integrity sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=
-
-cssnano-util-get-match@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz#c0e4ca07f5386bb17ec5e52250b4f5961365156d"
- integrity sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=
-
-cssnano-util-raw-cache@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz#b26d5fd5f72a11dfe7a7846fb4c67260f96bf282"
- integrity sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==
- dependencies:
- postcss "^7.0.0"
-
-cssnano-util-same-parent@^4.0.0:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz#574082fb2859d2db433855835d9a8456ea18bbf3"
- integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==
-
-cssnano@^4.0.0:
- version "4.1.5"
- resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.5.tgz#cfe5ffa722079f339ac2a6d547d88dd8ac8a498d"
- integrity sha512-+6m3g8zV87VDIMCXpDzlaXyzo9h9VrIn9o/XRU6ufH/AddZw/mHzmmmNv83+MxpX5rnVbYPxuAMYPjuDgjd9Hw==
- dependencies:
- cosmiconfig "^5.0.0"
- cssnano-preset-default "^4.0.2"
- is-resolvable "^1.0.0"
- postcss "^7.0.0"
-
-cssnano@^4.1.10:
- version "4.1.10"
- resolved "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz#0ac41f0b13d13d465487e111b778d42da631b8b2"
- integrity sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==
- dependencies:
- cosmiconfig "^5.0.0"
- cssnano-preset-default "^4.0.7"
- is-resolvable "^1.0.0"
- postcss "^7.0.0"
-
-csso@^3.5.0:
- version "3.5.1"
- resolved "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz#7b9eb8be61628973c1b261e169d2f024008e758b"
- integrity sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==
- dependencies:
- css-tree "1.0.0-alpha.29"
-
-currently-unhandled@^0.4.1:
- version "0.4.1"
- resolved "http://registry.npm.taobao.org/currently-unhandled/download/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
- integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
- dependencies:
- array-find-index "^1.0.1"
-
-cyclist@~0.2.2:
- version "0.2.2"
- resolved "http://registry.npm.taobao.org/cyclist/download/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
- integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
-
-d3-array@1, d3-array@~1.2.0:
- version "1.2.4"
- resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f"
- integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==
-
-d3-collection@1:
- version "1.0.7"
- resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e"
- integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==
-
-d3-color@1:
- version "1.2.3"
- resolved "http://registry.npm.taobao.org/d3-color/download/d3-color-1.2.3.tgz#6c67bb2af6df3cc8d79efcc4d3a3e83e28c8048f"
- integrity sha1-bGe7KvbfPMjXnvzE06PoPijIBI8=
-
-d3-composite-projections@~1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/d3-composite-projections/-/d3-composite-projections-1.2.0.tgz#fa0e6f1442f17d04643843a3a883c7d94e0c27c0"
- integrity sha1-+g5vFELxfQRkOEOjqIPH2U4MJ8A=
- dependencies:
- d3-geo "1.2.4"
- d3-path "^1.0.1"
-
-d3-dispatch@1:
- version "1.0.5"
- resolved "http://registry.npm.taobao.org/d3-dispatch/download/d3-dispatch-1.0.5.tgz#e25c10a186517cd6c82dd19ea018f07e01e39015"
- integrity sha1-4lwQoYZRfNbILdGeoBjwfgHjkBU=
-
-d3-dsv@~1.0.5:
- version "1.0.10"
- resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.0.10.tgz#4371c489a2a654a297aca16fcaf605a6f31a6f51"
- integrity sha512-vqklfpxmtO2ZER3fq/B33R/BIz3A1PV0FaZRuFM8w6jLo7sUX1BZDh73fPlr0s327rzq4H6EN1q9U+eCBCSN8g==
- dependencies:
- commander "2"
- iconv-lite "0.4"
- rw "1"
-
-d3-ease@1, d3-ease@~1.0.3:
- version "1.0.5"
- resolved "http://registry.npm.taobao.org/d3-ease/download/d3-ease-1.0.5.tgz#8ce59276d81241b1b72042d6af2d40e76d936ffb"
- integrity sha1-jOWSdtgSQbG3IELWry1A522Tb/s=
-
-d3-format@^1.3.0:
- version "1.3.2"
- resolved "http://registry.npm.taobao.org/d3-format/download/d3-format-1.3.2.tgz#6a96b5e31bcb98122a30863f7d92365c00603562"
- integrity sha1-apa14xvLmBIqMIY/fZI2XABgNWI=
-
-d3-geo-projection@~2.1.2:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/d3-geo-projection/-/d3-geo-projection-2.1.2.tgz#7df8e1e9d046d631c6509f7e531357d4adc24aa3"
- integrity sha1-ffjh6dBG1jHGUJ9+UxNX1K3CSqM=
- dependencies:
- commander "2"
- d3-array "1"
- d3-geo "^1.1.0"
-
-d3-geo@1.2.4:
- version "1.2.4"
- resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.2.4.tgz#d179f3baa76e623ef1e0d83693db705b7c599006"
- integrity sha1-0XnzuqduYj7x4Ng2k9twW3xZkAY=
- dependencies:
- d3-array "1"
-
-d3-geo@^1.1.0:
- version "1.11.1"
- resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.11.1.tgz#3f35e582c0d29296618b02a8ade0fdffb2c0e63c"
- integrity sha512-GsG7x9G9sykseLviOVSJ3h5yjw0ItLopOtuDQKUt1TRklEegCw5WAmnIpYYiCkSH/QgUMleAeE2xZK38Qb+1+Q==
- dependencies:
- d3-array "1"
-
-d3-geo@~1.6.4:
- version "1.6.4"
- resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.6.4.tgz#f20e1e461cb1845f5a8be55ab6f876542a7e3199"
- integrity sha1-8g4eRhyxhF9ai+Vatvh2VCp+MZk=
- dependencies:
- d3-array "1"
-
-d3-hexjson@~1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/d3-hexjson/-/d3-hexjson-1.0.1.tgz#6a23111e8359f1e214f5d0afa379c02b2b67df0b"
- integrity sha512-TeH4T0PSbDazMm3gHgc4ulO0PfrZpz0Uk3y5tCGz+NgC7HnX7KBdem7uAN+j9x3ZshTh7raN3V/bFhaLB2C8DA==
- dependencies:
- d3-array "1"
-
-d3-hierarchy@~1.1.5:
- version "1.1.8"
- resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.8.tgz#7a6317bd3ed24e324641b6f1e76e978836b008cc"
- integrity sha512-L+GHMSZNwTpiq4rt9GEsNcpLa4M96lXMR8M/nMG9p5hBE0jy6C+3hWtyZMenPQdwla249iJy7Nx0uKt3n+u9+w==
-
-d3-interpolate@1:
- version "1.3.2"
- resolved "http://registry.npm.taobao.org/d3-interpolate/download/d3-interpolate-1.3.2.tgz#417d3ebdeb4bc4efcc8fd4361c55e4040211fd68"
- integrity sha1-QX0+vetLxO/Mj9Q2HFXkBAIR/Wg=
- dependencies:
- d3-color "1"
-
-d3-interpolate@~1.1.5:
- version "1.1.6"
- resolved "http://registry.npm.taobao.org/d3-interpolate/download/d3-interpolate-1.1.6.tgz#2cf395ae2381804df08aa1bf766b7f97b5f68fb6"
- integrity sha1-LPOVriOBgE3wiqG/dmt/l7X2j7Y=
- dependencies:
- d3-color "1"
-
-d3-path@1, d3-path@^1.0.1:
- version "1.0.7"
- resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.7.tgz#8de7cd693a75ac0b5480d3abaccd94793e58aae8"
- integrity sha512-q0cW1RpvA5c5ma2rch62mX8AYaiLX0+bdaSM2wxSU9tXjU4DNvkx9qiUvjkuWCj3p22UO/hlPivujqMiR9PDzA==
-
-d3-sankey@~0.7.1:
- version "0.7.1"
- resolved "https://registry.yarnpkg.com/d3-sankey/-/d3-sankey-0.7.1.tgz#d229832268fc69a7fec84803e96c2256a614c521"
- integrity sha1-0imDImj8aaf+yEgD6WwiVqYUxSE=
- dependencies:
- d3-array "1"
- d3-collection "1"
- d3-shape "^1.2.0"
-
-d3-selection@^1.0.2, d3-selection@^1.1.0:
- version "1.3.2"
- resolved "http://registry.npm.taobao.org/d3-selection/download/d3-selection-1.3.2.tgz#6e70a9df60801c8af28ac24d10072d82cbfdf652"
- integrity sha1-bnCp32CAHIryisJNEActgsv99lI=
-
-d3-shape@^1.2.0:
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.2.tgz#f9dba3777a5825f9a8ce8bc928da08c17679e9a7"
- integrity sha512-hUGEozlKecFZ2bOSNt7ENex+4Tk9uc/m0TtTEHBvitCBxUNjhzm5hS2GrrVRD/ae4IylSmxGeqX5tWC2rASMlQ==
- dependencies:
- d3-path "1"
-
-d3-timer@1, d3-timer@~1.0.6:
- version "1.0.9"
- resolved "http://registry.npm.taobao.org/d3-timer/download/d3-timer-1.0.9.tgz#f7bb8c0d597d792ff7131e1c24a36dd471a471ba"
- integrity sha1-97uMDVl9eS/3Ex4cJKNt1HGkcbo=
-
-d3-transition@^1.0.1:
- version "1.1.3"
- resolved "http://registry.npm.taobao.org/d3-transition/download/d3-transition-1.1.3.tgz#3a435b05ce9cef9524fe0d38121cfb6905331ca6"
- integrity sha1-OkNbBc6c75Uk/g04Ehz7aQUzHKY=
- dependencies:
- d3-color "1"
- d3-dispatch "1"
- d3-ease "1"
- d3-interpolate "1"
- d3-selection "^1.1.0"
- d3-timer "1"
-
-d3-voronoi@~1.1.2:
- version "1.1.4"
- resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.4.tgz#dd3c78d7653d2bb359284ae478645d95944c8297"
- integrity sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg==
-
-dagre@~0.8.2:
- version "0.8.2"
- resolved "https://registry.yarnpkg.com/dagre/-/dagre-0.8.2.tgz#755b79f4d5499d63cf74c3368fb08add93eceafe"
- integrity sha512-TEOOGZOkCOgCG7AoUIq64sJ3d21SMv8tyoqteLpX+UsUsS9Qw8iap4hhogXY4oB3r0bbZuAjO0atAilgCmsE0Q==
- dependencies:
- graphlib "^2.1.5"
- lodash "^4.17.4"
-
-dashdash@^1.12.0:
- version "1.14.1"
- resolved "http://registry.npm.taobao.org/dashdash/download/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
- integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
- dependencies:
- assert-plus "^1.0.0"
-
-date-now@^0.1.4:
- version "0.1.4"
- resolved "http://registry.npm.taobao.org/date-now/download/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
- integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
-
-dayjs@^1.8.0:
- version "1.8.9"
- resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.8.9.tgz#8b5fda2f995ff5f29705894e1d23240f7f674f61"
- integrity sha512-/LPzoQ77NiXf566p5babPBkqegpJ94koAQ0vUfkcfWYcuvzOTgr+N9V4IOnQ3H05Su/9dpFNOV1iPvEhAsRscw==
-
-de-indent@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
- integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=
-
-debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
- version "2.6.9"
- resolved "http://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
- integrity sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=
- dependencies:
- ms "2.0.0"
-
-debug@=3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
- integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
- dependencies:
- ms "2.0.0"
-
-debug@^3.1.0, debug@^3.2.5:
- version "3.2.6"
- resolved "http://registry.npm.taobao.org/debug/download/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
- integrity sha1-6D0X3hbYp++3cX7b5fsQE17uYps=
- dependencies:
- ms "^2.1.1"
-
-debug@^4.0.1, debug@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
- integrity sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==
- dependencies:
- ms "^2.1.1"
-
-debug@^4.1.1:
- version "4.1.1"
- resolved "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
- integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
- dependencies:
- ms "^2.1.1"
-
-decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/decamelize/download/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
- integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
-decamelize@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
- integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
- dependencies:
- xregexp "4.0.0"
-
-decode-uri-component@^0.2.0:
- version "0.2.0"
- resolved "http://registry.npm.taobao.org/decode-uri-component/download/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
- integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
-
-deep-equal@^1.0.1, deep-equal@~1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
- integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
-
-deep-extend@^0.6.0:
- version "0.6.0"
- resolved "http://registry.npm.taobao.org/deep-extend/download/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
- integrity sha1-xPp8lUBKF6nD6Mp+FTcxK3NjMKw=
-
-deep-is@~0.1.3:
- version "0.1.3"
- resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
- integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
-
-deepmerge@^1.5.2:
- version "1.5.2"
- resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753"
- integrity sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==
-
-default-gateway@^4.0.1:
- version "4.2.0"
- resolved "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
- integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
- dependencies:
- execa "^1.0.0"
- ip-regex "^2.1.0"
-
-defaults@^1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
- integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
- dependencies:
- clone "^1.0.2"
-
-define-properties@^1.1.2:
- version "1.1.3"
- resolved "http://registry.npm.taobao.org/define-properties/download/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
- integrity sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE=
- dependencies:
- object-keys "^1.0.12"
-
-define-property@^0.2.5:
- version "0.2.5"
- resolved "http://registry.npm.taobao.org/define-property/download/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
- integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
- dependencies:
- is-descriptor "^0.1.0"
-
-define-property@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/define-property/download/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
- integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
- dependencies:
- is-descriptor "^1.0.0"
-
-define-property@^2.0.2:
- version "2.0.2"
- resolved "http://registry.npm.taobao.org/define-property/download/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
- integrity sha1-1Flono1lS6d+AqgX+HENcCyxbp0=
- dependencies:
- is-descriptor "^1.0.2"
- isobject "^3.0.1"
-
-defined@~1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/defined/download/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
- integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
-
-del@^2.0.2:
- version "2.2.2"
- resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
- integrity sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=
- dependencies:
- globby "^5.0.0"
- is-path-cwd "^1.0.0"
- is-path-in-cwd "^1.0.0"
- object-assign "^4.0.1"
- pify "^2.0.0"
- pinkie-promise "^2.0.0"
- rimraf "^2.2.8"
-
-del@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
- integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
- dependencies:
- globby "^6.1.0"
- is-path-cwd "^1.0.0"
- is-path-in-cwd "^1.0.0"
- p-map "^1.1.1"
- pify "^3.0.0"
- rimraf "^2.2.8"
-
-delayed-stream@~1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/delayed-stream/download/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
- integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-
-delegates@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
- integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
-depd@~1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
- integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
-
-des.js@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/des.js/download/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
- integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=
- dependencies:
- inherits "^2.0.1"
- minimalistic-assert "^1.0.0"
-
-destroy@~1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
- integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
-
-detect-libc@^1.0.2:
- version "1.0.3"
- resolved "http://registry.npm.taobao.org/detect-libc/download/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
- integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
-detect-node@^2.0.4:
- version "2.0.4"
- resolved "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
- integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
-
-diffie-hellman@^5.0.0:
- version "5.0.3"
- resolved "http://registry.npm.taobao.org/diffie-hellman/download/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
- integrity sha1-QOjumPVaIUlgcUaSHGPhrl89KHU=
- dependencies:
- bn.js "^4.1.0"
- miller-rabin "^4.0.0"
- randombytes "^2.0.0"
-
-dir-glob@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
- integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==
- dependencies:
- arrify "^1.0.1"
- path-type "^3.0.0"
-
-dir-glob@^2.2.1:
- version "2.2.2"
- resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
- integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
- dependencies:
- path-type "^3.0.0"
-
-dns-equal@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
- integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
-
-dns-packet@^1.3.1:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
- integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
- dependencies:
- ip "^1.1.0"
- safe-buffer "^5.0.1"
-
-dns-txt@^2.0.2:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
- integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=
- dependencies:
- buffer-indexof "^1.0.0"
-
-doctrine@1.5.0:
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
- integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=
- dependencies:
- esutils "^2.0.2"
- isarray "^1.0.0"
-
-doctrine@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
- integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
- dependencies:
- esutils "^2.0.2"
-
-doctrine@^3.0.0:
- version "3.0.0"
- resolved "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
- integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
- dependencies:
- esutils "^2.0.2"
-
-dom-align@^1.7.0:
- version "1.8.0"
- resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.8.0.tgz#c0e89b5b674c6e836cd248c52c2992135f093654"
- integrity sha512-B85D4ef2Gj5lw0rK0KM2+D5/pH7yqNxg2mB+E8uzFaolpm7RQmsxEfjyEuNiF8UBBkffumYDeKRzTzc3LePP+w==
-
-dom-closest@^0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/dom-closest/-/dom-closest-0.2.0.tgz#ebd9f91d1bf22e8d6f477876bbcd3ec90216c0cf"
- integrity sha1-69n5HRvyLo1vR3h2u80+yQIWwM8=
- dependencies:
- dom-matches ">=1.0.1"
-
-dom-converter@~0.2:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
- integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==
- dependencies:
- utila "~0.4"
-
-dom-matches@>=1.0.1:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/dom-matches/-/dom-matches-2.0.0.tgz#d2728b416a87533980eb089b848d253cf23a758c"
- integrity sha1-0nKLQWqHUzmA6wibhI0lPPI6dYw=
-
-dom-scroll-into-view@^1.2.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/dom-scroll-into-view/-/dom-scroll-into-view-1.2.1.tgz#e8f36732dd089b0201a88d7815dc3f88e6d66c7e"
- integrity sha1-6PNnMt0ImwIBqI14Fdw/iObWbH4=
-
-dom-serializer@0:
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
- integrity sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=
- dependencies:
- domelementtype "~1.1.1"
- entities "~1.1.1"
-
-domain-browser@^1.1.1:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/domain-browser/download/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
- integrity sha1-PTH1AZGmdJ3RN1p/Ui6CPULlTto=
-
-domelementtype@1:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
- integrity sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=
-
-domelementtype@~1.1.1:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
- integrity sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=
-
-domhandler@2.1:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
- integrity sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=
- dependencies:
- domelementtype "1"
-
-domutils@1.1:
- version "1.1.6"
- resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
- integrity sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=
- dependencies:
- domelementtype "1"
-
-domutils@1.5.1:
- version "1.5.1"
- resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
- integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
- dependencies:
- dom-serializer "0"
- domelementtype "1"
-
-domutils@^1.7.0:
- version "1.7.0"
- resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
- integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
- dependencies:
- dom-serializer "0"
- domelementtype "1"
-
-dot-prop@^4.1.1:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
- integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
- dependencies:
- is-obj "^1.0.0"
-
-dotenv-expand@^4.2.0:
- version "4.2.0"
- resolved "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275"
- integrity sha1-3vHxyl1gWdJKdm5YeULCEQbOEnU=
-
-dotenv@^6.2.0:
- version "6.2.0"
- resolved "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
- integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==
-
-duplexer@^0.1.1:
- version "0.1.1"
- resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
- integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
-
-duplexify@^3.4.2, duplexify@^3.6.0:
- version "3.6.1"
- resolved "http://registry.npm.taobao.org/duplexify/download/duplexify-3.6.1.tgz#b1a7a29c4abfd639585efaecce80d666b1e34125"
- integrity sha1-saeinEq/1jlYXvrszoDWZrHjQSU=
- dependencies:
- end-of-stream "^1.0.0"
- inherits "^2.0.1"
- readable-stream "^2.0.0"
- stream-shift "^1.0.0"
-
-easy-stack@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/easy-stack/-/easy-stack-1.0.0.tgz#12c91b3085a37f0baa336e9486eac4bf94e3e788"
- integrity sha1-EskbMIWjfwuqM26UhurEv5Tj54g=
-
-ecc-jsbn@~0.1.1:
- version "0.1.2"
- resolved "http://registry.npm.taobao.org/ecc-jsbn/download/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
- integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
- dependencies:
- jsbn "~0.1.0"
- safer-buffer "^2.1.0"
-
-ee-first@1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
- integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-
-ejs@^2.6.1:
- version "2.6.1"
- resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
- integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==
-
-electron-to-chromium@^1.3.113:
- version "1.3.113"
- resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz#b1ccf619df7295aea17bc6951dc689632629e4a9"
- integrity sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g==
-
-electron-to-chromium@^1.3.80, electron-to-chromium@^1.3.86:
- version "1.3.87"
- resolved "http://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.87.tgz#f0481ca84824752bced51673396e9a6c74fe5ec7"
- integrity sha1-8EgcqEgkdSvO1RZzOW6abHT+Xsc=
-
-elliptic@^6.0.0:
- version "6.4.1"
- resolved "http://registry.npm.taobao.org/elliptic/download/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
- integrity sha1-wtC3d2kRuGcixjLDwGxg8vgZk5o=
- dependencies:
- bn.js "^4.4.0"
- brorand "^1.0.1"
- hash.js "^1.0.0"
- hmac-drbg "^1.0.0"
- inherits "^2.0.1"
- minimalistic-assert "^1.0.0"
- minimalistic-crypto-utils "^1.0.0"
-
-emoji-regex@^7.0.1:
- version "7.0.3"
- resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
- integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
-emojis-list@^2.0.0:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/emojis-list/download/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
- integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
-
-encodeurl@~1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
- integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
-
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
- version "1.4.1"
- resolved "http://registry.npm.taobao.org/end-of-stream/download/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
- integrity sha1-7SljTRm6ukY7bOa4CjchPqtx7EM=
- dependencies:
- once "^1.4.0"
-
-enhanced-resolve@^4.1.0:
- version "4.1.0"
- resolved "http://registry.npm.taobao.org/enhanced-resolve/download/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
- integrity sha1-Qcfgv9/nSsH/4eV61qXGyfN0Kn8=
- dependencies:
- graceful-fs "^4.1.2"
- memory-fs "^0.4.0"
- tapable "^1.0.0"
-
-enquire.js@^2.1.6:
- version "2.1.6"
- resolved "https://registry.yarnpkg.com/enquire.js/-/enquire.js-2.1.6.tgz#3e8780c9b8b835084c3f60e166dbc3c2a3c89814"
- integrity sha1-PoeAybi4NQhMP2DhZtvDwqPImBQ=
-
-entities@~1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
- integrity sha1-blwtClYhtdra7O+AuQ7ftc13cvA=
-
-errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
- version "0.1.7"
- resolved "http://registry.npm.taobao.org/errno/download/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
- integrity sha1-RoTXF3mtOa8Xfj8AeZb3xnyFJhg=
- dependencies:
- prr "~1.0.1"
-
-error-ex@^1.2.0, error-ex@^1.3.1:
- version "1.3.2"
- resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
- integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
- dependencies:
- is-arrayish "^0.2.1"
-
-error-stack-parser@^2.0.0:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.2.tgz#4ae8dbaa2bf90a8b450707b9149dcabca135520d"
- integrity sha512-E1fPutRDdIj/hohG0UpT5mayXNCxXP9d+snxFsPU9X0XgccOumKraa3juDMwTUyi7+Bu5+mCGagjg4IYeNbOdw==
- dependencies:
- stackframe "^1.0.4"
-
-es-abstract@^1.4.3, es-abstract@^1.5.0, es-abstract@^1.5.1, es-abstract@^1.6.1:
- version "1.12.0"
- resolved "http://registry.npm.taobao.org/es-abstract/download/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
- integrity sha1-nbvdJ8aFbwABQhyhh4LXhr+KYWU=
- dependencies:
- es-to-primitive "^1.1.1"
- function-bind "^1.1.1"
- has "^1.0.1"
- is-callable "^1.1.3"
- is-regex "^1.0.4"
-
-es-to-primitive@^1.1.1:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/es-to-primitive/download/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
- integrity sha1-7fckeAM0VujdqO8J4ArZZQcH83c=
- dependencies:
- is-callable "^1.1.4"
- is-date-object "^1.0.1"
- is-symbol "^1.0.2"
-
-escape-html@~1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
- integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
-
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
- version "1.0.5"
- resolved "http://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
- integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-eslint-config-standard@^12.0.0:
- version "12.0.0"
- resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-12.0.0.tgz#638b4c65db0bd5a41319f96bba1f15ddad2107d9"
- integrity sha512-COUz8FnXhqFitYj4DTqHzidjIL/t4mumGZto5c7DrBpvWoie+Sn3P4sLEzUGeYhRElWuFEf8K1S1EfvD1vixCQ==
-
-eslint-import-resolver-node@^0.3.1:
- version "0.3.2"
- resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
- integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==
- dependencies:
- debug "^2.6.9"
- resolve "^1.5.0"
-
-eslint-loader@^2.1.2:
- version "2.1.2"
- resolved "https://registry.npmjs.org/eslint-loader/-/eslint-loader-2.1.2.tgz#453542a1230d6ffac90e4e7cb9cadba9d851be68"
- integrity sha512-rA9XiXEOilLYPOIInvVH5S/hYfyTPyxag6DZhoQOduM+3TkghAEQ3VcFO8VnX4J4qg/UIBzp72aOf/xvYmpmsg==
- dependencies:
- loader-fs-cache "^1.0.0"
- loader-utils "^1.0.2"
- object-assign "^4.0.1"
- object-hash "^1.1.4"
- rimraf "^2.6.1"
-
-eslint-module-utils@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz#b270362cd88b1a48ad308976ce7fa54e98411746"
- integrity sha1-snA2LNiLGkitMIl2zn+lTphBF0Y=
- dependencies:
- debug "^2.6.8"
- pkg-dir "^1.0.0"
-
-eslint-plugin-es@^1.3.1:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.4.0.tgz#475f65bb20c993fc10e8c8fe77d1d60068072da6"
- integrity sha512-XfFmgFdIUDgvaRAlaXUkxrRg5JSADoRC8IkKLc/cISeR3yHVMefFHQZpcyXXEUUPHfy5DwviBcrfqlyqEwlQVw==
- dependencies:
- eslint-utils "^1.3.0"
- regexpp "^2.0.1"
-
-eslint-plugin-import@^2.14.0:
- version "2.14.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz#6b17626d2e3e6ad52cfce8807a845d15e22111a8"
- integrity sha512-FpuRtniD/AY6sXByma2Wr0TXvXJ4nA/2/04VPlfpmUDPOpOY264x+ILiwnrk/k4RINgDAyFZByxqPUbSQ5YE7g==
- dependencies:
- contains-path "^0.1.0"
- debug "^2.6.8"
- doctrine "1.5.0"
- eslint-import-resolver-node "^0.3.1"
- eslint-module-utils "^2.2.0"
- has "^1.0.1"
- lodash "^4.17.4"
- minimatch "^3.0.3"
- read-pkg-up "^2.0.0"
- resolve "^1.6.0"
-
-eslint-plugin-node@^8.0.0:
- version "8.0.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-8.0.0.tgz#fb9e8911f4543514f154bb6a5924b599aa645568"
- integrity sha512-Y+ln8iQ52scz9+rSPnSWRaAxeWaoJZ4wIveDR0vLHkuSZGe44Vk1J4HX7WvEP5Cm+iXPE8ixo7OM7gAO3/OKpQ==
- dependencies:
- eslint-plugin-es "^1.3.1"
- eslint-utils "^1.3.1"
- ignore "^5.0.2"
- minimatch "^3.0.4"
- resolve "^1.8.1"
- semver "^5.5.0"
-
-eslint-plugin-promise@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.0.1.tgz#2d074b653f35a23d1ba89d8e976a985117d1c6a2"
- integrity sha512-Si16O0+Hqz1gDHsys6RtFRrW7cCTB6P7p3OJmKp3Y3dxpQE2qwOA7d3xnV+0mBmrPoi0RBnxlCKvqu70te6wjg==
-
-eslint-plugin-standard@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.0.tgz#f845b45109c99cd90e77796940a344546c8f6b5c"
- integrity sha512-OwxJkR6TQiYMmt1EsNRMe5qG3GsbjlcOhbGUBY4LtavF9DsLaTcoR+j2Tdjqi23oUwKNUqX7qcn5fPStafMdlA==
-
-eslint-plugin-vue@^4.7.1:
- version "4.7.1"
- resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-4.7.1.tgz#c829b9fc62582c1897b5a0b94afd44ecca511e63"
- integrity sha512-esETKhVMI7Vdli70Wt4bvAwnZBJeM0pxVX9Yb0wWKxdCJc2EADalVYK/q2FzMw8oKN0wPMdqVCKS8kmR89recA==
- dependencies:
- vue-eslint-parser "^2.0.3"
-
-eslint-plugin-vue@^5.1.0:
- version "5.2.2"
- resolved "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-5.2.2.tgz#86601823b7721b70bc92d54f1728cfc03b36283c"
- integrity sha512-CtGWH7IB0DA6BZOwcV9w9q3Ri6Yuo8qMjx05SmOGJ6X6E0Yo3y9E/gQ5tuNxg2dEt30tRnBoFTbvtmW9iEoyHA==
- dependencies:
- vue-eslint-parser "^5.0.0"
-
-eslint-scope@3.7.1:
- version "3.7.1"
- resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
- integrity sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=
- dependencies:
- esrecurse "^4.1.0"
- estraverse "^4.1.1"
-
-eslint-scope@^3.7.1:
- version "3.7.3"
- resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.3.tgz#bb507200d3d17f60247636160b4826284b108535"
- integrity sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==
- dependencies:
- esrecurse "^4.1.0"
- estraverse "^4.1.1"
-
-eslint-scope@^4.0.0:
- version "4.0.0"
- resolved "http://registry.npm.taobao.org/eslint-scope/download/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
- integrity sha1-UL8wcekzi83EMzF5Sgy1M/ATYXI=
- dependencies:
- esrecurse "^4.1.0"
- estraverse "^4.1.1"
-
-eslint-scope@^4.0.2:
- version "4.0.2"
- resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.2.tgz#5f10cd6cabb1965bf479fa65745673439e21cb0e"
- integrity sha512-5q1+B/ogmHl8+paxtOKx38Z8LtWkVGuNt3+GQNErqwLl6ViNp/gdJGMCjZNxZ8j/VYjDNZ2Fo+eQc1TAVPIzbg==
- dependencies:
- esrecurse "^4.1.0"
- estraverse "^4.1.1"
-
-eslint-utils@^1.3.0, eslint-utils@^1.3.1:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512"
- integrity sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==
-
-eslint-visitor-keys@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
- integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
-
-eslint@^4.19.1:
- version "4.19.1"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300"
- integrity sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==
- dependencies:
- ajv "^5.3.0"
- babel-code-frame "^6.22.0"
- chalk "^2.1.0"
- concat-stream "^1.6.0"
- cross-spawn "^5.1.0"
- debug "^3.1.0"
- doctrine "^2.1.0"
- eslint-scope "^3.7.1"
- eslint-visitor-keys "^1.0.0"
- espree "^3.5.4"
- esquery "^1.0.0"
- esutils "^2.0.2"
- file-entry-cache "^2.0.0"
- functional-red-black-tree "^1.0.1"
- glob "^7.1.2"
- globals "^11.0.1"
- ignore "^3.3.3"
- imurmurhash "^0.1.4"
- inquirer "^3.0.6"
- is-resolvable "^1.0.0"
- js-yaml "^3.9.1"
- json-stable-stringify-without-jsonify "^1.0.1"
- levn "^0.3.0"
- lodash "^4.17.4"
- minimatch "^3.0.2"
- mkdirp "^0.5.1"
- natural-compare "^1.4.0"
- optionator "^0.8.2"
- path-is-inside "^1.0.2"
- pluralize "^7.0.0"
- progress "^2.0.0"
- regexpp "^1.0.1"
- require-uncached "^1.0.3"
- semver "^5.3.0"
- strip-ansi "^4.0.0"
- strip-json-comments "~2.0.1"
- table "4.0.2"
- text-table "~0.2.0"
-
-eslint@^5.12.0:
- version "5.15.1"
- resolved "https://registry.npmjs.org/eslint/-/eslint-5.15.1.tgz#8266b089fd5391e0009a047050795b1d73664524"
- integrity sha512-NTcm6vQ+PTgN3UBsALw5BMhgO6i5EpIjQF/Xb5tIh3sk9QhrFafujUOczGz4J24JBlzWclSB9Vmx8d+9Z6bFCg==
- dependencies:
- "@babel/code-frame" "^7.0.0"
- ajv "^6.9.1"
- chalk "^2.1.0"
- cross-spawn "^6.0.5"
- debug "^4.0.1"
- doctrine "^3.0.0"
- eslint-scope "^4.0.2"
- eslint-utils "^1.3.1"
- eslint-visitor-keys "^1.0.0"
- espree "^5.0.1"
- esquery "^1.0.1"
- esutils "^2.0.2"
- file-entry-cache "^5.0.1"
- functional-red-black-tree "^1.0.1"
- glob "^7.1.2"
- globals "^11.7.0"
- ignore "^4.0.6"
- import-fresh "^3.0.0"
- imurmurhash "^0.1.4"
- inquirer "^6.2.2"
- js-yaml "^3.12.0"
- json-stable-stringify-without-jsonify "^1.0.1"
- levn "^0.3.0"
- lodash "^4.17.11"
- minimatch "^3.0.4"
- mkdirp "^0.5.1"
- natural-compare "^1.4.0"
- optionator "^0.8.2"
- path-is-inside "^1.0.2"
- progress "^2.0.0"
- regexpp "^2.0.1"
- semver "^5.5.1"
- strip-ansi "^4.0.0"
- strip-json-comments "^2.0.1"
- table "^5.2.3"
- text-table "^0.2.0"
-
-espree@^3.5.2, espree@^3.5.4:
- version "3.5.4"
- resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
- integrity sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==
- dependencies:
- acorn "^5.5.0"
- acorn-jsx "^3.0.0"
-
-espree@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/espree/-/espree-4.1.0.tgz#728d5451e0fd156c04384a7ad89ed51ff54eb25f"
- integrity sha512-I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w==
- dependencies:
- acorn "^6.0.2"
- acorn-jsx "^5.0.0"
- eslint-visitor-keys "^1.0.0"
-
-espree@^5.0.1:
- version "5.0.1"
- resolved "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"
- integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==
- dependencies:
- acorn "^6.0.7"
- acorn-jsx "^5.0.0"
- eslint-visitor-keys "^1.0.0"
-
-esprima@^4.0.0:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
- integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-esquery@^1.0.0, esquery@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
- integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
- dependencies:
- estraverse "^4.0.0"
-
-esrecurse@^4.1.0:
- version "4.2.1"
- resolved "http://registry.npm.taobao.org/esrecurse/download/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
- integrity sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=
- dependencies:
- estraverse "^4.1.0"
-
-estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
- integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
-
-esutils@^2.0.2:
- version "2.0.2"
- resolved "http://registry.npm.taobao.org/esutils/download/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
- integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
-
-etag@~1.8.1:
- version "1.8.1"
- resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
- integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
-
-event-pubsub@4.3.0:
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/event-pubsub/-/event-pubsub-4.3.0.tgz#f68d816bc29f1ec02c539dc58c8dd40ce72cb36e"
- integrity sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ==
-
-eventemitter3@^3.0.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
- integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
-
-events@^1.0.0:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/events/download/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
- integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=
-
-eventsource@^1.0.7:
- version "1.0.7"
- resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
- integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==
- dependencies:
- original "^1.0.0"
-
-evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
- version "1.0.3"
- resolved "http://registry.npm.taobao.org/evp_bytestokey/download/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
- integrity sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=
- dependencies:
- md5.js "^1.3.4"
- safe-buffer "^5.1.1"
-
-execa@^0.10.0:
- version "0.10.0"
- resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
- integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
- dependencies:
- cross-spawn "^6.0.0"
- get-stream "^3.0.0"
- is-stream "^1.1.0"
- npm-run-path "^2.0.0"
- p-finally "^1.0.0"
- signal-exit "^3.0.0"
- strip-eof "^1.0.0"
-
-execa@^0.8.0:
- version "0.8.0"
- resolved "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz#d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"
- integrity sha1-2NdrvBtVIX7RkP1t1J08d07PyNo=
- dependencies:
- cross-spawn "^5.0.1"
- get-stream "^3.0.0"
- is-stream "^1.1.0"
- npm-run-path "^2.0.0"
- p-finally "^1.0.0"
- signal-exit "^3.0.0"
- strip-eof "^1.0.0"
-
-execa@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
- integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
- dependencies:
- cross-spawn "^6.0.0"
- get-stream "^4.0.0"
- is-stream "^1.1.0"
- npm-run-path "^2.0.0"
- p-finally "^1.0.0"
- signal-exit "^3.0.0"
- strip-eof "^1.0.0"
-
-expand-brackets@^2.1.4:
- version "2.1.4"
- resolved "http://registry.npm.taobao.org/expand-brackets/download/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
- integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
- dependencies:
- debug "^2.3.3"
- define-property "^0.2.5"
- extend-shallow "^2.0.1"
- posix-character-classes "^0.1.0"
- regex-not "^1.0.0"
- snapdragon "^0.8.1"
- to-regex "^3.0.1"
-
-express@^4.16.2, express@^4.16.3:
- version "4.16.4"
- resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
- integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
- dependencies:
- accepts "~1.3.5"
- array-flatten "1.1.1"
- body-parser "1.18.3"
- content-disposition "0.5.2"
- content-type "~1.0.4"
- cookie "0.3.1"
- cookie-signature "1.0.6"
- debug "2.6.9"
- depd "~1.1.2"
- encodeurl "~1.0.2"
- escape-html "~1.0.3"
- etag "~1.8.1"
- finalhandler "1.1.1"
- fresh "0.5.2"
- merge-descriptors "1.0.1"
- methods "~1.1.2"
- on-finished "~2.3.0"
- parseurl "~1.3.2"
- path-to-regexp "0.1.7"
- proxy-addr "~2.0.4"
- qs "6.5.2"
- range-parser "~1.2.0"
- safe-buffer "5.1.2"
- send "0.16.2"
- serve-static "1.13.2"
- setprototypeof "1.1.0"
- statuses "~1.4.0"
- type-is "~1.6.16"
- utils-merge "1.0.1"
- vary "~1.1.2"
-
-extend-shallow@^2.0.1:
- version "2.0.1"
- resolved "http://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
- integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
- dependencies:
- is-extendable "^0.1.0"
-
-extend-shallow@^3.0.0, extend-shallow@^3.0.2:
- version "3.0.2"
- resolved "http://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
- integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
- dependencies:
- assign-symbols "^1.0.0"
- is-extendable "^1.0.1"
-
-extend@~3.0.2:
- version "3.0.2"
- resolved "http://registry.npm.taobao.org/extend/download/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
- integrity sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=
-
-external-editor@^2.0.4:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
- integrity sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==
- dependencies:
- chardet "^0.4.0"
- iconv-lite "^0.4.17"
- tmp "^0.0.33"
-
-external-editor@^3.0.3:
- version "3.0.3"
- resolved "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
- integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
- dependencies:
- chardet "^0.7.0"
- iconv-lite "^0.4.24"
- tmp "^0.0.33"
-
-extglob@^2.0.4:
- version "2.0.4"
- resolved "http://registry.npm.taobao.org/extglob/download/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
- integrity sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM=
- dependencies:
- array-unique "^0.3.2"
- define-property "^1.0.0"
- expand-brackets "^2.1.4"
- extend-shallow "^2.0.1"
- fragment-cache "^0.2.1"
- regex-not "^1.0.0"
- snapdragon "^0.8.1"
- to-regex "^3.0.1"
-
-extsprintf@1.3.0:
- version "1.3.0"
- resolved "http://registry.npm.taobao.org/extsprintf/download/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
- integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-
-extsprintf@^1.2.0:
- version "1.4.0"
- resolved "http://registry.npm.taobao.org/extsprintf/download/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
- integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
-
-fast-deep-equal@^1.0.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
- integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
-
-fast-deep-equal@^2.0.1:
- version "2.0.1"
- resolved "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
- integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
-
-fast-glob@^2.2.6:
- version "2.2.6"
- resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.6.tgz#a5d5b697ec8deda468d85a74035290a025a95295"
- integrity sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==
- dependencies:
- "@mrmlnc/readdir-enhanced" "^2.2.1"
- "@nodelib/fs.stat" "^1.1.2"
- glob-parent "^3.1.0"
- is-glob "^4.0.0"
- merge2 "^1.2.3"
- micromatch "^3.1.10"
-
-fast-json-stable-stringify@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/fast-json-stable-stringify/download/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
- integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
-
-fast-levenshtein@~2.0.4:
- version "2.0.6"
- resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
- integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
-
-fastparse@^1.1.1:
- version "1.1.2"
- resolved "http://registry.npm.taobao.org/fastparse/download/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
- integrity sha1-kXKMWllC7O2FMSg8eUQe5BIsNak=
-
-faye-websocket@^0.10.0:
- version "0.10.0"
- resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
- integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
- dependencies:
- websocket-driver ">=0.5.1"
-
-faye-websocket@~0.11.1:
- version "0.11.1"
- resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
- integrity sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=
- dependencies:
- websocket-driver ">=0.5.1"
-
-fecha@~2.3.3:
- version "2.3.3"
- resolved "http://registry.npm.taobao.org/fecha/download/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"
- integrity sha1-lI50FX3xoy/RsSw6PDzctuydls0=
-
-figgy-pudding@^3.1.0, figgy-pudding@^3.5.1:
- version "3.5.1"
- resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
- integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
-
-figures@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
- integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
- dependencies:
- escape-string-regexp "^1.0.5"
-
-file-entry-cache@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
- integrity sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=
- dependencies:
- flat-cache "^1.2.1"
- object-assign "^4.0.1"
-
-file-entry-cache@^5.0.1:
- version "5.0.1"
- resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
- integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
- dependencies:
- flat-cache "^2.0.1"
-
-file-loader@^3.0.1:
- version "3.0.1"
- resolved "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa"
- integrity sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==
- dependencies:
- loader-utils "^1.0.2"
- schema-utils "^1.0.0"
-
-filesize@^3.6.1:
- version "3.6.1"
- resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
- integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==
-
-fill-range@^4.0.0:
- version "4.0.0"
- resolved "http://registry.npm.taobao.org/fill-range/download/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
- integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
- dependencies:
- extend-shallow "^2.0.1"
- is-number "^3.0.0"
- repeat-string "^1.6.1"
- to-regex-range "^2.1.0"
-
-finalhandler@1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
- integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
- dependencies:
- debug "2.6.9"
- encodeurl "~1.0.2"
- escape-html "~1.0.3"
- on-finished "~2.3.0"
- parseurl "~1.3.2"
- statuses "~1.4.0"
- unpipe "~1.0.0"
-
-find-cache-dir@^0.1.1:
- version "0.1.1"
- resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9"
- integrity sha1-yN765XyKUqinhPnjHFfHQumToLk=
- dependencies:
- commondir "^1.0.1"
- mkdirp "^0.5.1"
- pkg-dir "^1.0.0"
-
-find-cache-dir@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/find-cache-dir/download/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
- integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
- dependencies:
- commondir "^1.0.1"
- make-dir "^1.0.0"
- pkg-dir "^2.0.0"
-
-find-cache-dir@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
- integrity sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==
- dependencies:
- commondir "^1.0.1"
- make-dir "^1.0.0"
- pkg-dir "^3.0.0"
-
-find-up@^1.0.0:
- version "1.1.2"
- resolved "http://registry.npm.taobao.org/find-up/download/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
- integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
- dependencies:
- path-exists "^2.0.0"
- pinkie-promise "^2.0.0"
-
-find-up@^2.0.0, find-up@^2.1.0:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/find-up/download/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
- integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
- dependencies:
- locate-path "^2.0.0"
-
-find-up@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
- integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
- dependencies:
- locate-path "^3.0.0"
-
-flat-cache@^1.2.1:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
- integrity sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=
- dependencies:
- circular-json "^0.3.1"
- del "^2.0.2"
- graceful-fs "^4.1.2"
- write "^0.2.1"
-
-flat-cache@^2.0.1:
- version "2.0.1"
- resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
- integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
- dependencies:
- flatted "^2.0.0"
- rimraf "2.6.3"
- write "1.0.3"
-
-flatted@^2.0.0:
- version "2.0.0"
- resolved "https://registry.npmjs.org/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916"
- integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==
-
-flush-write-stream@^1.0.0:
- version "1.0.3"
- resolved "http://registry.npm.taobao.org/flush-write-stream/download/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
- integrity sha1-xdWG7zivYJdlC0m8QbVfq7GfNb0=
- dependencies:
- inherits "^2.0.1"
- readable-stream "^2.0.4"
-
-fmin@0.0.2:
- version "0.0.2"
- resolved "http://registry.npm.taobao.org/fmin/download/fmin-0.0.2.tgz#59bbb40d43ffdc1c94cd00a568c41f95f1973017"
- integrity sha1-Wbu0DUP/3ByUzQClaMQflfGXMBc=
- dependencies:
- contour_plot "^0.0.1"
- json2module "^0.0.3"
- rollup "^0.25.8"
- tape "^4.5.1"
- uglify-js "^2.6.2"
-
-follow-redirects@^1.0.0, follow-redirects@^1.3.0:
- version "1.5.9"
- resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.9.tgz#c9ed9d748b814a39535716e531b9196a845d89c6"
- integrity sha512-Bh65EZI/RU8nx0wbYF9shkFZlqLP+6WT/5FnA3cE/djNSuKNHJEinGGZgu/cQEkeeb2GdFOgenAmn8qaqYke2w==
- dependencies:
- debug "=3.1.0"
-
-for-each@~0.3.3:
- version "0.3.3"
- resolved "http://registry.npm.taobao.org/for-each/download/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
- integrity sha1-abRH6IoKXTLD5whPPxcQA0shN24=
- dependencies:
- is-callable "^1.1.3"
-
-for-in@^0.1.3:
- version "0.1.8"
- resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
- integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=
-
-for-in@^1.0.1, for-in@^1.0.2:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/for-in/download/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
- integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
-
-for-own@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
- integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
- dependencies:
- for-in "^1.0.1"
-
-forever-agent@~0.6.1:
- version "0.6.1"
- resolved "http://registry.npm.taobao.org/forever-agent/download/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
- integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-
-form-data@~2.3.2:
- version "2.3.3"
- resolved "http://registry.npm.taobao.org/form-data/download/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
- integrity sha1-3M5SwF9kTymManq5Nr1yTO/786Y=
- dependencies:
- asynckit "^0.4.0"
- combined-stream "^1.0.6"
- mime-types "^2.1.12"
-
-forwarded@~0.1.2:
- version "0.1.2"
- resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
- integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
-
-fragment-cache@^0.2.1:
- version "0.2.1"
- resolved "http://registry.npm.taobao.org/fragment-cache/download/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
- integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
- dependencies:
- map-cache "^0.2.2"
-
-fresh@0.5.2:
- version "0.5.2"
- resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
- integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
-
-from2@^2.1.0:
- version "2.3.0"
- resolved "http://registry.npm.taobao.org/from2/download/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
- integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
- dependencies:
- inherits "^2.0.1"
- readable-stream "^2.0.0"
-
-fs-extra@^7.0.1:
- version "7.0.1"
- resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
- integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
- dependencies:
- graceful-fs "^4.1.2"
- jsonfile "^4.0.0"
- universalify "^0.1.0"
-
-fs-minipass@^1.2.5:
- version "1.2.5"
- resolved "http://registry.npm.taobao.org/fs-minipass/download/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
- integrity sha1-BsJ3IYRU7CiN93raVKA7hwKqy50=
- dependencies:
- minipass "^2.2.1"
-
-fs-write-stream-atomic@^1.0.8:
- version "1.0.10"
- resolved "http://registry.npm.taobao.org/fs-write-stream-atomic/download/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
- integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
- dependencies:
- graceful-fs "^4.1.2"
- iferr "^0.1.5"
- imurmurhash "^0.1.4"
- readable-stream "1 || 2"
-
-fs.realpath@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/fs.realpath/download/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
- integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-fsevents@^1.2.2:
- version "1.2.4"
- resolved "http://registry.npm.taobao.org/fsevents/download/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
- integrity sha1-9B3LGvJYKvNpLaNvxVy9jhBBxCY=
- dependencies:
- nan "^2.9.2"
- node-pre-gyp "^0.10.0"
-
-fstream@^1.0.0, fstream@^1.0.2:
- version "1.0.11"
- resolved "http://registry.npm.taobao.org/fstream/download/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
- integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
- dependencies:
- graceful-fs "^4.1.2"
- inherits "~2.0.0"
- mkdirp ">=0.5 0"
- rimraf "2"
-
-function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1, function-bind@~1.1.1:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/function-bind/download/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
- integrity sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=
-
-functional-red-black-tree@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
- integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
-
-gauge@~2.7.3:
- version "2.7.4"
- resolved "http://registry.npm.taobao.org/gauge/download/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
- integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
- dependencies:
- aproba "^1.0.3"
- console-control-strings "^1.0.0"
- has-unicode "^2.0.0"
- object-assign "^4.1.0"
- signal-exit "^3.0.0"
- string-width "^1.0.1"
- strip-ansi "^3.0.1"
- wide-align "^1.1.0"
-
-gaze@^1.0.0:
- version "1.1.3"
- resolved "http://registry.npm.taobao.org/gaze/download/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
- integrity sha1-xEFzPhO5J6yMD/C0w7Az8ogSkko=
- dependencies:
- globule "^1.0.0"
-
-get-caller-file@^1.0.1:
- version "1.0.3"
- resolved "http://registry.npm.taobao.org/get-caller-file/download/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
- integrity sha1-+Xj6TJDR3+f/LWvtoqUV5xO9z0o=
-
-get-stdin@^4.0.1:
- version "4.0.1"
- resolved "http://registry.npm.taobao.org/get-stdin/download/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
- integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
-
-get-stream@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
- integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
-
-get-stream@^4.0.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
- integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
- dependencies:
- pump "^3.0.0"
-
-get-value@^2.0.3, get-value@^2.0.6:
- version "2.0.6"
- resolved "http://registry.npm.taobao.org/get-value/download/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
- integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
-
-getpass@^0.1.1:
- version "0.1.7"
- resolved "http://registry.npm.taobao.org/getpass/download/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
- integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
- dependencies:
- assert-plus "^1.0.0"
-
-glob-parent@^3.1.0:
- version "3.1.0"
- resolved "http://registry.npm.taobao.org/glob-parent/download/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
- integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
- dependencies:
- is-glob "^3.1.0"
- path-dirname "^1.0.0"
-
-glob-to-regexp@^0.3.0:
- version "0.3.0"
- resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
- integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
-
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1, glob@~7.1.2:
- version "7.1.3"
- resolved "http://registry.npm.taobao.org/glob/download/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
- integrity sha1-OWCDLT8VdBCDQtr9OmezMsCWnfE=
- dependencies:
- fs.realpath "^1.0.0"
- inflight "^1.0.4"
- inherits "2"
- minimatch "^3.0.4"
- once "^1.3.0"
- path-is-absolute "^1.0.0"
-
-globals@^11.0.1:
- version "11.8.0"
- resolved "https://registry.yarnpkg.com/globals/-/globals-11.8.0.tgz#c1ef45ee9bed6badf0663c5cb90e8d1adec1321d"
- integrity sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==
-
-globals@^11.1.0, globals@^11.7.0:
- version "11.9.0"
- resolved "http://registry.npm.taobao.org/globals/download/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249"
- integrity sha1-veI2gI6YfykHaKk9BlBg145qskk=
-
-globby@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
- integrity sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=
- dependencies:
- array-union "^1.0.1"
- arrify "^1.0.0"
- glob "^7.0.3"
- object-assign "^4.0.1"
- pify "^2.0.0"
- pinkie-promise "^2.0.0"
-
-globby@^6.1.0:
- version "6.1.0"
- resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
- integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
- dependencies:
- array-union "^1.0.1"
- glob "^7.0.3"
- object-assign "^4.0.1"
- pify "^2.0.0"
- pinkie-promise "^2.0.0"
-
-globby@^7.1.1:
- version "7.1.1"
- resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
- integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA=
- dependencies:
- array-union "^1.0.1"
- dir-glob "^2.0.0"
- glob "^7.1.2"
- ignore "^3.3.5"
- pify "^3.0.0"
- slash "^1.0.0"
-
-globby@^9.0.0:
- version "9.1.0"
- resolved "https://registry.npmjs.org/globby/-/globby-9.1.0.tgz#e90f4d5134109e6d855abdd31bdb1b085428592e"
- integrity sha512-VtYjhHr7ncls724Of5W6Kaahz0ag7dB4G62/2HsN+xEKG6SrPzM1AJMerGxQTwJGnN9reeyxdvXbuZYpfssCvg==
- dependencies:
- "@types/glob" "^7.1.1"
- array-union "^1.0.2"
- dir-glob "^2.2.1"
- fast-glob "^2.2.6"
- glob "^7.1.3"
- ignore "^4.0.3"
- pify "^4.0.1"
- slash "^2.0.0"
-
-globule@^1.0.0:
- version "1.2.1"
- resolved "http://registry.npm.taobao.org/globule/download/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
- integrity sha1-Xf+xsZHyLSB5epNptJ6rTpg5aW0=
- dependencies:
- glob "~7.1.1"
- lodash "~4.17.10"
- minimatch "~3.0.2"
-
-graceful-fs@^4.1.11, graceful-fs@^4.1.2:
- version "4.1.15"
- resolved "http://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
- integrity sha1-/7cD4QZuig7qpMi4C6klPu77+wA=
-
-graceful-fs@^4.1.6:
- version "4.1.11"
- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
- integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
-
-graphlib@^2.1.5:
- version "2.1.5"
- resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.5.tgz#6afe1afcc5148555ec799e499056795bd6938c87"
- integrity sha512-XvtbqCcw+EM5SqQrIetIKKD+uZVNQtDPD1goIg7K73RuRZtVI5rYMdcCVSHm/AS1sCBZ7vt0p5WgXouucHQaOA==
- dependencies:
- lodash "^4.11.1"
-
-gzip-size@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.0.0.tgz#a55ecd99222f4c48fd8c01c625ce3b349d0a0e80"
- integrity sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA==
- dependencies:
- duplexer "^0.1.1"
- pify "^3.0.0"
-
-handle-thing@^2.0.0:
- version "2.0.0"
- resolved "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
- integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
-
-har-schema@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/har-schema/download/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
- integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~5.1.0:
- version "5.1.3"
- resolved "http://registry.npm.taobao.org/har-validator/download/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
- integrity sha1-HvievT5JllV2de7ZiTEQ3DUPoIA=
- dependencies:
- ajv "^6.5.5"
- har-schema "^2.0.0"
-
-has-ansi@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/has-ansi/download/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
- integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
- dependencies:
- ansi-regex "^2.0.0"
-
-has-flag@^3.0.0:
- version "3.0.0"
- resolved "http://registry.npm.taobao.org/has-flag/download/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
- integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
-has-symbols@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
- integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
-
-has-unicode@^2.0.0:
- version "2.0.1"
- resolved "http://registry.npm.taobao.org/has-unicode/download/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
- integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
-has-value@^0.3.1:
- version "0.3.1"
- resolved "http://registry.npm.taobao.org/has-value/download/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
- integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
- dependencies:
- get-value "^2.0.3"
- has-values "^0.1.4"
- isobject "^2.0.0"
-
-has-value@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/has-value/download/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
- integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
- dependencies:
- get-value "^2.0.6"
- has-values "^1.0.0"
- isobject "^3.0.0"
-
-has-values@^0.1.4:
- version "0.1.4"
- resolved "http://registry.npm.taobao.org/has-values/download/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
- integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
-
-has-values@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/has-values/download/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
- integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
- dependencies:
- is-number "^3.0.0"
- kind-of "^4.0.0"
-
-has@^1.0.0, has@^1.0.1, has@~1.0.3:
- version "1.0.3"
- resolved "http://registry.npm.taobao.org/has/download/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
- integrity sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y=
- dependencies:
- function-bind "^1.1.1"
-
-hash-base@^3.0.0:
- version "3.0.4"
- resolved "http://registry.npm.taobao.org/hash-base/download/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
- integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
- dependencies:
- inherits "^2.0.1"
- safe-buffer "^5.0.1"
-
-hash-sum@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"
- integrity sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=
-
-hash.js@^1.0.0, hash.js@^1.0.3:
- version "1.1.7"
- resolved "http://registry.npm.taobao.org/hash.js/download/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
- integrity sha1-C6vKU46NTuSg+JiNaIZlN6ADz0I=
- dependencies:
- inherits "^2.0.3"
- minimalistic-assert "^1.0.1"
-
-he@1.1.x:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
- integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
-
-he@^1.1.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
- integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
-
-hex-color-regex@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
- integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
-
-hmac-drbg@^1.0.0:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/hmac-drbg/download/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
- integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
- dependencies:
- hash.js "^1.0.3"
- minimalistic-assert "^1.0.0"
- minimalistic-crypto-utils "^1.0.1"
-
-hoek@5.x.x:
- version "5.0.4"
- resolved "https://registry.yarnpkg.com/hoek/-/hoek-5.0.4.tgz#0f7fa270a1cafeb364a4b2ddfaa33f864e4157da"
- integrity sha512-Alr4ZQgoMlnere5FZJsIyfIjORBqZll5POhDsF4q64dPuJR6rNxXdDxtHSQq8OXRurhmx+PWYEE8bXRROY8h0w==
-
-hoek@6.x.x:
- version "6.1.2"
- resolved "https://registry.npmjs.org/hoek/-/hoek-6.1.2.tgz#99e6d070561839de74ee427b61aa476bd6bddfd6"
- integrity sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q==
-
-hoopy@^0.1.2:
- version "0.1.4"
- resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d"
- integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==
-
-hosted-git-info@^2.1.4:
- version "2.7.1"
- resolved "http://registry.npm.taobao.org/hosted-git-info/download/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
- integrity sha1-l/I2l3vW4SVAiTD/bePuxigewEc=
-
-hpack.js@^2.1.6:
- version "2.1.6"
- resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
- integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
- dependencies:
- inherits "^2.0.1"
- obuf "^1.0.0"
- readable-stream "^2.0.1"
- wbuf "^1.1.0"
-
-hsl-regex@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e"
- integrity sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=
-
-hsla-regex@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"
- integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg=
-
-html-comment-regex@^1.1.0:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7"
- integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==
-
-html-entities@^1.2.0:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
- integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
-
-html-minifier@^3.2.3:
- version "3.5.20"
- resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.20.tgz#7b19fd3caa0cb79f7cde5ee5c3abdf8ecaa6bb14"
- integrity sha512-ZmgNLaTp54+HFKkONyLFEfs5dd/ZOtlquKaTnqIWFmx3Av5zG6ZPcV2d0o9XM2fXOTxxIf6eDcwzFFotke/5zA==
- dependencies:
- camel-case "3.0.x"
- clean-css "4.2.x"
- commander "2.17.x"
- he "1.1.x"
- param-case "2.1.x"
- relateurl "0.2.x"
- uglify-js "3.4.x"
-
-html-tags@^2.0.0:
- version "2.0.0"
- resolved "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b"
- integrity sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos=
-
-html-webpack-plugin@^3.2.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
- integrity sha1-sBq71yOsqqeze2r0SS69oD2d03s=
- dependencies:
- html-minifier "^3.2.3"
- loader-utils "^0.2.16"
- lodash "^4.17.3"
- pretty-error "^2.0.2"
- tapable "^1.0.0"
- toposort "^1.0.0"
- util.promisify "1.0.0"
-
-htmlparser2@~3.3.0:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe"
- integrity sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=
- dependencies:
- domelementtype "1"
- domhandler "2.1"
- domutils "1.1"
- readable-stream "1.0"
-
-http-deceiver@^1.2.7:
- version "1.2.7"
- resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
- integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
-
-http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
- version "1.6.3"
- resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
- integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
- dependencies:
- depd "~1.1.2"
- inherits "2.0.3"
- setprototypeof "1.1.0"
- statuses ">= 1.4.0 < 2"
-
-http-parser-js@>=0.4.0:
- version "0.4.13"
- resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.13.tgz#3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"
- integrity sha1-O9bW/ebjFyyTNMOzO2wZPYD+ETc=
-
-http-proxy-middleware@^0.19.1:
- version "0.19.1"
- resolved "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
- integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
- dependencies:
- http-proxy "^1.17.0"
- is-glob "^4.0.0"
- lodash "^4.17.11"
- micromatch "^3.1.10"
-
-http-proxy@^1.17.0:
- version "1.17.0"
- resolved "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
- integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
- dependencies:
- eventemitter3 "^3.0.0"
- follow-redirects "^1.0.0"
- requires-port "^1.0.0"
-
-http-signature@~1.2.0:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/http-signature/download/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
- integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
- dependencies:
- assert-plus "^1.0.0"
- jsprim "^1.2.2"
- sshpk "^1.7.0"
-
-https-browserify@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/https-browserify/download/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
- integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
-
-iconv-lite@0.4, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
- version "0.4.24"
- resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
- integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
- dependencies:
- safer-buffer ">= 2.1.2 < 3"
-
-iconv-lite@0.4.23:
- version "0.4.23"
- resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
- integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
- dependencies:
- safer-buffer ">= 2.1.2 < 3"
-
-icss-replace-symbols@^1.1.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/icss-replace-symbols/download/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
- integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=
-
-icss-utils@^2.1.0:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/icss-utils/download/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
- integrity sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=
- dependencies:
- postcss "^6.0.1"
-
-ieee754@^1.1.4:
- version "1.1.12"
- resolved "http://registry.npm.taobao.org/ieee754/download/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
- integrity sha1-UL8k5bnIu5ivSWTJQc2wkY2ntgs=
-
-iferr@^0.1.5:
- version "0.1.5"
- resolved "http://registry.npm.taobao.org/iferr/download/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
- integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
-
-ignore-walk@^3.0.1:
- version "3.0.1"
- resolved "http://registry.npm.taobao.org/ignore-walk/download/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
- integrity sha1-qD5i59JyrA47VRqqgoMaGbafgvg=
- dependencies:
- minimatch "^3.0.4"
-
-ignore@^3.3.3, ignore@^3.3.5:
- version "3.3.10"
- resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
- integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
-
-ignore@^4.0.3, ignore@^4.0.6:
- version "4.0.6"
- resolved "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
- integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-
-ignore@^5.0.2:
- version "5.0.4"
- resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.0.4.tgz#33168af4a21e99b00c5d41cbadb6a6cb49903a45"
- integrity sha512-WLsTMEhsQuXpCiG173+f3aymI43SXa+fB1rSfbzyP4GkPP+ZFVuO0/3sFUGNBtifisPeDcl/uD/Y2NxZ7xFq4g==
-
-image-size@~0.5.0:
- version "0.5.5"
- resolved "http://registry.npm.taobao.org/image-size/download/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
- integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
-
-import-cwd@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
- integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=
- dependencies:
- import-from "^2.1.0"
-
-import-fresh@^3.0.0:
- version "3.0.0"
- resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.0.0.tgz#a3d897f420cab0e671236897f75bc14b4885c390"
- integrity sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==
- dependencies:
- parent-module "^1.0.0"
- resolve-from "^4.0.0"
-
-import-from@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
- integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
- dependencies:
- resolve-from "^3.0.0"
-
-import-local@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
- integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
- dependencies:
- pkg-dir "^3.0.0"
- resolve-cwd "^2.0.0"
-
-imurmurhash@^0.1.4:
- version "0.1.4"
- resolved "http://registry.npm.taobao.org/imurmurhash/download/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
- integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
-
-in-publish@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/in-publish/download/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
- integrity sha1-4g/146KvwmkDILbcVSaCqcf631E=
-
-indent-string@^2.1.0:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/indent-string/download/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
- integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
- dependencies:
- repeating "^2.0.0"
-
-indexes-of@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
- integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
-
-indexof@0.0.1:
- version "0.0.1"
- resolved "http://registry.npm.taobao.org/indexof/download/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
- integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
-
-inflight@^1.0.4:
- version "1.0.6"
- resolved "http://registry.npm.taobao.org/inflight/download/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
- integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
- dependencies:
- once "^1.3.0"
- wrappy "1"
-
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
- version "2.0.3"
- resolved "http://registry.npm.taobao.org/inherits/download/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
- integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-inherits@2.0.1:
- version "2.0.1"
- resolved "http://registry.npm.taobao.org/inherits/download/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
- integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
-
-ini@~1.3.0:
- version "1.3.5"
- resolved "http://registry.npm.taobao.org/ini/download/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
- integrity sha1-7uJfVtscnsYIXgwid4CD9Zar+Sc=
-
-inquirer@^3.0.6:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
- integrity sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==
- dependencies:
- ansi-escapes "^3.0.0"
- chalk "^2.0.0"
- cli-cursor "^2.1.0"
- cli-width "^2.0.0"
- external-editor "^2.0.4"
- figures "^2.0.0"
- lodash "^4.3.0"
- mute-stream "0.0.7"
- run-async "^2.2.0"
- rx-lite "^4.0.8"
- rx-lite-aggregates "^4.0.8"
- string-width "^2.1.0"
- strip-ansi "^4.0.0"
- through "^2.3.6"
-
-inquirer@^6.2.2:
- version "6.2.2"
- resolved "https://registry.npmjs.org/inquirer/-/inquirer-6.2.2.tgz#46941176f65c9eb20804627149b743a218f25406"
- integrity sha512-Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA==
- dependencies:
- ansi-escapes "^3.2.0"
- chalk "^2.4.2"
- cli-cursor "^2.1.0"
- cli-width "^2.0.0"
- external-editor "^3.0.3"
- figures "^2.0.0"
- lodash "^4.17.11"
- mute-stream "0.0.7"
- run-async "^2.2.0"
- rxjs "^6.4.0"
- string-width "^2.1.0"
- strip-ansi "^5.0.0"
- through "^2.3.6"
-
-internal-ip@^4.2.0:
- version "4.2.0"
- resolved "https://registry.npmjs.org/internal-ip/-/internal-ip-4.2.0.tgz#46e81b638d84c338e5c67e42b1a17db67d0814fa"
- integrity sha512-ZY8Rk+hlvFeuMmG5uH1MXhhdeMntmIaxaInvAmzMq/SHV8rv4Kh+6GiQNNDQd0wZFrcO+FiTBo8lui/osKOyJw==
- dependencies:
- default-gateway "^4.0.1"
- ipaddr.js "^1.9.0"
-
-intersperse@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/intersperse/-/intersperse-1.0.0.tgz#f2561fb1cfef9f5277cc3347a22886b4351a5181"
- integrity sha1-8lYfsc/vn1J3zDNHoiiGtDUaUYE=
-
-invariant@^2.2.0, invariant@^2.2.2:
- version "2.2.4"
- resolved "http://registry.npm.taobao.org/invariant/download/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
- integrity sha1-YQ88ksk1nOHbYW5TgAjSP/NRWOY=
- dependencies:
- loose-envify "^1.0.0"
-
-invert-kv@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/invert-kv/download/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
- integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
-
-invert-kv@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
- integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
-
-ip-regex@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
- integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
-
-ip@^1.1.0, ip@^1.1.5:
- version "1.1.5"
- resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
- integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
-
-ipaddr.js@1.8.0:
- version "1.8.0"
- resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
- integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
-
-ipaddr.js@^1.9.0:
- version "1.9.0"
- resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
- integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
-
-is-absolute-url@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
- integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=
-
-is-accessor-descriptor@^0.1.6:
- version "0.1.6"
- resolved "http://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
- integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
- dependencies:
- kind-of "^3.0.2"
-
-is-accessor-descriptor@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
- integrity sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=
- dependencies:
- kind-of "^6.0.0"
-
-is-arrayish@^0.2.1:
- version "0.2.1"
- resolved "http://registry.npm.taobao.org/is-arrayish/download/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
- integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
-
-is-arrayish@^0.3.1:
- version "0.3.2"
- resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
- integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
-
-is-binary-path@^1.0.0:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/is-binary-path/download/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
- integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
- dependencies:
- binary-extensions "^1.0.0"
-
-is-buffer@^1.1.5, is-buffer@~1.1.1:
- version "1.1.6"
- resolved "http://registry.npm.taobao.org/is-buffer/download/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
- integrity sha1-76ouqdqg16suoTqXsritUf776L4=
-
-is-builtin-module@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/is-builtin-module/download/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
- integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74=
- dependencies:
- builtin-modules "^1.0.0"
-
-is-callable@^1.1.3, is-callable@^1.1.4:
- version "1.1.4"
- resolved "http://registry.npm.taobao.org/is-callable/download/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
- integrity sha1-HhrfIZ4e62hNaR+dagX/DTCiTXU=
-
-is-ci@^1.0.10:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
- integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
- dependencies:
- ci-info "^1.5.0"
-
-is-color-stop@^1.0.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345"
- integrity sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=
- dependencies:
- css-color-names "^0.0.4"
- hex-color-regex "^1.1.0"
- hsl-regex "^1.0.0"
- hsla-regex "^1.0.0"
- rgb-regex "^1.0.1"
- rgba-regex "^1.0.0"
-
-is-data-descriptor@^0.1.4:
- version "0.1.4"
- resolved "http://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
- integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
- dependencies:
- kind-of "^3.0.2"
-
-is-data-descriptor@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
- integrity sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=
- dependencies:
- kind-of "^6.0.0"
-
-is-date-object@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/is-date-object/download/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
- integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
-
-is-descriptor@^0.1.0:
- version "0.1.6"
- resolved "http://registry.npm.taobao.org/is-descriptor/download/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
- integrity sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=
- dependencies:
- is-accessor-descriptor "^0.1.6"
- is-data-descriptor "^0.1.4"
- kind-of "^5.0.0"
-
-is-descriptor@^1.0.0, is-descriptor@^1.0.2:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/is-descriptor/download/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
- integrity sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=
- dependencies:
- is-accessor-descriptor "^1.0.0"
- is-data-descriptor "^1.0.0"
- kind-of "^6.0.2"
-
-is-directory@^0.3.1:
- version "0.3.1"
- resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
- integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
-
-is-extendable@^0.1.0, is-extendable@^0.1.1:
- version "0.1.1"
- resolved "http://registry.npm.taobao.org/is-extendable/download/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
- integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-
-is-extendable@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
- integrity sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=
- dependencies:
- is-plain-object "^2.0.4"
-
-is-extglob@^2.1.0, is-extglob@^2.1.1:
- version "2.1.1"
- resolved "http://registry.npm.taobao.org/is-extglob/download/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
- integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
-is-finite@^1.0.0:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/is-finite/download/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
- integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=
- dependencies:
- number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
- integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
- dependencies:
- number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
- integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-
-is-glob@^3.1.0:
- version "3.1.0"
- resolved "http://registry.npm.taobao.org/is-glob/download/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
- integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
- dependencies:
- is-extglob "^2.1.0"
-
-is-glob@^4.0.0:
- version "4.0.0"
- resolved "http://registry.npm.taobao.org/is-glob/download/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
- integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=
- dependencies:
- is-extglob "^2.1.1"
-
-is-negative-zero@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
- integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
-
-is-number@^3.0.0:
- version "3.0.0"
- resolved "http://registry.npm.taobao.org/is-number/download/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
- integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
- dependencies:
- kind-of "^3.0.2"
-
-is-obj@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
- integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
-
-is-path-cwd@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
- integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
-
-is-path-in-cwd@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
- integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
- dependencies:
- is-path-inside "^1.0.0"
-
-is-path-inside@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
- integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
- dependencies:
- path-is-inside "^1.0.1"
-
-is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
- version "2.0.4"
- resolved "http://registry.npm.taobao.org/is-plain-object/download/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
- integrity sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=
- dependencies:
- isobject "^3.0.1"
-
-is-promise@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
- integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
-
-is-regex@^1.0.4:
- version "1.0.4"
- resolved "http://registry.npm.taobao.org/is-regex/download/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
- integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
- dependencies:
- has "^1.0.1"
-
-is-resolvable@^1.0.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
- integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
-
-is-stream@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
- integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
-
-is-svg@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75"
- integrity sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==
- dependencies:
- html-comment-regex "^1.1.0"
-
-is-symbol@^1.0.2:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/is-symbol/download/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
- integrity sha1-oFX2rlcZLK7jKeeoYBGLSXqVDzg=
- dependencies:
- has-symbols "^1.0.0"
-
-is-typedarray@~1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/is-typedarray/download/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
- integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-
-is-utf8@^0.2.0:
- version "0.2.1"
- resolved "http://registry.npm.taobao.org/is-utf8/download/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
- integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
-is-windows@^1.0.2:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/is-windows/download/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
- integrity sha1-0YUOuXkezRjmGCzhKjDzlmNLsZ0=
-
-is-wsl@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
- integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
-
-isarray@0.0.1, isarray@~0.0.1:
- version "0.0.1"
- resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
- integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
- integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
-isemail@3.x.x:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/isemail/-/isemail-3.2.0.tgz#59310a021931a9fb06bbb51e155ce0b3f236832c"
- integrity sha512-zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg==
- dependencies:
- punycode "2.x.x"
-
-isexe@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/isexe/download/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
- integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-
-ismobilejs@^0.5.1:
- version "0.5.1"
- resolved "https://registry.npmjs.org/ismobilejs/-/ismobilejs-0.5.1.tgz#0e3f825e29e32f84ad5ddbb60e9e04a894046488"
- integrity sha512-QX4STsOcBYqlTjVGuAdP1MiRVxtiUbRHOKH0v7Gn1EvfUVIQnrSdgCM4zB4VCZuIejnb2NUMUx0Bwd3EIG6yyA==
-
-isobject@^2.0.0:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/isobject/download/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
- integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
- dependencies:
- isarray "1.0.0"
-
-isobject@^3.0.0, isobject@^3.0.1:
- version "3.0.1"
- resolved "http://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
- integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
-
-isstream@~0.1.2:
- version "0.1.2"
- resolved "http://registry.npm.taobao.org/isstream/download/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
- integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-
-javascript-stringify@^1.6.0:
- version "1.6.0"
- resolved "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-1.6.0.tgz#142d111f3a6e3dae8f4a9afd77d45855b5a9cce3"
- integrity sha1-FC0RHzpuPa6PSpr9d9RYVbWpzOM=
-
-joi@^14.3.0:
- version "14.3.1"
- resolved "https://registry.npmjs.org/joi/-/joi-14.3.1.tgz#164a262ec0b855466e0c35eea2a885ae8b6c703c"
- integrity sha512-LQDdM+pkOrpAn4Lp+neNIFV3axv1Vna3j38bisbQhETPMANYRbFJFUyOZcOClYvM/hppMhGWuKSFEK9vjrB+bQ==
- dependencies:
- hoek "6.x.x"
- isemail "3.x.x"
- topo "3.x.x"
-
-js-base64@^2.1.8:
- version "2.4.9"
- resolved "http://registry.npm.taobao.org/js-base64/download/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03"
- integrity sha1-dIkR+wT0imDEdxs3XKxFqA3xHAM=
-
-js-cookie@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.0.tgz#1b2c279a6eece380a12168b92485265b35b1effb"
- integrity sha1-Gywnmm7s44ChIWi5JIUmWzWx7/s=
-
-js-levenshtein@^1.1.3:
- version "1.1.4"
- resolved "http://registry.npm.taobao.org/js-levenshtein/download/js-levenshtein-1.1.4.tgz#3a56e3cbf589ca0081eb22cd9ba0b1290a16d26e"
- integrity sha1-Olbjy/WJygCB6yLNm6CxKQoW0m4=
-
-js-message@1.0.5:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/js-message/-/js-message-1.0.5.tgz#2300d24b1af08e89dd095bc1a4c9c9cfcb892d15"
- integrity sha1-IwDSSxrwjondCVvBpMnJz8uJLRU=
-
-js-queue@2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/js-queue/-/js-queue-2.0.0.tgz#362213cf860f468f0125fc6c96abc1742531f948"
- integrity sha1-NiITz4YPRo8BJfxslqvBdCUx+Ug=
- dependencies:
- easy-stack "^1.0.0"
-
-js-tokens@^3.0.0, js-tokens@^3.0.2:
- version "3.0.2"
- resolved "http://registry.npm.taobao.org/js-tokens/download/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
- integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
-
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
- version "4.0.0"
- resolved "http://registry.npm.taobao.org/js-tokens/download/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
- integrity sha1-GSA/tZmR35jjoocFDUZHzerzJJk=
-
-js-yaml@^3.12.0, js-yaml@^3.9.0, js-yaml@^3.9.1:
- version "3.12.0"
- resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
- integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
- dependencies:
- argparse "^1.0.7"
- esprima "^4.0.0"
-
-jsbn@~0.1.0:
- version "0.1.1"
- resolved "http://registry.npm.taobao.org/jsbn/download/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
- integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-
-jsesc@^2.5.1:
- version "2.5.2"
- resolved "http://registry.npm.taobao.org/jsesc/download/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
- integrity sha1-gFZNLkg9rPbo7yCWUKZ98/DCg6Q=
-
-jsesc@~0.5.0:
- version "0.5.0"
- resolved "http://registry.npm.taobao.org/jsesc/download/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
- integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
-
-json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
- integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
-
-json-schema-traverse@^0.3.0:
- version "0.3.1"
- resolved "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
- integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
-
-json-schema-traverse@^0.4.1:
- version "0.4.1"
- resolved "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
- integrity sha1-afaofZUTq4u4/mO9sJecRI5oRmA=
-
-json-schema@0.2.3:
- version "0.2.3"
- resolved "http://registry.npm.taobao.org/json-schema/download/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
- integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
-
-json-stable-stringify-without-jsonify@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
- integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
-
-json-stringify-safe@~5.0.1:
- version "5.0.1"
- resolved "http://registry.npm.taobao.org/json-stringify-safe/download/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
- integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
-json2module@^0.0.3:
- version "0.0.3"
- resolved "http://registry.npm.taobao.org/json2module/download/json2module-0.0.3.tgz#00fb5f4a9b7adfc3f0647c29cb17bcd1979be9b2"
- integrity sha1-APtfSpt638PwZHwpyxe80Zeb6bI=
- dependencies:
- rw "^1.3.2"
-
-json2mq@^0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/json2mq/-/json2mq-0.2.0.tgz#b637bd3ba9eabe122c83e9720483aeb10d2c904a"
- integrity sha1-tje9O6nqvhIsg+lyBIOusQ0skEo=
- dependencies:
- string-convert "^0.2.0"
-
-json3@^3.3.2:
- version "3.3.2"
- resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
- integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
-
-json5@^0.5.0:
- version "0.5.1"
- resolved "http://registry.npm.taobao.org/json5/download/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
- integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
-
-json5@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
- integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==
- dependencies:
- minimist "^1.2.0"
-
-jsonfile@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
- integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
- optionalDependencies:
- graceful-fs "^4.1.6"
-
-jsonify@~0.0.0:
- version "0.0.0"
- resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
- integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
-
-jsprim@^1.2.2:
- version "1.4.1"
- resolved "http://registry.npm.taobao.org/jsprim/download/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
- integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
- dependencies:
- assert-plus "1.0.0"
- extsprintf "1.3.0"
- json-schema "0.2.3"
- verror "1.10.0"
-
-killable@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
- integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
-
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
- version "3.2.2"
- resolved "http://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
- integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
- dependencies:
- is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
- version "4.0.0"
- resolved "http://registry.npm.taobao.org/kind-of/download/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
- integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
- dependencies:
- is-buffer "^1.1.5"
-
-kind-of@^5.0.0:
- version "5.1.0"
- resolved "http://registry.npm.taobao.org/kind-of/download/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
- integrity sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=
-
-kind-of@^6.0.0, kind-of@^6.0.2:
- version "6.0.2"
- resolved "http://registry.npm.taobao.org/kind-of/download/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
- integrity sha1-ARRrNqYhjmTljzqNZt5df8b20FE=
-
-launch-editor-middleware@^2.2.1:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/launch-editor-middleware/-/launch-editor-middleware-2.2.1.tgz#e14b07e6c7154b0a4b86a0fd345784e45804c157"
- integrity sha512-s0UO2/gEGiCgei3/2UN3SMuUj1phjQN8lcpnvgLSz26fAzNWPQ6Nf/kF5IFClnfU2ehp6LrmKdMU/beveO+2jg==
- dependencies:
- launch-editor "^2.2.1"
-
-launch-editor@^2.2.1:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.2.1.tgz#871b5a3ee39d6680fcc26d37930b6eeda89db0ca"
- integrity sha512-On+V7K2uZK6wK7x691ycSUbLD/FyKKelArkbaAMSSJU8JmqmhwN2+mnJDNINuJWSrh2L0kDk+ZQtbC/gOWUwLw==
- dependencies:
- chalk "^2.3.0"
- shell-quote "^1.6.1"
-
-lazy-cache@^1.0.3:
- version "1.0.4"
- resolved "http://registry.npm.taobao.org/lazy-cache/download/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
- integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
-
-lcid@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/lcid/download/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
- integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
- dependencies:
- invert-kv "^1.0.0"
-
-lcid@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
- integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
- dependencies:
- invert-kv "^2.0.0"
-
-less-loader@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.1.0.tgz#2c1352c5b09a4f84101490274fd51674de41363e"
- integrity sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==
- dependencies:
- clone "^2.1.1"
- loader-utils "^1.1.0"
- pify "^3.0.0"
-
-less@^3.8.1:
- version "3.9.0"
- resolved "http://registry.npm.taobao.org/less/download/less-3.9.0.tgz#b7511c43f37cf57dc87dffd9883ec121289b1474"
- integrity sha1-t1EcQ/N89X3Iff/ZiD7BISibFHQ=
- dependencies:
- clone "^2.1.2"
- optionalDependencies:
- errno "^0.1.1"
- graceful-fs "^4.1.2"
- image-size "~0.5.0"
- mime "^1.4.1"
- mkdirp "^0.5.0"
- promise "^7.1.1"
- request "^2.83.0"
- source-map "~0.6.0"
-
-levn@^0.3.0, levn@~0.3.0:
- version "0.3.0"
- resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
- integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
- dependencies:
- prelude-ls "~1.1.2"
- type-check "~0.3.2"
-
-load-json-file@^1.0.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/load-json-file/download/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
- integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
- dependencies:
- graceful-fs "^4.1.2"
- parse-json "^2.2.0"
- pify "^2.0.0"
- pinkie-promise "^2.0.0"
- strip-bom "^2.0.0"
-
-load-json-file@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
- integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
- dependencies:
- graceful-fs "^4.1.2"
- parse-json "^2.2.0"
- pify "^2.0.0"
- strip-bom "^3.0.0"
-
-loader-fs-cache@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.1.tgz#56e0bf08bd9708b26a765b68509840c8dec9fdbc"
- integrity sha1-VuC/CL2XCLJqdltoUJhAyN7J/bw=
- dependencies:
- find-cache-dir "^0.1.1"
- mkdirp "0.5.1"
-
-loader-runner@^2.3.0:
- version "2.3.1"
- resolved "http://registry.npm.taobao.org/loader-runner/download/loader-runner-2.3.1.tgz#026f12fe7c3115992896ac02ba022ba92971b979"
- integrity sha1-Am8S/nwxFZkolqwCugIrqSlxuXk=
-
-loader-runner@^2.3.1:
- version "2.4.0"
- resolved "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
- integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
-
-loader-utils@^0.2.16:
- version "0.2.17"
- resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
- integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=
- dependencies:
- big.js "^3.1.3"
- emojis-list "^2.0.0"
- json5 "^0.5.0"
- object-assign "^4.0.1"
-
-loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/loader-utils/download/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
- integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=
- dependencies:
- big.js "^3.1.3"
- emojis-list "^2.0.0"
- json5 "^0.5.0"
-
-locate-path@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/locate-path/download/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
- integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
- dependencies:
- p-locate "^2.0.0"
- path-exists "^3.0.0"
-
-locate-path@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
- integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
- dependencies:
- p-locate "^3.0.0"
- path-exists "^3.0.0"
-
-lodash.assign@^4.2.0:
- version "4.2.0"
- resolved "http://registry.npm.taobao.org/lodash.assign/download/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
- integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
-
-lodash.clonedeep@^4.3.2:
- version "4.5.0"
- resolved "http://registry.npm.taobao.org/lodash.clonedeep/download/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
- integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
-
-lodash.debounce@^4.0.8:
- version "4.0.8"
- resolved "http://registry.npm.taobao.org/lodash.debounce/download/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
- integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
-
-lodash.defaultsdeep@^4.6.0:
- version "4.6.0"
- resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.0.tgz#bec1024f85b1bd96cbea405b23c14ad6443a6f81"
- integrity sha1-vsECT4WxvZbL6kBbI8FK1kQ6b4E=
-
-lodash.get@^4.4.2:
- version "4.4.2"
- resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
- integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
-
-lodash.kebabcase@^4.1.1:
- version "4.1.1"
- resolved "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
- integrity sha1-hImxyw0p/4gZXM7KRI/21swpXDY=
-
-lodash.mapvalues@^4.6.0:
- version "4.6.0"
- resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
- integrity sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=
-
-lodash.memoize@^4.1.2:
- version "4.1.2"
- resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
- integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
-
-lodash.mergewith@^4.6.0:
- version "4.6.1"
- resolved "http://registry.npm.taobao.org/lodash.mergewith/download/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
- integrity sha1-Y5BX5ybDr72z59QnQcqo1uQzWSc=
-
-lodash.pick@^4.4.0:
- version "4.4.0"
- resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
- integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=
-
-lodash.tail@^4.1.1:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
- integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=
-
-lodash.transform@^4.6.0:
- version "4.6.0"
- resolved "https://registry.yarnpkg.com/lodash.transform/-/lodash.transform-4.6.0.tgz#12306422f63324aed8483d3f38332b5f670547a0"
- integrity sha1-EjBkIvYzJK7YSD0/ODMrX2cFR6A=
-
-lodash.uniq@^4.5.0:
- version "4.5.0"
- resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
- integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
-
-lodash@^4.0.0, lodash@^4.11.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0, lodash@~4.17.10:
- version "4.17.11"
- resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
- integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
-
-log-symbols@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
- integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
- dependencies:
- chalk "^2.0.1"
-
-loglevel@^1.4.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
- integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
-
-longest@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/longest/download/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
- integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
-
-loose-envify@^1.0.0:
- version "1.4.0"
- resolved "http://registry.npm.taobao.org/loose-envify/download/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
- integrity sha1-ce5R+nvkyuwaY4OffmgtgTLTDK8=
- dependencies:
- js-tokens "^3.0.0 || ^4.0.0"
-
-loud-rejection@^1.0.0:
- version "1.6.0"
- resolved "http://registry.npm.taobao.org/loud-rejection/download/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
- integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
- dependencies:
- currently-unhandled "^0.4.1"
- signal-exit "^3.0.0"
-
-lower-case@^1.1.1:
- version "1.1.4"
- resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
- integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
-
-lru-cache@^4.0.1, lru-cache@^4.1.1:
- version "4.1.5"
- resolved "http://registry.npm.taobao.org/lru-cache/download/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
- integrity sha1-i75Q6oW+1ZvJ4z3KuCNe6bz0Q80=
- dependencies:
- pseudomap "^1.0.2"
- yallist "^2.1.2"
-
-lru-cache@^4.1.2, lru-cache@^4.1.3:
- version "4.1.3"
- resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
- integrity sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==
- dependencies:
- pseudomap "^1.0.2"
- yallist "^2.1.2"
-
-lru-cache@^5.1.1:
- version "5.1.1"
- resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
- integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
- dependencies:
- yallist "^3.0.2"
-
-make-dir@^1.0.0:
- version "1.3.0"
- resolved "http://registry.npm.taobao.org/make-dir/download/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
- integrity sha1-ecEDO4BRW9bSTsmTPoYMp17ifww=
- dependencies:
- pify "^3.0.0"
-
-map-age-cleaner@^0.1.1:
- version "0.1.2"
- resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74"
- integrity sha512-UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ==
- dependencies:
- p-defer "^1.0.0"
-
-map-cache@^0.2.2:
- version "0.2.2"
- resolved "http://registry.npm.taobao.org/map-cache/download/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
- integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
-
-map-obj@^1.0.0, map-obj@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/map-obj/download/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
- integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
-
-map-visit@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/map-visit/download/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
- integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
- dependencies:
- object-visit "^1.0.0"
-
-md5.js@^1.3.4:
- version "1.3.5"
- resolved "http://registry.npm.taobao.org/md5.js/download/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
- integrity sha1-tdB7jjIW4+J81yjXL3DR5qNCAF8=
- dependencies:
- hash-base "^3.0.0"
- inherits "^2.0.1"
- safe-buffer "^5.1.2"
-
-md5@^2.2.1:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
- integrity sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=
- dependencies:
- charenc "~0.0.1"
- crypt "~0.0.1"
- is-buffer "~1.1.1"
-
-mdn-data@~1.1.0:
- version "1.1.4"
- resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz#50b5d4ffc4575276573c4eedb8780812a8419f01"
- integrity sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA==
-
-media-typer@0.3.0:
- version "0.3.0"
- resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
- integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
-
-mem@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
- integrity sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==
- dependencies:
- map-age-cleaner "^0.1.1"
- mimic-fn "^1.0.0"
- p-is-promise "^1.1.0"
-
-memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
- version "0.4.1"
- resolved "http://registry.npm.taobao.org/memory-fs/download/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
- integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
- dependencies:
- errno "^0.1.3"
- readable-stream "^2.0.1"
-
-meow@^3.7.0:
- version "3.7.0"
- resolved "http://registry.npm.taobao.org/meow/download/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
- integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
- dependencies:
- camelcase-keys "^2.0.0"
- decamelize "^1.1.2"
- loud-rejection "^1.0.0"
- map-obj "^1.0.1"
- minimist "^1.1.3"
- normalize-package-data "^2.3.4"
- object-assign "^4.0.1"
- read-pkg-up "^1.0.1"
- redent "^1.0.0"
- trim-newlines "^1.0.0"
-
-merge-descriptors@1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
- integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
-
-merge-source-map@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
- integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==
- dependencies:
- source-map "^0.6.1"
-
-merge2@^1.2.3:
- version "1.2.3"
- resolved "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
- integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
-
-methods@~1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
- integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
-
-micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
- version "3.1.10"
- resolved "http://registry.npm.taobao.org/micromatch/download/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
- integrity sha1-cIWbyVyYQJUvNZoGij/En57PrCM=
- dependencies:
- arr-diff "^4.0.0"
- array-unique "^0.3.2"
- braces "^2.3.1"
- define-property "^2.0.2"
- extend-shallow "^3.0.2"
- extglob "^2.0.4"
- fragment-cache "^0.2.1"
- kind-of "^6.0.2"
- nanomatch "^1.2.9"
- object.pick "^1.3.0"
- regex-not "^1.0.0"
- snapdragon "^0.8.1"
- to-regex "^3.0.2"
-
-miller-rabin@^4.0.0:
- version "4.0.1"
- resolved "http://registry.npm.taobao.org/miller-rabin/download/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
- integrity sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=
- dependencies:
- bn.js "^4.0.0"
- brorand "^1.0.1"
-
-"mime-db@>= 1.36.0 < 2", mime-db@~1.37.0:
- version "1.37.0"
- resolved "http://registry.npm.taobao.org/mime-db/download/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
- integrity sha1-C2oM5v2+lXbiXx8tL96IMNwK0Ng=
-
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
- version "2.1.21"
- resolved "http://registry.npm.taobao.org/mime-types/download/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
- integrity sha1-KJlaoey3cHQv5q5+WPkYHHRLP5Y=
- dependencies:
- mime-db "~1.37.0"
-
-mime@1.4.1:
- version "1.4.1"
- resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
- integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
-
-mime@^1.4.1:
- version "1.6.0"
- resolved "http://registry.npm.taobao.org/mime/download/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
- integrity sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE=
-
-mime@^2.0.3, mime@^2.3.1:
- version "2.3.1"
- resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
- integrity sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==
-
-mimic-fn@^1.0.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
- integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
-
-mini-css-extract-plugin@^0.5.0:
- version "0.5.0"
- resolved "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0"
- integrity sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==
- dependencies:
- loader-utils "^1.1.0"
- schema-utils "^1.0.0"
- webpack-sources "^1.1.0"
-
-minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/minimalistic-assert/download/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
- integrity sha1-LhlN4ERibUoQ5/f7wAznPoPk1cc=
-
-minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/minimalistic-crypto-utils/download/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
- integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
-
-minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
- version "3.0.4"
- resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
- integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
- dependencies:
- brace-expansion "^1.1.7"
-
-minimist@0.0.8:
- version "0.0.8"
- resolved "http://registry.npm.taobao.org/minimist/download/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
- integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@^1.1.3, minimist@^1.2.0, minimist@~1.2.0:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/minimist/download/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
- integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
-minipass@^2.2.1, minipass@^2.3.4:
- version "2.3.5"
- resolved "http://registry.npm.taobao.org/minipass/download/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
- integrity sha1-ys6+SSAiSX9law8PUeJoKp7S2Eg=
- dependencies:
- safe-buffer "^5.1.2"
- yallist "^3.0.0"
-
-minizlib@^1.1.1:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/minizlib/download/minizlib-1.1.1.tgz#6734acc045a46e61d596a43bb9d9cd326e19cc42"
- integrity sha1-ZzSswEWkbmHVlqQ7udnNMm4ZzEI=
- dependencies:
- minipass "^2.2.1"
-
-mississippi@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/mississippi/download/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
- integrity sha1-NEKlCPr8KFAEhv7qmUCWduTuWm8=
- dependencies:
- concat-stream "^1.5.0"
- duplexify "^3.4.2"
- end-of-stream "^1.1.0"
- flush-write-stream "^1.0.0"
- from2 "^2.1.0"
- parallel-transform "^1.1.0"
- pump "^2.0.1"
- pumpify "^1.3.3"
- stream-each "^1.1.0"
- through2 "^2.0.0"
-
-mississippi@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
- integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
- dependencies:
- concat-stream "^1.5.0"
- duplexify "^3.4.2"
- end-of-stream "^1.1.0"
- flush-write-stream "^1.0.0"
- from2 "^2.1.0"
- parallel-transform "^1.1.0"
- pump "^3.0.0"
- pumpify "^1.3.3"
- stream-each "^1.1.0"
- through2 "^2.0.0"
-
-mixin-deep@^1.2.0:
- version "1.3.1"
- resolved "http://registry.npm.taobao.org/mixin-deep/download/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
- integrity sha1-pJ5yaNzhoNlpjkUybFYm3zVD0P4=
- dependencies:
- for-in "^1.0.2"
- is-extendable "^1.0.1"
-
-mixin-object@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
- integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=
- dependencies:
- for-in "^0.1.3"
- is-extendable "^0.1.1"
-
-mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
- version "0.5.1"
- resolved "http://registry.npm.taobao.org/mkdirp/download/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
- integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
- dependencies:
- minimist "0.0.8"
-
-moment@^2.21.0:
- version "2.22.2"
- resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
- integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
-
-move-concurrently@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/move-concurrently/download/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
- integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
- dependencies:
- aproba "^1.1.1"
- copy-concurrently "^1.0.0"
- fs-write-stream-atomic "^1.0.8"
- mkdirp "^0.5.1"
- rimraf "^2.5.4"
- run-queue "^1.0.3"
-
-ms@2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
- integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-ms@^2.1.1:
- version "2.1.1"
- resolved "http://registry.npm.taobao.org/ms/download/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
- integrity sha1-MKWGTrPrsKZvLr5tcnrwagnYbgo=
-
-multicast-dns-service-types@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
- integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=
-
-multicast-dns@^6.0.1:
- version "6.2.3"
- resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
- integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==
- dependencies:
- dns-packet "^1.3.1"
- thunky "^1.0.2"
-
-mutationobserver-shim@^0.3.2:
- version "0.3.3"
- resolved "https://registry.npmjs.org/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz#65869630bc89d7bf8c9cd9cb82188cd955aacd2b"
- integrity sha512-gciOLNN8Vsf7YzcqRjKzlAJ6y7e+B86u7i3KXes0xfxx/nfLmozlW1Vn+Sc9x3tPIePFgc1AeIFhtRgkqTjzDQ==
-
-mute-stream@0.0.7:
- version "0.0.7"
- resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
- integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
-
-nan@^2.10.0, nan@^2.9.2:
- version "2.11.1"
- resolved "http://registry.npm.taobao.org/nan/download/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766"
- integrity sha1-kOIrzLjKV+pM03zIPTgZtS7qZ2Y=
-
-nanomatch@^1.2.9:
- version "1.2.13"
- resolved "http://registry.npm.taobao.org/nanomatch/download/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
- integrity sha1-uHqKpPwN6P5r6IiVs4mD/yZb0Rk=
- dependencies:
- arr-diff "^4.0.0"
- array-unique "^0.3.2"
- define-property "^2.0.2"
- extend-shallow "^3.0.2"
- fragment-cache "^0.2.1"
- is-windows "^1.0.2"
- kind-of "^6.0.2"
- object.pick "^1.3.0"
- regex-not "^1.0.0"
- snapdragon "^0.8.1"
- to-regex "^3.0.1"
-
-natural-compare@^1.4.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
- integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
-
-needle@^2.2.1:
- version "2.2.4"
- resolved "http://registry.npm.taobao.org/needle/download/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
- integrity sha1-UZMb/4JTOxkot9HWngHxsA/9Kk4=
- dependencies:
- debug "^2.1.2"
- iconv-lite "^0.4.4"
- sax "^1.2.4"
-
-negotiator@0.6.1:
- version "0.6.1"
- resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
- integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
-
-neo-async@^2.5.0, neo-async@^2.6.0:
- version "2.6.0"
- resolved "http://registry.npm.taobao.org/neo-async/download/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
- integrity sha1-udFeTXHGdikIZUtRg+04t1M0CDU=
-
-nice-try@^1.0.4:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
- integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-
-no-case@^2.2.0:
- version "2.3.2"
- resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
- integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
- dependencies:
- lower-case "^1.1.1"
-
-node-forge@0.7.5:
- version "0.7.5"
- resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
- integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==
-
-node-gyp@^3.8.0:
- version "3.8.0"
- resolved "http://registry.npm.taobao.org/node-gyp/download/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
- integrity sha1-VAMEJhwzDoDQ1e3OJTpoyzlkIYw=
- dependencies:
- fstream "^1.0.0"
- glob "^7.0.3"
- graceful-fs "^4.1.2"
- mkdirp "^0.5.0"
- nopt "2 || 3"
- npmlog "0 || 1 || 2 || 3 || 4"
- osenv "0"
- request "^2.87.0"
- rimraf "2"
- semver "~5.3.0"
- tar "^2.0.0"
- which "1"
-
-node-ipc@^9.1.1:
- version "9.1.1"
- resolved "https://registry.yarnpkg.com/node-ipc/-/node-ipc-9.1.1.tgz#4e245ed6938e65100e595ebc5dc34b16e8dd5d69"
- integrity sha512-FAyICv0sIRJxVp3GW5fzgaf9jwwRQxAKDJlmNFUL5hOy+W4X/I5AypyHoq0DXXbo9o/gt79gj++4cMr4jVWE/w==
- dependencies:
- event-pubsub "4.3.0"
- js-message "1.0.5"
- js-queue "2.0.0"
-
-node-libs-browser@^2.0.0:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/node-libs-browser/download/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
- integrity sha1-X5QmPUBPbkR2fXJpAf/wVHjWAN8=
- dependencies:
- assert "^1.1.1"
- browserify-zlib "^0.2.0"
- buffer "^4.3.0"
- console-browserify "^1.1.0"
- constants-browserify "^1.0.0"
- crypto-browserify "^3.11.0"
- domain-browser "^1.1.1"
- events "^1.0.0"
- https-browserify "^1.0.0"
- os-browserify "^0.3.0"
- path-browserify "0.0.0"
- process "^0.11.10"
- punycode "^1.2.4"
- querystring-es3 "^0.2.0"
- readable-stream "^2.3.3"
- stream-browserify "^2.0.1"
- stream-http "^2.7.2"
- string_decoder "^1.0.0"
- timers-browserify "^2.0.4"
- tty-browserify "0.0.0"
- url "^0.11.0"
- util "^0.10.3"
- vm-browserify "0.0.4"
-
-node-pre-gyp@^0.10.0:
- version "0.10.3"
- resolved "http://registry.npm.taobao.org/node-pre-gyp/download/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
- integrity sha1-MHAEBxav3HeHR7YbaIe/eIgLgPw=
- dependencies:
- detect-libc "^1.0.2"
- mkdirp "^0.5.1"
- needle "^2.2.1"
- nopt "^4.0.1"
- npm-packlist "^1.1.6"
- npmlog "^4.0.2"
- rc "^1.2.7"
- rimraf "^2.6.1"
- semver "^5.3.0"
- tar "^4"
-
-node-releases@^1.0.0-alpha.14, node-releases@^1.0.5:
- version "1.0.5"
- resolved "http://registry.npm.taobao.org/node-releases/download/node-releases-1.0.5.tgz#a641adcc968b039a27345d92ef10b093e5cbd41d"
- integrity sha1-pkGtzJaLA5onNF2S7xCwk+XL1B0=
- dependencies:
- semver "^5.3.0"
-
-node-releases@^1.1.8:
- version "1.1.10"
- resolved "https://registry.npmjs.org/node-releases/-/node-releases-1.1.10.tgz#5dbeb6bc7f4e9c85b899e2e7adcc0635c9b2adf7"
- integrity sha512-KbUPCpfoBvb3oBkej9+nrU0/7xPlVhmhhUJ1PZqwIP5/1dJkRWKWD3OONjo6M2J7tSCBtDCumLwwqeI+DWWaLQ==
- dependencies:
- semver "^5.3.0"
-
-node-sass@^4.11.0:
- version "4.11.0"
- resolved "https://registry.npmjs.org/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
- integrity sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==
- dependencies:
- async-foreach "^0.1.3"
- chalk "^1.1.1"
- cross-spawn "^3.0.0"
- gaze "^1.0.0"
- get-stdin "^4.0.1"
- glob "^7.0.3"
- in-publish "^2.0.0"
- lodash.assign "^4.2.0"
- lodash.clonedeep "^4.3.2"
- lodash.mergewith "^4.6.0"
- meow "^3.7.0"
- mkdirp "^0.5.1"
- nan "^2.10.0"
- node-gyp "^3.8.0"
- npmlog "^4.0.0"
- request "^2.88.0"
- sass-graph "^2.2.4"
- stdout-stream "^1.4.0"
- "true-case-path" "^1.0.2"
-
-"nopt@2 || 3":
- version "3.0.6"
- resolved "http://registry.npm.taobao.org/nopt/download/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
- integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
- dependencies:
- abbrev "1"
-
-nopt@^4.0.1:
- version "4.0.1"
- resolved "http://registry.npm.taobao.org/nopt/download/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
- integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
- dependencies:
- abbrev "1"
- osenv "^0.1.4"
-
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
- version "2.4.0"
- resolved "http://registry.npm.taobao.org/normalize-package-data/download/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
- integrity sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=
- dependencies:
- hosted-git-info "^2.1.4"
- is-builtin-module "^1.0.0"
- semver "2 || 3 || 4 || 5"
- validate-npm-package-license "^3.0.1"
-
-normalize-path@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
- integrity sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=
-
-normalize-path@^2.1.1:
- version "2.1.1"
- resolved "http://registry.npm.taobao.org/normalize-path/download/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
- integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
- dependencies:
- remove-trailing-separator "^1.0.1"
-
-normalize-path@^3.0.0:
- version "3.0.0"
- resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
- integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
-normalize-range@^0.1.2:
- version "0.1.2"
- resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
- integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
-
-normalize-url@^3.0.0:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
- integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
-
-npm-bundled@^1.0.1:
- version "1.0.5"
- resolved "http://registry.npm.taobao.org/npm-bundled/download/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
- integrity sha1-PBcyt7qTazoQMlrvYWRnwMy8yXk=
-
-npm-packlist@^1.1.6:
- version "1.1.12"
- resolved "http://registry.npm.taobao.org/npm-packlist/download/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a"
- integrity sha1-Ir3i68EucspIKr1nr8UetJN3JDo=
- dependencies:
- ignore-walk "^3.0.1"
- npm-bundled "^1.0.1"
-
-npm-run-path@^2.0.0:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
- integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
- dependencies:
- path-key "^2.0.0"
-
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
- version "4.1.2"
- resolved "http://registry.npm.taobao.org/npmlog/download/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
- integrity sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=
- dependencies:
- are-we-there-yet "~1.1.2"
- console-control-strings "~1.1.0"
- gauge "~2.7.3"
- set-blocking "~2.0.0"
-
-nprogress@^0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/nprogress/-/nprogress-0.2.0.tgz#cb8f34c53213d895723fcbab907e9422adbcafb1"
- integrity sha1-y480xTIT2JVyP8urkH6UIq28r7E=
-
-nth-check@^1.0.1, nth-check@~1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
- integrity sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=
- dependencies:
- boolbase "~1.0.0"
-
-num2fraction@^1.2.2:
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
- integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
-
-number-is-nan@^1.0.0:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/number-is-nan/download/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
- integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
-oauth-sign@~0.9.0:
- version "0.9.0"
- resolved "http://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
- integrity sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU=
-
-object-assign@4.x, object-assign@^4.0.1, object-assign@^4.1.0:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
- integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-object-copy@^0.1.0:
- version "0.1.0"
- resolved "http://registry.npm.taobao.org/object-copy/download/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
- integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
- dependencies:
- copy-descriptor "^0.1.0"
- define-property "^0.2.5"
- kind-of "^3.0.3"
-
-object-hash@^1.1.4:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.0.tgz#76d9ba6ff113cf8efc0d996102851fe6723963e2"
- integrity sha512-05KzQ70lSeGSrZJQXE5wNDiTkBJDlUT/myi6RX9dVIvz7a7Qh4oH93BQdiPMn27nldYvVQCKMUaM83AfizZlsQ==
-
-object-inspect@~1.6.0:
- version "1.6.0"
- resolved "http://registry.npm.taobao.org/object-inspect/download/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"
- integrity sha1-xwtsv3LydKq0w0wMgvUWe/gs8Vs=
-
-object-keys@^1.0.11, object-keys@^1.0.12:
- version "1.0.12"
- resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
- integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==
-
-object-visit@^1.0.0:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/object-visit/download/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
- integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
- dependencies:
- isobject "^3.0.0"
-
-object.assign@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
- integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
- dependencies:
- define-properties "^1.1.2"
- function-bind "^1.1.1"
- has-symbols "^1.0.0"
- object-keys "^1.0.11"
-
-object.getownpropertydescriptors@^2.0.3:
- version "2.0.3"
- resolved "http://registry.npm.taobao.org/object.getownpropertydescriptors/download/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
- integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=
- dependencies:
- define-properties "^1.1.2"
- es-abstract "^1.5.1"
-
-object.pick@^1.3.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
- integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
- dependencies:
- isobject "^3.0.1"
-
-object.values@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.0.4.tgz#e524da09b4f66ff05df457546ec72ac99f13069a"
- integrity sha1-5STaCbT2b/Bd9FdUbscqyZ8TBpo=
- dependencies:
- define-properties "^1.1.2"
- es-abstract "^1.6.1"
- function-bind "^1.1.0"
- has "^1.0.1"
-
-obuf@^1.0.0, obuf@^1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
- integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
-
-omit.js@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/omit.js/-/omit.js-1.0.0.tgz#e013cb86a7517b9cf6f7cfb0ddb4297256a99288"
- integrity sha512-O1rwbvEfAdhtonTv+v6IQeMOKTi/wlHcXpI3hehyPDlujkjSBQC6Vtzg0mdy+v2KVDmuPf7hAbHlTBM6q1bUHQ==
- dependencies:
- babel-runtime "^6.23.0"
-
-on-finished@~2.3.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
- integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
- dependencies:
- ee-first "1.1.1"
-
-on-headers@~1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
- integrity sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=
-
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
- version "1.4.0"
- resolved "http://registry.npm.taobao.org/once/download/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
- integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
- dependencies:
- wrappy "1"
-
-onetime@^2.0.0:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
- integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
- dependencies:
- mimic-fn "^1.0.0"
-
-opener@^1.5.1:
- version "1.5.1"
- resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"
- integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==
-
-opn@^5.1.0, opn@^5.3.0:
- version "5.4.0"
- resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
- integrity sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==
- dependencies:
- is-wsl "^1.1.0"
-
-optionator@^0.8.2:
- version "0.8.2"
- resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
- integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
- dependencies:
- deep-is "~0.1.3"
- fast-levenshtein "~2.0.4"
- levn "~0.3.0"
- prelude-ls "~1.1.2"
- type-check "~0.3.2"
- wordwrap "~1.0.0"
-
-ora@^3.1.0:
- version "3.2.0"
- resolved "https://registry.npmjs.org/ora/-/ora-3.2.0.tgz#67e98a7e11f7f0ac95deaaaf11bb04de3d09e481"
- integrity sha512-XHMZA5WieCbtg+tu0uPF8CjvwQdNzKCX6BVh3N6GFsEXH40mTk5dsw/ya1lBTUGJslcEFJFQ8cBhOgkkZXQtMA==
- dependencies:
- chalk "^2.4.2"
- cli-cursor "^2.1.0"
- cli-spinners "^2.0.0"
- log-symbols "^2.2.0"
- strip-ansi "^5.0.0"
- wcwidth "^1.0.1"
-
-original@^1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
- integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
- dependencies:
- url-parse "^1.4.3"
-
-os-browserify@^0.3.0:
- version "0.3.0"
- resolved "http://registry.npm.taobao.org/os-browserify/download/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
- integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
-
-os-homedir@^1.0.0:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/os-homedir/download/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
- integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-
-os-locale@^1.4.0:
- version "1.4.0"
- resolved "http://registry.npm.taobao.org/os-locale/download/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
- integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
- dependencies:
- lcid "^1.0.0"
-
-os-locale@^3.0.0:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620"
- integrity sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==
- dependencies:
- execa "^0.10.0"
- lcid "^2.0.0"
- mem "^4.0.0"
-
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
- integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
-
-osenv@0, osenv@^0.1.4:
- version "0.1.5"
- resolved "http://registry.npm.taobao.org/osenv/download/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
- integrity sha1-hc36+uso6Gd/QW4odZK18/SepBA=
- dependencies:
- os-homedir "^1.0.0"
- os-tmpdir "^1.0.0"
-
-p-defer@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
- integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
-
-p-finally@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
- integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
-
-p-is-promise@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
- integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
-
-p-limit@^1.0.0, p-limit@^1.1.0:
- version "1.3.0"
- resolved "http://registry.npm.taobao.org/p-limit/download/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
- integrity sha1-uGvV8MJWkJEcdZD8v8IBDVSzzLg=
- dependencies:
- p-try "^1.0.0"
-
-p-limit@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
- integrity sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==
- dependencies:
- p-try "^2.0.0"
-
-p-locate@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/p-locate/download/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
- integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
- dependencies:
- p-limit "^1.1.0"
-
-p-locate@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
- integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
- dependencies:
- p-limit "^2.0.0"
-
-p-map@^1.1.1:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
- integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
-
-p-try@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/p-try/download/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
- integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
-
-p-try@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
- integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
-
-pako@~1.0.5:
- version "1.0.7"
- resolved "http://registry.npm.taobao.org/pako/download/pako-1.0.7.tgz#2473439021b57f1516c82f58be7275ad8ef1bb27"
- integrity sha1-JHNDkCG1fxUWyC9YvnJ1rY7xuyc=
-
-parallel-transform@^1.1.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/parallel-transform/download/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
- integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=
- dependencies:
- cyclist "~0.2.2"
- inherits "^2.0.3"
- readable-stream "^2.1.5"
-
-param-case@2.1.x:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
- integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
- dependencies:
- no-case "^2.2.0"
-
-parent-module@^1.0.0:
- version "1.0.0"
- resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.0.tgz#df250bdc5391f4a085fb589dad761f5ad6b865b5"
- integrity sha512-8Mf5juOMmiE4FcmzYc4IaiS9L3+9paz2KOiXzkRviCP6aDmN49Hz6EMWz0lGNp9pX80GvvAuLADtyGfW/Em3TA==
- dependencies:
- callsites "^3.0.0"
-
-parse-asn1@^5.0.0:
- version "5.1.1"
- resolved "http://registry.npm.taobao.org/parse-asn1/download/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
- integrity sha1-9r8pOBgzK9DatU77Fgh3JHRebKg=
- dependencies:
- asn1.js "^4.0.0"
- browserify-aes "^1.0.0"
- create-hash "^1.1.0"
- evp_bytestokey "^1.0.0"
- pbkdf2 "^3.0.3"
-
-parse-json@^2.2.0:
- version "2.2.0"
- resolved "http://registry.npm.taobao.org/parse-json/download/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
- integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
- dependencies:
- error-ex "^1.2.0"
-
-parse-json@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
- integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
- dependencies:
- error-ex "^1.3.1"
- json-parse-better-errors "^1.0.1"
-
-parse-svg-path@~0.1.1:
- version "0.1.2"
- resolved "https://registry.yarnpkg.com/parse-svg-path/-/parse-svg-path-0.1.2.tgz#7a7ec0d1eb06fa5325c7d3e009b859a09b5d49eb"
- integrity sha1-en7A0esG+lMlx9PgCbhZoJtdSes=
-
-parseurl@~1.3.2:
- version "1.3.2"
- resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
- integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
-
-pascalcase@^0.1.1:
- version "0.1.1"
- resolved "http://registry.npm.taobao.org/pascalcase/download/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
- integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
-
-path-browserify@0.0.0:
- version "0.0.0"
- resolved "http://registry.npm.taobao.org/path-browserify/download/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
- integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
-
-path-dirname@^1.0.0:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/path-dirname/download/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
- integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
-path-exists@^2.0.0:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/path-exists/download/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
- integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
- dependencies:
- pinkie-promise "^2.0.0"
-
-path-exists@^3.0.0:
- version "3.0.0"
- resolved "http://registry.npm.taobao.org/path-exists/download/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
- integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
-
-path-is-absolute@^1.0.0:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/path-is-absolute/download/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
- integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-path-is-inside@^1.0.1, path-is-inside@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
- integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
-
-path-key@^2.0.0, path-key@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
- integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
-
-path-parse@^1.0.5:
- version "1.0.6"
- resolved "http://registry.npm.taobao.org/path-parse/download/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
- integrity sha1-1i27VnlAXXLEc37FhgDp3c8G0kw=
-
-path-to-regexp@0.1.7:
- version "0.1.7"
- resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
- integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
-
-path-type@^1.0.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/path-type/download/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
- integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
- dependencies:
- graceful-fs "^4.1.2"
- pify "^2.0.0"
- pinkie-promise "^2.0.0"
-
-path-type@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
- integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
- dependencies:
- pify "^2.0.0"
-
-path-type@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
- integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
- dependencies:
- pify "^3.0.0"
-
-pbkdf2@^3.0.3:
- version "3.0.17"
- resolved "http://registry.npm.taobao.org/pbkdf2/download/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
- integrity sha1-l2wgZTBhexTrsyEUI597CTNuk6Y=
- dependencies:
- create-hash "^1.1.2"
- create-hmac "^1.1.4"
- ripemd160 "^2.0.1"
- safe-buffer "^5.0.1"
- sha.js "^2.4.8"
-
-performance-now@^2.1.0:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/performance-now/download/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
- integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-
-pify@^2.0.0:
- version "2.3.0"
- resolved "http://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
- integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
-
-pify@^3.0.0:
- version "3.0.0"
- resolved "http://registry.npm.taobao.org/pify/download/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
- integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
-
-pify@^4.0.1:
- version "4.0.1"
- resolved "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
- integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
-
-pinkie-promise@^2.0.0:
- version "2.0.1"
- resolved "http://registry.npm.taobao.org/pinkie-promise/download/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
- integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
- dependencies:
- pinkie "^2.0.0"
-
-pinkie@^2.0.0:
- version "2.0.4"
- resolved "http://registry.npm.taobao.org/pinkie/download/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
- integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
-pkg-dir@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
- integrity sha1-ektQio1bstYp1EcFb/TpyTFM89Q=
- dependencies:
- find-up "^1.0.0"
-
-pkg-dir@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/pkg-dir/download/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
- integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
- dependencies:
- find-up "^2.1.0"
-
-pkg-dir@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
- integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
- dependencies:
- find-up "^3.0.0"
-
-pluralize@^7.0.0:
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
- integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==
-
-point-at-length@~1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/point-at-length/-/point-at-length-1.0.2.tgz#9176d8d6d7c8162f12b646f707db9f0ea728125e"
- integrity sha1-kXbY1tfIFi8Stkb3B9ufDqcoEl4=
- dependencies:
- abs-svg-path "~0.1.1"
- isarray "~0.0.1"
- parse-svg-path "~0.1.1"
-
-portfinder@^1.0.20:
- version "1.0.20"
- resolved "https://registry.npmjs.org/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
- integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
- dependencies:
- async "^1.5.2"
- debug "^2.2.0"
- mkdirp "0.5.x"
-
-portfinder@^1.0.9:
- version "1.0.18"
- resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.18.tgz#cf1106ff336fd4329b7ce32fda7d17d62c6bcf37"
- integrity sha512-KanzLOERzKoX3En5yTiV8K/arnU1ykYVokmtEn0PgCzqKZG9489tqW8ifp9+v3/VJZ5YDjvDt/PAP5WaPgk7FA==
- dependencies:
- async "^1.5.2"
- debug "^2.2.0"
- mkdirp "0.5.x"
-
-posix-character-classes@^0.1.0:
- version "0.1.1"
- resolved "http://registry.npm.taobao.org/posix-character-classes/download/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
- integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
-
-postcss-calc@^7.0.0:
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.0.tgz#cf0e78e1d7d9f75119b833abc786fa4b61afedda"
- integrity sha512-o04XICBwDxXVYw1TXkzxs36WRgk9OECGiSUoyYMNoFWHLAQCKKeaqhrNBTUKdStMfwik3gSLLztHebTSV5kJOA==
- dependencies:
- css-unit-converter "^1.1.1"
- postcss "^7.0.2"
- postcss-selector-parser "^5.0.0-rc.3"
- postcss-value-parser "^3.3.0"
-
-postcss-calc@^7.0.1:
- version "7.0.1"
- resolved "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.1.tgz#36d77bab023b0ecbb9789d84dcb23c4941145436"
- integrity sha512-oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ==
- dependencies:
- css-unit-converter "^1.1.1"
- postcss "^7.0.5"
- postcss-selector-parser "^5.0.0-rc.4"
- postcss-value-parser "^3.3.1"
-
-postcss-colormin@^4.0.2:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.2.tgz#93cd1fa11280008696887db1a528048b18e7ed99"
- integrity sha512-1QJc2coIehnVFsz0otges8kQLsryi4lo19WD+U5xCWvXd0uw/Z+KKYnbiNDCnO9GP+PvErPHCG0jNvWTngk9Rw==
- dependencies:
- browserslist "^4.0.0"
- color "^3.0.0"
- has "^1.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-colormin@^4.0.3:
- version "4.0.3"
- resolved "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz#ae060bce93ed794ac71264f08132d550956bd381"
- integrity sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==
- dependencies:
- browserslist "^4.0.0"
- color "^3.0.0"
- has "^1.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-convert-values@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz#ca3813ed4da0f812f9d43703584e449ebe189a7f"
- integrity sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==
- dependencies:
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-discard-comments@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.1.tgz#30697735b0c476852a7a11050eb84387a67ef55d"
- integrity sha512-Ay+rZu1Sz6g8IdzRjUgG2NafSNpp2MSMOQUb+9kkzzzP+kh07fP0yNbhtFejURnyVXSX3FYy2nVNW1QTnNjgBQ==
- dependencies:
- postcss "^7.0.0"
-
-postcss-discard-comments@^4.0.2:
- version "4.0.2"
- resolved "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz#1fbabd2c246bff6aaad7997b2b0918f4d7af4033"
- integrity sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==
- dependencies:
- postcss "^7.0.0"
-
-postcss-discard-duplicates@^4.0.2:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz#3fe133cd3c82282e550fc9b239176a9207b784eb"
- integrity sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==
- dependencies:
- postcss "^7.0.0"
-
-postcss-discard-empty@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz#c8c951e9f73ed9428019458444a02ad90bb9f765"
- integrity sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==
- dependencies:
- postcss "^7.0.0"
-
-postcss-discard-overridden@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz#652aef8a96726f029f5e3e00146ee7a4e755ff57"
- integrity sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==
- dependencies:
- postcss "^7.0.0"
-
-postcss-load-config@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.0.0.tgz#f1312ddbf5912cd747177083c5ef7a19d62ee484"
- integrity sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==
- dependencies:
- cosmiconfig "^4.0.0"
- import-cwd "^2.0.0"
-
-postcss-loader@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d"
- integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==
- dependencies:
- loader-utils "^1.1.0"
- postcss "^7.0.0"
- postcss-load-config "^2.0.0"
- schema-utils "^1.0.0"
-
-postcss-merge-longhand@^4.0.11:
- version "4.0.11"
- resolved "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz#62f49a13e4a0ee04e7b98f42bb16062ca2549e24"
- integrity sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==
- dependencies:
- css-color-names "0.0.4"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
- stylehacks "^4.0.0"
-
-postcss-merge-longhand@^4.0.6:
- version "4.0.7"
- resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.7.tgz#77430fa60e36745887c1c725ab3782c40f48363d"
- integrity sha512-b2g9jC52xY0bwl8Dz1Xzfvn8x1KfmSQ0O8rc88hiv0bmYM6ky3xk1Zq128UClizM6SMBx0w7aqfrpS9u71d4Ow==
- dependencies:
- css-color-names "0.0.4"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
- stylehacks "^4.0.0"
-
-postcss-merge-rules@^4.0.2:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.2.tgz#2be44401bf19856f27f32b8b12c0df5af1b88e74"
- integrity sha512-UiuXwCCJtQy9tAIxsnurfF0mrNHKc4NnNx6NxqmzNNjXpQwLSukUxELHTRF0Rg1pAmcoKLih8PwvZbiordchag==
- dependencies:
- browserslist "^4.0.0"
- caniuse-api "^3.0.0"
- cssnano-util-same-parent "^4.0.0"
- postcss "^7.0.0"
- postcss-selector-parser "^3.0.0"
- vendors "^1.0.0"
-
-postcss-merge-rules@^4.0.3:
- version "4.0.3"
- resolved "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz#362bea4ff5a1f98e4075a713c6cb25aefef9a650"
- integrity sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==
- dependencies:
- browserslist "^4.0.0"
- caniuse-api "^3.0.0"
- cssnano-util-same-parent "^4.0.0"
- postcss "^7.0.0"
- postcss-selector-parser "^3.0.0"
- vendors "^1.0.0"
-
-postcss-minify-font-values@^4.0.2:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz#cd4c344cce474343fac5d82206ab2cbcb8afd5a6"
- integrity sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==
- dependencies:
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-minify-gradients@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.1.tgz#6da95c6e92a809f956bb76bf0c04494953e1a7dd"
- integrity sha512-pySEW3E6Ly5mHm18rekbWiAjVi/Wj8KKt2vwSfVFAWdW6wOIekgqxKxLU7vJfb107o3FDNPkaYFCxGAJBFyogA==
- dependencies:
- cssnano-util-get-arguments "^4.0.0"
- is-color-stop "^1.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-minify-gradients@^4.0.2:
- version "4.0.2"
- resolved "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz#93b29c2ff5099c535eecda56c4aa6e665a663471"
- integrity sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==
- dependencies:
- cssnano-util-get-arguments "^4.0.0"
- is-color-stop "^1.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-minify-params@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.1.tgz#5b2e2d0264dd645ef5d68f8fec0d4c38c1cf93d2"
- integrity sha512-h4W0FEMEzBLxpxIVelRtMheskOKKp52ND6rJv+nBS33G1twu2tCyurYj/YtgU76+UDCvWeNs0hs8HFAWE2OUFg==
- dependencies:
- alphanum-sort "^1.0.0"
- browserslist "^4.0.0"
- cssnano-util-get-arguments "^4.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
- uniqs "^2.0.0"
-
-postcss-minify-params@^4.0.2:
- version "4.0.2"
- resolved "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz#6b9cef030c11e35261f95f618c90036d680db874"
- integrity sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==
- dependencies:
- alphanum-sort "^1.0.0"
- browserslist "^4.0.0"
- cssnano-util-get-arguments "^4.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
- uniqs "^2.0.0"
-
-postcss-minify-selectors@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.1.tgz#a891c197977cc37abf60b3ea06b84248b1c1e9cd"
- integrity sha512-8+plQkomve3G+CodLCgbhAKrb5lekAnLYuL1d7Nz+/7RANpBEVdgBkPNwljfSKvZ9xkkZTZITd04KP+zeJTJqg==
- dependencies:
- alphanum-sort "^1.0.0"
- has "^1.0.0"
- postcss "^7.0.0"
- postcss-selector-parser "^3.0.0"
-
-postcss-minify-selectors@^4.0.2:
- version "4.0.2"
- resolved "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz#e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8"
- integrity sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==
- dependencies:
- alphanum-sort "^1.0.0"
- has "^1.0.0"
- postcss "^7.0.0"
- postcss-selector-parser "^3.0.0"
-
-postcss-modules-extract-imports@^1.2.0:
- version "1.2.1"
- resolved "http://registry.npm.taobao.org/postcss-modules-extract-imports/download/postcss-modules-extract-imports-1.2.1.tgz#dc87e34148ec7eab5f791f7cd5849833375b741a"
- integrity sha1-3IfjQUjsfqtfeR981YSYMzdbdBo=
- dependencies:
- postcss "^6.0.1"
-
-postcss-modules-local-by-default@^1.2.0:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/postcss-modules-local-by-default/download/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
- integrity sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=
- dependencies:
- css-selector-tokenizer "^0.7.0"
- postcss "^6.0.1"
-
-postcss-modules-scope@^1.1.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/postcss-modules-scope/download/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
- integrity sha1-1upkmUx5+XtipytCb75gVqGUu5A=
- dependencies:
- css-selector-tokenizer "^0.7.0"
- postcss "^6.0.1"
-
-postcss-modules-values@^1.3.0:
- version "1.3.0"
- resolved "http://registry.npm.taobao.org/postcss-modules-values/download/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
- integrity sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=
- dependencies:
- icss-replace-symbols "^1.1.0"
- postcss "^6.0.1"
-
-postcss-normalize-charset@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz#8b35add3aee83a136b0471e0d59be58a50285dd4"
- integrity sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==
- dependencies:
- postcss "^7.0.0"
-
-postcss-normalize-display-values@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.1.tgz#d9a83d47c716e8a980f22f632c8b0458cfb48a4c"
- integrity sha512-R5mC4vaDdvsrku96yXP7zak+O3Mm9Y8IslUobk7IMP+u/g+lXvcN4jngmHY5zeJnrQvE13dfAg5ViU05ZFDwdg==
- dependencies:
- cssnano-util-get-match "^4.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-normalize-display-values@^4.0.2:
- version "4.0.2"
- resolved "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz#0dbe04a4ce9063d4667ed2be476bb830c825935a"
- integrity sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==
- dependencies:
- cssnano-util-get-match "^4.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-normalize-positions@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.1.tgz#ee2d4b67818c961964c6be09d179894b94fd6ba1"
- integrity sha512-GNoOaLRBM0gvH+ZRb2vKCIujzz4aclli64MBwDuYGU2EY53LwiP7MxOZGE46UGtotrSnmarPPZ69l2S/uxdaWA==
- dependencies:
- cssnano-util-get-arguments "^4.0.0"
- has "^1.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-normalize-positions@^4.0.2:
- version "4.0.2"
- resolved "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz#05f757f84f260437378368a91f8932d4b102917f"
- integrity sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==
- dependencies:
- cssnano-util-get-arguments "^4.0.0"
- has "^1.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-normalize-repeat-style@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.1.tgz#5293f234b94d7669a9f805495d35b82a581c50e5"
- integrity sha512-fFHPGIjBUyUiswY2rd9rsFcC0t3oRta4wxE1h3lpwfQZwFeFjXFSiDtdJ7APCmHQOnUZnqYBADNRPKPwFAONgA==
- dependencies:
- cssnano-util-get-arguments "^4.0.0"
- cssnano-util-get-match "^4.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-normalize-repeat-style@^4.0.2:
- version "4.0.2"
- resolved "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz#c4ebbc289f3991a028d44751cbdd11918b17910c"
- integrity sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==
- dependencies:
- cssnano-util-get-arguments "^4.0.0"
- cssnano-util-get-match "^4.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-normalize-string@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.1.tgz#23c5030c2cc24175f66c914fa5199e2e3c10fef3"
- integrity sha512-IJoexFTkAvAq5UZVxWXAGE0yLoNN/012v7TQh5nDo6imZJl2Fwgbhy3J2qnIoaDBrtUP0H7JrXlX1jjn2YcvCQ==
- dependencies:
- has "^1.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-normalize-string@^4.0.2:
- version "4.0.2"
- resolved "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz#cd44c40ab07a0c7a36dc5e99aace1eca4ec2690c"
- integrity sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==
- dependencies:
- has "^1.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-normalize-timing-functions@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.1.tgz#8be83e0b9cb3ff2d1abddee032a49108f05f95d7"
- integrity sha512-1nOtk7ze36+63ONWD8RCaRDYsnzorrj+Q6fxkQV+mlY5+471Qx9kspqv0O/qQNMeApg8KNrRf496zHwJ3tBZ7w==
- dependencies:
- cssnano-util-get-match "^4.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-normalize-timing-functions@^4.0.2:
- version "4.0.2"
- resolved "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz#8e009ca2a3949cdaf8ad23e6b6ab99cb5e7d28d9"
- integrity sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==
- dependencies:
- cssnano-util-get-match "^4.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-normalize-unicode@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz#841bd48fdcf3019ad4baa7493a3d363b52ae1cfb"
- integrity sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==
- dependencies:
- browserslist "^4.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-normalize-url@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz#10e437f86bc7c7e58f7b9652ed878daaa95faae1"
- integrity sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==
- dependencies:
- is-absolute-url "^2.0.0"
- normalize-url "^3.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-normalize-whitespace@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.1.tgz#d14cb639b61238418ac8bc8d3b7bdd65fc86575e"
- integrity sha512-U8MBODMB2L+nStzOk6VvWWjZgi5kQNShCyjRhMT3s+W9Jw93yIjOnrEkKYD3Ul7ChWbEcjDWmXq0qOL9MIAnAw==
- dependencies:
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-normalize-whitespace@^4.0.2:
- version "4.0.2"
- resolved "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz#bf1d4070fe4fcea87d1348e825d8cc0c5faa7d82"
- integrity sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==
- dependencies:
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-ordered-values@^4.1.1:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.1.tgz#2e3b432ef3e489b18333aeca1f1295eb89be9fc2"
- integrity sha512-PeJiLgJWPzkVF8JuKSBcylaU+hDJ/TX3zqAMIjlghgn1JBi6QwQaDZoDIlqWRcCAI8SxKrt3FCPSRmOgKRB97Q==
- dependencies:
- cssnano-util-get-arguments "^4.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-ordered-values@^4.1.2:
- version "4.1.2"
- resolved "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz#0cf75c820ec7d5c4d280189559e0b571ebac0eee"
- integrity sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==
- dependencies:
- cssnano-util-get-arguments "^4.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-reduce-initial@^4.0.2:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.2.tgz#bac8e325d67510ee01fa460676dc8ea9e3b40f15"
- integrity sha512-epUiC39NonKUKG+P3eAOKKZtm5OtAtQJL7Ye0CBN1f+UQTHzqotudp+hki7zxXm7tT0ZAKDMBj1uihpPjP25ug==
- dependencies:
- browserslist "^4.0.0"
- caniuse-api "^3.0.0"
- has "^1.0.0"
- postcss "^7.0.0"
-
-postcss-reduce-initial@^4.0.3:
- version "4.0.3"
- resolved "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz#7fd42ebea5e9c814609639e2c2e84ae270ba48df"
- integrity sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==
- dependencies:
- browserslist "^4.0.0"
- caniuse-api "^3.0.0"
- has "^1.0.0"
- postcss "^7.0.0"
-
-postcss-reduce-transforms@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.1.tgz#8600d5553bdd3ad640f43bff81eb52f8760d4561"
- integrity sha512-sZVr3QlGs0pjh6JAIe6DzWvBaqYw05V1t3d9Tp+VnFRT5j+rsqoWsysh/iSD7YNsULjq9IAylCznIwVd5oU/zA==
- dependencies:
- cssnano-util-get-match "^4.0.0"
- has "^1.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-reduce-transforms@^4.0.2:
- version "4.0.2"
- resolved "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz#17efa405eacc6e07be3414a5ca2d1074681d4e29"
- integrity sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==
- dependencies:
- cssnano-util-get-match "^4.0.0"
- has "^1.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
-
-postcss-selector-parser@^3.0.0:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865"
- integrity sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=
- dependencies:
- dot-prop "^4.1.1"
- indexes-of "^1.0.1"
- uniq "^1.0.1"
-
-postcss-selector-parser@^5.0.0, postcss-selector-parser@^5.0.0-rc.4:
- version "5.0.0"
- resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c"
- integrity sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==
- dependencies:
- cssesc "^2.0.0"
- indexes-of "^1.0.1"
- uniq "^1.0.1"
-
-postcss-selector-parser@^5.0.0-rc.3:
- version "5.0.0-rc.3"
- resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0-rc.3.tgz#c4525dcc8eb90166c53dcbf0cb9317ceff5a15b5"
- integrity sha512-kBl1vc+zJgWCBmmxEXE2/15tmmYdD50lO5r6tLNXEx3K4LtszdLFaSNo8SNVuoI+BGODbWhavoG/n1DrYphBsw==
- dependencies:
- babel-eslint "^8.2.3"
- cssesc "^1.0.1"
- indexes-of "^1.0.1"
- uniq "^1.0.1"
-
-postcss-svgo@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.1.tgz#5628cdb38f015de6b588ce6d0bf0724b492b581d"
- integrity sha512-YD5uIk5NDRySy0hcI+ZJHwqemv2WiqqzDgtvgMzO8EGSkK5aONyX8HMVFRFJSdO8wUWTuisUFn/d7yRRbBr5Qw==
- dependencies:
- is-svg "^3.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
- svgo "^1.0.0"
-
-postcss-svgo@^4.0.2:
- version "4.0.2"
- resolved "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz#17b997bc711b333bab143aaed3b8d3d6e3d38258"
- integrity sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==
- dependencies:
- is-svg "^3.0.0"
- postcss "^7.0.0"
- postcss-value-parser "^3.0.0"
- svgo "^1.0.0"
-
-postcss-unique-selectors@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz#9446911f3289bfd64c6d680f073c03b1f9ee4bac"
- integrity sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==
- dependencies:
- alphanum-sort "^1.0.0"
- postcss "^7.0.0"
- uniqs "^2.0.0"
-
-postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1:
- version "3.3.1"
- resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
- integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
-
-postcss@^6.0.1, postcss@^6.0.23:
- version "6.0.23"
- resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
- integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
- dependencies:
- chalk "^2.4.1"
- source-map "^0.6.1"
- supports-color "^5.4.0"
-
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2:
- version "7.0.5"
- resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.5.tgz#70e6443e36a6d520b0fd4e7593fcca3635ee9f55"
- integrity sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ==
- dependencies:
- chalk "^2.4.1"
- source-map "^0.6.1"
- supports-color "^5.5.0"
-
-postcss@^7.0.14, postcss@^7.0.5:
- version "7.0.14"
- resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
- integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
- dependencies:
- chalk "^2.4.2"
- source-map "^0.6.1"
- supports-color "^6.1.0"
-
-prelude-ls@~1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
- integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
-
-prettier@1.16.3:
- version "1.16.3"
- resolved "https://registry.npmjs.org/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d"
- integrity sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw==
-
-pretty-error@^2.0.2:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
- integrity sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=
- dependencies:
- renderkid "^2.0.1"
- utila "~0.4"
-
-private@^0.1.6:
- version "0.1.8"
- resolved "http://registry.npm.taobao.org/private/download/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
- integrity sha1-I4Hts2ifelPWUxkAYPz4ItLzaP8=
-
-process-nextick-args@~2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/process-nextick-args/download/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
- integrity sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o=
-
-process@^0.11.10:
- version "0.11.10"
- resolved "http://registry.npm.taobao.org/process/download/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
- integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
-
-progress@^2.0.0:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.1.tgz#c9242169342b1c29d275889c95734621b1952e31"
- integrity sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==
-
-promise-inflight@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/promise-inflight/download/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
- integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
-
-promise-polyfill@8.1.0:
- version "8.1.0"
- resolved "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.1.0.tgz#30059da54d1358ce905ac581f287e184aedf995d"
- integrity sha512-OzSf6gcCUQ01byV4BgwyUCswlaQQ6gzXc23aLQWhicvfX9kfsUiUhgt3CCQej8jDnl8/PhGF31JdHX2/MzF3WA==
-
-promise@^7.1.1:
- version "7.3.1"
- resolved "http://registry.npm.taobao.org/promise/download/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
- integrity sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=
- dependencies:
- asap "~2.0.3"
-
-proxy-addr@~2.0.4:
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
- integrity sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==
- dependencies:
- forwarded "~0.1.2"
- ipaddr.js "1.8.0"
-
-prr@~1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/prr/download/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
- integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
-
-pseudomap@^1.0.2:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/pseudomap/download/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
- integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
-
-psl@^1.1.24:
- version "1.1.29"
- resolved "http://registry.npm.taobao.org/psl/download/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
- integrity sha1-YPWA02AXC7cip5fMcEQR5tqFDGc=
-
-psl@^1.1.28:
- version "1.1.31"
- resolved "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
- integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==
-
-public-encrypt@^4.0.0:
- version "4.0.3"
- resolved "http://registry.npm.taobao.org/public-encrypt/download/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
- integrity sha1-T8ydd6B+SLp1J+fL4N4z0HATMeA=
- dependencies:
- bn.js "^4.1.0"
- browserify-rsa "^4.0.0"
- create-hash "^1.1.0"
- parse-asn1 "^5.0.0"
- randombytes "^2.0.1"
- safe-buffer "^5.1.2"
-
-pump@^2.0.0, pump@^2.0.1:
- version "2.0.1"
- resolved "http://registry.npm.taobao.org/pump/download/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
- integrity sha1-Ejma3W5M91Jtlzy8i1zi4pCLOQk=
- dependencies:
- end-of-stream "^1.1.0"
- once "^1.3.1"
-
-pump@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
- integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
- dependencies:
- end-of-stream "^1.1.0"
- once "^1.3.1"
-
-pumpify@^1.3.3:
- version "1.5.1"
- resolved "http://registry.npm.taobao.org/pumpify/download/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
- integrity sha1-NlE74karJ1cLGjdKXOJ4v9dDcM4=
- dependencies:
- duplexify "^3.6.0"
- inherits "^2.0.3"
- pump "^2.0.0"
-
-punycode@1.3.2:
- version "1.3.2"
- resolved "http://registry.npm.taobao.org/punycode/download/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
- integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
-
-punycode@2.x.x, punycode@^2.1.0, punycode@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
- integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-punycode@^1.2.4, punycode@^1.4.1:
- version "1.4.1"
- resolved "http://registry.npm.taobao.org/punycode/download/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
- integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
-
-q@^1.1.2:
- version "1.5.1"
- resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
- integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
-
-qs@6.5.2, qs@~6.5.2:
- version "6.5.2"
- resolved "http://registry.npm.taobao.org/qs/download/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
- integrity sha1-yzroBuh0BERYTvFUzo7pjUA/PjY=
-
-querystring-es3@^0.2.0:
- version "0.2.1"
- resolved "http://registry.npm.taobao.org/querystring-es3/download/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
- integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
-
-querystring@0.2.0:
- version "0.2.0"
- resolved "http://registry.npm.taobao.org/querystring/download/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
- integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
-
-querystringify@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.0.tgz#7ded8dfbf7879dcc60d0a644ac6754b283ad17ef"
- integrity sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==
-
-raf@^3.4.0:
- version "3.4.0"
- resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575"
- integrity sha512-pDP/NMRAXoTfrhCfyfSEwJAKLaxBU9eApMeBPB1TkDouZmvPerIClV8lTAd+uF8ZiTaVl69e1FCxQrAd/VTjGw==
- dependencies:
- performance-now "^2.1.0"
-
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
- version "2.0.6"
- resolved "http://registry.npm.taobao.org/randombytes/download/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
- integrity sha1-0wLFIpSFiISKjTAMkytEwkIx2oA=
- dependencies:
- safe-buffer "^5.1.0"
-
-randomfill@^1.0.3:
- version "1.0.4"
- resolved "http://registry.npm.taobao.org/randomfill/download/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
- integrity sha1-ySGW/IarQr6YPxvzF3giSTHWFFg=
- dependencies:
- randombytes "^2.0.5"
- safe-buffer "^5.1.0"
-
-range-parser@^1.0.3, range-parser@~1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
- integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
-
-raw-body@2.3.3:
- version "2.3.3"
- resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
- integrity sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==
- dependencies:
- bytes "3.0.0"
- http-errors "1.6.3"
- iconv-lite "0.4.23"
- unpipe "1.0.0"
-
-rc@^1.2.7:
- version "1.2.8"
- resolved "http://registry.npm.taobao.org/rc/download/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
- integrity sha1-zZJL9SAKB1uDwYjNa54hG3/A0+0=
- dependencies:
- deep-extend "^0.6.0"
- ini "~1.3.0"
- minimist "^1.2.0"
- strip-json-comments "~2.0.1"
-
-read-pkg-up@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/read-pkg-up/download/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
- integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
- dependencies:
- find-up "^1.0.0"
- read-pkg "^1.0.0"
-
-read-pkg-up@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
- integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
- dependencies:
- find-up "^2.0.0"
- read-pkg "^2.0.0"
-
-read-pkg@^1.0.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/read-pkg/download/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
- integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
- dependencies:
- load-json-file "^1.0.0"
- normalize-package-data "^2.3.2"
- path-type "^1.0.0"
-
-read-pkg@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
- integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
- dependencies:
- load-json-file "^2.0.0"
- normalize-package-data "^2.3.2"
- path-type "^2.0.0"
-
-read-pkg@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
- integrity sha1-ljYlN48+HE1IyFhytabsfV0JMjc=
- dependencies:
- normalize-package-data "^2.3.2"
- parse-json "^4.0.0"
- pify "^3.0.0"
-
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
- version "2.3.6"
- resolved "http://registry.npm.taobao.org/readable-stream/download/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
- integrity sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=
- dependencies:
- core-util-is "~1.0.0"
- inherits "~2.0.3"
- isarray "~1.0.0"
- process-nextick-args "~2.0.0"
- safe-buffer "~5.1.1"
- string_decoder "~1.1.1"
- util-deprecate "~1.0.1"
-
-readable-stream@1.0:
- version "1.0.34"
- resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
- integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
- dependencies:
- core-util-is "~1.0.0"
- inherits "~2.0.1"
- isarray "0.0.1"
- string_decoder "~0.10.x"
-
-readable-stream@^3.0.6:
- version "3.2.0"
- resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz#de17f229864c120a9f56945756e4f32c4045245d"
- integrity sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==
- dependencies:
- inherits "^2.0.3"
- string_decoder "^1.1.1"
- util-deprecate "^1.0.1"
-
-readdirp@^2.0.0:
- version "2.2.1"
- resolved "http://registry.npm.taobao.org/readdirp/download/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
- integrity sha1-DodiKjMlqjPokihcr4tOhGUppSU=
- dependencies:
- graceful-fs "^4.1.11"
- micromatch "^3.1.10"
- readable-stream "^2.0.2"
-
-redent@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/redent/download/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
- integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
- dependencies:
- indent-string "^2.1.0"
- strip-indent "^1.0.1"
-
-regenerate-unicode-properties@^7.0.0:
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/regenerate-unicode-properties/download/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c"
- integrity sha1-EHQFr8xKGQ7F7UUOyqAO0Mr6ekw=
- dependencies:
- regenerate "^1.4.0"
-
-regenerate@^1.2.1, regenerate@^1.4.0:
- version "1.4.0"
- resolved "http://registry.npm.taobao.org/regenerate/download/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
- integrity sha1-SoVuxLVuQHfFV1icroXnpMiGmhE=
-
-regenerator-runtime@^0.11.0:
- version "0.11.1"
- resolved "http://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
- integrity sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk=
-
-regenerator-runtime@^0.12.0:
- version "0.12.1"
- resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
- integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
-
-regenerator-transform@^0.13.3:
- version "0.13.3"
- resolved "http://registry.npm.taobao.org/regenerator-transform/download/regenerator-transform-0.13.3.tgz#264bd9ff38a8ce24b06e0636496b2c856b57bcbb"
- integrity sha1-JkvZ/zioziSwbgY2SWsshWtXvLs=
- dependencies:
- private "^0.1.6"
-
-regex-not@^1.0.0, regex-not@^1.0.2:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/regex-not/download/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
- integrity sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=
- dependencies:
- extend-shallow "^3.0.2"
- safe-regex "^1.1.0"
-
-regexpp@^1.0.1:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
- integrity sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==
-
-regexpp@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
- integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
-
-regexpu-core@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/regexpu-core/download/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
- integrity sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=
- dependencies:
- regenerate "^1.2.1"
- regjsgen "^0.2.0"
- regjsparser "^0.1.4"
-
-regexpu-core@^4.1.3, regexpu-core@^4.2.0:
- version "4.2.0"
- resolved "http://registry.npm.taobao.org/regexpu-core/download/regexpu-core-4.2.0.tgz#a3744fa03806cffe146dea4421a3e73bdcc47b1d"
- integrity sha1-o3RPoDgGz/4UbepEIaPnO9zEex0=
- dependencies:
- regenerate "^1.4.0"
- regenerate-unicode-properties "^7.0.0"
- regjsgen "^0.4.0"
- regjsparser "^0.3.0"
- unicode-match-property-ecmascript "^1.0.4"
- unicode-match-property-value-ecmascript "^1.0.2"
-
-regjsgen@^0.2.0:
- version "0.2.0"
- resolved "http://registry.npm.taobao.org/regjsgen/download/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
- integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
-
-regjsgen@^0.4.0:
- version "0.4.0"
- resolved "http://registry.npm.taobao.org/regjsgen/download/regjsgen-0.4.0.tgz#c1eb4c89a209263f8717c782591523913ede2561"
- integrity sha1-wetMiaIJJj+HF8eCWRUjkT7eJWE=
-
-regjsparser@^0.1.4:
- version "0.1.5"
- resolved "http://registry.npm.taobao.org/regjsparser/download/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
- integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=
- dependencies:
- jsesc "~0.5.0"
-
-regjsparser@^0.3.0:
- version "0.3.0"
- resolved "http://registry.npm.taobao.org/regjsparser/download/regjsparser-0.3.0.tgz#3c326da7fcfd69fa0d332575a41c8c0cdf588c96"
- integrity sha1-PDJtp/z9afoNMyV1pByMDN9YjJY=
- dependencies:
- jsesc "~0.5.0"
-
-regression@~2.0.0:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/regression/-/regression-2.0.1.tgz#8d29c3e8224a10850c35e337e85a8b2fac3b0c87"
- integrity sha1-jSnD6CJKEIUMNeM36FqLL6w7DIc=
-
-relateurl@0.2.x:
- version "0.2.7"
- resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
- integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
-
-remove-trailing-separator@^1.0.1:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/remove-trailing-separator/download/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
- integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
-
-renderkid@^2.0.1:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.2.tgz#12d310f255360c07ad8fde253f6c9e9de372d2aa"
- integrity sha512-FsygIxevi1jSiPY9h7vZmBFUbAOcbYm9UwyiLNdVsLRs/5We9Ob5NMPbGYUTWiLq5L+ezlVdE0A8bbME5CWTpg==
- dependencies:
- css-select "^1.1.0"
- dom-converter "~0.2"
- htmlparser2 "~3.3.0"
- strip-ansi "^3.0.0"
- utila "^0.4.0"
-
-repeat-element@^1.1.2:
- version "1.1.3"
- resolved "http://registry.npm.taobao.org/repeat-element/download/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
- integrity sha1-eC4NglwMWjuzlzH4Tv7mt0Lmsc4=
-
-repeat-string@^1.5.2, repeat-string@^1.6.1:
- version "1.6.1"
- resolved "http://registry.npm.taobao.org/repeat-string/download/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
- integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
-
-repeating@^2.0.0:
- version "2.0.1"
- resolved "http://registry.npm.taobao.org/repeating/download/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
- integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
- dependencies:
- is-finite "^1.0.0"
-
-request-promise-core@1.1.2:
- version "1.1.2"
- resolved "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz#339f6aababcafdb31c799ff158700336301d3346"
- integrity sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==
- dependencies:
- lodash "^4.17.11"
-
-request-promise-native@^1.0.7:
- version "1.0.7"
- resolved "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz#a49868a624bdea5069f1251d0a836e0d89aa2c59"
- integrity sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==
- dependencies:
- request-promise-core "1.1.2"
- stealthy-require "^1.1.1"
- tough-cookie "^2.3.3"
-
-request@^2.83.0, request@^2.87.0, request@^2.88.0:
- version "2.88.0"
- resolved "http://registry.npm.taobao.org/request/download/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
- integrity sha1-nC/KT301tZLv5Xx/ClXoEFIST+8=
- dependencies:
- aws-sign2 "~0.7.0"
- aws4 "^1.8.0"
- caseless "~0.12.0"
- combined-stream "~1.0.6"
- extend "~3.0.2"
- forever-agent "~0.6.1"
- form-data "~2.3.2"
- har-validator "~5.1.0"
- http-signature "~1.2.0"
- is-typedarray "~1.0.0"
- isstream "~0.1.2"
- json-stringify-safe "~5.0.1"
- mime-types "~2.1.19"
- oauth-sign "~0.9.0"
- performance-now "^2.1.0"
- qs "~6.5.2"
- safe-buffer "^5.1.2"
- tough-cookie "~2.4.3"
- tunnel-agent "^0.6.0"
- uuid "^3.3.2"
-
-require-directory@^2.1.1:
- version "2.1.1"
- resolved "http://registry.npm.taobao.org/require-directory/download/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
- integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
-
-require-from-string@^2.0.1:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
- integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
-
-require-main-filename@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/require-main-filename/download/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
- integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
-
-require-uncached@^1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
- integrity sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=
- dependencies:
- caller-path "^0.1.0"
- resolve-from "^1.0.0"
-
-requires-port@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
- integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
-
-resize-observer-polyfill@^1.5.1:
- version "1.5.1"
- resolved "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
- integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
-
-resolve-cwd@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
- integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
- dependencies:
- resolve-from "^3.0.0"
-
-resolve-from@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
- integrity sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=
-
-resolve-from@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
- integrity sha1-six699nWiBvItuZTM17rywoYh0g=
-
-resolve-from@^4.0.0:
- version "4.0.0"
- resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
- integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-
-resolve-url@^0.2.1:
- version "0.2.1"
- resolved "http://registry.npm.taobao.org/resolve-url/download/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
- integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-
-resolve@^1.3.2, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1:
- version "1.8.1"
- resolved "http://registry.npm.taobao.org/resolve/download/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
- integrity sha1-gvHsGaQjrB+9CAsLqwa6NuhKeiY=
- dependencies:
- path-parse "^1.0.5"
-
-resolve@~1.7.1:
- version "1.7.1"
- resolved "http://registry.npm.taobao.org/resolve/download/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
- integrity sha1-qt1lY3T9KYruiVvAJrgpdBhnf9M=
- dependencies:
- path-parse "^1.0.5"
-
-restore-cursor@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
- integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
- dependencies:
- onetime "^2.0.0"
- signal-exit "^3.0.2"
-
-resumer@~0.0.0:
- version "0.0.0"
- resolved "http://registry.npm.taobao.org/resumer/download/resumer-0.0.0.tgz#f1e8f461e4064ba39e82af3cdc2a8c893d076759"
- integrity sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=
- dependencies:
- through "~2.3.4"
-
-ret@~0.1.10:
- version "0.1.15"
- resolved "http://registry.npm.taobao.org/ret/download/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
- integrity sha1-uKSCXVvbH8P29Twrwz+BOIaBx7w=
-
-rgb-regex@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1"
- integrity sha1-wODWiC3w4jviVKR16O3UGRX+rrE=
-
-rgba-regex@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
- integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
-
-right-align@^0.1.1:
- version "0.1.3"
- resolved "http://registry.npm.taobao.org/right-align/download/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
- integrity sha1-YTObci/mo1FWiSENJOFMlhSGE+8=
- dependencies:
- align-text "^0.1.1"
-
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
- version "2.6.2"
- resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
- integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
- dependencies:
- glob "^7.0.5"
-
-rimraf@2.6.3:
- version "2.6.3"
- resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
- integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
- dependencies:
- glob "^7.1.3"
-
-ripemd160@^2.0.0, ripemd160@^2.0.1:
- version "2.0.2"
- resolved "http://registry.npm.taobao.org/ripemd160/download/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
- integrity sha1-ocGm9iR1FXe6XQeRTLyShQWFiQw=
- dependencies:
- hash-base "^3.0.0"
- inherits "^2.0.1"
-
-rollup@^0.25.8:
- version "0.25.8"
- resolved "http://registry.npm.taobao.org/rollup/download/rollup-0.25.8.tgz#bf6ce83b87510d163446eeaa577ed6a6fc5835e0"
- integrity sha1-v2zoO4dRDRY0Ru6qV37WpvxYNeA=
- dependencies:
- chalk "^1.1.1"
- minimist "^1.2.0"
- source-map-support "^0.3.2"
-
-run-async@^2.2.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
- integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
- dependencies:
- is-promise "^2.1.0"
-
-run-queue@^1.0.0, run-queue@^1.0.3:
- version "1.0.3"
- resolved "http://registry.npm.taobao.org/run-queue/download/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
- integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
- dependencies:
- aproba "^1.1.1"
-
-rw@1, rw@^1.3.2:
- version "1.3.3"
- resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
- integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
-
-rx-lite-aggregates@^4.0.8:
- version "4.0.8"
- resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
- integrity sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=
- dependencies:
- rx-lite "*"
-
-rx-lite@*, rx-lite@^4.0.8:
- version "4.0.8"
- resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
- integrity sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=
-
-rxjs@^6.4.0:
- version "6.4.0"
- resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
- integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
- dependencies:
- tslib "^1.9.0"
-
-safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
- version "5.1.2"
- resolved "http://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
- integrity sha1-mR7GnSluAxN0fVm9/St0XDX4go0=
-
-safe-regex@^1.1.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/safe-regex/download/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
- integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
- dependencies:
- ret "~0.1.10"
-
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
- version "2.1.2"
- resolved "http://registry.npm.taobao.org/safer-buffer/download/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
- integrity sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=
-
-sass-graph@^2.2.4:
- version "2.2.4"
- resolved "http://registry.npm.taobao.org/sass-graph/download/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
- integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=
- dependencies:
- glob "^7.0.0"
- lodash "^4.0.0"
- scss-tokenizer "^0.2.3"
- yargs "^7.0.0"
-
-sass-loader@^7.0.1:
- version "7.1.0"
- resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.1.0.tgz#16fd5138cb8b424bf8a759528a1972d72aad069d"
- integrity sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==
- dependencies:
- clone-deep "^2.0.1"
- loader-utils "^1.0.1"
- lodash.tail "^4.1.1"
- neo-async "^2.5.0"
- pify "^3.0.0"
- semver "^5.5.0"
-
-sax@^1.2.4, sax@~1.2.4:
- version "1.2.4"
- resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
- integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-
-schema-utils@^0.4.4:
- version "0.4.7"
- resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
- integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
- dependencies:
- ajv "^6.1.0"
- ajv-keywords "^3.1.0"
-
-schema-utils@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
- integrity sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=
- dependencies:
- ajv "^6.1.0"
- ajv-errors "^1.0.0"
- ajv-keywords "^3.1.0"
-
-scss-tokenizer@^0.2.3:
- version "0.2.3"
- resolved "http://registry.npm.taobao.org/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
- integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
- dependencies:
- js-base64 "^2.1.8"
- source-map "^0.4.2"
-
-select-hose@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
- integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
-
-selfsigned@^1.9.1:
- version "1.10.4"
- resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
- integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==
- dependencies:
- node-forge "0.7.5"
-
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
- version "5.6.0"
- resolved "http://registry.npm.taobao.org/semver/download/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
- integrity sha1-fnQlb7qknHWqfHogXMInmcrIAAQ=
-
-semver@~5.3.0:
- version "5.3.0"
- resolved "http://registry.npm.taobao.org/semver/download/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
- integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
-
-send@0.16.2:
- version "0.16.2"
- resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
- integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
- dependencies:
- debug "2.6.9"
- depd "~1.1.2"
- destroy "~1.0.4"
- encodeurl "~1.0.2"
- escape-html "~1.0.3"
- etag "~1.8.1"
- fresh "0.5.2"
- http-errors "~1.6.2"
- mime "1.4.1"
- ms "2.0.0"
- on-finished "~2.3.0"
- range-parser "~1.2.0"
- statuses "~1.4.0"
-
-serialize-javascript@^1.4.0:
- version "1.5.0"
- resolved "http://registry.npm.taobao.org/serialize-javascript/download/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
- integrity sha1-GqM2FiyIqJDdrVOEuuvJOmVRYf4=
-
-serve-index@^1.7.2:
- version "1.9.1"
- resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
- integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
- dependencies:
- accepts "~1.3.4"
- batch "0.6.1"
- debug "2.6.9"
- escape-html "~1.0.3"
- http-errors "~1.6.2"
- mime-types "~2.1.17"
- parseurl "~1.3.2"
-
-serve-static@1.13.2:
- version "1.13.2"
- resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
- integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
- dependencies:
- encodeurl "~1.0.2"
- escape-html "~1.0.3"
- parseurl "~1.3.2"
- send "0.16.2"
-
-set-blocking@^2.0.0, set-blocking@~2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/set-blocking/download/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
- integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
-set-value@^0.4.3:
- version "0.4.3"
- resolved "http://registry.npm.taobao.org/set-value/download/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
- integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
- dependencies:
- extend-shallow "^2.0.1"
- is-extendable "^0.1.1"
- is-plain-object "^2.0.1"
- to-object-path "^0.3.0"
-
-set-value@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/set-value/download/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
- integrity sha1-ca5KiPD+77v1LR6mBPP7MV67YnQ=
- dependencies:
- extend-shallow "^2.0.1"
- is-extendable "^0.1.1"
- is-plain-object "^2.0.3"
- split-string "^3.0.1"
-
-setimmediate@^1.0.4:
- version "1.0.5"
- resolved "http://registry.npm.taobao.org/setimmediate/download/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
- integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
-
-setprototypeof@1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
- integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
-
-sha.js@^2.4.0, sha.js@^2.4.8:
- version "2.4.11"
- resolved "http://registry.npm.taobao.org/sha.js/download/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
- integrity sha1-N6XPC4HsvGlD3hCbopYNGyZYSuc=
- dependencies:
- inherits "^2.0.1"
- safe-buffer "^5.0.1"
-
-shallow-clone@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571"
- integrity sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==
- dependencies:
- is-extendable "^0.1.1"
- kind-of "^5.0.0"
- mixin-object "^2.0.1"
-
-shallow-equal@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.0.0.tgz#508d1838b3de590ab8757b011b25e430900945f7"
- integrity sha1-UI0YOLPeWQq4dXsBGyXkMJAJRfc=
-
-shallowequal@^1.0.2:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
- integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==
-
-shebang-command@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
- integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
- dependencies:
- shebang-regex "^1.0.0"
-
-shebang-regex@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
- integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
-
-shell-quote@^1.6.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
- integrity sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=
- dependencies:
- array-filter "~0.0.0"
- array-map "~0.0.0"
- array-reduce "~0.0.0"
- jsonify "~0.0.0"
-
-signal-exit@^3.0.0, signal-exit@^3.0.2:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
- integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
-
-simple-statistics@~6.1.0:
- version "6.1.1"
- resolved "https://registry.yarnpkg.com/simple-statistics/-/simple-statistics-6.1.1.tgz#e3a0799ffc49914d6f421c5a4ac585f6a13e2bad"
- integrity sha512-zGwn0DDRa9Zel4H4n2pjTFIyGoAGpnpjrGIctreCxj5XWrcx9v7Xy7270FkC967WMmcvuc8ZU7m0ZG+hGN7gAA==
-
-simple-swizzle@^0.2.2:
- version "0.2.2"
- resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
- integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=
- dependencies:
- is-arrayish "^0.3.1"
-
-slash@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
- integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
-
-slash@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
- integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
-
-slice-ansi@1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
- integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==
- dependencies:
- is-fullwidth-code-point "^2.0.0"
-
-slice-ansi@^2.1.0:
- version "2.1.0"
- resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
- integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
- dependencies:
- ansi-styles "^3.2.0"
- astral-regex "^1.0.0"
- is-fullwidth-code-point "^2.0.0"
-
-snapdragon-node@^2.0.1:
- version "2.1.1"
- resolved "http://registry.npm.taobao.org/snapdragon-node/download/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
- integrity sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=
- dependencies:
- define-property "^1.0.0"
- isobject "^3.0.0"
- snapdragon-util "^3.0.1"
-
-snapdragon-util@^3.0.1:
- version "3.0.1"
- resolved "http://registry.npm.taobao.org/snapdragon-util/download/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
- integrity sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=
- dependencies:
- kind-of "^3.2.0"
-
-snapdragon@^0.8.1:
- version "0.8.2"
- resolved "http://registry.npm.taobao.org/snapdragon/download/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
- integrity sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=
- dependencies:
- base "^0.11.1"
- debug "^2.2.0"
- define-property "^0.2.5"
- extend-shallow "^2.0.1"
- map-cache "^0.2.2"
- source-map "^0.5.6"
- source-map-resolve "^0.5.0"
- use "^3.1.0"
-
-sockjs-client@1.3.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz#12fc9d6cb663da5739d3dc5fb6e8687da95cb177"
- integrity sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==
- dependencies:
- debug "^3.2.5"
- eventsource "^1.0.7"
- faye-websocket "~0.11.1"
- inherits "^2.0.3"
- json3 "^3.3.2"
- url-parse "^1.4.3"
-
-sockjs@0.3.19:
- version "0.3.19"
- resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d"
- integrity sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==
- dependencies:
- faye-websocket "^0.10.0"
- uuid "^3.0.1"
-
-source-list-map@^2.0.0:
- version "2.0.1"
- resolved "http://registry.npm.taobao.org/source-list-map/download/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
- integrity sha1-OZO9hzv8SEecyp6jpUeDXHwVSzQ=
-
-source-map-resolve@^0.5.0:
- version "0.5.2"
- resolved "http://registry.npm.taobao.org/source-map-resolve/download/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
- integrity sha1-cuLMNAlVQ+Q7LGKyxMENSpBU8lk=
- dependencies:
- atob "^2.1.1"
- decode-uri-component "^0.2.0"
- resolve-url "^0.2.1"
- source-map-url "^0.4.0"
- urix "^0.1.0"
-
-source-map-support@^0.3.2:
- version "0.3.3"
- resolved "http://registry.npm.taobao.org/source-map-support/download/source-map-support-0.3.3.tgz#34900977d5ba3f07c7757ee72e73bb1a9b53754f"
- integrity sha1-NJAJd9W6PwfHdX7nLnO7GptTdU8=
- dependencies:
- source-map "0.1.32"
-
-source-map-support@~0.5.6:
- version "0.5.9"
- resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
- integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==
- dependencies:
- buffer-from "^1.0.0"
- source-map "^0.6.0"
-
-source-map-support@~0.5.9:
- version "0.5.10"
- resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
- integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==
- dependencies:
- buffer-from "^1.0.0"
- source-map "^0.6.0"
-
-source-map-url@^0.4.0:
- version "0.4.0"
- resolved "http://registry.npm.taobao.org/source-map-url/download/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
- integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
-
-source-map@0.1.32:
- version "0.1.32"
- resolved "http://registry.npm.taobao.org/source-map/download/source-map-0.1.32.tgz#c8b6c167797ba4740a8ea33252162ff08591b266"
- integrity sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=
- dependencies:
- amdefine ">=0.0.4"
-
-source-map@^0.4.2:
- version "0.4.4"
- resolved "http://registry.npm.taobao.org/source-map/download/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
- integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
- dependencies:
- amdefine ">=0.0.4"
-
-source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1:
- version "0.5.7"
- resolved "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
- integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
- version "0.6.1"
- resolved "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
- integrity sha1-dHIq8y6WFOnCh6jQu95IteLxomM=
-
-spdx-correct@^3.0.0:
- version "3.0.2"
- resolved "http://registry.npm.taobao.org/spdx-correct/download/spdx-correct-3.0.2.tgz#19bb409e91b47b1ad54159243f7312a858db3c2e"
- integrity sha1-GbtAnpG0exrVQVkkP3MSqFjbPC4=
- dependencies:
- spdx-expression-parse "^3.0.0"
- spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
- version "2.2.0"
- resolved "http://registry.npm.taobao.org/spdx-exceptions/download/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
- integrity sha1-LqRQrudPKom/uUUZwH/Nb0EyKXc=
-
-spdx-expression-parse@^3.0.0:
- version "3.0.0"
- resolved "http://registry.npm.taobao.org/spdx-expression-parse/download/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
- integrity sha1-meEZt6XaAOBUkcn6M4t5BII7QdA=
- dependencies:
- spdx-exceptions "^2.1.0"
- spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
- version "3.0.2"
- resolved "http://registry.npm.taobao.org/spdx-license-ids/download/spdx-license-ids-3.0.2.tgz#a59efc09784c2a5bada13cfeaf5c75dd214044d2"
- integrity sha1-pZ78CXhMKlutoTz+r1x13SFARNI=
-
-spdy-transport@^3.0.0:
- version "3.0.0"
- resolved "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
- integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==
- dependencies:
- debug "^4.1.0"
- detect-node "^2.0.4"
- hpack.js "^2.1.6"
- obuf "^1.1.2"
- readable-stream "^3.0.6"
- wbuf "^1.7.3"
-
-spdy@^4.0.0:
- version "4.0.0"
- resolved "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz#81f222b5a743a329aa12cea6a390e60e9b613c52"
- integrity sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==
- dependencies:
- debug "^4.1.0"
- handle-thing "^2.0.0"
- http-deceiver "^1.2.7"
- select-hose "^2.0.0"
- spdy-transport "^3.0.0"
-
-split-string@^3.0.1, split-string@^3.0.2:
- version "3.1.0"
- resolved "http://registry.npm.taobao.org/split-string/download/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
- integrity sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=
- dependencies:
- extend-shallow "^3.0.0"
-
-sprintf-js@~1.0.2:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
- integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
-sshpk@^1.7.0:
- version "1.15.2"
- resolved "http://registry.npm.taobao.org/sshpk/download/sshpk-1.15.2.tgz#c946d6bd9b1a39d0e8635763f5242d6ed6dcb629"
- integrity sha1-yUbWvZsaOdDoY1dj9SQtbtbctik=
- dependencies:
- asn1 "~0.2.3"
- assert-plus "^1.0.0"
- bcrypt-pbkdf "^1.0.0"
- dashdash "^1.12.0"
- ecc-jsbn "~0.1.1"
- getpass "^0.1.1"
- jsbn "~0.1.0"
- safer-buffer "^2.0.2"
- tweetnacl "~0.14.0"
-
-ssri@^5.2.4:
- version "5.3.0"
- resolved "http://registry.npm.taobao.org/ssri/download/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
- integrity sha1-ujhyycbTOgcEp9cf8EXl7EiZnQY=
- dependencies:
- safe-buffer "^5.1.1"
-
-ssri@^6.0.0, ssri@^6.0.1:
- version "6.0.1"
- resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
- integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
- dependencies:
- figgy-pudding "^3.5.1"
-
-stable@~0.1.6:
- version "0.1.8"
- resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
- integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
-
-stackframe@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.0.4.tgz#357b24a992f9427cba6b545d96a14ed2cbca187b"
- integrity sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==
-
-static-extend@^0.1.1:
- version "0.1.2"
- resolved "http://registry.npm.taobao.org/static-extend/download/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
- integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
- dependencies:
- define-property "^0.2.5"
- object-copy "^0.1.0"
-
-"statuses@>= 1.4.0 < 2":
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
- integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
-
-statuses@~1.4.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
- integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
-
-stdout-stream@^1.4.0:
- version "1.4.1"
- resolved "http://registry.npm.taobao.org/stdout-stream/download/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
- integrity sha1-WsF0zdXNcmEEqgwLK9g4FdjVNd4=
- dependencies:
- readable-stream "^2.0.1"
-
-stealthy-require@^1.1.1:
- version "1.1.1"
- resolved "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
- integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
-
-stream-browserify@^2.0.1:
- version "2.0.1"
- resolved "http://registry.npm.taobao.org/stream-browserify/download/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
- integrity sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=
- dependencies:
- inherits "~2.0.1"
- readable-stream "^2.0.2"
-
-stream-each@^1.1.0:
- version "1.2.3"
- resolved "http://registry.npm.taobao.org/stream-each/download/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
- integrity sha1-6+J6DDibBPvMIzZClS4Qcxr6m64=
- dependencies:
- end-of-stream "^1.1.0"
- stream-shift "^1.0.0"
-
-stream-http@^2.7.2:
- version "2.8.3"
- resolved "http://registry.npm.taobao.org/stream-http/download/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
- integrity sha1-stJCRpKIpaJ+xP6JM6z2I95lFPw=
- dependencies:
- builtin-status-codes "^3.0.0"
- inherits "^2.0.1"
- readable-stream "^2.3.6"
- to-arraybuffer "^1.0.0"
- xtend "^4.0.0"
-
-stream-shift@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/stream-shift/download/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
- integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
-
-string-convert@^0.2.0:
- version "0.2.1"
- resolved "https://registry.yarnpkg.com/string-convert/-/string-convert-0.2.1.tgz#6982cc3049fbb4cd85f8b24568b9d9bf39eeff97"
- integrity sha1-aYLMMEn7tM2F+LJFaLnZvznu/5c=
-
-string-width@^1.0.1, string-width@^1.0.2:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/string-width/download/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
- integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
- dependencies:
- code-point-at "^1.0.0"
- is-fullwidth-code-point "^1.0.0"
- strip-ansi "^3.0.0"
-
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
- integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
- dependencies:
- is-fullwidth-code-point "^2.0.0"
- strip-ansi "^4.0.0"
-
-string-width@^3.0.0:
- version "3.1.0"
- resolved "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
- integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
- dependencies:
- emoji-regex "^7.0.1"
- is-fullwidth-code-point "^2.0.0"
- strip-ansi "^5.1.0"
-
-string.prototype.padend@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0"
- integrity sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=
- dependencies:
- define-properties "^1.1.2"
- es-abstract "^1.4.3"
- function-bind "^1.0.2"
-
-string.prototype.padstart@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/string.prototype.padstart/-/string.prototype.padstart-3.0.0.tgz#5bcfad39f4649bb2d031292e19bcf0b510d4b242"
- integrity sha1-W8+tOfRkm7LQMSkuGbzwtRDUskI=
- dependencies:
- define-properties "^1.1.2"
- es-abstract "^1.4.3"
- function-bind "^1.0.2"
-
-string.prototype.trim@~1.1.2:
- version "1.1.2"
- resolved "http://registry.npm.taobao.org/string.prototype.trim/download/string.prototype.trim-1.1.2.tgz#d04de2c89e137f4d7d206f086b5ed2fae6be8cea"
- integrity sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=
- dependencies:
- define-properties "^1.1.2"
- es-abstract "^1.5.0"
- function-bind "^1.0.2"
-
-string_decoder@^1.0.0, string_decoder@^1.1.1:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/string_decoder/download/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
- integrity sha1-/obnOLGVRK/nBGkkOyoe6SQOro0=
- dependencies:
- safe-buffer "~5.1.0"
-
-string_decoder@~0.10.x:
- version "0.10.31"
- resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
- integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
-
-string_decoder@~1.1.1:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/string_decoder/download/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
- integrity sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=
- dependencies:
- safe-buffer "~5.1.0"
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
- version "3.0.1"
- resolved "http://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
- integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
- dependencies:
- ansi-regex "^2.0.0"
-
-strip-ansi@^4.0.0:
- version "4.0.0"
- resolved "http://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
- integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
- dependencies:
- ansi-regex "^3.0.0"
-
-strip-ansi@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
- integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==
- dependencies:
- ansi-regex "^4.0.0"
-
-strip-ansi@^5.1.0:
- version "5.1.0"
- resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.1.0.tgz#55aaa54e33b4c0649a7338a43437b1887d153ec4"
- integrity sha512-TjxrkPONqO2Z8QDCpeE2j6n0M6EwxzyDgzEeGp+FbdvaJAt//ClYi6W5my+3ROlC/hZX2KACUwDfK49Ka5eDvg==
- dependencies:
- ansi-regex "^4.1.0"
-
-strip-bom@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/strip-bom/download/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
- integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
- dependencies:
- is-utf8 "^0.2.0"
-
-strip-bom@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
- integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
-
-strip-eof@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
- integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
-
-strip-indent@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/strip-indent/download/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
- integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
- dependencies:
- get-stdin "^4.0.1"
-
-strip-indent@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
- integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=
-
-strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
- version "2.0.1"
- resolved "http://registry.npm.taobao.org/strip-json-comments/download/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
- integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
-style-loader@^0.23.1:
- version "0.23.1"
- resolved "http://registry.npm.taobao.org/style-loader/download/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925"
- integrity sha1-y5FUYG8+dxq2xKtjcCahBJF02SU=
- dependencies:
- loader-utils "^1.1.0"
- schema-utils "^1.0.0"
-
-stylehacks@^4.0.0:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.1.tgz#3186595d047ab0df813d213e51c8b94e0b9010f2"
- integrity sha512-TK5zEPeD9NyC1uPIdjikzsgWxdQQN/ry1X3d1iOz1UkYDCmcr928gWD1KHgyC27F50UnE0xCTrBOO1l6KR8M4w==
- dependencies:
- browserslist "^4.0.0"
- postcss "^7.0.0"
- postcss-selector-parser "^3.0.0"
-
-supports-color@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/supports-color/download/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
- integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
-supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0:
- version "5.5.0"
- resolved "http://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
- integrity sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=
- dependencies:
- has-flag "^3.0.0"
-
-supports-color@^6.1.0:
- version "6.1.0"
- resolved "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
- integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
- dependencies:
- has-flag "^3.0.0"
-
-svg-tags@^1.0.0:
- version "1.0.0"
- resolved "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
- integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=
-
-svg.draggable.js@^2.2.1:
- version "2.2.2"
- resolved "https://registry.npmjs.org/svg.draggable.js/-/svg.draggable.js-2.2.2.tgz#c514a2f1405efb6f0263e7958f5b68fce50603ba"
- integrity sha512-JzNHBc2fLQMzYCZ90KZHN2ohXL0BQJGQimK1kGk6AvSeibuKcIdDX9Kr0dT9+UJ5O8nYA0RB839Lhvk4CY4MZw==
- dependencies:
- svg.js "^2.0.1"
-
-svg.easing.js@^2.0.0:
- version "2.0.0"
- resolved "https://registry.npmjs.org/svg.easing.js/-/svg.easing.js-2.0.0.tgz#8aa9946b0a8e27857a5c40a10eba4091e5691f12"
- integrity sha1-iqmUawqOJ4V6XEChDrpAkeVpHxI=
- dependencies:
- svg.js ">=2.3.x"
-
-svg.filter.js@^2.0.2:
- version "2.0.2"
- resolved "https://registry.npmjs.org/svg.filter.js/-/svg.filter.js-2.0.2.tgz#91008e151389dd9230779fcbe6e2c9a362d1c203"
- integrity sha1-kQCOFROJ3ZIwd5/L5uLJo2LRwgM=
- dependencies:
- svg.js "^2.2.5"
-
-svg.js@>=2.3.x, svg.js@^2.0.1, svg.js@^2.2.5, svg.js@^2.4.0, svg.js@^2.6.5, svg.js@^2.6.6:
- version "2.7.1"
- resolved "https://registry.npmjs.org/svg.js/-/svg.js-2.7.1.tgz#eb977ed4737001eab859949b4a398ee1bb79948d"
- integrity sha512-ycbxpizEQktk3FYvn/8BH+6/EuWXg7ZpQREJvgacqn46gIddG24tNNe4Son6omdXCnSOaApnpZw6MPCBA1dODA==
-
-svg.pathmorphing.js@^0.1.3:
- version "0.1.3"
- resolved "https://registry.npmjs.org/svg.pathmorphing.js/-/svg.pathmorphing.js-0.1.3.tgz#c25718a1cc7c36e852ecabc380e758ac09bb2b65"
- integrity sha512-49HWI9X4XQR/JG1qXkSDV8xViuTLIWm/B/7YuQELV5KMOPtXjiwH4XPJvr/ghEDibmLQ9Oc22dpWpG0vUDDNww==
- dependencies:
- svg.js "^2.4.0"
-
-svg.resize.js@^1.4.1:
- version "1.4.3"
- resolved "https://registry.npmjs.org/svg.resize.js/-/svg.resize.js-1.4.3.tgz#885abd248e0cd205b36b973c4b578b9a36f23332"
- integrity sha512-9k5sXJuPKp+mVzXNvxz7U0uC9oVMQrrf7cFsETznzUDDm0x8+77dtZkWdMfRlmbkEEYvUn9btKuZ3n41oNA+uw==
- dependencies:
- svg.js "^2.6.5"
- svg.select.js "^2.1.2"
-
-svg.select.js@^2.1.2:
- version "2.1.2"
- resolved "https://registry.npmjs.org/svg.select.js/-/svg.select.js-2.1.2.tgz#e41ce13b1acff43a7441f9f8be87a2319c87be73"
- integrity sha512-tH6ABEyJsAOVAhwcCjF8mw4crjXSI1aa7j2VQR8ZuJ37H2MBUbyeqYr5nEO7sSN3cy9AR9DUwNg0t/962HlDbQ==
- dependencies:
- svg.js "^2.2.5"
-
-svgo@^1.0.0:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.1.1.tgz#12384b03335bcecd85cfa5f4e3375fed671cb985"
- integrity sha512-GBkJbnTuFpM4jFbiERHDWhZc/S/kpHToqmZag3aEBjPYK44JAN2QBjvrGIxLOoCyMZjuFQIfTO2eJd8uwLY/9g==
- dependencies:
- coa "~2.0.1"
- colors "~1.1.2"
- css-select "^2.0.0"
- css-select-base-adapter "~0.1.0"
- css-tree "1.0.0-alpha.28"
- css-url-regex "^1.1.0"
- csso "^3.5.0"
- js-yaml "^3.12.0"
- mkdirp "~0.5.1"
- object.values "^1.0.4"
- sax "~1.2.4"
- stable "~0.1.6"
- unquote "~1.1.1"
- util.promisify "~1.0.0"
-
-table@4.0.2:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
- integrity sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==
- dependencies:
- ajv "^5.2.3"
- ajv-keywords "^2.1.0"
- chalk "^2.1.0"
- lodash "^4.17.4"
- slice-ansi "1.0.0"
- string-width "^2.1.1"
-
-table@^5.2.3:
- version "5.2.3"
- resolved "https://registry.npmjs.org/table/-/table-5.2.3.tgz#cde0cc6eb06751c009efab27e8c820ca5b67b7f2"
- integrity sha512-N2RsDAMvDLvYwFcwbPyF3VmVSSkuF+G1e+8inhBLtHpvwXGw4QRPEZhihQNeEN0i1up6/f6ObCJXNdlRG3YVyQ==
- dependencies:
- ajv "^6.9.1"
- lodash "^4.17.11"
- slice-ansi "^2.1.0"
- string-width "^3.0.0"
-
-tapable@^1.0.0, tapable@^1.1.0:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/tapable/download/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e"
- integrity sha1-TSl5I8WnKkI2DeKrUtrfquwAAY4=
-
-tape@^4.5.1:
- version "4.9.1"
- resolved "http://registry.npm.taobao.org/tape/download/tape-4.9.1.tgz#1173d7337e040c76fbf42ec86fcabedc9b3805c9"
- integrity sha1-EXPXM34EDHb79C7Ib8q+3Js4Bck=
- dependencies:
- deep-equal "~1.0.1"
- defined "~1.0.0"
- for-each "~0.3.3"
- function-bind "~1.1.1"
- glob "~7.1.2"
- has "~1.0.3"
- inherits "~2.0.3"
- minimist "~1.2.0"
- object-inspect "~1.6.0"
- resolve "~1.7.1"
- resumer "~0.0.0"
- string.prototype.trim "~1.1.2"
- through "~2.3.8"
-
-tar@^2.0.0:
- version "2.2.1"
- resolved "http://registry.npm.taobao.org/tar/download/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
- integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
- dependencies:
- block-stream "*"
- fstream "^1.0.2"
- inherits "2"
-
-tar@^4:
- version "4.4.8"
- resolved "http://registry.npm.taobao.org/tar/download/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
- integrity sha1-sZ7sP94qluZGZt+f20DFyhvDdH0=
- dependencies:
- chownr "^1.1.1"
- fs-minipass "^1.2.5"
- minipass "^2.3.4"
- minizlib "^1.1.1"
- mkdirp "^0.5.0"
- safe-buffer "^5.1.2"
- yallist "^3.0.2"
-
-terser-webpack-plugin@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.1.0.tgz#cf7c25a1eee25bf121f4a587bb9e004e3f80e528"
- integrity sha512-61lV0DSxMAZ8AyZG7/A4a3UPlrbOBo8NIQ4tJzLPAdGOQ+yoNC7l5ijEow27lBAL2humer01KLS6bGIMYQxKoA==
- dependencies:
- cacache "^11.0.2"
- find-cache-dir "^2.0.0"
- schema-utils "^1.0.0"
- serialize-javascript "^1.4.0"
- source-map "^0.6.1"
- terser "^3.8.1"
- webpack-sources "^1.1.0"
- worker-farm "^1.5.2"
-
-terser-webpack-plugin@^1.2.2:
- version "1.2.3"
- resolved "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz#3f98bc902fac3e5d0de730869f50668561262ec8"
- integrity sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==
- dependencies:
- cacache "^11.0.2"
- find-cache-dir "^2.0.0"
- schema-utils "^1.0.0"
- serialize-javascript "^1.4.0"
- source-map "^0.6.1"
- terser "^3.16.1"
- webpack-sources "^1.1.0"
- worker-farm "^1.5.2"
-
-terser@^3.16.1:
- version "3.16.1"
- resolved "https://registry.npmjs.org/terser/-/terser-3.16.1.tgz#5b0dd4fa1ffd0b0b43c2493b2c364fd179160493"
- integrity sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==
- dependencies:
- commander "~2.17.1"
- source-map "~0.6.1"
- source-map-support "~0.5.9"
-
-terser@^3.8.1:
- version "3.11.0"
- resolved "https://registry.yarnpkg.com/terser/-/terser-3.11.0.tgz#60782893e1f4d6788acc696351f40636d0e37af0"
- integrity sha512-5iLMdhEPIq3zFWskpmbzmKwMQixKmTYwY3Ox9pjtSklBLnHiuQ0GKJLhL1HSYtyffHM3/lDIFBnb82m9D7ewwQ==
- dependencies:
- commander "~2.17.1"
- source-map "~0.6.1"
- source-map-support "~0.5.6"
-
-text-table@^0.2.0, text-table@~0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
- integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
-
-thread-loader@^2.1.2:
- version "2.1.2"
- resolved "https://registry.npmjs.org/thread-loader/-/thread-loader-2.1.2.tgz#f585dd38e852c7f9cded5d092992108148f5eb30"
- integrity sha512-7xpuc9Ifg6WU+QYw/8uUqNdRwMD+N5gjwHKMqETrs96Qn+7BHwECpt2Brzr4HFlf4IAkZsayNhmGdbkBsTJ//w==
- dependencies:
- loader-runner "^2.3.1"
- loader-utils "^1.1.0"
- neo-async "^2.6.0"
-
-through2@^2.0.0:
- version "2.0.5"
- resolved "http://registry.npm.taobao.org/through2/download/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
- integrity sha1-AcHjnrMdB8t9A6lqcIIyYLIxMs0=
- dependencies:
- readable-stream "~2.3.6"
- xtend "~4.0.1"
-
-through@^2.3.6, through@~2.3.4, through@~2.3.8:
- version "2.3.8"
- resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
- integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
-
-thunky@^1.0.2:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826"
- integrity sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==
-
-timers-browserify@^2.0.4:
- version "2.0.10"
- resolved "http://registry.npm.taobao.org/timers-browserify/download/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
- integrity sha1-HSjj0qrfHVpZlsTp+VYBzQU0gK4=
- dependencies:
- setimmediate "^1.0.4"
-
-timsort@^0.3.0:
- version "0.3.0"
- resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
- integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
-
-tinycolor2@^1.4.1:
- version "1.4.1"
- resolved "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"
- integrity sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=
-
-tinymce@^5.0.2:
- version "5.0.3"
- resolved "https://registry.npmjs.org/tinymce/-/tinymce-5.0.3.tgz#40fa8658b5bdf58e7f04c816b38e1b06f96f6cfe"
- integrity sha512-x7D0ttqn176Z4CWQIITMjcEtMGUjiaK0Y2FN2vO8DiyUeIHCdr70jJDSoGhuXtXX70Sw4Bd5UFfqIn/bG3HXcg==
-
-tmp@^0.0.33:
- version "0.0.33"
- resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
- integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
- dependencies:
- os-tmpdir "~1.0.2"
-
-to-arraybuffer@^1.0.0:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/to-arraybuffer/download/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
- integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
-
-to-fast-properties@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/to-fast-properties/download/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
- integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
-
-to-object-path@^0.3.0:
- version "0.3.0"
- resolved "http://registry.npm.taobao.org/to-object-path/download/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
- integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
- dependencies:
- kind-of "^3.0.2"
-
-to-regex-range@^2.1.0:
- version "2.1.1"
- resolved "http://registry.npm.taobao.org/to-regex-range/download/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
- integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
- dependencies:
- is-number "^3.0.0"
- repeat-string "^1.6.1"
-
-to-regex@^3.0.1, to-regex@^3.0.2:
- version "3.0.2"
- resolved "http://registry.npm.taobao.org/to-regex/download/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
- integrity sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=
- dependencies:
- define-property "^2.0.2"
- extend-shallow "^3.0.2"
- regex-not "^1.0.2"
- safe-regex "^1.1.0"
-
-topo@3.x.x:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/topo/-/topo-3.0.0.tgz#37e48c330efeac784538e0acd3e62ca5e231fe7a"
- integrity sha512-Tlu1fGlR90iCdIPURqPiufqAlCZYzLjHYVVbcFWDMcX7+tK8hdZWAfsMrD/pBul9jqHHwFjNdf1WaxA9vTRRhw==
- dependencies:
- hoek "5.x.x"
-
-topojson-client@~3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/topojson-client/-/topojson-client-3.0.0.tgz#1f99293a77ef42a448d032a81aa982b73f360d2f"
- integrity sha1-H5kpOnfvQqRI0DKoGqmCtz82DS8=
- dependencies:
- commander "2"
-
-toposort@^1.0.0:
- version "1.0.7"
- resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
- integrity sha1-LmhELZ9k7HILjMieZEOsbKqVACk=
-
-tough-cookie@^2.3.3:
- version "2.5.0"
- resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
- integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
- dependencies:
- psl "^1.1.28"
- punycode "^2.1.1"
-
-tough-cookie@~2.4.3:
- version "2.4.3"
- resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
- integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
- dependencies:
- psl "^1.1.24"
- punycode "^1.4.1"
-
-trim-newlines@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/trim-newlines/download/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
- integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
-
-trim-right@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/trim-right/download/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
- integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
-
-"true-case-path@^1.0.2":
- version "1.0.3"
- resolved "http://registry.npm.taobao.org/true-case-path/download/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
- integrity sha1-+BO1qMhrQNpZYGcisUTjIleZ9H0=
- dependencies:
- glob "^7.1.2"
-
-tryer@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
- integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==
-
-tslib@^1.9.0:
- version "1.9.3"
- resolved "http://registry.npm.taobao.org/tslib/download/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
- integrity sha1-1+TdeSRdhUKMTX5IIqeZF5VMooY=
-
-tty-browserify@0.0.0:
- version "0.0.0"
- resolved "http://registry.npm.taobao.org/tty-browserify/download/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
- integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
-
-tunnel-agent@^0.6.0:
- version "0.6.0"
- resolved "http://registry.npm.taobao.org/tunnel-agent/download/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
- integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
- dependencies:
- safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
- version "0.14.5"
- resolved "http://registry.npm.taobao.org/tweetnacl/download/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
- integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-
-type-check@~0.3.2:
- version "0.3.2"
- resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
- integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
- dependencies:
- prelude-ls "~1.1.2"
-
-type-is@~1.6.16:
- version "1.6.16"
- resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
- integrity sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==
- dependencies:
- media-typer "0.3.0"
- mime-types "~2.1.18"
-
-typedarray@^0.0.6:
- version "0.0.6"
- resolved "http://registry.npm.taobao.org/typedarray/download/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
- integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-
-uglify-js@3.4.x:
- version "3.4.9"
- resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
- integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
- dependencies:
- commander "~2.17.1"
- source-map "~0.6.1"
-
-uglify-js@^2.6.2:
- version "2.8.29"
- resolved "http://registry.npm.taobao.org/uglify-js/download/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
- integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0=
- dependencies:
- source-map "~0.5.1"
- yargs "~3.10.0"
- optionalDependencies:
- uglify-to-browserify "~1.0.0"
-
-uglify-to-browserify@~1.0.0:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/uglify-to-browserify/download/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
- integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
-
-unicode-canonical-property-names-ecmascript@^1.0.4:
- version "1.0.4"
- resolved "http://registry.npm.taobao.org/unicode-canonical-property-names-ecmascript/download/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
- integrity sha1-JhmADEyCWADv3YNDr33Zkzy+KBg=
-
-unicode-match-property-ecmascript@^1.0.4:
- version "1.0.4"
- resolved "http://registry.npm.taobao.org/unicode-match-property-ecmascript/download/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
- integrity sha1-jtKjJWmWG86SJ9Cc0/+7j+1fAgw=
- dependencies:
- unicode-canonical-property-names-ecmascript "^1.0.4"
- unicode-property-aliases-ecmascript "^1.0.4"
-
-unicode-match-property-value-ecmascript@^1.0.2:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/unicode-match-property-value-ecmascript/download/unicode-match-property-value-ecmascript-1.0.2.tgz#9f1dc76926d6ccf452310564fd834ace059663d4"
- integrity sha1-nx3HaSbWzPRSMQVk/YNKzgWWY9Q=
-
-unicode-property-aliases-ecmascript@^1.0.4:
- version "1.0.4"
- resolved "http://registry.npm.taobao.org/unicode-property-aliases-ecmascript/download/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0"
- integrity sha1-WlM/MbQxfqdvF9gH+g0RZUYRHdA=
-
-union-value@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/union-value/download/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
- integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
- dependencies:
- arr-union "^3.1.0"
- get-value "^2.0.6"
- is-extendable "^0.1.1"
- set-value "^0.4.3"
-
-uniq@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
- integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
-
-uniqs@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
- integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI=
-
-unique-filename@^1.1.0:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/unique-filename/download/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
- integrity sha1-HWl2k2mtoFgxA6HmrodoG1ZXMjA=
- dependencies:
- unique-slug "^2.0.0"
-
-unique-slug@^2.0.0:
- version "2.0.1"
- resolved "http://registry.npm.taobao.org/unique-slug/download/unique-slug-2.0.1.tgz#5e9edc6d1ce8fb264db18a507ef9bd8544451ca6"
- integrity sha1-Xp7cbRzo+yZNsYpQfvm9hURFHKY=
- dependencies:
- imurmurhash "^0.1.4"
-
-universalify@^0.1.0:
- version "0.1.2"
- resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
- integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-
-unpipe@1.0.0, unpipe@~1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
- integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
-
-unquote@~1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544"
- integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=
-
-unset-value@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/unset-value/download/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
- integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
- dependencies:
- has-value "^0.3.1"
- isobject "^3.0.0"
-
-upath@^1.0.5:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/upath/download/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
- integrity sha1-NSVll+RqWB20eT0M5H+prr/J+r0=
-
-upper-case@^1.1.1:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
- integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
-
-uri-js@^4.2.2:
- version "4.2.2"
- resolved "http://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
- integrity sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=
- dependencies:
- punycode "^2.1.0"
-
-urix@^0.1.0:
- version "0.1.0"
- resolved "http://registry.npm.taobao.org/urix/download/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
- integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-
-url-loader@^1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-1.1.2.tgz#b971d191b83af693c5e3fea4064be9e1f2d7f8d8"
- integrity sha512-dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg==
- dependencies:
- loader-utils "^1.1.0"
- mime "^2.0.3"
- schema-utils "^1.0.0"
-
-url-parse@^1.4.3:
- version "1.4.3"
- resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.3.tgz#bfaee455c889023219d757e045fa6a684ec36c15"
- integrity sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==
- dependencies:
- querystringify "^2.0.0"
- requires-port "^1.0.0"
-
-url@^0.11.0:
- version "0.11.0"
- resolved "http://registry.npm.taobao.org/url/download/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
- integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
- dependencies:
- punycode "1.3.2"
- querystring "0.2.0"
-
-use@^3.1.0:
- version "3.1.1"
- resolved "http://registry.npm.taobao.org/use/download/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
- integrity sha1-1QyMrHmhn7wg8pEfVuuXP04QBw8=
-
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/util-deprecate/download/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
- integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
-util.promisify@1.0.0, util.promisify@^1.0.0, util.promisify@~1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/util.promisify/download/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
- integrity sha1-RA9xZaRZyaFtwUXrjnLzVocJcDA=
- dependencies:
- define-properties "^1.1.2"
- object.getownpropertydescriptors "^2.0.3"
-
-util@0.10.3:
- version "0.10.3"
- resolved "http://registry.npm.taobao.org/util/download/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
- integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
- dependencies:
- inherits "2.0.1"
-
-util@^0.10.3:
- version "0.10.4"
- resolved "http://registry.npm.taobao.org/util/download/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
- integrity sha1-OqASW/5mikZy3liFfTrOJ+y3aQE=
- dependencies:
- inherits "2.0.3"
-
-utila@^0.4.0, utila@~0.4:
- version "0.4.0"
- resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
- integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=
-
-utils-merge@1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
- integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
-
-uuid@^3.0.1, uuid@^3.3.2:
- version "3.3.2"
- resolved "http://registry.npm.taobao.org/uuid/download/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
- integrity sha1-G0r0lV6zB3xQHCOHL8ZROBFYcTE=
-
-validate-npm-package-license@^3.0.1:
- version "3.0.4"
- resolved "http://registry.npm.taobao.org/validate-npm-package-license/download/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
- integrity sha1-/JH2uce6FchX9MssXe/uw51PQQo=
- dependencies:
- spdx-correct "^3.0.0"
- spdx-expression-parse "^3.0.0"
-
-vary@~1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
- integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
-
-vendors@^1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.2.tgz#7fcb5eef9f5623b156bcea89ec37d63676f21801"
- integrity sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==
-
-venn.js@~0.2.20:
- version "0.2.20"
- resolved "http://registry.npm.taobao.org/venn.js/download/venn.js-0.2.20.tgz#3f0e50cc75cba1f58692a8a32f67bd7aaf1aa6fa"
- integrity sha1-Pw5QzHXLofWGkqijL2e9eq8apvo=
- dependencies:
- d3-selection "^1.0.2"
- d3-transition "^1.0.1"
- fmin "0.0.2"
-
-verror@1.10.0:
- version "1.10.0"
- resolved "http://registry.npm.taobao.org/verror/download/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
- integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
- dependencies:
- assert-plus "^1.0.0"
- core-util-is "1.0.2"
- extsprintf "^1.2.0"
-
-viser-vue@^2.4.4:
- version "2.4.5"
- resolved "https://registry.npmjs.org/viser-vue/-/viser-vue-2.4.5.tgz#77318bb32113c5c10868c85c79cbbbff4a16d394"
- integrity sha512-wSs07wKqsYj9hBzRLqSb87ytfnZrpP/KXQ54bMcjjrX+/ubSLoj1cVEoQcU9ivLy0KUTi1mANHQPA2i9q8UVTQ==
- dependencies:
- "@types/node" "*"
- viser "^2.0.0"
- vue "^2.5.3"
-
-viser@^2.0.0:
- version "2.4.2"
- resolved "http://registry.npm.taobao.org/viser/download/viser-2.4.2.tgz#9c145fdf7d6510e8da2b2886ed29d3c3ebe3cccd"
- integrity sha1-nBRf331lEOjaKyiG7SnTw+vjzM0=
- dependencies:
- "@antv/g2" "^3.3.0"
- "@antv/g2-brush" "^0.0.2"
- "@antv/g2-plugin-slider" "^2.1.0"
- "@types/d3-format" "*"
- "@types/lodash" "*"
- "@types/node" "^8.0.53"
- d3-format "^1.3.0"
- lodash "^4.17.4"
-
-vm-browserify@0.0.4:
- version "0.0.4"
- resolved "http://registry.npm.taobao.org/vm-browserify/download/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
- integrity sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=
- dependencies:
- indexof "0.0.1"
-
-vue-apexcharts@^1.3.2:
- version "1.3.2"
- resolved "https://registry.npmjs.org/vue-apexcharts/-/vue-apexcharts-1.3.2.tgz#f4c0475146d39a668983e7311244987da4a35176"
- integrity sha512-3a3v6FKUlpD3BHWiDhuN/7Jcho9pE3+r6PEUccdzfpRFj0jn9W+zAHtaiKrdbBsTqXPKDfbd4dkT25SvBo/cxw==
-
-vue-class-component@^6.0.0, vue-class-component@^6.2.0:
- version "6.3.2"
- resolved "https://registry.npmjs.org/vue-class-component/-/vue-class-component-6.3.2.tgz#e6037e84d1df2af3bde4f455e50ca1b9eec02be6"
- integrity sha512-cH208IoM+jgZyEf/g7mnFyofwPDJTM/QvBNhYMjqGB8fCsRyTf68rH2ISw/G20tJv+5mIThQ3upKwoL4jLTr1A==
-
-vue-cropper@^0.4.8:
- version "0.4.8"
- resolved "https://registry.npmjs.org/vue-cropper/-/vue-cropper-0.4.8.tgz#9bd26a93335cded988d135d9f25575a61a9fb795"
- integrity sha512-xS+23lhyZvTSExmsO3x14lXra5xmykEoAy6iyjLiXH+5l+koP3F+aP8EjJmT9hGOvT5b8fVu9nts9pHAeXb78w==
- dependencies:
- "@babel/core" "^7.1.2"
- "@babel/plugin-transform-runtime" "^7.1.0"
- "@babel/preset-env" "^7.1.0"
- babel-loader "^8.0.0-beta.0"
- babel-plugin-transform-runtime "^6.23.0"
- babel-runtime "^6.26.0"
- css-loader "^1.0.0"
- style-loader "^0.23.1"
- vue "^2.5.17"
- vue-template-compiler "^2.5.17"
- webpack "^4.20.2"
-
-vue-eslint-parser@^2.0.3:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1"
- integrity sha512-ZezcU71Owm84xVF6gfurBQUGg8WQ+WZGxgDEQu1IHFBZNx7BFZg3L1yHxrCBNNwbwFtE1GuvfJKMtb6Xuwc/Bw==
- dependencies:
- debug "^3.1.0"
- eslint-scope "^3.7.1"
- eslint-visitor-keys "^1.0.0"
- espree "^3.5.2"
- esquery "^1.0.0"
- lodash "^4.17.4"
-
-vue-eslint-parser@^5.0.0:
- version "5.0.0"
- resolved "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-5.0.0.tgz#00f4e4da94ec974b821a26ff0ed0f7a78402b8a1"
- integrity sha512-JlHVZwBBTNVvzmifwjpZYn0oPWH2SgWv5dojlZBsrhablDu95VFD+hriB1rQGwbD+bms6g+rAFhQHk6+NyiS6g==
- dependencies:
- debug "^4.1.0"
- eslint-scope "^4.0.0"
- eslint-visitor-keys "^1.0.0"
- espree "^4.1.0"
- esquery "^1.0.1"
- lodash "^4.17.11"
-
-vue-hot-reload-api@^2.3.0:
- version "2.3.1"
- resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.1.tgz#b2d3d95402a811602380783ea4f566eb875569a2"
- integrity sha512-AA86yKZ5uOKz87/q1UpngEXhbRkaYg1b7HMMVRobNV1IVKqZe8oLIzo6iMocVwZXnYitlGwf2k4ZRLOZlS8oPQ==
-
-vue-i18n@^8.7.0:
- version "8.9.0"
- resolved "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.9.0.tgz#5f084001fe5b4c7ad8c00ee5f11396a88ff2e55b"
- integrity sha512-8wr/D9yU8CLC8ne9stdQn/N58E7GRSUSO75bCucj2AIFTDyjGfoze5RxFvh2w3e7yxgnz5x+ooOIcoX59PHguQ==
-
-vue-loader@^15.6.4:
- version "15.7.0"
- resolved "https://registry.npmjs.org/vue-loader/-/vue-loader-15.7.0.tgz#27275aa5a3ef4958c5379c006dd1436ad04b25b3"
- integrity sha512-x+NZ4RIthQOxcFclEcs8sXGEWqnZHodL2J9Vq+hUz+TDZzBaDIh1j3d9M2IUlTjtrHTZy4uMuRdTi8BGws7jLA==
- dependencies:
- "@vue/component-compiler-utils" "^2.5.1"
- hash-sum "^1.0.2"
- loader-utils "^1.1.0"
- vue-hot-reload-api "^2.3.0"
- vue-style-loader "^4.1.0"
-
-vue-ls@^3.2.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/vue-ls/-/vue-ls-3.2.0.tgz#33356ad3ec9c30dac203757cf4036abe4ff767b3"
- integrity sha512-39FGQMrT9NbG5WGDJfxWj19ZD1tsVoBBN1n8qvq6/+uRB9BansQ9NSyclQ9TzZatRkkM/VEQo5oTsijdM5hGFw==
-
-vue-print-nb-jeecg@^1.0.5:
- version "1.0.5"
- resolved "https://registry.npmjs.org/vue-print-nb-jeecg/-/vue-print-nb-jeecg-1.0.5.tgz#d426d3c11aef1a2decdc0dcbd5564e92f9dfe0dc"
- integrity sha512-ErmPhIlo2/jqfe69f1Ds3bUcQJQo62pOneqrfPSHUkMi5bChQdx6m/ZEuqdRS3MT6ipZbQeEa4WrnNNyi6MSyA==
- dependencies:
- babel-plugin-transform-runtime "^6.23.0"
-
-vue-property-decorator@^7.3.0:
- version "7.3.0"
- resolved "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-7.3.0.tgz#d50d67f0b0f1c814f9f2fba36d6eeccbcc62dbb6"
- integrity sha512-HarXfTQ/Nxm4s/APpAaGIGHq5ZzslApImQy8ZrtkfGamw8rUFAVgMS5C50/AQ80+wfw3Wpnf4bNzbmj75m/k2Q==
- dependencies:
- vue-class-component "^6.2.0"
-
-vue-ref@^1.0.4:
- version "1.0.6"
- resolved "https://registry.npmjs.org/vue-ref/-/vue-ref-1.0.6.tgz#b9b3d7d0e290ee2fd3d50d5d7bdac520806cb265"
- integrity sha512-UzD8t1CG+aoWVOOpGd5KcaCNtCgUc0byaKhJMH+6N7H/p1ThVkYl/VCt7DmCrdhUlzZK+hT5JPTKAdrbWi0nNw==
-
-vue-router@^3.0.1:
- version "3.0.2"
- resolved "http://registry.npm.taobao.org/vue-router/download/vue-router-3.0.2.tgz#dedc67afe6c4e2bc25682c8b1c2a8c0d7c7e56be"
- integrity sha1-3txnr+bE4rwlaCyLHCqMDXx+Vr4=
-
-vue-style-loader@^4.1.0:
- version "4.1.2"
- resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.2.tgz#dedf349806f25ceb4e64f3ad7c0a44fba735fcf8"
- integrity sha512-0ip8ge6Gzz/Bk0iHovU9XAUQaFt/G2B61bnWa2tCcqqdgfHs1lF9xXorFbE55Gmy92okFT+8bfmySuUOu13vxQ==
- dependencies:
- hash-sum "^1.0.2"
- loader-utils "^1.0.2"
-
-vue-template-compiler@^2.5.17:
- version "2.5.17"
- resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.17.tgz#52a4a078c327deb937482a509ae85c06f346c3cb"
- integrity sha512-63uI4syCwtGR5IJvZM0LN5tVsahrelomHtCxvRkZPJ/Tf3ADm1U1wG6KWycK3qCfqR+ygM5vewUvmJ0REAYksg==
- dependencies:
- de-indent "^1.0.2"
- he "^1.1.0"
-
-vue-template-compiler@^2.5.22:
- version "2.6.8"
- resolved "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.8.tgz#750802604595134775b9c53141b9850b35255e1c"
- integrity sha512-SwWKANE5ee+oJg+dEJmsdxsxWYICPsNwk68+1AFjOS8l0O/Yz2845afuJtFqf3UjS/vXG7ECsPeHHEAD65Cjng==
- dependencies:
- de-indent "^1.0.2"
- he "^1.1.0"
-
-vue-template-es2015-compiler@^1.9.0:
- version "1.9.1"
- resolved "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
- integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
-
-vue@^2.5.17, vue@^2.5.3:
- version "2.5.17"
- resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.17.tgz#0f8789ad718be68ca1872629832ed533589c6ada"
- integrity sha512-mFbcWoDIJi0w0Za4emyLiW72Jae0yjANHbCVquMKijcavBGypqlF7zHRgMa5k4sesdv7hv2rB4JPdZfR+TPfhQ==
-
-vue@^2.5.22:
- version "2.6.8"
- resolved "https://registry.npmjs.org/vue/-/vue-2.6.8.tgz#f21cbc536bfc14f7d1d792a137bb12f69e60ea91"
- integrity sha512-+vp9lEC2Kt3yom673pzg1J7T1NVGuGzO9j8Wxno+rQN2WYVBX2pyo/RGQ3fXCLh2Pk76Skw/laAPCuBuEQ4diw==
-
-vuex-class@^0.3.1:
- version "0.3.1"
- resolved "https://registry.npmjs.org/vuex-class/-/vuex-class-0.3.1.tgz#3c0b946bcff4cf2be1904de5b0cab1a3dd5c41d5"
- integrity sha512-d7Hc+ItQx6p9E/2mEWiyrvyEuo7Uj0mq4VNImd7dmxTelnkhOavKPMEG1Xdypug2RlPEYv0920IOa3hdVZ+4AA==
-
-vuex@^3.0.1:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.0.1.tgz#e761352ebe0af537d4bb755a9b9dc4be3df7efd2"
- integrity sha512-wLoqz0B7DSZtgbWL1ShIBBCjv22GV5U+vcBFox658g6V0s4wZV9P4YjCNyoHSyIBpj1f29JBoNQIqD82cR4O3w==
-
-warning@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
- integrity sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=
- dependencies:
- loose-envify "^1.0.0"
-
-watchpack@^1.5.0:
- version "1.6.0"
- resolved "http://registry.npm.taobao.org/watchpack/download/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
- integrity sha1-S8EsLr6KonenHx0/FNaFx7RGzQA=
- dependencies:
- chokidar "^2.0.2"
- graceful-fs "^4.1.2"
- neo-async "^2.5.0"
-
-wbuf@^1.1.0, wbuf@^1.7.3:
- version "1.7.3"
- resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
- integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
- dependencies:
- minimalistic-assert "^1.0.0"
-
-wcwidth@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
- integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
- dependencies:
- defaults "^1.0.3"
-
-webpack-bundle-analyzer@^3.0.4:
- version "3.1.0"
- resolved "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.1.0.tgz#2f19cbb87bb6d4f3cb4e59cb67c837bd9436e89d"
- integrity sha512-nyDyWEs7C6DZlgvu1pR1zzJfIWSiGPbtaByZr8q+Fd2xp70FuM/8ngCJzj3Er1TYRLSFmp1F1OInbEm4DZH8NA==
- dependencies:
- acorn "^6.0.7"
- acorn-walk "^6.1.1"
- bfj "^6.1.1"
- chalk "^2.4.1"
- commander "^2.18.0"
- ejs "^2.6.1"
- express "^4.16.3"
- filesize "^3.6.1"
- gzip-size "^5.0.0"
- lodash "^4.17.10"
- mkdirp "^0.5.1"
- opener "^1.5.1"
- ws "^6.0.0"
-
-webpack-chain@^4.11.0:
- version "4.12.1"
- resolved "https://registry.yarnpkg.com/webpack-chain/-/webpack-chain-4.12.1.tgz#6c8439bbb2ab550952d60e1ea9319141906c02a6"
- integrity sha512-BCfKo2YkDe2ByqkEWe1Rw+zko4LsyS75LVr29C6xIrxAg9JHJ4pl8kaIZ396SUSNp6b4815dRZPSTAS8LlURRQ==
- dependencies:
- deepmerge "^1.5.2"
- javascript-stringify "^1.6.0"
-
-webpack-dev-middleware@^3.5.1:
- version "3.6.1"
- resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.6.1.tgz#91f2531218a633a99189f7de36045a331a4b9cd4"
- integrity sha512-XQmemun8QJexMEvNFbD2BIg4eSKrmSIMrTfnl2nql2Sc6OGAYFyb8rwuYrCjl/IiEYYuyTEiimMscu7EXji/Dw==
- dependencies:
- memory-fs "^0.4.1"
- mime "^2.3.1"
- range-parser "^1.0.3"
- webpack-log "^2.0.0"
-
-webpack-dev-server@^3.2.0:
- version "3.2.1"
- resolved "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz#1b45ce3ecfc55b6ebe5e36dab2777c02bc508c4e"
- integrity sha512-sjuE4mnmx6JOh9kvSbPYw3u/6uxCLHNWfhWaIPwcXWsvWOPN+nc5baq4i9jui3oOBRXGonK9+OI0jVkaz6/rCw==
- dependencies:
- ansi-html "0.0.7"
- bonjour "^3.5.0"
- chokidar "^2.0.0"
- compression "^1.5.2"
- connect-history-api-fallback "^1.3.0"
- debug "^4.1.1"
- del "^3.0.0"
- express "^4.16.2"
- html-entities "^1.2.0"
- http-proxy-middleware "^0.19.1"
- import-local "^2.0.0"
- internal-ip "^4.2.0"
- ip "^1.1.5"
- killable "^1.0.0"
- loglevel "^1.4.1"
- opn "^5.1.0"
- portfinder "^1.0.9"
- schema-utils "^1.0.0"
- selfsigned "^1.9.1"
- semver "^5.6.0"
- serve-index "^1.7.2"
- sockjs "0.3.19"
- sockjs-client "1.3.0"
- spdy "^4.0.0"
- strip-ansi "^3.0.0"
- supports-color "^6.1.0"
- url "^0.11.0"
- webpack-dev-middleware "^3.5.1"
- webpack-log "^2.0.0"
- yargs "12.0.2"
-
-webpack-log@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
- integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
- dependencies:
- ansi-colors "^3.0.0"
- uuid "^3.3.2"
-
-webpack-merge@^4.2.1:
- version "4.2.1"
- resolved "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz#5e923cf802ea2ace4fd5af1d3247368a633489b4"
- integrity sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==
- dependencies:
- lodash "^4.17.5"
-
-webpack-sources@^1.1.0, webpack-sources@^1.3.0:
- version "1.3.0"
- resolved "http://registry.npm.taobao.org/webpack-sources/download/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
- integrity sha1-KijcufH0X+lg2PFJMlK17mUw+oU=
- dependencies:
- source-list-map "^2.0.0"
- source-map "~0.6.1"
-
-"webpack@>=4 < 4.29":
- version "4.28.4"
- resolved "https://registry.npmjs.org/webpack/-/webpack-4.28.4.tgz#1ddae6c89887d7efb752adf0c3cd32b9b07eacd0"
- integrity sha512-NxjD61WsK/a3JIdwWjtIpimmvE6UrRi3yG54/74Hk9rwNj5FPkA4DJCf1z4ByDWLkvZhTZE+P3C/eh6UD5lDcw==
- dependencies:
- "@webassemblyjs/ast" "1.7.11"
- "@webassemblyjs/helper-module-context" "1.7.11"
- "@webassemblyjs/wasm-edit" "1.7.11"
- "@webassemblyjs/wasm-parser" "1.7.11"
- acorn "^5.6.2"
- acorn-dynamic-import "^3.0.0"
- ajv "^6.1.0"
- ajv-keywords "^3.1.0"
- chrome-trace-event "^1.0.0"
- enhanced-resolve "^4.1.0"
- eslint-scope "^4.0.0"
- json-parse-better-errors "^1.0.2"
- loader-runner "^2.3.0"
- loader-utils "^1.1.0"
- memory-fs "~0.4.1"
- micromatch "^3.1.8"
- mkdirp "~0.5.0"
- neo-async "^2.5.0"
- node-libs-browser "^2.0.0"
- schema-utils "^0.4.4"
- tapable "^1.1.0"
- terser-webpack-plugin "^1.1.0"
- watchpack "^1.5.0"
- webpack-sources "^1.3.0"
-
-webpack@^4.20.2:
- version "4.26.1"
- resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.26.1.tgz#ff3a9283d363c07b3494dfa702d08f4f2ef6cb39"
- integrity sha512-i2oOvEvuvLLSuSCkdVrknaxAhtUZ9g+nLSoHCWV0gDzqGX2DXaCrMmMUpbRsTSSLrUqAI56PoEiyMUZIZ1msug==
- dependencies:
- "@webassemblyjs/ast" "1.7.11"
- "@webassemblyjs/helper-module-context" "1.7.11"
- "@webassemblyjs/wasm-edit" "1.7.11"
- "@webassemblyjs/wasm-parser" "1.7.11"
- acorn "^5.6.2"
- acorn-dynamic-import "^3.0.0"
- ajv "^6.1.0"
- ajv-keywords "^3.1.0"
- chrome-trace-event "^1.0.0"
- enhanced-resolve "^4.1.0"
- eslint-scope "^4.0.0"
- json-parse-better-errors "^1.0.2"
- loader-runner "^2.3.0"
- loader-utils "^1.1.0"
- memory-fs "~0.4.1"
- micromatch "^3.1.8"
- mkdirp "~0.5.0"
- neo-async "^2.5.0"
- node-libs-browser "^2.0.0"
- schema-utils "^0.4.4"
- tapable "^1.1.0"
- terser-webpack-plugin "^1.1.0"
- watchpack "^1.5.0"
- webpack-sources "^1.3.0"
-
-websocket-driver@>=0.5.1:
- version "0.7.0"
- resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
- integrity sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=
- dependencies:
- http-parser-js ">=0.4.0"
- websocket-extensions ">=0.1.1"
-
-websocket-extensions@>=0.1.1:
- version "0.1.3"
- resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
- integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
-
-which-module@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/which-module/download/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
- integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
-
-which-module@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
- integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
-
-which@1, which@^1.2.9:
- version "1.3.1"
- resolved "http://registry.npm.taobao.org/which/download/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
- integrity sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=
- dependencies:
- isexe "^2.0.0"
-
-wide-align@^1.1.0:
- version "1.1.3"
- resolved "http://registry.npm.taobao.org/wide-align/download/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
- integrity sha1-rgdOa9wMFKQx6ATmJFScYzsABFc=
- dependencies:
- string-width "^1.0.2 || 2"
-
-window-size@0.1.0:
- version "0.1.0"
- resolved "http://registry.npm.taobao.org/window-size/download/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
- integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
-
-wolfy87-eventemitter@~5.1.0:
- version "5.1.0"
- resolved "http://registry.npm.taobao.org/wolfy87-eventemitter/download/wolfy87-eventemitter-5.1.0.tgz#35c1ac0dd1ac0c15e35d981508fc22084a13a011"
- integrity sha1-NcGsDdGsDBXjXZgVCPwiCEoToBE=
-
-wordwrap@0.0.2:
- version "0.0.2"
- resolved "http://registry.npm.taobao.org/wordwrap/download/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
- integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
-
-wordwrap@~1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
- integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
-
-worker-farm@^1.5.2:
- version "1.6.0"
- resolved "http://registry.npm.taobao.org/worker-farm/download/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
- integrity sha1-rsxAWXb6talVJhgIRvDboojzpKA=
- dependencies:
- errno "~0.1.7"
-
-wrap-ansi@^2.0.0:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
- integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
- dependencies:
- string-width "^1.0.1"
- strip-ansi "^3.0.1"
-
-wrappy@1:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/wrappy/download/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
- integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-write@1.0.3:
- version "1.0.3"
- resolved "https://registry.npmjs.org/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
- integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
- dependencies:
- mkdirp "^0.5.1"
-
-write@^0.2.1:
- version "0.2.1"
- resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
- integrity sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=
- dependencies:
- mkdirp "^0.5.1"
-
-ws@^6.0.0:
- version "6.1.2"
- resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.2.tgz#3cc7462e98792f0ac679424148903ded3b9c3ad8"
- integrity sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==
- dependencies:
- async-limiter "~1.0.0"
-
-xregexp@4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
- integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
-
-xtend@^4.0.0, xtend@~4.0.1:
- version "4.0.1"
- resolved "http://registry.npm.taobao.org/xtend/download/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
- integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
-
-y18n@^3.2.1:
- version "3.2.1"
- resolved "http://registry.npm.taobao.org/y18n/download/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
- integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
-
-"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
- integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
-
-yallist@^2.1.2:
- version "2.1.2"
- resolved "http://registry.npm.taobao.org/yallist/download/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
- integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
-
-yallist@^3.0.0, yallist@^3.0.2:
- version "3.0.3"
- resolved "http://registry.npm.taobao.org/yallist/download/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
- integrity sha1-tLBJ4xS+VF486AIjbWzSLNkcPek=
-
-yargs-parser@^10.1.0:
- version "10.1.0"
- resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
- integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
- dependencies:
- camelcase "^4.1.0"
-
-yargs-parser@^5.0.0:
- version "5.0.0"
- resolved "http://registry.npm.taobao.org/yargs-parser/download/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
- integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=
- dependencies:
- camelcase "^3.0.0"
-
-yargs@12.0.2:
- version "12.0.2"
- resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
- integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
- dependencies:
- cliui "^4.0.0"
- decamelize "^2.0.0"
- find-up "^3.0.0"
- get-caller-file "^1.0.1"
- os-locale "^3.0.0"
- require-directory "^2.1.1"
- require-main-filename "^1.0.1"
- set-blocking "^2.0.0"
- string-width "^2.0.0"
- which-module "^2.0.0"
- y18n "^3.2.1 || ^4.0.0"
- yargs-parser "^10.1.0"
-
-yargs@^7.0.0:
- version "7.1.0"
- resolved "http://registry.npm.taobao.org/yargs/download/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
- integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=
- dependencies:
- camelcase "^3.0.0"
- cliui "^3.2.0"
- decamelize "^1.1.1"
- get-caller-file "^1.0.1"
- os-locale "^1.4.0"
- read-pkg-up "^1.0.1"
- require-directory "^2.1.1"
- require-main-filename "^1.0.1"
- set-blocking "^2.0.0"
- string-width "^1.0.2"
- which-module "^1.0.0"
- y18n "^3.2.1"
- yargs-parser "^5.0.0"
-
-yargs@~3.10.0:
- version "3.10.0"
- resolved "http://registry.npm.taobao.org/yargs/download/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
- integrity sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=
- dependencies:
- camelcase "^1.0.2"
- cliui "^2.1.0"
- decamelize "^1.0.0"
- window-size "0.1.0"
-
-yorkie@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/yorkie/-/yorkie-2.0.0.tgz#92411912d435214e12c51c2ae1093e54b6bb83d9"
- integrity sha512-jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw==
- dependencies:
- execa "^0.8.0"
- is-ci "^1.0.10"
- normalize-path "^1.0.0"
- strip-indent "^2.0.0"
diff --git a/jeecg-boot/README.md b/jeecg-boot/README.md
index fa04a0f..c5d9d07 100644
--- a/jeecg-boot/README.md
+++ b/jeecg-boot/README.md
@@ -1,15 +1,15 @@
Jeecg-Boot 快速开发平台
===============
-当前最新版本： 1.1（发布日期：20190415）
+当前最新版本： 2.0.0（发布日期：20190518）
## 后端技术架构
-- 基础框架：Spring Boot 2.0.3.RELEASE
+- 基础框架：Spring Boot 2.1.3.RELEASE
- 持久层框架：Mybatis-plus_3.0.6
-- 安全框架：Apache Shiro 1.4.0-RC2，Jwt_3.4.1
+- 安全框架：Apache Shiro 1.4.0，Jwt_3.7.0
- 数据库连接池：阿里巴巴Druid 1.1.10
@@ -34,24 +34,7 @@ Jeecg-Boot 快速开发平台
- 缓存：Redis
- #### 技术文档
-
-
-- 官方文档 ： [http://jeecg-boot.mydoc.io](http://jeecg-boot.mydoc.io)
-
-- 零基础入门 ： [http://jeecg-boot.mydoc.io/?t=344845](http://jeecg-boot.mydoc.io/?t=344845)
-
-- 在线演示 ： [http://boot.jeecg.org](http://boot.jeecg.org)
-
-- QQ交流群 ： 284271917
-
-- 视频教程 ： https://pan.baidu.com/s/1Il0TS50I70vH1AG1y40wtw 提取码：hok5
-
-- 常见问题 ： [新手入门必看，汇总了常见各种问题](http://www.jeecg.org/forum.php?mod=viewthread&tid=7816&page=1&extra=#pid21237)
-
-
-
-## 专项文档区
+## 开发文档
- 查询过滤器用法
@@ -98,5 +81,177 @@ QueryWrapper<?> queryWrapper = QueryGenerator.initQueryWrapper(?, req.getParamet
[在线文档](https://github.com/zhangdaiscott/autopoi)
+
+
+
+- **代码生成器**
+
+** 功能说明**： 一键生成的代码（包括：controller、service、dao、mapper、entity、vue）
+
+ **模板位置**： src/main/resources/jeecg/code-template
+
+**使用方法**：
+
+ 【**一对一模板**】
+
+**1.**先找到**jeecg-boot/src/resources/jeecg**下的
+**jeecg_config.properties**和**jeecg_database.properties**两个文件。
+**jeecg_config.properties:** 用来配置文件生成的路径，
+
+**jeecg_database.properties:** 用来配置数据库相关配置.
+
+
+**2.**配置好这些配置之后，我们需要找到**jeecg-boot/src/main/java/org/jeecg/JeecgOneGUI.java**类，也就是启动一对一代码生成器的入口；
+
+
+**3.**右键运行该类，紧接着会弹出一个窗口，如下图:
+ 
+
+
+**4.**然后根据窗口左侧的提示，在右侧填写对应的信息即可.
+
+ 【**一对多模板**】
+
+
+**1.**先找到**jeecg-boot/src/resources/jeecg**下的
+
+**jeecg_config.properties**和**jeecg_database.properties**两个文件。
+
+**jeecg_config.properties:** 是配置文件生成路径的，
+
+
+**jeecg_database.properties:** 是配置数据库相关配置的文件。
+
+
+**2.**接着我们需要找到**jeecg-boot/src/main/java/org/jeecg/JeecgOneToMainUtil.java**这个类。
+ 该类是生成一对多模板的启动入口。
+
+
+**3.**该类中需要三个步骤来配置一对多表的信息。
+
+
+ (1) 第一步: 配置主表信息,代码如下:
-
\ No newline at end of file
+```
+ //第一步：设置主表配置
+ MainTableVo mainTable = new MainTableVo();
+ mainTable.setTableName("jeecg_order_main");//表名
+ mainTable.setEntityName("TestOrderMain"); //实体名
+ mainTable.setEntityPackage("test2"); //包名
+ mainTable.setFtlDescription("订单"); //描述
+
+```
+ (2) 第二步: 配置子表信息，**有多个则配置多个**, 代码如下:
+
+ ①比如: 配置子表 1:
+
+ ```
+ //第二步：设置子表集合配置
+ List<SubTableVo> subTables = new ArrayList<SubTableVo>();
+ //[1].子表一
+ SubTableVo po = new SubTableVo();
+ po.setTableName("jeecg_order_customer");//表名
+ po.setEntityName("TestOrderCustom"); //实体名
+ po.setEntityPackage("test2"); //包名
+ po.setFtlDescription("客户明细"); //描述
+ //子表外键参数配置
+ /*说明:
+ * a) 子表引用主表主键ID作为外键，外键字段必须以_ID结尾;
+ * b) 主表和子表的外键字段名字，必须相同（除主键ID外）;
+ * c) 多个外键字段，采用逗号分隔;
+ */
+ po.setForeignKeys(new String[]{"order_id"});
+ subTables.add(po);
+ ```
+ ②比如: 配置子表 2:
+
+```
+ //[2].子表二
+ SubTableVo po2 = new SubTableVo();
+ po2.setTableName("jeecg_order_ticket"); //表名
+ po2.setEntityName("TestOrderTicket"); //实体名
+ po2.setEntityPackage("test2"); //包名
+ po2.setFtlDescription("产品明细"); //描述
+ //子表外键参数配置
+ /*说明:
+ * a) 子表引用主表主键ID作为外键，外键字段必须以_ID结尾;
+ * b) 主表和子表的外键字段名字，必须相同（除主键ID外）;
+ * c) 多个外键字段，采用逗号分隔;
+ */
+ po2.setForeignKeys(new String[]{"order_id"});
+ subTables.add(po2);
+ ```
+ ③将整合了子表VO的subTables添加到主表对象当中去:
+
+```
+ mainTable.setSubTables(subTables);
+ ```
+ ④需要注意如下代码,该代码的作用是,为子表设置主外键关联,当添加数据时,
+主表的主键将会添加到子表的"order_id"中:
+
+```
+ po2.setForeignKeys(new String[]{"order_id"});
+ ```
+
+ (3) 第三步: 启动(run)程序，生成代码, 代码如下:
+
+ ```
+ //第三步：一对多(父子表)数据模型,代码生成
+ new CodeGenerateOneToMany(mainTable,subTables).generateCodeFile();
+ ```
+
+[在线文档](https://github.com/zhangdaiscott/autopoi)
+
+
+- **编码排重使用示例**
+
+重复校验效果：
+
+
+1.引入排重接口,代码如下:
+
+```
+import { duplicateCheck } from '@/api/api'
+ ```
+2.找到编码必填校验规则的前端代码,代码如下:
+
+```
+<a-input placeholder="请输入编码" v-decorator="['code', validatorRules.code ]"/>
+
+code: {
+ rules: [
+ { required: true, message: '请输入编码!' },
+ {validator: this.validateCode}
+ ]
+ },
+ ```
+3.找到rules里validator对应的方法在哪里,然后使用第一步中引入的排重校验接口.
+ 以用户online表单编码为示例,其中四个必传的参数有:
+
+```
+ {tableName:表名,fieldName:字段名,fieldVal:字段值,dataId:表的主键},
+ ```
+ 具体使用代码如下:
+
+```
+ validateCode(rule, value, callback){
+ let pattern = /^[a-z|A-Z][a-z|A-Z|\d|_|-]{0,}$/;
+ if(!pattern.test(value)){
+ callback('编码必须以字母开头，可包含数字、下划线、横杠');
+ } else {
+ var params = {
+ tableName: "onl_cgreport_head",
+ fieldName: "code",
+ fieldVal: value,
+ dataId: this.model.id
+ };
+ duplicateCheck(params).then((res)=>{
+ if(res.success){
+ callback();
+ }else{
+ callback(res.message);
+ }
+ })
+ }
+ },
+```
\ No newline at end of file
diff --git a/jeecg-boot/docs/db/jeecg-boot_1.1.0-20190415.sql b/jeecg-boot/db/jeecg-boot-mysql.sql
index 3486d31..4756ce6 100644
--- a/jeecg-boot/docs/db/jeecg-boot_1.1.0-20190415.sql
+++ b/jeecg-boot/db/jeecg-boot-mysql.sql
@@ -3,14 +3,14 @@ Navicat MySQL Data Transfer
Source Server : mysql
Source Server Version : 50037
-Source Host : localhost:3306
-Source Database : jeecg-boot-20190411
+Source Host : 127.0.0.1:3306
+Source Database : jeecg-boot2
Target Server Type : MYSQL
Target Server Version : 50037
File Encoding : 65001
-Date: 2019-04-14 15:31:06
+Date: 2019-05-18 11:37:41
*/
SET FOREIGN_KEY_CHECKS=0;
@@ -39,30 +39,17 @@ CREATE TABLE `demo` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- ----------------------------
--- Records of demo
+-- Table structure for jeecg_monthly_growth_analysis
-- ----------------------------
-INSERT INTO `demo` VALUES ('08375a2dff80e821d5a158dd98302b23', '导入小虎', null, null, null, null, '2', '28', null, null, null, 'jeecg-boot', '2019-04-10 11:42:57', null, null);
-INSERT INTO `demo` VALUES ('1c2ba51b29a42d9de02bbd708ea8121a', '777777', '777', '2018-12-07 19:43:17', null, null, null, '7', '2018-12-07', null, null, null, null, 'admin', '2019-02-21 18:26:04');
-INSERT INTO `demo` VALUES ('1dc29e80be14d1400f165b5c6b30c707', 'zhang daihao', null, null, null, null, '2', null, null, 'zhangdaiscott@163.com', null, null, null, null, null);
-INSERT INTO `demo` VALUES ('304e651dc769d5c9b6e08fb30457a602', '小白兔', null, null, null, null, '2', '28', null, null, null, 'scott', '2019-01-19 13:12:53', 'qinfeng', '2019-01-19 13:13:12');
-INSERT INTO `demo` VALUES ('4', 'Sandy', '开源，很好', '2018-12-15 00:00:00', null, null, '2', '21', '2018-12-15', 'test4@baomidou.com', '聪明00', null, null, 'admin', '2019-02-25 16:29:27');
-INSERT INTO `demo` VALUES ('42c08b1a2e5b2a96ffa4cc88383d4b11', '秦50090', null, '2019-01-05 20:33:31', null, null, null, '28', '2019-01-05', null, null, 'admin', '2019-01-19 20:33:54', 'admin', '2019-01-19 20:34:29');
-INSERT INTO `demo` VALUES ('4436302a0de50bb83025286bc414d6a9', 'zhang daihao', null, null, null, null, null, null, null, 'zhangdaiscott@163.com', null, 'admin', '2019-01-19 15:39:04', null, null);
-INSERT INTO `demo` VALUES ('4981637bf71b0c1ed1365241dfcfa0ea', '小虎', null, null, null, null, '2', '28', null, null, null, 'scott', '2019-01-19 13:12:53', 'qinfeng', '2019-01-19 13:13:12');
-INSERT INTO `demo` VALUES ('5c16e6a5c31296bcd3f1053d5d118815', '导入zhangdaiscott', null, null, null, null, '1', null, '2019-01-03', null, null, 'jeecg-boot', '2019-04-10 11:42:57', null, null);
-INSERT INTO `demo` VALUES ('7', 'zhangdaiscott', null, null, null, null, '1', null, '2019-01-03', null, null, null, null, null, null);
-INSERT INTO `demo` VALUES ('73bc58611012617ca446d8999379e4ac', '郭靖11a', '777', '2018-12-07 00:00:00', null, null, null, null, null, null, null, 'jeecg-boot', '2019-03-28 18:16:39', null, null);
-INSERT INTO `demo` VALUES ('917e240eaa0b1b2d198ae869b64a81c3', 'zhang daihao', null, null, null, null, '2', '0', '2018-11-29', 'zhangdaiscott@163.com', null, null, null, null, null);
-INSERT INTO `demo` VALUES ('94420c5d8fc4420dde1e7196154b3a24', '秦111', null, null, null, null, null, null, null, null, null, 'scott', '2019-01-19 12:54:58', 'qinfeng', '2019-01-19 13:12:10');
-INSERT INTO `demo` VALUES ('95740656751c5f22e5932ab0ae33b1e4', '杨康22a', '奸臣', null, null, null, null, null, null, null, null, 'jeecg-boot', '2019-03-28 18:16:39', null, null);
-INSERT INTO `demo` VALUES ('b86897900c770503771c7bb88e5d1e9b', 'scott1', '开源、很好、hello', null, null, null, '1', null, null, 'zhangdaiscott@163.com', null, 'scott', '2019-01-19 12:22:34', null, null);
-INSERT INTO `demo` VALUES ('c0b7c3de7c62a295ab715943de8a315d', '秦风555', null, null, null, null, null, null, null, null, null, 'admin', '2019-01-19 13:18:30', 'admin', '2019-01-19 13:18:50');
-INSERT INTO `demo` VALUES ('c28fa8391ef81d6fabd8bd894a7615aa', '小麦', null, null, null, null, '2', null, null, 'zhangdaiscott@163.com', null, 'jeecg-boot', '2019-04-04 17:18:09', null, null);
-INSERT INTO `demo` VALUES ('c2c0d49e3c01913067cf8d1fb3c971d2', 'zhang daihao', null, null, null, null, '2', null, null, 'zhangdaiscott@163.com', null, 'admin', '2019-01-19 23:37:18', 'admin', '2019-01-21 16:49:06');
-INSERT INTO `demo` VALUES ('c96279c666b4b82e3ef1e4e2978701ce', '报名时间', null, null, null, null, null, null, null, null, null, 'jeecg-boot', '2019-03-28 18:00:52', null, null);
-INSERT INTO `demo` VALUES ('d24668721446e8478eeeafe4db66dcff', 'zhang daihao999', null, null, null, null, '1', null, null, 'zhangdaiscott@163.com', null, null, null, null, null);
-INSERT INTO `demo` VALUES ('eaa6c1116b41dc10a94eae34cf990133', 'zhang daihao', null, null, null, null, null, null, null, 'zhangdaiscott@163.com', null, null, null, null, null);
-INSERT INTO `demo` VALUES ('ffa9da1ad40632dfcabac51d766865bd', '秦999', null, null, null, null, null, null, null, null, null, 'admin', '2019-01-19 23:36:34', 'admin', '2019-02-14 17:30:43');
+DROP TABLE IF EXISTS `jeecg_monthly_growth_analysis`;
+CREATE TABLE `jeecg_monthly_growth_analysis` (
+ `id` int(11) NOT NULL auto_increment,
+ `year` varchar(50) default NULL,
+ `month` varchar(50) default NULL COMMENT '月份',
+ `main_income` decimal(18,2) default '0.00' COMMENT '佣金/主营收入',
+ `other_income` decimal(18,2) default '0.00' COMMENT '其他收入',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- ----------------------------
-- Table structure for jeecg_order_customer
@@ -84,75 +71,6 @@ CREATE TABLE `jeecg_order_customer` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- ----------------------------
--- Records of jeecg_order_customer
--- ----------------------------
-INSERT INTO `jeecg_order_customer` VALUES ('15538561502720', '3333', '1', '', null, '', '0d4a2e67b538ee1bc881e5ed34f670f0', 'jeecg-boot', '2019-03-29 18:42:55', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('15538561512681', '3332333', '2', '', null, '', '0d4a2e67b538ee1bc881e5ed34f670f0', 'jeecg-boot', '2019-03-29 18:42:55', 'admin', '2019-03-29 18:43:12');
-INSERT INTO `jeecg_order_customer` VALUES ('15538561550142', '4442', '2', '', null, '', '0d4a2e67b538ee1bc881e5ed34f670f0', 'jeecg-boot', '2019-03-29 18:42:55', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('15541168497342', '444', '', '', '', '', 'f71f7f8930b5b6b1703d9948d189982b', 'admin', '2019-04-01 19:08:45', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('15541168499553', '5555', '', '', '', '', 'f71f7f8930b5b6b1703d9948d189982b', 'admin', '2019-04-01 19:08:45', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('15541169272690', '小王1', '1', '', '', '18611788525', 'f618a85b17e2c4dd58d268220c8dd9a1', 'admin', '2019-04-01 19:10:07', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('15541169288141', '效力1', '1', '', '', '18611788525', 'f618a85b17e2c4dd58d268220c8dd9a1', 'admin', '2019-04-01 19:10:07', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('15541169441372', '小红1', '1', '', '', '18611788525', 'f618a85b17e2c4dd58d268220c8dd9a1', 'admin', '2019-04-01 19:10:07', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('15543695362380', '1111', '', '', '', '', '5d6e2b9e44037526270b6206196f6689', 'admin', '2019-04-04 17:19:40', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('15543695397221', '222', '', '', '', '', '5d6e2b9e44037526270b6206196f6689', 'admin', '2019-04-04 17:19:40', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('15543695398992', '333', '', '', '', '', '5d6e2b9e44037526270b6206196f6689', 'admin', '2019-04-04 17:19:40', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('18dc5eb1068ccdfe90e358951ca1a3d6', 'dr2', '', '', '', '', '8ab1186410a65118c4d746eb085d3bed', 'admin', '2019-04-04 17:25:33', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('195d280490fe88ca1475512ddcaf2af9', '12', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('217a2bf83709775d2cd85bf598392327', '2', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('22bc052ae53ed09913b946abba93fa89', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('23bafeae88126c3bf3322a29a04f0d5e', 'x秦风', null, null, null, null, '163e2efcbc6d7d54eb3f8a137da8a75a', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('25c4a552c6843f36fad6303bfa99a382', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('2d32144e2bee63264f3f16215c258381', '33333', '2', null, null, null, 'd908bfee3377e946e59220c4a4eb414a', 'admin', '2019-04-01 16:27:03', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('2d43170d6327f941bd1a017999495e25', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('2e5f62a8b6e0a0ce19b52a6feae23d48', '3', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('313abf99558ac5f13ecca3b87e562ad1', 'scott', '2', null, null, null, 'b190737bd04cca8360e6f87c9ef9ec4e', 'admin', '2019-02-25 16:29:48', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('34a1c5cf6cee360ed610ed0bed70e0f9', '导入秦风', null, null, null, null, 'a2cce75872cc8fcc47f78de9ffd378c2', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('3c87400f8109b4cf43c5598f0d40e34d', '2', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('40964bcbbecb38e5ac15e6d08cf3cd43', '233', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('41e3dee0b0b6e6530eccb7fbb22fd7a3', '4555', '1', '370285198602058823', null, '18611788674', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('4808ae8344c7679a4a2f461db5dc3a70', '44', '1', '370285198602058823', null, '18611788674', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('4b6cef12f195fad94d57279b2241770d', 'dr12', '', '', '', '', '8ab1186410a65118c4d746eb085d3bed', 'admin', '2019-04-04 17:25:33', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('524e695283f8e8c256cc24f39d6d8542', '小王', '2', '370285198604033222', null, '18611788674', 'eb13ab35d2946a2b0cfe3452bca1e73f', 'admin', '2019-02-25 16:29:41', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('57c2a8367db34016114cbc9fa368dba0', '2', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('5df36a1608b8c7ac99ad9bc408fe54bf', '4', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('6b694e9ba54bb289ae9cc499e40031e7', 'x秦风', '1', null, null, null, 'b190737bd04cca8360e6f87c9ef9ec4e', 'admin', '2019-02-25 16:29:48', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('6c6fd2716c2dcd044ed03c2c95d261f8', '李四', '2', '370285198602058833', '', '18611788676', 'f71f7f8930b5b6b1703d9948d189982b', 'admin', '2019-04-01 19:08:45', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('742d008214dee0afff2145555692973e', '秦风', '1', '370285198602058822', null, '18611788676', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('7469c3e5d371767ff90a739d297689b5', '导入秦风', '2', null, null, null, '3a867ebf2cebce9bae3f79676d8d86f3', 'jeecg-boot', '2019-03-29 18:43:59', 'admin', '2019-04-08 17:35:02');
-INSERT INTO `jeecg_order_customer` VALUES ('7a96e2c7b24847d4a29940dbc0eda6e5', 'drscott', null, null, null, null, 'e73434dad84ebdce2d4e0c2a2f06d8ea', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('7f5a40818e225ee18bda6da7932ac5f9', '2', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('8011575abfd7c8085e71ff66df1124b9', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('8404f31d7196221a573c9bd6c8f15003', '小张', '1', '370285198602058211', null, '18611788676', 'eb13ab35d2946a2b0cfe3452bca1e73f', 'admin', '2019-02-25 16:29:41', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('859020e10a2f721f201cdbff78cf7b9f', 'scott', null, null, null, null, '163e2efcbc6d7d54eb3f8a137da8a75a', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('8cc3c4d26e3060975df3a2adb781eeb4', 'dr33', null, null, null, null, 'b2feb454e43c46b2038768899061e464', 'jeecg-boot', '2019-04-04 17:23:09', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('8d1725c23a6a50685ff0dedfd437030d', '4', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('933cae3a79f60a93922d59aace5346ce', '小王', null, '370285198604033222', null, '18611788674', '6a719071a29927a14f19482f8693d69a', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('9bdb5400b709ba4eaf3444de475880d7', 'dr22', null, null, null, null, '22c17790dcd04b296c4a2a089f71895f', 'jeecg-boot', '2019-04-04 17:23:09', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('9f87677f70e5f864679314389443a3eb', '33', '2', '370285198602058823', null, '18611788674', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('a2c2b7101f75c02deb328ba777137897', '44', '2', '370285198602058823', null, '18611788674', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('ab4d002dc552c326147e318c87d3bed4', 'ddddd', '1', '370285198604033222', null, '18611755848', '9a57c850e4f68cf94ef7d8585dbaf7e6', 'admin', '2019-04-04 17:30:47', 'admin', '2019-04-04 17:31:17');
-INSERT INTO `jeecg_order_customer` VALUES ('ad116f722a438e5f23095a0b5fcc8e89', 'dr秦风', null, null, null, null, 'e73434dad84ebdce2d4e0c2a2f06d8ea', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('b1ba147b75f5eaa48212586097fc3fd1', '2', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('b43bf432c251f0e6b206e403b8ec29bc', 'lisi', null, null, null, null, 'f8889aaef6d1bccffd98d2889c0aafb5', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('bcdd300a7d44c45a66bdaac14903c801', '33', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('beb983293e47e2dc1a9b3d649aa3eb34', 'ddd3', null, null, null, null, 'd908bfee3377e946e59220c4a4eb414a', 'admin', '2019-04-01 16:27:03', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('c219808196406f1b8c7f1062589de4b5', '44', '1', '370285198602058823', null, '18611788674', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('c8ed061d4b27c0c7a64e100f2b1c8ab5', '张经理', '2', '370285198602058823', null, '18611788674', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('cc5de4af7f06cd6d250965ebe92a0395', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('cf8817bd703bf7c7c77a2118edc26cc7', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('d72b26fae42e71270fce2097a88da58a', '导入scott', null, 'www', null, null, '3a867ebf2cebce9bae3f79676d8d86f3', 'jeecg-boot', '2019-03-29 18:43:59', 'admin', '2019-04-08 17:35:05');
-INSERT INTO `jeecg_order_customer` VALUES ('dbdc60a6ac1a8c43f24afee384039b68', 'xiaowang', null, null, null, null, 'f8889aaef6d1bccffd98d2889c0aafb5', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('dc5883b50466de94d900919ed96d97af', '33', '1', '370285198602058823', null, '18611788674', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('deeb73e553ad8dc0a0b3cfd5a338de8e', '3333', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('e2570278bf189ac05df3673231326f47', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('e39cb23bb950b2bdedfc284686c6128a', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('e46fe9111a9100844af582a18a2aa402', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('ee7af0acb9beb9bf8d8b3819a8a7fdc3', '2', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('f5d2605e844192d9e548f9bd240ac908', '小张', null, '370285198602058211', null, '18611788676', '6a719071a29927a14f19482f8693d69a', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_customer` VALUES ('f6db6547382126613a3e46e7cd58a5f2', '导入scott', null, null, null, null, 'a2cce75872cc8fcc47f78de9ffd378c2', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-
--- ----------------------------
-- Table structure for jeecg_order_main
-- ----------------------------
DROP TABLE IF EXISTS `jeecg_order_main`;
@@ -171,28 +89,6 @@ CREATE TABLE `jeecg_order_main` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- ----------------------------
--- Records of jeecg_order_main
--- ----------------------------
-INSERT INTO `jeecg_order_main` VALUES ('163e2efcbc6d7d54eb3f8a137da8a75a', 'B100', null, null, '3000.000', null, 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_main` VALUES ('3a867ebf2cebce9bae3f79676d8d86f3', '导入B100', '2222', null, '3000.000', null, 'jeecg-boot', '2019-03-29 18:43:59', 'admin', '2019-04-08 17:35:13');
-INSERT INTO `jeecg_order_main` VALUES ('4bca3ea6881d39dbf67ef1e42c649766', '1212', null, null, null, null, 'admin', '2019-04-03 10:55:43', null, null);
-INSERT INTO `jeecg_order_main` VALUES ('4cba137333127e8e31df7ad168cc3732', '青岛订单A0001', '2', '2019-04-03 10:56:07', null, null, 'admin', '2019-04-03 10:56:11', null, null);
-INSERT INTO `jeecg_order_main` VALUES ('54e739bef5b67569c963c38da52581ec', 'NC911', '1', '2019-02-18 09:58:51', '40.000', null, 'admin', '2019-02-18 09:58:47', 'admin', '2019-02-18 09:58:59');
-INSERT INTO `jeecg_order_main` VALUES ('5d6e2b9e44037526270b6206196f6689', 'N333', null, '2019-04-04 17:19:11', null, '聪明00', 'admin', '2019-04-04 17:19:40', null, null);
-INSERT INTO `jeecg_order_main` VALUES ('6a719071a29927a14f19482f8693d69a', 'c100', null, null, '5000.000', null, 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_main` VALUES ('8ab1186410a65118c4d746eb085d3bed', '导入400', '1', '2019-02-18 09:58:51', '40.000', null, 'admin', '2019-02-18 09:58:47', 'admin', '2019-02-18 09:58:59');
-INSERT INTO `jeecg_order_main` VALUES ('9a57c850e4f68cf94ef7d8585dbaf7e6', 'halou100dd', null, '2019-04-04 17:30:32', null, null, 'admin', '2019-04-04 17:30:41', 'admin', '2019-04-04 17:31:08');
-INSERT INTO `jeecg_order_main` VALUES ('a2cce75872cc8fcc47f78de9ffd378c2', '导入B100', null, null, '3000.000', null, 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_main` VALUES ('b190737bd04cca8360e6f87c9ef9ec4e', 'B0018888', '1', null, null, null, 'admin', '2019-02-15 18:39:29', 'admin', '2019-02-15 18:39:37');
-INSERT INTO `jeecg_order_main` VALUES ('d908bfee3377e946e59220c4a4eb414a', 'SSSS001', null, null, '599.000', null, 'admin', '2019-04-01 15:43:03', 'admin', '2019-04-01 16:26:52');
-INSERT INTO `jeecg_order_main` VALUES ('e73434dad84ebdce2d4e0c2a2f06d8ea', '导入200', null, null, '3000.000', null, 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_main` VALUES ('eb13ab35d2946a2b0cfe3452bca1e73f', 'BJ9980', '1', null, '90.000', null, 'admin', '2019-02-16 17:36:42', 'admin', '2019-02-16 17:46:16');
-INSERT INTO `jeecg_order_main` VALUES ('f618a85b17e2c4dd58d268220c8dd9a1', 'N001', null, '2019-04-01 19:09:02', '2222.000', null, 'admin', '2019-04-01 19:09:47', 'admin', '2019-04-01 19:10:00');
-INSERT INTO `jeecg_order_main` VALUES ('f71f7f8930b5b6b1703d9948d189982b', 'BY911', null, '2019-04-06 19:08:39', null, null, 'admin', '2019-04-01 16:36:02', 'admin', '2019-04-01 16:36:08');
-INSERT INTO `jeecg_order_main` VALUES ('f8889aaef6d1bccffd98d2889c0aafb5', 'A100', null, '2018-10-10 00:00:00', '6000.000', null, 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_main` VALUES ('fe81ee5d19bbf9eef2066d4f29dfbe0f', 'uuuu', null, null, null, null, 'jeecg-boot', '2019-04-03 11:00:39', null, null);
-
--- ----------------------------
-- Table structure for jeecg_order_ticket
-- ----------------------------
DROP TABLE IF EXISTS `jeecg_order_ticket`;
@@ -209,199 +105,38 @@ CREATE TABLE `jeecg_order_ticket` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- ----------------------------
--- Records of jeecg_order_ticket
--- ----------------------------
-INSERT INTO `jeecg_order_ticket` VALUES ('0f0e3a40a215958f807eea08a6e1ac0a', '88', null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('0fa3bd0bbcf53650c0bb3c0cac6d8cb7', 'ffff', '2019-02-21 00:00:00', 'eb13ab35d2946a2b0cfe3452bca1e73f', 'admin', '2019-02-25 16:29:41', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('14221afb4f5f749c1deef26ac56fdac3', '33', '2019-03-09 00:00:00', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('15538561502730', '222', null, '0d4a2e67b538ee1bc881e5ed34f670f0', 'jeecg-boot', '2019-03-29 18:42:55', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('15538561526461', '2244', '2019-03-29 00:00:00', '0d4a2e67b538ee1bc881e5ed34f670f0', 'jeecg-boot', '2019-03-29 18:42:55', 'admin', '2019-03-29 18:43:26');
-INSERT INTO `jeecg_order_ticket` VALUES ('15541168478913', 'hhhhh', null, 'f71f7f8930b5b6b1703d9948d189982b', 'admin', '2019-04-01 19:08:45', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('15541169272810', '22211', '2019-04-01 19:09:40', 'f618a85b17e2c4dd58d268220c8dd9a1', 'admin', '2019-04-01 19:10:07', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('15541169302331', '333311', '2019-04-01 19:09:40', 'f618a85b17e2c4dd58d268220c8dd9a1', 'admin', '2019-04-01 19:10:07', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('15541169713092', '333311', '2019-04-01 19:09:47', 'f618a85b17e2c4dd58d268220c8dd9a1', 'admin', '2019-04-01 19:10:07', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('15542604293170', 'c', null, 'fe81ee5d19bbf9eef2066d4f29dfbe0f', 'jeecg-boot', '2019-04-03 11:00:39', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('15542604374431', 'd', null, 'fe81ee5d19bbf9eef2066d4f29dfbe0f', 'jeecg-boot', '2019-04-03 11:00:39', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('15543695362380', 'ccc2', null, '5d6e2b9e44037526270b6206196f6689', 'admin', '2019-04-04 17:19:40', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('15543695381291', 'cccc1', null, '5d6e2b9e44037526270b6206196f6689', 'admin', '2019-04-04 17:19:40', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('15543695740352', 'dddd', null, '5d6e2b9e44037526270b6206196f6689', 'admin', '2019-04-04 17:19:40', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('18905bc89ee3851805aab38ed3b505ec', '44', null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('1f809cbd26f4e574697e1c10de575d72', 'A100', null, 'e73434dad84ebdce2d4e0c2a2f06d8ea', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('21051adb51529bdaa8798b5a3dd7f7f7', 'C10029', '2019-02-20 00:00:00', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('269576e766b917f8b6509a2bb0c4d4bd', 'A100', null, '163e2efcbc6d7d54eb3f8a137da8a75a', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('2d473ffc79e5b38a17919e15f8b7078e', '66', '2019-03-29 00:00:00', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('3655b66fca5fef9c6aac6d70182ffda2', 'AA123', '2019-04-01 00:00:00', 'd908bfee3377e946e59220c4a4eb414a', 'admin', '2019-04-01 16:27:03', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('365d5919155473ade45840fd626c51a9', 'dddd', '2019-04-04 17:25:29', '8ab1186410a65118c4d746eb085d3bed', 'admin', '2019-04-04 17:25:33', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('4889a782e78706ab4306a925cfb163a5', 'C34', '2019-04-01 00:00:00', 'd908bfee3377e946e59220c4a4eb414a', 'admin', '2019-04-01 16:35:00', 'admin', '2019-04-01 16:35:07');
-INSERT INTO `jeecg_order_ticket` VALUES ('48d385796382cf87fa4bdf13b42d9a28', '导入A100', null, '3a867ebf2cebce9bae3f79676d8d86f3', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('541faed56efbeb4be9df581bd8264d3a', '88', null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('57a27a7dfd6a48e7d981f300c181b355', '6', '2019-03-30 00:00:00', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('5ce4dc439c874266e42e6c0ff8dc8b5c', '导入A100', null, 'a2cce75872cc8fcc47f78de9ffd378c2', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('5f16e6a64ab22a161bd94cc205f2c662', '222', '2019-02-23 00:00:00', 'b190737bd04cca8360e6f87c9ef9ec4e', 'admin', '2019-02-25 16:29:48', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('645a06152998a576c051474157625c41', '88', '2019-04-04 17:25:31', '8ab1186410a65118c4d746eb085d3bed', 'admin', '2019-04-04 17:25:33', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('6e3562f2571ea9e96b2d24497b5f5eec', '55', '2019-03-23 00:00:00', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('8fd2b389151568738b1cc4d8e27a6110', '导入A100', null, 'a2cce75872cc8fcc47f78de9ffd378c2', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('93f1a84053e546f59137432ff5564cac', '55', null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('969ddc5d2e198d50903686917f996470', 'A10029', '2019-04-01 00:00:00', 'f71f7f8930b5b6b1703d9948d189982b', 'admin', '2019-04-01 19:08:45', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('96e7303a8d22a5c384e08d7bcf7ac2bf', 'A100', null, 'e73434dad84ebdce2d4e0c2a2f06d8ea', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('9e8a3336f6c63f558f2b68ce2e1e666e', 'dddd', null, '9a57c850e4f68cf94ef7d8585dbaf7e6', 'admin', '2019-04-04 17:30:55', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('a28db02c810c65660015095cb81ed434', 'A100', null, 'f8889aaef6d1bccffd98d2889c0aafb5', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('b217bb0e4ec6a45b6cbf6db880060c0f', 'A100', null, '6a719071a29927a14f19482f8693d69a', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('ba708df70bb2652ed1051a394cfa0bb3', '333', null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('beabbfcb195d39bedeeafe8318794562', 'A1345', '2019-04-01 00:00:00', 'd908bfee3377e946e59220c4a4eb414a', 'admin', '2019-04-01 16:27:04', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('bf450223cb505f89078a311ef7b6ed16', '777', '2019-03-30 00:00:00', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('c06165b6603e3e1335db187b3c841eef', 'fff', null, '9a57c850e4f68cf94ef7d8585dbaf7e6', 'admin', '2019-04-04 17:30:58', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('c113136abc26ace3a6da4e41d7dc1c7e', '44', '2019-03-15 00:00:00', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('c1abdc2e30aeb25de13ad6ee3488ac24', '77', '2019-03-22 00:00:00', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('c23751a7deb44f553ce50a94948c042a', '33', '2019-03-09 00:00:00', '8ab1186410a65118c4d746eb085d3bed', 'admin', '2019-04-04 17:25:33', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('c64547666b634b3d6a0feedcf05f25ce', 'C10019', '2019-04-01 00:00:00', 'f71f7f8930b5b6b1703d9948d189982b', 'admin', '2019-04-01 19:08:45', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('c8b8d3217f37da78dddf711a1f7da485', 'A100', null, '163e2efcbc6d7d54eb3f8a137da8a75a', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('cab691c1c1ff7a6dfd7248421917fd3c', 'A100', null, 'f8889aaef6d1bccffd98d2889c0aafb5', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('cca10a9a850b456d9b72be87da7b0883', '77', null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('d2fbba11f4814d9b1d3cb1a3f342234a', 'C10019', '2019-02-18 00:00:00', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('d746c1ed956a562e97eef9c6faf94efa', '111', '2019-02-01 00:00:00', 'b190737bd04cca8360e6f87c9ef9ec4e', 'admin', '2019-02-25 16:29:48', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('dbdb07a16826808e4276e84b2aa4731a', '导入A100', null, '3a867ebf2cebce9bae3f79676d8d86f3', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('e7075639c37513afc0bbc4bf7b5d98b9', '88', null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('fa759dc104d0371f8aa28665b323dab6', '888', null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-INSERT INTO `jeecg_order_ticket` VALUES ('ff197da84a9a3af53878eddc91afbb2e', '33', null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
-
--- ----------------------------
--- Table structure for onl_cgreport_head
+-- Table structure for jeecg_project_nature_income
-- ----------------------------
-DROP TABLE IF EXISTS `onl_cgreport_head`;
-CREATE TABLE `onl_cgreport_head` (
- `id` varchar(36) NOT NULL,
- `code` varchar(100) NOT NULL COMMENT '报表编码',
- `name` varchar(100) NOT NULL COMMENT '报表名字',
- `cgr_sql` varchar(1000) NOT NULL COMMENT '报表SQL',
- `return_val_field` varchar(100) default NULL COMMENT '返回值字段',
- `return_txt_field` varchar(100) default NULL COMMENT '返回文本字段',
- `return_type` varchar(2) default '1' COMMENT '返回类型，单选或多选',
- `db_source` varchar(100) default NULL COMMENT '动态数据源',
- `content` varchar(1000) default NULL COMMENT '描述',
- `update_time` datetime default NULL COMMENT '修改时间',
- `update_by` varchar(32) default NULL COMMENT '修改人id',
- `create_time` datetime default NULL COMMENT '创建时间',
- `create_by` varchar(32) default NULL COMMENT '创建人id',
- PRIMARY KEY (`id`),
- UNIQUE KEY `index_onlinereport_code` USING BTREE (`code`)
+DROP TABLE IF EXISTS `jeecg_project_nature_income`;
+CREATE TABLE `jeecg_project_nature_income` (
+ `id` int(11) NOT NULL auto_increment,
+ `nature` varchar(50) NOT NULL COMMENT '项目性质',
+ `insurance_fee` decimal(18,2) default '0.00' COMMENT '保险经纪佣金费',
+ `risk_consulting_fee` decimal(18,2) default '0.00' COMMENT '风险咨询费',
+ `evaluation_fee` decimal(18,2) default '0.00' COMMENT '承保公估评估费',
+ `insurance_evaluation_fee` decimal(18,2) default '0.00' COMMENT '保险公估费',
+ `bidding_consulting_fee` decimal(18,2) default '0.00' COMMENT '投标咨询费',
+ `interol_consulting_fee` decimal(18,2) default '0.00' COMMENT '内控咨询费',
+ PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- ----------------------------
--- Records of onl_cgreport_head
--- ----------------------------
-INSERT INTO `onl_cgreport_head` VALUES ('6c7f59741c814347905a938f06ee003c', 'report_user', '统计在线用户', 'select * from sys_user', null, null, '1', null, null, '2019-03-25 11:21:04', 'admin', '2019-03-25 11:20:45', 'admin');
-INSERT INTO `onl_cgreport_head` VALUES ('87b55a515d3441b6b98e48e5b35474a6', 'demo', 'Report Demo', 'select * from demo', null, null, '1', null, null, '2019-03-15 18:18:17', 'admin', '2019-03-12 11:25:16', 'admin');
-
--- ----------------------------
--- Table structure for onl_cgreport_item
+-- Table structure for joa_demo
-- ----------------------------
-DROP TABLE IF EXISTS `onl_cgreport_item`;
-CREATE TABLE `onl_cgreport_item` (
- `id` varchar(36) NOT NULL,
- `cgrhead_id` varchar(36) NOT NULL COMMENT '报表ID',
- `field_name` varchar(36) NOT NULL COMMENT '字段名字',
- `field_txt` varchar(300) default NULL COMMENT '字段文本',
- `field_width` int(3) default NULL,
- `field_type` varchar(10) default NULL COMMENT '字段类型',
- `search_mode` varchar(10) default NULL COMMENT '查询模式',
- `is_order` int(2) default '0' COMMENT '是否排序 0否,1是',
- `is_search` int(2) default '0' COMMENT '是否查询 0否,1是',
- `dict_code` varchar(36) default NULL COMMENT '字典CODE',
- `field_href` varchar(120) default NULL COMMENT '字段跳转URL',
- `is_show` int(2) default '1' COMMENT '是否显示 0否,1显示',
- `order_num` int(11) default NULL COMMENT '排序',
- `replace_val` varchar(200) default NULL COMMENT '取值表达式',
- `create_by` varchar(32) default NULL COMMENT '创建人',
+DROP TABLE IF EXISTS `joa_demo`;
+CREATE TABLE `joa_demo` (
+ `id` varchar(32) default NULL COMMENT 'ID',
+ `name` varchar(100) default NULL COMMENT '请假人',
+ `days` int(11) default NULL COMMENT '请假天数',
+ `begin_date` datetime default NULL COMMENT '开始时间',
+ `end_date` datetime default NULL COMMENT '请假结束时间',
+ `reason` varchar(500) default NULL COMMENT '请假原因',
+ `bpm_status` varchar(50) default '1' COMMENT '流程状态',
+ `create_by` varchar(32) default NULL COMMENT '创建人id',
`create_time` datetime default NULL COMMENT '创建时间',
- `update_by` varchar(32) default NULL COMMENT '修改人',
`update_time` datetime default NULL COMMENT '修改时间',
- PRIMARY KEY (`id`),
- KEY `index_CGRHEAD_ID` USING BTREE (`cgrhead_id`),
- KEY `index_isshow` USING BTREE (`is_show`),
- KEY `index_order_num` USING BTREE (`order_num`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- ----------------------------
--- Records of onl_cgreport_item
--- ----------------------------
-INSERT INTO `onl_cgreport_item` VALUES ('1740bb02519db90c44cb2cba8b755136', '6c7f59741c814347905a938f06ee003c', 'realname', '用户名', null, 'String', null, '0', '0', '', '', '1', '3', '', 'admin', '2019-03-25 11:20:45', 'admin', '2019-04-03 15:40:31');
-INSERT INTO `onl_cgreport_item` VALUES ('1b181e6d2813bcb263adc39737f9df46', '87b55a515d3441b6b98e48e5b35474a6', 'name', '用户名', null, 'String', 'single', '0', '1', '', '', '1', '4', '', 'admin', '2019-03-20 19:26:39', 'admin', '2019-03-27 18:05:04');
-INSERT INTO `onl_cgreport_item` VALUES ('1fb45af29af4e792bdc5a4a2c06a4d4d', '402880ec5d872157015d87f2dd940010', 'data_table', '表名', null, 'String', null, '0', '0', null, null, '1', '0', null, 'admin', '2019-03-20 13:24:21', 'admin', '2019-03-20 13:25:08');
-INSERT INTO `onl_cgreport_item` VALUES ('402881f167cf82600167cfa154ec0003', '402880e64e1ef94d014e1efefc2a0001', 'id', 'id', '0', 'String', '', null, '0', '', '', '0', '0', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f167cf82600167cfa154ed0004', '402880e64e1ef94d014e1efefc2a0001', 'accountname', 'accountname', '0', 'String', '', null, '0', '', '', '0', '1', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f167cf82600167cfa154ed0005', '402880e64e1ef94d014e1efefc2a0001', 'accounttoken', 'accounttoken', '0', 'String', '', null, '0', '', '', '0', '2', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f167cf82600167cfa154ed0006', '402880e64e1ef94d014e1efefc2a0001', 'accountnumber', 'accountnumber', '0', 'String', '', null, '0', '', '', '0', '3', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f167cf82600167cfa154ed0007', '402880e64e1ef94d014e1efefc2a0001', 'accounttype', 'accounttype', '0', 'String', '', null, '0', '', '', '0', '4', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f167cf82600167cfa154ed0008', '402880e64e1ef94d014e1efefc2a0001', 'accountemail', 'accountemail', '0', 'String', '', null, '0', '', '', '0', '5', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f167cf82600167cfa154ed0009', '402880e64e1ef94d014e1efefc2a0001', 'accountdesc', 'accountdesc', '0', 'String', '', null, '0', '', '', '0', '6', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f167cf82600167cfa154ee000b', '402880e64e1ef94d014e1efefc2a0001', 'accountappid', 'accountappid', '0', 'String', '', null, '0', '', '', '0', '8', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f167cf82600167cfa154ee000c', '402880e64e1ef94d014e1efefc2a0001', 'accountappsecret', 'accountappsecret', '0', 'String', '', null, '0', '', '', '0', '9', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f167cf82600167cfa154ee000d', '402880e64e1ef94d014e1efefc2a0001', 'ADDTOEKNTIME', 'ADDTOEKNTIME', '0', 'String', '', null, '0', '', '', '0', '10', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f167cf82600167cfa154ee000e', '402880e64e1ef94d014e1efefc2a0001', 'USERNAME', 'USERNAME', '0', 'String', '', null, '0', '', '', '0', '11', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f167cf82600167cfa154ee0010', '402880e64e1ef94d014e1efefc2a0001', 'jsapiticket', 'jsapiticket', '0', 'String', '', null, '0', '', '', '0', '13', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f167cf82600167cfa154ee0011', '402880e64e1ef94d014e1efefc2a0001', 'jsapitickettime', 'jsapitickettime', '0', 'String', '', null, '0', '', '', '0', '14', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f167cf82600167cfa154ef0012', '402880e64e1ef94d014e1efefc2a0001', 'init_data_flag', 'init_data_flag', '0', 'String', '', null, '0', '', '', '0', '15', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f363aa9a380163aa9ebe490002', '402881f363aa9a380163aa9ebe480001', 'id', 'id', '0', 'String', '', null, '0', '', '', '0', '0', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f363aa9a380163aa9ebe490003', '402881f363aa9a380163aa9ebe480001', 'name', 'name', '0', 'String', 'single', null, '0', '', '', '0', '10', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f363aa9a380163aa9ebe490004', '402881f363aa9a380163aa9ebe480001', 'sex', 'sex', '0', 'String', 'single', null, '0', 'sex', '', '0', '11', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f363aa9a380163aa9ebe490005', '402881f363aa9a380163aa9ebe480001', 'age', 'age', '0', 'String', '', null, '0', '', '', '0', '12', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f363aa9a380163aa9ebe490006', '402881f363aa9a380163aa9ebe480001', 'address', 'address', '0', 'String', '', null, '0', '', '', '0', '13', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f363aa9a380163aa9ebe490007', '402881f363aa9a380163aa9ebe480001', 'phone', 'phone', '0', 'String', '', null, '0', '', '', '0', '14', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f363aa9a380163aa9ebe4a0008', '402881f363aa9a380163aa9ebe480001', 'memo', 'memo', '0', 'String', '', null, '0', '', '', '0', '15', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f36402f3de016403035d2c0004', '402880e64eb9a22c014eb9a4d5890001', 'ID', 'ID', '0', 'String', '', null, '0', '', '', '0', '0', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f36402f3de016403035d2c0005', '402880e64eb9a22c014eb9a4d5890001', 'activitiSync', 'activitiSync', '0', 'String', '', null, '0', '', '', '0', '1', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f36402f3de016403035d2d0006', '402880e64eb9a22c014eb9a4d5890001', 'browser', 'browser', '0', 'String', '', null, '0', '', '', '0', '2', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f36402f3de016403035d2d0007', '402880e64eb9a22c014eb9a4d5890001', 'password', 'password', '0', 'String', '', null, '0', '', '', '0', '3', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f36402f3de016403035d2e0008', '402880e64eb9a22c014eb9a4d5890001', 'realname', 'realname', '0', 'String', '', null, '0', '', '', '0', '4', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f36402f3de016403035d2e0009', '402880e64eb9a22c014eb9a4d5890001', 'signature', 'signature', '0', 'String', '', null, '0', '', '', '0', '5', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f36402f3de016403035d2f000a', '402880e64eb9a22c014eb9a4d5890001', 'status', 'status', '0', 'String', '', null, '0', '', '', '0', '6', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f36402f3de016403035d30000b', '402880e64eb9a22c014eb9a4d5890001', 'userkey', 'userkey', '0', 'String', '', null, '0', '', '', '0', '7', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f36402f3de016403035d30000c', '402880e64eb9a22c014eb9a4d5890001', 'username', 'username', '0', 'String', '', null, '0', '', '', '0', '8', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f36402f3de016403035d31000d', '402880e64eb9a22c014eb9a4d5890001', 'departid', 'departid', '0', 'String', '', null, '0', '', '', '0', '9', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f36402f3de016403035d31000e', '402880e64eb9a22c014eb9a4d5890001', 'user_name_en', 'user_name_en', '0', 'String', '', null, '0', '', '', '0', '10', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f36402f3de016403035d32000f', '402880e64eb9a22c014eb9a4d5890001', 'delete_flag', 'delete_flag', '0', 'String', '', null, '0', '', '', '0', '11', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f3647e95be01647eb88c400003', '402880e74d76e784014d76f9e783001e', 'account', 'account', '0', 'String', 'single', null, '0', '', '', '0', '0', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('402881f3647e95be01647eb88c410004', '402880e74d76e784014d76f9e783001e', 'realname', 'realname', '0', 'String', '', null, '0', '', '', '0', '1', '', null, null, null, null);
-INSERT INTO `onl_cgreport_item` VALUES ('61ef5b323134938fdd07ad5e3ea16cd3', '87b55a515d3441b6b98e48e5b35474a6', 'key_word', '关键词', null, 'String', 'single', '0', '1', '', '', '1', '5', '', 'admin', '2019-03-20 19:26:39', 'admin', '2019-03-27 18:05:04');
-INSERT INTO `onl_cgreport_item` VALUES ('627768efd9ba2c41e905579048f21000', '6c7f59741c814347905a938f06ee003c', 'username', '用户名', null, 'String', null, '0', '0', '', '', '1', '2', '', 'admin', '2019-03-25 11:20:45', 'admin', '2019-04-03 15:40:31');
-INSERT INTO `onl_cgreport_item` VALUES ('8a2dfe672f3c0d391ace4a9f9bf564ff', '402880ec5d872157015d87f2dd940010', 'data_id', '数据ID', null, 'String', null, '0', '0', null, null, '1', '0', null, 'admin', '2019-03-20 13:24:21', 'admin', '2019-03-20 13:25:08');
-INSERT INTO `onl_cgreport_item` VALUES ('8bb087a9aa2000bcae17a1b3f5768435', '6c7f59741c814347905a938f06ee003c', 'sex', '性别', null, 'String', null, '0', '0', 'sex', '', '1', '5', '', 'admin', '2019-03-25 11:20:45', 'admin', '2019-04-03 15:40:31');
-INSERT INTO `onl_cgreport_item` VALUES ('90d4fa57d301801abb26a9b86b6b94c4', '6c7f59741c814347905a938f06ee003c', 'birthday', '生日', null, 'Date', null, '0', '0', '', '', '1', '4', '', 'admin', '2019-03-25 11:20:45', 'admin', '2019-04-03 15:40:31');
-INSERT INTO `onl_cgreport_item` VALUES ('9a0a7375479b7657e16c6a228354b495', '402880ec5d872157015d87f2dd940010', 'data_version', '数据版本', null, 'String', null, '0', '0', null, null, '1', '0', null, 'admin', '2019-03-20 13:24:21', 'admin', '2019-03-20 13:25:08');
-INSERT INTO `onl_cgreport_item` VALUES ('a4ac355f07a05218854e5f23e2930163', '6c7f59741c814347905a938f06ee003c', 'avatar', '头像', null, 'String', null, '0', '0', '', '', '0', '6', '', 'admin', '2019-03-25 11:20:45', 'admin', '2019-04-03 15:40:31');
-INSERT INTO `onl_cgreport_item` VALUES ('ae4d621e391a1392779175cf5a65134c', '87b55a515d3441b6b98e48e5b35474a6', 'update_by', '修改人', null, 'String', null, '0', '0', '', '', '1', '7', '', 'admin', '2019-03-20 19:26:39', 'admin', '2019-03-27 18:05:04');
-INSERT INTO `onl_cgreport_item` VALUES ('b27bea35b1264003c79d38cb86d6929e', '6c7f59741c814347905a938f06ee003c', 'id', 'id', null, 'String', null, '0', '0', '', '', '0', '1', '', 'admin', '2019-03-25 11:20:45', 'admin', '2019-04-03 15:40:31');
-INSERT INTO `onl_cgreport_item` VALUES ('ce5168755a734ea09dd190e28bf8d9f4', '87b55a515d3441b6b98e48e5b35474a6', 'update_time', '修改时间', null, 'String', null, '0', '0', '', '', '1', '2', '', 'admin', '2019-03-20 19:26:39', 'admin', '2019-03-27 18:05:04');
-INSERT INTO `onl_cgreport_item` VALUES ('d6e86b5ffd096ddcc445c0f320a45004', '6c7f59741c814347905a938f06ee003c', 'phone', '手机号', null, 'String', null, '0', '0', '', '', '1', '11', '', 'admin', '2019-03-25 11:20:45', 'admin', '2019-04-03 15:40:31');
-INSERT INTO `onl_cgreport_item` VALUES ('df365cd357699eea96c29763d1dd7f9d', '6c7f59741c814347905a938f06ee003c', 'email', '邮箱', null, 'String', null, '0', '0', '', '', '1', '14', '', 'admin', '2019-03-25 11:20:45', 'admin', '2019-04-03 15:40:31');
-INSERT INTO `onl_cgreport_item` VALUES ('edf9932912b81ad01dd557d3d593a559', '87b55a515d3441b6b98e48e5b35474a6', 'age', '年龄', null, 'String', null, '0', '0', '', '', '1', '8', '', 'admin', '2019-03-20 19:26:39', 'admin', '2019-03-27 18:05:04');
-INSERT INTO `onl_cgreport_item` VALUES ('f985883e509a6faaaf62ca07fd24a73c', '87b55a515d3441b6b98e48e5b35474a6', 'birthday', '生日', null, 'Date', 'single', '0', '1', '', '', '1', '1', '', 'admin', '2019-03-20 19:26:39', 'admin', '2019-03-27 18:05:04');
-INSERT INTO `onl_cgreport_item` VALUES ('fce83e4258de3e2f114ab3116397670c', '87b55a515d3441b6b98e48e5b35474a6', 'punch_time', '发布时间', null, 'String', null, '0', '0', '', '', '1', '3', '', 'admin', '2019-03-20 19:26:39', 'admin', '2019-03-27 18:05:04');
-
--- ----------------------------
--- Table structure for onl_cgreport_param
--- ----------------------------
-DROP TABLE IF EXISTS `onl_cgreport_param`;
-CREATE TABLE `onl_cgreport_param` (
- `id` varchar(36) NOT NULL,
- `cgrhead_id` varchar(36) NOT NULL COMMENT '动态报表ID',
- `param_name` varchar(32) NOT NULL COMMENT '参数字段',
- `param_txt` varchar(32) default NULL COMMENT '参数文本',
- `param_value` varchar(32) default NULL COMMENT '参数默认值',
- `order_num` int(11) default NULL COMMENT '排序',
- `create_by` varchar(50) default NULL COMMENT '创建人登录名称',
- `create_time` datetime default NULL COMMENT '创建日期',
- `update_by` varchar(50) default NULL COMMENT '更新人登录名称',
- `update_time` datetime default NULL COMMENT '更新日期',
- PRIMARY KEY (`id`),
- KEY `idx_cgrheadid` USING BTREE (`cgrhead_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- ----------------------------
--- Records of onl_cgreport_param
--- ----------------------------
-INSERT INTO `onl_cgreport_param` VALUES ('402881f36402f3de016403035d350010', '402880e64eb9a22c014eb9a4d5890001', 'usekey', 'usekey', '', '0', 'admin', '2018-06-15 18:35:09', null, null);
+ `update_by` varchar(32) default NULL COMMENT '修改人id'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='流程测试';
-- ----------------------------
-- Table structure for qrtz_blob_triggers
@@ -417,10 +152,6 @@ CREATE TABLE `qrtz_blob_triggers` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='InnoDB free: 504832 kB; (`SCHED_NAME` `TRIGGER_NAME` `TRIGGE';
-- ----------------------------
--- Records of qrtz_blob_triggers
--- ----------------------------
-
--- ----------------------------
-- Table structure for qrtz_calendars
-- ----------------------------
DROP TABLE IF EXISTS `qrtz_calendars`;
@@ -432,10 +163,6 @@ CREATE TABLE `qrtz_calendars` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- ----------------------------
--- Records of qrtz_calendars
--- ----------------------------
-
--- ----------------------------
-- Table structure for qrtz_cron_triggers
-- ----------------------------
DROP TABLE IF EXISTS `qrtz_cron_triggers`;
@@ -450,10 +177,6 @@ CREATE TABLE `qrtz_cron_triggers` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='InnoDB free: 504832 kB; (`SCHED_NAME` `TRIGGER_NAME` `TRIGGE';
-- ----------------------------
--- Records of qrtz_cron_triggers
--- ----------------------------
-
--- ----------------------------
-- Table structure for qrtz_fired_triggers
-- ----------------------------
DROP TABLE IF EXISTS `qrtz_fired_triggers`;
@@ -475,10 +198,6 @@ CREATE TABLE `qrtz_fired_triggers` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- ----------------------------
--- Records of qrtz_fired_triggers
--- ----------------------------
-
--- ----------------------------
-- Table structure for qrtz_job_details
-- ----------------------------
DROP TABLE IF EXISTS `qrtz_job_details`;
@@ -497,10 +216,6 @@ CREATE TABLE `qrtz_job_details` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- ----------------------------
--- Records of qrtz_job_details
--- ----------------------------
-
--- ----------------------------
-- Table structure for qrtz_locks
-- ----------------------------
DROP TABLE IF EXISTS `qrtz_locks`;
@@ -511,11 +226,6 @@ CREATE TABLE `qrtz_locks` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- ----------------------------
--- Records of qrtz_locks
--- ----------------------------
-INSERT INTO `qrtz_locks` VALUES ('quartzScheduler', 'TRIGGER_ACCESS');
-
--- ----------------------------
-- Table structure for qrtz_paused_trigger_grps
-- ----------------------------
DROP TABLE IF EXISTS `qrtz_paused_trigger_grps`;
@@ -526,10 +236,6 @@ CREATE TABLE `qrtz_paused_trigger_grps` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- ----------------------------
--- Records of qrtz_paused_trigger_grps
--- ----------------------------
-
--- ----------------------------
-- Table structure for qrtz_scheduler_state
-- ----------------------------
DROP TABLE IF EXISTS `qrtz_scheduler_state`;
@@ -542,10 +248,6 @@ CREATE TABLE `qrtz_scheduler_state` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- ----------------------------
--- Records of qrtz_scheduler_state
--- ----------------------------
-
--- ----------------------------
-- Table structure for qrtz_simple_triggers
-- ----------------------------
DROP TABLE IF EXISTS `qrtz_simple_triggers`;
@@ -561,10 +263,6 @@ CREATE TABLE `qrtz_simple_triggers` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='InnoDB free: 504832 kB; (`SCHED_NAME` `TRIGGER_NAME` `TRIGGE';
-- ----------------------------
--- Records of qrtz_simple_triggers
--- ----------------------------
-
--- ----------------------------
-- Table structure for qrtz_simprop_triggers
-- ----------------------------
DROP TABLE IF EXISTS `qrtz_simprop_triggers`;
@@ -588,10 +286,6 @@ CREATE TABLE `qrtz_simprop_triggers` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='InnoDB free: 504832 kB; (`SCHED_NAME` `TRIGGER_NAME` `TRIGGE';
-- ----------------------------
--- Records of qrtz_simprop_triggers
--- ----------------------------
-
--- ----------------------------
-- Table structure for qrtz_triggers
-- ----------------------------
DROP TABLE IF EXISTS `qrtz_triggers`;
@@ -618,10 +312,6 @@ CREATE TABLE `qrtz_triggers` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='InnoDB free: 504832 kB; (`SCHED_NAME` `JOB_NAME` `JOB_GROUP`';
-- ----------------------------
--- Records of qrtz_triggers
--- ----------------------------
-
--- ----------------------------
-- Table structure for sys_announcement
-- ----------------------------
DROP TABLE IF EXISTS `sys_announcement`;
@@ -633,6 +323,7 @@ CREATE TABLE `sys_announcement` (
`end_time` datetime default NULL COMMENT '结束时间',
`sender` varchar(100) default NULL COMMENT '发布人',
`priority` varchar(255) default NULL COMMENT '优先级（L低，M中，H高）',
+ `msg_category` varchar(10) NOT NULL default '2' COMMENT '消息类型1:通知公告2:系统消息',
`msg_type` varchar(10) default NULL COMMENT '通告对象类型（USER:指定用户，ALL:全体用户）',
`send_status` varchar(10) default NULL COMMENT '发布状态（0未发布，1已发布，2已撤销）',
`send_time` datetime default NULL COMMENT '发布时间',
@@ -647,16 +338,6 @@ CREATE TABLE `sys_announcement` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='系统通告表';
-- ----------------------------
--- Records of sys_announcement
--- ----------------------------
-INSERT INTO `sys_announcement` VALUES ('1b714f8ebc3cc33f8b4f906103b6a18d', '5467567', null, null, null, 'admin', null, null, '1', '2019-03-30 12:40:38', null, '0', 'admin', '2019-02-26 17:23:26', 'admin', '2019-02-26 17:35:10', null);
-INSERT INTO `sys_announcement` VALUES ('3d11237ccdf62450d20bb8abdb331178', '111222', null, null, null, null, null, null, '0', null, null, '1', 'admin', '2019-03-29 17:19:47', 'admin', '2019-03-29 17:19:50', null);
-INSERT INTO `sys_announcement` VALUES ('7ef04e95f8de030b1d5f7a9144090dc6', '111', null, '2019-02-06 17:28:10', '2019-03-08 17:28:11', null, null, null, '0', null, null, '1', 'admin', '2019-02-26 17:28:17', 'admin', '2019-03-26 19:59:49', null);
-INSERT INTO `sys_announcement` VALUES ('93a9060a1c20e4bf98b3f768a02c2ff9', '111', '111', '2019-02-06 17:20:17', '2019-02-21 17:20:20', 'admin', 'M', 'ALL', '1', '2019-02-26 17:24:29', null, '0', 'admin', '2019-02-26 17:16:26', 'admin', '2019-02-26 17:19:35', null);
-INSERT INTO `sys_announcement` VALUES ('de1dc57f31037079e1e55c8347fe6ef7', '222', '2222', '2019-02-06 17:28:26', '2019-02-23 17:28:28', 'admin', 'M', 'ALL', '1', '2019-03-29 17:19:56', null, '1', 'admin', '2019-02-26 17:28:36', 'admin', '2019-02-26 17:28:40', null);
-INSERT INTO `sys_announcement` VALUES ('e52f3eb6215f139cb2224c52517af3bd', '334', '334', null, null, null, null, null, '0', null, null, '1', 'admin', '2019-03-30 12:40:28', 'admin', '2019-03-30 12:40:32', null);
-
--- ----------------------------
-- Table structure for sys_announcement_send
-- ----------------------------
DROP TABLE IF EXISTS `sys_announcement_send`;
@@ -673,10 +354,6 @@ CREATE TABLE `sys_announcement_send` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户通告阅读标记表';
-- ----------------------------
--- Records of sys_announcement_send
--- ----------------------------
-
--- ----------------------------
-- Table structure for sys_data_log
-- ----------------------------
DROP TABLE IF EXISTS `sys_data_log`;
@@ -695,28 +372,7 @@ CREATE TABLE `sys_data_log` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- ----------------------------
--- Records of sys_data_log
--- ----------------------------
-INSERT INTO `sys_data_log` VALUES ('402880f05ab0d198015ab12274bf0006', 'admin', '2017-03-09 11:35:09', null, null, 'jeecg_demo', '4028ef81550c1a7901550c1cd6e70001', '{\"mobilePhone\":\"\",\"officePhone\":\"\",\"email\":\"\",\"createDate\":\"Jun 23, 2016 12:00:00 PM\",\"sex\":\"1\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"9001\",\"status\":\"1\",\"content\":\"111\",\"id\":\"4028ef81550c1a7901550c1cd6e70001\"}', '3');
-INSERT INTO `sys_data_log` VALUES ('402880f05ab6d12b015ab700bead0009', 'admin', '2017-03-10 14:56:03', null, null, 'jeecg_demo', '402880f05ab6d12b015ab700be8d0008', '{\"mobilePhone\":\"\",\"officePhone\":\"\",\"email\":\"\",\"createDate\":\"Mar 10, 2017 2:56:03 PM\",\"sex\":\"0\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"111\",\"status\":\"0\",\"id\":\"402880f05ab6d12b015ab700be8d0008\"}', '1');
-INSERT INTO `sys_data_log` VALUES ('402880f05ab6d12b015ab705a23f000d', 'admin', '2017-03-10 15:01:24', null, null, 'jeecg_demo', '402880f05ab6d12b015ab705a233000c', '{\"mobilePhone\":\"\",\"officePhone\":\"11\",\"email\":\"\",\"createDate\":\"Mar 10, 2017 3:01:24 PM\",\"sex\":\"0\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"11\",\"status\":\"0\",\"id\":\"402880f05ab6d12b015ab705a233000c\"}', '1');
-INSERT INTO `sys_data_log` VALUES ('402880f05ab6d12b015ab712a6420013', 'admin', '2017-03-10 15:15:37', null, null, 'jeecg_demo', '402880f05ab6d12b015ab712a6360012', '{\"mobilePhone\":\"\",\"officePhone\":\"\",\"email\":\"\",\"createDate\":\"Mar 10, 2017 3:15:37 PM\",\"sex\":\"0\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"小王\",\"status\":\"0\",\"id\":\"402880f05ab6d12b015ab712a6360012\"}', '1');
-INSERT INTO `sys_data_log` VALUES ('402880f05ab6d12b015ab712d0510015', 'admin', '2017-03-10 15:15:47', null, null, 'jeecg_demo', '402880f05ab6d12b015ab712a6360012', '{\"mobilePhone\":\"18611788525\",\"officePhone\":\"\",\"email\":\"\",\"createDate\":\"Mar 10, 2017 3:15:37 AM\",\"sex\":\"0\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"小王\",\"status\":\"0\",\"id\":\"402880f05ab6d12b015ab712a6360012\"}', '2');
-INSERT INTO `sys_data_log` VALUES ('402880f05ab6d12b015ab71308240018', 'admin', '2017-03-10 15:16:02', null, null, 'jeecg_demo', '8a8ab0b246dc81120146dc81860f016f', '{\"mobilePhone\":\"13111111111\",\"officePhone\":\"66666666\",\"email\":\"demo@jeecg.com\",\"age\":12,\"salary\":10.00,\"birthday\":\"Feb 14, 2014 12:00:00 AM\",\"sex\":\"1\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"小明\",\"status\":\"\",\"content\":\"\",\"id\":\"8a8ab0b246dc81120146dc81860f016f\"}', '1');
-INSERT INTO `sys_data_log` VALUES ('402880f05ab6d12b015ab72806c3001b', 'admin', '2017-03-10 15:38:58', null, null, 'jeecg_demo', '8a8ab0b246dc81120146dc81860f016f', '{\"mobilePhone\":\"18611788888\",\"officePhone\":\"66666666\",\"email\":\"demo@jeecg.com\",\"age\":12,\"salary\":10.00,\"birthday\":\"Feb 14, 2014 12:00:00 AM\",\"sex\":\"1\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"小明\",\"status\":\"\",\"content\":\"\",\"id\":\"8a8ab0b246dc81120146dc81860f016f\"}', '2');
-INSERT INTO `sys_data_log` VALUES ('4028ef815318148a0153181567690001', 'admin', '2016-02-25 18:59:29', null, null, 'jeecg_demo', '4028ef815318148a0153181566270000', '{\"mobilePhone\":\"13423423423\",\"officePhone\":\"1\",\"email\":\"\",\"age\":1,\"salary\":1,\"birthday\":\"Feb 25, 2016 12:00:00 AM\",\"createDate\":\"Feb 25, 2016 6:59:24 PM\",\"depId\":\"402880e447e9a9570147e9b6a3be0005\",\"userName\":\"1\",\"status\":\"0\",\"id\":\"4028ef815318148a0153181566270000\"}', '1');
-INSERT INTO `sys_data_log` VALUES ('4028ef815318148a01531815ec5c0003', 'admin', '2016-02-25 19:00:03', null, null, 'jeecg_demo', '4028ef815318148a0153181566270000', '{\"mobilePhone\":\"13426498659\",\"officePhone\":\"1\",\"email\":\"\",\"age\":1,\"salary\":1.00,\"birthday\":\"Feb 25, 2016 12:00:00 AM\",\"createDate\":\"Feb 25, 2016 6:59:24 AM\",\"depId\":\"402880e447e9a9570147e9b6a3be0005\",\"userName\":\"1\",\"status\":\"0\",\"id\":\"4028ef815318148a0153181566270000\"}', '2');
-INSERT INTO `sys_data_log` VALUES ('4028ef8153c028db0153c0502e6b0003', 'admin', '2016-03-29 10:59:53', null, null, 'jeecg_demo', '4028ef8153c028db0153c0502d420002', '{\"mobilePhone\":\"18455477548\",\"officePhone\":\"123\",\"email\":\"\",\"createDate\":\"Mar 29, 2016 10:59:53 AM\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"123\",\"status\":\"0\",\"id\":\"4028ef8153c028db0153c0502d420002\"}', '1');
-INSERT INTO `sys_data_log` VALUES ('4028ef8153c028db0153c0509aa40006', 'admin', '2016-03-29 11:00:21', null, null, 'jeecg_demo', '4028ef8153c028db0153c0509a3e0005', '{\"mobilePhone\":\"13565486458\",\"officePhone\":\"\",\"email\":\"\",\"createDate\":\"Mar 29, 2016 11:00:21 AM\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"22\",\"status\":\"0\",\"id\":\"4028ef8153c028db0153c0509a3e0005\"}', '1');
-INSERT INTO `sys_data_log` VALUES ('4028ef8153c028db0153c051c4a70008', 'admin', '2016-03-29 11:01:37', null, null, 'jeecg_demo', '4028ef8153c028db0153c0509a3e0005', '{\"mobilePhone\":\"13565486458\",\"officePhone\":\"\",\"email\":\"\",\"createDate\":\"Mar 29, 2016 11:00:21 AM\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"22\",\"status\":\"0\",\"id\":\"4028ef8153c028db0153c0509a3e0005\"}', '2');
-INSERT INTO `sys_data_log` VALUES ('4028ef8153c028db0153c051d4b5000a', 'admin', '2016-03-29 11:01:41', null, null, 'jeecg_demo', '4028ef8153c028db0153c0502d420002', '{\"mobilePhone\":\"13565486458\",\"officePhone\":\"123\",\"email\":\"\",\"createDate\":\"Mar 29, 2016 10:59:53 AM\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"123\",\"status\":\"0\",\"id\":\"4028ef8153c028db0153c0502d420002\"}', '2');
-INSERT INTO `sys_data_log` VALUES ('4028ef8153c028db0153c07033d8000d', 'admin', '2016-03-29 11:34:52', null, null, 'jeecg_demo', '4028ef8153c028db0153c0502d420002', '{\"mobilePhone\":\"13565486458\",\"officePhone\":\"123\",\"email\":\"\",\"age\":23,\"createDate\":\"Mar 29, 2016 10:59:53 AM\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"123\",\"status\":\"0\",\"id\":\"4028ef8153c028db0153c0502d420002\"}', '3');
-INSERT INTO `sys_data_log` VALUES ('4028ef8153c028db0153c070492e000f', 'admin', '2016-03-29 11:34:57', null, null, 'jeecg_demo', '4028ef8153c028db0153c0509a3e0005', '{\"mobilePhone\":\"13565486458\",\"officePhone\":\"\",\"email\":\"\",\"age\":22,\"createDate\":\"Mar 29, 2016 11:00:21 AM\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"22\",\"status\":\"0\",\"id\":\"4028ef8153c028db0153c0509a3e0005\"}', '3');
-INSERT INTO `sys_data_log` VALUES ('4028ef81550c1a7901550c1cd7850002', 'admin', '2016-06-01 21:17:44', null, null, 'jeecg_demo', '4028ef81550c1a7901550c1cd6e70001', '{\"mobilePhone\":\"\",\"officePhone\":\"\",\"email\":\"\",\"createDate\":\"Jun 1, 2016 9:17:44 PM\",\"sex\":\"1\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"121221\",\"status\":\"0\",\"id\":\"4028ef81550c1a7901550c1cd6e70001\"}', '1');
-INSERT INTO `sys_data_log` VALUES ('4028ef81568c31ec01568c3307080004', 'admin', '2016-08-15 11:16:09', null, null, 'jeecg_demo', '4028ef81550c1a7901550c1cd6e70001', '{\"mobilePhone\":\"\",\"officePhone\":\"\",\"email\":\"\",\"createDate\":\"Jun 23, 2016 12:00:00 PM\",\"sex\":\"1\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"9001\",\"status\":\"1\",\"content\":\"111\",\"id\":\"4028ef81550c1a7901550c1cd6e70001\"}', '2');
-
--- ----------------------------
--- Table structure for sys_depart
+-- Table structure for sys_depart
-- ----------------------------
DROP TABLE IF EXISTS `sys_depart`;
CREATE TABLE `sys_depart` (
@@ -727,7 +383,7 @@ CREATE TABLE `sys_depart` (
`depart_name_abbr` varchar(500) default NULL COMMENT '缩写',
`depart_order` int(11) default '0' COMMENT '排序',
`description` text COMMENT '描述',
- `org_type` varchar(10) default NULL COMMENT '机构类型',
+ `org_type` varchar(10) default NULL COMMENT '机构类型 1一级部门 2子部门',
`org_code` varchar(64) NOT NULL COMMENT '机构编码',
`mobile` varchar(32) default NULL COMMENT '手机号',
`fax` varchar(32) default NULL COMMENT '传真',
@@ -746,18 +402,6 @@ CREATE TABLE `sys_depart` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='组织机构表';
-- ----------------------------
--- Records of sys_depart
--- ----------------------------
-INSERT INTO `sys_depart` VALUES ('4f1765520d6346f9bd9c79e2479e5b12', 'c6d7cb4deeac411cb3384b1b31278596', '市场部', null, null, '0', null, '2', 'A01A03', null, null, null, null, null, '0', 'admin', '2019-02-20 17:15:34', 'admin', '2019-02-26 16:36:18');
-INSERT INTO `sys_depart` VALUES ('5159cde220114246b045e574adceafe9', '6d35e179cd814e3299bd588ea7daed3f', '研发部', null, null, '0', null, '2', 'A02A02', null, null, null, null, null, '0', 'admin', '2019-02-26 16:44:38', 'admin', '2019-03-07 09:36:53');
-INSERT INTO `sys_depart` VALUES ('57197590443c44f083d42ae24ef26a2c', 'c6d7cb4deeac411cb3384b1b31278596', '研发部', null, null, '0', null, '2', 'A01A05', null, null, null, null, null, '0', 'admin', '2019-02-21 16:14:41', 'admin', '2019-03-27 19:05:49');
-INSERT INTO `sys_depart` VALUES ('67fc001af12a4f9b8458005d3f19934a', 'c6d7cb4deeac411cb3384b1b31278596', '财务部', null, null, '0', null, '2', 'A01A04', null, null, null, null, null, '0', 'admin', '2019-02-21 16:14:35', 'admin', '2019-02-25 12:49:41');
-INSERT INTO `sys_depart` VALUES ('6d35e179cd814e3299bd588ea7daed3f', '', '卓尔互动公司', null, null, '0', null, '1', 'A02', null, null, null, null, null, '0', 'admin', '2019-02-26 16:36:39', 'admin', '2019-03-22 16:47:25');
-INSERT INTO `sys_depart` VALUES ('743ba9dbdc114af8953a11022ef3096a', 'f28c6f53abd841ac87ead43afc483433', '财务部', null, null, '0', null, '2', 'A03A01', null, null, null, null, null, '0', 'admin', '2019-03-22 16:45:43', null, null);
-INSERT INTO `sys_depart` VALUES ('a7d7e77e06c84325a40932163adcdaa6', '6d35e179cd814e3299bd588ea7daed3f', '财务部', null, null, '0', null, '2', 'A02A01', null, null, null, null, null, '0', 'admin', '2019-02-26 16:36:47', 'admin', '2019-02-26 16:37:25');
-INSERT INTO `sys_depart` VALUES ('c6d7cb4deeac411cb3384b1b31278596', '', '北京国炬公司', null, null, '0', null, '1', 'A01', null, null, null, null, null, '0', 'admin', '2019-02-11 14:21:51', 'admin', '2019-03-22 16:47:19');
-
--- ----------------------------
-- Table structure for sys_dict
-- ----------------------------
DROP TABLE IF EXISTS `sys_dict`;
@@ -777,64 +421,642 @@ CREATE TABLE `sys_dict` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- ----------------------------
+-- Table structure for sys_dict_item
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_dict_item`;
+CREATE TABLE `sys_dict_item` (
+ `id` varchar(32) NOT NULL,
+ `dict_id` varchar(32) default NULL COMMENT '字典id',
+ `item_text` varchar(100) default NULL COMMENT '字典项文本',
+ `item_value` varchar(100) default NULL COMMENT '字典项值',
+ `description` varchar(255) default NULL COMMENT '描述',
+ `sort_order` int(10) default NULL COMMENT '排序',
+ `status` int(11) default NULL COMMENT '状态（1启用 0不启用）',
+ `create_by` varchar(32) default NULL,
+ `create_time` datetime default NULL,
+ `update_by` varchar(32) default NULL,
+ `update_time` datetime default NULL,
+ PRIMARY KEY (`id`),
+ KEY `index_table_dict_id` USING BTREE (`dict_id`),
+ KEY `index_table_sort_order` USING BTREE (`sort_order`),
+ KEY `index_table_dict_status` USING BTREE (`status`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for sys_log
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_log`;
+CREATE TABLE `sys_log` (
+ `id` varchar(32) NOT NULL,
+ `log_type` int(2) default NULL COMMENT '日志类型（1登录日志，2操作日志）',
+ `log_content` varchar(1000) default NULL COMMENT '日志内容',
+ `operate_type` int(2) default NULL COMMENT '操作类型',
+ `userid` varchar(32) default NULL COMMENT '操作用户账号',
+ `username` varchar(100) default NULL COMMENT '操作用户名称',
+ `ip` varchar(100) default NULL COMMENT 'IP',
+ `method` varchar(500) default NULL COMMENT '请求java方法',
+ `request_url` varchar(255) default NULL COMMENT '请求路径',
+ `request_param` varchar(255) default NULL COMMENT '请求参数',
+ `request_type` varchar(10) default NULL COMMENT '请求类型',
+ `cost_time` bigint(20) default NULL COMMENT '耗时',
+ `create_by` varchar(32) default NULL COMMENT '创建人',
+ `create_time` datetime default NULL COMMENT '创建时间',
+ `update_by` varchar(32) default NULL COMMENT '更新人',
+ `update_time` datetime default NULL COMMENT '更新时间',
+ PRIMARY KEY (`id`),
+ KEY `index_table_userid` USING BTREE (`userid`),
+ KEY `index_logt_ype` USING BTREE (`log_type`),
+ KEY `index_operate_type` USING BTREE (`operate_type`),
+ KEY `index_log_type` USING BTREE (`log_type`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='系统日志表';
+
+-- ----------------------------
+-- Table structure for sys_permission
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_permission`;
+CREATE TABLE `sys_permission` (
+ `id` varchar(32) NOT NULL COMMENT '主键id',
+ `parent_id` varchar(32) default NULL COMMENT '父id',
+ `name` varchar(100) default NULL COMMENT '菜单标题',
+ `url` varchar(255) default NULL COMMENT '路径',
+ `component` varchar(255) default NULL COMMENT '组件',
+ `component_name` varchar(100) default NULL COMMENT '组件名字',
+ `redirect` varchar(255) default NULL COMMENT '一级菜单跳转地址',
+ `menu_type` int(11) default NULL COMMENT '菜单类型(0:一级菜单; 1:子菜单:2:按钮权限)',
+ `perms` varchar(255) default NULL COMMENT '菜单权限编码',
+ `perms_type` varchar(10) default '0' COMMENT '权限策略1显示2禁用',
+ `sort_no` int(10) default NULL COMMENT '菜单排序',
+ `always_show` tinyint(1) default NULL COMMENT '聚合子路由: 1是0否',
+ `icon` varchar(100) default NULL COMMENT '菜单图标',
+ `is_route` tinyint(1) default '1' COMMENT '是否路由菜单: 0:不是 1:是（默认值1）',
+ `is_leaf` tinyint(1) default NULL COMMENT '是否叶子节点: 1:是 0:不是',
+ `hidden` int(2) default '0' COMMENT '是否隐藏路由: 0否,1是',
+ `description` varchar(255) default NULL COMMENT '描述',
+ `create_by` varchar(32) default NULL COMMENT '创建人',
+ `create_time` datetime default NULL COMMENT '创建时间',
+ `update_by` varchar(32) default NULL COMMENT '更新人',
+ `update_time` datetime default NULL COMMENT '更新时间',
+ `del_flag` int(1) default '0' COMMENT '删除状态 0正常 1已删除',
+ `rule_flag` int(3) default '0' COMMENT '是否添加数据权限1是0否',
+ `status` varchar(2) default NULL COMMENT '按钮权限状态(0无效1有效)',
+ PRIMARY KEY (`id`),
+ KEY `index_prem_pid` USING BTREE (`parent_id`),
+ KEY `index_prem_is_route` USING BTREE (`is_route`),
+ KEY `index_prem_is_leaf` USING BTREE (`is_leaf`),
+ KEY `index_prem_sort_no` USING BTREE (`sort_no`),
+ KEY `index_prem_del_flag` USING BTREE (`del_flag`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='菜单权限表';
+
+-- ----------------------------
+-- Table structure for sys_permission_data_rule
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_permission_data_rule`;
+CREATE TABLE `sys_permission_data_rule` (
+ `id` varchar(32) NOT NULL COMMENT 'ID',
+ `permission_id` varchar(32) default NULL COMMENT '菜单ID',
+ `rule_name` varchar(50) default NULL COMMENT '规则名称',
+ `rule_column` varchar(50) default NULL COMMENT '字段',
+ `rule_conditions` varchar(50) default NULL COMMENT '条件',
+ `rule_value` varchar(300) default NULL COMMENT '规则值',
+ `status` varchar(3) default NULL COMMENT '权限有效状态1有0否',
+ `create_time` datetime default NULL COMMENT '创建时间',
+ `create_by` varchar(32) default NULL,
+ `update_time` datetime default NULL COMMENT '修改时间',
+ `update_by` varchar(32) default NULL COMMENT '修改人',
+ PRIMARY KEY (`id`),
+ KEY `index_fucntionid` USING BTREE (`permission_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for sys_quartz_job
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_quartz_job`;
+CREATE TABLE `sys_quartz_job` (
+ `id` varchar(32) NOT NULL,
+ `create_by` varchar(32) default NULL COMMENT '创建人',
+ `create_time` datetime default NULL COMMENT '创建时间',
+ `del_flag` int(1) default NULL COMMENT '删除状态',
+ `update_by` varchar(32) default NULL COMMENT '修改人',
+ `update_time` datetime default NULL COMMENT '修改时间',
+ `job_class_name` varchar(255) default NULL COMMENT '任务类名',
+ `cron_expression` varchar(255) default NULL COMMENT 'cron表达式',
+ `parameter` varchar(255) default NULL COMMENT '参数',
+ `description` varchar(255) default NULL COMMENT '描述',
+ `status` int(1) default NULL COMMENT '状态 0正常 -1停止',
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for sys_role
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_role`;
+CREATE TABLE `sys_role` (
+ `id` varchar(32) NOT NULL COMMENT '主键id',
+ `role_name` varchar(200) default NULL COMMENT '角色名称',
+ `role_code` varchar(100) NOT NULL COMMENT '角色编码',
+ `description` varchar(255) default NULL COMMENT '描述',
+ `create_by` varchar(32) default NULL COMMENT '创建人',
+ `create_time` datetime default NULL COMMENT '创建时间',
+ `update_by` varchar(32) default NULL COMMENT '更新人',
+ `update_time` datetime default NULL COMMENT '更新时间',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `index_role_code` USING BTREE (`role_code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='角色表';
+
+-- ----------------------------
+-- Table structure for sys_role_permission
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_role_permission`;
+CREATE TABLE `sys_role_permission` (
+ `id` varchar(32) NOT NULL,
+ `role_id` varchar(32) default NULL COMMENT '角色id',
+ `permission_id` varchar(32) default NULL COMMENT '权限id',
+ `data_rule_ids` varchar(1000) default NULL,
+ PRIMARY KEY (`id`),
+ KEY `index_group_role_per_id` USING BTREE (`role_id`,`permission_id`),
+ KEY `index_group_role_id` USING BTREE (`role_id`),
+ KEY `index_group_per_id` USING BTREE (`permission_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='角色权限表';
+
+-- ----------------------------
+-- Table structure for sys_sms
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_sms`;
+CREATE TABLE `sys_sms` (
+ `id` varchar(32) NOT NULL COMMENT 'ID',
+ `es_title` varchar(100) default NULL COMMENT '消息标题',
+ `es_type` varchar(1) default NULL COMMENT '发送方式：1短信 2邮件 3微信',
+ `es_receiver` varchar(50) default NULL COMMENT '接收人',
+ `es_param` varchar(1000) default NULL COMMENT '发送所需参数Json格式',
+ `es_content` longtext COMMENT '推送内容',
+ `es_send_time` datetime default NULL COMMENT '推送时间',
+ `es_send_status` varchar(1) default NULL COMMENT '推送状态 0未推送 1推送成功 2推送失败 -1失败不再发送',
+ `es_send_num` int(11) default NULL COMMENT '发送次数 超过5次不再发送',
+ `es_result` varchar(255) default NULL COMMENT '推送失败原因',
+ `remark` varchar(500) default NULL COMMENT '备注',
+ `create_by` varchar(32) default NULL COMMENT '创建人登录名称',
+ `create_time` datetime default NULL COMMENT '创建日期',
+ `update_by` varchar(32) default NULL COMMENT '更新人登录名称',
+ `update_time` datetime default NULL COMMENT '更新日期',
+ PRIMARY KEY (`id`),
+ KEY `index_type` USING BTREE (`es_type`),
+ KEY `index_receiver` USING BTREE (`es_receiver`),
+ KEY `index_sendtime` USING BTREE (`es_send_time`),
+ KEY `index_status` USING BTREE (`es_send_status`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for sys_sms_template
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_sms_template`;
+CREATE TABLE `sys_sms_template` (
+ `id` varchar(32) NOT NULL COMMENT '主键',
+ `template_name` varchar(50) default NULL COMMENT '模板标题',
+ `template_code` varchar(32) NOT NULL COMMENT '模板CODE',
+ `template_type` varchar(1) NOT NULL COMMENT '模板类型：1短信 2邮件 3微信',
+ `template_content` varchar(1000) NOT NULL COMMENT '模板内容',
+ `template_test_json` varchar(1000) default NULL COMMENT '模板测试json',
+ `create_time` datetime default NULL COMMENT '创建日期',
+ `create_by` varchar(32) default NULL COMMENT '创建人登录名称',
+ `update_time` datetime default NULL COMMENT '更新日期',
+ `update_by` varchar(32) default NULL COMMENT '更新人登录名称',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `uniq_templatecode` USING BTREE (`template_code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for sys_user
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_user`;
+CREATE TABLE `sys_user` (
+ `id` varchar(32) NOT NULL COMMENT '主键id',
+ `username` varchar(100) default NULL COMMENT '登录账号',
+ `realname` varchar(100) default NULL COMMENT '真实姓名',
+ `password` varchar(255) default NULL COMMENT '密码',
+ `salt` varchar(45) default NULL COMMENT 'md5密码盐',
+ `avatar` varchar(255) default NULL COMMENT '头像',
+ `birthday` datetime default NULL COMMENT '生日',
+ `sex` int(11) default NULL COMMENT '性别（1：男 2：女）',
+ `email` varchar(45) default NULL COMMENT '电子邮件',
+ `phone` varchar(45) default NULL COMMENT '电话',
+ `org_code` varchar(100) default NULL COMMENT '部门code',
+ `status` int(2) default NULL COMMENT '状态(1：正常 2：冻结 ）',
+ `del_flag` varchar(1) default NULL COMMENT '删除状态（0，正常，1已删除）',
+ `activiti_sync` varchar(6) default NULL COMMENT '同步工作流引擎1同步0不同步',
+ `create_by` varchar(32) default NULL COMMENT '创建人',
+ `create_time` datetime default NULL COMMENT '创建时间',
+ `update_by` varchar(32) default NULL COMMENT '更新人',
+ `update_time` datetime default NULL COMMENT '更新时间',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `index_user_name` USING BTREE (`username`),
+ KEY `index_user_status` USING BTREE (`status`),
+ KEY `index_user_del_flag` USING BTREE (`del_flag`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户表';
+
+-- ----------------------------
+-- Table structure for sys_user_agent
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_user_agent`;
+CREATE TABLE `sys_user_agent` (
+ `id` varchar(32) NOT NULL COMMENT '序号',
+ `user_name` varchar(100) default NULL COMMENT '用户名',
+ `agent_user_name` varchar(100) default NULL COMMENT '代理人用户名',
+ `start_time` datetime default NULL COMMENT '代理开始时间',
+ `end_time` datetime default NULL COMMENT '代理结束时间',
+ `status` varchar(2) default NULL COMMENT '状态0无效1有效',
+ `create_name` varchar(50) default NULL COMMENT '创建人名称',
+ `create_by` varchar(50) default NULL COMMENT '创建人登录名称',
+ `create_time` datetime default NULL COMMENT '创建日期',
+ `update_name` varchar(50) default NULL COMMENT '更新人名称',
+ `update_by` varchar(50) default NULL COMMENT '更新人登录名称',
+ `update_time` datetime default NULL COMMENT '更新日期',
+ `sys_org_code` varchar(50) default NULL COMMENT '所属部门',
+ `sys_company_code` varchar(50) default NULL COMMENT '所属公司',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `uniq_username` USING BTREE (`user_name`),
+ KEY `statux_index` USING BTREE (`status`),
+ KEY `begintime_index` USING BTREE (`start_time`),
+ KEY `endtime_index` USING BTREE (`end_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户代理人设置';
+
+-- ----------------------------
+-- Table structure for sys_user_depart
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_user_depart`;
+CREATE TABLE `sys_user_depart` (
+ `ID` varchar(32) NOT NULL COMMENT 'id',
+ `user_id` varchar(32) default NULL COMMENT '用户id',
+ `dep_id` varchar(32) default NULL COMMENT '部门id',
+ PRIMARY KEY (`ID`),
+ KEY `index_depart_groupk_userid` USING BTREE (`user_id`),
+ KEY `index_depart_groupkorgid` USING BTREE (`dep_id`),
+ KEY `index_depart_groupk_uidanddid` USING BTREE (`user_id`,`dep_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for sys_user_role
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_user_role`;
+CREATE TABLE `sys_user_role` (
+ `id` varchar(32) NOT NULL COMMENT '主键id',
+ `user_id` varchar(32) default NULL COMMENT '用户id',
+ `role_id` varchar(32) default NULL COMMENT '角色id',
+ PRIMARY KEY (`id`),
+ KEY `index2_groupuu_user_id` USING BTREE (`user_id`),
+ KEY `index2_groupuu_ole_id` USING BTREE (`role_id`),
+ KEY `index2_groupuu_useridandroleid` USING BTREE (`user_id`,`role_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户角色表';
+
+-- ----------------------------
+-- Table structure for test_person
+-- ----------------------------
+DROP TABLE IF EXISTS `test_person`;
+CREATE TABLE `test_person` (
+ `id` varchar(36) NOT NULL,
+ `create_by` varchar(50) default NULL COMMENT '创建人',
+ `create_time` datetime default NULL COMMENT '创建日期',
+ `update_by` varchar(50) default NULL COMMENT '更新人',
+ `update_time` datetime default NULL COMMENT '更新日期',
+ `sex` varchar(32) default NULL COMMENT '性别',
+ `name` varchar(200) default NULL COMMENT '用户名',
+ `content` longtext COMMENT '请假原因',
+ `be_date` datetime default NULL COMMENT '请假时间',
+ `qj_days` int(11) default NULL COMMENT '请假天数',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+
+
+
+-- ----------------------------
+-- Records of demo
+-- ----------------------------
+INSERT INTO `demo` VALUES ('08375a2dff80e821d5a158dd98302b23', '导入小虎', null, null, null, null, '2', '28', null, null, null, 'jeecg-boot', '2019-04-10 11:42:57', null, null);
+INSERT INTO `demo` VALUES ('1c2ba51b29a42d9de02bbd708ea8121a', '777777', '777', '2018-12-07 19:43:17', null, null, null, '7', '2018-12-07', null, null, null, null, 'admin', '2019-02-21 18:26:04');
+INSERT INTO `demo` VALUES ('1dc29e80be14d1400f165b5c6b30c707', 'zhang daihao', null, null, null, null, '2', null, null, 'zhangdaiscott@163.com', null, null, null, null, null);
+INSERT INTO `demo` VALUES ('304e651dc769d5c9b6e08fb30457a602', '小白兔', null, null, null, null, '2', '28', null, null, null, 'scott', '2019-01-19 13:12:53', 'qinfeng', '2019-01-19 13:13:12');
+INSERT INTO `demo` VALUES ('4', 'Sandy', '开源，很好', '2018-12-15 00:00:00', null, null, '2', '21', '2018-12-15', 'test4@baomidou.com', '聪明00', null, null, 'admin', '2019-02-25 16:29:27');
+INSERT INTO `demo` VALUES ('42c08b1a2e5b2a96ffa4cc88383d4b11', '秦50090', null, '2019-01-05 20:33:31', null, null, null, '28', '2019-01-05', null, null, 'admin', '2019-01-19 20:33:54', 'admin', '2019-01-19 20:34:29');
+INSERT INTO `demo` VALUES ('4436302a0de50bb83025286bc414d6a9', 'zhang daihao', null, null, null, null, null, null, null, 'zhangdaiscott@163.com', null, 'admin', '2019-01-19 15:39:04', null, null);
+INSERT INTO `demo` VALUES ('4981637bf71b0c1ed1365241dfcfa0ea', '小虎', null, null, null, null, '2', '28', null, null, null, 'scott', '2019-01-19 13:12:53', 'qinfeng', '2019-01-19 13:13:12');
+INSERT INTO `demo` VALUES ('5c16e6a5c31296bcd3f1053d5d118815', '导入zhangdaiscott', null, null, null, null, '1', null, '2019-01-03', null, null, 'jeecg-boot', '2019-04-10 11:42:57', null, null);
+INSERT INTO `demo` VALUES ('7', 'zhangdaiscott', null, null, null, null, '1', null, '2019-01-03', null, null, null, null, null, null);
+INSERT INTO `demo` VALUES ('73bc58611012617ca446d8999379e4ac', '郭靖11a', '777', '2018-12-07 00:00:00', null, null, null, null, null, null, null, 'jeecg-boot', '2019-03-28 18:16:39', null, null);
+INSERT INTO `demo` VALUES ('917e240eaa0b1b2d198ae869b64a81c3', 'zhang daihao', null, null, null, null, '2', '0', '2018-11-29', 'zhangdaiscott@163.com', null, null, null, null, null);
+INSERT INTO `demo` VALUES ('94420c5d8fc4420dde1e7196154b3a24', '秦111', null, null, null, null, null, null, null, null, null, 'scott', '2019-01-19 12:54:58', 'qinfeng', '2019-01-19 13:12:10');
+INSERT INTO `demo` VALUES ('95740656751c5f22e5932ab0ae33b1e4', '杨康22a', '奸臣', null, null, null, null, null, null, null, null, 'jeecg-boot', '2019-03-28 18:16:39', null, null);
+INSERT INTO `demo` VALUES ('b86897900c770503771c7bb88e5d1e9b', 'scott1', '开源、很好、hello', null, null, null, '1', null, null, 'zhangdaiscott@163.com', null, 'scott', '2019-01-19 12:22:34', null, null);
+INSERT INTO `demo` VALUES ('c0b7c3de7c62a295ab715943de8a315d', '秦风555', null, null, null, null, null, null, null, null, null, 'admin', '2019-01-19 13:18:30', 'admin', '2019-01-19 13:18:50');
+INSERT INTO `demo` VALUES ('c28fa8391ef81d6fabd8bd894a7615aa', '小麦', null, null, null, null, '2', null, null, 'zhangdaiscott@163.com', null, 'jeecg-boot', '2019-04-04 17:18:09', null, null);
+INSERT INTO `demo` VALUES ('c2c0d49e3c01913067cf8d1fb3c971d2', 'zhang daihao', null, null, null, null, '2', null, null, 'zhangdaiscott@163.com', null, 'admin', '2019-01-19 23:37:18', 'admin', '2019-01-21 16:49:06');
+INSERT INTO `demo` VALUES ('c96279c666b4b82e3ef1e4e2978701ce', '报名时间', null, null, null, null, null, null, null, null, null, 'jeecg-boot', '2019-03-28 18:00:52', null, null);
+INSERT INTO `demo` VALUES ('d24668721446e8478eeeafe4db66dcff', 'zhang daihao999', null, null, null, null, '1', null, null, 'zhangdaiscott@163.com', null, null, null, null, null);
+INSERT INTO `demo` VALUES ('eaa6c1116b41dc10a94eae34cf990133', 'zhang daihao', null, null, null, null, null, null, null, 'zhangdaiscott@163.com', null, null, null, null, null);
+INSERT INTO `demo` VALUES ('ffa9da1ad40632dfcabac51d766865bd', '秦999', null, null, null, null, null, null, null, null, null, 'admin', '2019-01-19 23:36:34', 'admin', '2019-02-14 17:30:43');
+
+-- ----------------------------
+-- Records of jeecg_monthly_growth_analysis
+-- ----------------------------
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('1', '2018', '1月', '114758.90', '4426054.19');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('2', '2018', '2月', '8970734.12', '1230188.67');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('3', '2018', '3月', '26755421.23', '2048836.84');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('4', '2018', '4月', '2404990.63', '374171.44');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('5', '2018', '5月', '5450793.02', '502306.10');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('6', '2018', '6月', '17186212.11', '1375154.97');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('7', '2018', '7月', '579975.67', '461483.99');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('8', '2018', '8月', '1393590.06', '330403.76');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('9', '2018', '9月', '735761.21', '1647474.92');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('10', '2018', '10月', '1670442.44', '3423368.33');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('11', '2018', '11月', '2993130.34', '3552024.00');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('12', '2018', '12月', '4206227.26', '3645614.92');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('13', '2019', '1月', '483834.66', '418046.77');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('14', '2019', '2月', '11666578.65', '731352.20');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('15', '2019', '3月', '27080982.08', '1878538.81');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('16', '2019', '4月', '0.00', '0.00');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('17', '2019', '5月', '0.00', '0.00');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('18', '2019', '6月', '0.00', '0.00');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('19', '2019', '7月', '0.00', '0.00');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('20', '2019', '8月', '0.00', '0.00');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('21', '2019', '9月', '0.00', '0.00');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('22', '2019', '10月', '0.00', '0.00');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('23', '2019', '11月', '0.00', '0.00');
+INSERT INTO `jeecg_monthly_growth_analysis` VALUES ('24', '2019', '12月', '0.00', '0.00');
+
+-- ----------------------------
+-- Records of jeecg_order_customer
+-- ----------------------------
+INSERT INTO `jeecg_order_customer` VALUES ('15538561502720', '3333', '1', '', null, '', '0d4a2e67b538ee1bc881e5ed34f670f0', 'jeecg-boot', '2019-03-29 18:42:55', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('15538561512681', '3332333', '2', '', null, '', '0d4a2e67b538ee1bc881e5ed34f670f0', 'jeecg-boot', '2019-03-29 18:42:55', 'admin', '2019-03-29 18:43:12');
+INSERT INTO `jeecg_order_customer` VALUES ('15538561550142', '4442', '2', '', null, '', '0d4a2e67b538ee1bc881e5ed34f670f0', 'jeecg-boot', '2019-03-29 18:42:55', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('15541168497342', '444', '', '', '', '', 'f71f7f8930b5b6b1703d9948d189982b', 'admin', '2019-04-01 19:08:45', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('15541168499553', '5555', '', '', '', '', 'f71f7f8930b5b6b1703d9948d189982b', 'admin', '2019-04-01 19:08:45', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('15541169272690', '小王1', '1', '', '', '18611788525', 'f618a85b17e2c4dd58d268220c8dd9a1', 'admin', '2019-04-01 19:10:07', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('15541169288141', '效力1', '1', '', '', '18611788525', 'f618a85b17e2c4dd58d268220c8dd9a1', 'admin', '2019-04-01 19:10:07', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('15541169441372', '小红1', '1', '', '', '18611788525', 'f618a85b17e2c4dd58d268220c8dd9a1', 'admin', '2019-04-01 19:10:07', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('15543695362380', '1111', '', '', '', '', '5d6e2b9e44037526270b6206196f6689', 'admin', '2019-04-04 17:19:40', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('15543695397221', '222', '', '', '', '', '5d6e2b9e44037526270b6206196f6689', 'admin', '2019-04-04 17:19:40', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('15543695398992', '333', '', '', '', '', '5d6e2b9e44037526270b6206196f6689', 'admin', '2019-04-04 17:19:40', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('18dc5eb1068ccdfe90e358951ca1a3d6', 'dr2', '', '', '', '', '8ab1186410a65118c4d746eb085d3bed', 'admin', '2019-04-04 17:25:33', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('195d280490fe88ca1475512ddcaf2af9', '12', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('217a2bf83709775d2cd85bf598392327', '2', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('22bc052ae53ed09913b946abba93fa89', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('23bafeae88126c3bf3322a29a04f0d5e', 'x秦风', null, null, null, null, '163e2efcbc6d7d54eb3f8a137da8a75a', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('25c4a552c6843f36fad6303bfa99a382', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('2d32144e2bee63264f3f16215c258381', '33333', '2', null, null, null, 'd908bfee3377e946e59220c4a4eb414a', 'admin', '2019-04-01 16:27:03', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('2d43170d6327f941bd1a017999495e25', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('2e5f62a8b6e0a0ce19b52a6feae23d48', '3', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('313abf99558ac5f13ecca3b87e562ad1', 'scott', '2', null, null, null, 'b190737bd04cca8360e6f87c9ef9ec4e', 'admin', '2019-02-25 16:29:48', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('34a1c5cf6cee360ed610ed0bed70e0f9', '导入秦风', null, null, null, null, 'a2cce75872cc8fcc47f78de9ffd378c2', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('3c87400f8109b4cf43c5598f0d40e34d', '2', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('40964bcbbecb38e5ac15e6d08cf3cd43', '233', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('41e3dee0b0b6e6530eccb7fbb22fd7a3', '4555', '1', '370285198602058823', null, '18611788674', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('4808ae8344c7679a4a2f461db5dc3a70', '44', '1', '370285198602058823', null, '18611788674', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('4b6cef12f195fad94d57279b2241770d', 'dr12', '', '', '', '', '8ab1186410a65118c4d746eb085d3bed', 'admin', '2019-04-04 17:25:33', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('524e695283f8e8c256cc24f39d6d8542', '小王', '2', '370285198604033222', null, '18611788674', 'eb13ab35d2946a2b0cfe3452bca1e73f', 'admin', '2019-02-25 16:29:41', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('57c2a8367db34016114cbc9fa368dba0', '2', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('5df36a1608b8c7ac99ad9bc408fe54bf', '4', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('6b694e9ba54bb289ae9cc499e40031e7', 'x秦风', '1', null, null, null, 'b190737bd04cca8360e6f87c9ef9ec4e', 'admin', '2019-02-25 16:29:48', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('6c6fd2716c2dcd044ed03c2c95d261f8', '李四', '2', '370285198602058833', '', '18611788676', 'f71f7f8930b5b6b1703d9948d189982b', 'admin', '2019-04-01 19:08:45', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('742d008214dee0afff2145555692973e', '秦风', '1', '370285198602058822', null, '18611788676', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('7469c3e5d371767ff90a739d297689b5', '导入秦风', '2', null, null, null, '3a867ebf2cebce9bae3f79676d8d86f3', 'jeecg-boot', '2019-03-29 18:43:59', 'admin', '2019-04-08 17:35:02');
+INSERT INTO `jeecg_order_customer` VALUES ('7a96e2c7b24847d4a29940dbc0eda6e5', 'drscott', null, null, null, null, 'e73434dad84ebdce2d4e0c2a2f06d8ea', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('7f5a40818e225ee18bda6da7932ac5f9', '2', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('8011575abfd7c8085e71ff66df1124b9', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('8404f31d7196221a573c9bd6c8f15003', '小张', '1', '370285198602058211', null, '18611788676', 'eb13ab35d2946a2b0cfe3452bca1e73f', 'admin', '2019-02-25 16:29:41', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('859020e10a2f721f201cdbff78cf7b9f', 'scott', null, null, null, null, '163e2efcbc6d7d54eb3f8a137da8a75a', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('8cc3c4d26e3060975df3a2adb781eeb4', 'dr33', null, null, null, null, 'b2feb454e43c46b2038768899061e464', 'jeecg-boot', '2019-04-04 17:23:09', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('8d1725c23a6a50685ff0dedfd437030d', '4', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('933cae3a79f60a93922d59aace5346ce', '小王', null, '370285198604033222', null, '18611788674', '6a719071a29927a14f19482f8693d69a', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('9bdb5400b709ba4eaf3444de475880d7', 'dr22', null, null, null, null, '22c17790dcd04b296c4a2a089f71895f', 'jeecg-boot', '2019-04-04 17:23:09', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('9f87677f70e5f864679314389443a3eb', '33', '2', '370285198602058823', null, '18611788674', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('a2c2b7101f75c02deb328ba777137897', '44', '2', '370285198602058823', null, '18611788674', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('ab4d002dc552c326147e318c87d3bed4', 'ddddd', '1', '370285198604033222', null, '18611755848', '9a57c850e4f68cf94ef7d8585dbaf7e6', 'admin', '2019-04-04 17:30:47', 'admin', '2019-04-04 17:31:17');
+INSERT INTO `jeecg_order_customer` VALUES ('ad116f722a438e5f23095a0b5fcc8e89', 'dr秦风', null, null, null, null, 'e73434dad84ebdce2d4e0c2a2f06d8ea', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('b1ba147b75f5eaa48212586097fc3fd1', '2', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('b43bf432c251f0e6b206e403b8ec29bc', 'lisi', null, null, null, null, 'f8889aaef6d1bccffd98d2889c0aafb5', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('bcdd300a7d44c45a66bdaac14903c801', '33', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('beb983293e47e2dc1a9b3d649aa3eb34', 'ddd3', null, null, null, null, 'd908bfee3377e946e59220c4a4eb414a', 'admin', '2019-04-01 16:27:03', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('c219808196406f1b8c7f1062589de4b5', '44', '1', '370285198602058823', null, '18611788674', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('c8ed061d4b27c0c7a64e100f2b1c8ab5', '张经理', '2', '370285198602058823', null, '18611788674', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('cc5de4af7f06cd6d250965ebe92a0395', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('cf8817bd703bf7c7c77a2118edc26cc7', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('d72b26fae42e71270fce2097a88da58a', '导入scott', null, 'www', null, null, '3a867ebf2cebce9bae3f79676d8d86f3', 'jeecg-boot', '2019-03-29 18:43:59', 'admin', '2019-04-08 17:35:05');
+INSERT INTO `jeecg_order_customer` VALUES ('dbdc60a6ac1a8c43f24afee384039b68', 'xiaowang', null, null, null, null, 'f8889aaef6d1bccffd98d2889c0aafb5', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('dc5883b50466de94d900919ed96d97af', '33', '1', '370285198602058823', null, '18611788674', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('deeb73e553ad8dc0a0b3cfd5a338de8e', '3333', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('e2570278bf189ac05df3673231326f47', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('e39cb23bb950b2bdedfc284686c6128a', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('e46fe9111a9100844af582a18a2aa402', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('ee7af0acb9beb9bf8d8b3819a8a7fdc3', '2', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('f5d2605e844192d9e548f9bd240ac908', '小张', null, '370285198602058211', null, '18611788676', '6a719071a29927a14f19482f8693d69a', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_customer` VALUES ('f6db6547382126613a3e46e7cd58a5f2', '导入scott', null, null, null, null, 'a2cce75872cc8fcc47f78de9ffd378c2', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+
+-- ----------------------------
+-- Records of jeecg_order_main
+-- ----------------------------
+INSERT INTO `jeecg_order_main` VALUES ('163e2efcbc6d7d54eb3f8a137da8a75a', 'B100', null, null, '3000.000', null, 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_main` VALUES ('3a867ebf2cebce9bae3f79676d8d86f3', '导入B100', '2222', null, '3000.000', null, 'jeecg-boot', '2019-03-29 18:43:59', 'admin', '2019-04-08 17:35:13');
+INSERT INTO `jeecg_order_main` VALUES ('4bca3ea6881d39dbf67ef1e42c649766', '1212', null, null, null, null, 'admin', '2019-04-03 10:55:43', null, null);
+INSERT INTO `jeecg_order_main` VALUES ('4cba137333127e8e31df7ad168cc3732', '青岛订单A0001', '2', '2019-04-03 10:56:07', null, null, 'admin', '2019-04-03 10:56:11', null, null);
+INSERT INTO `jeecg_order_main` VALUES ('54e739bef5b67569c963c38da52581ec', 'NC911', '1', '2019-02-18 09:58:51', '40.000', null, 'admin', '2019-02-18 09:58:47', 'admin', '2019-02-18 09:58:59');
+INSERT INTO `jeecg_order_main` VALUES ('5d6e2b9e44037526270b6206196f6689', 'N333', null, '2019-04-04 17:19:11', null, '聪明00', 'admin', '2019-04-04 17:19:40', null, null);
+INSERT INTO `jeecg_order_main` VALUES ('6a719071a29927a14f19482f8693d69a', 'c100', null, null, '5000.000', null, 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_main` VALUES ('8ab1186410a65118c4d746eb085d3bed', '导入400', '1', '2019-02-18 09:58:51', '40.000', null, 'admin', '2019-02-18 09:58:47', 'admin', '2019-02-18 09:58:59');
+INSERT INTO `jeecg_order_main` VALUES ('9a57c850e4f68cf94ef7d8585dbaf7e6', 'halou100dd', null, '2019-04-04 17:30:32', null, null, 'admin', '2019-04-04 17:30:41', 'admin', '2019-04-04 17:31:08');
+INSERT INTO `jeecg_order_main` VALUES ('a2cce75872cc8fcc47f78de9ffd378c2', '导入B100', null, null, '3000.000', null, 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_main` VALUES ('b190737bd04cca8360e6f87c9ef9ec4e', 'B0018888', '1', null, null, null, 'admin', '2019-02-15 18:39:29', 'admin', '2019-02-15 18:39:37');
+INSERT INTO `jeecg_order_main` VALUES ('d908bfee3377e946e59220c4a4eb414a', 'SSSS001', null, null, '599.000', null, 'admin', '2019-04-01 15:43:03', 'admin', '2019-04-01 16:26:52');
+INSERT INTO `jeecg_order_main` VALUES ('e73434dad84ebdce2d4e0c2a2f06d8ea', '导入200', null, null, '3000.000', null, 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_main` VALUES ('eb13ab35d2946a2b0cfe3452bca1e73f', 'BJ9980', '1', null, '90.000', null, 'admin', '2019-02-16 17:36:42', 'admin', '2019-02-16 17:46:16');
+INSERT INTO `jeecg_order_main` VALUES ('f618a85b17e2c4dd58d268220c8dd9a1', 'N001', null, '2019-04-01 19:09:02', '2222.000', null, 'admin', '2019-04-01 19:09:47', 'admin', '2019-04-01 19:10:00');
+INSERT INTO `jeecg_order_main` VALUES ('f71f7f8930b5b6b1703d9948d189982b', 'BY911', null, '2019-04-06 19:08:39', null, null, 'admin', '2019-04-01 16:36:02', 'admin', '2019-04-01 16:36:08');
+INSERT INTO `jeecg_order_main` VALUES ('f8889aaef6d1bccffd98d2889c0aafb5', 'A100', null, '2018-10-10 00:00:00', '6000.000', null, 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_main` VALUES ('fe81ee5d19bbf9eef2066d4f29dfbe0f', 'uuuu', null, null, null, null, 'jeecg-boot', '2019-04-03 11:00:39', null, null);
+
+-- ----------------------------
+-- Records of jeecg_order_ticket
+-- ----------------------------
+INSERT INTO `jeecg_order_ticket` VALUES ('0f0e3a40a215958f807eea08a6e1ac0a', '88', null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('0fa3bd0bbcf53650c0bb3c0cac6d8cb7', 'ffff', '2019-02-21 00:00:00', 'eb13ab35d2946a2b0cfe3452bca1e73f', 'admin', '2019-02-25 16:29:41', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('14221afb4f5f749c1deef26ac56fdac3', '33', '2019-03-09 00:00:00', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('15538561502730', '222', null, '0d4a2e67b538ee1bc881e5ed34f670f0', 'jeecg-boot', '2019-03-29 18:42:55', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('15538561526461', '2244', '2019-03-29 00:00:00', '0d4a2e67b538ee1bc881e5ed34f670f0', 'jeecg-boot', '2019-03-29 18:42:55', 'admin', '2019-03-29 18:43:26');
+INSERT INTO `jeecg_order_ticket` VALUES ('15541168478913', 'hhhhh', null, 'f71f7f8930b5b6b1703d9948d189982b', 'admin', '2019-04-01 19:08:45', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('15541169272810', '22211', '2019-04-01 19:09:40', 'f618a85b17e2c4dd58d268220c8dd9a1', 'admin', '2019-04-01 19:10:07', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('15541169302331', '333311', '2019-04-01 19:09:40', 'f618a85b17e2c4dd58d268220c8dd9a1', 'admin', '2019-04-01 19:10:07', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('15541169713092', '333311', '2019-04-01 19:09:47', 'f618a85b17e2c4dd58d268220c8dd9a1', 'admin', '2019-04-01 19:10:07', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('15542604293170', 'c', null, 'fe81ee5d19bbf9eef2066d4f29dfbe0f', 'jeecg-boot', '2019-04-03 11:00:39', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('15542604374431', 'd', null, 'fe81ee5d19bbf9eef2066d4f29dfbe0f', 'jeecg-boot', '2019-04-03 11:00:39', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('15543695362380', 'ccc2', null, '5d6e2b9e44037526270b6206196f6689', 'admin', '2019-04-04 17:19:40', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('15543695381291', 'cccc1', null, '5d6e2b9e44037526270b6206196f6689', 'admin', '2019-04-04 17:19:40', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('15543695740352', 'dddd', null, '5d6e2b9e44037526270b6206196f6689', 'admin', '2019-04-04 17:19:40', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('18905bc89ee3851805aab38ed3b505ec', '44', null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('1f809cbd26f4e574697e1c10de575d72', 'A100', null, 'e73434dad84ebdce2d4e0c2a2f06d8ea', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('21051adb51529bdaa8798b5a3dd7f7f7', 'C10029', '2019-02-20 00:00:00', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('269576e766b917f8b6509a2bb0c4d4bd', 'A100', null, '163e2efcbc6d7d54eb3f8a137da8a75a', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('2d473ffc79e5b38a17919e15f8b7078e', '66', '2019-03-29 00:00:00', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('3655b66fca5fef9c6aac6d70182ffda2', 'AA123', '2019-04-01 00:00:00', 'd908bfee3377e946e59220c4a4eb414a', 'admin', '2019-04-01 16:27:03', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('365d5919155473ade45840fd626c51a9', 'dddd', '2019-04-04 17:25:29', '8ab1186410a65118c4d746eb085d3bed', 'admin', '2019-04-04 17:25:33', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('4889a782e78706ab4306a925cfb163a5', 'C34', '2019-04-01 00:00:00', 'd908bfee3377e946e59220c4a4eb414a', 'admin', '2019-04-01 16:35:00', 'admin', '2019-04-01 16:35:07');
+INSERT INTO `jeecg_order_ticket` VALUES ('48d385796382cf87fa4bdf13b42d9a28', '导入A100', null, '3a867ebf2cebce9bae3f79676d8d86f3', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('541faed56efbeb4be9df581bd8264d3a', '88', null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('57a27a7dfd6a48e7d981f300c181b355', '6', '2019-03-30 00:00:00', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('5ce4dc439c874266e42e6c0ff8dc8b5c', '导入A100', null, 'a2cce75872cc8fcc47f78de9ffd378c2', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('5f16e6a64ab22a161bd94cc205f2c662', '222', '2019-02-23 00:00:00', 'b190737bd04cca8360e6f87c9ef9ec4e', 'admin', '2019-02-25 16:29:48', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('645a06152998a576c051474157625c41', '88', '2019-04-04 17:25:31', '8ab1186410a65118c4d746eb085d3bed', 'admin', '2019-04-04 17:25:33', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('6e3562f2571ea9e96b2d24497b5f5eec', '55', '2019-03-23 00:00:00', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('8fd2b389151568738b1cc4d8e27a6110', '导入A100', null, 'a2cce75872cc8fcc47f78de9ffd378c2', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('93f1a84053e546f59137432ff5564cac', '55', null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('969ddc5d2e198d50903686917f996470', 'A10029', '2019-04-01 00:00:00', 'f71f7f8930b5b6b1703d9948d189982b', 'admin', '2019-04-01 19:08:45', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('96e7303a8d22a5c384e08d7bcf7ac2bf', 'A100', null, 'e73434dad84ebdce2d4e0c2a2f06d8ea', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('9e8a3336f6c63f558f2b68ce2e1e666e', 'dddd', null, '9a57c850e4f68cf94ef7d8585dbaf7e6', 'admin', '2019-04-04 17:30:55', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('a28db02c810c65660015095cb81ed434', 'A100', null, 'f8889aaef6d1bccffd98d2889c0aafb5', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('b217bb0e4ec6a45b6cbf6db880060c0f', 'A100', null, '6a719071a29927a14f19482f8693d69a', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('ba708df70bb2652ed1051a394cfa0bb3', '333', null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('beabbfcb195d39bedeeafe8318794562', 'A1345', '2019-04-01 00:00:00', 'd908bfee3377e946e59220c4a4eb414a', 'admin', '2019-04-01 16:27:04', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('bf450223cb505f89078a311ef7b6ed16', '777', '2019-03-30 00:00:00', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('c06165b6603e3e1335db187b3c841eef', 'fff', null, '9a57c850e4f68cf94ef7d8585dbaf7e6', 'admin', '2019-04-04 17:30:58', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('c113136abc26ace3a6da4e41d7dc1c7e', '44', '2019-03-15 00:00:00', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('c1abdc2e30aeb25de13ad6ee3488ac24', '77', '2019-03-22 00:00:00', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('c23751a7deb44f553ce50a94948c042a', '33', '2019-03-09 00:00:00', '8ab1186410a65118c4d746eb085d3bed', 'admin', '2019-04-04 17:25:33', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('c64547666b634b3d6a0feedcf05f25ce', 'C10019', '2019-04-01 00:00:00', 'f71f7f8930b5b6b1703d9948d189982b', 'admin', '2019-04-01 19:08:45', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('c8b8d3217f37da78dddf711a1f7da485', 'A100', null, '163e2efcbc6d7d54eb3f8a137da8a75a', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('cab691c1c1ff7a6dfd7248421917fd3c', 'A100', null, 'f8889aaef6d1bccffd98d2889c0aafb5', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('cca10a9a850b456d9b72be87da7b0883', '77', null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('d2fbba11f4814d9b1d3cb1a3f342234a', 'C10019', '2019-02-18 00:00:00', '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('d746c1ed956a562e97eef9c6faf94efa', '111', '2019-02-01 00:00:00', 'b190737bd04cca8360e6f87c9ef9ec4e', 'admin', '2019-02-25 16:29:48', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('dbdb07a16826808e4276e84b2aa4731a', '导入A100', null, '3a867ebf2cebce9bae3f79676d8d86f3', 'jeecg-boot', '2019-03-29 18:43:59', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('e7075639c37513afc0bbc4bf7b5d98b9', '88', null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('fa759dc104d0371f8aa28665b323dab6', '888', null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+INSERT INTO `jeecg_order_ticket` VALUES ('ff197da84a9a3af53878eddc91afbb2e', '33', null, '54e739bef5b67569c963c38da52581ec', 'admin', '2019-03-15 16:50:15', null, null);
+
+-- ----------------------------
+-- Records of jeecg_project_nature_income
+-- ----------------------------
+INSERT INTO `jeecg_project_nature_income` VALUES ('1', '市场化-电商业务', '4865.41', '0.00', '0.00', '0.00', '0.00', '0.00');
+INSERT INTO `jeecg_project_nature_income` VALUES ('2', '统筹型', '35767081.88', '0.00', '0.00', '0.00', '0.00', '0.00');
+INSERT INTO `jeecg_project_nature_income` VALUES ('3', '市场化-非股东', '1487045.35', '0.00', '0.00', '0.00', '0.00', '0.00');
+INSERT INTO `jeecg_project_nature_income` VALUES ('4', '市场化-参控股', '382690.56', '0.00', '0.00', '0.00', '0.00', '0.00');
+INSERT INTO `jeecg_project_nature_income` VALUES ('5', '市场化-员工福利', '256684.91', '0.00', '0.00', '0.00', '0.00', '0.00');
+INSERT INTO `jeecg_project_nature_income` VALUES ('6', '市场化-再保险', '563451.03', '0.00', '0.00', '0.00', '0.00', '0.00');
+INSERT INTO `jeecg_project_nature_income` VALUES ('7', '市场化-海外业务', '760576.25', '770458.75', '0.00', '0.00', '0.00', '0.00');
+INSERT INTO `jeecg_project_nature_income` VALUES ('8', '市场化-风险咨询', '910183.93', '0.00', '0.00', '0.00', '0.00', '226415.09');
+
+-- ----------------------------
+-- Records of qrtz_locks
+-- ----------------------------
+INSERT INTO `qrtz_locks` VALUES ('quartzScheduler', 'TRIGGER_ACCESS');
+
+-- ----------------------------
+-- Records of sys_announcement
+-- ----------------------------
+INSERT INTO `sys_announcement` VALUES ('1b714f8ebc3cc33f8b4f906103b6a18d', '5467567', null, null, null, 'admin', null, '2', null, '1', '2019-03-30 12:40:38', null, '0', 'admin', '2019-02-26 17:23:26', 'admin', '2019-02-26 17:35:10', null);
+INSERT INTO `sys_announcement` VALUES ('3d11237ccdf62450d20bb8abdb331178', '111222', null, null, null, null, null, '2', null, '0', null, null, '1', 'admin', '2019-03-29 17:19:47', 'admin', '2019-03-29 17:19:50', null);
+INSERT INTO `sys_announcement` VALUES ('7ef04e95f8de030b1d5f7a9144090dc6', '111', null, '2019-02-06 17:28:10', '2019-03-08 17:28:11', null, null, '2', null, '0', null, null, '1', 'admin', '2019-02-26 17:28:17', 'admin', '2019-03-26 19:59:49', null);
+INSERT INTO `sys_announcement` VALUES ('93a9060a1c20e4bf98b3f768a02c2ff9', '111', '111', '2019-02-06 17:20:17', '2019-02-21 17:20:20', 'admin', 'M', '2', 'ALL', '1', '2019-02-26 17:24:29', null, '0', 'admin', '2019-02-26 17:16:26', 'admin', '2019-02-26 17:19:35', null);
+INSERT INTO `sys_announcement` VALUES ('de1dc57f31037079e1e55c8347fe6ef7', '222', '2222', '2019-02-06 17:28:26', '2019-02-23 17:28:28', 'admin', 'M', '2', 'ALL', '1', '2019-03-29 17:19:56', null, '1', 'admin', '2019-02-26 17:28:36', 'admin', '2019-02-26 17:28:40', null);
+INSERT INTO `sys_announcement` VALUES ('e52f3eb6215f139cb2224c52517af3bd', '334', '334', null, null, null, null, '2', null, '0', null, null, '1', 'admin', '2019-03-30 12:40:28', 'admin', '2019-03-30 12:40:32', null);
+
+
+-- ----------------------------
+-- Records of sys_announcement_send
+-- ----------------------------
+INSERT INTO `sys_announcement_send` VALUES ('646c0c405ec643d4dc4160db2446f8ff', '93a9060a1c20e4bf98b3f768a02c2ff9', 'e9ca23d68d884d4ebb19d07889727dae', '0', null, 'admin', '2019-05-17 11:50:56', null, null);
+
+-- ----------------------------
+-- Records of sys_data_log
+-- ----------------------------
+INSERT INTO `sys_data_log` VALUES ('402880f05ab0d198015ab12274bf0006', 'admin', '2017-03-09 11:35:09', null, null, 'jeecg_demo', '4028ef81550c1a7901550c1cd6e70001', '{\"mobilePhone\":\"\",\"officePhone\":\"\",\"email\":\"\",\"createDate\":\"Jun 23, 2016 12:00:00 PM\",\"sex\":\"1\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"9001\",\"status\":\"1\",\"content\":\"111\",\"id\":\"4028ef81550c1a7901550c1cd6e70001\"}', '3');
+INSERT INTO `sys_data_log` VALUES ('402880f05ab6d12b015ab700bead0009', 'admin', '2017-03-10 14:56:03', null, null, 'jeecg_demo', '402880f05ab6d12b015ab700be8d0008', '{\"mobilePhone\":\"\",\"officePhone\":\"\",\"email\":\"\",\"createDate\":\"Mar 10, 2017 2:56:03 PM\",\"sex\":\"0\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"111\",\"status\":\"0\",\"id\":\"402880f05ab6d12b015ab700be8d0008\"}', '1');
+INSERT INTO `sys_data_log` VALUES ('402880f05ab6d12b015ab705a23f000d', 'admin', '2017-03-10 15:01:24', null, null, 'jeecg_demo', '402880f05ab6d12b015ab705a233000c', '{\"mobilePhone\":\"\",\"officePhone\":\"11\",\"email\":\"\",\"createDate\":\"Mar 10, 2017 3:01:24 PM\",\"sex\":\"0\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"11\",\"status\":\"0\",\"id\":\"402880f05ab6d12b015ab705a233000c\"}', '1');
+INSERT INTO `sys_data_log` VALUES ('402880f05ab6d12b015ab712a6420013', 'admin', '2017-03-10 15:15:37', null, null, 'jeecg_demo', '402880f05ab6d12b015ab712a6360012', '{\"mobilePhone\":\"\",\"officePhone\":\"\",\"email\":\"\",\"createDate\":\"Mar 10, 2017 3:15:37 PM\",\"sex\":\"0\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"小王\",\"status\":\"0\",\"id\":\"402880f05ab6d12b015ab712a6360012\"}', '1');
+INSERT INTO `sys_data_log` VALUES ('402880f05ab6d12b015ab712d0510015', 'admin', '2017-03-10 15:15:47', null, null, 'jeecg_demo', '402880f05ab6d12b015ab712a6360012', '{\"mobilePhone\":\"18611788525\",\"officePhone\":\"\",\"email\":\"\",\"createDate\":\"Mar 10, 2017 3:15:37 AM\",\"sex\":\"0\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"小王\",\"status\":\"0\",\"id\":\"402880f05ab6d12b015ab712a6360012\"}', '2');
+INSERT INTO `sys_data_log` VALUES ('402880f05ab6d12b015ab71308240018', 'admin', '2017-03-10 15:16:02', null, null, 'jeecg_demo', '8a8ab0b246dc81120146dc81860f016f', '{\"mobilePhone\":\"13111111111\",\"officePhone\":\"66666666\",\"email\":\"demo@jeecg.com\",\"age\":12,\"salary\":10.00,\"birthday\":\"Feb 14, 2014 12:00:00 AM\",\"sex\":\"1\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"小明\",\"status\":\"\",\"content\":\"\",\"id\":\"8a8ab0b246dc81120146dc81860f016f\"}', '1');
+INSERT INTO `sys_data_log` VALUES ('402880f05ab6d12b015ab72806c3001b', 'admin', '2017-03-10 15:38:58', null, null, 'jeecg_demo', '8a8ab0b246dc81120146dc81860f016f', '{\"mobilePhone\":\"18611788888\",\"officePhone\":\"66666666\",\"email\":\"demo@jeecg.com\",\"age\":12,\"salary\":10.00,\"birthday\":\"Feb 14, 2014 12:00:00 AM\",\"sex\":\"1\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"小明\",\"status\":\"\",\"content\":\"\",\"id\":\"8a8ab0b246dc81120146dc81860f016f\"}', '2');
+INSERT INTO `sys_data_log` VALUES ('4028ef815318148a0153181567690001', 'admin', '2016-02-25 18:59:29', null, null, 'jeecg_demo', '4028ef815318148a0153181566270000', '{\"mobilePhone\":\"13423423423\",\"officePhone\":\"1\",\"email\":\"\",\"age\":1,\"salary\":1,\"birthday\":\"Feb 25, 2016 12:00:00 AM\",\"createDate\":\"Feb 25, 2016 6:59:24 PM\",\"depId\":\"402880e447e9a9570147e9b6a3be0005\",\"userName\":\"1\",\"status\":\"0\",\"id\":\"4028ef815318148a0153181566270000\"}', '1');
+INSERT INTO `sys_data_log` VALUES ('4028ef815318148a01531815ec5c0003', 'admin', '2016-02-25 19:00:03', null, null, 'jeecg_demo', '4028ef815318148a0153181566270000', '{\"mobilePhone\":\"13426498659\",\"officePhone\":\"1\",\"email\":\"\",\"age\":1,\"salary\":1.00,\"birthday\":\"Feb 25, 2016 12:00:00 AM\",\"createDate\":\"Feb 25, 2016 6:59:24 AM\",\"depId\":\"402880e447e9a9570147e9b6a3be0005\",\"userName\":\"1\",\"status\":\"0\",\"id\":\"4028ef815318148a0153181566270000\"}', '2');
+INSERT INTO `sys_data_log` VALUES ('4028ef8153c028db0153c0502e6b0003', 'admin', '2016-03-29 10:59:53', null, null, 'jeecg_demo', '4028ef8153c028db0153c0502d420002', '{\"mobilePhone\":\"18455477548\",\"officePhone\":\"123\",\"email\":\"\",\"createDate\":\"Mar 29, 2016 10:59:53 AM\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"123\",\"status\":\"0\",\"id\":\"4028ef8153c028db0153c0502d420002\"}', '1');
+INSERT INTO `sys_data_log` VALUES ('4028ef8153c028db0153c0509aa40006', 'admin', '2016-03-29 11:00:21', null, null, 'jeecg_demo', '4028ef8153c028db0153c0509a3e0005', '{\"mobilePhone\":\"13565486458\",\"officePhone\":\"\",\"email\":\"\",\"createDate\":\"Mar 29, 2016 11:00:21 AM\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"22\",\"status\":\"0\",\"id\":\"4028ef8153c028db0153c0509a3e0005\"}', '1');
+INSERT INTO `sys_data_log` VALUES ('4028ef8153c028db0153c051c4a70008', 'admin', '2016-03-29 11:01:37', null, null, 'jeecg_demo', '4028ef8153c028db0153c0509a3e0005', '{\"mobilePhone\":\"13565486458\",\"officePhone\":\"\",\"email\":\"\",\"createDate\":\"Mar 29, 2016 11:00:21 AM\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"22\",\"status\":\"0\",\"id\":\"4028ef8153c028db0153c0509a3e0005\"}', '2');
+INSERT INTO `sys_data_log` VALUES ('4028ef8153c028db0153c051d4b5000a', 'admin', '2016-03-29 11:01:41', null, null, 'jeecg_demo', '4028ef8153c028db0153c0502d420002', '{\"mobilePhone\":\"13565486458\",\"officePhone\":\"123\",\"email\":\"\",\"createDate\":\"Mar 29, 2016 10:59:53 AM\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"123\",\"status\":\"0\",\"id\":\"4028ef8153c028db0153c0502d420002\"}', '2');
+INSERT INTO `sys_data_log` VALUES ('4028ef8153c028db0153c07033d8000d', 'admin', '2016-03-29 11:34:52', null, null, 'jeecg_demo', '4028ef8153c028db0153c0502d420002', '{\"mobilePhone\":\"13565486458\",\"officePhone\":\"123\",\"email\":\"\",\"age\":23,\"createDate\":\"Mar 29, 2016 10:59:53 AM\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"123\",\"status\":\"0\",\"id\":\"4028ef8153c028db0153c0502d420002\"}', '3');
+INSERT INTO `sys_data_log` VALUES ('4028ef8153c028db0153c070492e000f', 'admin', '2016-03-29 11:34:57', null, null, 'jeecg_demo', '4028ef8153c028db0153c0509a3e0005', '{\"mobilePhone\":\"13565486458\",\"officePhone\":\"\",\"email\":\"\",\"age\":22,\"createDate\":\"Mar 29, 2016 11:00:21 AM\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"22\",\"status\":\"0\",\"id\":\"4028ef8153c028db0153c0509a3e0005\"}', '3');
+INSERT INTO `sys_data_log` VALUES ('4028ef81550c1a7901550c1cd7850002', 'admin', '2016-06-01 21:17:44', null, null, 'jeecg_demo', '4028ef81550c1a7901550c1cd6e70001', '{\"mobilePhone\":\"\",\"officePhone\":\"\",\"email\":\"\",\"createDate\":\"Jun 1, 2016 9:17:44 PM\",\"sex\":\"1\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"121221\",\"status\":\"0\",\"id\":\"4028ef81550c1a7901550c1cd6e70001\"}', '1');
+INSERT INTO `sys_data_log` VALUES ('4028ef81568c31ec01568c3307080004', 'admin', '2016-08-15 11:16:09', null, null, 'jeecg_demo', '4028ef81550c1a7901550c1cd6e70001', '{\"mobilePhone\":\"\",\"officePhone\":\"\",\"email\":\"\",\"createDate\":\"Jun 23, 2016 12:00:00 PM\",\"sex\":\"1\",\"depId\":\"402880e447e99cf10147e9a03b320003\",\"userName\":\"9001\",\"status\":\"1\",\"content\":\"111\",\"id\":\"4028ef81550c1a7901550c1cd6e70001\"}', '2');
+
+-- ----------------------------
+-- Records of sys_depart
+-- ----------------------------
+INSERT INTO `sys_depart` VALUES ('4f1765520d6346f9bd9c79e2479e5b12', 'c6d7cb4deeac411cb3384b1b31278596', '市场部', null, null, '0', null, '2', 'A01A03', null, null, null, null, null, '0', 'admin', '2019-02-20 17:15:34', 'admin', '2019-02-26 16:36:18');
+INSERT INTO `sys_depart` VALUES ('5159cde220114246b045e574adceafe9', '6d35e179cd814e3299bd588ea7daed3f', '研发部', null, null, '0', null, '2', 'A02A02', null, null, null, null, null, '0', 'admin', '2019-02-26 16:44:38', 'admin', '2019-03-07 09:36:53');
+INSERT INTO `sys_depart` VALUES ('57197590443c44f083d42ae24ef26a2c', 'c6d7cb4deeac411cb3384b1b31278596', '研发部', null, null, '0', null, '2', 'A01A05', null, null, null, null, null, '0', 'admin', '2019-02-21 16:14:41', 'admin', '2019-03-27 19:05:49');
+INSERT INTO `sys_depart` VALUES ('67fc001af12a4f9b8458005d3f19934a', 'c6d7cb4deeac411cb3384b1b31278596', '财务部', null, null, '0', null, '2', 'A01A04', null, null, null, null, null, '0', 'admin', '2019-02-21 16:14:35', 'admin', '2019-02-25 12:49:41');
+INSERT INTO `sys_depart` VALUES ('6d35e179cd814e3299bd588ea7daed3f', '', '卓尔互动公司', null, null, '0', null, '1', 'A02', null, null, null, null, null, '0', 'admin', '2019-02-26 16:36:39', 'admin', '2019-03-22 16:47:25');
+INSERT INTO `sys_depart` VALUES ('743ba9dbdc114af8953a11022ef3096a', 'f28c6f53abd841ac87ead43afc483433', '财务部', null, null, '0', null, '2', 'A03A01', null, null, null, null, null, '0', 'admin', '2019-03-22 16:45:43', null, null);
+INSERT INTO `sys_depart` VALUES ('a7d7e77e06c84325a40932163adcdaa6', '6d35e179cd814e3299bd588ea7daed3f', '财务部', null, null, '0', null, '2', 'A02A01', null, null, null, null, null, '0', 'admin', '2019-02-26 16:36:47', 'admin', '2019-02-26 16:37:25');
+INSERT INTO `sys_depart` VALUES ('c6d7cb4deeac411cb3384b1b31278596', '', '北京国炬公司', null, null, '0', null, '1', 'A01', null, null, null, null, null, '0', 'admin', '2019-02-11 14:21:51', 'admin', '2019-03-22 16:47:19');
+
+-- ----------------------------
-- Records of sys_dict
-- ----------------------------
+INSERT INTO `sys_dict` VALUES ('0b5d19e1fce4b2e6647e6b4a17760c14', '通告类型', 'msg_category', '消息类型1:通知公告2:系统消息', '1', 'admin', '2019-04-22 18:01:35', null, null, '0');
+INSERT INTO `sys_dict` VALUES ('236e8a4baff0db8c62c00dd95632834f', '同步工作流引擎', 'activiti_sync', '同步工作流引擎', '1', 'admin', '2019-05-15 15:27:33', null, null, '0');
+INSERT INTO `sys_dict` VALUES ('2e02df51611a4b9632828ab7e5338f00', '权限策略', 'perms_type', '权限策略', '1', 'admin', '2019-04-26 18:26:55', null, null, '0');
INSERT INTO `sys_dict` VALUES ('2f0320997ade5dd147c90130f7218c3e', '推送类别', 'msg_type', '', '1', 'admin', '2019-03-17 21:21:32', 'admin', '2019-03-26 19:57:45', '0');
INSERT INTO `sys_dict` VALUES ('3486f32803bb953e7155dab3513dc68b', '删除状态', 'del_flag', null, '1', 'admin', '2019-01-18 21:46:26', 'admin', '2019-03-30 11:17:11', '0');
INSERT INTO `sys_dict` VALUES ('3d9a351be3436fbefb1307d4cfb49bf2', '性别', 'sex', null, '1', null, '2019-01-04 14:56:32', 'admin', '2019-03-30 11:28:27', '1');
INSERT INTO `sys_dict` VALUES ('404a04a15f371566c658ee9ef9fc392a', 'cehis2', '22', null, '2', 'admin', '2019-01-30 11:17:21', 'admin', '2019-03-30 11:18:12', '0');
+INSERT INTO `sys_dict` VALUES ('4274efc2292239b6f000b153f50823ff', '全局权限策略', 'global_perms_type', '全局权限策略', '1', 'admin', '2019-05-10 17:54:05', null, null, '0');
+INSERT INTO `sys_dict` VALUES ('4c03fca6bf1f0299c381213961566349', 'Online图表展示模板', 'online_graph_display_template', 'Online图表展示模板', '1', 'admin', '2019-04-12 17:28:50', null, null, '0');
INSERT INTO `sys_dict` VALUES ('4c753b5293304e7a445fd2741b46529d', '字典状态', 'dict_item_status', null, '1', 'admin', '2020-06-18 23:18:42', 'admin', '2019-03-30 19:33:52', '1');
+INSERT INTO `sys_dict` VALUES ('4d7fec1a7799a436d26d02325eff295e', '优先级', 'priority', '优先级', '1', 'admin', '2019-03-16 17:03:34', 'admin', '2019-04-16 17:39:23', '0');
INSERT INTO `sys_dict` VALUES ('4e4602b3e3686f0911384e188dc7efb4', '条件规则', 'rule_conditions', '', '1', 'admin', '2019-04-01 10:15:03', 'admin', '2019-04-01 10:30:47', '0');
INSERT INTO `sys_dict` VALUES ('4f69be5f507accea8d5df5f11346181a', '发送消息类型', 'msgType', null, '1', 'admin', '2019-04-11 14:27:09', null, null, '0');
+INSERT INTO `sys_dict` VALUES ('68168534ff5065a152bfab275c2136f8', '有效无效状态', 'valid_status', '有效无效状态', '1', 'admin', '2020-09-26 19:21:14', 'admin', '2019-04-26 19:21:23', '0');
INSERT INTO `sys_dict` VALUES ('6b78e3f59faec1a4750acff08030a79b', '用户类型', 'user_type', null, '2', null, '2019-01-04 14:59:01', 'admin', '2019-03-18 23:28:18', '0');
INSERT INTO `sys_dict` VALUES ('72cce0989df68887546746d8f09811aa', 'Online表单类型', 'cgform_table_type', '', '1', 'admin', '2019-01-27 10:13:02', 'admin', '2019-03-30 11:37:36', '0');
+INSERT INTO `sys_dict` VALUES ('78bda155fe380b1b3f175f1e88c284c6', '流程状态', 'bpm_status', '流程状态', '1', 'admin', '2019-05-09 16:31:52', null, null, '0');
INSERT INTO `sys_dict` VALUES ('83bfb33147013cc81640d5fd9eda030c', '日志类型', 'log_type', null, '1', 'admin', '2019-03-18 23:22:19', null, null, '1');
INSERT INTO `sys_dict` VALUES ('845da5006c97754728bf48b6a10f79cc', '状态', 'status', null, '2', 'admin', '2019-03-18 21:45:25', 'admin', '2019-03-18 21:58:25', '0');
+INSERT INTO `sys_dict` VALUES ('8dfe32e2d29ea9430a988b3b558bf233', '发布状态', 'send_status', '发布状态', '1', 'admin', '2019-04-16 17:40:42', null, null, '0');
INSERT INTO `sys_dict` VALUES ('a9d9942bd0eccb6e89de92d130ec4c4a', '消息发送状态', 'msgSendStatus', null, '1', 'admin', '2019-04-12 18:18:17', null, null, '0');
INSERT INTO `sys_dict` VALUES ('ac2f7c0c5c5775fcea7e2387bcb22f01', '菜单类型', 'menu_type', null, '1', 'admin', '2020-12-18 23:24:32', 'admin', '2019-04-01 15:27:06', '1');
INSERT INTO `sys_dict` VALUES ('ad7c65ba97c20a6805d5dcdf13cdaf36', 'onlineT类型', 'ceshi_online', null, '2', 'admin', '2019-03-22 16:31:49', 'admin', '2019-03-22 16:34:16', '0');
+INSERT INTO `sys_dict` VALUES ('bd1b8bc28e65d6feefefb6f3c79f42fd', 'Online图表数据类型', 'online_graph_data_type', 'Online图表数据类型', '1', 'admin', '2019-04-12 17:24:24', 'admin', '2019-04-12 17:24:57', '0');
INSERT INTO `sys_dict` VALUES ('c36169beb12de8a71c8683ee7c28a503', '部门状态', 'depart_status', null, '1', 'admin', '2019-03-18 21:59:51', null, null, '0');
+INSERT INTO `sys_dict` VALUES ('c5a14c75172783d72cbee6ee7f5df5d1', 'Online图表类型', 'online_graph_type', 'Online图表类型', '1', 'admin', '2019-04-12 17:04:06', null, null, '0');
INSERT INTO `sys_dict` VALUES ('d6e1152968b02d69ff358c75b48a6ee1', '流程类型', 'bpm_process_type', null, '1', 'admin', '2021-02-22 19:26:54', 'admin', '2019-03-30 18:14:44', '0');
INSERT INTO `sys_dict` VALUES ('fc6cd58fde2e8481db10d3a1e68ce70c', '用户状态', 'user_status', null, '1', 'admin', '2019-03-18 21:57:25', 'admin', '2019-03-18 23:11:58', '1');
-- ----------------------------
--- Table structure for sys_dict_item
--- ----------------------------
-DROP TABLE IF EXISTS `sys_dict_item`;
-CREATE TABLE `sys_dict_item` (
- `id` varchar(32) NOT NULL,
- `dict_id` varchar(32) default NULL COMMENT '字典id',
- `item_text` varchar(100) default NULL COMMENT '字典项文本',
- `item_value` varchar(100) default NULL COMMENT '字典项值',
- `description` varchar(255) default NULL COMMENT '描述',
- `sort_order` int(10) default NULL COMMENT '排序',
- `status` int(11) default NULL COMMENT '状态（1启用 0不启用）',
- `create_by` varchar(32) default NULL,
- `create_time` datetime default NULL,
- `update_by` varchar(32) default NULL,
- `update_time` datetime default NULL,
- PRIMARY KEY (`id`),
- KEY `index_table_dict_id` USING BTREE (`dict_id`),
- KEY `index_table_sort_order` USING BTREE (`sort_order`),
- KEY `index_table_dict_status` USING BTREE (`status`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- ----------------------------
-- Records of sys_dict_item
-- ----------------------------
+INSERT INTO `sys_dict_item` VALUES ('0072d115e07c875d76c9b022e2179128', '4d7fec1a7799a436d26d02325eff295e', '低', 'L', '低', '3', '1', 'admin', '2019-04-16 17:04:59', null, null);
INSERT INTO `sys_dict_item` VALUES ('05a2e732ce7b00aa52141ecc3e330b4e', '3486f32803bb953e7155dab3513dc68b', '已删除', '1', null, null, '1', 'admin', '2025-10-18 21:46:56', 'admin', '2019-03-28 22:23:20');
+INSERT INTO `sys_dict_item` VALUES ('096c2e758d823def3855f6376bc736fb', 'bd1b8bc28e65d6feefefb6f3c79f42fd', 'SQL', 'sql', null, '1', '1', 'admin', '2019-04-12 17:26:26', null, null);
INSERT INTO `sys_dict_item` VALUES ('0c9532916f5cd722017b46bc4d953e41', '2f0320997ade5dd147c90130f7218c3e', '指定用户', 'USER', null, null, '1', 'admin', '2019-03-17 21:22:19', 'admin', '2019-03-17 21:22:28');
INSERT INTO `sys_dict_item` VALUES ('0ca4beba9efc4f9dd54af0911a946d5c', '72cce0989df68887546746d8f09811aa', '附表', '3', null, '3', '1', 'admin', '2019-03-27 10:13:43', null, null);
+INSERT INTO `sys_dict_item` VALUES ('1030a2652608f5eac3b49d70458b8532', '2e02df51611a4b9632828ab7e5338f00', '禁用', '2', '禁用', '2', '1', 'admin', '2021-03-26 18:27:28', 'admin', '2019-04-26 18:39:11');
INSERT INTO `sys_dict_item` VALUES ('147c48ff4b51545032a9119d13f3222a', 'd6e1152968b02d69ff358c75b48a6ee1', '测试流程', 'test', null, '1', '1', 'admin', '2019-03-22 19:27:05', null, null);
+INSERT INTO `sys_dict_item` VALUES ('1543fe7e5e26fb97cdafe4981bedc0c8', '4c03fca6bf1f0299c381213961566349', '单排布局', 'single', null, '2', '1', 'admin', '2022-07-12 17:43:39', 'admin', '2019-04-12 17:43:57');
INSERT INTO `sys_dict_item` VALUES ('1b8a6341163062dad8cb2fddd34e0c3b', '404a04a15f371566c658ee9ef9fc392a', '22', '222', null, '1', '1', 'admin', '2019-03-30 11:17:48', null, null);
INSERT INTO `sys_dict_item` VALUES ('1ce390c52453891f93514c1bd2795d44', 'ad7c65ba97c20a6805d5dcdf13cdaf36', '000', '00', null, '1', '1', 'admin', '2019-03-22 16:34:34', null, null);
+INSERT INTO `sys_dict_item` VALUES ('1db531bcff19649fa82a644c8a939dc4', '4c03fca6bf1f0299c381213961566349', '组合布局', 'combination', '', '4', '1', 'admin', '2019-05-11 16:07:08', null, null);
+INSERT INTO `sys_dict_item` VALUES ('222705e11ef0264d4214affff1fb4ff9', '4f69be5f507accea8d5df5f11346181a', '短信', '1', '', '1', '1', 'admin', '2023-02-28 10:50:36', 'admin', '2019-04-28 10:58:11');
INSERT INTO `sys_dict_item` VALUES ('23a5bb76004ed0e39414e928c4cde155', '4e4602b3e3686f0911384e188dc7efb4', '不等于', '!=', '不等于', '3', '1', 'admin', '2019-04-01 16:46:15', 'admin', '2019-04-01 17:48:40');
INSERT INTO `sys_dict_item` VALUES ('25847e9cb661a7c711f9998452dc09e6', '4e4602b3e3686f0911384e188dc7efb4', '小于等于', '<=', '小于等于', '6', '1', 'admin', '2019-04-01 16:44:34', 'admin', '2019-04-01 17:49:10');
+INSERT INTO `sys_dict_item` VALUES ('2d51376643f220afdeb6d216a8ac2c01', '68168534ff5065a152bfab275c2136f8', '有效', '1', '有效', '2', '1', 'admin', '2019-04-26 19:22:01', null, null);
+INSERT INTO `sys_dict_item` VALUES ('308c8aadf0c37ecdde188b97ca9833f5', '8dfe32e2d29ea9430a988b3b558bf233', '已发布', '1', '已发布', '2', '1', 'admin', '2019-04-16 17:41:24', null, null);
+INSERT INTO `sys_dict_item` VALUES ('333e6b2196e01ef9a5f76d74e86a6e33', '8dfe32e2d29ea9430a988b3b558bf233', '未发布', '0', '未发布', '1', '1', 'admin', '2019-04-16 17:41:12', null, null);
+INSERT INTO `sys_dict_item` VALUES ('337ea1e401bda7233f6258c284ce4f50', 'bd1b8bc28e65d6feefefb6f3c79f42fd', 'JSON', 'json', null, '1', '1', 'admin', '2019-04-12 17:26:33', null, null);
INSERT INTO `sys_dict_item` VALUES ('33bc9d9f753cf7dc40e70461e50fdc54', 'a9d9942bd0eccb6e89de92d130ec4c4a', '发送失败', '2', null, '3', '1', 'admin', '2019-04-12 18:20:02', null, null);
+INSERT INTO `sys_dict_item` VALUES ('3fbc03d6c994ae06d083751248037c0e', '78bda155fe380b1b3f175f1e88c284c6', '已完成', '3', '已完成', '3', '1', 'admin', '2019-05-09 16:33:25', null, null);
+INSERT INTO `sys_dict_item` VALUES ('41d7aaa40c9b61756ffb1f28da5ead8e', '0b5d19e1fce4b2e6647e6b4a17760c14', '通知公告', '1', null, '1', '1', 'admin', '2019-04-22 18:01:57', null, null);
INSERT INTO `sys_dict_item` VALUES ('41fa1e9571505d643aea87aeb83d4d76', '4e4602b3e3686f0911384e188dc7efb4', '等于', '=', '等于', '4', '1', 'admin', '2019-04-01 16:45:24', 'admin', '2019-04-01 17:49:00');
INSERT INTO `sys_dict_item` VALUES ('43d2295b8610adce9510ff196a49c6e9', '845da5006c97754728bf48b6a10f79cc', '正常', '1', null, null, '1', 'admin', '2019-03-18 21:45:51', null, null);
INSERT INTO `sys_dict_item` VALUES ('4f05fb5376f4c61502c5105f52e4dd2b', '83bfb33147013cc81640d5fd9eda030c', '操作日志', '2', null, null, '1', 'admin', '2019-03-18 23:22:49', null, null);
INSERT INTO `sys_dict_item` VALUES ('50223341bfb5ba30bf6319789d8d17fe', 'd6e1152968b02d69ff358c75b48a6ee1', '业务办理', 'business', null, '3', '1', 'admin', '2023-04-22 19:28:05', 'admin', '2019-03-22 23:24:39');
+INSERT INTO `sys_dict_item` VALUES ('538fca35afe004972c5f3947c039e766', '2e02df51611a4b9632828ab7e5338f00', '显示', '1', '显示', '1', '1', 'admin', '2025-03-26 18:27:13', 'admin', '2019-04-26 18:39:07');
INSERT INTO `sys_dict_item` VALUES ('5584c21993bde231bbde2b966f2633ac', '4e4602b3e3686f0911384e188dc7efb4', '自定义SQL表达式', 'USE_SQL_RULES', '自定义SQL表达式', '9', '1', 'admin', '2019-04-01 10:45:24', 'admin', '2019-04-01 17:49:27');
INSERT INTO `sys_dict_item` VALUES ('58b73b344305c99b9d8db0fc056bbc0a', '72cce0989df68887546746d8f09811aa', '主表', '2', null, '2', '1', 'admin', '2019-03-27 10:13:36', null, null);
INSERT INTO `sys_dict_item` VALUES ('5b65a88f076b32e8e69d19bbaadb52d5', '2f0320997ade5dd147c90130f7218c3e', '全体用户', 'ALL', null, null, '1', 'admin', '2020-10-17 21:22:43', 'admin', '2019-03-28 22:17:09');
@@ -842,60 +1064,53 @@ INSERT INTO `sys_dict_item` VALUES ('5d84a8634c8fdfe96275385075b105c9', '3d9a351
INSERT INTO `sys_dict_item` VALUES ('66c952ae2c3701a993e7db58f3baf55e', '4e4602b3e3686f0911384e188dc7efb4', '大于', '>', '大于', '1', '1', 'admin', '2019-04-01 10:45:46', 'admin', '2019-04-01 17:48:29');
INSERT INTO `sys_dict_item` VALUES ('6937c5dde8f92e9a00d4e2ded9198694', 'ad7c65ba97c20a6805d5dcdf13cdaf36', 'easyui', '3', null, '1', '1', 'admin', '2019-03-22 16:32:15', null, null);
INSERT INTO `sys_dict_item` VALUES ('69cacf64e244100289ddd4aa9fa3b915', 'a9d9942bd0eccb6e89de92d130ec4c4a', '未发送', '0', null, '1', '1', 'admin', '2019-04-12 18:19:23', null, null);
+INSERT INTO `sys_dict_item` VALUES ('6a7a9e1403a7943aba69e54ebeff9762', '4f69be5f507accea8d5df5f11346181a', '邮件', '2', '', '2', '1', 'admin', '2031-02-28 10:50:44', 'admin', '2019-04-28 10:59:03');
INSERT INTO `sys_dict_item` VALUES ('6c682d78ddf1715baf79a1d52d2aa8c2', '72cce0989df68887546746d8f09811aa', '单表', '1', null, '1', '1', 'admin', '2019-03-27 10:13:29', null, null);
INSERT INTO `sys_dict_item` VALUES ('6d404fd2d82311fbc87722cd302a28bc', '4e4602b3e3686f0911384e188dc7efb4', '模糊', 'LIKE', '模糊', '7', '1', 'admin', '2019-04-01 16:46:02', 'admin', '2019-04-01 17:49:20');
+INSERT INTO `sys_dict_item` VALUES ('6d4e26e78e1a09699182e08516c49fc4', '4d7fec1a7799a436d26d02325eff295e', '高', 'H', '高', '1', '1', 'admin', '2019-04-16 17:04:24', null, null);
INSERT INTO `sys_dict_item` VALUES ('700e9f030654f3f90e9ba76ab0713551', '6b78e3f59faec1a4750acff08030a79b', '333', '333', null, null, '1', 'admin', '2019-02-21 19:59:47', null, null);
+INSERT INTO `sys_dict_item` VALUES ('7050c1522702bac3be40e3b7d2e1dfd8', 'c5a14c75172783d72cbee6ee7f5df5d1', '柱状图', 'bar', null, '1', '1', 'admin', '2019-04-12 17:05:17', null, null);
INSERT INTO `sys_dict_item` VALUES ('71b924faa93805c5c1579f12e001c809', 'd6e1152968b02d69ff358c75b48a6ee1', 'OA办公', 'oa', null, '2', '1', 'admin', '2021-03-22 19:27:17', 'admin', '2019-03-22 23:24:36');
INSERT INTO `sys_dict_item` VALUES ('75b260d7db45a39fc7f21badeabdb0ed', 'c36169beb12de8a71c8683ee7c28a503', '不启用', '0', null, null, '1', 'admin', '2019-03-18 23:29:41', 'admin', '2019-03-18 23:29:54');
INSERT INTO `sys_dict_item` VALUES ('7688469db4a3eba61e6e35578dc7c2e5', 'c36169beb12de8a71c8683ee7c28a503', '启用', '1', null, null, '1', 'admin', '2019-03-18 23:29:28', null, null);
INSERT INTO `sys_dict_item` VALUES ('78ea6cadac457967a4b1c4eb7aaa418c', 'fc6cd58fde2e8481db10d3a1e68ce70c', '正常', '1', null, null, '1', 'admin', '2019-03-18 23:30:28', null, null);
INSERT INTO `sys_dict_item` VALUES ('7ccf7b80c70ee002eceb3116854b75cb', 'ac2f7c0c5c5775fcea7e2387bcb22f01', '按钮权限', '2', null, null, '1', 'admin', '2019-03-18 23:25:40', null, null);
INSERT INTO `sys_dict_item` VALUES ('81fb2bb0e838dc68b43f96cc309f8257', 'fc6cd58fde2e8481db10d3a1e68ce70c', '冻结', '2', null, null, '1', 'admin', '2019-03-18 23:30:37', null, null);
+INSERT INTO `sys_dict_item` VALUES ('83250269359855501ec4e9c0b7e21596', '4274efc2292239b6f000b153f50823ff', '显示/访问(授权后显示/可访问)', '1', '', '1', '1', 'admin', '2019-05-10 17:54:51', null, null);
INSERT INTO `sys_dict_item` VALUES ('84778d7e928bc843ad4756db1322301f', '4e4602b3e3686f0911384e188dc7efb4', '大于等于', '>=', '大于等于', '5', '1', 'admin', '2019-04-01 10:46:02', 'admin', '2019-04-01 17:49:05');
+INSERT INTO `sys_dict_item` VALUES ('848d4da35ebd93782029c57b103e5b36', 'c5a14c75172783d72cbee6ee7f5df5d1', '饼图', 'pie', null, '3', '1', 'admin', '2019-04-12 17:05:49', null, null);
+INSERT INTO `sys_dict_item` VALUES ('84dfc178dd61b95a72900fcdd624c471', '78bda155fe380b1b3f175f1e88c284c6', '处理中', '2', '处理中', '2', '1', 'admin', '2019-05-09 16:33:01', null, null);
INSERT INTO `sys_dict_item` VALUES ('86f19c7e0a73a0bae451021ac05b99dd', 'ac2f7c0c5c5775fcea7e2387bcb22f01', '子菜单', '1', null, null, '1', 'admin', '2019-03-18 23:25:27', null, null);
INSERT INTO `sys_dict_item` VALUES ('8bccb963e1cd9e8d42482c54cc609ca2', '4f69be5f507accea8d5df5f11346181a', '微信', '3', null, '3', '1', 'admin', '2021-05-11 14:29:12', 'admin', '2019-04-11 14:29:31');
-INSERT INTO `sys_dict_item` VALUES ('8c618902365ca681ebbbe1e28f11a548', '4c753b5293304e7a445fd2741b46529d', '启用', '1', null, '0', '0', 'admin', '2019-03-18 23:19:27', 'admin', '2019-03-20 09:33:30');
+INSERT INTO `sys_dict_item` VALUES ('8c618902365ca681ebbbe1e28f11a548', '4c753b5293304e7a445fd2741b46529d', '启用', '1', '', '0', '1', 'admin', '2020-07-18 23:19:27', 'admin', '2019-05-17 14:51:18');
+INSERT INTO `sys_dict_item` VALUES ('8cdf08045056671efd10677b8456c999', '4274efc2292239b6f000b153f50823ff', '可编辑(未授权时禁用)', '2', '', '2', '1', 'admin', '2019-05-10 17:55:38', null, null);
+INSERT INTO `sys_dict_item` VALUES ('8ff48e657a7c5090d4f2a59b37d1b878', '4d7fec1a7799a436d26d02325eff295e', '中', 'M', '中', '2', '1', 'admin', '2019-04-16 17:04:40', null, null);
INSERT INTO `sys_dict_item` VALUES ('9a96c4a4e4c5c9b4e4d0cbf6eb3243cc', '4c753b5293304e7a445fd2741b46529d', '不启用', '0', null, '1', '1', 'admin', '2019-03-18 23:19:53', null, null);
INSERT INTO `sys_dict_item` VALUES ('a2321496db6febc956a6c70fab94cb0c', '404a04a15f371566c658ee9ef9fc392a', '3', '3', null, '1', '1', 'admin', '2019-03-30 11:18:18', null, null);
+INSERT INTO `sys_dict_item` VALUES ('a2be752dd4ec980afaec1efd1fb589af', '8dfe32e2d29ea9430a988b3b558bf233', '已撤销', '2', '已撤销', '3', '1', 'admin', '2019-04-16 17:41:39', null, null);
INSERT INTO `sys_dict_item` VALUES ('aa0d8a8042a18715a17f0a888d360aa4', 'ac2f7c0c5c5775fcea7e2387bcb22f01', '一级菜单', '0', null, null, '1', 'admin', '2019-03-18 23:24:52', null, null);
INSERT INTO `sys_dict_item` VALUES ('adcf2a1fe93bb99a84833043f475fe0b', '4e4602b3e3686f0911384e188dc7efb4', '包含', 'IN', '包含', '8', '1', 'admin', '2019-04-01 16:45:47', 'admin', '2019-04-01 17:49:24');
+INSERT INTO `sys_dict_item` VALUES ('b029a41a851465332ee4ee69dcf0a4c2', '0b5d19e1fce4b2e6647e6b4a17760c14', '系统消息', '2', null, '1', '1', 'admin', '2019-02-22 18:02:08', 'admin', '2019-04-22 18:02:13');
INSERT INTO `sys_dict_item` VALUES ('b2a8b4bb2c8e66c2c4b1bb086337f393', '3486f32803bb953e7155dab3513dc68b', '正常', '0', null, null, '1', 'admin', '2022-10-18 21:46:48', 'admin', '2019-03-28 22:22:20');
INSERT INTO `sys_dict_item` VALUES ('b4a887dc3ff01d2daadaa412e63189ed', '4f69be5f507accea8d5df5f11346181a', '邮件', '2', null, '2', '1', 'admin', '2021-05-11 14:29:03', 'admin', '2019-04-11 14:29:25');
INSERT INTO `sys_dict_item` VALUES ('b57f98b88363188daf38d42f25991956', '6b78e3f59faec1a4750acff08030a79b', '22', '222', null, null, '0', 'admin', '2019-02-21 19:59:43', 'admin', '2019-03-11 21:23:27');
+INSERT INTO `sys_dict_item` VALUES ('b5f3bd5f66bb9a83fecd89228c0d93d1', '68168534ff5065a152bfab275c2136f8', '无效', '0', '无效', '1', '1', 'admin', '2019-04-26 19:21:49', null, null);
+INSERT INTO `sys_dict_item` VALUES ('b9fbe2a3602d4a27b45c100ac5328484', '78bda155fe380b1b3f175f1e88c284c6', '待提交', '1', '待提交', '1', '1', 'admin', '2019-05-09 16:32:35', null, null);
+INSERT INTO `sys_dict_item` VALUES ('ba27737829c6e0e582e334832703d75e', '236e8a4baff0db8c62c00dd95632834f', '同步', '1', '同步', '1', '1', 'admin', '2019-05-15 15:28:15', null, null);
+INSERT INTO `sys_dict_item` VALUES ('cbfcc5b88fc3a90975df23ffc8cbe29c', 'c5a14c75172783d72cbee6ee7f5df5d1', '曲线图', 'line', null, '2', '1', 'admin', '2019-05-12 17:05:30', 'admin', '2019-04-12 17:06:06');
+INSERT INTO `sys_dict_item` VALUES ('d1cee7b0dcccff0b07da7325110fcad4', '4f69be5f507accea8d5df5f11346181a', '微信', '3', '', '3', '1', 'admin', '2035-02-28 10:50:53', 'admin', '2019-04-28 10:58:51');
+INSERT INTO `sys_dict_item` VALUES ('d217592908ea3e00ff986ce97f24fb98', 'c5a14c75172783d72cbee6ee7f5df5d1', '数据列表', 'table', null, '4', '1', 'admin', '2019-04-12 17:05:56', null, null);
INSERT INTO `sys_dict_item` VALUES ('d75b5b3666d0742f08027af0255b4400', '4f69be5f507accea8d5df5f11346181a', '短信', '1', null, '1', '1', 'admin', '2019-04-11 14:28:49', null, null);
INSERT INTO `sys_dict_item` VALUES ('df168368dcef46cade2aadd80100d8aa', '3d9a351be3436fbefb1307d4cfb49bf2', '男', '1', null, '1', '1', null, '2027-08-04 14:56:49', 'admin', '2019-03-23 22:44:44');
INSERT INTO `sys_dict_item` VALUES ('e6329e3a66a003819e2eb830b0ca2ea0', '4e4602b3e3686f0911384e188dc7efb4', '小于', '<', '小于', '2', '1', 'admin', '2019-04-01 16:44:15', 'admin', '2019-04-01 17:48:34');
+INSERT INTO `sys_dict_item` VALUES ('e94eb7af89f1dbfa0d823580a7a6e66a', '236e8a4baff0db8c62c00dd95632834f', '不同步', '0', '不同步', '2', '1', 'admin', '2019-05-15 15:28:28', null, null);
INSERT INTO `sys_dict_item` VALUES ('f0162f4cc572c9273f3e26b2b4d8c082', 'ad7c65ba97c20a6805d5dcdf13cdaf36', 'booostrap', '1', null, '1', '1', 'admin', '2021-08-22 16:32:04', 'admin', '2019-03-22 16:33:57');
INSERT INTO `sys_dict_item` VALUES ('f16c5706f3ae05c57a53850c64ce7c45', 'a9d9942bd0eccb6e89de92d130ec4c4a', '发送成功', '1', null, '2', '1', 'admin', '2019-04-12 18:19:43', null, null);
INSERT INTO `sys_dict_item` VALUES ('f2a7920421f3335afdf6ad2b342f6b5d', '845da5006c97754728bf48b6a10f79cc', '冻结', '2', null, null, '1', 'admin', '2019-03-18 21:46:02', null, null);
INSERT INTO `sys_dict_item` VALUES ('f37f90c496ec9841c4c326b065e00bb2', '83bfb33147013cc81640d5fd9eda030c', '登录日志', '1', null, null, '1', 'admin', '2019-03-18 23:22:37', null, null);
-
--- ----------------------------
--- Table structure for sys_log
--- ----------------------------
-DROP TABLE IF EXISTS `sys_log`;
-CREATE TABLE `sys_log` (
- `id` varchar(32) NOT NULL,
- `log_type` int(2) default NULL COMMENT '日志类型（1登录日志，2操作日志）',
- `log_content` varchar(1000) default NULL COMMENT '日志内容',
- `operate_type` int(2) default NULL COMMENT '操作类型',
- `userid` varchar(32) default NULL COMMENT '操作用户账号',
- `username` varchar(100) default NULL COMMENT '操作用户名称',
- `ip` varchar(100) default NULL COMMENT 'IP',
- `method` varchar(500) default NULL COMMENT '请求java方法',
- `request_url` varchar(255) default NULL COMMENT '请求路径',
- `request_param` varchar(255) default NULL COMMENT '请求参数',
- `request_type` varchar(10) default NULL COMMENT '请求类型',
- `cost_time` bigint(20) default NULL COMMENT '耗时',
- `create_by` varchar(32) default NULL COMMENT '创建人',
- `create_time` datetime default NULL COMMENT '创建时间',
- `update_by` varchar(32) default NULL COMMENT '更新人',
- `update_time` datetime default NULL COMMENT '更新时间',
- PRIMARY KEY (`id`),
- KEY `index_table_userid` USING BTREE (`userid`),
- KEY `index_logt_ype` USING BTREE (`log_type`),
- KEY `index_operate_type` USING BTREE (`operate_type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='系统日志表';
+INSERT INTO `sys_dict_item` VALUES ('f753aff60ff3931c0ecb4812d8b5e643', '4c03fca6bf1f0299c381213961566349', '双排布局', 'double', null, '3', '1', 'admin', '2019-04-12 17:43:51', null, null);
+INSERT INTO `sys_dict_item` VALUES ('fcec03570f68a175e1964808dc3f1c91', '4c03fca6bf1f0299c381213961566349', 'Tab风格', 'tab', null, '1', '1', 'admin', '2019-04-12 17:43:31', null, null);
+INSERT INTO `sys_dict_item` VALUES ('fe50b23ae5e68434def76f67cef35d2d', '78bda155fe380b1b3f175f1e88c284c6', '已作废', '4', '已作废', '4', '1', 'admin', '2021-09-09 16:33:43', 'admin', '2019-05-09 16:34:40');
-- ----------------------------
-- Records of sys_log
@@ -1662,217 +1877,140 @@ INSERT INTO `sys_log` VALUES ('dd4e1ab492e59719173d8ae0f5dbc9a2', '1', '用户�
INSERT INTO `sys_log` VALUES ('056dd4466f4ed51de26c535fd9864828', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', '2019-04-11 19:47:15', null, null);
INSERT INTO `sys_log` VALUES ('89bfd8b9d6fa57a8e7017a2345ec1534', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', '2019-04-12 09:27:32', null, null);
INSERT INTO `sys_log` VALUES ('51aeabed335ab4e238640a4d17dd51a3', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', '2019-04-12 10:12:41', null, null);
-INSERT INTO `sys_log` VALUES ('85780936e962607ee10ce7b6b4838d66', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', '2019-04-12 10:43:38', null, null);
-INSERT INTO `sys_log` VALUES ('7efea1a687e28610a7ccdfc04b27c66a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', '2019-04-12 12:10:02', null, null);
-INSERT INTO `sys_log` VALUES ('fd4a496c56bacd76f93f95a2836965c8', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', '2019-04-12 18:35:11', null, null);
-INSERT INTO `sys_log` VALUES ('973b3d25b4defcac4fe8c62bd0b7dd8e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', '2019-04-12 19:01:30', null, null);
-INSERT INTO `sys_log` VALUES ('26be99abd7a62d27c751675df196b011', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', '2019-04-12 20:50:55', null, null);
-INSERT INTO `sys_log` VALUES ('9c1148d0c35f9ae2d77ccddee84f6761', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', '2019-04-12 22:35:43', null, null);
-INSERT INTO `sys_log` VALUES ('2d02b1f2e72203070b0e5e34ae6a39b2', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', '2019-04-14 15:21:25', null, null);
-INSERT INTO `sys_log` VALUES ('dcbee150c5158457b8bb696e5a74aa89', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', '2019-04-14 15:22:25', null, null);
-
--- ----------------------------
--- Table structure for sys_permission
--- ----------------------------
-DROP TABLE IF EXISTS `sys_permission`;
-CREATE TABLE `sys_permission` (
- `id` varchar(32) NOT NULL COMMENT '主键id',
- `parent_id` varchar(32) default NULL COMMENT '父id',
- `name` varchar(100) default NULL COMMENT '菜单标题',
- `url` varchar(255) default NULL COMMENT '路径',
- `component` varchar(255) default NULL COMMENT '组件',
- `component_name` varchar(100) default NULL COMMENT '组件名字',
- `redirect` varchar(255) default NULL COMMENT '一级菜单跳转地址',
- `menu_type` int(11) default NULL COMMENT '菜单类型(0:一级菜单; 1:子菜单:2:按钮权限)',
- `perms` varchar(255) default NULL COMMENT '菜单权限编码',
- `sort_no` double(3,2) default NULL COMMENT '菜单排序',
- `always_show` tinyint(1) default NULL COMMENT '聚合子路由: 1是0否',
- `icon` varchar(100) default NULL COMMENT '菜单图标',
- `is_route` tinyint(1) default '1' COMMENT '是否路由菜单: 0:不是 1:是（默认值1）',
- `is_leaf` tinyint(1) default NULL COMMENT '是否叶子节点: 1:是 0:不是',
- `hidden` int(2) default '0' COMMENT '是否隐藏路由: 0否,1是',
- `description` varchar(255) default NULL COMMENT '描述',
- `create_by` varchar(32) default NULL COMMENT '创建人',
- `create_time` datetime default NULL COMMENT '创建时间',
- `update_by` varchar(32) default NULL COMMENT '更新人',
- `update_time` datetime default NULL COMMENT '更新时间',
- `del_flag` int(1) default '0' COMMENT '删除状态 0正常 1已删除',
- PRIMARY KEY (`id`),
- KEY `index_prem_pid` USING BTREE (`parent_id`),
- KEY `index_prem_is_route` USING BTREE (`is_route`),
- KEY `index_prem_is_leaf` USING BTREE (`is_leaf`),
- KEY `index_prem_sort_no` USING BTREE (`sort_no`),
- KEY `index_prem_del_flag` USING BTREE (`del_flag`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='菜单权限表';
+INSERT INTO `sys_log` VALUES ('67181c36b55b06047a16a031fd1262c1', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg', '2019-05-17 13:55:22', null, null);
+INSERT INTO `sys_log` VALUES ('2d5af41d2df82b316ba31fcdf6168d6a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg', '2019-05-17 14:43:58', null, null);
+INSERT INTO `sys_log` VALUES ('e2f703771f64b1bcd709204669ae3d93', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', '2019-05-17 14:48:39', null, null);
+INSERT INTO `sys_log` VALUES ('8143ce0b35bfe6e7b8113e1ecc066acd', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg', '2019-05-17 14:48:48', null, null);
+INSERT INTO `sys_log` VALUES ('2bca2d6666c1f6630225252c7b31326c', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', '2019-05-17 18:30:48', null, null);
+INSERT INTO `sys_log` VALUES ('11695a9dcf44859cda97a4226bebe21b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg', '2019-05-17 18:30:57', null, null);
+INSERT INTO `sys_log` VALUES ('40209016cadff6b571a8150c6218cfa8', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg', '2019-05-18 11:33:28', null, null);
-- ----------------------------
-- Records of sys_permission
-- ----------------------------
-INSERT INTO `sys_permission` VALUES ('00a2a0ae65cdca5e93209cdbde97cbe6', '2e42e3835c2b44ec9f7bc26c146ee531', '成功', '/result/success', 'result/Success', null, null, '1', null, '1.00', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('020b06793e4de2eee0007f603000c769', 'f0675b52d89100ee88472b6800754a08', 'ViserChartDemo', '/report/ViserChartDemo', 'jeecg/report/ViserChartDemo', null, null, '1', null, '0.00', '0', null, '1', '1', '0', null, 'admin', '2019-04-03 19:08:53', 'admin', '2019-04-12 10:54:29', '0');
-INSERT INTO `sys_permission` VALUES ('024f1fd1283dc632458976463d8984e1', '700b7f95165c46cc7a78bf227aa8fed3', 'Tomcat信息', '/monitor/TomcatInfo', 'monitor/TomcatInfo', null, null, '1', null, '4.00', '0', null, '1', '1', '0', null, 'admin', '2019-04-02 09:44:29', 'admin', '2019-04-02 11:36:25', '0');
-INSERT INTO `sys_permission` VALUES ('05b3c82ddb2536a4a5ee1a4c46b5abef', '540a2936940846cb98114ffb0d145cb8', '用户列表', '/list/user-list', 'list/UserList', null, null, '1', null, '3.00', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('078f9558cdeab239aecb2bda1a8ed0d1', 'fb07ca05a3e13674dbf6d3245956da2e', '搜索列表（文章）', '/list/search/article', 'list/TableList', null, null, '1', null, '1.00', '0', null, '1', '1', '0', null, 'admin', '2019-02-12 14:00:34', 'admin', '2019-02-12 14:17:54', '0');
-INSERT INTO `sys_permission` VALUES ('08e6b9dc3c04489c8e1ff2ce6f105aa4', '', '系统监控', '/dashboard3', 'layouts/RouteView', null, null, '0', null, '6.00', '0', 'dashboard', '1', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-03-31 22:19:58', '0');
-INSERT INTO `sys_permission` VALUES ('109c78a583d4693ce2f16551b7786786', 'e41b69c57a941a3bbcce45032fe57605', 'Online报表配置', '/online/cgreport', 'modules/online/cgreport/OnlCgreportHeadList', null, null, '1', null, '2.00', '0', null, '1', '1', '0', null, 'admin', '2019-03-08 10:51:07', 'admin', '2019-03-30 19:04:28', '0');
-INSERT INTO `sys_permission` VALUES ('13212d3416eb690c2e1d5033166ff47a', '2e42e3835c2b44ec9f7bc26c146ee531', '失败', '/result/fail', 'result/Error', null, null, '1', null, '2.00', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('1367a93f2c410b169faa7abcbad2f77c', '6e73eb3c26099c191bf03852ee1310a1', '基本设置', '/account/settings/base', 'account/settings/BaseSetting', null, null, '1', 'BaseSettings', null, '0', null, '1', '1', '1', null, null, '2018-12-26 18:58:35', 'admin', '2019-03-20 12:57:31', '0');
-INSERT INTO `sys_permission` VALUES ('200006f0edf145a2b50eacca07585451', 'fb07ca05a3e13674dbf6d3245956da2e', '搜索列表（应用）', '/list/search/application', 'list/TableList', null, null, '1', null, '1.00', '0', null, '1', '1', '0', null, 'admin', '2019-02-12 14:02:51', 'admin', '2019-02-12 14:14:01', '0');
-INSERT INTO `sys_permission` VALUES ('277bfabef7d76e89b33062b16a9a5020', 'e3c13679c73a4f829bcff2aba8fd68b1', '基础表单', '/form/base-form', 'form/BasicForm', null, null, '1', null, '1.00', '0', null, '1', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-02-26 17:02:08', '0');
-INSERT INTO `sys_permission` VALUES ('2a470fc0c3954d9dbb61de6d80846549', '', '常见案例', '/jeecg', 'layouts/RouteView', null, null, '0', null, '7.00', '0', 'qrcode', '1', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-04-02 11:46:42', '0');
-INSERT INTO `sys_permission` VALUES ('2aeddae571695cd6380f6d6d334d6e7d', 'f0675b52d89100ee88472b6800754a08', '布局统计报表', '/report/ArchivesStatisticst', 'jeecg/report/ArchivesStatisticst', null, null, '1', null, '1.00', '0', null, '1', '1', '0', null, 'admin', '2019-04-03 18:32:48', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('2dbbafa22cda07fa5d169d741b81fe12', '08e6b9dc3c04489c8e1ff2ce6f105aa4', '在线文档', '{{ window._CONFIG[\'domianURL\'] }}/swagger-ui.html#/', 'layouts/IframePageView', null, null, '1', null, '3.00', '0', null, '1', '1', '0', null, 'admin', '2019-01-30 10:00:01', 'admin', '2019-03-23 19:44:43', '0');
-INSERT INTO `sys_permission` VALUES ('2e42e3835c2b44ec9f7bc26c146ee531', '', '结果页', '/result', 'layouts/PageView', null, null, '0', null, '8.00', '0', 'check-circle-o', '1', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-04-02 11:46:56', '0');
-INSERT INTO `sys_permission` VALUES ('339329ed54cf255e1f9392e84f136901', '2a470fc0c3954d9dbb61de6d80846549', 'helloworld', '/jeecg/helloworld', 'jeecg/helloworld', null, null, '1', null, '4.00', '0', null, '1', '1', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-02-15 16:24:56', '0');
-INSERT INTO `sys_permission` VALUES ('3f915b2769fc80648e92d04e84ca059d', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '用户管理', '/isystem/user', 'system/UserList', null, null, '1', null, '1.00', '0', null, '1', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-03-16 11:20:33', '0');
-INSERT INTO `sys_permission` VALUES ('4148ec82b6acd69f470bea75fe41c357', '2a470fc0c3954d9dbb61de6d80846549', '单表模型示例', '/jeecg/jeecgDemoList', 'jeecg/JeecgDemoList', 'DemoList', null, '1', null, '1.00', '0', null, '1', '1', '0', null, null, '2018-12-28 15:57:30', 'admin', '2019-02-15 16:24:37', '0');
-INSERT INTO `sys_permission` VALUES ('418964ba087b90a84897b62474496b93', '540a2936940846cb98114ffb0d145cb8', '查询表格', '/list/query-list', 'list/TableList', null, null, '1', null, '1.00', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('4356a1a67b564f0988a484f5531fd4d9', '2a470fc0c3954d9dbb61de6d80846549', '内嵌Table', '/jeecg/TableExpandeSub', 'jeecg/TableExpandeSub', null, null, '1', null, '1.00', '0', null, '1', '1', '0', null, 'admin', '2019-04-04 22:48:13', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('45c966826eeff4c99b8f8ebfe74511fc', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '部门管理', '/isystem/depart', 'system/DepartList', null, null, '1', null, '1.00', '0', null, '1', '1', '0', null, 'admin', '2019-01-29 18:47:40', 'admin', '2019-03-07 19:23:16', '0');
-INSERT INTO `sys_permission` VALUES ('4875ebe289344e14844d8e3ea1edd73f', '', '详情页', '/profile', 'layouts/RouteView', null, null, '0', null, '8.00', '0', 'profile', '1', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-04-02 11:46:48', '0');
-INSERT INTO `sys_permission` VALUES ('4f66409ef3bbd69c1d80469d6e2a885e', '6e73eb3c26099c191bf03852ee1310a1', '账户绑定', '/account/settings/binding', 'account/settings/Binding', null, null, '1', 'BindingSettings', null, null, null, '1', '1', null, null, null, '2018-12-26 19:01:20', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('4f84f9400e5e92c95f05b554724c2b58', '540a2936940846cb98114ffb0d145cb8', '角色列表', '/list/role-list', 'list/RoleList', null, null, '1', null, '4.00', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('540a2936940846cb98114ffb0d145cb8', '', '列表页', '/list', 'layouts/PageView', null, '/list/query-list', '0', null, '9.00', '0', 'table', '1', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-03-31 22:20:20', '0');
-INSERT INTO `sys_permission` VALUES ('54dd5457a3190740005c1bfec55b1c34', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '菜单管理', '/isystem/permission', 'system/PermissionList', null, null, '1', null, '3.00', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('58857ff846e61794c69208e9d3a85466', '08e6b9dc3c04489c8e1ff2ce6f105aa4', '日志管理', '/isystem/log', 'system/LogList', null, null, '1', null, '1.00', '0', '', '1', '1', '0', null, null, '2018-12-26 10:11:18', 'admin', '2019-04-02 11:38:17', '0');
-INSERT INTO `sys_permission` VALUES ('5c8042bd6c601270b2bbd9b20bccc68b', '', '消息中心', '/message', 'layouts/RouteView', null, null, '0', null, '6.00', '0', 'message', '1', '0', '0', null, 'admin', '2019-04-09 11:05:04', 'admin', '2019-04-11 19:47:54', '0');
-INSERT INTO `sys_permission` VALUES ('6531cf3421b1265aeeeabaab5e176e6d', 'e3c13679c73a4f829bcff2aba8fd68b1', '分步表单', '/form/step-form', 'form/stepForm/StepForm', null, null, '1', null, '2.00', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('65a8f489f25a345836b7f44b1181197a', 'c65321e57b7949b7a975313220de0422', '403', '/exception/403', 'exception/403', null, null, '1', null, '1.00', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('6ad53fd1b220989a8b71ff482d683a5a', '2a470fc0c3954d9dbb61de6d80846549', '一对多Tab示例', '/jeecg/tablist/JeecgOrderDMainList', 'jeecg/tablist/JeecgOrderDMainList', null, null, '1', null, '2.00', '0', null, '1', '1', '0', null, 'admin', '2019-02-20 14:45:09', 'admin', '2019-02-21 16:26:21', '0');
-INSERT INTO `sys_permission` VALUES ('6e73eb3c26099c191bf03852ee1310a1', '717f6bee46f44a3897eca9abd6e2ec44', '个人设置', '/account/settings', 'account/settings/Index', null, null, '1', null, '2.00', '1', null, '1', '0', null, null, null, '2018-12-25 20:34:38', null, '2018-12-26 19:05:26', '0');
-INSERT INTO `sys_permission` VALUES ('700b7f95165c46cc7a78bf227aa8fed3', '08e6b9dc3c04489c8e1ff2ce6f105aa4', '性能监控', '/monitor', 'layouts/RouteView', null, null, '1', null, '0.00', '0', null, '1', '0', '0', null, 'admin', '2019-04-02 11:34:34', 'admin', '2019-04-14 15:21:54', '0');
-INSERT INTO `sys_permission` VALUES ('717f6bee46f44a3897eca9abd6e2ec44', null, '个人页', '/account', 'layouts/RouteView', null, null, '0', null, '9.00', '0', 'user', '1', '0', null, null, null, '2018-12-25 20:34:38', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('73678f9daa45ed17a3674131b03432fb', '540a2936940846cb98114ffb0d145cb8', '权限列表', '/list/permission-list', 'list/PermissionList', null, null, '1', null, '5.00', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('7593c9e3523a17bca83b8d7fe8a34e58', '3f915b2769fc80648e92d04e84ca059d', '添加用户按钮', '', null, null, null, '2', 'user:add', '1.00', '0', null, '1', '1', '0', null, 'admin', '2019-03-16 11:20:33', 'admin', '2019-03-16 11:54:15', '0');
-INSERT INTO `sys_permission` VALUES ('7960961b0063228937da5fa8dd73d371', '2a470fc0c3954d9dbb61de6d80846549', 'JEditableTable示例', '/jeecg/JEditableTable', 'jeecg/JeecgEditableTableExample', null, null, '1', null, '7.00', '0', null, '1', '1', '0', null, 'admin', '2019-03-22 15:22:18', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('7ac9eb9ccbde2f7a033cd4944272bf1e', '540a2936940846cb98114ffb0d145cb8', '卡片列表', '/list/card', 'list/CardList', null, null, '1', null, '7.00', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('841057b8a1bef8f6b4b20f9a618a7fa6', '08e6b9dc3c04489c8e1ff2ce6f105aa4', '数据日志', '/sys/dataLog-list', 'system/DataLogList', null, null, '1', null, '1.00', '0', null, '1', '1', '0', null, 'admin', '2019-03-11 19:26:49', 'admin', '2019-03-12 11:40:47', '0');
-INSERT INTO `sys_permission` VALUES ('882a73768cfd7f78f3a37584f7299656', '6e73eb3c26099c191bf03852ee1310a1', '个性化设置', '/account/settings/custom', 'account/settings/Custom', null, null, '1', 'CustomSettings', null, null, null, '1', '1', null, null, null, '2018-12-26 19:00:46', null, '2018-12-26 21:13:25', '0');
-INSERT INTO `sys_permission` VALUES ('8b3bff2eee6f1939147f5c68292a1642', '700b7f95165c46cc7a78bf227aa8fed3', '服务器信息', '/monitor/SystemInfo', 'monitor/SystemInfo', null, null, '1', null, '4.00', '0', null, '1', '1', '0', null, 'admin', '2019-04-02 11:39:19', 'admin', '2019-04-02 15:40:02', '0');
-INSERT INTO `sys_permission` VALUES ('8d1ebd663688965f1fd86a2f0ead3416', '700b7f95165c46cc7a78bf227aa8fed3', 'Redis监控', '/monitor/redis/info', 'monitor/RedisInfo', null, null, '1', null, '1.00', '0', null, '1', '1', '0', null, 'admin', '2019-04-02 13:11:33', 'admin', '2019-04-02 13:24:43', '0');
-INSERT INTO `sys_permission` VALUES ('8fb8172747a78756c11916216b8b8066', '717f6bee46f44a3897eca9abd6e2ec44', '工作台', '/dashboard/workplace', 'dashboard/Workplace', null, null, '1', null, '3.00', '0', null, '1', '1', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-04-02 11:45:02', '0');
-INSERT INTO `sys_permission` VALUES ('944abf0a8fc22fe1f1154a389a574154', '5c8042bd6c601270b2bbd9b20bccc68b', '消息管理', '/modules/message/sysMessageList', 'modules/message/SysMessageList', null, null, '1', null, '1.00', '0', null, '1', '1', '0', null, 'admin', '2019-04-09 11:27:53', 'admin', '2019-04-09 19:31:23', '0');
-INSERT INTO `sys_permission` VALUES ('9502685863ab87f0ad1134142788a385', '', '首页', '/dashboard/analysis', 'dashboard/Analysis', null, null, '0', null, '0.00', '0', 'home', '1', '1', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-03-29 11:04:13', '0');
-INSERT INTO `sys_permission` VALUES ('9a90363f216a6a08f32eecb3f0bf12a3', '2a470fc0c3954d9dbb61de6d80846549', '常用选择组件', '/jeecg/SelectDemo', 'jeecg/SelectDemo', null, null, '1', null, '1.00', '0', null, '1', '1', '0', null, 'admin', '2019-03-19 11:19:05', 'admin', '2019-04-10 15:36:50', '0');
-INSERT INTO `sys_permission` VALUES ('9cb91b8851db0cf7b19d7ecc2a8193dd', '1939e035e803a99ceecb6f5563570fb2', '我的任务表单', '/modules/bpm/task/form/FormModule', 'modules/bpm/task/form/FormModule', null, null, '1', null, '1.00', '0', null, '1', '1', '0', null, 'admin', '2019-03-08 16:49:05', 'admin', '2019-03-08 18:37:56', '0');
-INSERT INTO `sys_permission` VALUES ('9fe26464838de2ea5e90f2367e35efa0', 'e41b69c57a941a3bbcce45032fe57605', 'AUTO在线报表', '/online/cgreport/:code', 'modules/online/cgreport/auto/OnlCgreportAutoList', 'onlineAutoList', null, '1', null, '6.00', '0', null, '1', '1', '0', null, 'admin', '2019-03-12 11:06:48', 'admin', '2019-04-11 19:52:38', '0');
-INSERT INTO `sys_permission` VALUES ('a400e4f4d54f79bf5ce160ae432231af', '2a470fc0c3954d9dbb61de6d80846549', '百度', 'http://www.baidu.com', 'layouts/IframePageView', null, null, '1', null, '4.00', '0', null, '1', '1', '0', null, 'admin', '2019-01-29 19:44:06', 'admin', '2019-02-15 16:25:02', '0');
-INSERT INTO `sys_permission` VALUES ('ae4fed059f67086fd52a73d913cf473d', '540a2936940846cb98114ffb0d145cb8', '内联编辑表格', '/list/edit-table', 'list/TableInnerEditList', null, null, '1', null, '2.00', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('aedbf679b5773c1f25e9f7b10111da73', '08e6b9dc3c04489c8e1ff2ce6f105aa4', 'SQL监控', '{{ window._CONFIG[\'domianURL\'] }}/druid/', 'layouts/IframePageView', null, null, '1', null, '1.00', '0', null, '1', '1', '0', null, 'admin', '2019-01-30 09:43:22', 'admin', '2019-03-23 19:00:46', '0');
-INSERT INTO `sys_permission` VALUES ('b1cb0a3fedf7ed0e4653cb5a229837ee', '08e6b9dc3c04489c8e1ff2ce6f105aa4', '定时任务', '/isystem/QuartzJobList', 'system/QuartzJobList', null, null, '1', null, '3.00', '0', null, '1', '1', '0', null, null, '2019-01-03 09:38:52', 'admin', '2019-04-02 10:24:13', '0');
-INSERT INTO `sys_permission` VALUES ('b3c824fc22bd953e2eb16ae6914ac8f9', '4875ebe289344e14844d8e3ea1edd73f', '高级详情页', '/profile/advanced', 'profile/advanced/Advanced', null, null, '1', null, '2.00', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('b4dfc7d5dd9e8d5b6dd6d4579b1aa559', 'c65321e57b7949b7a975313220de0422', '500', '/exception/500', 'exception/500', null, null, '1', null, '3.00', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('c431130c0bc0ec71b0a5be37747bb36a', '2a470fc0c3954d9dbb61de6d80846549', '一对多JEditable', '/jeecg/JeecgOrderMainListForJEditableTable', 'jeecg/JeecgOrderMainListForJEditableTable', null, null, '1', null, '3.00', '0', null, '1', '1', '0', null, 'admin', '2019-03-29 10:51:59', 'admin', '2019-04-04 20:09:39', '0');
-INSERT INTO `sys_permission` VALUES ('c65321e57b7949b7a975313220de0422', null, '异常页', '/exception', 'layouts/RouteView', null, null, '0', null, '8.00', null, 'warning', '1', '0', null, null, null, '2018-12-25 20:34:38', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('c6cf95444d80435eb37b2f9db3971ae6', '2a470fc0c3954d9dbb61de6d80846549', '数据回执模拟', '/jeecg/InterfaceTest', 'jeecg/InterfaceTest', null, null, '1', null, '6.00', '0', null, '1', '1', '0', null, 'admin', '2019-02-19 16:02:23', 'admin', '2019-02-21 16:25:45', '0');
-INSERT INTO `sys_permission` VALUES ('cc50656cf9ca528e6f2150eba4714ad2', '4875ebe289344e14844d8e3ea1edd73f', '基础详情页', '/profile/basic', 'profile/basic/Index', null, null, '1', null, '1.00', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('d07a2c87a451434c99ab06296727ec4f', '700b7f95165c46cc7a78bf227aa8fed3', 'JVM信息', '/monitor/JvmInfo', 'monitor/JvmInfo', null, null, '1', null, '4.00', '0', null, '1', '1', '0', null, 'admin', '2019-04-01 23:07:48', 'admin', '2019-04-02 11:37:16', '0');
-INSERT INTO `sys_permission` VALUES ('d2bbf9ebca5a8fa2e227af97d2da7548', 'c65321e57b7949b7a975313220de0422', '404', '/exception/404', 'exception/404', null, null, '1', null, '2.00', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('d7d6e2e4e2934f2c9385a623fd98c6f3', '', '系统管理', '/isystem', 'layouts/RouteView', null, null, '1', null, '4.00', '0', 'setting', '1', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-03-31 22:19:52', '0');
-INSERT INTO `sys_permission` VALUES ('d86f58e7ab516d3bc6bfb1fe10585f97', '717f6bee46f44a3897eca9abd6e2ec44', '个人中心', '/account/center', 'account/center/Index', null, null, '1', null, '1.00', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('de13e0f6328c069748de7399fcc1dbbd', 'fb07ca05a3e13674dbf6d3245956da2e', '搜索列表（项目）', '/list/search/project', 'list/TableList', null, null, '1', null, '1.00', '0', null, '1', '1', '0', null, 'admin', '2019-02-12 14:01:40', 'admin', '2019-02-12 14:14:18', '0');
-INSERT INTO `sys_permission` VALUES ('e08cb190ef230d5d4f03824198773950', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '系统通告', '/isystem/annountCement', 'system/SysAnnouncementList', null, null, '1', 'annountCement', '6.00', null, '', '1', '1', null, null, null, '2019-01-02 17:23:01', null, '2019-01-02 17:31:23', '0');
-INSERT INTO `sys_permission` VALUES ('e3c13679c73a4f829bcff2aba8fd68b1', '', '表单页', '/form', 'layouts/PageView', null, null, '0', null, '9.00', '0', 'form', '1', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-03-31 22:20:14', '0');
-INSERT INTO `sys_permission` VALUES ('e41b69c57a941a3bbcce45032fe57605', '', '在线开发', '/online', 'layouts/RouteView', null, null, '0', null, '5.00', '0', 'cloud', '1', '0', '0', null, 'admin', '2019-03-08 10:43:10', 'admin', '2019-03-31 22:20:35', '0');
-INSERT INTO `sys_permission` VALUES ('e5973686ed495c379d829ea8b2881fc6', 'e3c13679c73a4f829bcff2aba8fd68b1', '高级表单', '/form/advanced-form', 'form/advancedForm/AdvancedForm', null, null, '1', null, '3.00', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('e6bfd1fcabfd7942fdd05f076d1dad38', '2a470fc0c3954d9dbb61de6d80846549', '打印测试', '/jeecg/PrintDemo', 'jeecg/PrintDemoList', null, null, '1', null, '3.00', '0', null, '1', '1', '0', null, 'admin', '2019-02-19 15:58:48', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('e8af452d8948ea49d37c934f5100ae6a', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '角色管理', '/isystem/role', 'system/RoleList', null, null, '1', null, '2.00', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('ec8d607d0156e198b11853760319c646', '6e73eb3c26099c191bf03852ee1310a1', '安全设置', '/account/settings/security', 'account/settings/Security', null, null, '1', 'SecuritySettings', null, null, null, '1', '1', null, null, null, '2018-12-26 18:59:52', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('f0675b52d89100ee88472b6800754a08', '', '统计报表', '/report', 'layouts/RouteView', null, null, '0', null, '7.00', '0', 'bar-chart', '1', '0', '0', null, 'admin', '2019-04-03 18:32:02', 'admin', '2019-04-11 19:48:39', '0');
-INSERT INTO `sys_permission` VALUES ('f1cb187abf927c88b89470d08615f5ac', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '数据字典', '/isystem/dict', 'system/DictList', null, null, '1', null, '5.00', null, null, '1', '1', null, null, null, '2018-12-28 13:54:43', null, '2018-12-28 15:37:54', '0');
-INSERT INTO `sys_permission` VALUES ('f23d9bfff4d9aa6b68569ba2cff38415', '540a2936940846cb98114ffb0d145cb8', '标准列表', '/list/basic-list', 'list/StandardList', null, null, '1', null, '6.00', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0');
-INSERT INTO `sys_permission` VALUES ('f780d0d3083d849ccbdb1b1baee4911d', '5c8042bd6c601270b2bbd9b20bccc68b', '模板管理', '/modules/message/sysMessageTemplateList', 'modules/message/SysMessageTemplateList', null, null, '1', null, '1.00', '0', null, '1', '1', '0', null, 'admin', '2019-04-09 11:50:31', 'admin', '2019-04-12 10:16:34', '0');
-INSERT INTO `sys_permission` VALUES ('fb07ca05a3e13674dbf6d3245956da2e', '540a2936940846cb98114ffb0d145cb8', '搜索列表', '/list/search', 'list/search/SearchLayout', null, '/list/search/article', '1', null, '8.00', '0', null, '1', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-02-12 15:09:13', '0');
-INSERT INTO `sys_permission` VALUES ('fb367426764077dcf94640c843733985', '2a470fc0c3954d9dbb61de6d80846549', '一对多示例', '/jeecg/JeecgOrderMainList', 'jeecg/JeecgOrderMainList', null, null, '1', null, '2.00', '0', null, '1', '1', '0', null, 'admin', '2019-02-15 16:24:11', 'admin', '2019-02-18 10:50:14', '0');
-INSERT INTO `sys_permission` VALUES ('fc810a2267dd183e4ef7c71cc60f4670', '700b7f95165c46cc7a78bf227aa8fed3', '请求追踪', '/monitor/HttpTrace', 'monitor/HttpTrace', null, null, '1', null, '4.00', '0', null, '1', '1', '0', null, 'admin', '2019-04-02 09:46:19', 'admin', '2019-04-02 11:37:27', '0');
-INSERT INTO `sys_permission` VALUES ('fedfbf4420536cacc0218557d263dfea', '6e73eb3c26099c191bf03852ee1310a1', '新消息通知', '/account/settings/notification', 'account/settings/Notification', null, null, '1', 'NotificationSettings', null, null, '', '1', '1', null, null, null, '2018-12-26 19:02:05', null, null, '0');
-
--- ----------------------------
--- Table structure for sys_permission_data_rule
--- ----------------------------
-DROP TABLE IF EXISTS `sys_permission_data_rule`;
-CREATE TABLE `sys_permission_data_rule` (
- `id` varchar(32) NOT NULL COMMENT 'ID',
- `permission_id` varchar(32) default NULL COMMENT '菜单ID',
- `rule_name` varchar(50) default NULL COMMENT '规则名称',
- `rule_column` varchar(50) default NULL COMMENT '字段',
- `rule_conditions` varchar(50) default NULL COMMENT '条件',
- `rule_value` varchar(300) default NULL COMMENT '规则值',
- `create_time` datetime default NULL COMMENT '创建时间',
- `create_by` varchar(32) default NULL,
- `update_time` datetime default NULL COMMENT '修改时间',
- `update_by` varchar(32) default NULL COMMENT '修改人',
- PRIMARY KEY (`id`),
- KEY `index_fucntionid` USING BTREE (`permission_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+INSERT INTO `sys_permission` VALUES ('00a2a0ae65cdca5e93209cdbde97cbe6', '2e42e3835c2b44ec9f7bc26c146ee531', '成功', '/result/success', 'result/Success', null, null, '1', null, null, '1', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('020b06793e4de2eee0007f603000c769', 'f0675b52d89100ee88472b6800754a08', 'ViserChartDemo', '/report/ViserChartDemo', 'jeecg/report/ViserChartDemo', null, null, '1', null, null, '3', '0', null, '1', '1', '0', null, 'admin', '2019-04-03 19:08:53', 'admin', '2019-04-03 19:08:53', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('024f1fd1283dc632458976463d8984e1', '700b7f95165c46cc7a78bf227aa8fed3', 'Tomcat信息', '/monitor/TomcatInfo', 'modules/monitor/TomcatInfo', null, null, '1', null, null, '4', '0', null, '1', '1', '0', null, 'admin', '2019-04-02 09:44:29', 'admin', '2019-05-07 15:19:10', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('05b3c82ddb2536a4a5ee1a4c46b5abef', '540a2936940846cb98114ffb0d145cb8', '用户列表', '/list/user-list', 'list/UserList', null, null, '1', null, null, '3', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('0620e402857b8c5b605e1ad9f4b89350', '2a470fc0c3954d9dbb61de6d80846549', '异步树列表Demo', '/jeecg/JeecgTreeTable', 'jeecg/JeecgTreeTable', null, null, '1', null, '0', '3', '0', null, '1', '1', '0', null, 'admin', '2019-05-13 17:30:30', 'admin', '2019-05-13 17:32:17', '0', '0', '1');
+INSERT INTO `sys_permission` VALUES ('078f9558cdeab239aecb2bda1a8ed0d1', 'fb07ca05a3e13674dbf6d3245956da2e', '搜索列表（文章）', '/list/search/article', 'list/TableList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', '2019-02-12 14:00:34', 'admin', '2019-02-12 14:17:54', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('08e6b9dc3c04489c8e1ff2ce6f105aa4', '', '系统监控', '/dashboard3', 'layouts/RouteView', null, null, '0', null, null, '6', '0', 'dashboard', '1', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-03-31 22:19:58', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('13212d3416eb690c2e1d5033166ff47a', '2e42e3835c2b44ec9f7bc26c146ee531', '失败', '/result/fail', 'result/Error', null, null, '1', null, null, '2', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('1367a93f2c410b169faa7abcbad2f77c', '6e73eb3c26099c191bf03852ee1310a1', '基本设置', '/account/settings/base', 'account/settings/BaseSetting', null, null, '1', 'BaseSettings', null, null, '0', null, '1', '1', '1', null, null, '2018-12-26 18:58:35', 'admin', '2019-03-20 12:57:31', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('190c2b43bec6a5f7a4194a85db67d96a', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '角色维护', '/system/roleUserList', 'system/RoleUserList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', '2019-04-17 15:13:56', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('1a0811914300741f4e11838ff37a1d3a', '3f915b2769fc80648e92d04e84ca059d', '手机号禁用', null, null, null, null, '2', 'user:form:phone', '2', '1', '0', null, '0', '1', '0', null, 'admin', '2019-05-11 17:19:30', 'admin', '2019-05-11 18:00:22', '0', '0', '1');
+INSERT INTO `sys_permission` VALUES ('200006f0edf145a2b50eacca07585451', 'fb07ca05a3e13674dbf6d3245956da2e', '搜索列表（应用）', '/list/search/application', 'list/TableList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', '2019-02-12 14:02:51', 'admin', '2019-02-12 14:14:01', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('265de841c58907954b8877fb85212622', '2a470fc0c3954d9dbb61de6d80846549', '图片拖拽排序', '/jeecg/imgDragSort', 'jeecg/ImgDragSort', null, null, '1', null, null, '4', '0', null, '1', '1', '0', null, 'admin', '2019-04-25 10:43:08', 'admin', '2019-04-25 10:46:26', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('277bfabef7d76e89b33062b16a9a5020', 'e3c13679c73a4f829bcff2aba8fd68b1', '基础表单', '/form/base-form', 'form/BasicForm', null, null, '1', null, null, '1', '0', null, '1', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-02-26 17:02:08', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('2a470fc0c3954d9dbb61de6d80846549', '', '常见案例', '/jeecg', 'layouts/RouteView', null, null, '0', null, null, '7', '0', 'qrcode', '1', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-04-02 11:46:42', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('2aeddae571695cd6380f6d6d334d6e7d', 'f0675b52d89100ee88472b6800754a08', '布局统计报表', '/report/ArchivesStatisticst', 'jeecg/report/ArchivesStatisticst', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', '2019-04-03 18:32:48', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('2dbbafa22cda07fa5d169d741b81fe12', '08e6b9dc3c04489c8e1ff2ce6f105aa4', '在线文档', '{{ window._CONFIG[\'domianURL\'] }}/swagger-ui.html#/', 'layouts/IframePageView', null, null, '1', null, null, '3', '0', null, '1', '1', '0', null, 'admin', '2019-01-30 10:00:01', 'admin', '2019-03-23 19:44:43', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('2e42e3835c2b44ec9f7bc26c146ee531', '', '结果页', '/result', 'layouts/PageView', null, null, '0', null, null, '8', '0', 'check-circle-o', '1', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-04-02 11:46:56', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('339329ed54cf255e1f9392e84f136901', '2a470fc0c3954d9dbb61de6d80846549', 'helloworld', '/jeecg/helloworld', 'jeecg/helloworld', null, null, '1', null, null, '4', '0', null, '1', '1', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-02-15 16:24:56', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('3f915b2769fc80648e92d04e84ca059d', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '用户管理', '/isystem/user', 'system/UserList', null, null, '1', null, null, '1', '0', null, '1', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-03-16 11:20:33', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('3fac0d3c9cd40fa53ab70d4c583821f8', '2a470fc0c3954d9dbb61de6d80846549', '分屏', '/jeecg/splitPanel', 'jeecg/SplitPanel', null, null, '1', null, null, '6', '0', null, '1', '1', '0', null, 'admin', '2019-04-25 16:27:06', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('4148ec82b6acd69f470bea75fe41c357', '2a470fc0c3954d9dbb61de6d80846549', '单表模型示例', '/jeecg/jeecgDemoList', 'jeecg/JeecgDemoList', 'DemoList', null, '1', null, null, '1', '0', null, '1', '1', '0', null, null, '2018-12-28 15:57:30', 'admin', '2019-02-15 16:24:37', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('418964ba087b90a84897b62474496b93', '540a2936940846cb98114ffb0d145cb8', '查询表格', '/list/query-list', 'list/TableList', null, null, '1', null, null, '1', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('4356a1a67b564f0988a484f5531fd4d9', '2a470fc0c3954d9dbb61de6d80846549', '内嵌Table', '/jeecg/TableExpandeSub', 'jeecg/TableExpandeSub', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', '2019-04-04 22:48:13', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('45c966826eeff4c99b8f8ebfe74511fc', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '部门管理', '/isystem/depart', 'system/DepartList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', '2019-01-29 18:47:40', 'admin', '2019-03-07 19:23:16', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('4875ebe289344e14844d8e3ea1edd73f', '', '详情页', '/profile', 'layouts/RouteView', null, null, '0', null, null, '8', '0', 'profile', '1', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-04-02 11:46:48', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('4f66409ef3bbd69c1d80469d6e2a885e', '6e73eb3c26099c191bf03852ee1310a1', '账户绑定', '/account/settings/binding', 'account/settings/Binding', null, null, '1', 'BindingSettings', null, null, null, null, '1', '1', null, null, null, '2018-12-26 19:01:20', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('4f84f9400e5e92c95f05b554724c2b58', '540a2936940846cb98114ffb0d145cb8', '角色列表', '/list/role-list', 'list/RoleList', null, null, '1', null, null, '4', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('53a9230444d33de28aa11cc108fb1dba', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '我的消息', '/isps/userAnnouncement', 'system/UserAnnouncementList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', '2019-04-19 10:16:00', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('540a2936940846cb98114ffb0d145cb8', '', '列表页', '/list', 'layouts/PageView', null, '/list/query-list', '0', null, null, '9', '0', 'table', '1', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-03-31 22:20:20', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('54dd5457a3190740005c1bfec55b1c34', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '菜单管理', '/isystem/permission', 'system/PermissionList', null, null, '1', null, null, '3', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('58857ff846e61794c69208e9d3a85466', '08e6b9dc3c04489c8e1ff2ce6f105aa4', '日志管理', '/isystem/log', 'system/LogList', null, null, '1', null, null, '1', '0', '', '1', '1', '0', null, null, '2018-12-26 10:11:18', 'admin', '2019-04-02 11:38:17', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('58b9204feaf07e47284ddb36cd2d8468', '2a470fc0c3954d9dbb61de6d80846549', '图片翻页', '/jeecg/imgTurnPage', 'jeecg/ImgTurnPage', null, null, '1', null, null, '4', '0', null, '1', '1', '0', null, 'admin', '2019-04-25 11:36:42', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('5c2f42277948043026b7a14692456828', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '我的部门', '/system/departUserList', 'system/DepartUserList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', '2019-04-17 15:12:24', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('5c8042bd6c601270b2bbd9b20bccc68b', '', '消息中心', '/message', 'layouts/RouteView', null, null, '0', null, null, '6', '0', 'message', '1', '0', '0', null, 'admin', '2019-04-09 11:05:04', 'admin', '2019-04-11 19:47:54', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('6531cf3421b1265aeeeabaab5e176e6d', 'e3c13679c73a4f829bcff2aba8fd68b1', '分步表单', '/form/step-form', 'form/stepForm/StepForm', null, null, '1', null, null, '2', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('655563cd64b75dcf52ef7bcdd4836953', '2a470fc0c3954d9dbb61de6d80846549', '图片预览', '/jeecg/ImagPreview', 'jeecg/ImagPreview', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', '2019-04-17 11:18:45', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('65a8f489f25a345836b7f44b1181197a', 'c65321e57b7949b7a975313220de0422', '403', '/exception/403', 'exception/403', null, null, '1', null, null, '1', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('6ad53fd1b220989a8b71ff482d683a5a', '2a470fc0c3954d9dbb61de6d80846549', '一对多Tab示例', '/jeecg/tablist/JeecgOrderDMainList', 'jeecg/tablist/JeecgOrderDMainList', null, null, '1', null, null, '2', '0', null, '1', '1', '0', null, 'admin', '2019-02-20 14:45:09', 'admin', '2019-02-21 16:26:21', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('6e73eb3c26099c191bf03852ee1310a1', '717f6bee46f44a3897eca9abd6e2ec44', '个人设置', '/account/settings/base', 'account/settings/Index', null, null, '1', null, null, '2', '1', null, '1', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-04-19 09:41:05', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('700b7f95165c46cc7a78bf227aa8fed3', '08e6b9dc3c04489c8e1ff2ce6f105aa4', '性能监控', '/monitor', 'layouts/RouteView', null, null, '1', null, null, '0', '0', null, '1', '0', '0', null, 'admin', '2019-04-02 11:34:34', 'admin', '2019-05-05 17:49:47', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('717f6bee46f44a3897eca9abd6e2ec44', null, '个人页', '/account', 'layouts/RouteView', null, null, '0', null, null, '9', '0', 'user', '1', '0', null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('73678f9daa45ed17a3674131b03432fb', '540a2936940846cb98114ffb0d145cb8', '权限列表', '/list/permission-list', 'list/PermissionList', null, null, '1', null, null, '5', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('7593c9e3523a17bca83b8d7fe8a34e58', '3f915b2769fc80648e92d04e84ca059d', '添加用户按钮', '', null, null, null, '2', 'user:add', '1', '1', '0', null, '1', '1', '0', null, 'admin', '2019-03-16 11:20:33', 'admin', '2019-05-17 18:31:25', '0', '0', '1');
+INSERT INTO `sys_permission` VALUES ('7960961b0063228937da5fa8dd73d371', '2a470fc0c3954d9dbb61de6d80846549', 'JEditableTable示例', '/jeecg/JEditableTable', 'jeecg/JeecgEditableTableExample', null, null, '1', null, null, '7', '0', null, '1', '1', '0', null, 'admin', '2019-03-22 15:22:18', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('7ac9eb9ccbde2f7a033cd4944272bf1e', '540a2936940846cb98114ffb0d145cb8', '卡片列表', '/list/card', 'list/CardList', null, null, '1', null, null, '7', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('841057b8a1bef8f6b4b20f9a618a7fa6', '08e6b9dc3c04489c8e1ff2ce6f105aa4', '数据日志', '/sys/dataLog-list', 'system/DataLogList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', '2019-03-11 19:26:49', 'admin', '2019-03-12 11:40:47', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('882a73768cfd7f78f3a37584f7299656', '6e73eb3c26099c191bf03852ee1310a1', '个性化设置', '/account/settings/custom', 'account/settings/Custom', null, null, '1', 'CustomSettings', null, null, null, null, '1', '1', null, null, null, '2018-12-26 19:00:46', null, '2018-12-26 21:13:25', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('8b3bff2eee6f1939147f5c68292a1642', '700b7f95165c46cc7a78bf227aa8fed3', '服务器信息', '/monitor/SystemInfo', 'modules/monitor/SystemInfo', null, null, '1', null, null, '4', '0', null, '1', '1', '0', null, 'admin', '2019-04-02 11:39:19', 'admin', '2019-04-02 15:40:02', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('8d1ebd663688965f1fd86a2f0ead3416', '700b7f95165c46cc7a78bf227aa8fed3', 'Redis监控', '/monitor/redis/info', 'modules/monitor/RedisInfo', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', '2019-04-02 13:11:33', 'admin', '2019-05-07 15:18:54', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('8fb8172747a78756c11916216b8b8066', '717f6bee46f44a3897eca9abd6e2ec44', '工作台', '/dashboard/workplace', 'dashboard/Workplace', null, null, '1', null, null, '3', '0', null, '1', '1', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-04-02 11:45:02', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('944abf0a8fc22fe1f1154a389a574154', '5c8042bd6c601270b2bbd9b20bccc68b', '消息管理', '/modules/message/sysMessageList', 'modules/message/SysMessageList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', '2019-04-09 11:27:53', 'admin', '2019-04-09 19:31:23', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('9502685863ab87f0ad1134142788a385', '', '首页', '/dashboard/analysis', 'dashboard/Analysis', null, null, '0', null, null, '0', '0', 'home', '1', '1', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-03-29 11:04:13', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('97c8629abc7848eccdb6d77c24bb3ebb', '700b7f95165c46cc7a78bf227aa8fed3', '磁盘监控', '/monitor/Disk', 'modules/monitor/DiskMonitoring', null, null, '1', null, null, '6', '0', null, '1', '1', '0', null, 'admin', '2019-04-25 14:30:06', 'admin', '2019-05-05 14:37:14', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('9a90363f216a6a08f32eecb3f0bf12a3', '2a470fc0c3954d9dbb61de6d80846549', '常用选择组件', '/jeecg/SelectDemo', 'jeecg/SelectDemo', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', '2019-03-19 11:19:05', 'admin', '2019-04-10 15:36:50', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('9cb91b8851db0cf7b19d7ecc2a8193dd', '1939e035e803a99ceecb6f5563570fb2', '我的任务表单', '/modules/bpm/task/form/FormModule', 'modules/bpm/task/form/FormModule', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', '2019-03-08 16:49:05', 'admin', '2019-03-08 18:37:56', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('a2b11669e98c5fe54a53c3e3c4f35d14', 'f0675b52d89100ee88472b6800754a08', '类别统计报表', '/report/Analysis', 'jeecg/report/Analysis', null, '', '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', '2019-04-03 19:03:56', 'admin', '2019-04-03 19:05:26', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('a400e4f4d54f79bf5ce160ae432231af', '2a470fc0c3954d9dbb61de6d80846549', '百度', 'http://www.baidu.com', 'layouts/IframePageView', null, null, '1', null, null, '4', '0', null, '1', '1', '0', null, 'admin', '2019-01-29 19:44:06', 'admin', '2019-02-15 16:25:02', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('ae4fed059f67086fd52a73d913cf473d', '540a2936940846cb98114ffb0d145cb8', '内联编辑表格', '/list/edit-table', 'list/TableInnerEditList', null, null, '1', null, null, '2', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('aedbf679b5773c1f25e9f7b10111da73', '08e6b9dc3c04489c8e1ff2ce6f105aa4', 'SQL监控', '{{ window._CONFIG[\'domianURL\'] }}/druid/', 'layouts/IframePageView', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', '2019-01-30 09:43:22', 'admin', '2019-03-23 19:00:46', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('b1cb0a3fedf7ed0e4653cb5a229837ee', '08e6b9dc3c04489c8e1ff2ce6f105aa4', '定时任务', '/isystem/QuartzJobList', 'system/QuartzJobList', null, null, '1', null, null, '3', '0', null, '1', '1', '0', null, null, '2019-01-03 09:38:52', 'admin', '2019-04-02 10:24:13', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('b3c824fc22bd953e2eb16ae6914ac8f9', '4875ebe289344e14844d8e3ea1edd73f', '高级详情页', '/profile/advanced', 'profile/advanced/Advanced', null, null, '1', null, null, '2', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('b4dfc7d5dd9e8d5b6dd6d4579b1aa559', 'c65321e57b7949b7a975313220de0422', '500', '/exception/500', 'exception/500', null, null, '1', null, null, '3', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('b6bcee2ccc854052d3cc3e9c96d90197', '71102b3b87fb07e5527bbd2c530dd90a', '加班申请', '/modules/extbpm/joa/JoaOvertimeList', 'modules/extbpm/joa/JoaOvertimeList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', '2019-04-03 15:33:10', 'admin', '2019-04-03 15:34:48', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('c431130c0bc0ec71b0a5be37747bb36a', '2a470fc0c3954d9dbb61de6d80846549', '一对多JEditable', '/jeecg/JeecgOrderMainListForJEditableTable', 'jeecg/JeecgOrderMainListForJEditableTable', null, null, '1', null, null, '3', '0', null, '1', '1', '0', null, 'admin', '2019-03-29 10:51:59', 'admin', '2019-04-04 20:09:39', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('c65321e57b7949b7a975313220de0422', null, '异常页', '/exception', 'layouts/RouteView', null, null, '0', null, null, '8', null, 'warning', '1', '0', null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('c6cf95444d80435eb37b2f9db3971ae6', '2a470fc0c3954d9dbb61de6d80846549', '数据回执模拟', '/jeecg/InterfaceTest', 'jeecg/InterfaceTest', null, null, '1', null, null, '6', '0', null, '1', '1', '0', null, 'admin', '2019-02-19 16:02:23', 'admin', '2019-02-21 16:25:45', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('cc50656cf9ca528e6f2150eba4714ad2', '4875ebe289344e14844d8e3ea1edd73f', '基础详情页', '/profile/basic', 'profile/basic/Index', null, null, '1', null, null, '1', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('d07a2c87a451434c99ab06296727ec4f', '700b7f95165c46cc7a78bf227aa8fed3', 'JVM信息', '/monitor/JvmInfo', 'modules/monitor/JvmInfo', null, null, '1', null, null, '4', '0', null, '1', '1', '0', null, 'admin', '2019-04-01 23:07:48', 'admin', '2019-04-02 11:37:16', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('d2bbf9ebca5a8fa2e227af97d2da7548', 'c65321e57b7949b7a975313220de0422', '404', '/exception/404', 'exception/404', null, null, '1', null, null, '2', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('d7d6e2e4e2934f2c9385a623fd98c6f3', '', '系统管理', '/isystem', 'layouts/RouteView', null, null, '1', null, null, '4', '0', 'setting', '1', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-03-31 22:19:52', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('d86f58e7ab516d3bc6bfb1fe10585f97', '717f6bee46f44a3897eca9abd6e2ec44', '个人中心', '/account/center', 'account/center/Index', null, null, '1', null, null, '1', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('de13e0f6328c069748de7399fcc1dbbd', 'fb07ca05a3e13674dbf6d3245956da2e', '搜索列表（项目）', '/list/search/project', 'list/TableList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', '2019-02-12 14:01:40', 'admin', '2019-02-12 14:14:18', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('e08cb190ef230d5d4f03824198773950', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '系统通告', '/isystem/annountCement', 'system/SysAnnouncementList', null, null, '1', 'annountCement', null, '6', null, '', '1', '1', null, null, null, '2019-01-02 17:23:01', null, '2019-01-02 17:31:23', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('e1979bb53e9ea51cecc74d86fd9d2f64', '2a470fc0c3954d9dbb61de6d80846549', 'PDF预览', '/jeecg/jeecgPdfView', 'jeecg/JeecgPdfView', null, null, '1', null, null, '3', '0', null, '1', '1', '0', null, 'admin', '2019-04-25 10:39:35', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('e3c13679c73a4f829bcff2aba8fd68b1', '', '表单页', '/form', 'layouts/PageView', null, null, '0', null, null, '9', '0', 'form', '1', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-03-31 22:20:14', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('e5973686ed495c379d829ea8b2881fc6', 'e3c13679c73a4f829bcff2aba8fd68b1', '高级表单', '/form/advanced-form', 'form/advancedForm/AdvancedForm', null, null, '1', null, null, '3', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('e6bfd1fcabfd7942fdd05f076d1dad38', '2a470fc0c3954d9dbb61de6d80846549', '打印测试', '/jeecg/PrintDemo', 'jeecg/PrintDemo', null, null, '1', null, null, '3', '0', null, '1', '1', '0', null, 'admin', '2019-02-19 15:58:48', 'admin', '2019-05-07 20:14:39', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('e8af452d8948ea49d37c934f5100ae6a', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '角色管理', '/isystem/role', 'system/RoleList', null, null, '1', null, null, '2', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('ec8d607d0156e198b11853760319c646', '6e73eb3c26099c191bf03852ee1310a1', '安全设置', '/account/settings/security', 'account/settings/Security', null, null, '1', 'SecuritySettings', null, null, null, null, '1', '1', null, null, null, '2018-12-26 18:59:52', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('f0675b52d89100ee88472b6800754a08', '', '统计报表', '/report', 'layouts/RouteView', null, null, '0', null, null, '7', '0', 'bar-chart', '1', '0', '0', null, 'admin', '2019-04-03 18:32:02', 'admin', '2019-04-11 19:48:39', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('f1cb187abf927c88b89470d08615f5ac', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '数据字典', '/isystem/dict', 'system/DictList', null, null, '1', null, null, '5', null, null, '1', '1', null, null, null, '2018-12-28 13:54:43', null, '2018-12-28 15:37:54', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('f23d9bfff4d9aa6b68569ba2cff38415', '540a2936940846cb98114ffb0d145cb8', '标准列表', '/list/basic-list', 'list/StandardList', null, null, '1', null, null, '6', null, null, '1', '1', null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('f780d0d3083d849ccbdb1b1baee4911d', '5c8042bd6c601270b2bbd9b20bccc68b', '模板管理', '/modules/message/sysMessageTemplateList', 'modules/message/SysMessageTemplateList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', '2019-04-09 11:50:31', 'admin', '2019-04-12 10:16:34', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('fb07ca05a3e13674dbf6d3245956da2e', '540a2936940846cb98114ffb0d145cb8', '搜索列表', '/list/search', 'list/search/SearchLayout', null, '/list/search/article', '1', null, null, '8', '0', null, '1', '0', '0', null, null, '2018-12-25 20:34:38', 'admin', '2019-02-12 15:09:13', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('fb367426764077dcf94640c843733985', '2a470fc0c3954d9dbb61de6d80846549', '一对多示例', '/jeecg/JeecgOrderMainList', 'jeecg/JeecgOrderMainList', null, null, '1', null, null, '2', '0', null, '1', '1', '0', null, 'admin', '2019-02-15 16:24:11', 'admin', '2019-02-18 10:50:14', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('fc810a2267dd183e4ef7c71cc60f4670', '700b7f95165c46cc7a78bf227aa8fed3', '请求追踪', '/monitor/HttpTrace', 'modules/monitor/HttpTrace', null, null, '1', null, null, '4', '0', null, '1', '1', '0', null, 'admin', '2019-04-02 09:46:19', 'admin', '2019-04-02 11:37:27', '0', '0', null);
+INSERT INTO `sys_permission` VALUES ('fedfbf4420536cacc0218557d263dfea', '6e73eb3c26099c191bf03852ee1310a1', '新消息通知', '/account/settings/notification', 'account/settings/Notification', null, null, '1', 'NotificationSettings', null, null, null, '', '1', '1', null, null, null, '2018-12-26 19:02:05', null, null, '0', '0', null);
-- ----------------------------
-- Records of sys_permission_data_rule
-- ----------------------------
-INSERT INTO `sys_permission_data_rule` VALUES ('40283181614231d401614234fe670003', '40283181614231d401614232cd1c0001', 'createBy', 'createBy', '=', '#{sys_user_code}', '2018-01-29 21:57:04', 'admin', null, null);
-INSERT INTO `sys_permission_data_rule` VALUES ('4028318161424e730161424fca6f0004', '4028318161424e730161424f61510002', 'createBy', 'createBy', '=', '#{sys_user_code}', '2018-01-29 22:26:20', 'admin', null, null);
-INSERT INTO `sys_permission_data_rule` VALUES ('402880e6487e661a01487e732c020005', '402889fb486e848101486e93a7c80014', 'SYS_ORG_CODE', 'SYS_ORG_CODE', 'LIKE', '010201%', '2014-09-16 20:32:30', 'admin', null, null);
-INSERT INTO `sys_permission_data_rule` VALUES ('402880e6487e661a01487e8153ee0007', '402889fb486e848101486e93a7c80014', 'create_by', 'create_by', '', '#{SYS_USER_CODE}', '2014-09-16 20:47:57', 'admin', null, null);
-INSERT INTO `sys_permission_data_rule` VALUES ('402880ec5ddec439015ddf9225060038', '40288088481d019401481d2fcebf000d', '复杂关系', '', 'USE_SQL_RULES', 'name like \'%张%\' or age > 10', null, null, '2017-08-14 15:10:25', 'demo');
-INSERT INTO `sys_permission_data_rule` VALUES ('402880ec5ddfdd26015ddfe3e0570011', '4028ab775dca0d1b015dca3fccb60016', '复杂sql配置', '', 'USE_SQL_RULES', 'table_name like \'%test%\' or is_tree = \'Y\'', null, null, '2017-08-14 16:38:55', 'demo');
-INSERT INTO `sys_permission_data_rule` VALUES ('402880f25b1e2ac7015b1e5fdebc0012', '402880f25b1e2ac7015b1e5cdc340010', '只能看自己数据', 'create_by', '=', '#{sys_user_code}', '2017-03-30 16:40:51', 'admin', null, null);
-INSERT INTO `sys_permission_data_rule` VALUES ('402881875b19f141015b19f8125e0014', '40288088481d019401481d2fcebf000d', '可看下属业务数据', 'sys_org_code', 'LIKE', '#{sys_org_code}', null, null, '2017-08-14 15:04:32', 'demo');
-INSERT INTO `sys_permission_data_rule` VALUES ('402881e45394d66901539500a4450001', '402881e54df73c73014df75ab670000f', 'sysCompanyCode', 'sysCompanyCode', '=', '#{SYS_COMPANY_CODE}', '2016-03-21 01:09:21', 'admin', null, null);
-INSERT INTO `sys_permission_data_rule` VALUES ('402881e45394d6690153950177cb0003', '402881e54df73c73014df75ab670000f', 'sysOrgCode', 'sysOrgCode', '=', '#{SYS_ORG_CODE}', '2016-03-21 01:10:15', 'admin', null, null);
-INSERT INTO `sys_permission_data_rule` VALUES ('402881e56266f43101626727aff60067', '402881e56266f43101626724eb730065', '销售自己看自己的数据', 'createBy', '=', '#{sys_user_code}', '2018-03-27 19:11:16', 'admin', null, null);
-INSERT INTO `sys_permission_data_rule` VALUES ('402881e56266f4310162672fb1a70082', '402881e56266f43101626724eb730065', '销售经理看所有下级数据', 'sysOrgCode', 'LIKE', '#{sys_org_code}', '2018-03-27 19:20:01', 'admin', null, null);
-INSERT INTO `sys_permission_data_rule` VALUES ('402881e56266f431016267387c9f0088', '402881e56266f43101626724eb730065', '只看金额大于1000的数据', 'money', '>=', '1000', '2018-03-27 19:29:37', 'admin', null, null);
-INSERT INTO `sys_permission_data_rule` VALUES ('402881f3650de25101650dfb5a3a0010', '402881e56266f4310162671d62050044', '22', '', 'USE_SQL_RULES', '22', '2018-08-06 14:45:01', 'admin', null, null);
-INSERT INTO `sys_permission_data_rule` VALUES ('402889fb486e848101486e913cd6000b', '402889fb486e848101486e8e2e8b0007', 'userName', 'userName', '=', 'admin', '2014-09-13 18:31:25', 'admin', null, null);
-INSERT INTO `sys_permission_data_rule` VALUES ('402889fb486e848101486e98d20d0016', '402889fb486e848101486e93a7c80014', 'title', 'title', '=', '12', null, null, '2014-09-13 22:18:22', 'scott');
-INSERT INTO `sys_permission_data_rule` VALUES ('402889fe47fcb29c0147fcb6b6220001', '8a8ab0b246dc81120146dc8180fe002b', '12', '12', '>', '12', '2014-08-22 15:55:38', '8a8ab0b246dc81120146dc8181950052', null, null);
-INSERT INTO `sys_permission_data_rule` VALUES ('4028ab775dca0d1b015dca4183530018', '4028ab775dca0d1b015dca3fccb60016', '表名限制', 'isDbSynch', '=', 'Y', null, null, '2017-08-14 16:43:45', 'demo');
-INSERT INTO `sys_permission_data_rule` VALUES ('4028ef815595a881015595b0ccb60001', '40288088481d019401481d2fcebf000d', '限只能看自己', 'create_by', '=', '#{sys_user_code}', null, null, '2017-08-14 15:03:56', 'demo');
-INSERT INTO `sys_permission_data_rule` VALUES ('4028ef81574ae99701574aed26530005', '4028ef81574ae99701574aeb97bd0003', '用户名', 'userName', '!=', 'admin', '2016-09-21 12:07:18', 'admin', null, null);
-INSERT INTO `sys_permission_data_rule` VALUES ('f852d85d47f224990147f2284c0c0005', null, '小于', 'test', '<=', '11', '2014-08-20 14:43:52', '8a8ab0b246dc81120146dc8181950052', null, null);
-
--- ----------------------------
--- Table structure for sys_quartz_job
--- ----------------------------
-DROP TABLE IF EXISTS `sys_quartz_job`;
-CREATE TABLE `sys_quartz_job` (
- `id` varchar(32) NOT NULL,
- `create_by` varchar(32) default NULL COMMENT '创建人',
- `create_time` datetime default NULL COMMENT '创建时间',
- `del_flag` int(1) default NULL COMMENT '删除状态',
- `update_by` varchar(32) default NULL COMMENT '修改人',
- `update_time` datetime default NULL COMMENT '修改时间',
- `job_class_name` varchar(255) default NULL COMMENT '任务类名',
- `cron_expression` varchar(255) default NULL COMMENT 'cron表达式',
- `parameter` varchar(255) default NULL COMMENT '参数',
- `description` varchar(255) default NULL COMMENT '描述',
- `status` int(1) default NULL COMMENT '状态 0正常 -1停止',
- PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+INSERT INTO `sys_permission_data_rule` VALUES ('32b62cb04d6c788d9d92e3ff5e66854e', '8d4683aacaa997ab86b966b464360338', '000', '00', '!=', '00', '1', '2019-04-02 18:36:08', 'admin', null, null);
+INSERT INTO `sys_permission_data_rule` VALUES ('40283181614231d401614234fe670003', '40283181614231d401614232cd1c0001', 'createBy', 'createBy', '=', '#{sys_user_code}', '1', '2018-01-29 21:57:04', 'admin', null, null);
+INSERT INTO `sys_permission_data_rule` VALUES ('4028318161424e730161424fca6f0004', '4028318161424e730161424f61510002', 'createBy', 'createBy', '=', '#{sys_user_code}', '1', '2018-01-29 22:26:20', 'admin', null, null);
+INSERT INTO `sys_permission_data_rule` VALUES ('402880e6487e661a01487e732c020005', '402889fb486e848101486e93a7c80014', 'SYS_ORG_CODE', 'SYS_ORG_CODE', 'LIKE', '010201%', '1', '2014-09-16 20:32:30', 'admin', null, null);
+INSERT INTO `sys_permission_data_rule` VALUES ('402880e6487e661a01487e8153ee0007', '402889fb486e848101486e93a7c80014', 'create_by', 'create_by', '', '#{SYS_USER_CODE}', '1', '2014-09-16 20:47:57', 'admin', null, null);
+INSERT INTO `sys_permission_data_rule` VALUES ('402880ec5ddec439015ddf9225060038', '40288088481d019401481d2fcebf000d', '复杂关系', '', 'USE_SQL_RULES', 'name like \'%张%\' or age > 10', '1', null, null, '2017-08-14 15:10:25', 'demo');
+INSERT INTO `sys_permission_data_rule` VALUES ('402880ec5ddfdd26015ddfe3e0570011', '4028ab775dca0d1b015dca3fccb60016', '复杂sql配置', '', 'USE_SQL_RULES', 'table_name like \'%test%\' or is_tree = \'Y\'', '1', null, null, '2017-08-14 16:38:55', 'demo');
+INSERT INTO `sys_permission_data_rule` VALUES ('402880f25b1e2ac7015b1e5fdebc0012', '402880f25b1e2ac7015b1e5cdc340010', '只能看自己数据', 'create_by', '=', '#{sys_user_code}', '1', '2017-03-30 16:40:51', 'admin', null, null);
+INSERT INTO `sys_permission_data_rule` VALUES ('402881875b19f141015b19f8125e0014', '40288088481d019401481d2fcebf000d', '可看下属业务数据', 'sys_org_code', 'LIKE', '#{sys_org_code}', '1', null, null, '2017-08-14 15:04:32', 'demo');
+INSERT INTO `sys_permission_data_rule` VALUES ('402881e45394d66901539500a4450001', '402881e54df73c73014df75ab670000f', 'sysCompanyCode', 'sysCompanyCode', '=', '#{SYS_COMPANY_CODE}', '1', '2016-03-21 01:09:21', 'admin', null, null);
+INSERT INTO `sys_permission_data_rule` VALUES ('402881e45394d6690153950177cb0003', '402881e54df73c73014df75ab670000f', 'sysOrgCode', 'sysOrgCode', '=', '#{SYS_ORG_CODE}', '1', '2016-03-21 01:10:15', 'admin', null, null);
+INSERT INTO `sys_permission_data_rule` VALUES ('402881e56266f43101626727aff60067', '402881e56266f43101626724eb730065', '销售自己看自己的数据', 'createBy', '=', '#{sys_user_code}', '1', '2018-03-27 19:11:16', 'admin', null, null);
+INSERT INTO `sys_permission_data_rule` VALUES ('402881e56266f4310162672fb1a70082', '402881e56266f43101626724eb730065', '销售经理看所有下级数据', 'sysOrgCode', 'LIKE', '#{sys_org_code}', '1', '2018-03-27 19:20:01', 'admin', null, null);
+INSERT INTO `sys_permission_data_rule` VALUES ('402881e56266f431016267387c9f0088', '402881e56266f43101626724eb730065', '只看金额大于1000的数据', 'money', '>=', '1000', '1', '2018-03-27 19:29:37', 'admin', null, null);
+INSERT INTO `sys_permission_data_rule` VALUES ('402881f3650de25101650dfb5a3a0010', '402881e56266f4310162671d62050044', '22', '', 'USE_SQL_RULES', '22', '1', '2018-08-06 14:45:01', 'admin', null, null);
+INSERT INTO `sys_permission_data_rule` VALUES ('402889fb486e848101486e913cd6000b', '402889fb486e848101486e8e2e8b0007', 'userName', 'userName', '=', 'admin', '1', '2014-09-13 18:31:25', 'admin', null, null);
+INSERT INTO `sys_permission_data_rule` VALUES ('402889fb486e848101486e98d20d0016', '402889fb486e848101486e93a7c80014', 'title', 'title', '=', '12', '1', null, null, '2014-09-13 22:18:22', 'scott');
+INSERT INTO `sys_permission_data_rule` VALUES ('402889fe47fcb29c0147fcb6b6220001', '8a8ab0b246dc81120146dc8180fe002b', '12', '12', '>', '12', '1', '2014-08-22 15:55:38', '8a8ab0b246dc81120146dc8181950052', null, null);
+INSERT INTO `sys_permission_data_rule` VALUES ('4028ab775dca0d1b015dca4183530018', '4028ab775dca0d1b015dca3fccb60016', '表名限制', 'isDbSynch', '=', 'Y', '1', null, null, '2017-08-14 16:43:45', 'demo');
+INSERT INTO `sys_permission_data_rule` VALUES ('4028ef815595a881015595b0ccb60001', '40288088481d019401481d2fcebf000d', '限只能看自己', 'create_by', '=', '#{sys_user_code}', '1', null, null, '2017-08-14 15:03:56', 'demo');
+INSERT INTO `sys_permission_data_rule` VALUES ('4028ef81574ae99701574aed26530005', '4028ef81574ae99701574aeb97bd0003', '用户名', 'userName', '!=', 'admin', '1', '2016-09-21 12:07:18', 'admin', null, null);
+INSERT INTO `sys_permission_data_rule` VALUES ('53609e1854f4a87eb23ed23a18a1042c', '4148ec82b6acd69f470bea75fe41c357', '只看当前部门数据', 'sysOrgCode', '=', '#{sys_org_code}', '1', '2019-05-11 19:40:39', 'admin', '2019-05-11 19:40:50', 'admin');
+INSERT INTO `sys_permission_data_rule` VALUES ('a7d661ef5ac168b2b162420c6804dac5', '4148ec82b6acd69f470bea75fe41c357', '只看自己的数据', 'createBy', '=', '#{sys_user_code}', '1', '2019-05-11 19:19:05', 'admin', '2019-05-11 19:24:58', 'admin');
+INSERT INTO `sys_permission_data_rule` VALUES ('f852d85d47f224990147f2284c0c0005', null, '小于', 'test', '<=', '11', '1', '2014-08-20 14:43:52', '8a8ab0b246dc81120146dc8181950052', null, null);
-- ----------------------------
-- Records of sys_quartz_job
-- ----------------------------
INSERT INTO `sys_quartz_job` VALUES ('df26ecacf0f75d219d746750fe84bbee', null, null, '0', 'admin', '2019-01-19 15:09:41', 'org.jeecg.modules.quartz.job.SampleParamJob', '0/1 * * * * ?', 'scott', '带参测试 后台将每隔1秒执行输出日志', '-1');
INSERT INTO `sys_quartz_job` VALUES ('a253cdfc811d69fa0efc70d052bc8128', 'admin', '2019-03-30 12:44:48', '0', 'admin', '2019-03-30 12:44:52', 'org.jeecg.modules.quartz.job.SampleJob', '0/1 * * * * ?', null, null, '-1');
-INSERT INTO `sys_quartz_job` VALUES ('5b3d2c087ad41aa755fc4f89697b01e7', 'admin', '2019-04-11 19:04:21', '0', 'admin', '2019-04-11 19:49:49', 'org.jeecg.modules.message.job.SendMsgJob', '0/60 * * * * ?', null, null, '0');
-
--- ----------------------------
--- Table structure for sys_role
--- ----------------------------
-DROP TABLE IF EXISTS `sys_role`;
-CREATE TABLE `sys_role` (
- `id` varchar(32) NOT NULL COMMENT '主键id',
- `role_name` varchar(200) default NULL COMMENT '角色名称',
- `role_code` varchar(100) default NULL COMMENT '角色编码',
- `description` varchar(255) default NULL COMMENT '描述',
- `create_by` varchar(32) default NULL COMMENT '创建人',
- `create_time` datetime default NULL COMMENT '创建时间',
- `update_by` varchar(32) default NULL COMMENT '更新人',
- `update_time` datetime default NULL COMMENT '更新时间',
- PRIMARY KEY (`id`),
- UNIQUE KEY `index_role_code` USING BTREE (`role_code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='角色表';
+INSERT INTO `sys_quartz_job` VALUES ('5b3d2c087ad41aa755fc4f89697b01e7', 'admin', '2019-04-11 19:04:21', '0', 'admin', '2019-04-11 19:49:49', 'org.jeecg.modules.message.job.SendMsgJob', '0/60 * * * * ?', null, null, '-1');
-- ----------------------------
-- Records of sys_role
@@ -1882,126 +2020,107 @@ INSERT INTO `sys_role` VALUES ('ee8626f80f7c2619917b6236f3a7f02b', '临时角色
INSERT INTO `sys_role` VALUES ('f6817f48af4fb3af11b9e8bf182f618b', '管理员', 'admin', '管理员', null, '2018-12-21 18:03:39', 'admin', '2019-02-22 19:49:42');
-- ----------------------------
--- Table structure for sys_role_permission
--- ----------------------------
-DROP TABLE IF EXISTS `sys_role_permission`;
-CREATE TABLE `sys_role_permission` (
- `id` varchar(32) NOT NULL,
- `role_id` varchar(32) default NULL COMMENT '角色id',
- `permission_id` varchar(32) default NULL COMMENT '权限id',
- `data_rule_ids` varchar(1000) default NULL,
- PRIMARY KEY (`id`),
- KEY `index_group_role_per_id` USING BTREE (`role_id`,`permission_id`),
- KEY `index_group_role_id` USING BTREE (`role_id`),
- KEY `index_group_per_id` USING BTREE (`permission_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='角色权限表';
-
--- ----------------------------
-- Records of sys_role_permission
-- ----------------------------
INSERT INTO `sys_role_permission` VALUES ('00b0748f04d3ea52c8cfa179c1c9d384', '52b0cf022ac4187b2a70dfa4f8b2d940', 'd7d6e2e4e2934f2c9385a623fd98c6f3', null);
-INSERT INTO `sys_role_permission` VALUES ('01221378db3443dbddaa494597fb10e3', 'f6817f48af4fb3af11b9e8bf182f618b', '024f1fd1283dc632458976463d8984e1', null);
-INSERT INTO `sys_role_permission` VALUES ('012fe07d6c7d54306f497174ae4ff4c7', 'f6817f48af4fb3af11b9e8bf182f618b', 'f23d9bfff4d9aa6b68569ba2cff38415', null);
-INSERT INTO `sys_role_permission` VALUES ('02cf2fd105e49aeb90bd2868f59659a3', 'f6817f48af4fb3af11b9e8bf182f618b', 'b3c824fc22bd953e2eb16ae6914ac8f9', null);
-INSERT INTO `sys_role_permission` VALUES ('0538e66f1151b80ad45fee3ab99a83b2', 'f6817f48af4fb3af11b9e8bf182f618b', '339329ed54cf255e1f9392e84f136901', null);
-INSERT INTO `sys_role_permission` VALUES ('05a6fadb2a7e774852e19650577f4431', 'f6817f48af4fb3af11b9e8bf182f618b', '8b3bff2eee6f1939147f5c68292a1642', null);
-INSERT INTO `sys_role_permission` VALUES ('077f0484204f514efdf82565e8e2ad0c', 'f6817f48af4fb3af11b9e8bf182f618b', 'e3c13679c73a4f829bcff2aba8fd68b1', null);
-INSERT INTO `sys_role_permission` VALUES ('0aeacc20f807204bee6cbb595602fcb5', 'f6817f48af4fb3af11b9e8bf182f618b', '2a470fc0c3954d9dbb61de6d80846549', null);
-INSERT INTO `sys_role_permission` VALUES ('0be9294ad987d5f2d65738307d18a658', 'f6817f48af4fb3af11b9e8bf182f618b', '078f9558cdeab239aecb2bda1a8ed0d1', null);
-INSERT INTO `sys_role_permission` VALUES ('0c76a4acf236d8e8a777c1072f63556b', 'f6817f48af4fb3af11b9e8bf182f618b', 'c431130c0bc0ec71b0a5be37747bb36a', null);
+INSERT INTO `sys_role_permission` VALUES ('00b82058779cca5106fbb84783534c9b', 'f6817f48af4fb3af11b9e8bf182f618b', '4148ec82b6acd69f470bea75fe41c357', null);
+INSERT INTO `sys_role_permission` VALUES ('0254c0b25694ad5479e6d6935bbc176e', 'f6817f48af4fb3af11b9e8bf182f618b', '944abf0a8fc22fe1f1154a389a574154', null);
+INSERT INTO `sys_role_permission` VALUES ('09bd4fc30ffe88c4a44ed3868f442719', 'f6817f48af4fb3af11b9e8bf182f618b', 'e6bfd1fcabfd7942fdd05f076d1dad38', null);
+INSERT INTO `sys_role_permission` VALUES ('0c2d2db76ee3aa81a4fe0925b0f31365', 'f6817f48af4fb3af11b9e8bf182f618b', '024f1fd1283dc632458976463d8984e1', null);
+INSERT INTO `sys_role_permission` VALUES ('0c6b8facbb1cc874964c87a8cf01e4b1', 'f6817f48af4fb3af11b9e8bf182f618b', '841057b8a1bef8f6b4b20f9a618a7fa6', null);
+INSERT INTO `sys_role_permission` VALUES ('0c6e1075e422972083c3e854d9af7851', 'f6817f48af4fb3af11b9e8bf182f618b', '08e6b9dc3c04489c8e1ff2ce6f105aa4', null);
INSERT INTO `sys_role_permission` VALUES ('0d9d14bc66e9d5e99b0280095fdc8587', 'ee8626f80f7c2619917b6236f3a7f02b', '277bfabef7d76e89b33062b16a9a5020', null);
INSERT INTO `sys_role_permission` VALUES ('0dec36b68c234767cd35466efef3b941', 'ee8626f80f7c2619917b6236f3a7f02b', '54dd5457a3190740005c1bfec55b1c34', null);
+INSERT INTO `sys_role_permission` VALUES ('0e139e6c1b5b73eee81381ddf0b5a9f3', 'f6817f48af4fb3af11b9e8bf182f618b', '277bfabef7d76e89b33062b16a9a5020', null);
+INSERT INTO `sys_role_permission` VALUES ('0f861cb988fdc639bb1ab943471f3a72', 'f6817f48af4fb3af11b9e8bf182f618b', '97c8629abc7848eccdb6d77c24bb3ebb', null);
INSERT INTO `sys_role_permission` VALUES ('105c2ac10741e56a618a82cd58c461d7', 'e51758fa916c881624b046d26bd09230', '1663f3faba244d16c94552f849627d84', null);
INSERT INTO `sys_role_permission` VALUES ('115a6673ae6c0816d3f60de221520274', '21c5a3187763729408b40afb0d0fdfa8', '63b551e81c5956d5c861593d366d8c57', null);
-INSERT INTO `sys_role_permission` VALUES ('120693092740d63656a7dc6ddeda6dd0', 'f6817f48af4fb3af11b9e8bf182f618b', '418964ba087b90a84897b62474496b93', null);
+INSERT INTO `sys_role_permission` VALUES ('126ea9faebeec2b914d6d9bef957afb6', 'f6817f48af4fb3af11b9e8bf182f618b', 'f1cb187abf927c88b89470d08615f5ac', null);
INSERT INTO `sys_role_permission` VALUES ('145eac8dd88eddbd4ce0a800ab40a92c', 'e51758fa916c881624b046d26bd09230', '08e6b9dc3c04489c8e1ff2ce6f105aa4', null);
-INSERT INTO `sys_role_permission` VALUES ('14880dc3cc885742ac91b885bd73ac7a', 'f6817f48af4fb3af11b9e8bf182f618b', '2e42e3835c2b44ec9f7bc26c146ee531', null);
-INSERT INTO `sys_role_permission` VALUES ('15db74f6c965d75f4127e6bdc9d25594', 'f6817f48af4fb3af11b9e8bf182f618b', 'a4fc7b64b01a224da066bb16230f9c5a', null);
+INSERT INTO `sys_role_permission` VALUES ('154edd0599bd1dc2c7de220b489cd1e2', 'f6817f48af4fb3af11b9e8bf182f618b', '7ac9eb9ccbde2f7a033cd4944272bf1e', null);
+INSERT INTO `sys_role_permission` VALUES ('165acd6046a0eaf975099f46a3c898ea', 'f6817f48af4fb3af11b9e8bf182f618b', '4f66409ef3bbd69c1d80469d6e2a885e', null);
+INSERT INTO `sys_role_permission` VALUES ('1664b92dff13e1575e3a929caa2fa14d', 'f6817f48af4fb3af11b9e8bf182f618b', 'd2bbf9ebca5a8fa2e227af97d2da7548', null);
INSERT INTO `sys_role_permission` VALUES ('16ef8ed3865ccc6f6306200760896c50', 'ee8626f80f7c2619917b6236f3a7f02b', 'e8af452d8948ea49d37c934f5100ae6a', null);
INSERT INTO `sys_role_permission` VALUES ('17ead5b7d97ed365398ab20009a69ea3', '52b0cf022ac4187b2a70dfa4f8b2d940', 'e08cb190ef230d5d4f03824198773950', null);
INSERT INTO `sys_role_permission` VALUES ('1ac1688ef8456f384091a03d88a89ab1', '52b0cf022ac4187b2a70dfa4f8b2d940', '693ce69af3432bd00be13c3971a57961', null);
INSERT INTO `sys_role_permission` VALUES ('1af4babaa4227c3cbb830bc5eb513abb', 'ee8626f80f7c2619917b6236f3a7f02b', 'e08cb190ef230d5d4f03824198773950', null);
INSERT INTO `sys_role_permission` VALUES ('1ba162bbc2076c25561f8622f610d5bf', 'ee8626f80f7c2619917b6236f3a7f02b', 'aedbf679b5773c1f25e9f7b10111da73', null);
-INSERT INTO `sys_role_permission` VALUES ('1bf767127ea2e467d9293d570a16605c', 'f6817f48af4fb3af11b9e8bf182f618b', 'f9d3f4f27653a71c52faa9fb8070fbe7', null);
+INSERT INTO `sys_role_permission` VALUES ('1c1dbba68ef1817e7fb19c822d2854e8', 'f6817f48af4fb3af11b9e8bf182f618b', 'fb367426764077dcf94640c843733985', null);
INSERT INTO `sys_role_permission` VALUES ('1c55c4ced20765b8ebab383caa60f0b6', 'e51758fa916c881624b046d26bd09230', 'fb367426764077dcf94640c843733985', null);
-INSERT INTO `sys_role_permission` VALUES ('1caf6f14df1566bd270b4ef4299d91f1', 'f6817f48af4fb3af11b9e8bf182f618b', 'fef097f3903caf3a3c3a6efa8de43fbb', null);
-INSERT INTO `sys_role_permission` VALUES ('1de539a7fd0a48421d6b86a14b1985c5', 'f6817f48af4fb3af11b9e8bf182f618b', '4f66409ef3bbd69c1d80469d6e2a885e', null);
INSERT INTO `sys_role_permission` VALUES ('1e099baeae01b747d67aca06bdfc34d1', 'e51758fa916c881624b046d26bd09230', '6ad53fd1b220989a8b71ff482d683a5a', null);
-INSERT INTO `sys_role_permission` VALUES ('1ec19c55dd19d898724d87ea5014dd98', 'f6817f48af4fb3af11b9e8bf182f618b', '93d5cfb4448f11e9916698e7f462b4b6', null);
+INSERT INTO `sys_role_permission` VALUES ('1e47db875601fd97723254046b5bba90', 'f6817f48af4fb3af11b9e8bf182f618b', 'baf16b7174bd821b6bab23fa9abb200d', null);
INSERT INTO `sys_role_permission` VALUES ('1fe4d408b85f19618c15bcb768f0ec22', '1750a8fb3e6d90cb7957c02de1dc8e59', '9502685863ab87f0ad1134142788a385', null);
+INSERT INTO `sys_role_permission` VALUES ('20e53c87a785688bdc0a5bb6de394ef1', 'f6817f48af4fb3af11b9e8bf182f618b', '540a2936940846cb98114ffb0d145cb8', null);
INSERT INTO `sys_role_permission` VALUES ('248d288586c6ff3bd14381565df84163', '52b0cf022ac4187b2a70dfa4f8b2d940', '3f915b2769fc80648e92d04e84ca059d', null);
+INSERT INTO `sys_role_permission` VALUES ('25491ecbd5a9b34f09c8bc447a10ede1', 'f6817f48af4fb3af11b9e8bf182f618b', 'd07a2c87a451434c99ab06296727ec4f', null);
INSERT INTO `sys_role_permission` VALUES ('25f5443f19c34d99718a016d5f54112e', 'ee8626f80f7c2619917b6236f3a7f02b', '6e73eb3c26099c191bf03852ee1310a1', null);
-INSERT INTO `sys_role_permission` VALUES ('26368ba64b5572e3282e4eac0bbe902b', 'f6817f48af4fb3af11b9e8bf182f618b', '8d4683aacaa997ab86b966b464360338', null);
INSERT INTO `sys_role_permission` VALUES ('27489816708b18859768dfed5945c405', 'a799c3b1b12dd3ed4bd046bfaef5fe6e', '9502685863ab87f0ad1134142788a385', null);
+INSERT INTO `sys_role_permission` VALUES ('2779cdea8367fff37db26a42c1a1f531', 'f6817f48af4fb3af11b9e8bf182f618b', 'fef097f3903caf3a3c3a6efa8de43fbb', null);
INSERT INTO `sys_role_permission` VALUES ('296f9c75ca0e172ae5ce4c1022c996df', '646c628b2b8295fbdab2d34044de0354', '732d48f8e0abe99fe6a23d18a3171cd1', null);
INSERT INTO `sys_role_permission` VALUES ('29fb4d37aa29b9fa400f389237cf9fe7', 'ee8626f80f7c2619917b6236f3a7f02b', '05b3c82ddb2536a4a5ee1a4c46b5abef', null);
-INSERT INTO `sys_role_permission` VALUES ('2a0734aa10d68c01c16f73ded008c147', 'f6817f48af4fb3af11b9e8bf182f618b', '1939e035e803a99ceecb6f5563570fb2', null);
-INSERT INTO `sys_role_permission` VALUES ('2b81f6c5c5e0bd11e8a550b65548390a', 'f6817f48af4fb3af11b9e8bf182f618b', '6e73eb3c26099c191bf03852ee1310a1', null);
+INSERT INTO `sys_role_permission` VALUES ('29fb6b0ad59a7e911c8d27e0bdc42d23', 'f6817f48af4fb3af11b9e8bf182f618b', '9a90363f216a6a08f32eecb3f0bf12a3', null);
+INSERT INTO `sys_role_permission` VALUES ('2ad37346c1b83ddeebc008f6987b2227', 'f6817f48af4fb3af11b9e8bf182f618b', '8d1ebd663688965f1fd86a2f0ead3416', null);
INSERT INTO `sys_role_permission` VALUES ('2c462293cbb0eab7e8ae0a3600361b5f', '52b0cf022ac4187b2a70dfa4f8b2d940', '9502685863ab87f0ad1134142788a385', null);
INSERT INTO `sys_role_permission` VALUES ('2dc1a0eb5e39aaa131ddd0082a492d76', 'ee8626f80f7c2619917b6236f3a7f02b', '08e6b9dc3c04489c8e1ff2ce6f105aa4', null);
-INSERT INTO `sys_role_permission` VALUES ('2e067c4cd3d56c5b1906711c7ce4f44c', 'f6817f48af4fb3af11b9e8bf182f618b', 'f1cb187abf927c88b89470d08615f5ac', null);
INSERT INTO `sys_role_permission` VALUES ('2ea2382af618ba7d1e80491a0185fb8a', 'ee8626f80f7c2619917b6236f3a7f02b', 'f23d9bfff4d9aa6b68569ba2cff38415', null);
INSERT INTO `sys_role_permission` VALUES ('2fcfa2ac3dcfadc7c67107dae9a0de6d', 'ee8626f80f7c2619917b6236f3a7f02b', '73678f9daa45ed17a3674131b03432fb', null);
INSERT INTO `sys_role_permission` VALUES ('2fdaed22dfa4c8d4629e44ef81688c6a', '52b0cf022ac4187b2a70dfa4f8b2d940', 'aedbf679b5773c1f25e9f7b10111da73', null);
INSERT INTO `sys_role_permission` VALUES ('300c462b7fec09e2ff32574ef8b3f0bd', '52b0cf022ac4187b2a70dfa4f8b2d940', '2a470fc0c3954d9dbb61de6d80846549', null);
-INSERT INTO `sys_role_permission` VALUES ('30312072349ea41db06ecf587d8be6e7', 'f6817f48af4fb3af11b9e8bf182f618b', 'a400e4f4d54f79bf5ce160ae432231af', null);
-INSERT INTO `sys_role_permission` VALUES ('31c1e8a7a37dec06d85c4eeba90f1942', 'f6817f48af4fb3af11b9e8bf182f618b', '65a8f489f25a345836b7f44b1181197a', null);
-INSERT INTO `sys_role_permission` VALUES ('3249742372a0356bb313f19c1bd6f6ee', 'f6817f48af4fb3af11b9e8bf182f618b', '7d08d3885671cf0ff1c4fe5d82fcd0e2', null);
INSERT INTO `sys_role_permission` VALUES ('326181da3248a62a05e872119a462be1', 'ee8626f80f7c2619917b6236f3a7f02b', '3f915b2769fc80648e92d04e84ca059d', null);
INSERT INTO `sys_role_permission` VALUES ('3369650f5072b330543f8caa556b1b33', 'e51758fa916c881624b046d26bd09230', 'a400e4f4d54f79bf5ce160ae432231af', null);
INSERT INTO `sys_role_permission` VALUES ('35a7e156c20e93aa7e825fe514bf9787', 'e51758fa916c881624b046d26bd09230', 'c6cf95444d80435eb37b2f9db3971ae6', null);
INSERT INTO `sys_role_permission` VALUES ('35ac7cae648de39eb56213ca1b649713', '52b0cf022ac4187b2a70dfa4f8b2d940', 'b1cb0a3fedf7ed0e4653cb5a229837ee', null);
-INSERT INTO `sys_role_permission` VALUES ('370127be64a2bfda6203ce72c4811bf4', 'f6817f48af4fb3af11b9e8bf182f618b', '765dd244f37b804e3d00f475fd56149b', null);
-INSERT INTO `sys_role_permission` VALUES ('370e842a683fc6395a1958da681fe749', 'f6817f48af4fb3af11b9e8bf182f618b', '841057b8a1bef8f6b4b20f9a618a7fa6', null);
INSERT INTO `sys_role_permission` VALUES ('37112f4d372541e105473f18da3dc50d', 'ee8626f80f7c2619917b6236f3a7f02b', 'a400e4f4d54f79bf5ce160ae432231af', null);
INSERT INTO `sys_role_permission` VALUES ('37789f70cd8bd802c4a69e9e1f633eaa', 'ee8626f80f7c2619917b6236f3a7f02b', 'ae4fed059f67086fd52a73d913cf473d', null);
INSERT INTO `sys_role_permission` VALUES ('381504a717cb3ce77dcd4070c9689a7e', 'ee8626f80f7c2619917b6236f3a7f02b', '4f84f9400e5e92c95f05b554724c2b58', null);
-INSERT INTO `sys_role_permission` VALUES ('38c74d670bf1ebc612b72b69ebf067cf', 'f6817f48af4fb3af11b9e8bf182f618b', 'baf16b7174bd821b6bab23fa9abb200d', null);
+INSERT INTO `sys_role_permission` VALUES ('38a2e55db0960262800576e34b3af44c', 'f6817f48af4fb3af11b9e8bf182f618b', '5c2f42277948043026b7a14692456828', null);
INSERT INTO `sys_role_permission` VALUES ('38dd7a19711e7ffe864232954c06fae9', 'e51758fa916c881624b046d26bd09230', 'd2bbf9ebca5a8fa2e227af97d2da7548', null);
-INSERT INTO `sys_role_permission` VALUES ('3ab440506de8f51378762d02b79d45c5', 'f6817f48af4fb3af11b9e8bf182f618b', 'fb07ca05a3e13674dbf6d3245956da2e', null);
-INSERT INTO `sys_role_permission` VALUES ('3b6fcd36c9e1114003fc1e6c6a092ab9', 'f6817f48af4fb3af11b9e8bf182f618b', '7ac9eb9ccbde2f7a033cd4944272bf1e', null);
+INSERT INTO `sys_role_permission` VALUES ('3b1886f727ac503c93fecdd06dcb9622', 'f6817f48af4fb3af11b9e8bf182f618b', 'c431130c0bc0ec71b0a5be37747bb36a', null);
+INSERT INTO `sys_role_permission` VALUES ('3de2a60c7e42a521fecf6fcc5cb54978', 'f6817f48af4fb3af11b9e8bf182f618b', '2d83d62bd2544b8994c8f38cf17b0ddf', null);
+INSERT INTO `sys_role_permission` VALUES ('3e4e38f748b8d87178dd62082e5b7b60', 'f6817f48af4fb3af11b9e8bf182f618b', '7960961b0063228937da5fa8dd73d371', null);
INSERT INTO `sys_role_permission` VALUES ('3e563751942b0879c88ca4de19757b50', '1750a8fb3e6d90cb7957c02de1dc8e59', '58857ff846e61794c69208e9d3a85466', null);
+INSERT INTO `sys_role_permission` VALUES ('3f1d04075e3c3254666a4138106a4e51', 'f6817f48af4fb3af11b9e8bf182f618b', '3fac0d3c9cd40fa53ab70d4c583821f8', null);
INSERT INTO `sys_role_permission` VALUES ('412e2de37a35b3442d68db8dd2f3c190', '52b0cf022ac4187b2a70dfa4f8b2d940', 'f1cb187abf927c88b89470d08615f5ac', null);
-INSERT INTO `sys_role_permission` VALUES ('4276c23200b37c3be419d16466b21496', 'f6817f48af4fb3af11b9e8bf182f618b', 'e5973686ed495c379d829ea8b2881fc6', null);
+INSERT INTO `sys_role_permission` VALUES ('4204f91fb61911ba8ce40afa7c02369f', 'f6817f48af4fb3af11b9e8bf182f618b', '3f915b2769fc80648e92d04e84ca059d', null);
+INSERT INTO `sys_role_permission` VALUES ('439568ff7db6f329bf6dd45b3dfc9456', 'f6817f48af4fb3af11b9e8bf182f618b', '7593c9e3523a17bca83b8d7fe8a34e58', null);
+INSERT INTO `sys_role_permission` VALUES ('444126230885d5d38b8fa6072c9f43f8', 'f6817f48af4fb3af11b9e8bf182f618b', 'f780d0d3083d849ccbdb1b1baee4911d', null);
+INSERT INTO `sys_role_permission` VALUES ('445656dd187bd8a71605f4bbab1938a3', 'f6817f48af4fb3af11b9e8bf182f618b', '020b06793e4de2eee0007f603000c769', null);
INSERT INTO `sys_role_permission` VALUES ('44b5a73541bcb854dd5d38c6d1fb93a1', 'ee8626f80f7c2619917b6236f3a7f02b', '418964ba087b90a84897b62474496b93', null);
-INSERT INTO `sys_role_permission` VALUES ('45325d8dbf7c9ee548ae06b490b045d3', 'f6817f48af4fb3af11b9e8bf182f618b', 'cc50656cf9ca528e6f2150eba4714ad2', null);
-INSERT INTO `sys_role_permission` VALUES ('45767d6c72d2ca1ce83025d9241d113a', 'f6817f48af4fb3af11b9e8bf182f618b', '05b3c82ddb2536a4a5ee1a4c46b5abef', null);
+INSERT INTO `sys_role_permission` VALUES ('455cdb482457f529b79b479a2ff74427', 'f6817f48af4fb3af11b9e8bf182f618b', 'e1979bb53e9ea51cecc74d86fd9d2f64', null);
INSERT INTO `sys_role_permission` VALUES ('459aa2e7021b435b4d65414cfbc71c66', 'e51758fa916c881624b046d26bd09230', '4148ec82b6acd69f470bea75fe41c357', null);
-INSERT INTO `sys_role_permission` VALUES ('467da0025bf89d8155aa6d290f6d9422', 'f6817f48af4fb3af11b9e8bf182f618b', '03dc3d93261dda19fc86dd7ca486c6cf', null);
-INSERT INTO `sys_role_permission` VALUES ('4a00cb21e8f14d362e3779cdc9abae62', 'f6817f48af4fb3af11b9e8bf182f618b', 'fc810a2267dd183e4ef7c71cc60f4670', null);
-INSERT INTO `sys_role_permission` VALUES ('4ac09a099adad69ab897254dda2db0d3', 'f6817f48af4fb3af11b9e8bf182f618b', '2d83d62bd2544b8994c8f38cf17b0ddf', null);
INSERT INTO `sys_role_permission` VALUES ('4c0940badae3ef9231ee9d042338f2a4', 'e51758fa916c881624b046d26bd09230', '2a470fc0c3954d9dbb61de6d80846549', null);
INSERT INTO `sys_role_permission` VALUES ('4d56ce2f67c94b74a1d3abdbea340e42', 'ee8626f80f7c2619917b6236f3a7f02b', 'd86f58e7ab516d3bc6bfb1fe10585f97', null);
-INSERT INTO `sys_role_permission` VALUES ('4da321638e32b193f1b56027ef803a76', 'f6817f48af4fb3af11b9e8bf182f618b', 'd86f58e7ab516d3bc6bfb1fe10585f97', null);
+INSERT INTO `sys_role_permission` VALUES ('4dab5a06acc8ef3297889872caa74747', 'f6817f48af4fb3af11b9e8bf182f618b', 'ffb423d25cc59dcd0532213c4a518261', null);
+INSERT INTO `sys_role_permission` VALUES ('4e0a37ed49524df5f08fc6593aee875c', 'f6817f48af4fb3af11b9e8bf182f618b', 'f23d9bfff4d9aa6b68569ba2cff38415', null);
+INSERT INTO `sys_role_permission` VALUES ('4ea403fc1d19feb871c8bdd9f94a4ecc', 'f6817f48af4fb3af11b9e8bf182f618b', '2e42e3835c2b44ec9f7bc26c146ee531', null);
+INSERT INTO `sys_role_permission` VALUES ('4f254549d9498f06f4cc9b23f3e2c070', 'f6817f48af4fb3af11b9e8bf182f618b', '93d5cfb4448f11e9916698e7f462b4b6', null);
INSERT INTO `sys_role_permission` VALUES ('4faad8ff93cb2b5607cd3d07c1b624ee', 'a799c3b1b12dd3ed4bd046bfaef5fe6e', '70b8f33da5f39de1981bf89cf6c99792', null);
-INSERT INTO `sys_role_permission` VALUES ('4fb0c63fcd0a2bb7f304e914013ee9e3', 'f6817f48af4fb3af11b9e8bf182f618b', 'c65321e57b7949b7a975313220de0422', null);
-INSERT INTO `sys_role_permission` VALUES ('54aeeecd4405b6e0189da1b5f82e6a9e', 'f6817f48af4fb3af11b9e8bf182f618b', 'de13e0f6328c069748de7399fcc1dbbd', null);
-INSERT INTO `sys_role_permission` VALUES ('552a143a7f527d1d2a4769793824aa84', 'f6817f48af4fb3af11b9e8bf182f618b', '45c966826eeff4c99b8f8ebfe74511fc', null);
+INSERT INTO `sys_role_permission` VALUES ('504e326de3f03562cdd186748b48a8c7', 'f6817f48af4fb3af11b9e8bf182f618b', '027aee69baee98a0ed2e01806e89c891', null);
+INSERT INTO `sys_role_permission` VALUES ('51b11ce979730f8ce8606da16e4d69bb', 'f6817f48af4fb3af11b9e8bf182f618b', 'e8af452d8948ea49d37c934f5100ae6a', null);
+INSERT INTO `sys_role_permission` VALUES ('520b5989e6fe4a302a573d4fee12a40a', 'f6817f48af4fb3af11b9e8bf182f618b', '6531cf3421b1265aeeeabaab5e176e6d', null);
+INSERT INTO `sys_role_permission` VALUES ('529953da30b8c7a20034f3a2a90dd5b2', 'f6817f48af4fb3af11b9e8bf182f618b', '190c2b43bec6a5f7a4194a85db67d96a', null);
+INSERT INTO `sys_role_permission` VALUES ('54fdf85e52807bdb32ce450814abc256', 'f6817f48af4fb3af11b9e8bf182f618b', 'cc50656cf9ca528e6f2150eba4714ad2', null);
INSERT INTO `sys_role_permission` VALUES ('57c0b3a547b815ea3ec8e509b08948b3', '1750a8fb3e6d90cb7957c02de1dc8e59', '3f915b2769fc80648e92d04e84ca059d', null);
-INSERT INTO `sys_role_permission` VALUES ('57ef0491da429c0ea949e6aa2f36383e', 'f6817f48af4fb3af11b9e8bf182f618b', 'aedbf679b5773c1f25e9f7b10111da73', null);
INSERT INTO `sys_role_permission` VALUES ('593ee05c4fe4645c7826b7d5e14f23ec', '52b0cf022ac4187b2a70dfa4f8b2d940', '8fb8172747a78756c11916216b8b8066', null);
-INSERT INTO `sys_role_permission` VALUES ('59e64243d9b015a67fa8aace53801c2b', 'f6817f48af4fb3af11b9e8bf182f618b', 'd7d6e2e4e2934f2c9385a623fd98c6f3', null);
-INSERT INTO `sys_role_permission` VALUES ('5a93a14d6edcc28020a3e1bb58b550a9', 'f6817f48af4fb3af11b9e8bf182f618b', 'f780d0d3083d849ccbdb1b1baee4911d', null);
INSERT INTO `sys_role_permission` VALUES ('5affc85021fcba07d81c09a6fdfa8dc6', 'ee8626f80f7c2619917b6236f3a7f02b', '078f9558cdeab239aecb2bda1a8ed0d1', null);
-INSERT INTO `sys_role_permission` VALUES ('5e0c8b2aaf853fe6b1c8b726db5342dc', 'f6817f48af4fb3af11b9e8bf182f618b', '200006f0edf145a2b50eacca07585451', null);
+INSERT INTO `sys_role_permission` VALUES ('5d230e6cd2935c4117f6cb9a7a749e39', 'f6817f48af4fb3af11b9e8bf182f618b', 'fc810a2267dd183e4ef7c71cc60f4670', null);
+INSERT INTO `sys_role_permission` VALUES ('5de6871fadb4fe1cdd28989da0126b07', 'f6817f48af4fb3af11b9e8bf182f618b', 'a400e4f4d54f79bf5ce160a3432231af', null);
+INSERT INTO `sys_role_permission` VALUES ('5e4015a9a641cbf3fb5d28d9f885d81a', 'f6817f48af4fb3af11b9e8bf182f618b', '2dbbafa22cda07fa5d169d741b81fe12', null);
INSERT INTO `sys_role_permission` VALUES ('5e634a89f75b7a421c02aecfd520325f', 'e51758fa916c881624b046d26bd09230', '339329ed54cf255e1f9392e84f136901', null);
INSERT INTO `sys_role_permission` VALUES ('5e74637c4bec048d1880ad0bd1b00552', 'e51758fa916c881624b046d26bd09230', 'a400e4f4d54f79bf5ce160a3432231af', null);
-INSERT INTO `sys_role_permission` VALUES ('5f88c86ffc73ea6b311e221245c6bbf9', 'f6817f48af4fb3af11b9e8bf182f618b', '56ca78fe0f22d815fabc793461af67b8', null);
INSERT INTO `sys_role_permission` VALUES ('5fc194b709336d354640fe29fefd65a3', 'a799c3b1b12dd3ed4bd046bfaef5fe6e', '9ba60e626bf2882c31c488aba62b89f0', null);
-INSERT INTO `sys_role_permission` VALUES ('60c4f0b59a0029429f744ab20b1bb7fa', 'f6817f48af4fb3af11b9e8bf182f618b', 'edfa74d66e8ea63ea432c2910837b150', null);
-INSERT INTO `sys_role_permission` VALUES ('61c71e973503479e8b795c5d40363f13', 'f6817f48af4fb3af11b9e8bf182f618b', 'e6bfd1fcabfd7942fdd05f076d1dad38', null);
-INSERT INTO `sys_role_permission` VALUES ('6369b641d2fa1b4bb9ef2fa630073bd8', 'f6817f48af4fb3af11b9e8bf182f618b', '54097c6a3cf50fad0793a34beff1efdf', null);
-INSERT INTO `sys_role_permission` VALUES ('63e66c8481aa89d2a2a614e7d5bc0184', 'f6817f48af4fb3af11b9e8bf182f618b', 'e8af452d8948ea49d37c934f5100ae6a', null);
+INSERT INTO `sys_role_permission` VALUES ('60eda4b4db138bdb47edbe8e10e71675', 'f6817f48af4fb3af11b9e8bf182f618b', 'fb07ca05a3e13674dbf6d3245956da2e', null);
+INSERT INTO `sys_role_permission` VALUES ('61835e48f3e675f7d3f5c9dd3a10dcf3', 'f6817f48af4fb3af11b9e8bf182f618b', 'f0675b52d89100ee88472b6800754a08', null);
INSERT INTO `sys_role_permission` VALUES ('6451dac67ba4acafb570fd6a03f47460', 'ee8626f80f7c2619917b6236f3a7f02b', 'e3c13679c73a4f829bcff2aba8fd68b1', null);
-INSERT INTO `sys_role_permission` VALUES ('68ffc3f37266f287496e43ff6a329c36', 'f6817f48af4fb3af11b9e8bf182f618b', '109c78a583d4693ce2f16551b7786786', null);
-INSERT INTO `sys_role_permission` VALUES ('6a2375344192922f9bf3ee0f32e042eb', 'f6817f48af4fb3af11b9e8bf182f618b', '13212d3416eb690c2e1d5033166ff47a', null);
-INSERT INTO `sys_role_permission` VALUES ('6a9a93ac415e8ebb98fb5d75ed1bc970', 'f6817f48af4fb3af11b9e8bf182f618b', '700b7f95165c46cc7a78bf227aa8fed3', null);
+INSERT INTO `sys_role_permission` VALUES ('660fbc40bcb1044738f7cabdf1708c28', 'f6817f48af4fb3af11b9e8bf182f618b', 'b3c824fc22bd953e2eb16ae6914ac8f9', null);
+INSERT INTO `sys_role_permission` VALUES ('66b202f8f84fe766176b3f51071836ef', 'f6817f48af4fb3af11b9e8bf182f618b', '1367a93f2c410b169faa7abcbad2f77c', null);
INSERT INTO `sys_role_permission` VALUES ('6c43fd3f10fdaf2a0646434ae68709b5', 'ee8626f80f7c2619917b6236f3a7f02b', '540a2936940846cb98114ffb0d145cb8', null);
-INSERT INTO `sys_role_permission` VALUES ('6d230b680a3cbe5081a86e944734435f', 'f6817f48af4fb3af11b9e8bf182f618b', 'fedfbf4420536cacc0218557d263dfea', null);
-INSERT INTO `sys_role_permission` VALUES ('6fe1ccedfebfe359e9cb0dbd4329d257', 'f6817f48af4fb3af11b9e8bf182f618b', 'b1cb0a3fedf7ed0e4653cb5a229837ee', null);
+INSERT INTO `sys_role_permission` VALUES ('6c74518eb6bb9a353f6a6c459c77e64b', 'f6817f48af4fb3af11b9e8bf182f618b', 'b4dfc7d5dd9e8d5b6dd6d4579b1aa559', null);
+INSERT INTO `sys_role_permission` VALUES ('6daddafacd7eccb91309530c17c5855d', 'f6817f48af4fb3af11b9e8bf182f618b', 'edfa74d66e8ea63ea432c2910837b150', null);
+INSERT INTO `sys_role_permission` VALUES ('6fb4c2142498dd6d5b6c014ef985cb66', 'f6817f48af4fb3af11b9e8bf182f618b', '6e73eb3c26099c191bf03852ee1310a1', null);
INSERT INTO `sys_role_permission` VALUES ('71a5f54a90aa8c7a250a38b7dba39f6f', 'ee8626f80f7c2619917b6236f3a7f02b', '8fb8172747a78756c11916216b8b8066', null);
-INSERT INTO `sys_role_permission` VALUES ('7335d2c31f17ec8e91f11e20fdae00ef', 'f6817f48af4fb3af11b9e8bf182f618b', 'e08cb190ef230d5d4f03824198773950', null);
INSERT INTO `sys_role_permission` VALUES ('737d35f582036cd18bfd4c8e5748eaa4', 'e51758fa916c881624b046d26bd09230', '693ce69af3432bd00be13c3971a57961', null);
+INSERT INTO `sys_role_permission` VALUES ('7413acf23b56c906aedb5a36fb75bd3a', 'f6817f48af4fb3af11b9e8bf182f618b', 'a4fc7b64b01a224da066bb16230f9c5a', null);
INSERT INTO `sys_role_permission` VALUES ('75002588591820806', '16457350655250432', '5129710648430592', null);
INSERT INTO `sys_role_permission` VALUES ('75002588604403712', '16457350655250432', '5129710648430593', null);
INSERT INTO `sys_role_permission` VALUES ('75002588612792320', '16457350655250432', '40238597734928384', null);
@@ -2009,7 +2128,7 @@ INSERT INTO `sys_role_permission` VALUES ('75002588625375232', '1645735065525043
INSERT INTO `sys_role_permission` VALUES ('75002588633763840', '16457350655250432', '16392452747300864', null);
INSERT INTO `sys_role_permission` VALUES ('75002588637958144', '16457350655250432', '16392767785668608', null);
INSERT INTO `sys_role_permission` VALUES ('75002588650541056', '16457350655250432', '16439068543946752', null);
-INSERT INTO `sys_role_permission` VALUES ('76de49fa17c97d7ce2b647aa6985e43d', 'f6817f48af4fb3af11b9e8bf182f618b', '9a90363f216a6a08f32eecb3f0bf12a3', null);
+INSERT INTO `sys_role_permission` VALUES ('76a54a8cc609754360bf9f57e7dbb2db', 'f6817f48af4fb3af11b9e8bf182f618b', 'c65321e57b7949b7a975313220de0422', null);
INSERT INTO `sys_role_permission` VALUES ('77277779875336192', '496138616573952', '5129710648430592', null);
INSERT INTO `sys_role_permission` VALUES ('77277780043108352', '496138616573952', '5129710648430593', null);
INSERT INTO `sys_role_permission` VALUES ('77277780055691264', '496138616573952', '15701400130424832', null);
@@ -2139,129 +2258,110 @@ INSERT INTO `sys_role_permission` VALUES ('77277860385001472', '496138616573953'
INSERT INTO `sys_role_permission` VALUES ('77277860389195776', '496138616573953', '16439068543946752', null);
INSERT INTO `sys_role_permission` VALUES ('7750f9be48ee09cd561fce718219a3e2', 'ee8626f80f7c2619917b6236f3a7f02b', '882a73768cfd7f78f3a37584f7299656', null);
INSERT INTO `sys_role_permission` VALUES ('7a5d31ba48fe3fb1266bf186dc5f7ba7', '52b0cf022ac4187b2a70dfa4f8b2d940', '58857ff846e61794c69208e9d3a85466', null);
+INSERT INTO `sys_role_permission` VALUES ('7ca833caa5eac837b7200d8b6de8b2e3', 'f6817f48af4fb3af11b9e8bf182f618b', 'fedfbf4420536cacc0218557d263dfea', null);
INSERT INTO `sys_role_permission` VALUES ('7d2ea745950be3357747ec7750c31c57', 'ee8626f80f7c2619917b6236f3a7f02b', '2a470fc0c3954d9dbb61de6d80846549', null);
-INSERT INTO `sys_role_permission` VALUES ('7d81581210add7608f4d580ab09c1c9d', 'f6817f48af4fb3af11b9e8bf182f618b', '882a73768cfd7f78f3a37584f7299656', null);
INSERT INTO `sys_role_permission` VALUES ('7de42bdc0b8c5446b7d428c66a7abc12', '52b0cf022ac4187b2a70dfa4f8b2d940', '54dd5457a3190740005c1bfec55b1c34', null);
INSERT INTO `sys_role_permission` VALUES ('7e19d90cec0dd87aaef351b9ff8f4902', '646c628b2b8295fbdab2d34044de0354', 'f9d3f4f27653a71c52faa9fb8070fbe7', null);
INSERT INTO `sys_role_permission` VALUES ('7f862c47003eb20e8bad05f506371f92', 'ee8626f80f7c2619917b6236f3a7f02b', 'd7d6e2e4e2934f2c9385a623fd98c6f3', null);
-INSERT INTO `sys_role_permission` VALUES ('806bcc05238ef1b0c24dadf18fb0af08', 'f6817f48af4fb3af11b9e8bf182f618b', 'ec8d607d0156e198b11853760319c646', null);
INSERT INTO `sys_role_permission` VALUES ('812ed54661b1a24b81b58974691a73f5', 'e51758fa916c881624b046d26bd09230', 'e6bfd1fcabfd7942fdd05f076d1dad38', null);
-INSERT INTO `sys_role_permission` VALUES ('8246c649fe7f1845cdc872014c7ad962', 'f6817f48af4fb3af11b9e8bf182f618b', '9502685863ab87f0ad1134142788a385', null);
INSERT INTO `sys_role_permission` VALUES ('83f704524b21b6a3ae324b8736c65333', 'ee8626f80f7c2619917b6236f3a7f02b', '7ac9eb9ccbde2f7a033cd4944272bf1e', null);
INSERT INTO `sys_role_permission` VALUES ('84d32474316a43b01256d6644e6e7751', 'ee8626f80f7c2619917b6236f3a7f02b', 'ec8d607d0156e198b11853760319c646', null);
+INSERT INTO `sys_role_permission` VALUES ('84eac2f113c23737128fb099d1d1da89', 'f6817f48af4fb3af11b9e8bf182f618b', '03dc3d93261dda19fc86dd7ca486c6cf', null);
INSERT INTO `sys_role_permission` VALUES ('85755a6c0bdff78b3860b52d35310c7f', 'e51758fa916c881624b046d26bd09230', 'c65321e57b7949b7a975313220de0422', null);
-INSERT INTO `sys_role_permission` VALUES ('859fb968f3e4560f870f6659d4d2982f', 'f6817f48af4fb3af11b9e8bf182f618b', '63b551e81c5956d5c861593d366d8c57', null);
-INSERT INTO `sys_role_permission` VALUES ('85a009f7be4e792e61dc8dccfc35c273', 'f6817f48af4fb3af11b9e8bf182f618b', '8fb8172747a78756c11916216b8b8066', null);
-INSERT INTO `sys_role_permission` VALUES ('86cc551bcb0cc7d61f1fc5e924cffd2f', 'f6817f48af4fb3af11b9e8bf182f618b', '9fe26464838de2ea5e90f2367e35efa0', null);
+INSERT INTO `sys_role_permission` VALUES ('86060e2867a5049d8a80d9fe5d8bc28b', 'f6817f48af4fb3af11b9e8bf182f618b', '765dd244f37b804e3d00f475fd56149b', null);
INSERT INTO `sys_role_permission` VALUES ('8703a2410cddb713c33232ce16ec04b9', 'ee8626f80f7c2619917b6236f3a7f02b', '1367a93f2c410b169faa7abcbad2f77c', null);
-INSERT INTO `sys_role_permission` VALUES ('8724588961f747d321885b2c50f3ef67', 'f6817f48af4fb3af11b9e8bf182f618b', '9cb91b8851db0cf7b19d7ecc2a8193dd', null);
+INSERT INTO `sys_role_permission` VALUES ('884f147c20e003cc80ed5b7efa598cbe', 'f6817f48af4fb3af11b9e8bf182f618b', 'e5973686ed495c379d829ea8b2881fc6', null);
INSERT INTO `sys_role_permission` VALUES ('885c1a827383e5b2c6c4f8ca72a7b493', 'ee8626f80f7c2619917b6236f3a7f02b', '4148ec82b6acd69f470bea75fe41c357', null);
INSERT INTO `sys_role_permission` VALUES ('8a60df8d8b4c9ee5fa63f48aeee3ec00', '1750a8fb3e6d90cb7957c02de1dc8e59', 'd7d6e2e4e2934f2c9385a623fd98c6f3', null);
INSERT INTO `sys_role_permission` VALUES ('8b1e326791375f325d3e6b797753b65e', 'ee8626f80f7c2619917b6236f3a7f02b', '2dbbafa22cda07fa5d169d741b81fe12', null);
INSERT INTO `sys_role_permission` VALUES ('8ce1022dac4e558ff9694600515cf510', '1750a8fb3e6d90cb7957c02de1dc8e59', '08e6b9dc3c04489c8e1ff2ce6f105aa4', null);
+INSERT INTO `sys_role_permission` VALUES ('8d154c2382a8ae5c8d1b84bd38df2a93', 'f6817f48af4fb3af11b9e8bf182f618b', 'd86f58e7ab516d3bc6bfb1fe10585f97', null);
INSERT INTO `sys_role_permission` VALUES ('8d848ca7feec5b7ebb3ecb32b2c8857a', '52b0cf022ac4187b2a70dfa4f8b2d940', '4148ec82b6acd69f470bea75fe41c357', null);
+INSERT INTO `sys_role_permission` VALUES ('8dd64f65a1014196078d0882f767cd85', 'f6817f48af4fb3af11b9e8bf182f618b', 'e3c13679c73a4f829bcff2aba8fd68b1', null);
+INSERT INTO `sys_role_permission` VALUES ('8e3dc1671abad4f3c83883b194d2e05a', 'f6817f48af4fb3af11b9e8bf182f618b', 'b1cb0a3fedf7ed0e4653cb5a229837ee', null);
INSERT INTO `sys_role_permission` VALUES ('8eec2c510f1ac9c5eee26c041b1f00ca', 'ee8626f80f7c2619917b6236f3a7f02b', '58857ff846e61794c69208e9d3a85466', null);
INSERT INTO `sys_role_permission` VALUES ('8f762ff80253f634b08cf59a77742ba4', 'ee8626f80f7c2619917b6236f3a7f02b', '9502685863ab87f0ad1134142788a385', null);
INSERT INTO `sys_role_permission` VALUES ('903b790e6090414343502c6dc393b7c9', 'ee8626f80f7c2619917b6236f3a7f02b', 'de13e0f6328c069748de7399fcc1dbbd', null);
+INSERT INTO `sys_role_permission` VALUES ('905bf419332ebcb83863603b3ebe30f0', 'f6817f48af4fb3af11b9e8bf182f618b', '8fb8172747a78756c11916216b8b8066', null);
INSERT INTO `sys_role_permission` VALUES ('90996d56357730e173e636b99fc48bea', 'ee8626f80f7c2619917b6236f3a7f02b', 'fb07ca05a3e13674dbf6d3245956da2e', null);
INSERT INTO `sys_role_permission` VALUES ('90e1c607a0631364eec310f3cc4acebd', 'ee8626f80f7c2619917b6236f3a7f02b', '4f66409ef3bbd69c1d80469d6e2a885e', null);
INSERT INTO `sys_role_permission` VALUES ('9264104cee9b10c96241d527b2d0346d', '1750a8fb3e6d90cb7957c02de1dc8e59', '54dd5457a3190740005c1bfec55b1c34', null);
-INSERT INTO `sys_role_permission` VALUES ('9435f03bc69f108d08f3efdb436de278', 'f6817f48af4fb3af11b9e8bf182f618b', '6ad53fd1b220989a8b71ff482d683a5a', null);
+INSERT INTO `sys_role_permission` VALUES ('9380121ca9cfee4b372194630fce150e', 'f6817f48af4fb3af11b9e8bf182f618b', '65a8f489f25a345836b7f44b1181197a', null);
+INSERT INTO `sys_role_permission` VALUES ('94911fef73a590f6824105ebf9b6cab3', 'f6817f48af4fb3af11b9e8bf182f618b', '8b3bff2eee6f1939147f5c68292a1642', null);
+INSERT INTO `sys_role_permission` VALUES ('9700d20dbc1ae3cbf7de1c810b521fe6', 'f6817f48af4fb3af11b9e8bf182f618b', 'ec8d607d0156e198b11853760319c646', null);
+INSERT INTO `sys_role_permission` VALUES ('980171fda43adfe24840959b1d048d4d', 'f6817f48af4fb3af11b9e8bf182f618b', 'd7d6e2e4e2934f2c9385a623fd98c6f3', null);
+INSERT INTO `sys_role_permission` VALUES ('987c23b70873bd1d6dca52f30aafd8c2', 'f6817f48af4fb3af11b9e8bf182f618b', '00a2a0ae65cdca5e93209cdbde97cbe6', null);
INSERT INTO `sys_role_permission` VALUES ('98f02353f91dd569e3c6b8fd6b4f4034', 'ee8626f80f7c2619917b6236f3a7f02b', '6531cf3421b1265aeeeabaab5e176e6d', null);
-INSERT INTO `sys_role_permission` VALUES ('9b6c9e4bc89343d326f43b0ba14caa35', 'f6817f48af4fb3af11b9e8bf182f618b', '3f915b2769fc80648e92d04e84ca059d', null);
-INSERT INTO `sys_role_permission` VALUES ('9c035b8416d8d074f2a24ae975f9dc66', 'f6817f48af4fb3af11b9e8bf182f618b', '00a2a0ae65cdca5e93209cdbde97cbe6', null);
+INSERT INTO `sys_role_permission` VALUES ('9b2ad767f9861e64a20b097538feafd3', 'f6817f48af4fb3af11b9e8bf182f618b', '73678f9daa45ed17a3674131b03432fb', null);
INSERT INTO `sys_role_permission` VALUES ('9d8772c310b675ae43eacdbc6c7fa04a', 'a799c3b1b12dd3ed4bd046bfaef5fe6e', '1663f3faba244d16c94552f849627d84', null);
+INSERT INTO `sys_role_permission` VALUES ('9d980ec0489040e631a9c24a6af42934', 'f6817f48af4fb3af11b9e8bf182f618b', '05b3c82ddb2536a4a5ee1a4c46b5abef', null);
INSERT INTO `sys_role_permission` VALUES ('9f8311ecccd44e079723098cf2ffe1cc', '1750a8fb3e6d90cb7957c02de1dc8e59', '693ce69af3432bd00be13c3971a57961', null);
+INSERT INTO `sys_role_permission` VALUES ('a034ed7c38c996b880d3e78f586fe0ae', 'f6817f48af4fb3af11b9e8bf182f618b', 'c89018ea6286e852b424466fd92a2ffc', null);
INSERT INTO `sys_role_permission` VALUES ('a098e2acc3f90316f161f6648d085640', 'ee8626f80f7c2619917b6236f3a7f02b', 'e6bfd1fcabfd7942fdd05f076d1dad38', null);
-INSERT INTO `sys_role_permission` VALUES ('a1326a034fd39447609573ae7f209fc3', 'f6817f48af4fb3af11b9e8bf182f618b', '73678f9daa45ed17a3674131b03432fb', null);
-INSERT INTO `sys_role_permission` VALUES ('a34efa870a95ff078b4a729e5aff5f48', 'f6817f48af4fb3af11b9e8bf182f618b', '732d48f8e0abe99fe6a23d18a3171cd1', null);
-INSERT INTO `sys_role_permission` VALUES ('a4bbd697954d0c9edefdbebf05781cc0', 'f6817f48af4fb3af11b9e8bf182f618b', '7960961b0063228937da5fa8dd73d371', null);
-INSERT INTO `sys_role_permission` VALUES ('a5b56bd1e428d23aaa3d2f4c7424533b', 'f6817f48af4fb3af11b9e8bf182f618b', '54dd5457a3190740005c1bfec55b1c34', null);
+INSERT INTO `sys_role_permission` VALUES ('a307a9349ad64a2eff8ab69582fa9be4', 'f6817f48af4fb3af11b9e8bf182f618b', '0620e402857b8c5b605e1ad9f4b89350', null);
+INSERT INTO `sys_role_permission` VALUES ('a5d25fdb3c62904a8474182706ce11a0', 'f6817f48af4fb3af11b9e8bf182f618b', '418964ba087b90a84897b62474496b93', null);
INSERT INTO `sys_role_permission` VALUES ('a66feaaf128417ad762e946abccf27ec', 'ee8626f80f7c2619917b6236f3a7f02b', 'c6cf95444d80435eb37b2f9db3971ae6', null);
INSERT INTO `sys_role_permission` VALUES ('a72c31a3913c736d4eca11d13be99183', 'e51758fa916c881624b046d26bd09230', 'a44c30db536349e91106223957e684eb', null);
INSERT INTO `sys_role_permission` VALUES ('a7ab87eac0f8fafa2efa4b1f9351923f', 'ee8626f80f7c2619917b6236f3a7f02b', 'fedfbf4420536cacc0218557d263dfea', null);
-INSERT INTO `sys_role_permission` VALUES ('a80a4528118552a7a3dc9e6a6eaee439', 'f6817f48af4fb3af11b9e8bf182f618b', '717f6bee46f44a3897eca9abd6e2ec44', null);
-INSERT INTO `sys_role_permission` VALUES ('a88f4cdc81d4a8d1e0a27a29c90d8c2a', 'f6817f48af4fb3af11b9e8bf182f618b', 'ffb423d25cc59dcd0532213c4a518261', null);
-INSERT INTO `sys_role_permission` VALUES ('ab639f1526a4ade3411fd20db7a1815e', 'f6817f48af4fb3af11b9e8bf182f618b', '6531cf3421b1265aeeeabaab5e176e6d', null);
INSERT INTO `sys_role_permission` VALUES ('abdc324a2df9f13ee6e73d44c6e62bc8', 'ee8626f80f7c2619917b6236f3a7f02b', 'f1cb187abf927c88b89470d08615f5ac', null);
-INSERT INTO `sys_role_permission` VALUES ('ac17157d44d559e528a8fb9d04406fe8', 'f6817f48af4fb3af11b9e8bf182f618b', 'c2c356bf4ddd29975347a7047a062440', null);
-INSERT INTO `sys_role_permission` VALUES ('ad040f98d3c29cf93f7dc892a8ba1210', 'f6817f48af4fb3af11b9e8bf182f618b', '020b06793e4de2eee0007f603000c769', null);
+INSERT INTO `sys_role_permission` VALUES ('acacce4417e5d7f96a9c3be2ded5b4be', 'f6817f48af4fb3af11b9e8bf182f618b', 'f9d3f4f27653a71c52faa9fb8070fbe7', null);
INSERT INTO `sys_role_permission` VALUES ('aefc8c22e061171806e59cd222f6b7e1', '52b0cf022ac4187b2a70dfa4f8b2d940', 'e8af452d8948ea49d37c934f5100ae6a', null);
-INSERT INTO `sys_role_permission` VALUES ('b05599406e8791d65afacdcb7201f563', 'f6817f48af4fb3af11b9e8bf182f618b', 'd2bbf9ebca5a8fa2e227af97d2da7548', null);
+INSERT INTO `sys_role_permission` VALUES ('af60ac8fafd807ed6b6b354613b9ccbc', 'f6817f48af4fb3af11b9e8bf182f618b', '58857ff846e61794c69208e9d3a85466', null);
+INSERT INTO `sys_role_permission` VALUES ('b0c8a20800b8bf1ebdd7be473bceb44f', 'f6817f48af4fb3af11b9e8bf182f618b', '58b9204feaf07e47284ddb36cd2d8468', null);
+INSERT INTO `sys_role_permission` VALUES ('b128ebe78fa5abb54a3a82c6689bdca3', 'f6817f48af4fb3af11b9e8bf182f618b', 'aedbf679b5773c1f25e9f7b10111da73', null);
INSERT INTO `sys_role_permission` VALUES ('b131ebeafcfd059f3c7e542606ea9ff5', 'ee8626f80f7c2619917b6236f3a7f02b', 'e5973686ed495c379d829ea8b2881fc6', null);
-INSERT INTO `sys_role_permission` VALUES ('b24122ddecdca94eb5754456bb2c32f2', 'f6817f48af4fb3af11b9e8bf182f618b', 'e41b69c57a941a3bbcce45032fe57605', null);
+INSERT INTO `sys_role_permission` VALUES ('b21b07951bb547b09cc85624a841aea0', 'f6817f48af4fb3af11b9e8bf182f618b', '4356a1a67b564f0988a484f5531fd4d9', null);
INSERT INTO `sys_role_permission` VALUES ('b2b2dcfff6986d3d7f890ea62d474651', 'ee8626f80f7c2619917b6236f3a7f02b', '200006f0edf145a2b50eacca07585451', null);
-INSERT INTO `sys_role_permission` VALUES ('b3b7f425c0fc1d92d4c2dccbef66af69', 'f6817f48af4fb3af11b9e8bf182f618b', '7593c9e3523a17bca83b8d7fe8a34e58', null);
-INSERT INTO `sys_role_permission` VALUES ('b3db897e3e7e8469ea6218afe42d0a5a', 'f6817f48af4fb3af11b9e8bf182f618b', 'ae4fed059f67086fd52a73d913cf473d', null);
INSERT INTO `sys_role_permission` VALUES ('b495a46fa0e0d4637abe0db7fd12fe1a', 'ee8626f80f7c2619917b6236f3a7f02b', '717f6bee46f44a3897eca9abd6e2ec44', null);
-INSERT INTO `sys_role_permission` VALUES ('b9d821aae407085c0d91da70f8c09e21', 'f6817f48af4fb3af11b9e8bf182f618b', '4148ec82b6acd69f470bea75fe41c357', null);
-INSERT INTO `sys_role_permission` VALUES ('ba87fd2b2c8eee82dac1cd92d39ca774', 'f6817f48af4fb3af11b9e8bf182f618b', '5c8042bd6c601270b2bbd9b20bccc68b', null);
+INSERT INTO `sys_role_permission` VALUES ('b64c4ab9cd9a2ea8ac1e9db5fb7cf522', 'f6817f48af4fb3af11b9e8bf182f618b', '2aeddae571695cd6380f6d6d334d6e7d', null);
+INSERT INTO `sys_role_permission` VALUES ('bbec16ad016efec9ea2def38f4d3d9dc', 'f6817f48af4fb3af11b9e8bf182f618b', '13212d3416eb690c2e1d5033166ff47a', null);
INSERT INTO `sys_role_permission` VALUES ('bd30561f141f07827b836878137fddd8', 'e51758fa916c881624b046d26bd09230', '65a8f489f25a345836b7f44b1181197a', null);
-INSERT INTO `sys_role_permission` VALUES ('be5eabad598d67bda03e314168086982', 'f6817f48af4fb3af11b9e8bf182f618b', 'c6cf95444d80435eb37b2f9db3971ae6', null);
-INSERT INTO `sys_role_permission` VALUES ('c316fdb7d377bf25772ce3577677509c', 'f6817f48af4fb3af11b9e8bf182f618b', '4875ebe289344e14844d8e3ea1edd73f', null);
-INSERT INTO `sys_role_permission` VALUES ('c63d3bdbb2a9a523ebfd44d2fc9008dd', 'f6817f48af4fb3af11b9e8bf182f618b', '8d1ebd663688965f1fd86a2f0ead3416', null);
+INSERT INTO `sys_role_permission` VALUES ('bea2986432079d89203da888d99b3f16', 'f6817f48af4fb3af11b9e8bf182f618b', '54dd5457a3190740005c1bfec55b1c34', null);
+INSERT INTO `sys_role_permission` VALUES ('c09373ebfc73fb5740db5ff02cba4f91', 'f6817f48af4fb3af11b9e8bf182f618b', '339329ed54cf255e1f9392e84f136901', null);
+INSERT INTO `sys_role_permission` VALUES ('c56fb1658ee5f7476380786bf5905399', 'f6817f48af4fb3af11b9e8bf182f618b', 'de13e0f6328c069748de7399fcc1dbbd', null);
INSERT INTO `sys_role_permission` VALUES ('c689539d20a445b0896270290c58d01f', 'e51758fa916c881624b046d26bd09230', '13212d3416eb690c2e1d5033166ff47a', null);
-INSERT INTO `sys_role_permission` VALUES ('c77425e2129587a2efc9c7f9059699b7', 'f6817f48af4fb3af11b9e8bf182f618b', 'a2b11669e98c5fe54a53c3e3c4f35d14', null);
+INSERT INTO `sys_role_permission` VALUES ('c6fee38d293b9d0596436a0cbd205070', 'f6817f48af4fb3af11b9e8bf182f618b', '4f84f9400e5e92c95f05b554724c2b58', null);
INSERT INTO `sys_role_permission` VALUES ('c8571839e6b14796e661f3e2843b80b6', 'ee8626f80f7c2619917b6236f3a7f02b', '45c966826eeff4c99b8f8ebfe74511fc', null);
-INSERT INTO `sys_role_permission` VALUES ('c9412b70586ce8d729dac8fa3149ab1a', 'f6817f48af4fb3af11b9e8bf182f618b', '4f84f9400e5e92c95f05b554724c2b58', null);
+INSERT INTO `sys_role_permission` VALUES ('c90b0b01c7ca454d2a1cb7408563e696', 'f6817f48af4fb3af11b9e8bf182f618b', '882a73768cfd7f78f3a37584f7299656', null);
INSERT INTO `sys_role_permission` VALUES ('c9d35261cccd67ab2932107a0967a7d7', 'e51758fa916c881624b046d26bd09230', 'b4dfc7d5dd9e8d5b6dd6d4579b1aa559', null);
-INSERT INTO `sys_role_permission` VALUES ('ced7337f40e1db9a70de44d1262f0360', 'f6817f48af4fb3af11b9e8bf182f618b', '91c23960fab49335831cf43d820b0a61', null);
INSERT INTO `sys_role_permission` VALUES ('ced80e43584ce15e97bb07298e93020d', 'e51758fa916c881624b046d26bd09230', '45c966826eeff4c99b8f8ebfe74511fc', null);
+INSERT INTO `sys_role_permission` VALUES ('cf1feb1bf69eafc982295ad6c9c8d698', 'f6817f48af4fb3af11b9e8bf182f618b', 'a2b11669e98c5fe54a53c3e3c4f35d14', null);
+INSERT INTO `sys_role_permission` VALUES ('cf2ef620217673e4042f695743294f01', 'f6817f48af4fb3af11b9e8bf182f618b', '717f6bee46f44a3897eca9abd6e2ec44', null);
+INSERT INTO `sys_role_permission` VALUES ('cf43895aef7fc684669483ab00ef2257', 'f6817f48af4fb3af11b9e8bf182f618b', '700b7f95165c46cc7a78bf227aa8fed3', null);
INSERT INTO `sys_role_permission` VALUES ('d03d792b0f312e7b490afc5cec3dd6c5', 'e51758fa916c881624b046d26bd09230', '8fb8172747a78756c11916216b8b8066', null);
+INSERT INTO `sys_role_permission` VALUES ('d281a95b8f293d0fa2a136f46c4e0b10', 'f6817f48af4fb3af11b9e8bf182f618b', '5c8042bd6c601270b2bbd9b20bccc68b', null);
+INSERT INTO `sys_role_permission` VALUES ('d37ad568e26f46ed0feca227aa9c2ffa', 'f6817f48af4fb3af11b9e8bf182f618b', '9502685863ab87f0ad1134142788a385', null);
+INSERT INTO `sys_role_permission` VALUES ('d3ddcacee1acdfaa0810618b74e38ef2', 'f6817f48af4fb3af11b9e8bf182f618b', 'c6cf95444d80435eb37b2f9db3971ae6', null);
INSERT INTO `sys_role_permission` VALUES ('d3fe195d59811531c05d31d8436f5c8b', '1750a8fb3e6d90cb7957c02de1dc8e59', 'e8af452d8948ea49d37c934f5100ae6a', null);
INSERT INTO `sys_role_permission` VALUES ('d5267597a4450f06d49d2fb63859641a', 'e51758fa916c881624b046d26bd09230', '2dbbafa22cda07fa5d169d741b81fe12', null);
-INSERT INTO `sys_role_permission` VALUES ('d9c64c7a34306dc4e3176d95d367520b', 'f6817f48af4fb3af11b9e8bf182f618b', 'f0675b52d89100ee88472b6800754a08', null);
-INSERT INTO `sys_role_permission` VALUES ('dc4e760077a35fcef7995be9c92cef8d', 'f6817f48af4fb3af11b9e8bf182f618b', 'a400e4f4d54f79bf5ce160a3432231af', null);
-INSERT INTO `sys_role_permission` VALUES ('e02b6986b273af631e1aaf169a71f810', 'f6817f48af4fb3af11b9e8bf182f618b', '4356a1a67b564f0988a484f5531fd4d9', null);
+INSERT INTO `sys_role_permission` VALUES ('d83282192a69514cfe6161b3087ff962', 'f6817f48af4fb3af11b9e8bf182f618b', '53a9230444d33de28aa11cc108fb1dba', null);
+INSERT INTO `sys_role_permission` VALUES ('d8a5c9079df12090e108e21be94b4fd7', 'f6817f48af4fb3af11b9e8bf182f618b', '078f9558cdeab239aecb2bda1a8ed0d1', null);
+INSERT INTO `sys_role_permission` VALUES ('dbc5dd836d45c5bc7bc94b22596ab956', 'f6817f48af4fb3af11b9e8bf182f618b', '1939e035e803a99ceecb6f5563570fb2', null);
+INSERT INTO `sys_role_permission` VALUES ('dc83bb13c0e8c930e79d28b2db26f01f', 'f6817f48af4fb3af11b9e8bf182f618b', '63b551e81c5956d5c861593d366d8c57', null);
+INSERT INTO `sys_role_permission` VALUES ('dc8fd3f79bd85bd832608b42167a1c71', 'f6817f48af4fb3af11b9e8bf182f618b', '91c23960fab49335831cf43d820b0a61', null);
+INSERT INTO `sys_role_permission` VALUES ('de82e89b8b60a3ea99be5348f565c240', 'f6817f48af4fb3af11b9e8bf182f618b', '56ca78fe0f22d815fabc793461af67b8', null);
+INSERT INTO `sys_role_permission` VALUES ('de8f43229e351d34af3c95b1b9f0a15d', 'f6817f48af4fb3af11b9e8bf182f618b', 'a400e4f4d54f79bf5ce160ae432231af', null);
INSERT INTO `sys_role_permission` VALUES ('e258ca8bf7ee168b93bfee739668eb15', 'ee8626f80f7c2619917b6236f3a7f02b', 'fb367426764077dcf94640c843733985', null);
-INSERT INTO `sys_role_permission` VALUES ('e2e29f53362b2ec40cbd4c3414d1e85f', 'f6817f48af4fb3af11b9e8bf182f618b', '58857ff846e61794c69208e9d3a85466', null);
INSERT INTO `sys_role_permission` VALUES ('e339f7db7418a4fd2bd2c113f1182186', 'ee8626f80f7c2619917b6236f3a7f02b', 'b1cb0a3fedf7ed0e4653cb5a229837ee', null);
-INSERT INTO `sys_role_permission` VALUES ('e36b26c0077205bc87bb3f29b96f9039', 'f6817f48af4fb3af11b9e8bf182f618b', '540a2936940846cb98114ffb0d145cb8', null);
-INSERT INTO `sys_role_permission` VALUES ('e3c30f109d09db2210f3857c1e79baad', 'f6817f48af4fb3af11b9e8bf182f618b', '944abf0a8fc22fe1f1154a389a574154', null);
INSERT INTO `sys_role_permission` VALUES ('e3e922673f4289b18366bb51b6200f17', '52b0cf022ac4187b2a70dfa4f8b2d940', '45c966826eeff4c99b8f8ebfe74511fc', null);
-INSERT INTO `sys_role_permission` VALUES ('e56a61a4964e0fc71f20856713a0040d', 'f6817f48af4fb3af11b9e8bf182f618b', '2aeddae571695cd6380f6d6d334d6e7d', null);
-INSERT INTO `sys_role_permission` VALUES ('ec3748f2cc58400ffbd3cd1fa3232f5d', 'f6817f48af4fb3af11b9e8bf182f618b', '1367a93f2c410b169faa7abcbad2f77c', null);
-INSERT INTO `sys_role_permission` VALUES ('eeb6b2e31b35a6a2b7778f41b9922ef6', 'f6817f48af4fb3af11b9e8bf182f618b', 'd07a2c87a451434c99ab06296727ec4f', null);
+INSERT INTO `sys_role_permission` VALUES ('e7467726ee72235baaeb47df04a35e73', 'f6817f48af4fb3af11b9e8bf182f618b', 'e08cb190ef230d5d4f03824198773950', null);
+INSERT INTO `sys_role_permission` VALUES ('eaef4486f1c9b0408580bbfa2037eb66', 'f6817f48af4fb3af11b9e8bf182f618b', '2a470fc0c3954d9dbb61de6d80846549', null);
+INSERT INTO `sys_role_permission` VALUES ('ec4bc97829ab56afd83f428b6dc37ff6', 'f6817f48af4fb3af11b9e8bf182f618b', '200006f0edf145a2b50eacca07585451', null);
+INSERT INTO `sys_role_permission` VALUES ('ec846a3f85fdb6813e515be71f11b331', 'f6817f48af4fb3af11b9e8bf182f618b', '732d48f8e0abe99fe6a23d18a3171cd1', null);
+INSERT INTO `sys_role_permission` VALUES ('ec93bb06f5be4c1f19522ca78180e2ef', 'f6817f48af4fb3af11b9e8bf182f618b', '265de841c58907954b8877fb85212622', null);
+INSERT INTO `sys_role_permission` VALUES ('ecdd72fe694e6bba9c1d9fc925ee79de', 'f6817f48af4fb3af11b9e8bf182f618b', '45c966826eeff4c99b8f8ebfe74511fc', null);
+INSERT INTO `sys_role_permission` VALUES ('edefd8d468f5727db465cf1b860af474', 'f6817f48af4fb3af11b9e8bf182f618b', '6ad53fd1b220989a8b71ff482d683a5a', null);
+INSERT INTO `sys_role_permission` VALUES ('ef8bdd20d29447681ec91d3603e80c7b', 'f6817f48af4fb3af11b9e8bf182f618b', 'ae4fed059f67086fd52a73d913cf473d', null);
INSERT INTO `sys_role_permission` VALUES ('f12b6c90e8913183d7ca547c66600891', 'e51758fa916c881624b046d26bd09230', 'aedbf679b5773c1f25e9f7b10111da73', null);
+INSERT INTO `sys_role_permission` VALUES ('f177acac0276329dc66af0c9ad30558a', 'f6817f48af4fb3af11b9e8bf182f618b', 'c2c356bf4ddd29975347a7047a062440', null);
INSERT INTO `sys_role_permission` VALUES ('f17ab8ad1e71341140857ef4914ef297', '21c5a3187763729408b40afb0d0fdfa8', '732d48f8e0abe99fe6a23d18a3171cd1', null);
-INSERT INTO `sys_role_permission` VALUES ('f1e64337a340851c05ce380a4cd8c827', 'f6817f48af4fb3af11b9e8bf182f618b', 'fb367426764077dcf94640c843733985', null);
-INSERT INTO `sys_role_permission` VALUES ('f4587c9881865a9d25cc3bfc523da70c', 'f6817f48af4fb3af11b9e8bf182f618b', 'b4dfc7d5dd9e8d5b6dd6d4579b1aa559', null);
-INSERT INTO `sys_role_permission` VALUES ('f55be9d4b4ff6ddcbd917cf4feb22ab6', 'f6817f48af4fb3af11b9e8bf182f618b', '027aee69baee98a0ed2e01806e89c891', null);
-INSERT INTO `sys_role_permission` VALUES ('f641ae7d1a22add2697259d16dd0a93b', 'f6817f48af4fb3af11b9e8bf182f618b', 'c89018ea6286e852b424466fd92a2ffc', null);
-INSERT INTO `sys_role_permission` VALUES ('f8f3fb503568a404dad05fd3e67e62a2', 'f6817f48af4fb3af11b9e8bf182f618b', '08e6b9dc3c04489c8e1ff2ce6f105aa4', null);
-INSERT INTO `sys_role_permission` VALUES ('fa242a4d2fcf1582bd4bb72d6ed71cd7', 'f6817f48af4fb3af11b9e8bf182f618b', '277bfabef7d76e89b33062b16a9a5020', null);
-INSERT INTO `sys_role_permission` VALUES ('fcd15dba62849353702fd0499fb2660f', 'f6817f48af4fb3af11b9e8bf182f618b', '2dbbafa22cda07fa5d169d741b81fe12', null);
+INSERT INTO `sys_role_permission` VALUES ('f99f99cc3bc27220cdd4f5aced33b7d7', 'f6817f48af4fb3af11b9e8bf182f618b', '655563cd64b75dcf52ef7bcdd4836953', null);
+INSERT INTO `sys_role_permission` VALUES ('fafe73c4448b977fe42880a6750c3ee8', 'f6817f48af4fb3af11b9e8bf182f618b', '9cb91b8851db0cf7b19d7ecc2a8193dd', null);
+INSERT INTO `sys_role_permission` VALUES ('fced905c7598973b970d42d833f73474', 'f6817f48af4fb3af11b9e8bf182f618b', '4875ebe289344e14844d8e3ea1edd73f', null);
INSERT INTO `sys_role_permission` VALUES ('fd86f6b08eb683720ba499f9d9421726', 'ee8626f80f7c2619917b6236f3a7f02b', '693ce69af3432bd00be13c3971a57961', null);
INSERT INTO `sys_role_permission` VALUES ('fed41a4671285efb266cd404f24dd378', '52b0cf022ac4187b2a70dfa4f8b2d940', '00a2a0ae65cdca5e93209cdbde97cbe6', null);
-- ----------------------------
--- Table structure for sys_sms
--- ----------------------------
-DROP TABLE IF EXISTS `sys_sms`;
-CREATE TABLE `sys_sms` (
- `id` varchar(32) NOT NULL COMMENT 'ID',
- `es_title` varchar(100) default NULL COMMENT '消息标题',
- `es_type` varchar(1) default NULL COMMENT '发送方式：1短信 2邮件 3微信',
- `es_receiver` varchar(50) default NULL COMMENT '接收人',
- `es_param` varchar(1000) default NULL COMMENT '发送所需参数Json格式',
- `es_content` longtext COMMENT '推送内容',
- `es_send_time` datetime default NULL COMMENT '推送时间',
- `es_send_status` varchar(1) default NULL COMMENT '推送状态 0未推送 1推送成功 2推送失败 -1失败不再发送',
- `es_send_num` int(11) default NULL COMMENT '发送次数 超过5次不再发送',
- `es_result` varchar(255) default NULL COMMENT '推送失败原因',
- `remark` varchar(500) default NULL COMMENT '备注',
- `create_by` varchar(32) default NULL COMMENT '创建人登录名称',
- `create_time` datetime default NULL COMMENT '创建日期',
- `update_by` varchar(32) default NULL COMMENT '更新人登录名称',
- `update_time` datetime default NULL COMMENT '更新日期',
- PRIMARY KEY (`id`),
- KEY `index_type` USING BTREE (`es_type`),
- KEY `index_receiver` USING BTREE (`es_receiver`),
- KEY `index_sendtime` USING BTREE (`es_send_time`),
- KEY `index_status` USING BTREE (`es_send_status`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- ----------------------------
-- Records of sys_sms
-- ----------------------------
INSERT INTO `sys_sms` VALUES ('402880e74dc2f361014dc2f8411e0001', '消息推送测试333', '2', '411944058@qq.com', null, '张三你好，你的订单4028d881436d514601436d521ae80165已付款!', '2015-06-05 17:06:01', '3', null, null, '认证失败错误的用户名或者密码', 'admin', '2015-06-05 17:05:59', 'admin', '2015-11-19 22:30:39');
@@ -2271,80 +2371,19 @@ INSERT INTO `sys_sms` VALUES ('402880f05ab649b4015ab64b9cd80012', '消息推送�
INSERT INTO `sys_sms` VALUES ('402880f05ab7b035015ab7c4462c0004', '消息推送测试333', '2', '411944058@qq.com', null, '张三你好，你的订单4028d881436d514601436d521ae80165已付款!', '2017-11-16 15:58:15', '3', null, null, null, 'admin', '2017-03-10 18:29:37', null, null);
INSERT INTO `sys_sms` VALUES ('402881f3646a472b01646a4a5af00001', '催办：HR审批', '3', 'admin', null, 'admin，您好！\r\n请前待办任务办理事项！HR审批\r\n\r\n\r\n===========================\r\n此消息由系统发出', '2018-07-05 19:53:35', '2', null, null, null, 'admin', '2018-07-05 19:53:35', 'admin', '2018-07-07 13:45:24');
INSERT INTO `sys_sms` VALUES ('402881f3647da06c01647da43a940014', '催办：HR审批', '3', 'admin', null, 'admin，您好！\r\n请前待办任务办理事项！HR审批\r\n\r\n\r\n===========================\r\n此消息由系统发出', '2018-07-09 14:04:32', '2', null, null, null, 'admin', '2018-07-09 14:04:32', 'admin', '2018-07-09 18:51:30');
-INSERT INTO `sys_sms` VALUES ('c0f7f27f65a5678961306eb0364c05cd', '催办：HR审批', '2', '445654970@qq.com', '{\"taskName\":\"HR审批\",\"userName\":\"admin\"}', 'admin，您好！\r\n请前待办任务办理事项！HR审批\r\n\r\n\r\n===========================\r\n此消息由系统发出', '2019-04-12 20:51:28', '0', '0', null, null, 'admin', '2019-04-12 20:51:28', null, null);
-
--- ----------------------------
--- Table structure for sys_sms_template
--- ----------------------------
-DROP TABLE IF EXISTS `sys_sms_template`;
-CREATE TABLE `sys_sms_template` (
- `id` varchar(32) NOT NULL COMMENT '主键',
- `template_name` varchar(50) default NULL COMMENT '模板标题',
- `template_code` varchar(32) NOT NULL COMMENT '模板CODE',
- `template_type` varchar(1) NOT NULL COMMENT '模板类型：1短信 2邮件 3微信',
- `template_content` varchar(1000) NOT NULL COMMENT '模板内容',
- `template_test_json` varchar(1000) default NULL COMMENT '模板测试json',
- `create_time` datetime default NULL COMMENT '创建日期',
- `create_by` varchar(32) default NULL COMMENT '创建人登录名称',
- `update_time` datetime default NULL COMMENT '更新日期',
- `update_by` varchar(32) default NULL COMMENT '更新人登录名称',
- PRIMARY KEY (`id`),
- UNIQUE KEY `uniq_templatecode` USING BTREE (`template_code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- ----------------------------
-- Records of sys_sms_template
-- ----------------------------
-INSERT INTO `sys_sms_template` VALUES ('4028608164691b000164693108140003', '催办：${taskName}', 'SYS001', '2', '${userName}，您好！\r\n请前待办任务办理事项！${taskName}\r\n\r\n\r\n===========================\r\n此消息由系统发出', '{\r\n\"taskName\":\"HR审批\",\r\n\"userName\":\"admin\"\r\n}', '2018-07-05 14:46:18', 'admin', '2018-07-05 18:31:34', 'admin');
-
--- ----------------------------
--- Table structure for sys_user
--- ----------------------------
-DROP TABLE IF EXISTS `sys_user`;
-CREATE TABLE `sys_user` (
- `id` varchar(32) NOT NULL COMMENT '主键id',
- `username` varchar(100) default NULL COMMENT '登录账号',
- `realname` varchar(100) default NULL COMMENT '真实姓名',
- `password` varchar(255) default NULL COMMENT '密码',
- `salt` varchar(45) default NULL COMMENT 'md5密码盐',
- `avatar` varchar(255) default NULL COMMENT '头像',
- `birthday` datetime default NULL COMMENT '生日',
- `sex` int(11) default NULL COMMENT '性别（1：男 2：女）',
- `email` varchar(45) default NULL COMMENT '电子邮件',
- `phone` varchar(45) default NULL COMMENT '电话',
- `status` int(2) default NULL COMMENT '状态(1：正常 2：冻结 ）',
- `del_flag` varchar(1) default NULL COMMENT '删除状态（0，正常，1已删除）',
- `create_by` varchar(32) default NULL COMMENT '创建人',
- `create_time` datetime default NULL COMMENT '创建时间',
- `update_by` varchar(32) default NULL COMMENT '更新人',
- `update_time` datetime default NULL COMMENT '更新时间',
- PRIMARY KEY (`id`),
- UNIQUE KEY `index_user_name` USING BTREE (`username`),
- KEY `index_user_status` USING BTREE (`status`),
- KEY `index_user_del_flag` USING BTREE (`del_flag`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户表';
+INSERT INTO `sys_sms_template` VALUES ('4028608164691b000164693108140003', '催办：${taskName}', 'SYS001', '3', '${userName}，您好！\r\n请前待办任务办理事项！${taskName}\r\n\r\n\r\n===========================\r\n此消息由系统发出', '{\r\n\"taskName\":\"HR审批\",\r\n\"userName\":\"admin\"\r\n}', '2018-07-05 14:46:18', 'admin', '2018-07-05 18:31:34', 'admin');
-- ----------------------------
-- Records of sys_user
-- ----------------------------
-INSERT INTO `sys_user` VALUES ('42d153bffeea74f72a9c1697874fa4a7', 'test22', '23232', 'ac52e15671a377cf', '5FMD48RM', 'user/20190314/ly-plate-e_1552531617500.png', '2019-02-09 00:00:00', '1', 'zhangdaiscott@163.com', '18611782222', '1', '0', 'admin', '2019-01-26 18:01:10', 'admin', '2019-03-23 15:05:50');
-INSERT INTO `sys_user` VALUES ('a75d45a015c44384a04449ee80dc3503', 'jeecg', 'jeecg', '3dd8371f3cf8240e', 'vDDkDzrK', 'user/20190220/e1fe9925bc315c60addea1b98eb1cb1349547719_1550656892940.jpg', null, '2', null, null, '1', '0', 'admin', '2019-02-13 16:02:36', 'admin', '2019-04-09 15:47:36');
-INSERT INTO `sys_user` VALUES ('e9ca23d68d884d4ebb19d07889727dae', 'admin', '管理员', 'cb362cfeefbf3d8d', 'RCGTeGiH', 'user/20190119/logo-2_1547868176839.png', '2018-12-05 00:00:00', '1', '11@qq.com', '18566666666', '1', '0', null, '2018-12-21 17:54:10', 'admin', '2019-02-26 17:55:02');
-INSERT INTO `sys_user` VALUES ('f0019fdebedb443c98dcb17d88222c38', 'zhagnxiao', '张小红', 'f898134e5e52ae11a2ffb2c3b57a4e90', 'go3jJ4zX', 'user/20190401/20180607175028Fn1Lq7zw_1554118444672.png', '2019-04-01 00:00:00', null, null, null, '1', '0', 'admin', '2023-10-01 19:34:10', 'admin', '2019-04-10 22:00:22');
-
--- ----------------------------
--- Table structure for sys_user_depart
--- ----------------------------
-DROP TABLE IF EXISTS `sys_user_depart`;
-CREATE TABLE `sys_user_depart` (
- `ID` varchar(32) NOT NULL COMMENT 'id',
- `user_id` varchar(32) default NULL COMMENT '用户id',
- `dep_id` varchar(32) default NULL COMMENT '部门id',
- PRIMARY KEY (`ID`),
- KEY `index_depart_groupk_userid` USING BTREE (`user_id`),
- KEY `index_depart_groupkorgid` USING BTREE (`dep_id`),
- KEY `index_depart_groupk_uidanddid` USING BTREE (`user_id`,`dep_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+INSERT INTO `sys_user` VALUES ('42d153bffeea74f72a9c1697874fa4a7', 'test22', '23232', 'ac52e15671a377cf', '5FMD48RM', 'user/20190314/ly-plate-e_1552531617500.png', '2019-02-09 00:00:00', '1', 'zhangdaiscott@163.com', '18611782222', null, '1', '0', '1', 'admin', '2019-01-26 18:01:10', 'admin', '2019-03-23 15:05:50');
+INSERT INTO `sys_user` VALUES ('a75d45a015c44384a04449ee80dc3503', 'jeecg', 'jeecg', '3dd8371f3cf8240e', 'vDDkDzrK', 'user/20190220/e1fe9925bc315c60addea1b98eb1cb1349547719_1550656892940.jpg', null, '2', null, null, null, '1', '0', '1', 'admin', '2019-02-13 16:02:36', 'admin', '2019-04-09 15:47:36');
+INSERT INTO `sys_user` VALUES ('e9ca23d68d884d4ebb19d07889727dae', 'admin', '管理员', 'cb362cfeefbf3d8d', 'RCGTeGiH', 'user/20190119/logo-2_1547868176839.png', '2018-12-05 00:00:00', '1', '11@qq.com', '18566666666', 'A01', '1', '0', '1', null, '2018-12-21 17:54:10', 'admin', '2019-02-26 17:55:02');
+INSERT INTO `sys_user` VALUES ('f0019fdebedb443c98dcb17d88222c38', 'zhagnxiao', '张小红', 'f898134e5e52ae11a2ffb2c3b57a4e90', 'go3jJ4zX', 'user/20190401/20180607175028Fn1Lq7zw_1554118444672.png', '2019-04-01 00:00:00', null, null, null, null, '1', '0', '1', 'admin', '2023-10-01 19:34:10', 'admin', '2019-04-10 22:00:22');
-- ----------------------------
-- Records of sys_user_depart
@@ -2358,20 +2397,6 @@ INSERT INTO `sys_user_depart` VALUES ('ac52f23ae625eb6560c9227170b88166', 'f0019
INSERT INTO `sys_user_depart` VALUES ('179660a8b9a122f66b73603799a10924', 'f0019fdebedb443c98dcb17d88222c38', '67fc001af12a4f9b8458005d3f19934a');
-- ----------------------------
--- Table structure for sys_user_role
--- ----------------------------
-DROP TABLE IF EXISTS `sys_user_role`;
-CREATE TABLE `sys_user_role` (
- `id` varchar(32) NOT NULL COMMENT '主键id',
- `user_id` varchar(32) default NULL COMMENT '用户id',
- `role_id` varchar(32) default NULL COMMENT '角色id',
- PRIMARY KEY (`id`),
- KEY `index2_groupuu_user_id` USING BTREE (`user_id`),
- KEY `index2_groupuu_ole_id` USING BTREE (`role_id`),
- KEY `index2_groupuu_useridandroleid` USING BTREE (`user_id`,`role_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户角色表';
-
--- ----------------------------
-- Records of sys_user_role
-- ----------------------------
INSERT INTO `sys_user_role` VALUES ('b3ffd9311a1ca296c44e2409b547384f', '01b802058ea94b978a2c96f4807f6b48', '1');
@@ -2391,5 +2416,7 @@ INSERT INTO `sys_user_role` VALUES ('fe38580871c5061ba59d5c03a0840b0e', 'a75d45a
INSERT INTO `sys_user_role` VALUES ('6ec01b4aaab790eac4ddb33d7a524a58', 'e9ca23d68d884d4ebb19d07889727dae', 'f6817f48af4fb3af11b9e8bf182f618b');
INSERT INTO `sys_user_role` VALUES ('d2233e5be091d39da5abb0073c766224', 'f0019fdebedb443c98dcb17d88222c38', 'ee8626f80f7c2619917b6236f3a7f02b');
-UPDATE `sys_permission` SET `component`='/jeecg/PrintDemo' WHERE (`id`='e6bfd1fcabfd7942fdd05f076d1dad38');
-delete from sys_permission where id = '700b7f95165c46cc7a78bf227aa8fed3'
\ No newline at end of file
+-- ----------------------------
+-- Records of test_person
+-- ----------------------------
+INSERT INTO `test_person` VALUES ('8ca668defdae47df8649a5477ae08b05', 'admin', '2019-04-12 09:51:37', null, null, '1', 'zhangdaiscott', 'dsdsd', '2019-04-12 00:00:00', '2');
diff --git a/jeecg-boot/db/jeecg-boot-oracle_11g.sql b/jeecg-boot/db/jeecg-boot-oracle_11g.sql
new file mode 100644
index 0000000..5e44d3e
--- /dev/null
+++ b/jeecg-boot/db/jeecg-boot-oracle_11g.sql
@@ -0,0 +1,3741 @@
+/*
+Navicat Oracle Data Transfer
+Oracle Client Version : 12.2.0.1.0
+
+Source Server : 192.168.1.200(jeecgboot)
+Source Server Version : 110200
+Source Host : 192.168.1.200:1521
+Source Schema : JEECGBOOT
+
+Target Server Type : ORACLE
+Target Server Version : 110200
+File Encoding : 65001
+
+Date: 2019-05-18 12:06:58
+*/
+
+
+-- ----------------------------
+-- Table structure for DEMO
+-- ----------------------------
+DROP TABLE "DEMO";
+CREATE TABLE "DEMO" (
+"ID" NVARCHAR2(50) NOT NULL ,
+"NAME" NVARCHAR2(30) NULL ,
+"KEY_WORD" NVARCHAR2(255) NULL ,
+"PUNCH_TIME" DATE NULL ,
+"SALARY_MONEY" NUMBER NULL ,
+"BONUS_MONEY" NUMBER NULL ,
+"SEX" NVARCHAR2(2) NULL ,
+"AGE" NUMBER(11) NULL ,
+"BIRTHDAY" DATE NULL ,
+"EMAIL" NVARCHAR2(50) NULL ,
+"CONTENT" NVARCHAR2(1000) NULL ,
+"CREATE_BY" NVARCHAR2(32) NULL ,
+"CREATE_TIME" DATE NULL ,
+"UPDATE_BY" NVARCHAR2(32) NULL ,
+"UPDATE_TIME" DATE NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON COLUMN "DEMO"."ID" IS '主键ID';
+COMMENT ON COLUMN "DEMO"."NAME" IS '姓名';
+COMMENT ON COLUMN "DEMO"."KEY_WORD" IS '关键词';
+COMMENT ON COLUMN "DEMO"."PUNCH_TIME" IS '打卡时间';
+COMMENT ON COLUMN "DEMO"."SALARY_MONEY" IS '工资';
+COMMENT ON COLUMN "DEMO"."BONUS_MONEY" IS '奖金';
+COMMENT ON COLUMN "DEMO"."SEX" IS '性别 {男:1,女:2}';
+COMMENT ON COLUMN "DEMO"."AGE" IS '年龄';
+COMMENT ON COLUMN "DEMO"."BIRTHDAY" IS '生日';
+COMMENT ON COLUMN "DEMO"."EMAIL" IS '邮箱';
+COMMENT ON COLUMN "DEMO"."CONTENT" IS '个人简介';
+COMMENT ON COLUMN "DEMO"."CREATE_BY" IS '创建人';
+COMMENT ON COLUMN "DEMO"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "DEMO"."UPDATE_BY" IS '修改人';
+COMMENT ON COLUMN "DEMO"."UPDATE_TIME" IS '修改时间';
+
+-- ----------------------------
+-- Table structure for JEECG_MONTHLY_GROWTH_ANALYSIS
+-- ----------------------------
+DROP TABLE "JEECG_MONTHLY_GROWTH_ANALYSIS";
+CREATE TABLE "JEECG_MONTHLY_GROWTH_ANALYSIS" (
+"ID" NUMBER(11) NOT NULL ,
+"YEAR" NVARCHAR2(50) NULL ,
+"MONTH" NVARCHAR2(50) NULL ,
+"MAIN_INCOME" NUMBER NULL ,
+"OTHER_INCOME" NUMBER NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON COLUMN "JEECG_MONTHLY_GROWTH_ANALYSIS"."MONTH" IS '月份';
+COMMENT ON COLUMN "JEECG_MONTHLY_GROWTH_ANALYSIS"."MAIN_INCOME" IS '佣金/主营收入';
+COMMENT ON COLUMN "JEECG_MONTHLY_GROWTH_ANALYSIS"."OTHER_INCOME" IS '其他收入';
+
+-- ----------------------------
+-- Table structure for JEECG_ORDER_CUSTOMER
+-- ----------------------------
+DROP TABLE "JEECG_ORDER_CUSTOMER";
+CREATE TABLE "JEECG_ORDER_CUSTOMER" (
+"ID" NVARCHAR2(32) NOT NULL ,
+"NAME" NVARCHAR2(100) NOT NULL ,
+"SEX" NVARCHAR2(4) NULL ,
+"IDCARD" NVARCHAR2(18) NULL ,
+"IDCARD_PIC" NVARCHAR2(500) NULL ,
+"TELPHONE" NVARCHAR2(32) NULL ,
+"ORDER_ID" NVARCHAR2(32) NOT NULL ,
+"CREATE_BY" NVARCHAR2(32) NULL ,
+"CREATE_TIME" DATE NULL ,
+"UPDATE_BY" NVARCHAR2(32) NULL ,
+"UPDATE_TIME" DATE NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON COLUMN "JEECG_ORDER_CUSTOMER"."ID" IS '主键';
+COMMENT ON COLUMN "JEECG_ORDER_CUSTOMER"."NAME" IS '客户名';
+COMMENT ON COLUMN "JEECG_ORDER_CUSTOMER"."SEX" IS '性别';
+COMMENT ON COLUMN "JEECG_ORDER_CUSTOMER"."IDCARD" IS '身份证号码';
+COMMENT ON COLUMN "JEECG_ORDER_CUSTOMER"."IDCARD_PIC" IS '身份证扫描件';
+COMMENT ON COLUMN "JEECG_ORDER_CUSTOMER"."TELPHONE" IS '电话1';
+COMMENT ON COLUMN "JEECG_ORDER_CUSTOMER"."ORDER_ID" IS '外键';
+COMMENT ON COLUMN "JEECG_ORDER_CUSTOMER"."CREATE_BY" IS '创建人';
+COMMENT ON COLUMN "JEECG_ORDER_CUSTOMER"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "JEECG_ORDER_CUSTOMER"."UPDATE_BY" IS '修改人';
+COMMENT ON COLUMN "JEECG_ORDER_CUSTOMER"."UPDATE_TIME" IS '修改时间';
+
+-- ----------------------------
+-- Table structure for JEECG_ORDER_MAIN
+-- ----------------------------
+DROP TABLE "JEECG_ORDER_MAIN";
+CREATE TABLE "JEECG_ORDER_MAIN" (
+"ID" NVARCHAR2(32) NOT NULL ,
+"ORDER_CODE" NVARCHAR2(50) NULL ,
+"CTYPE" NVARCHAR2(500) NULL ,
+"ORDER_DATE" DATE NULL ,
+"ORDER_MONEY" NUMBER NULL ,
+"CONTENT" NVARCHAR2(500) NULL ,
+"CREATE_BY" NVARCHAR2(32) NULL ,
+"CREATE_TIME" DATE NULL ,
+"UPDATE_BY" NVARCHAR2(32) NULL ,
+"UPDATE_TIME" DATE NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON COLUMN "JEECG_ORDER_MAIN"."ID" IS '主键';
+COMMENT ON COLUMN "JEECG_ORDER_MAIN"."ORDER_CODE" IS '订单号';
+COMMENT ON COLUMN "JEECG_ORDER_MAIN"."CTYPE" IS '订单类型';
+COMMENT ON COLUMN "JEECG_ORDER_MAIN"."ORDER_DATE" IS '订单日期';
+COMMENT ON COLUMN "JEECG_ORDER_MAIN"."ORDER_MONEY" IS '订单金额';
+COMMENT ON COLUMN "JEECG_ORDER_MAIN"."CONTENT" IS '订单备注';
+COMMENT ON COLUMN "JEECG_ORDER_MAIN"."CREATE_BY" IS '创建人';
+COMMENT ON COLUMN "JEECG_ORDER_MAIN"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "JEECG_ORDER_MAIN"."UPDATE_BY" IS '修改人';
+COMMENT ON COLUMN "JEECG_ORDER_MAIN"."UPDATE_TIME" IS '修改时间';
+
+-- ----------------------------
+-- Table structure for JEECG_ORDER_TICKET
+-- ----------------------------
+DROP TABLE "JEECG_ORDER_TICKET";
+CREATE TABLE "JEECG_ORDER_TICKET" (
+"ID" NVARCHAR2(32) NOT NULL ,
+"TICKET_CODE" NVARCHAR2(100) NOT NULL ,
+"TICKECT_DATE" DATE NULL ,
+"ORDER_ID" NVARCHAR2(32) NOT NULL ,
+"CREATE_BY" NVARCHAR2(32) NULL ,
+"CREATE_TIME" DATE NULL ,
+"UPDATE_BY" NVARCHAR2(32) NULL ,
+"UPDATE_TIME" DATE NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON COLUMN "JEECG_ORDER_TICKET"."ID" IS '主键';
+COMMENT ON COLUMN "JEECG_ORDER_TICKET"."TICKET_CODE" IS '航班号';
+COMMENT ON COLUMN "JEECG_ORDER_TICKET"."TICKECT_DATE" IS '航班时间';
+COMMENT ON COLUMN "JEECG_ORDER_TICKET"."ORDER_ID" IS '外键';
+COMMENT ON COLUMN "JEECG_ORDER_TICKET"."CREATE_BY" IS '创建人';
+COMMENT ON COLUMN "JEECG_ORDER_TICKET"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "JEECG_ORDER_TICKET"."UPDATE_BY" IS '修改人';
+COMMENT ON COLUMN "JEECG_ORDER_TICKET"."UPDATE_TIME" IS '修改时间';
+
+-- ----------------------------
+-- Table structure for JEECG_PROJECT_NATURE_INCOME
+-- ----------------------------
+DROP TABLE "JEECG_PROJECT_NATURE_INCOME";
+CREATE TABLE "JEECG_PROJECT_NATURE_INCOME" (
+"ID" NUMBER(11) NOT NULL ,
+"NATURE" NVARCHAR2(50) NOT NULL ,
+"INSURANCE_FEE" NUMBER NULL ,
+"RISK_CONSULTING_FEE" NUMBER NULL ,
+"EVALUATION_FEE" NUMBER NULL ,
+"INSURANCE_EVALUATION_FEE" NUMBER NULL ,
+"BIDDING_CONSULTING_FEE" NUMBER NULL ,
+"INTEROL_CONSULTING_FEE" NUMBER NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON COLUMN "JEECG_PROJECT_NATURE_INCOME"."NATURE" IS '项目性质';
+COMMENT ON COLUMN "JEECG_PROJECT_NATURE_INCOME"."INSURANCE_FEE" IS '保险经纪佣金费';
+COMMENT ON COLUMN "JEECG_PROJECT_NATURE_INCOME"."RISK_CONSULTING_FEE" IS '风险咨询费';
+COMMENT ON COLUMN "JEECG_PROJECT_NATURE_INCOME"."EVALUATION_FEE" IS '承保公估评估费';
+COMMENT ON COLUMN "JEECG_PROJECT_NATURE_INCOME"."INSURANCE_EVALUATION_FEE" IS '保险公估费';
+COMMENT ON COLUMN "JEECG_PROJECT_NATURE_INCOME"."BIDDING_CONSULTING_FEE" IS '投标咨询费';
+COMMENT ON COLUMN "JEECG_PROJECT_NATURE_INCOME"."INTEROL_CONSULTING_FEE" IS '内控咨询费';
+
+-- ----------------------------
+-- Table structure for JOA_DEMO
+-- ----------------------------
+DROP TABLE "JOA_DEMO";
+CREATE TABLE "JOA_DEMO" (
+"ID" NVARCHAR2(32) NULL ,
+"NAME" NVARCHAR2(100) NULL ,
+"DAYS" NUMBER(11) NULL ,
+"BEGIN_DATE" DATE NULL ,
+"END_DATE" DATE NULL ,
+"REASON" NVARCHAR2(500) NULL ,
+"BPM_STATUS" NVARCHAR2(50) NULL ,
+"CREATE_BY" NVARCHAR2(32) NULL ,
+"CREATE_TIME" DATE NULL ,
+"UPDATE_TIME" DATE NULL ,
+"UPDATE_BY" NVARCHAR2(32) NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON TABLE "JOA_DEMO" IS '流程测试';
+COMMENT ON COLUMN "JOA_DEMO"."ID" IS 'ID';
+COMMENT ON COLUMN "JOA_DEMO"."NAME" IS '请假人';
+COMMENT ON COLUMN "JOA_DEMO"."DAYS" IS '请假天数';
+COMMENT ON COLUMN "JOA_DEMO"."BEGIN_DATE" IS '开始时间';
+COMMENT ON COLUMN "JOA_DEMO"."END_DATE" IS '请假结束时间';
+COMMENT ON COLUMN "JOA_DEMO"."REASON" IS '请假原因';
+COMMENT ON COLUMN "JOA_DEMO"."BPM_STATUS" IS '流程状态';
+COMMENT ON COLUMN "JOA_DEMO"."CREATE_BY" IS '创建人id';
+COMMENT ON COLUMN "JOA_DEMO"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "JOA_DEMO"."UPDATE_TIME" IS '修改时间';
+COMMENT ON COLUMN "JOA_DEMO"."UPDATE_BY" IS '修改人id';
+
+-- ----------------------------
+-- Table structure for QRTZ_BLOB_TRIGGERS
+-- ----------------------------
+DROP TABLE "QRTZ_BLOB_TRIGGERS";
+CREATE TABLE "QRTZ_BLOB_TRIGGERS" (
+"SCHED_NAME" VARCHAR2(120 BYTE) NOT NULL ,
+"TRIGGER_NAME" VARCHAR2(200 BYTE) NOT NULL ,
+"TRIGGER_GROUP" VARCHAR2(200 BYTE) NOT NULL ,
+"BLOB_DATA" BLOB NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+
+-- ----------------------------
+-- Table structure for QRTZ_CALENDARS
+-- ----------------------------
+DROP TABLE "QRTZ_CALENDARS";
+CREATE TABLE "QRTZ_CALENDARS" (
+"SCHED_NAME" VARCHAR2(120 BYTE) NOT NULL ,
+"CALENDAR_NAME" VARCHAR2(200 BYTE) NOT NULL ,
+"CALENDAR" BLOB NOT NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+
+-- ----------------------------
+-- Table structure for QRTZ_CRON_TRIGGERS
+-- ----------------------------
+DROP TABLE "QRTZ_CRON_TRIGGERS";
+CREATE TABLE "QRTZ_CRON_TRIGGERS" (
+"SCHED_NAME" VARCHAR2(120 BYTE) NOT NULL ,
+"TRIGGER_NAME" VARCHAR2(200 BYTE) NOT NULL ,
+"TRIGGER_GROUP" VARCHAR2(200 BYTE) NOT NULL ,
+"CRON_EXPRESSION" VARCHAR2(120 BYTE) NOT NULL ,
+"TIME_ZONE_ID" VARCHAR2(80 BYTE) NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+
+-- ----------------------------
+-- Table structure for QRTZ_FIRED_TRIGGERS
+-- ----------------------------
+DROP TABLE "QRTZ_FIRED_TRIGGERS";
+CREATE TABLE "QRTZ_FIRED_TRIGGERS" (
+"SCHED_NAME" VARCHAR2(120 BYTE) NOT NULL ,
+"ENTRY_ID" VARCHAR2(95 BYTE) NOT NULL ,
+"TRIGGER_NAME" VARCHAR2(200 BYTE) NOT NULL ,
+"TRIGGER_GROUP" VARCHAR2(200 BYTE) NOT NULL ,
+"INSTANCE_NAME" VARCHAR2(200 BYTE) NOT NULL ,
+"FIRED_TIME" NUMBER(13) NOT NULL ,
+"SCHED_TIME" NUMBER(13) NOT NULL ,
+"PRIORITY" NUMBER(13) NOT NULL ,
+"STATE" VARCHAR2(16 BYTE) NOT NULL ,
+"JOB_NAME" VARCHAR2(200 BYTE) NULL ,
+"JOB_GROUP" VARCHAR2(200 BYTE) NULL ,
+"IS_NONCONCURRENT" VARCHAR2(1 BYTE) NULL ,
+"REQUESTS_RECOVERY" VARCHAR2(1 BYTE) NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+
+-- ----------------------------
+-- Table structure for QRTZ_JOB_DETAILS
+-- ----------------------------
+DROP TABLE "QRTZ_JOB_DETAILS";
+CREATE TABLE "QRTZ_JOB_DETAILS" (
+"SCHED_NAME" VARCHAR2(120 BYTE) NOT NULL ,
+"JOB_NAME" VARCHAR2(200 BYTE) NOT NULL ,
+"JOB_GROUP" VARCHAR2(200 BYTE) NOT NULL ,
+"DESCRIPTION" VARCHAR2(250 BYTE) NULL ,
+"JOB_CLASS_NAME" VARCHAR2(250 BYTE) NOT NULL ,
+"IS_DURABLE" VARCHAR2(1 BYTE) NOT NULL ,
+"IS_NONCONCURRENT" VARCHAR2(1 BYTE) NOT NULL ,
+"IS_UPDATE_DATA" VARCHAR2(1 BYTE) NOT NULL ,
+"REQUESTS_RECOVERY" VARCHAR2(1 BYTE) NOT NULL ,
+"JOB_DATA" BLOB NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+
+-- ----------------------------
+-- Table structure for QRTZ_LOCKS
+-- ----------------------------
+DROP TABLE "QRTZ_LOCKS";
+CREATE TABLE "QRTZ_LOCKS" (
+"SCHED_NAME" VARCHAR2(120 BYTE) NOT NULL ,
+"LOCK_NAME" VARCHAR2(40 BYTE) NOT NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+
+-- ----------------------------
+-- Table structure for QRTZ_PAUSED_TRIGGER_GRPS
+-- ----------------------------
+DROP TABLE "QRTZ_PAUSED_TRIGGER_GRPS";
+CREATE TABLE "QRTZ_PAUSED_TRIGGER_GRPS" (
+"SCHED_NAME" VARCHAR2(120 BYTE) NOT NULL ,
+"TRIGGER_GROUP" VARCHAR2(200 BYTE) NOT NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+
+-- ----------------------------
+-- Table structure for QRTZ_SCHEDULER_STATE
+-- ----------------------------
+DROP TABLE "QRTZ_SCHEDULER_STATE";
+CREATE TABLE "QRTZ_SCHEDULER_STATE" (
+"SCHED_NAME" VARCHAR2(120 BYTE) NOT NULL ,
+"INSTANCE_NAME" VARCHAR2(200 BYTE) NOT NULL ,
+"LAST_CHECKIN_TIME" NUMBER(13) NOT NULL ,
+"CHECKIN_INTERVAL" NUMBER(13) NOT NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+
+-- ----------------------------
+-- Table structure for QRTZ_SIMPLE_TRIGGERS
+-- ----------------------------
+DROP TABLE "QRTZ_SIMPLE_TRIGGERS";
+CREATE TABLE "QRTZ_SIMPLE_TRIGGERS" (
+"SCHED_NAME" VARCHAR2(120 BYTE) NOT NULL ,
+"TRIGGER_NAME" VARCHAR2(200 BYTE) NOT NULL ,
+"TRIGGER_GROUP" VARCHAR2(200 BYTE) NOT NULL ,
+"REPEAT_COUNT" NUMBER(7) NOT NULL ,
+"REPEAT_INTERVAL" NUMBER(12) NOT NULL ,
+"TIMES_TRIGGERED" NUMBER(10) NOT NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+
+-- ----------------------------
+-- Table structure for QRTZ_SIMPROP_TRIGGERS
+-- ----------------------------
+DROP TABLE "QRTZ_SIMPROP_TRIGGERS";
+CREATE TABLE "QRTZ_SIMPROP_TRIGGERS" (
+"SCHED_NAME" VARCHAR2(120 BYTE) NOT NULL ,
+"TRIGGER_NAME" VARCHAR2(200 BYTE) NOT NULL ,
+"TRIGGER_GROUP" VARCHAR2(200 BYTE) NOT NULL ,
+"STR_PROP_1" VARCHAR2(512 BYTE) NULL ,
+"STR_PROP_2" VARCHAR2(512 BYTE) NULL ,
+"STR_PROP_3" VARCHAR2(512 BYTE) NULL ,
+"INT_PROP_1" NUMBER(10) NULL ,
+"INT_PROP_2" NUMBER(10) NULL ,
+"LONG_PROP_1" NUMBER(13) NULL ,
+"LONG_PROP_2" NUMBER(13) NULL ,
+"DEC_PROP_1" NUMBER(13,4) NULL ,
+"DEC_PROP_2" NUMBER(13,4) NULL ,
+"BOOL_PROP_1" VARCHAR2(1 BYTE) NULL ,
+"BOOL_PROP_2" VARCHAR2(1 BYTE) NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+
+-- ----------------------------
+-- Table structure for QRTZ_TRIGGERS
+-- ----------------------------
+DROP TABLE "QRTZ_TRIGGERS";
+CREATE TABLE "QRTZ_TRIGGERS" (
+"SCHED_NAME" VARCHAR2(120 BYTE) NOT NULL ,
+"TRIGGER_NAME" VARCHAR2(200 BYTE) NOT NULL ,
+"TRIGGER_GROUP" VARCHAR2(200 BYTE) NOT NULL ,
+"JOB_NAME" VARCHAR2(200 BYTE) NOT NULL ,
+"JOB_GROUP" VARCHAR2(200 BYTE) NOT NULL ,
+"DESCRIPTION" VARCHAR2(250 BYTE) NULL ,
+"NEXT_FIRE_TIME" NUMBER(13) NULL ,
+"PREV_FIRE_TIME" NUMBER(13) NULL ,
+"PRIORITY" NUMBER(13) NULL ,
+"TRIGGER_STATE" VARCHAR2(16 BYTE) NOT NULL ,
+"TRIGGER_TYPE" VARCHAR2(8 BYTE) NOT NULL ,
+"START_TIME" NUMBER(13) NOT NULL ,
+"END_TIME" NUMBER(13) NULL ,
+"CALENDAR_NAME" VARCHAR2(200 BYTE) NULL ,
+"MISFIRE_INSTR" NUMBER(2) NULL ,
+"JOB_DATA" BLOB NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+
+-- ----------------------------
+-- Table structure for SYS_ANNOUNCEMENT
+-- ----------------------------
+DROP TABLE "SYS_ANNOUNCEMENT";
+CREATE TABLE "SYS_ANNOUNCEMENT" (
+"ID" NVARCHAR2(32) NOT NULL ,
+"TITILE" NVARCHAR2(100) NULL ,
+"MSG_CONTENT" NCLOB NULL ,
+"START_TIME" DATE NULL ,
+"END_TIME" DATE NULL ,
+"SENDER" NVARCHAR2(100) NULL ,
+"PRIORITY" NVARCHAR2(255) NULL ,
+"MSG_CATEGORY" NVARCHAR2(10) NOT NULL ,
+"MSG_TYPE" NVARCHAR2(10) NULL ,
+"SEND_STATUS" NVARCHAR2(10) NULL ,
+"SEND_TIME" DATE NULL ,
+"CANCEL_TIME" DATE NULL ,
+"DEL_FLAG" NVARCHAR2(1) NULL ,
+"CREATE_BY" NVARCHAR2(32) NULL ,
+"CREATE_TIME" DATE NULL ,
+"UPDATE_BY" NVARCHAR2(32) NULL ,
+"UPDATE_TIME" DATE NULL ,
+"USER_IDS" NCLOB NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON TABLE "SYS_ANNOUNCEMENT" IS '系统通告表';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT"."TITILE" IS '标题';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT"."MSG_CONTENT" IS '内容';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT"."START_TIME" IS '开始时间';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT"."END_TIME" IS '结束时间';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT"."SENDER" IS '发布人';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT"."PRIORITY" IS '优先级（L低，M中，H高）';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT"."MSG_CATEGORY" IS '消息类型1:通知公告2:系统消息';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT"."MSG_TYPE" IS '通告对象类型（USER:指定用户，ALL:全体用户）';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT"."SEND_STATUS" IS '发布状态（0未发布，1已发布，2已撤销）';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT"."SEND_TIME" IS '发布时间';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT"."CANCEL_TIME" IS '撤销时间';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT"."DEL_FLAG" IS '删除状态（0，正常，1已删除）';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT"."CREATE_BY" IS '创建人';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT"."UPDATE_BY" IS '更新人';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT"."UPDATE_TIME" IS '更新时间';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT"."USER_IDS" IS '指定用户';
+
+-- ----------------------------
+-- Table structure for SYS_ANNOUNCEMENT_SEND
+-- ----------------------------
+DROP TABLE "SYS_ANNOUNCEMENT_SEND";
+CREATE TABLE "SYS_ANNOUNCEMENT_SEND" (
+"ID" NVARCHAR2(32) NULL ,
+"ANNT_ID" NVARCHAR2(32) NULL ,
+"USER_ID" NVARCHAR2(32) NULL ,
+"READ_FLAG" NVARCHAR2(10) NULL ,
+"READ_TIME" DATE NULL ,
+"CREATE_BY" NVARCHAR2(32) NULL ,
+"CREATE_TIME" DATE NULL ,
+"UPDATE_BY" NVARCHAR2(32) NULL ,
+"UPDATE_TIME" DATE NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON TABLE "SYS_ANNOUNCEMENT_SEND" IS '用户通告阅读标记表';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT_SEND"."ANNT_ID" IS '通告ID';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT_SEND"."USER_ID" IS '用户id';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT_SEND"."READ_FLAG" IS '阅读状态（0未读，1已读）';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT_SEND"."READ_TIME" IS '阅读时间';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT_SEND"."CREATE_BY" IS '创建人';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT_SEND"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT_SEND"."UPDATE_BY" IS '更新人';
+COMMENT ON COLUMN "SYS_ANNOUNCEMENT_SEND"."UPDATE_TIME" IS '更新时间';
+
+-- ----------------------------
+-- Table structure for SYS_DATA_LOG
+-- ----------------------------
+DROP TABLE "SYS_DATA_LOG";
+CREATE TABLE "SYS_DATA_LOG" (
+"ID" NVARCHAR2(32) NOT NULL ,
+"CREATE_BY" NVARCHAR2(32) NULL ,
+"CREATE_TIME" DATE NULL ,
+"UPDATE_BY" NVARCHAR2(32) NULL ,
+"UPDATE_TIME" DATE NULL ,
+"DATA_TABLE" NVARCHAR2(32) NULL ,
+"DATA_ID" NVARCHAR2(32) NULL ,
+"DATA_CONTENT" NCLOB NULL ,
+"DATA_VERSION" NUMBER(11) NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON COLUMN "SYS_DATA_LOG"."ID" IS 'id';
+COMMENT ON COLUMN "SYS_DATA_LOG"."CREATE_BY" IS '创建人登录名称';
+COMMENT ON COLUMN "SYS_DATA_LOG"."CREATE_TIME" IS '创建日期';
+COMMENT ON COLUMN "SYS_DATA_LOG"."UPDATE_BY" IS '更新人登录名称';
+COMMENT ON COLUMN "SYS_DATA_LOG"."UPDATE_TIME" IS '更新日期';
+COMMENT ON COLUMN "SYS_DATA_LOG"."DATA_TABLE" IS '表名';
+COMMENT ON COLUMN "SYS_DATA_LOG"."DATA_ID" IS '数据ID';
+COMMENT ON COLUMN "SYS_DATA_LOG"."DATA_CONTENT" IS '数据内容';
+COMMENT ON COLUMN "SYS_DATA_LOG"."DATA_VERSION" IS '版本号';
+
+-- ----------------------------
+-- Table structure for SYS_DEPART
+-- ----------------------------
+DROP TABLE "SYS_DEPART";
+CREATE TABLE "SYS_DEPART" (
+"ID" NVARCHAR2(32) NOT NULL ,
+"PARENT_ID" NVARCHAR2(32) NULL ,
+"DEPART_NAME" NVARCHAR2(100) NOT NULL ,
+"DEPART_NAME_EN" NVARCHAR2(500) NULL ,
+"DEPART_NAME_ABBR" NVARCHAR2(500) NULL ,
+"DEPART_ORDER" NUMBER(11) NULL ,
+"DESCRIPTION" NCLOB NULL ,
+"ORG_TYPE" NVARCHAR2(10) NULL ,
+"ORG_CODE" NVARCHAR2(64) NOT NULL ,
+"MOBILE" NVARCHAR2(32) NULL ,
+"FAX" NVARCHAR2(32) NULL ,
+"ADDRESS" NVARCHAR2(100) NULL ,
+"MEMO" NVARCHAR2(500) NULL ,
+"STATUS" NVARCHAR2(1) NULL ,
+"DEL_FLAG" NVARCHAR2(1) NULL ,
+"CREATE_BY" NVARCHAR2(32) NULL ,
+"CREATE_TIME" DATE NULL ,
+"UPDATE_BY" NVARCHAR2(32) NULL ,
+"UPDATE_TIME" DATE NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON TABLE "SYS_DEPART" IS '组织机构表';
+COMMENT ON COLUMN "SYS_DEPART"."ID" IS 'ID';
+COMMENT ON COLUMN "SYS_DEPART"."PARENT_ID" IS '父机构ID';
+COMMENT ON COLUMN "SYS_DEPART"."DEPART_NAME" IS '机构/部门名称';
+COMMENT ON COLUMN "SYS_DEPART"."DEPART_NAME_EN" IS '英文名';
+COMMENT ON COLUMN "SYS_DEPART"."DEPART_NAME_ABBR" IS '缩写';
+COMMENT ON COLUMN "SYS_DEPART"."DEPART_ORDER" IS '排序';
+COMMENT ON COLUMN "SYS_DEPART"."DESCRIPTION" IS '描述';
+COMMENT ON COLUMN "SYS_DEPART"."ORG_TYPE" IS '机构类型 1一级部门 2子部门';
+COMMENT ON COLUMN "SYS_DEPART"."ORG_CODE" IS '机构编码';
+COMMENT ON COLUMN "SYS_DEPART"."MOBILE" IS '手机号';
+COMMENT ON COLUMN "SYS_DEPART"."FAX" IS '传真';
+COMMENT ON COLUMN "SYS_DEPART"."ADDRESS" IS '地址';
+COMMENT ON COLUMN "SYS_DEPART"."MEMO" IS '备注';
+COMMENT ON COLUMN "SYS_DEPART"."STATUS" IS '状态（1启用，0不启用）';
+COMMENT ON COLUMN "SYS_DEPART"."DEL_FLAG" IS '删除状态（0，正常，1已删除）';
+COMMENT ON COLUMN "SYS_DEPART"."CREATE_BY" IS '创建人';
+COMMENT ON COLUMN "SYS_DEPART"."CREATE_TIME" IS '创建日期';
+COMMENT ON COLUMN "SYS_DEPART"."UPDATE_BY" IS '更新人';
+COMMENT ON COLUMN "SYS_DEPART"."UPDATE_TIME" IS '更新日期';
+
+-- ----------------------------
+-- Table structure for SYS_DICT
+-- ----------------------------
+DROP TABLE "SYS_DICT";
+CREATE TABLE "SYS_DICT" (
+"ID" NVARCHAR2(32) NOT NULL ,
+"DICT_NAME" NVARCHAR2(100) NULL ,
+"DICT_CODE" NVARCHAR2(100) NULL ,
+"DESCRIPTION" NVARCHAR2(255) NULL ,
+"DEL_FLAG" NUMBER(11) NULL ,
+"CREATE_BY" NVARCHAR2(32) NULL ,
+"CREATE_TIME" DATE NULL ,
+"UPDATE_BY" NVARCHAR2(32) NULL ,
+"UPDATE_TIME" DATE NULL ,
+"TYPE" NUMBER(11) NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON COLUMN "SYS_DICT"."DICT_NAME" IS '字典名称';
+COMMENT ON COLUMN "SYS_DICT"."DICT_CODE" IS '字典编码';
+COMMENT ON COLUMN "SYS_DICT"."DESCRIPTION" IS '描述';
+COMMENT ON COLUMN "SYS_DICT"."DEL_FLAG" IS '删除状态';
+COMMENT ON COLUMN "SYS_DICT"."CREATE_BY" IS '创建人';
+COMMENT ON COLUMN "SYS_DICT"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "SYS_DICT"."UPDATE_BY" IS '更新人';
+COMMENT ON COLUMN "SYS_DICT"."UPDATE_TIME" IS '更新时间';
+COMMENT ON COLUMN "SYS_DICT"."TYPE" IS '字典类型0为string,1为number';
+
+-- ----------------------------
+-- Table structure for SYS_DICT_ITEM
+-- ----------------------------
+DROP TABLE "SYS_DICT_ITEM";
+CREATE TABLE "SYS_DICT_ITEM" (
+"ID" NVARCHAR2(32) NOT NULL ,
+"DICT_ID" NVARCHAR2(32) NULL ,
+"ITEM_TEXT" NVARCHAR2(100) NULL ,
+"ITEM_VALUE" NVARCHAR2(100) NULL ,
+"DESCRIPTION" NVARCHAR2(255) NULL ,
+"SORT_ORDER" NUMBER(11) NULL ,
+"STATUS" NUMBER(11) NULL ,
+"CREATE_BY" NVARCHAR2(32) NULL ,
+"CREATE_TIME" DATE NULL ,
+"UPDATE_BY" NVARCHAR2(32) NULL ,
+"UPDATE_TIME" DATE NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON COLUMN "SYS_DICT_ITEM"."DICT_ID" IS '字典id';
+COMMENT ON COLUMN "SYS_DICT_ITEM"."ITEM_TEXT" IS '字典项文本';
+COMMENT ON COLUMN "SYS_DICT_ITEM"."ITEM_VALUE" IS '字典项值';
+COMMENT ON COLUMN "SYS_DICT_ITEM"."DESCRIPTION" IS '描述';
+COMMENT ON COLUMN "SYS_DICT_ITEM"."SORT_ORDER" IS '排序';
+COMMENT ON COLUMN "SYS_DICT_ITEM"."STATUS" IS '状态（1启用 0不启用）';
+
+-- ----------------------------
+-- Table structure for SYS_LOG
+-- ----------------------------
+DROP TABLE "SYS_LOG";
+CREATE TABLE "SYS_LOG" (
+"ID" NVARCHAR2(32) NOT NULL ,
+"LOG_TYPE" NUMBER(11) NULL ,
+"LOG_CONTENT" NVARCHAR2(1000) NULL ,
+"OPERATE_TYPE" NUMBER(11) NULL ,
+"USERID" NVARCHAR2(32) NULL ,
+"USERNAME" NVARCHAR2(100) NULL ,
+"IP" NVARCHAR2(100) NULL ,
+"METHOD" NVARCHAR2(500) NULL ,
+"REQUEST_URL" NVARCHAR2(255) NULL ,
+"REQUEST_PARAM" NVARCHAR2(255) NULL ,
+"REQUEST_TYPE" NVARCHAR2(10) NULL ,
+"COST_TIME" NUMBER(20) NULL ,
+"CREATE_BY" NVARCHAR2(32) NULL ,
+"CREATE_TIME" DATE NULL ,
+"UPDATE_BY" NVARCHAR2(32) NULL ,
+"UPDATE_TIME" DATE NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON TABLE "SYS_LOG" IS '系统日志表';
+COMMENT ON COLUMN "SYS_LOG"."LOG_TYPE" IS '日志类型（1登录日志，2操作日志）';
+COMMENT ON COLUMN "SYS_LOG"."LOG_CONTENT" IS '日志内容';
+COMMENT ON COLUMN "SYS_LOG"."OPERATE_TYPE" IS '操作类型';
+COMMENT ON COLUMN "SYS_LOG"."USERID" IS '操作用户账号';
+COMMENT ON COLUMN "SYS_LOG"."USERNAME" IS '操作用户名称';
+COMMENT ON COLUMN "SYS_LOG"."IP" IS 'IP';
+COMMENT ON COLUMN "SYS_LOG"."METHOD" IS '请求java方法';
+COMMENT ON COLUMN "SYS_LOG"."REQUEST_URL" IS '请求路径';
+COMMENT ON COLUMN "SYS_LOG"."REQUEST_PARAM" IS '请求参数';
+COMMENT ON COLUMN "SYS_LOG"."REQUEST_TYPE" IS '请求类型';
+COMMENT ON COLUMN "SYS_LOG"."COST_TIME" IS '耗时';
+COMMENT ON COLUMN "SYS_LOG"."CREATE_BY" IS '创建人';
+COMMENT ON COLUMN "SYS_LOG"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "SYS_LOG"."UPDATE_BY" IS '更新人';
+COMMENT ON COLUMN "SYS_LOG"."UPDATE_TIME" IS '更新时间';
+
+-- ----------------------------
+-- Table structure for SYS_PERMISSION
+-- ----------------------------
+DROP TABLE "SYS_PERMISSION";
+CREATE TABLE "SYS_PERMISSION" (
+"ID" NVARCHAR2(32) NOT NULL ,
+"PARENT_ID" NVARCHAR2(32) NULL ,
+"NAME" NVARCHAR2(100) NULL ,
+"URL" NVARCHAR2(255) NULL ,
+"COMPONENT" NVARCHAR2(255) NULL ,
+"COMPONENT_NAME" NVARCHAR2(100) NULL ,
+"REDIRECT" NVARCHAR2(255) NULL ,
+"MENU_TYPE" NUMBER(11) NULL ,
+"PERMS" NVARCHAR2(255) NULL ,
+"PERMS_TYPE" NVARCHAR2(10) NULL ,
+"SORT_NO" NUMBER(11) NULL ,
+"ALWAYS_SHOW" NUMBER(4) NULL ,
+"ICON" NVARCHAR2(100) NULL ,
+"IS_ROUTE" NUMBER(4) NULL ,
+"IS_LEAF" NUMBER(4) NULL ,
+"HIDDEN" NUMBER(11) NULL ,
+"DESCRIPTION" NVARCHAR2(255) NULL ,
+"CREATE_BY" NVARCHAR2(32) NULL ,
+"CREATE_TIME" DATE NULL ,
+"UPDATE_BY" NVARCHAR2(32) NULL ,
+"UPDATE_TIME" DATE NULL ,
+"DEL_FLAG" NUMBER(11) NULL ,
+"RULE_FLAG" NUMBER(11) NULL ,
+"STATUS" NVARCHAR2(2) NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON TABLE "SYS_PERMISSION" IS '菜单权限表';
+COMMENT ON COLUMN "SYS_PERMISSION"."ID" IS '主键id';
+COMMENT ON COLUMN "SYS_PERMISSION"."PARENT_ID" IS '父id';
+COMMENT ON COLUMN "SYS_PERMISSION"."NAME" IS '菜单标题';
+COMMENT ON COLUMN "SYS_PERMISSION"."URL" IS '路径';
+COMMENT ON COLUMN "SYS_PERMISSION"."COMPONENT" IS '组件';
+COMMENT ON COLUMN "SYS_PERMISSION"."COMPONENT_NAME" IS '组件名字';
+COMMENT ON COLUMN "SYS_PERMISSION"."REDIRECT" IS '一级菜单跳转地址';
+COMMENT ON COLUMN "SYS_PERMISSION"."MENU_TYPE" IS '菜单类型(0:一级菜单; 1:子菜单:2:按钮权限)';
+COMMENT ON COLUMN "SYS_PERMISSION"."PERMS" IS '菜单权限编码';
+COMMENT ON COLUMN "SYS_PERMISSION"."PERMS_TYPE" IS '权限策略1显示2禁用';
+COMMENT ON COLUMN "SYS_PERMISSION"."SORT_NO" IS '菜单排序';
+COMMENT ON COLUMN "SYS_PERMISSION"."ALWAYS_SHOW" IS '聚合子路由: 1是0否';
+COMMENT ON COLUMN "SYS_PERMISSION"."ICON" IS '菜单图标';
+COMMENT ON COLUMN "SYS_PERMISSION"."IS_ROUTE" IS '是否路由菜单: 0:不是 1:是（默认值1）';
+COMMENT ON COLUMN "SYS_PERMISSION"."IS_LEAF" IS '是否叶子节点: 1:是 0:不是';
+COMMENT ON COLUMN "SYS_PERMISSION"."HIDDEN" IS '是否隐藏路由: 0否,1是';
+COMMENT ON COLUMN "SYS_PERMISSION"."DESCRIPTION" IS '描述';
+COMMENT ON COLUMN "SYS_PERMISSION"."CREATE_BY" IS '创建人';
+COMMENT ON COLUMN "SYS_PERMISSION"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "SYS_PERMISSION"."UPDATE_BY" IS '更新人';
+COMMENT ON COLUMN "SYS_PERMISSION"."UPDATE_TIME" IS '更新时间';
+COMMENT ON COLUMN "SYS_PERMISSION"."DEL_FLAG" IS '删除状态 0正常 1已删除';
+COMMENT ON COLUMN "SYS_PERMISSION"."RULE_FLAG" IS '是否添加数据权限1是0否';
+COMMENT ON COLUMN "SYS_PERMISSION"."STATUS" IS '按钮权限状态(0无效1有效)';
+
+-- ----------------------------
+-- Table structure for SYS_PERMISSION_DATA_RULE
+-- ----------------------------
+DROP TABLE "SYS_PERMISSION_DATA_RULE";
+CREATE TABLE "SYS_PERMISSION_DATA_RULE" (
+"ID" NVARCHAR2(32) NOT NULL ,
+"PERMISSION_ID" NVARCHAR2(32) NULL ,
+"RULE_NAME" NVARCHAR2(50) NULL ,
+"RULE_COLUMN" NVARCHAR2(50) NULL ,
+"RULE_CONDITIONS" NVARCHAR2(50) NULL ,
+"RULE_VALUE" NVARCHAR2(300) NULL ,
+"STATUS" NVARCHAR2(3) NULL ,
+"CREATE_TIME" DATE NULL ,
+"CREATE_BY" NVARCHAR2(32) NULL ,
+"UPDATE_TIME" DATE NULL ,
+"UPDATE_BY" NVARCHAR2(32) NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON COLUMN "SYS_PERMISSION_DATA_RULE"."ID" IS 'ID';
+COMMENT ON COLUMN "SYS_PERMISSION_DATA_RULE"."PERMISSION_ID" IS '菜单ID';
+COMMENT ON COLUMN "SYS_PERMISSION_DATA_RULE"."RULE_NAME" IS '规则名称';
+COMMENT ON COLUMN "SYS_PERMISSION_DATA_RULE"."RULE_COLUMN" IS '字段';
+COMMENT ON COLUMN "SYS_PERMISSION_DATA_RULE"."RULE_CONDITIONS" IS '条件';
+COMMENT ON COLUMN "SYS_PERMISSION_DATA_RULE"."RULE_VALUE" IS '规则值';
+COMMENT ON COLUMN "SYS_PERMISSION_DATA_RULE"."STATUS" IS '权限有效状态1有0否';
+COMMENT ON COLUMN "SYS_PERMISSION_DATA_RULE"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "SYS_PERMISSION_DATA_RULE"."UPDATE_TIME" IS '修改时间';
+COMMENT ON COLUMN "SYS_PERMISSION_DATA_RULE"."UPDATE_BY" IS '修改人';
+
+-- ----------------------------
+-- Table structure for SYS_QUARTZ_JOB
+-- ----------------------------
+DROP TABLE "SYS_QUARTZ_JOB";
+CREATE TABLE "SYS_QUARTZ_JOB" (
+"ID" NVARCHAR2(32) NOT NULL ,
+"CREATE_BY" NVARCHAR2(32) NULL ,
+"CREATE_TIME" DATE NULL ,
+"DEL_FLAG" NUMBER(11) NULL ,
+"UPDATE_BY" NVARCHAR2(32) NULL ,
+"UPDATE_TIME" DATE NULL ,
+"JOB_CLASS_NAME" NVARCHAR2(255) NULL ,
+"CRON_EXPRESSION" NVARCHAR2(255) NULL ,
+"PARAMETER" NVARCHAR2(255) NULL ,
+"DESCRIPTION" NVARCHAR2(255) NULL ,
+"STATUS" NUMBER(11) NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON COLUMN "SYS_QUARTZ_JOB"."CREATE_BY" IS '创建人';
+COMMENT ON COLUMN "SYS_QUARTZ_JOB"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "SYS_QUARTZ_JOB"."DEL_FLAG" IS '删除状态';
+COMMENT ON COLUMN "SYS_QUARTZ_JOB"."UPDATE_BY" IS '修改人';
+COMMENT ON COLUMN "SYS_QUARTZ_JOB"."UPDATE_TIME" IS '修改时间';
+COMMENT ON COLUMN "SYS_QUARTZ_JOB"."JOB_CLASS_NAME" IS '任务类名';
+COMMENT ON COLUMN "SYS_QUARTZ_JOB"."CRON_EXPRESSION" IS 'cron表达式';
+COMMENT ON COLUMN "SYS_QUARTZ_JOB"."PARAMETER" IS '参数';
+COMMENT ON COLUMN "SYS_QUARTZ_JOB"."DESCRIPTION" IS '描述';
+COMMENT ON COLUMN "SYS_QUARTZ_JOB"."STATUS" IS '状态 0正常 -1停止';
+
+-- ----------------------------
+-- Table structure for SYS_ROLE
+-- ----------------------------
+DROP TABLE "SYS_ROLE";
+CREATE TABLE "SYS_ROLE" (
+"ID" NVARCHAR2(32) NOT NULL ,
+"ROLE_NAME" NVARCHAR2(200) NULL ,
+"ROLE_CODE" NVARCHAR2(100) NOT NULL ,
+"DESCRIPTION" NVARCHAR2(255) NULL ,
+"CREATE_BY" NVARCHAR2(32) NULL ,
+"CREATE_TIME" DATE NULL ,
+"UPDATE_BY" NVARCHAR2(32) NULL ,
+"UPDATE_TIME" DATE NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON TABLE "SYS_ROLE" IS '角色表';
+COMMENT ON COLUMN "SYS_ROLE"."ID" IS '主键id';
+COMMENT ON COLUMN "SYS_ROLE"."ROLE_NAME" IS '角色名称';
+COMMENT ON COLUMN "SYS_ROLE"."ROLE_CODE" IS '角色编码';
+COMMENT ON COLUMN "SYS_ROLE"."DESCRIPTION" IS '描述';
+COMMENT ON COLUMN "SYS_ROLE"."CREATE_BY" IS '创建人';
+COMMENT ON COLUMN "SYS_ROLE"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "SYS_ROLE"."UPDATE_BY" IS '更新人';
+COMMENT ON COLUMN "SYS_ROLE"."UPDATE_TIME" IS '更新时间';
+
+-- ----------------------------
+-- Table structure for SYS_ROLE_PERMISSION
+-- ----------------------------
+DROP TABLE "SYS_ROLE_PERMISSION";
+CREATE TABLE "SYS_ROLE_PERMISSION" (
+"ID" NVARCHAR2(32) NOT NULL ,
+"ROLE_ID" NVARCHAR2(32) NULL ,
+"PERMISSION_ID" NVARCHAR2(32) NULL ,
+"DATA_RULE_IDS" NVARCHAR2(1000) NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON TABLE "SYS_ROLE_PERMISSION" IS '角色权限表';
+COMMENT ON COLUMN "SYS_ROLE_PERMISSION"."ROLE_ID" IS '角色id';
+COMMENT ON COLUMN "SYS_ROLE_PERMISSION"."PERMISSION_ID" IS '权限id';
+
+-- ----------------------------
+-- Table structure for SYS_SMS
+-- ----------------------------
+DROP TABLE "SYS_SMS";
+CREATE TABLE "SYS_SMS" (
+"ID" NVARCHAR2(32) NOT NULL ,
+"ES_TITLE" NVARCHAR2(100) NULL ,
+"ES_TYPE" NVARCHAR2(1) NULL ,
+"ES_RECEIVER" NVARCHAR2(50) NULL ,
+"ES_PARAM" NVARCHAR2(1000) NULL ,
+"ES_CONTENT" NCLOB NULL ,
+"ES_SEND_TIME" DATE NULL ,
+"ES_SEND_STATUS" NVARCHAR2(1) NULL ,
+"ES_SEND_NUM" NUMBER(11) NULL ,
+"ES_RESULT" NVARCHAR2(255) NULL ,
+"REMARK" NVARCHAR2(500) NULL ,
+"CREATE_BY" NVARCHAR2(32) NULL ,
+"CREATE_TIME" DATE NULL ,
+"UPDATE_BY" NVARCHAR2(32) NULL ,
+"UPDATE_TIME" DATE NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON COLUMN "SYS_SMS"."ID" IS 'ID';
+COMMENT ON COLUMN "SYS_SMS"."ES_TITLE" IS '消息标题';
+COMMENT ON COLUMN "SYS_SMS"."ES_TYPE" IS '发送方式：1短信 2邮件 3微信';
+COMMENT ON COLUMN "SYS_SMS"."ES_RECEIVER" IS '接收人';
+COMMENT ON COLUMN "SYS_SMS"."ES_PARAM" IS '发送所需参数Json格式';
+COMMENT ON COLUMN "SYS_SMS"."ES_CONTENT" IS '推送内容';
+COMMENT ON COLUMN "SYS_SMS"."ES_SEND_TIME" IS '推送时间';
+COMMENT ON COLUMN "SYS_SMS"."ES_SEND_STATUS" IS '推送状态 0未推送 1推送成功 2推送失败 -1失败不再发送';
+COMMENT ON COLUMN "SYS_SMS"."ES_SEND_NUM" IS '发送次数 超过5次不再发送';
+COMMENT ON COLUMN "SYS_SMS"."ES_RESULT" IS '推送失败原因';
+COMMENT ON COLUMN "SYS_SMS"."REMARK" IS '备注';
+COMMENT ON COLUMN "SYS_SMS"."CREATE_BY" IS '创建人登录名称';
+COMMENT ON COLUMN "SYS_SMS"."CREATE_TIME" IS '创建日期';
+COMMENT ON COLUMN "SYS_SMS"."UPDATE_BY" IS '更新人登录名称';
+COMMENT ON COLUMN "SYS_SMS"."UPDATE_TIME" IS '更新日期';
+
+-- ----------------------------
+-- Table structure for SYS_SMS_TEMPLATE
+-- ----------------------------
+DROP TABLE "SYS_SMS_TEMPLATE";
+CREATE TABLE "SYS_SMS_TEMPLATE" (
+"ID" NVARCHAR2(32) NOT NULL ,
+"TEMPLATE_NAME" NVARCHAR2(50) NULL ,
+"TEMPLATE_CODE" NVARCHAR2(32) NOT NULL ,
+"TEMPLATE_TYPE" NVARCHAR2(1) NOT NULL ,
+"TEMPLATE_CONTENT" NVARCHAR2(1000) NOT NULL ,
+"TEMPLATE_TEST_JSON" NVARCHAR2(1000) NULL ,
+"CREATE_TIME" DATE NULL ,
+"CREATE_BY" NVARCHAR2(32) NULL ,
+"UPDATE_TIME" DATE NULL ,
+"UPDATE_BY" NVARCHAR2(32) NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON COLUMN "SYS_SMS_TEMPLATE"."ID" IS '主键';
+COMMENT ON COLUMN "SYS_SMS_TEMPLATE"."TEMPLATE_NAME" IS '模板标题';
+COMMENT ON COLUMN "SYS_SMS_TEMPLATE"."TEMPLATE_CODE" IS '模板CODE';
+COMMENT ON COLUMN "SYS_SMS_TEMPLATE"."TEMPLATE_TYPE" IS '模板类型：1短信 2邮件 3微信';
+COMMENT ON COLUMN "SYS_SMS_TEMPLATE"."TEMPLATE_CONTENT" IS '模板内容';
+COMMENT ON COLUMN "SYS_SMS_TEMPLATE"."TEMPLATE_TEST_JSON" IS '模板测试json';
+COMMENT ON COLUMN "SYS_SMS_TEMPLATE"."CREATE_TIME" IS '创建日期';
+COMMENT ON COLUMN "SYS_SMS_TEMPLATE"."CREATE_BY" IS '创建人登录名称';
+COMMENT ON COLUMN "SYS_SMS_TEMPLATE"."UPDATE_TIME" IS '更新日期';
+COMMENT ON COLUMN "SYS_SMS_TEMPLATE"."UPDATE_BY" IS '更新人登录名称';
+
+-- ----------------------------
+-- Table structure for SYS_USER
+-- ----------------------------
+DROP TABLE "SYS_USER";
+CREATE TABLE "SYS_USER" (
+"ID" NVARCHAR2(32) NOT NULL ,
+"USERNAME" NVARCHAR2(100) NULL ,
+"REALNAME" NVARCHAR2(100) NULL ,
+"PASSWORD" NVARCHAR2(255) NULL ,
+"SALT" NVARCHAR2(45) NULL ,
+"AVATAR" NVARCHAR2(255) NULL ,
+"BIRTHDAY" DATE NULL ,
+"SEX" NUMBER(11) NULL ,
+"EMAIL" NVARCHAR2(45) NULL ,
+"PHONE" NVARCHAR2(45) NULL ,
+"ORG_CODE" NVARCHAR2(100) NULL ,
+"STATUS" NUMBER(11) NULL ,
+"DEL_FLAG" NVARCHAR2(1) NULL ,
+"ACTIVITI_SYNC" NVARCHAR2(6) NULL ,
+"CREATE_BY" NVARCHAR2(32) NULL ,
+"CREATE_TIME" DATE NULL ,
+"UPDATE_BY" NVARCHAR2(32) NULL ,
+"UPDATE_TIME" DATE NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON TABLE "SYS_USER" IS '用户表';
+COMMENT ON COLUMN "SYS_USER"."ID" IS '主键id';
+COMMENT ON COLUMN "SYS_USER"."USERNAME" IS '登录账号';
+COMMENT ON COLUMN "SYS_USER"."REALNAME" IS '真实姓名';
+COMMENT ON COLUMN "SYS_USER"."PASSWORD" IS '密码';
+COMMENT ON COLUMN "SYS_USER"."SALT" IS 'md5密码盐';
+COMMENT ON COLUMN "SYS_USER"."AVATAR" IS '头像';
+COMMENT ON COLUMN "SYS_USER"."BIRTHDAY" IS '生日';
+COMMENT ON COLUMN "SYS_USER"."SEX" IS '性别（1：男 2：女）';
+COMMENT ON COLUMN "SYS_USER"."EMAIL" IS '电子邮件';
+COMMENT ON COLUMN "SYS_USER"."PHONE" IS '电话';
+COMMENT ON COLUMN "SYS_USER"."ORG_CODE" IS '部门code';
+COMMENT ON COLUMN "SYS_USER"."STATUS" IS '状态(1：正常 2：冻结 ）';
+COMMENT ON COLUMN "SYS_USER"."DEL_FLAG" IS '删除状态（0，正常，1已删除）';
+COMMENT ON COLUMN "SYS_USER"."ACTIVITI_SYNC" IS '同步工作流引擎1同步0不同步';
+COMMENT ON COLUMN "SYS_USER"."CREATE_BY" IS '创建人';
+COMMENT ON COLUMN "SYS_USER"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "SYS_USER"."UPDATE_BY" IS '更新人';
+COMMENT ON COLUMN "SYS_USER"."UPDATE_TIME" IS '更新时间';
+
+-- ----------------------------
+-- Table structure for SYS_USER_AGENT
+-- ----------------------------
+DROP TABLE "SYS_USER_AGENT";
+CREATE TABLE "SYS_USER_AGENT" (
+"ID" NVARCHAR2(32) NOT NULL ,
+"USER_NAME" NVARCHAR2(100) NULL ,
+"AGENT_USER_NAME" NVARCHAR2(100) NULL ,
+"START_TIME" DATE NULL ,
+"END_TIME" DATE NULL ,
+"STATUS" NVARCHAR2(2) NULL ,
+"CREATE_NAME" NVARCHAR2(50) NULL ,
+"CREATE_BY" NVARCHAR2(50) NULL ,
+"CREATE_TIME" DATE NULL ,
+"UPDATE_NAME" NVARCHAR2(50) NULL ,
+"UPDATE_BY" NVARCHAR2(50) NULL ,
+"UPDATE_TIME" DATE NULL ,
+"SYS_ORG_CODE" NVARCHAR2(50) NULL ,
+"SYS_COMPANY_CODE" NVARCHAR2(50) NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON TABLE "SYS_USER_AGENT" IS '用户代理人设置';
+COMMENT ON COLUMN "SYS_USER_AGENT"."ID" IS '序号';
+COMMENT ON COLUMN "SYS_USER_AGENT"."USER_NAME" IS '用户名';
+COMMENT ON COLUMN "SYS_USER_AGENT"."AGENT_USER_NAME" IS '代理人用户名';
+COMMENT ON COLUMN "SYS_USER_AGENT"."START_TIME" IS '代理开始时间';
+COMMENT ON COLUMN "SYS_USER_AGENT"."END_TIME" IS '代理结束时间';
+COMMENT ON COLUMN "SYS_USER_AGENT"."STATUS" IS '状态0无效1有效';
+COMMENT ON COLUMN "SYS_USER_AGENT"."CREATE_NAME" IS '创建人名称';
+COMMENT ON COLUMN "SYS_USER_AGENT"."CREATE_BY" IS '创建人登录名称';
+COMMENT ON COLUMN "SYS_USER_AGENT"."CREATE_TIME" IS '创建日期';
+COMMENT ON COLUMN "SYS_USER_AGENT"."UPDATE_NAME" IS '更新人名称';
+COMMENT ON COLUMN "SYS_USER_AGENT"."UPDATE_BY" IS '更新人登录名称';
+COMMENT ON COLUMN "SYS_USER_AGENT"."UPDATE_TIME" IS '更新日期';
+COMMENT ON COLUMN "SYS_USER_AGENT"."SYS_ORG_CODE" IS '所属部门';
+COMMENT ON COLUMN "SYS_USER_AGENT"."SYS_COMPANY_CODE" IS '所属公司';
+
+-- ----------------------------
+-- Table structure for SYS_USER_DEPART
+-- ----------------------------
+DROP TABLE "SYS_USER_DEPART";
+CREATE TABLE "SYS_USER_DEPART" (
+"ID" NVARCHAR2(32) NOT NULL ,
+"USER_ID" NVARCHAR2(32) NULL ,
+"DEP_ID" NVARCHAR2(32) NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON COLUMN "SYS_USER_DEPART"."ID" IS 'id';
+COMMENT ON COLUMN "SYS_USER_DEPART"."USER_ID" IS '用户id';
+COMMENT ON COLUMN "SYS_USER_DEPART"."DEP_ID" IS '部门id';
+
+-- ----------------------------
+-- Table structure for SYS_USER_ROLE
+-- ----------------------------
+DROP TABLE "SYS_USER_ROLE";
+CREATE TABLE "SYS_USER_ROLE" (
+"ID" NVARCHAR2(32) NOT NULL ,
+"USER_ID" NVARCHAR2(32) NULL ,
+"ROLE_ID" NVARCHAR2(32) NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON TABLE "SYS_USER_ROLE" IS '用户角色表';
+COMMENT ON COLUMN "SYS_USER_ROLE"."ID" IS '主键id';
+COMMENT ON COLUMN "SYS_USER_ROLE"."USER_ID" IS '用户id';
+COMMENT ON COLUMN "SYS_USER_ROLE"."ROLE_ID" IS '角色id';
+
+-- ----------------------------
+-- Table structure for TEST_PERSON
+-- ----------------------------
+DROP TABLE "TEST_PERSON";
+CREATE TABLE "TEST_PERSON" (
+"ID" NVARCHAR2(36) NOT NULL ,
+"CREATE_BY" NVARCHAR2(50) NULL ,
+"CREATE_TIME" DATE NULL ,
+"UPDATE_BY" NVARCHAR2(50) NULL ,
+"UPDATE_TIME" DATE NULL ,
+"SEX" NVARCHAR2(32) NULL ,
+"NAME" NVARCHAR2(200) NULL ,
+"CONTENT" NCLOB NULL ,
+"BE_DATE" DATE NULL ,
+"QJ_DAYS" NUMBER(11) NULL
+)
+LOGGING
+NOCOMPRESS
+NOCACHE
+
+;
+COMMENT ON COLUMN "TEST_PERSON"."CREATE_BY" IS '创建人';
+COMMENT ON COLUMN "TEST_PERSON"."CREATE_TIME" IS '创建日期';
+COMMENT ON COLUMN "TEST_PERSON"."UPDATE_BY" IS '更新人';
+COMMENT ON COLUMN "TEST_PERSON"."UPDATE_TIME" IS '更新日期';
+COMMENT ON COLUMN "TEST_PERSON"."SEX" IS '性别';
+COMMENT ON COLUMN "TEST_PERSON"."NAME" IS '用户名';
+COMMENT ON COLUMN "TEST_PERSON"."CONTENT" IS '请假原因';
+COMMENT ON COLUMN "TEST_PERSON"."BE_DATE" IS '请假时间';
+COMMENT ON COLUMN "TEST_PERSON"."QJ_DAYS" IS '请假天数';
+
+-- ----------------------------
+-- Indexes structure for table DEMO
+-- ----------------------------
+
+-- ----------------------------
+-- Checks structure for table DEMO
+-- ----------------------------
+ALTER TABLE "DEMO" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "DEMO" ADD CHECK ("ID" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table DEMO
+-- ----------------------------
+ALTER TABLE "DEMO" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table JEECG_MONTHLY_GROWTH_ANALYSIS
+-- ----------------------------
+
+-- ----------------------------
+-- Checks structure for table JEECG_MONTHLY_GROWTH_ANALYSIS
+-- ----------------------------
+ALTER TABLE "JEECG_MONTHLY_GROWTH_ANALYSIS" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "JEECG_MONTHLY_GROWTH_ANALYSIS" ADD CHECK ("ID" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table JEECG_MONTHLY_GROWTH_ANALYSIS
+-- ----------------------------
+ALTER TABLE "JEECG_MONTHLY_GROWTH_ANALYSIS" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table JEECG_ORDER_CUSTOMER
+-- ----------------------------
+
+-- ----------------------------
+-- Checks structure for table JEECG_ORDER_CUSTOMER
+-- ----------------------------
+ALTER TABLE "JEECG_ORDER_CUSTOMER" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "JEECG_ORDER_CUSTOMER" ADD CHECK ("NAME" IS NOT NULL);
+ALTER TABLE "JEECG_ORDER_CUSTOMER" ADD CHECK ("ORDER_ID" IS NOT NULL);
+ALTER TABLE "JEECG_ORDER_CUSTOMER" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "JEECG_ORDER_CUSTOMER" ADD CHECK ("NAME" IS NOT NULL);
+ALTER TABLE "JEECG_ORDER_CUSTOMER" ADD CHECK ("ORDER_ID" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table JEECG_ORDER_CUSTOMER
+-- ----------------------------
+ALTER TABLE "JEECG_ORDER_CUSTOMER" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table JEECG_ORDER_MAIN
+-- ----------------------------
+
+-- ----------------------------
+-- Checks structure for table JEECG_ORDER_MAIN
+-- ----------------------------
+ALTER TABLE "JEECG_ORDER_MAIN" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "JEECG_ORDER_MAIN" ADD CHECK ("ID" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table JEECG_ORDER_MAIN
+-- ----------------------------
+ALTER TABLE "JEECG_ORDER_MAIN" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table JEECG_ORDER_TICKET
+-- ----------------------------
+
+-- ----------------------------
+-- Checks structure for table JEECG_ORDER_TICKET
+-- ----------------------------
+ALTER TABLE "JEECG_ORDER_TICKET" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "JEECG_ORDER_TICKET" ADD CHECK ("TICKET_CODE" IS NOT NULL);
+ALTER TABLE "JEECG_ORDER_TICKET" ADD CHECK ("ORDER_ID" IS NOT NULL);
+ALTER TABLE "JEECG_ORDER_TICKET" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "JEECG_ORDER_TICKET" ADD CHECK ("TICKET_CODE" IS NOT NULL);
+ALTER TABLE "JEECG_ORDER_TICKET" ADD CHECK ("ORDER_ID" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table JEECG_ORDER_TICKET
+-- ----------------------------
+ALTER TABLE "JEECG_ORDER_TICKET" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table JEECG_PROJECT_NATURE_INCOME
+-- ----------------------------
+
+-- ----------------------------
+-- Checks structure for table JEECG_PROJECT_NATURE_INCOME
+-- ----------------------------
+ALTER TABLE "JEECG_PROJECT_NATURE_INCOME" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "JEECG_PROJECT_NATURE_INCOME" ADD CHECK ("NATURE" IS NOT NULL);
+ALTER TABLE "JEECG_PROJECT_NATURE_INCOME" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "JEECG_PROJECT_NATURE_INCOME" ADD CHECK ("NATURE" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table JEECG_PROJECT_NATURE_INCOME
+-- ----------------------------
+ALTER TABLE "JEECG_PROJECT_NATURE_INCOME" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table QRTZ_BLOB_TRIGGERS
+-- ----------------------------
+
+-- ----------------------------
+-- Checks structure for table QRTZ_BLOB_TRIGGERS
+-- ----------------------------
+ALTER TABLE "QRTZ_BLOB_TRIGGERS" ADD CHECK ("SCHED_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_BLOB_TRIGGERS" ADD CHECK ("TRIGGER_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_BLOB_TRIGGERS" ADD CHECK ("TRIGGER_GROUP" IS NOT NULL);
+ALTER TABLE "QRTZ_BLOB_TRIGGERS" ADD CHECK ("SCHED_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_BLOB_TRIGGERS" ADD CHECK ("TRIGGER_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_BLOB_TRIGGERS" ADD CHECK ("TRIGGER_GROUP" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table QRTZ_BLOB_TRIGGERS
+-- ----------------------------
+ALTER TABLE "QRTZ_BLOB_TRIGGERS" ADD PRIMARY KEY ("SCHED_NAME", "TRIGGER_NAME", "TRIGGER_GROUP");
+
+-- ----------------------------
+-- Indexes structure for table QRTZ_CALENDARS
+-- ----------------------------
+
+-- ----------------------------
+-- Checks structure for table QRTZ_CALENDARS
+-- ----------------------------
+ALTER TABLE "QRTZ_CALENDARS" ADD CHECK ("SCHED_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_CALENDARS" ADD CHECK ("CALENDAR_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_CALENDARS" ADD CHECK ("CALENDAR" IS NOT NULL);
+ALTER TABLE "QRTZ_CALENDARS" ADD CHECK ("SCHED_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_CALENDARS" ADD CHECK ("CALENDAR_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_CALENDARS" ADD CHECK ("CALENDAR" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table QRTZ_CALENDARS
+-- ----------------------------
+ALTER TABLE "QRTZ_CALENDARS" ADD PRIMARY KEY ("SCHED_NAME", "CALENDAR_NAME");
+
+-- ----------------------------
+-- Indexes structure for table QRTZ_CRON_TRIGGERS
+-- ----------------------------
+
+-- ----------------------------
+-- Checks structure for table QRTZ_CRON_TRIGGERS
+-- ----------------------------
+ALTER TABLE "QRTZ_CRON_TRIGGERS" ADD CHECK ("SCHED_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_CRON_TRIGGERS" ADD CHECK ("TRIGGER_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_CRON_TRIGGERS" ADD CHECK ("TRIGGER_GROUP" IS NOT NULL);
+ALTER TABLE "QRTZ_CRON_TRIGGERS" ADD CHECK ("CRON_EXPRESSION" IS NOT NULL);
+ALTER TABLE "QRTZ_CRON_TRIGGERS" ADD CHECK ("SCHED_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_CRON_TRIGGERS" ADD CHECK ("TRIGGER_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_CRON_TRIGGERS" ADD CHECK ("TRIGGER_GROUP" IS NOT NULL);
+ALTER TABLE "QRTZ_CRON_TRIGGERS" ADD CHECK ("CRON_EXPRESSION" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table QRTZ_CRON_TRIGGERS
+-- ----------------------------
+ALTER TABLE "QRTZ_CRON_TRIGGERS" ADD PRIMARY KEY ("SCHED_NAME", "TRIGGER_NAME", "TRIGGER_GROUP");
+
+-- ----------------------------
+-- Indexes structure for table QRTZ_FIRED_TRIGGERS
+-- ----------------------------
+CREATE INDEX "IDX_QRTZ_FT_INST_JOB_REQ_RCVRY"
+ON "QRTZ_FIRED_TRIGGERS" ("SCHED_NAME" ASC, "INSTANCE_NAME" ASC, "REQUESTS_RECOVERY" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "IDX_QRTZ_FT_JG"
+ON "QRTZ_FIRED_TRIGGERS" ("SCHED_NAME" ASC, "JOB_GROUP" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "IDX_QRTZ_FT_J_G"
+ON "QRTZ_FIRED_TRIGGERS" ("SCHED_NAME" ASC, "JOB_NAME" ASC, "JOB_GROUP" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "IDX_QRTZ_FT_TG"
+ON "QRTZ_FIRED_TRIGGERS" ("SCHED_NAME" ASC, "TRIGGER_GROUP" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "IDX_QRTZ_FT_TRIG_INST_NAME"
+ON "QRTZ_FIRED_TRIGGERS" ("SCHED_NAME" ASC, "INSTANCE_NAME" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "IDX_QRTZ_FT_T_G"
+ON "QRTZ_FIRED_TRIGGERS" ("SCHED_NAME" ASC, "TRIGGER_NAME" ASC, "TRIGGER_GROUP" ASC)
+LOGGING
+VISIBLE;
+
+-- ----------------------------
+-- Checks structure for table QRTZ_FIRED_TRIGGERS
+-- ----------------------------
+ALTER TABLE "QRTZ_FIRED_TRIGGERS" ADD CHECK ("SCHED_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_FIRED_TRIGGERS" ADD CHECK ("ENTRY_ID" IS NOT NULL);
+ALTER TABLE "QRTZ_FIRED_TRIGGERS" ADD CHECK ("TRIGGER_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_FIRED_TRIGGERS" ADD CHECK ("TRIGGER_GROUP" IS NOT NULL);
+ALTER TABLE "QRTZ_FIRED_TRIGGERS" ADD CHECK ("INSTANCE_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_FIRED_TRIGGERS" ADD CHECK ("FIRED_TIME" IS NOT NULL);
+ALTER TABLE "QRTZ_FIRED_TRIGGERS" ADD CHECK ("SCHED_TIME" IS NOT NULL);
+ALTER TABLE "QRTZ_FIRED_TRIGGERS" ADD CHECK ("PRIORITY" IS NOT NULL);
+ALTER TABLE "QRTZ_FIRED_TRIGGERS" ADD CHECK ("STATE" IS NOT NULL);
+ALTER TABLE "QRTZ_FIRED_TRIGGERS" ADD CHECK ("SCHED_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_FIRED_TRIGGERS" ADD CHECK ("ENTRY_ID" IS NOT NULL);
+ALTER TABLE "QRTZ_FIRED_TRIGGERS" ADD CHECK ("TRIGGER_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_FIRED_TRIGGERS" ADD CHECK ("TRIGGER_GROUP" IS NOT NULL);
+ALTER TABLE "QRTZ_FIRED_TRIGGERS" ADD CHECK ("INSTANCE_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_FIRED_TRIGGERS" ADD CHECK ("FIRED_TIME" IS NOT NULL);
+ALTER TABLE "QRTZ_FIRED_TRIGGERS" ADD CHECK ("SCHED_TIME" IS NOT NULL);
+ALTER TABLE "QRTZ_FIRED_TRIGGERS" ADD CHECK ("PRIORITY" IS NOT NULL);
+ALTER TABLE "QRTZ_FIRED_TRIGGERS" ADD CHECK ("STATE" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table QRTZ_FIRED_TRIGGERS
+-- ----------------------------
+ALTER TABLE "QRTZ_FIRED_TRIGGERS" ADD PRIMARY KEY ("SCHED_NAME", "ENTRY_ID");
+
+-- ----------------------------
+-- Indexes structure for table QRTZ_JOB_DETAILS
+-- ----------------------------
+CREATE INDEX "IDX_QRTZ_J_GRP"
+ON "QRTZ_JOB_DETAILS" ("SCHED_NAME" ASC, "JOB_GROUP" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "IDX_QRTZ_J_REQ_RECOVERY"
+ON "QRTZ_JOB_DETAILS" ("SCHED_NAME" ASC, "REQUESTS_RECOVERY" ASC)
+LOGGING
+VISIBLE;
+
+-- ----------------------------
+-- Checks structure for table QRTZ_JOB_DETAILS
+-- ----------------------------
+ALTER TABLE "QRTZ_JOB_DETAILS" ADD CHECK ("SCHED_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_JOB_DETAILS" ADD CHECK ("JOB_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_JOB_DETAILS" ADD CHECK ("JOB_GROUP" IS NOT NULL);
+ALTER TABLE "QRTZ_JOB_DETAILS" ADD CHECK ("JOB_CLASS_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_JOB_DETAILS" ADD CHECK ("IS_DURABLE" IS NOT NULL);
+ALTER TABLE "QRTZ_JOB_DETAILS" ADD CHECK ("IS_NONCONCURRENT" IS NOT NULL);
+ALTER TABLE "QRTZ_JOB_DETAILS" ADD CHECK ("IS_UPDATE_DATA" IS NOT NULL);
+ALTER TABLE "QRTZ_JOB_DETAILS" ADD CHECK ("REQUESTS_RECOVERY" IS NOT NULL);
+ALTER TABLE "QRTZ_JOB_DETAILS" ADD CHECK ("SCHED_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_JOB_DETAILS" ADD CHECK ("JOB_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_JOB_DETAILS" ADD CHECK ("JOB_GROUP" IS NOT NULL);
+ALTER TABLE "QRTZ_JOB_DETAILS" ADD CHECK ("JOB_CLASS_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_JOB_DETAILS" ADD CHECK ("IS_DURABLE" IS NOT NULL);
+ALTER TABLE "QRTZ_JOB_DETAILS" ADD CHECK ("IS_NONCONCURRENT" IS NOT NULL);
+ALTER TABLE "QRTZ_JOB_DETAILS" ADD CHECK ("IS_UPDATE_DATA" IS NOT NULL);
+ALTER TABLE "QRTZ_JOB_DETAILS" ADD CHECK ("REQUESTS_RECOVERY" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table QRTZ_JOB_DETAILS
+-- ----------------------------
+ALTER TABLE "QRTZ_JOB_DETAILS" ADD PRIMARY KEY ("SCHED_NAME", "JOB_NAME", "JOB_GROUP");
+
+-- ----------------------------
+-- Indexes structure for table QRTZ_LOCKS
+-- ----------------------------
+
+-- ----------------------------
+-- Checks structure for table QRTZ_LOCKS
+-- ----------------------------
+ALTER TABLE "QRTZ_LOCKS" ADD CHECK ("SCHED_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_LOCKS" ADD CHECK ("LOCK_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_LOCKS" ADD CHECK ("SCHED_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_LOCKS" ADD CHECK ("LOCK_NAME" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table QRTZ_LOCKS
+-- ----------------------------
+ALTER TABLE "QRTZ_LOCKS" ADD PRIMARY KEY ("SCHED_NAME", "LOCK_NAME");
+
+-- ----------------------------
+-- Indexes structure for table QRTZ_PAUSED_TRIGGER_GRPS
+-- ----------------------------
+
+-- ----------------------------
+-- Checks structure for table QRTZ_PAUSED_TRIGGER_GRPS
+-- ----------------------------
+ALTER TABLE "QRTZ_PAUSED_TRIGGER_GRPS" ADD CHECK ("SCHED_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_PAUSED_TRIGGER_GRPS" ADD CHECK ("TRIGGER_GROUP" IS NOT NULL);
+ALTER TABLE "QRTZ_PAUSED_TRIGGER_GRPS" ADD CHECK ("SCHED_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_PAUSED_TRIGGER_GRPS" ADD CHECK ("TRIGGER_GROUP" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table QRTZ_PAUSED_TRIGGER_GRPS
+-- ----------------------------
+ALTER TABLE "QRTZ_PAUSED_TRIGGER_GRPS" ADD PRIMARY KEY ("SCHED_NAME", "TRIGGER_GROUP");
+
+-- ----------------------------
+-- Indexes structure for table QRTZ_SCHEDULER_STATE
+-- ----------------------------
+
+-- ----------------------------
+-- Checks structure for table QRTZ_SCHEDULER_STATE
+-- ----------------------------
+ALTER TABLE "QRTZ_SCHEDULER_STATE" ADD CHECK ("SCHED_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_SCHEDULER_STATE" ADD CHECK ("INSTANCE_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_SCHEDULER_STATE" ADD CHECK ("LAST_CHECKIN_TIME" IS NOT NULL);
+ALTER TABLE "QRTZ_SCHEDULER_STATE" ADD CHECK ("CHECKIN_INTERVAL" IS NOT NULL);
+ALTER TABLE "QRTZ_SCHEDULER_STATE" ADD CHECK ("SCHED_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_SCHEDULER_STATE" ADD CHECK ("INSTANCE_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_SCHEDULER_STATE" ADD CHECK ("LAST_CHECKIN_TIME" IS NOT NULL);
+ALTER TABLE "QRTZ_SCHEDULER_STATE" ADD CHECK ("CHECKIN_INTERVAL" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table QRTZ_SCHEDULER_STATE
+-- ----------------------------
+ALTER TABLE "QRTZ_SCHEDULER_STATE" ADD PRIMARY KEY ("SCHED_NAME", "INSTANCE_NAME");
+
+-- ----------------------------
+-- Indexes structure for table QRTZ_SIMPLE_TRIGGERS
+-- ----------------------------
+
+-- ----------------------------
+-- Checks structure for table QRTZ_SIMPLE_TRIGGERS
+-- ----------------------------
+ALTER TABLE "QRTZ_SIMPLE_TRIGGERS" ADD CHECK ("SCHED_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_SIMPLE_TRIGGERS" ADD CHECK ("TRIGGER_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_SIMPLE_TRIGGERS" ADD CHECK ("TRIGGER_GROUP" IS NOT NULL);
+ALTER TABLE "QRTZ_SIMPLE_TRIGGERS" ADD CHECK ("REPEAT_COUNT" IS NOT NULL);
+ALTER TABLE "QRTZ_SIMPLE_TRIGGERS" ADD CHECK ("REPEAT_INTERVAL" IS NOT NULL);
+ALTER TABLE "QRTZ_SIMPLE_TRIGGERS" ADD CHECK ("TIMES_TRIGGERED" IS NOT NULL);
+ALTER TABLE "QRTZ_SIMPLE_TRIGGERS" ADD CHECK ("SCHED_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_SIMPLE_TRIGGERS" ADD CHECK ("TRIGGER_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_SIMPLE_TRIGGERS" ADD CHECK ("TRIGGER_GROUP" IS NOT NULL);
+ALTER TABLE "QRTZ_SIMPLE_TRIGGERS" ADD CHECK ("REPEAT_COUNT" IS NOT NULL);
+ALTER TABLE "QRTZ_SIMPLE_TRIGGERS" ADD CHECK ("REPEAT_INTERVAL" IS NOT NULL);
+ALTER TABLE "QRTZ_SIMPLE_TRIGGERS" ADD CHECK ("TIMES_TRIGGERED" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table QRTZ_SIMPLE_TRIGGERS
+-- ----------------------------
+ALTER TABLE "QRTZ_SIMPLE_TRIGGERS" ADD PRIMARY KEY ("SCHED_NAME", "TRIGGER_NAME", "TRIGGER_GROUP");
+
+-- ----------------------------
+-- Indexes structure for table QRTZ_SIMPROP_TRIGGERS
+-- ----------------------------
+
+-- ----------------------------
+-- Checks structure for table QRTZ_SIMPROP_TRIGGERS
+-- ----------------------------
+ALTER TABLE "QRTZ_SIMPROP_TRIGGERS" ADD CHECK ("SCHED_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_SIMPROP_TRIGGERS" ADD CHECK ("TRIGGER_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_SIMPROP_TRIGGERS" ADD CHECK ("TRIGGER_GROUP" IS NOT NULL);
+ALTER TABLE "QRTZ_SIMPROP_TRIGGERS" ADD CHECK ("SCHED_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_SIMPROP_TRIGGERS" ADD CHECK ("TRIGGER_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_SIMPROP_TRIGGERS" ADD CHECK ("TRIGGER_GROUP" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table QRTZ_SIMPROP_TRIGGERS
+-- ----------------------------
+ALTER TABLE "QRTZ_SIMPROP_TRIGGERS" ADD PRIMARY KEY ("SCHED_NAME", "TRIGGER_NAME", "TRIGGER_GROUP");
+
+-- ----------------------------
+-- Indexes structure for table QRTZ_TRIGGERS
+-- ----------------------------
+CREATE INDEX "IDX_QRTZ_T_C"
+ON "QRTZ_TRIGGERS" ("SCHED_NAME" ASC, "CALENDAR_NAME" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "IDX_QRTZ_T_G"
+ON "QRTZ_TRIGGERS" ("SCHED_NAME" ASC, "TRIGGER_GROUP" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "IDX_QRTZ_T_J"
+ON "QRTZ_TRIGGERS" ("SCHED_NAME" ASC, "JOB_NAME" ASC, "JOB_GROUP" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "IDX_QRTZ_T_JG"
+ON "QRTZ_TRIGGERS" ("SCHED_NAME" ASC, "JOB_GROUP" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "IDX_QRTZ_T_NEXT_FIRE_TIME"
+ON "QRTZ_TRIGGERS" ("SCHED_NAME" ASC, "NEXT_FIRE_TIME" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "IDX_QRTZ_T_NFT_MISFIRE"
+ON "QRTZ_TRIGGERS" ("SCHED_NAME" ASC, "MISFIRE_INSTR" ASC, "NEXT_FIRE_TIME" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "IDX_QRTZ_T_NFT_ST"
+ON "QRTZ_TRIGGERS" ("SCHED_NAME" ASC, "TRIGGER_STATE" ASC, "NEXT_FIRE_TIME" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "IDX_QRTZ_T_NFT_ST_MISFIRE"
+ON "QRTZ_TRIGGERS" ("SCHED_NAME" ASC, "MISFIRE_INSTR" ASC, "NEXT_FIRE_TIME" ASC, "TRIGGER_STATE" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "IDX_QRTZ_T_NFT_ST_MISFIRE_GRP"
+ON "QRTZ_TRIGGERS" ("SCHED_NAME" ASC, "MISFIRE_INSTR" ASC, "NEXT_FIRE_TIME" ASC, "TRIGGER_GROUP" ASC, "TRIGGER_STATE" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "IDX_QRTZ_T_N_G_STATE"
+ON "QRTZ_TRIGGERS" ("SCHED_NAME" ASC, "TRIGGER_GROUP" ASC, "TRIGGER_STATE" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "IDX_QRTZ_T_N_STATE"
+ON "QRTZ_TRIGGERS" ("SCHED_NAME" ASC, "TRIGGER_NAME" ASC, "TRIGGER_GROUP" ASC, "TRIGGER_STATE" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "IDX_QRTZ_T_STATE"
+ON "QRTZ_TRIGGERS" ("SCHED_NAME" ASC, "TRIGGER_STATE" ASC)
+LOGGING
+VISIBLE;
+
+-- ----------------------------
+-- Checks structure for table QRTZ_TRIGGERS
+-- ----------------------------
+ALTER TABLE "QRTZ_TRIGGERS" ADD CHECK ("SCHED_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_TRIGGERS" ADD CHECK ("TRIGGER_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_TRIGGERS" ADD CHECK ("TRIGGER_GROUP" IS NOT NULL);
+ALTER TABLE "QRTZ_TRIGGERS" ADD CHECK ("JOB_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_TRIGGERS" ADD CHECK ("JOB_GROUP" IS NOT NULL);
+ALTER TABLE "QRTZ_TRIGGERS" ADD CHECK ("TRIGGER_STATE" IS NOT NULL);
+ALTER TABLE "QRTZ_TRIGGERS" ADD CHECK ("TRIGGER_TYPE" IS NOT NULL);
+ALTER TABLE "QRTZ_TRIGGERS" ADD CHECK ("START_TIME" IS NOT NULL);
+ALTER TABLE "QRTZ_TRIGGERS" ADD CHECK ("SCHED_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_TRIGGERS" ADD CHECK ("TRIGGER_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_TRIGGERS" ADD CHECK ("TRIGGER_GROUP" IS NOT NULL);
+ALTER TABLE "QRTZ_TRIGGERS" ADD CHECK ("JOB_NAME" IS NOT NULL);
+ALTER TABLE "QRTZ_TRIGGERS" ADD CHECK ("JOB_GROUP" IS NOT NULL);
+ALTER TABLE "QRTZ_TRIGGERS" ADD CHECK ("TRIGGER_STATE" IS NOT NULL);
+ALTER TABLE "QRTZ_TRIGGERS" ADD CHECK ("TRIGGER_TYPE" IS NOT NULL);
+ALTER TABLE "QRTZ_TRIGGERS" ADD CHECK ("START_TIME" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table QRTZ_TRIGGERS
+-- ----------------------------
+ALTER TABLE "QRTZ_TRIGGERS" ADD PRIMARY KEY ("SCHED_NAME", "TRIGGER_NAME", "TRIGGER_GROUP");
+
+-- ----------------------------
+-- Indexes structure for table SYS_ANNOUNCEMENT
+-- ----------------------------
+
+-- ----------------------------
+-- Checks structure for table SYS_ANNOUNCEMENT
+-- ----------------------------
+ALTER TABLE "SYS_ANNOUNCEMENT" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "SYS_ANNOUNCEMENT" ADD CHECK ("MSG_CATEGORY" IS NOT NULL);
+ALTER TABLE "SYS_ANNOUNCEMENT" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "SYS_ANNOUNCEMENT" ADD CHECK ("MSG_CATEGORY" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table SYS_ANNOUNCEMENT
+-- ----------------------------
+ALTER TABLE "SYS_ANNOUNCEMENT" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table SYS_DATA_LOG
+-- ----------------------------
+CREATE INDEX "SINDEX"
+ON "SYS_DATA_LOG" ("DATA_TABLE" ASC, "DATA_ID" ASC)
+LOGGING
+VISIBLE;
+
+-- ----------------------------
+-- Checks structure for table SYS_DATA_LOG
+-- ----------------------------
+ALTER TABLE "SYS_DATA_LOG" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "SYS_DATA_LOG" ADD CHECK ("ID" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table SYS_DATA_LOG
+-- ----------------------------
+ALTER TABLE "SYS_DATA_LOG" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table SYS_DEPART
+-- ----------------------------
+CREATE INDEX "INDEX_DEPART_DEPART_ORDER"
+ON "SYS_DEPART" ("DEPART_ORDER" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "INDEX_DEPART_ORG_CODE"
+ON "SYS_DEPART" ("ORG_CODE" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "INDEX_DEPART_PARENT_ID"
+ON "SYS_DEPART" ("PARENT_ID" ASC)
+LOGGING
+VISIBLE;
+
+-- ----------------------------
+-- Checks structure for table SYS_DEPART
+-- ----------------------------
+ALTER TABLE "SYS_DEPART" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "SYS_DEPART" ADD CHECK ("DEPART_NAME" IS NOT NULL);
+ALTER TABLE "SYS_DEPART" ADD CHECK ("ORG_CODE" IS NOT NULL);
+ALTER TABLE "SYS_DEPART" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "SYS_DEPART" ADD CHECK ("DEPART_NAME" IS NOT NULL);
+ALTER TABLE "SYS_DEPART" ADD CHECK ("ORG_CODE" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table SYS_DEPART
+-- ----------------------------
+ALTER TABLE "SYS_DEPART" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table SYS_DICT
+-- ----------------------------
+CREATE UNIQUE INDEX "INDEXTABLE_DICT_CODE"
+ON "SYS_DICT" ("DICT_CODE" ASC)
+LOGGING
+VISIBLE;
+
+-- ----------------------------
+-- Checks structure for table SYS_DICT
+-- ----------------------------
+ALTER TABLE "SYS_DICT" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "SYS_DICT" ADD CHECK ("ID" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table SYS_DICT
+-- ----------------------------
+ALTER TABLE "SYS_DICT" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table SYS_DICT_ITEM
+-- ----------------------------
+CREATE INDEX "INDEX_TABLE_DICT_ID"
+ON "SYS_DICT_ITEM" ("DICT_ID" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "INDEX_TABLE_DICT_STATUS"
+ON "SYS_DICT_ITEM" ("STATUS" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "INDEX_TABLE_SORT_ORDER"
+ON "SYS_DICT_ITEM" ("SORT_ORDER" ASC)
+LOGGING
+VISIBLE;
+
+-- ----------------------------
+-- Checks structure for table SYS_DICT_ITEM
+-- ----------------------------
+ALTER TABLE "SYS_DICT_ITEM" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "SYS_DICT_ITEM" ADD CHECK ("ID" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table SYS_DICT_ITEM
+-- ----------------------------
+ALTER TABLE "SYS_DICT_ITEM" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table SYS_LOG
+-- ----------------------------
+CREATE INDEX "INDEX_LOGT_YPE"
+ON "SYS_LOG" ("LOG_TYPE" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "INDEX_OPERATE_TYPE"
+ON "SYS_LOG" ("OPERATE_TYPE" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "INDEX_TABLE_USERID"
+ON "SYS_LOG" ("USERID" ASC)
+LOGGING
+VISIBLE;
+
+-- ----------------------------
+-- Checks structure for table SYS_LOG
+-- ----------------------------
+ALTER TABLE "SYS_LOG" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "SYS_LOG" ADD CHECK ("ID" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table SYS_LOG
+-- ----------------------------
+ALTER TABLE "SYS_LOG" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table SYS_PERMISSION
+-- ----------------------------
+CREATE INDEX "INDEX_PREM_DEL_FLAG"
+ON "SYS_PERMISSION" ("DEL_FLAG" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "INDEX_PREM_IS_LEAF"
+ON "SYS_PERMISSION" ("IS_LEAF" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "INDEX_PREM_IS_ROUTE"
+ON "SYS_PERMISSION" ("IS_ROUTE" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "INDEX_PREM_PID"
+ON "SYS_PERMISSION" ("PARENT_ID" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "INDEX_PREM_SORT_NO"
+ON "SYS_PERMISSION" ("SORT_NO" ASC)
+LOGGING
+VISIBLE;
+
+-- ----------------------------
+-- Checks structure for table SYS_PERMISSION
+-- ----------------------------
+ALTER TABLE "SYS_PERMISSION" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "SYS_PERMISSION" ADD CHECK ("ID" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table SYS_PERMISSION
+-- ----------------------------
+ALTER TABLE "SYS_PERMISSION" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table SYS_PERMISSION_DATA_RULE
+-- ----------------------------
+CREATE INDEX "INDEX_FUCNTIONID"
+ON "SYS_PERMISSION_DATA_RULE" ("PERMISSION_ID" ASC)
+LOGGING
+VISIBLE;
+
+-- ----------------------------
+-- Checks structure for table SYS_PERMISSION_DATA_RULE
+-- ----------------------------
+ALTER TABLE "SYS_PERMISSION_DATA_RULE" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "SYS_PERMISSION_DATA_RULE" ADD CHECK ("ID" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table SYS_PERMISSION_DATA_RULE
+-- ----------------------------
+ALTER TABLE "SYS_PERMISSION_DATA_RULE" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table SYS_QUARTZ_JOB
+-- ----------------------------
+
+-- ----------------------------
+-- Checks structure for table SYS_QUARTZ_JOB
+-- ----------------------------
+ALTER TABLE "SYS_QUARTZ_JOB" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "SYS_QUARTZ_JOB" ADD CHECK ("ID" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table SYS_QUARTZ_JOB
+-- ----------------------------
+ALTER TABLE "SYS_QUARTZ_JOB" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table SYS_ROLE
+-- ----------------------------
+CREATE UNIQUE INDEX "INDEX_ROLE_CODE"
+ON "SYS_ROLE" ("ROLE_CODE" ASC)
+LOGGING
+VISIBLE;
+
+-- ----------------------------
+-- Checks structure for table SYS_ROLE
+-- ----------------------------
+ALTER TABLE "SYS_ROLE" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "SYS_ROLE" ADD CHECK ("ROLE_CODE" IS NOT NULL);
+ALTER TABLE "SYS_ROLE" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "SYS_ROLE" ADD CHECK ("ROLE_CODE" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table SYS_ROLE
+-- ----------------------------
+ALTER TABLE "SYS_ROLE" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table SYS_ROLE_PERMISSION
+-- ----------------------------
+CREATE INDEX "INDEX_GROUP_PER_ID"
+ON "SYS_ROLE_PERMISSION" ("PERMISSION_ID" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "INDEX_GROUP_ROLE_ID"
+ON "SYS_ROLE_PERMISSION" ("ROLE_ID" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "INDEX_GROUP_ROLE_PER_ID"
+ON "SYS_ROLE_PERMISSION" ("ROLE_ID" ASC, "PERMISSION_ID" ASC)
+LOGGING
+VISIBLE;
+
+-- ----------------------------
+-- Checks structure for table SYS_ROLE_PERMISSION
+-- ----------------------------
+ALTER TABLE "SYS_ROLE_PERMISSION" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "SYS_ROLE_PERMISSION" ADD CHECK ("ID" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table SYS_ROLE_PERMISSION
+-- ----------------------------
+ALTER TABLE "SYS_ROLE_PERMISSION" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table SYS_SMS
+-- ----------------------------
+CREATE INDEX "INDEX_RECEIVER"
+ON "SYS_SMS" ("ES_RECEIVER" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "INDEX_SENDTIME"
+ON "SYS_SMS" ("ES_SEND_TIME" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "INDEX_TYPE"
+ON "SYS_SMS" ("ES_TYPE" ASC)
+LOGGING
+VISIBLE;
+
+-- ----------------------------
+-- Checks structure for table SYS_SMS
+-- ----------------------------
+ALTER TABLE "SYS_SMS" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "SYS_SMS" ADD CHECK ("ID" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table SYS_SMS
+-- ----------------------------
+ALTER TABLE "SYS_SMS" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table SYS_SMS_TEMPLATE
+-- ----------------------------
+CREATE UNIQUE INDEX "UNIQ_TEMPLATECODE"
+ON "SYS_SMS_TEMPLATE" ("TEMPLATE_CODE" ASC)
+LOGGING
+VISIBLE;
+
+-- ----------------------------
+-- Checks structure for table SYS_SMS_TEMPLATE
+-- ----------------------------
+ALTER TABLE "SYS_SMS_TEMPLATE" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "SYS_SMS_TEMPLATE" ADD CHECK ("TEMPLATE_CODE" IS NOT NULL);
+ALTER TABLE "SYS_SMS_TEMPLATE" ADD CHECK ("TEMPLATE_TYPE" IS NOT NULL);
+ALTER TABLE "SYS_SMS_TEMPLATE" ADD CHECK ("TEMPLATE_CONTENT" IS NOT NULL);
+ALTER TABLE "SYS_SMS_TEMPLATE" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "SYS_SMS_TEMPLATE" ADD CHECK ("TEMPLATE_CODE" IS NOT NULL);
+ALTER TABLE "SYS_SMS_TEMPLATE" ADD CHECK ("TEMPLATE_TYPE" IS NOT NULL);
+ALTER TABLE "SYS_SMS_TEMPLATE" ADD CHECK ("TEMPLATE_CONTENT" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table SYS_SMS_TEMPLATE
+-- ----------------------------
+ALTER TABLE "SYS_SMS_TEMPLATE" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table SYS_USER
+-- ----------------------------
+CREATE INDEX "INDEX_USER_DEL_FLAG"
+ON "SYS_USER" ("DEL_FLAG" ASC)
+LOGGING
+VISIBLE;
+CREATE UNIQUE INDEX "INDEX_USER_NAME"
+ON "SYS_USER" ("USERNAME" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "INDEX_USER_STATUS"
+ON "SYS_USER" ("STATUS" ASC)
+LOGGING
+VISIBLE;
+
+-- ----------------------------
+-- Checks structure for table SYS_USER
+-- ----------------------------
+ALTER TABLE "SYS_USER" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "SYS_USER" ADD CHECK ("ID" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table SYS_USER
+-- ----------------------------
+ALTER TABLE "SYS_USER" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table SYS_USER_AGENT
+-- ----------------------------
+CREATE INDEX "BEGINTIME_INDEX"
+ON "SYS_USER_AGENT" ("START_TIME" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "ENDTIME_INDEX"
+ON "SYS_USER_AGENT" ("END_TIME" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "STATUX_INDEX"
+ON "SYS_USER_AGENT" ("STATUS" ASC)
+LOGGING
+VISIBLE;
+CREATE UNIQUE INDEX "UNIQ_USERNAME"
+ON "SYS_USER_AGENT" ("USER_NAME" ASC)
+LOGGING
+VISIBLE;
+
+-- ----------------------------
+-- Checks structure for table SYS_USER_AGENT
+-- ----------------------------
+ALTER TABLE "SYS_USER_AGENT" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "SYS_USER_AGENT" ADD CHECK ("ID" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table SYS_USER_AGENT
+-- ----------------------------
+ALTER TABLE "SYS_USER_AGENT" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table SYS_USER_DEPART
+-- ----------------------------
+CREATE INDEX "INDEX_DEPART_GROUPKORGID"
+ON "SYS_USER_DEPART" ("DEP_ID" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "INDEX_DEPART_GROUPK_UIDANDDID"
+ON "SYS_USER_DEPART" ("USER_ID" ASC, "DEP_ID" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "INDEX_DEPART_GROUPK_USERID"
+ON "SYS_USER_DEPART" ("USER_ID" ASC)
+LOGGING
+VISIBLE;
+
+-- ----------------------------
+-- Checks structure for table SYS_USER_DEPART
+-- ----------------------------
+ALTER TABLE "SYS_USER_DEPART" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "SYS_USER_DEPART" ADD CHECK ("ID" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table SYS_USER_DEPART
+-- ----------------------------
+ALTER TABLE "SYS_USER_DEPART" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table SYS_USER_ROLE
+-- ----------------------------
+CREATE INDEX "INDEX2_GROUPUU_OLE_ID"
+ON "SYS_USER_ROLE" ("ROLE_ID" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "INDEX2_GROUPUU_USERIDANDROLEID"
+ON "SYS_USER_ROLE" ("USER_ID" ASC, "ROLE_ID" ASC)
+LOGGING
+VISIBLE;
+CREATE INDEX "INDEX2_GROUPUU_USER_ID"
+ON "SYS_USER_ROLE" ("USER_ID" ASC)
+LOGGING
+VISIBLE;
+
+-- ----------------------------
+-- Checks structure for table SYS_USER_ROLE
+-- ----------------------------
+ALTER TABLE "SYS_USER_ROLE" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "SYS_USER_ROLE" ADD CHECK ("ID" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table SYS_USER_ROLE
+-- ----------------------------
+ALTER TABLE "SYS_USER_ROLE" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Indexes structure for table TEST_PERSON
+-- ----------------------------
+
+-- ----------------------------
+-- Checks structure for table TEST_PERSON
+-- ----------------------------
+ALTER TABLE "TEST_PERSON" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "TEST_PERSON" ADD CHECK ("ID" IS NOT NULL);
+
+-- ----------------------------
+-- Primary Key structure for table TEST_PERSON
+-- ----------------------------
+ALTER TABLE "TEST_PERSON" ADD PRIMARY KEY ("ID");
+
+-- ----------------------------
+-- Foreign Key structure for table "QRTZ_BLOB_TRIGGERS"
+-- ----------------------------
+ALTER TABLE "QRTZ_BLOB_TRIGGERS" ADD FOREIGN KEY ("SCHED_NAME", "TRIGGER_NAME", "TRIGGER_GROUP") REFERENCES "QRTZ_TRIGGERS" ("SCHED_NAME", "TRIGGER_NAME", "TRIGGER_GROUP");
+
+-- ----------------------------
+-- Foreign Key structure for table "QRTZ_CRON_TRIGGERS"
+-- ----------------------------
+ALTER TABLE "QRTZ_CRON_TRIGGERS" ADD FOREIGN KEY ("SCHED_NAME", "TRIGGER_NAME", "TRIGGER_GROUP") REFERENCES "QRTZ_TRIGGERS" ("SCHED_NAME", "TRIGGER_NAME", "TRIGGER_GROUP");
+
+-- ----------------------------
+-- Foreign Key structure for table "QRTZ_SIMPLE_TRIGGERS"
+-- ----------------------------
+ALTER TABLE "QRTZ_SIMPLE_TRIGGERS" ADD FOREIGN KEY ("SCHED_NAME", "TRIGGER_NAME", "TRIGGER_GROUP") REFERENCES "QRTZ_TRIGGERS" ("SCHED_NAME", "TRIGGER_NAME", "TRIGGER_GROUP");
+
+-- ----------------------------
+-- Foreign Key structure for table "QRTZ_SIMPROP_TRIGGERS"
+-- ----------------------------
+ALTER TABLE "QRTZ_SIMPROP_TRIGGERS" ADD FOREIGN KEY ("SCHED_NAME", "TRIGGER_NAME", "TRIGGER_GROUP") REFERENCES "QRTZ_TRIGGERS" ("SCHED_NAME", "TRIGGER_NAME", "TRIGGER_GROUP");
+
+-- ----------------------------
+-- Foreign Key structure for table "QRTZ_TRIGGERS"
+-- ----------------------------
+ALTER TABLE "QRTZ_TRIGGERS" ADD FOREIGN KEY ("SCHED_NAME", "JOB_NAME", "JOB_GROUP") REFERENCES "QRTZ_JOB_DETAILS" ("SCHED_NAME", "JOB_NAME", "JOB_GROUP");
+
+
+/*
+Navicat Oracle Data Transfer
+Oracle Client Version : 12.2.0.1.0
+
+Source Server : 192.168.1.200(jeecgboot)
+Source Server Version : 110200
+Source Host : 192.168.1.200:1521
+Source Schema : JEECGBOOT
+
+Target Server Type : ORACLE
+Target Server Version : 110200
+File Encoding : 65001
+
+Date: 2019-05-18 12:07:18
+*/
+
+
+
+-- ----------------------------
+-- Records of DEMO
+-- ----------------------------
+INSERT INTO "DEMO" VALUES ('08375a2dff80e821d5a158dd98302b23', '导入小虎', null, null, null, null, '2', '28', null, null, null, 'jeecg-boot', TO_DATE('2019-04-10 11:42:57', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "DEMO" VALUES ('1c2ba51b29a42d9de02bbd708ea8121a', '777777', '777', TO_DATE('2018-12-07 19:43:17', 'YYYY-MM-DD HH24:MI:SS'), null, null, null, '7', TO_DATE('2018-12-07 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), null, null, null, null, 'admin', TO_DATE('2019-02-21 18:26:04', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "DEMO" VALUES ('1dc29e80be14d1400f165b5c6b30c707', 'zhang daihao', null, null, null, null, '2', null, null, 'zhangdaiscott@163.com', null, null, null, null, null);
+INSERT INTO "DEMO" VALUES ('304e651dc769d5c9b6e08fb30457a602', '小白兔', null, null, null, null, '2', '28', null, null, null, 'scott', TO_DATE('2019-01-19 13:12:53', 'YYYY-MM-DD HH24:MI:SS'), 'qinfeng', TO_DATE('2019-01-19 13:13:12', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "DEMO" VALUES ('4', 'Sandy', '开源，很好', TO_DATE('2018-12-15 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), null, null, '2', '21', TO_DATE('2018-12-15 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), 'test4@baomidou.com', '聪明00', null, null, 'admin', TO_DATE('2019-02-25 16:29:27', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "DEMO" VALUES ('42c08b1a2e5b2a96ffa4cc88383d4b11', '秦50090', null, TO_DATE('2019-01-05 20:33:31', 'YYYY-MM-DD HH24:MI:SS'), null, null, null, '28', TO_DATE('2019-01-05 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'admin', TO_DATE('2019-01-19 20:33:54', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-01-19 20:34:29', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "DEMO" VALUES ('4436302a0de50bb83025286bc414d6a9', 'zhang daihao', null, null, null, null, null, null, null, 'zhangdaiscott@163.com', null, 'admin', TO_DATE('2019-01-19 15:39:04', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "DEMO" VALUES ('4981637bf71b0c1ed1365241dfcfa0ea', '小虎', null, null, null, null, '2', '28', null, null, null, 'scott', TO_DATE('2019-01-19 13:12:53', 'YYYY-MM-DD HH24:MI:SS'), 'qinfeng', TO_DATE('2019-01-19 13:13:12', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "DEMO" VALUES ('5c16e6a5c31296bcd3f1053d5d118815', '导入zhangdaiscott', null, null, null, null, '1', null, TO_DATE('2019-01-03 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'jeecg-boot', TO_DATE('2019-04-10 11:42:57', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "DEMO" VALUES ('7', 'zhangdaiscott', null, null, null, null, '1', null, TO_DATE('2019-01-03 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), null, null, null, null, null, null);
+INSERT INTO "DEMO" VALUES ('73bc58611012617ca446d8999379e4ac', '郭靖11a', '777', TO_DATE('2018-12-07 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), null, null, null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-28 18:16:39', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "DEMO" VALUES ('917e240eaa0b1b2d198ae869b64a81c3', 'zhang daihao', null, null, null, null, '2', '0', TO_DATE('2018-11-29 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), 'zhangdaiscott@163.com', null, null, null, null, null);
+INSERT INTO "DEMO" VALUES ('94420c5d8fc4420dde1e7196154b3a24', '秦111', null, null, null, null, null, null, null, null, null, 'scott', TO_DATE('2019-01-19 12:54:58', 'YYYY-MM-DD HH24:MI:SS'), 'qinfeng', TO_DATE('2019-01-19 13:12:10', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "DEMO" VALUES ('95740656751c5f22e5932ab0ae33b1e4', '杨康22a', '奸臣', null, null, null, null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-28 18:16:39', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "DEMO" VALUES ('b86897900c770503771c7bb88e5d1e9b', 'scott1', '开源、很好、hello', null, null, null, '1', null, null, 'zhangdaiscott@163.com', null, 'scott', TO_DATE('2019-01-19 12:22:34', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "DEMO" VALUES ('c0b7c3de7c62a295ab715943de8a315d', '秦风555', null, null, null, null, null, null, null, null, null, 'admin', TO_DATE('2019-01-19 13:18:30', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-01-19 13:18:50', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "DEMO" VALUES ('c28fa8391ef81d6fabd8bd894a7615aa', '小麦', null, null, null, null, '2', null, null, 'zhangdaiscott@163.com', null, 'jeecg-boot', TO_DATE('2019-04-04 17:18:09', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "DEMO" VALUES ('c2c0d49e3c01913067cf8d1fb3c971d2', 'zhang daihao', null, null, null, null, '2', null, null, 'zhangdaiscott@163.com', null, 'admin', TO_DATE('2019-01-19 23:37:18', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-01-21 16:49:06', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "DEMO" VALUES ('c96279c666b4b82e3ef1e4e2978701ce', '报名时间', null, null, null, null, null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-28 18:00:52', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "DEMO" VALUES ('d24668721446e8478eeeafe4db66dcff', 'zhang daihao999', null, null, null, null, '1', null, null, 'zhangdaiscott@163.com', null, null, null, null, null);
+INSERT INTO "DEMO" VALUES ('eaa6c1116b41dc10a94eae34cf990133', 'zhang daihao', null, null, null, null, null, null, null, 'zhangdaiscott@163.com', null, null, null, null, null);
+INSERT INTO "DEMO" VALUES ('ffa9da1ad40632dfcabac51d766865bd', '秦999', null, null, null, null, null, null, null, null, null, 'admin', TO_DATE('2019-01-19 23:36:34', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-14 17:30:43', 'YYYY-MM-DD HH24:MI:SS'));
+
+
+-- ----------------------------
+-- Records of JEECG_MONTHLY_GROWTH_ANALYSIS
+-- ----------------------------
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('1', '2018', '1月', '114758.90', '4426054.19');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('2', '2018', '2月', '8970734.12', '1230188.67');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('3', '2018', '3月', '26755421.23', '2048836.84');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('4', '2018', '4月', '2404990.63', '374171.44');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('5', '2018', '5月', '5450793.02', '502306.10');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('6', '2018', '6月', '17186212.11', '1375154.97');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('7', '2018', '7月', '579975.67', '461483.99');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('8', '2018', '8月', '1393590.06', '330403.76');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('9', '2018', '9月', '735761.21', '1647474.92');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('10', '2018', '10月', '1670442.44', '3423368.33');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('11', '2018', '11月', '2993130.34', '3552024');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('12', '2018', '12月', '4206227.26', '3645614.92');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('13', '2019', '1月', '483834.66', '418046.77');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('14', '2019', '2月', '11666578.65', '731352.20');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('15', '2019', '3月', '27080982.08', '1878538.81');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('16', '2019', '4月', '0', '0');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('17', '2019', '5月', '0', '0');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('18', '2019', '6月', '0', '0');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('19', '2019', '7月', '0', '0');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('20', '2019', '8月', '0', '0');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('21', '2019', '9月', '0', '0');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('22', '2019', '10月', '0', '0');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('23', '2019', '11月', '0', '0');
+INSERT INTO "JEECG_MONTHLY_GROWTH_ANALYSIS" VALUES ('24', '2019', '12月', '0', '0');
+
+-- ----------------------------
+-- Records of JEECG_ORDER_CUSTOMER
+-- ----------------------------
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('15538561502720', '3333', '1', null, null, null, '0d4a2e67b538ee1bc881e5ed34f670f0', 'jeecg-boot', TO_DATE('2019-03-29 18:42:55', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('15538561512681', '3332333', '2', null, null, null, '0d4a2e67b538ee1bc881e5ed34f670f0', 'jeecg-boot', TO_DATE('2019-03-29 18:42:55', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-29 18:43:12', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('15538561550142', '4442', '2', null, null, null, '0d4a2e67b538ee1bc881e5ed34f670f0', 'jeecg-boot', TO_DATE('2019-03-29 18:42:55', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('15541168497342', '444', null, null, null, null, 'f71f7f8930b5b6b1703d9948d189982b', 'admin', TO_DATE('2019-04-01 19:08:45', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('15541168499553', '5555', null, null, null, null, 'f71f7f8930b5b6b1703d9948d189982b', 'admin', TO_DATE('2019-04-01 19:08:45', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('15541169272690', '小王1', '1', null, null, '18611788525', 'f618a85b17e2c4dd58d268220c8dd9a1', 'admin', TO_DATE('2019-04-01 19:10:07', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('15541169288141', '效力1', '1', null, null, '18611788525', 'f618a85b17e2c4dd58d268220c8dd9a1', 'admin', TO_DATE('2019-04-01 19:10:07', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('15541169441372', '小红1', '1', null, null, '18611788525', 'f618a85b17e2c4dd58d268220c8dd9a1', 'admin', TO_DATE('2019-04-01 19:10:07', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('15543695362380', '1111', null, null, null, null, '5d6e2b9e44037526270b6206196f6689', 'admin', TO_DATE('2019-04-04 17:19:40', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('15543695397221', '222', null, null, null, null, '5d6e2b9e44037526270b6206196f6689', 'admin', TO_DATE('2019-04-04 17:19:40', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('15543695398992', '333', null, null, null, null, '5d6e2b9e44037526270b6206196f6689', 'admin', TO_DATE('2019-04-04 17:19:40', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('18dc5eb1068ccdfe90e358951ca1a3d6', 'dr2', null, null, null, null, '8ab1186410a65118c4d746eb085d3bed', 'admin', TO_DATE('2019-04-04 17:25:33', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('195d280490fe88ca1475512ddcaf2af9', '12', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('217a2bf83709775d2cd85bf598392327', '2', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('22bc052ae53ed09913b946abba93fa89', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('23bafeae88126c3bf3322a29a04f0d5e', 'x秦风', null, null, null, null, '163e2efcbc6d7d54eb3f8a137da8a75a', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('25c4a552c6843f36fad6303bfa99a382', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('2d32144e2bee63264f3f16215c258381', '33333', '2', null, null, null, 'd908bfee3377e946e59220c4a4eb414a', 'admin', TO_DATE('2019-04-01 16:27:03', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('2d43170d6327f941bd1a017999495e25', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('2e5f62a8b6e0a0ce19b52a6feae23d48', '3', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('313abf99558ac5f13ecca3b87e562ad1', 'scott', '2', null, null, null, 'b190737bd04cca8360e6f87c9ef9ec4e', 'admin', TO_DATE('2019-02-25 16:29:48', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('34a1c5cf6cee360ed610ed0bed70e0f9', '导入秦风', null, null, null, null, 'a2cce75872cc8fcc47f78de9ffd378c2', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('3c87400f8109b4cf43c5598f0d40e34d', '2', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('40964bcbbecb38e5ac15e6d08cf3cd43', '233', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('41e3dee0b0b6e6530eccb7fbb22fd7a3', '4555', '1', '370285198602058823', null, '18611788674', '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('4808ae8344c7679a4a2f461db5dc3a70', '44', '1', '370285198602058823', null, '18611788674', '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('4b6cef12f195fad94d57279b2241770d', 'dr12', null, null, null, null, '8ab1186410a65118c4d746eb085d3bed', 'admin', TO_DATE('2019-04-04 17:25:33', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('524e695283f8e8c256cc24f39d6d8542', '小王', '2', '370285198604033222', null, '18611788674', 'eb13ab35d2946a2b0cfe3452bca1e73f', 'admin', TO_DATE('2019-02-25 16:29:41', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('57c2a8367db34016114cbc9fa368dba0', '2', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('5df36a1608b8c7ac99ad9bc408fe54bf', '4', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('6b694e9ba54bb289ae9cc499e40031e7', 'x秦风', '1', null, null, null, 'b190737bd04cca8360e6f87c9ef9ec4e', 'admin', TO_DATE('2019-02-25 16:29:48', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('6c6fd2716c2dcd044ed03c2c95d261f8', '李四', '2', '370285198602058833', null, '18611788676', 'f71f7f8930b5b6b1703d9948d189982b', 'admin', TO_DATE('2019-04-01 19:08:45', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('742d008214dee0afff2145555692973e', '秦风', '1', '370285198602058822', null, '18611788676', '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('7469c3e5d371767ff90a739d297689b5', '导入秦风', '2', null, null, null, '3a867ebf2cebce9bae3f79676d8d86f3', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-08 17:35:02', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('7a96e2c7b24847d4a29940dbc0eda6e5', 'drscott', null, null, null, null, 'e73434dad84ebdce2d4e0c2a2f06d8ea', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('7f5a40818e225ee18bda6da7932ac5f9', '2', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('8011575abfd7c8085e71ff66df1124b9', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('8404f31d7196221a573c9bd6c8f15003', '小张', '1', '370285198602058211', null, '18611788676', 'eb13ab35d2946a2b0cfe3452bca1e73f', 'admin', TO_DATE('2019-02-25 16:29:41', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('859020e10a2f721f201cdbff78cf7b9f', 'scott', null, null, null, null, '163e2efcbc6d7d54eb3f8a137da8a75a', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('8cc3c4d26e3060975df3a2adb781eeb4', 'dr33', null, null, null, null, 'b2feb454e43c46b2038768899061e464', 'jeecg-boot', TO_DATE('2019-04-04 17:23:09', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('8d1725c23a6a50685ff0dedfd437030d', '4', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('933cae3a79f60a93922d59aace5346ce', '小王', null, '370285198604033222', null, '18611788674', '6a719071a29927a14f19482f8693d69a', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('9bdb5400b709ba4eaf3444de475880d7', 'dr22', null, null, null, null, '22c17790dcd04b296c4a2a089f71895f', 'jeecg-boot', TO_DATE('2019-04-04 17:23:09', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('9f87677f70e5f864679314389443a3eb', '33', '2', '370285198602058823', null, '18611788674', '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('a2c2b7101f75c02deb328ba777137897', '44', '2', '370285198602058823', null, '18611788674', '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('ab4d002dc552c326147e318c87d3bed4', 'ddddd', '1', '370285198604033222', null, '18611755848', '9a57c850e4f68cf94ef7d8585dbaf7e6', 'admin', TO_DATE('2019-04-04 17:30:47', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-04 17:31:17', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('ad116f722a438e5f23095a0b5fcc8e89', 'dr秦风', null, null, null, null, 'e73434dad84ebdce2d4e0c2a2f06d8ea', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('b1ba147b75f5eaa48212586097fc3fd1', '2', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('b43bf432c251f0e6b206e403b8ec29bc', 'lisi', null, null, null, null, 'f8889aaef6d1bccffd98d2889c0aafb5', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('bcdd300a7d44c45a66bdaac14903c801', '33', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('beb983293e47e2dc1a9b3d649aa3eb34', 'ddd3', null, null, null, null, 'd908bfee3377e946e59220c4a4eb414a', 'admin', TO_DATE('2019-04-01 16:27:03', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('c219808196406f1b8c7f1062589de4b5', '44', '1', '370285198602058823', null, '18611788674', '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('c8ed061d4b27c0c7a64e100f2b1c8ab5', '张经理', '2', '370285198602058823', null, '18611788674', '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('cc5de4af7f06cd6d250965ebe92a0395', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('cf8817bd703bf7c7c77a2118edc26cc7', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('d72b26fae42e71270fce2097a88da58a', '导入scott', null, 'www', null, null, '3a867ebf2cebce9bae3f79676d8d86f3', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-08 17:35:05', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('dbdc60a6ac1a8c43f24afee384039b68', 'xiaowang', null, null, null, null, 'f8889aaef6d1bccffd98d2889c0aafb5', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('dc5883b50466de94d900919ed96d97af', '33', '1', '370285198602058823', null, '18611788674', '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('deeb73e553ad8dc0a0b3cfd5a338de8e', '3333', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('e2570278bf189ac05df3673231326f47', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('e39cb23bb950b2bdedfc284686c6128a', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('e46fe9111a9100844af582a18a2aa402', '1', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('ee7af0acb9beb9bf8d8b3819a8a7fdc3', '2', null, null, null, null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('f5d2605e844192d9e548f9bd240ac908', '小张', null, '370285198602058211', null, '18611788676', '6a719071a29927a14f19482f8693d69a', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_CUSTOMER" VALUES ('f6db6547382126613a3e46e7cd58a5f2', '导入scott', null, null, null, null, 'a2cce75872cc8fcc47f78de9ffd378c2', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+
+-- ----------------------------
+-- Records of JEECG_ORDER_MAIN
+-- ----------------------------
+INSERT INTO "JEECG_ORDER_MAIN" VALUES ('163e2efcbc6d7d54eb3f8a137da8a75a', 'B100', null, null, '3000', null, 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_MAIN" VALUES ('3a867ebf2cebce9bae3f79676d8d86f3', '导入B100', '2222', null, '3000', null, 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-08 17:35:13', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "JEECG_ORDER_MAIN" VALUES ('4bca3ea6881d39dbf67ef1e42c649766', '1212', null, null, null, null, 'admin', TO_DATE('2019-04-03 10:55:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_MAIN" VALUES ('4cba137333127e8e31df7ad168cc3732', '青岛订单A0001', '2', TO_DATE('2019-04-03 10:56:07', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'admin', TO_DATE('2019-04-03 10:56:11', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_MAIN" VALUES ('54e739bef5b67569c963c38da52581ec', 'NC911', '1', TO_DATE('2019-02-18 09:58:51', 'YYYY-MM-DD HH24:MI:SS'), '40', null, 'admin', TO_DATE('2019-02-18 09:58:47', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-18 09:58:59', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "JEECG_ORDER_MAIN" VALUES ('5d6e2b9e44037526270b6206196f6689', 'N333', null, TO_DATE('2019-04-04 17:19:11', 'YYYY-MM-DD HH24:MI:SS'), null, '聪明00', 'admin', TO_DATE('2019-04-04 17:19:40', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_MAIN" VALUES ('6a719071a29927a14f19482f8693d69a', 'c100', null, null, '5000', null, 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_MAIN" VALUES ('8ab1186410a65118c4d746eb085d3bed', '导入400', '1', TO_DATE('2019-02-18 09:58:51', 'YYYY-MM-DD HH24:MI:SS'), '40', null, 'admin', TO_DATE('2019-02-18 09:58:47', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-18 09:58:59', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "JEECG_ORDER_MAIN" VALUES ('9a57c850e4f68cf94ef7d8585dbaf7e6', 'halou100dd', null, TO_DATE('2019-04-04 17:30:32', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'admin', TO_DATE('2019-04-04 17:30:41', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-04 17:31:08', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "JEECG_ORDER_MAIN" VALUES ('a2cce75872cc8fcc47f78de9ffd378c2', '导入B100', null, null, '3000', null, 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_MAIN" VALUES ('b190737bd04cca8360e6f87c9ef9ec4e', 'B0018888', '1', null, null, null, 'admin', TO_DATE('2019-02-15 18:39:29', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-15 18:39:37', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "JEECG_ORDER_MAIN" VALUES ('d908bfee3377e946e59220c4a4eb414a', 'SSSS001', null, null, '599', null, 'admin', TO_DATE('2019-04-01 15:43:03', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-01 16:26:52', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "JEECG_ORDER_MAIN" VALUES ('e73434dad84ebdce2d4e0c2a2f06d8ea', '导入200', null, null, '3000', null, 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_MAIN" VALUES ('eb13ab35d2946a2b0cfe3452bca1e73f', 'BJ9980', '1', null, '90', null, 'admin', TO_DATE('2019-02-16 17:36:42', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-16 17:46:16', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "JEECG_ORDER_MAIN" VALUES ('f618a85b17e2c4dd58d268220c8dd9a1', 'N001', null, TO_DATE('2019-04-01 19:09:02', 'YYYY-MM-DD HH24:MI:SS'), '2222', null, 'admin', TO_DATE('2019-04-01 19:09:47', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-01 19:10:00', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "JEECG_ORDER_MAIN" VALUES ('f71f7f8930b5b6b1703d9948d189982b', 'BY911', null, TO_DATE('2019-04-06 19:08:39', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'admin', TO_DATE('2019-04-01 16:36:02', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-01 16:36:08', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "JEECG_ORDER_MAIN" VALUES ('f8889aaef6d1bccffd98d2889c0aafb5', 'A100', null, TO_DATE('2018-10-10 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '6000', null, 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_MAIN" VALUES ('fe81ee5d19bbf9eef2066d4f29dfbe0f', 'uuuu', null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-03 11:00:39', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+
+-- ----------------------------
+-- Records of JEECG_ORDER_TICKET
+-- ----------------------------
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('0f0e3a40a215958f807eea08a6e1ac0a', '88', null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('0fa3bd0bbcf53650c0bb3c0cac6d8cb7', 'ffff', TO_DATE('2019-02-21 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), 'eb13ab35d2946a2b0cfe3452bca1e73f', 'admin', TO_DATE('2019-02-25 16:29:41', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('14221afb4f5f749c1deef26ac56fdac3', '33', TO_DATE('2019-03-09 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('15538561502730', '222', null, '0d4a2e67b538ee1bc881e5ed34f670f0', 'jeecg-boot', TO_DATE('2019-03-29 18:42:55', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('15538561526461', '2244', TO_DATE('2019-03-29 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '0d4a2e67b538ee1bc881e5ed34f670f0', 'jeecg-boot', TO_DATE('2019-03-29 18:42:55', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-29 18:43:26', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('15541168478913', 'hhhhh', null, 'f71f7f8930b5b6b1703d9948d189982b', 'admin', TO_DATE('2019-04-01 19:08:45', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('15541169272810', '22211', TO_DATE('2019-04-01 19:09:40', 'YYYY-MM-DD HH24:MI:SS'), 'f618a85b17e2c4dd58d268220c8dd9a1', 'admin', TO_DATE('2019-04-01 19:10:07', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('15541169302331', '333311', TO_DATE('2019-04-01 19:09:40', 'YYYY-MM-DD HH24:MI:SS'), 'f618a85b17e2c4dd58d268220c8dd9a1', 'admin', TO_DATE('2019-04-01 19:10:07', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('15541169713092', '333311', TO_DATE('2019-04-01 19:09:47', 'YYYY-MM-DD HH24:MI:SS'), 'f618a85b17e2c4dd58d268220c8dd9a1', 'admin', TO_DATE('2019-04-01 19:10:07', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('15542604293170', 'c', null, 'fe81ee5d19bbf9eef2066d4f29dfbe0f', 'jeecg-boot', TO_DATE('2019-04-03 11:00:39', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('15542604374431', 'd', null, 'fe81ee5d19bbf9eef2066d4f29dfbe0f', 'jeecg-boot', TO_DATE('2019-04-03 11:00:39', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('15543695362380', 'ccc2', null, '5d6e2b9e44037526270b6206196f6689', 'admin', TO_DATE('2019-04-04 17:19:40', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('15543695381291', 'cccc1', null, '5d6e2b9e44037526270b6206196f6689', 'admin', TO_DATE('2019-04-04 17:19:40', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('15543695740352', 'dddd', null, '5d6e2b9e44037526270b6206196f6689', 'admin', TO_DATE('2019-04-04 17:19:40', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('18905bc89ee3851805aab38ed3b505ec', '44', null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('1f809cbd26f4e574697e1c10de575d72', 'A100', null, 'e73434dad84ebdce2d4e0c2a2f06d8ea', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('21051adb51529bdaa8798b5a3dd7f7f7', 'C10029', TO_DATE('2019-02-20 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('269576e766b917f8b6509a2bb0c4d4bd', 'A100', null, '163e2efcbc6d7d54eb3f8a137da8a75a', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('2d473ffc79e5b38a17919e15f8b7078e', '66', TO_DATE('2019-03-29 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('3655b66fca5fef9c6aac6d70182ffda2', 'AA123', TO_DATE('2019-04-01 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), 'd908bfee3377e946e59220c4a4eb414a', 'admin', TO_DATE('2019-04-01 16:27:03', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('365d5919155473ade45840fd626c51a9', 'dddd', TO_DATE('2019-04-04 17:25:29', 'YYYY-MM-DD HH24:MI:SS'), '8ab1186410a65118c4d746eb085d3bed', 'admin', TO_DATE('2019-04-04 17:25:33', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('4889a782e78706ab4306a925cfb163a5', 'C34', TO_DATE('2019-04-01 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), 'd908bfee3377e946e59220c4a4eb414a', 'admin', TO_DATE('2019-04-01 16:35:00', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-01 16:35:07', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('48d385796382cf87fa4bdf13b42d9a28', '导入A100', null, '3a867ebf2cebce9bae3f79676d8d86f3', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('541faed56efbeb4be9df581bd8264d3a', '88', null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('57a27a7dfd6a48e7d981f300c181b355', '6', TO_DATE('2019-03-30 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('5ce4dc439c874266e42e6c0ff8dc8b5c', '导入A100', null, 'a2cce75872cc8fcc47f78de9ffd378c2', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('5f16e6a64ab22a161bd94cc205f2c662', '222', TO_DATE('2019-02-23 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), 'b190737bd04cca8360e6f87c9ef9ec4e', 'admin', TO_DATE('2019-02-25 16:29:48', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('645a06152998a576c051474157625c41', '88', TO_DATE('2019-04-04 17:25:31', 'YYYY-MM-DD HH24:MI:SS'), '8ab1186410a65118c4d746eb085d3bed', 'admin', TO_DATE('2019-04-04 17:25:33', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('6e3562f2571ea9e96b2d24497b5f5eec', '55', TO_DATE('2019-03-23 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('8fd2b389151568738b1cc4d8e27a6110', '导入A100', null, 'a2cce75872cc8fcc47f78de9ffd378c2', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('93f1a84053e546f59137432ff5564cac', '55', null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('969ddc5d2e198d50903686917f996470', 'A10029', TO_DATE('2019-04-01 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), 'f71f7f8930b5b6b1703d9948d189982b', 'admin', TO_DATE('2019-04-01 19:08:45', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('96e7303a8d22a5c384e08d7bcf7ac2bf', 'A100', null, 'e73434dad84ebdce2d4e0c2a2f06d8ea', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('9e8a3336f6c63f558f2b68ce2e1e666e', 'dddd', null, '9a57c850e4f68cf94ef7d8585dbaf7e6', 'admin', TO_DATE('2019-04-04 17:30:55', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('a28db02c810c65660015095cb81ed434', 'A100', null, 'f8889aaef6d1bccffd98d2889c0aafb5', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('b217bb0e4ec6a45b6cbf6db880060c0f', 'A100', null, '6a719071a29927a14f19482f8693d69a', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('ba708df70bb2652ed1051a394cfa0bb3', '333', null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('beabbfcb195d39bedeeafe8318794562', 'A1345', TO_DATE('2019-04-01 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), 'd908bfee3377e946e59220c4a4eb414a', 'admin', TO_DATE('2019-04-01 16:27:04', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('bf450223cb505f89078a311ef7b6ed16', '777', TO_DATE('2019-03-30 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('c06165b6603e3e1335db187b3c841eef', 'fff', null, '9a57c850e4f68cf94ef7d8585dbaf7e6', 'admin', TO_DATE('2019-04-04 17:30:58', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('c113136abc26ace3a6da4e41d7dc1c7e', '44', TO_DATE('2019-03-15 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('c1abdc2e30aeb25de13ad6ee3488ac24', '77', TO_DATE('2019-03-22 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('c23751a7deb44f553ce50a94948c042a', '33', TO_DATE('2019-03-09 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '8ab1186410a65118c4d746eb085d3bed', 'admin', TO_DATE('2019-04-04 17:25:33', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('c64547666b634b3d6a0feedcf05f25ce', 'C10019', TO_DATE('2019-04-01 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), 'f71f7f8930b5b6b1703d9948d189982b', 'admin', TO_DATE('2019-04-01 19:08:45', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('c8b8d3217f37da78dddf711a1f7da485', 'A100', null, '163e2efcbc6d7d54eb3f8a137da8a75a', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('cab691c1c1ff7a6dfd7248421917fd3c', 'A100', null, 'f8889aaef6d1bccffd98d2889c0aafb5', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('cca10a9a850b456d9b72be87da7b0883', '77', null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('d2fbba11f4814d9b1d3cb1a3f342234a', 'C10019', TO_DATE('2019-02-18 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('d746c1ed956a562e97eef9c6faf94efa', '111', TO_DATE('2019-02-01 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), 'b190737bd04cca8360e6f87c9ef9ec4e', 'admin', TO_DATE('2019-02-25 16:29:48', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('dbdb07a16826808e4276e84b2aa4731a', '导入A100', null, '3a867ebf2cebce9bae3f79676d8d86f3', 'jeecg-boot', TO_DATE('2019-03-29 18:43:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('e7075639c37513afc0bbc4bf7b5d98b9', '88', null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('fa759dc104d0371f8aa28665b323dab6', '888', null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "JEECG_ORDER_TICKET" VALUES ('ff197da84a9a3af53878eddc91afbb2e', '33', null, '54e739bef5b67569c963c38da52581ec', 'admin', TO_DATE('2019-03-15 16:50:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+-----------------------
+-- Records of JEECG_PROJECT_NATURE_INCOME
+-- ----------------------------
+INSERT INTO "JEECG_PROJECT_NATURE_INCOME" VALUES ('1', '市场化-电商业务', '4865.41', '0', '0', '0', '0', '0');
+INSERT INTO "JEECG_PROJECT_NATURE_INCOME" VALUES ('2', '统筹型', '35767081.88', '0', '0', '0', '0', '0');
+INSERT INTO "JEECG_PROJECT_NATURE_INCOME" VALUES ('3', '市场化-非股东', '1487045.35', '0', '0', '0', '0', '0');
+INSERT INTO "JEECG_PROJECT_NATURE_INCOME" VALUES ('4', '市场化-参控股', '382690.56', '0', '0', '0', '0', '0');
+INSERT INTO "JEECG_PROJECT_NATURE_INCOME" VALUES ('5', '市场化-员工福利', '256684.91', '0', '0', '0', '0', '0');
+INSERT INTO "JEECG_PROJECT_NATURE_INCOME" VALUES ('6', '市场化-再保险', '563451.03', '0', '0', '0', '0', '0');
+INSERT INTO "JEECG_PROJECT_NATURE_INCOME" VALUES ('7', '市场化-海外业务', '760576.25', '770458.75', '0', '0', '0', '0');
+INSERT INTO "JEECG_PROJECT_NATURE_INCOME" VALUES ('8', '市场化-风险咨询', '910183.93', '0', '0', '0', '0', '226415.09');
+
+-- ----------------------------
+-- Records of QRTZ_LOCKS
+-- ----------------------------
+INSERT INTO "QRTZ_LOCKS" VALUES ('quartzScheduler', 'TRIGGER_ACCESS');
+
+-- ----------------------------
+-- Records of SYS_ANNOUNCEMENT
+-- ----------------------------
+INSERT INTO "SYS_ANNOUNCEMENT" VALUES ('1b714f8ebc3cc33f8b4f906103b6a18d', '5467567', null, null, null, 'admin', null, '2', null, '1', TO_DATE('2019-03-30 12:40:38', 'YYYY-MM-DD HH24:MI:SS'), null, '0', 'admin', TO_DATE('2019-02-26 17:23:26', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-26 17:35:10', 'YYYY-MM-DD HH24:MI:SS'), null);
+INSERT INTO "SYS_ANNOUNCEMENT" VALUES ('3d11237ccdf62450d20bb8abdb331178', '111222', null, null, null, null, null, '2', null, '0', null, null, '1', 'admin', TO_DATE('2019-03-29 17:19:47', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-29 17:19:50', 'YYYY-MM-DD HH24:MI:SS'), null);
+INSERT INTO "SYS_ANNOUNCEMENT" VALUES ('7ef04e95f8de030b1d5f7a9144090dc6', '111', null, TO_DATE('2019-02-06 17:28:10', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2019-03-08 17:28:11', 'YYYY-MM-DD HH24:MI:SS'), null, null, '2', null, '0', null, null, '1', 'admin', TO_DATE('2019-02-26 17:28:17', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-26 19:59:49', 'YYYY-MM-DD HH24:MI:SS'), null);
+INSERT INTO "SYS_ANNOUNCEMENT" VALUES ('93a9060a1c20e4bf98b3f768a02c2ff9', '111', '111', TO_DATE('2019-02-06 17:20:17', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2019-02-21 17:20:20', 'YYYY-MM-DD HH24:MI:SS'), 'admin', 'M', '2', 'ALL', '1', TO_DATE('2019-02-26 17:24:29', 'YYYY-MM-DD HH24:MI:SS'), null, '0', 'admin', TO_DATE('2019-02-26 17:16:26', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-26 17:19:35', 'YYYY-MM-DD HH24:MI:SS'), null);
+INSERT INTO "SYS_ANNOUNCEMENT" VALUES ('de1dc57f31037079e1e55c8347fe6ef7', '222', '2222', TO_DATE('2019-02-06 17:28:26', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2019-02-23 17:28:28', 'YYYY-MM-DD HH24:MI:SS'), 'admin', 'M', '2', 'ALL', '1', TO_DATE('2019-03-29 17:19:56', 'YYYY-MM-DD HH24:MI:SS'), null, '1', 'admin', TO_DATE('2019-02-26 17:28:36', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-26 17:28:40', 'YYYY-MM-DD HH24:MI:SS'), null);
+INSERT INTO "SYS_ANNOUNCEMENT" VALUES ('e52f3eb6215f139cb2224c52517af3bd', '334', '334', null, null, null, null, '2', null, '0', null, null, '1', 'admin', TO_DATE('2019-03-30 12:40:28', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-30 12:40:32', 'YYYY-MM-DD HH24:MI:SS'), null);
+
+-- ----------------------------
+-- Records of SYS_ANNOUNCEMENT_SEND
+-- ----------------------------
+INSERT INTO "SYS_ANNOUNCEMENT_SEND" VALUES ('646c0c405ec643d4dc4160db2446f8ff', '93a9060a1c20e4bf98b3f768a02c2ff9', 'e9ca23d68d884d4ebb19d07889727dae', '0', null, 'admin', TO_DATE('2019-05-17 11:50:56', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+
+-- ----------------------------
+-- Records of SYS_DATA_LOG
+-- ----------------------------
+INSERT INTO "SYS_DATA_LOG" VALUES ('402880f05ab0d198015ab12274bf0006', 'admin', TO_DATE('2017-03-09 11:35:09', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'jeecg_demo', '4028ef81550c1a7901550c1cd6e70001', '{"mobilePhone":"","officePhone":"","email":"","createDate":"Jun 23, 2016 12:00:00 PM","sex":"1","depId":"402880e447e99cf10147e9a03b320003","userName":"9001","status":"1","content":"111","id":"4028ef81550c1a7901550c1cd6e70001"}', '3');
+INSERT INTO "SYS_DATA_LOG" VALUES ('402880f05ab6d12b015ab700bead0009', 'admin', TO_DATE('2017-03-10 14:56:03', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'jeecg_demo', '402880f05ab6d12b015ab700be8d0008', '{"mobilePhone":"","officePhone":"","email":"","createDate":"Mar 10, 2017 2:56:03 PM","sex":"0","depId":"402880e447e99cf10147e9a03b320003","userName":"111","status":"0","id":"402880f05ab6d12b015ab700be8d0008"}', '1');
+INSERT INTO "SYS_DATA_LOG" VALUES ('402880f05ab6d12b015ab705a23f000d', 'admin', TO_DATE('2017-03-10 15:01:24', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'jeecg_demo', '402880f05ab6d12b015ab705a233000c', '{"mobilePhone":"","officePhone":"11","email":"","createDate":"Mar 10, 2017 3:01:24 PM","sex":"0","depId":"402880e447e99cf10147e9a03b320003","userName":"11","status":"0","id":"402880f05ab6d12b015ab705a233000c"}', '1');
+INSERT INTO "SYS_DATA_LOG" VALUES ('402880f05ab6d12b015ab712a6420013', 'admin', TO_DATE('2017-03-10 15:15:37', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'jeecg_demo', '402880f05ab6d12b015ab712a6360012', '{"mobilePhone":"","officePhone":"","email":"","createDate":"Mar 10, 2017 3:15:37 PM","sex":"0","depId":"402880e447e99cf10147e9a03b320003","userName":"小王","status":"0","id":"402880f05ab6d12b015ab712a6360012"}', '1');
+INSERT INTO "SYS_DATA_LOG" VALUES ('402880f05ab6d12b015ab712d0510015', 'admin', TO_DATE('2017-03-10 15:15:47', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'jeecg_demo', '402880f05ab6d12b015ab712a6360012', '{"mobilePhone":"18611788525","officePhone":"","email":"","createDate":"Mar 10, 2017 3:15:37 AM","sex":"0","depId":"402880e447e99cf10147e9a03b320003","userName":"小王","status":"0","id":"402880f05ab6d12b015ab712a6360012"}', '2');
+INSERT INTO "SYS_DATA_LOG" VALUES ('402880f05ab6d12b015ab71308240018', 'admin', TO_DATE('2017-03-10 15:16:02', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'jeecg_demo', '8a8ab0b246dc81120146dc81860f016f', '{"mobilePhone":"13111111111","officePhone":"66666666","email":"demo@jeecg.com","age":12,"salary":10.00,"birthday":"Feb 14, 2014 12:00:00 AM","sex":"1","depId":"402880e447e99cf10147e9a03b320003","userName":"小明","status":"","content":"","id":"8a8ab0b246dc81120146dc81860f016f"}', '1');
+INSERT INTO "SYS_DATA_LOG" VALUES ('402880f05ab6d12b015ab72806c3001b', 'admin', TO_DATE('2017-03-10 15:38:58', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'jeecg_demo', '8a8ab0b246dc81120146dc81860f016f', '{"mobilePhone":"18611788888","officePhone":"66666666","email":"demo@jeecg.com","age":12,"salary":10.00,"birthday":"Feb 14, 2014 12:00:00 AM","sex":"1","depId":"402880e447e99cf10147e9a03b320003","userName":"小明","status":"","content":"","id":"8a8ab0b246dc81120146dc81860f016f"}', '2');
+INSERT INTO "SYS_DATA_LOG" VALUES ('4028ef815318148a0153181567690001', 'admin', TO_DATE('2016-02-25 18:59:29', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'jeecg_demo', '4028ef815318148a0153181566270000', '{"mobilePhone":"13423423423","officePhone":"1","email":"","age":1,"salary":1,"birthday":"Feb 25, 2016 12:00:00 AM","createDate":"Feb 25, 2016 6:59:24 PM","depId":"402880e447e9a9570147e9b6a3be0005","userName":"1","status":"0","id":"4028ef815318148a0153181566270000"}', '1');
+INSERT INTO "SYS_DATA_LOG" VALUES ('4028ef815318148a01531815ec5c0003', 'admin', TO_DATE('2016-02-25 19:00:03', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'jeecg_demo', '4028ef815318148a0153181566270000', '{"mobilePhone":"13426498659","officePhone":"1","email":"","age":1,"salary":1.00,"birthday":"Feb 25, 2016 12:00:00 AM","createDate":"Feb 25, 2016 6:59:24 AM","depId":"402880e447e9a9570147e9b6a3be0005","userName":"1","status":"0","id":"4028ef815318148a0153181566270000"}', '2');
+INSERT INTO "SYS_DATA_LOG" VALUES ('4028ef8153c028db0153c0502e6b0003', 'admin', TO_DATE('2016-03-29 10:59:53', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'jeecg_demo', '4028ef8153c028db0153c0502d420002', '{"mobilePhone":"18455477548","officePhone":"123","email":"","createDate":"Mar 29, 2016 10:59:53 AM","depId":"402880e447e99cf10147e9a03b320003","userName":"123","status":"0","id":"4028ef8153c028db0153c0502d420002"}', '1');
+INSERT INTO "SYS_DATA_LOG" VALUES ('4028ef8153c028db0153c0509aa40006', 'admin', TO_DATE('2016-03-29 11:00:21', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'jeecg_demo', '4028ef8153c028db0153c0509a3e0005', '{"mobilePhone":"13565486458","officePhone":"","email":"","createDate":"Mar 29, 2016 11:00:21 AM","depId":"402880e447e99cf10147e9a03b320003","userName":"22","status":"0","id":"4028ef8153c028db0153c0509a3e0005"}', '1');
+INSERT INTO "SYS_DATA_LOG" VALUES ('4028ef8153c028db0153c051c4a70008', 'admin', TO_DATE('2016-03-29 11:01:37', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'jeecg_demo', '4028ef8153c028db0153c0509a3e0005', '{"mobilePhone":"13565486458","officePhone":"","email":"","createDate":"Mar 29, 2016 11:00:21 AM","depId":"402880e447e99cf10147e9a03b320003","userName":"22","status":"0","id":"4028ef8153c028db0153c0509a3e0005"}', '2');
+INSERT INTO "SYS_DATA_LOG" VALUES ('4028ef8153c028db0153c051d4b5000a', 'admin', TO_DATE('2016-03-29 11:01:41', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'jeecg_demo', '4028ef8153c028db0153c0502d420002', '{"mobilePhone":"13565486458","officePhone":"123","email":"","createDate":"Mar 29, 2016 10:59:53 AM","depId":"402880e447e99cf10147e9a03b320003","userName":"123","status":"0","id":"4028ef8153c028db0153c0502d420002"}', '2');
+INSERT INTO "SYS_DATA_LOG" VALUES ('4028ef8153c028db0153c07033d8000d', 'admin', TO_DATE('2016-03-29 11:34:52', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'jeecg_demo', '4028ef8153c028db0153c0502d420002', '{"mobilePhone":"13565486458","officePhone":"123","email":"","age":23,"createDate":"Mar 29, 2016 10:59:53 AM","depId":"402880e447e99cf10147e9a03b320003","userName":"123","status":"0","id":"4028ef8153c028db0153c0502d420002"}', '3');
+INSERT INTO "SYS_DATA_LOG" VALUES ('4028ef8153c028db0153c070492e000f', 'admin', TO_DATE('2016-03-29 11:34:57', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'jeecg_demo', '4028ef8153c028db0153c0509a3e0005', '{"mobilePhone":"13565486458","officePhone":"","email":"","age":22,"createDate":"Mar 29, 2016 11:00:21 AM","depId":"402880e447e99cf10147e9a03b320003","userName":"22","status":"0","id":"4028ef8153c028db0153c0509a3e0005"}', '3');
+INSERT INTO "SYS_DATA_LOG" VALUES ('4028ef81550c1a7901550c1cd7850002', 'admin', TO_DATE('2016-06-01 21:17:44', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'jeecg_demo', '4028ef81550c1a7901550c1cd6e70001', '{"mobilePhone":"","officePhone":"","email":"","createDate":"Jun 1, 2016 9:17:44 PM","sex":"1","depId":"402880e447e99cf10147e9a03b320003","userName":"121221","status":"0","id":"4028ef81550c1a7901550c1cd6e70001"}', '1');
+INSERT INTO "SYS_DATA_LOG" VALUES ('4028ef81568c31ec01568c3307080004', 'admin', TO_DATE('2016-08-15 11:16:09', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'jeecg_demo', '4028ef81550c1a7901550c1cd6e70001', '{"mobilePhone":"","officePhone":"","email":"","createDate":"Jun 23, 2016 12:00:00 PM","sex":"1","depId":"402880e447e99cf10147e9a03b320003","userName":"9001","status":"1","content":"111","id":"4028ef81550c1a7901550c1cd6e70001"}', '2');
+
+-- ----------------------------
+-- Records of SYS_DEPART
+-- ----------------------------
+INSERT INTO "SYS_DEPART" VALUES ('4f1765520d6346f9bd9c79e2479e5b12', 'c6d7cb4deeac411cb3384b1b31278596', '市场部', null, null, '0', null, '2', 'A01A03', null, null, null, null, null, '0', 'admin', TO_DATE('2019-02-20 17:15:34', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-26 16:36:18', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DEPART" VALUES ('5159cde220114246b045e574adceafe9', '6d35e179cd814e3299bd588ea7daed3f', '研发部', null, null, '0', null, '2', 'A02A02', null, null, null, null, null, '0', 'admin', TO_DATE('2019-02-26 16:44:38', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-07 09:36:53', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DEPART" VALUES ('57197590443c44f083d42ae24ef26a2c', 'c6d7cb4deeac411cb3384b1b31278596', '研发部', null, null, '0', null, '2', 'A01A05', null, null, null, null, null, '0', 'admin', TO_DATE('2019-02-21 16:14:41', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-27 19:05:49', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DEPART" VALUES ('67fc001af12a4f9b8458005d3f19934a', 'c6d7cb4deeac411cb3384b1b31278596', '财务部', null, null, '0', null, '2', 'A01A04', null, null, null, null, null, '0', 'admin', TO_DATE('2019-02-21 16:14:35', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-25 12:49:41', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DEPART" VALUES ('6d35e179cd814e3299bd588ea7daed3f', null, '卓尔互动公司', null, null, '0', null, '1', 'A02', null, null, null, null, null, '0', 'admin', TO_DATE('2019-02-26 16:36:39', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-22 16:47:25', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DEPART" VALUES ('743ba9dbdc114af8953a11022ef3096a', 'f28c6f53abd841ac87ead43afc483433', '财务部', null, null, '0', null, '2', 'A03A01', null, null, null, null, null, '0', 'admin', TO_DATE('2019-03-22 16:45:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DEPART" VALUES ('a7d7e77e06c84325a40932163adcdaa6', '6d35e179cd814e3299bd588ea7daed3f', '财务部', null, null, '0', null, '2', 'A02A01', null, null, null, null, null, '0', 'admin', TO_DATE('2019-02-26 16:36:47', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-26 16:37:25', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DEPART" VALUES ('c6d7cb4deeac411cb3384b1b31278596', null, '北京国炬公司', null, null, '0', null, '1', 'A01', null, null, null, null, null, '0', 'admin', TO_DATE('2019-02-11 14:21:51', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-22 16:47:19', 'YYYY-MM-DD HH24:MI:SS'));
+
+-- ----------------------------
+-- Records of SYS_DICT
+-- ----------------------------
+INSERT INTO "SYS_DICT" VALUES ('0b5d19e1fce4b2e6647e6b4a17760c14', '通告类型', 'msg_category', '消息类型1:通知公告2:系统消息', '1', 'admin', TO_DATE('2019-04-22 18:01:35', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0');
+INSERT INTO "SYS_DICT" VALUES ('236e8a4baff0db8c62c00dd95632834f', '同步工作流引擎', 'activiti_sync', '同步工作流引擎', '1', 'admin', TO_DATE('2019-05-15 15:27:33', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0');
+INSERT INTO "SYS_DICT" VALUES ('2e02df51611a4b9632828ab7e5338f00', '权限策略', 'perms_type', '权限策略', '1', 'admin', TO_DATE('2019-04-26 18:26:55', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0');
+INSERT INTO "SYS_DICT" VALUES ('2f0320997ade5dd147c90130f7218c3e', '推送类别', 'msg_type', null, '1', 'admin', TO_DATE('2019-03-17 21:21:32', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-26 19:57:45', 'YYYY-MM-DD HH24:MI:SS'), '0');
+INSERT INTO "SYS_DICT" VALUES ('3486f32803bb953e7155dab3513dc68b', '删除状态', 'del_flag', null, '1', 'admin', TO_DATE('2019-01-18 21:46:26', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-30 11:17:11', 'YYYY-MM-DD HH24:MI:SS'), '0');
+INSERT INTO "SYS_DICT" VALUES ('3d9a351be3436fbefb1307d4cfb49bf2', '性别', 'sex', null, '1', null, TO_DATE('2019-01-04 14:56:32', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-30 11:28:27', 'YYYY-MM-DD HH24:MI:SS'), '1');
+INSERT INTO "SYS_DICT" VALUES ('404a04a15f371566c658ee9ef9fc392a', 'cehis2', '22', null, '2', 'admin', TO_DATE('2019-01-30 11:17:21', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-30 11:18:12', 'YYYY-MM-DD HH24:MI:SS'), '0');
+INSERT INTO "SYS_DICT" VALUES ('4274efc2292239b6f000b153f50823ff', '全局权限策略', 'global_perms_type', '全局权限策略', '1', 'admin', TO_DATE('2019-05-10 17:54:05', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0');
+INSERT INTO "SYS_DICT" VALUES ('4c03fca6bf1f0299c381213961566349', 'Online图表展示模板', 'online_graph_display_template', 'Online图表展示模板', '1', 'admin', TO_DATE('2019-04-12 17:28:50', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0');
+INSERT INTO "SYS_DICT" VALUES ('4c753b5293304e7a445fd2741b46529d', '字典状态', 'dict_item_status', null, '1', 'admin', TO_DATE('2020-06-18 23:18:42', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-30 19:33:52', 'YYYY-MM-DD HH24:MI:SS'), '1');
+INSERT INTO "SYS_DICT" VALUES ('4d7fec1a7799a436d26d02325eff295e', '优先级', 'priority', '优先级', '1', 'admin', TO_DATE('2019-03-16 17:03:34', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-16 17:39:23', 'YYYY-MM-DD HH24:MI:SS'), '0');
+INSERT INTO "SYS_DICT" VALUES ('4e4602b3e3686f0911384e188dc7efb4', '条件规则', 'rule_conditions', null, '1', 'admin', TO_DATE('2019-04-01 10:15:03', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-01 10:30:47', 'YYYY-MM-DD HH24:MI:SS'), '0');
+INSERT INTO "SYS_DICT" VALUES ('4f69be5f507accea8d5df5f11346181a', '发送消息类型', 'msgType', null, '1', 'admin', TO_DATE('2019-04-11 14:27:09', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0');
+INSERT INTO "SYS_DICT" VALUES ('68168534ff5065a152bfab275c2136f8', '有效无效状态', 'valid_status', '有效无效状态', '1', 'admin', TO_DATE('2020-09-26 19:21:14', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-26 19:21:23', 'YYYY-MM-DD HH24:MI:SS'), '0');
+INSERT INTO "SYS_DICT" VALUES ('6b78e3f59faec1a4750acff08030a79b', '用户类型', 'user_type', null, '2', null, TO_DATE('2019-01-04 14:59:01', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-18 23:28:18', 'YYYY-MM-DD HH24:MI:SS'), '0');
+INSERT INTO "SYS_DICT" VALUES ('72cce0989df68887546746d8f09811aa', 'Online表单类型', 'cgform_table_type', null, '1', 'admin', TO_DATE('2019-01-27 10:13:02', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-30 11:37:36', 'YYYY-MM-DD HH24:MI:SS'), '0');
+INSERT INTO "SYS_DICT" VALUES ('78bda155fe380b1b3f175f1e88c284c6', '流程状态', 'bpm_status', '流程状态', '1', 'admin', TO_DATE('2019-05-09 16:31:52', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0');
+INSERT INTO "SYS_DICT" VALUES ('83bfb33147013cc81640d5fd9eda030c', '日志类型', 'log_type', null, '1', 'admin', TO_DATE('2019-03-18 23:22:19', 'YYYY-MM-DD HH24:MI:SS'), null, null, '1');
+INSERT INTO "SYS_DICT" VALUES ('845da5006c97754728bf48b6a10f79cc', '状态', 'status', null, '2', 'admin', TO_DATE('2019-03-18 21:45:25', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-18 21:58:25', 'YYYY-MM-DD HH24:MI:SS'), '0');
+INSERT INTO "SYS_DICT" VALUES ('8dfe32e2d29ea9430a988b3b558bf233', '发布状态', 'send_status', '发布状态', '1', 'admin', TO_DATE('2019-04-16 17:40:42', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0');
+INSERT INTO "SYS_DICT" VALUES ('a9d9942bd0eccb6e89de92d130ec4c4a', '消息发送状态', 'msgSendStatus', null, '1', 'admin', TO_DATE('2019-04-12 18:18:17', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0');
+INSERT INTO "SYS_DICT" VALUES ('ac2f7c0c5c5775fcea7e2387bcb22f01', '菜单类型', 'menu_type', null, '1', 'admin', TO_DATE('2020-12-18 23:24:32', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-01 15:27:06', 'YYYY-MM-DD HH24:MI:SS'), '1');
+INSERT INTO "SYS_DICT" VALUES ('ad7c65ba97c20a6805d5dcdf13cdaf36', 'onlineT类型', 'ceshi_online', null, '2', 'admin', TO_DATE('2019-03-22 16:31:49', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-22 16:34:16', 'YYYY-MM-DD HH24:MI:SS'), '0');
+INSERT INTO "SYS_DICT" VALUES ('bd1b8bc28e65d6feefefb6f3c79f42fd', 'Online图表数据类型', 'online_graph_data_type', 'Online图表数据类型', '1', 'admin', TO_DATE('2019-04-12 17:24:24', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-12 17:24:57', 'YYYY-MM-DD HH24:MI:SS'), '0');
+INSERT INTO "SYS_DICT" VALUES ('c36169beb12de8a71c8683ee7c28a503', '部门状态', 'depart_status', null, '1', 'admin', TO_DATE('2019-03-18 21:59:51', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0');
+INSERT INTO "SYS_DICT" VALUES ('c5a14c75172783d72cbee6ee7f5df5d1', 'Online图表类型', 'online_graph_type', 'Online图表类型', '1', 'admin', TO_DATE('2019-04-12 17:04:06', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0');
+INSERT INTO "SYS_DICT" VALUES ('d6e1152968b02d69ff358c75b48a6ee1', '流程类型', 'bpm_process_type', null, '1', 'admin', TO_DATE('2021-02-22 19:26:54', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-30 18:14:44', 'YYYY-MM-DD HH24:MI:SS'), '0');
+INSERT INTO "SYS_DICT" VALUES ('fc6cd58fde2e8481db10d3a1e68ce70c', '用户状态', 'user_status', null, '1', 'admin', TO_DATE('2019-03-18 21:57:25', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-18 23:11:58', 'YYYY-MM-DD HH24:MI:SS'), '1');
+
+-- ----------------------------
+-- Records of SYS_DICT_ITEM
+-- ----------------------------
+INSERT INTO "SYS_DICT_ITEM" VALUES ('fe50b23ae5e68434def76f67cef35d2d', '78bda155fe380b1b3f175f1e88c284c6', '已作废', '4', '已作废', '4', '1', 'admin', TO_DATE('2021-09-09 16:33:43', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-05-09 16:34:40', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('0072d115e07c875d76c9b022e2179128', '4d7fec1a7799a436d26d02325eff295e', '低', 'L', '低', '3', '1', 'admin', TO_DATE('2019-04-16 17:04:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('05a2e732ce7b00aa52141ecc3e330b4e', '3486f32803bb953e7155dab3513dc68b', '已删除', '1', null, null, '1', 'admin', TO_DATE('2025-10-18 21:46:56', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-28 22:23:20', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('096c2e758d823def3855f6376bc736fb', 'bd1b8bc28e65d6feefefb6f3c79f42fd', 'SQL', 'sql', null, '1', '1', 'admin', TO_DATE('2019-04-12 17:26:26', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('0c9532916f5cd722017b46bc4d953e41', '2f0320997ade5dd147c90130f7218c3e', '指定用户', 'USER', null, null, '1', 'admin', TO_DATE('2019-03-17 21:22:19', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-17 21:22:28', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('0ca4beba9efc4f9dd54af0911a946d5c', '72cce0989df68887546746d8f09811aa', '附表', '3', null, '3', '1', 'admin', TO_DATE('2019-03-27 10:13:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('1030a2652608f5eac3b49d70458b8532', '2e02df51611a4b9632828ab7e5338f00', '禁用', '2', '禁用', '2', '1', 'admin', TO_DATE('2021-03-26 18:27:28', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-26 18:39:11', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('147c48ff4b51545032a9119d13f3222a', 'd6e1152968b02d69ff358c75b48a6ee1', '测试流程', 'test', null, '1', '1', 'admin', TO_DATE('2019-03-22 19:27:05', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('1543fe7e5e26fb97cdafe4981bedc0c8', '4c03fca6bf1f0299c381213961566349', '单排布局', 'single', null, '2', '1', 'admin', TO_DATE('2022-07-12 17:43:39', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-12 17:43:57', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('1b8a6341163062dad8cb2fddd34e0c3b', '404a04a15f371566c658ee9ef9fc392a', '22', '222', null, '1', '1', 'admin', TO_DATE('2019-03-30 11:17:48', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('1ce390c52453891f93514c1bd2795d44', 'ad7c65ba97c20a6805d5dcdf13cdaf36', '000', '00', null, '1', '1', 'admin', TO_DATE('2019-03-22 16:34:34', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('1db531bcff19649fa82a644c8a939dc4', '4c03fca6bf1f0299c381213961566349', '组合布局', 'combination', null, '4', '1', 'admin', TO_DATE('2019-05-11 16:07:08', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('222705e11ef0264d4214affff1fb4ff9', '4f69be5f507accea8d5df5f11346181a', '短信', '1', null, '1', '1', 'admin', TO_DATE('2023-02-28 10:50:36', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-28 10:58:11', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('23a5bb76004ed0e39414e928c4cde155', '4e4602b3e3686f0911384e188dc7efb4', '不等于', '!=', '不等于', '3', '1', 'admin', TO_DATE('2019-04-01 16:46:15', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-01 17:48:40', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('25847e9cb661a7c711f9998452dc09e6', '4e4602b3e3686f0911384e188dc7efb4', '小于等于', '<=', '小于等于', '6', '1', 'admin', TO_DATE('2019-04-01 16:44:34', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-01 17:49:10', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('2d51376643f220afdeb6d216a8ac2c01', '68168534ff5065a152bfab275c2136f8', '有效', '1', '有效', '2', '1', 'admin', TO_DATE('2019-04-26 19:22:01', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('308c8aadf0c37ecdde188b97ca9833f5', '8dfe32e2d29ea9430a988b3b558bf233', '已发布', '1', '已发布', '2', '1', 'admin', TO_DATE('2019-04-16 17:41:24', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('333e6b2196e01ef9a5f76d74e86a6e33', '8dfe32e2d29ea9430a988b3b558bf233', '未发布', '0', '未发布', '1', '1', 'admin', TO_DATE('2019-04-16 17:41:12', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('337ea1e401bda7233f6258c284ce4f50', 'bd1b8bc28e65d6feefefb6f3c79f42fd', 'JSON', 'json', null, '1', '1', 'admin', TO_DATE('2019-04-12 17:26:33', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('33bc9d9f753cf7dc40e70461e50fdc54', 'a9d9942bd0eccb6e89de92d130ec4c4a', '发送失败', '2', null, '3', '1', 'admin', TO_DATE('2019-04-12 18:20:02', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('3fbc03d6c994ae06d083751248037c0e', '78bda155fe380b1b3f175f1e88c284c6', '已完成', '3', '已完成', '3', '1', 'admin', TO_DATE('2019-05-09 16:33:25', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('41d7aaa40c9b61756ffb1f28da5ead8e', '0b5d19e1fce4b2e6647e6b4a17760c14', '通知公告', '1', null, '1', '1', 'admin', TO_DATE('2019-04-22 18:01:57', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('41fa1e9571505d643aea87aeb83d4d76', '4e4602b3e3686f0911384e188dc7efb4', '等于', '=', '等于', '4', '1', 'admin', TO_DATE('2019-04-01 16:45:24', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-01 17:49:00', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('43d2295b8610adce9510ff196a49c6e9', '845da5006c97754728bf48b6a10f79cc', '正常', '1', null, null, '1', 'admin', TO_DATE('2019-03-18 21:45:51', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('4f05fb5376f4c61502c5105f52e4dd2b', '83bfb33147013cc81640d5fd9eda030c', '操作日志', '2', null, null, '1', 'admin', TO_DATE('2019-03-18 23:22:49', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('50223341bfb5ba30bf6319789d8d17fe', 'd6e1152968b02d69ff358c75b48a6ee1', '业务办理', 'business', null, '3', '1', 'admin', TO_DATE('2023-04-22 19:28:05', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-22 23:24:39', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('538fca35afe004972c5f3947c039e766', '2e02df51611a4b9632828ab7e5338f00', '显示', '1', '显示', '1', '1', 'admin', TO_DATE('2025-03-26 18:27:13', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-26 18:39:07', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('5584c21993bde231bbde2b966f2633ac', '4e4602b3e3686f0911384e188dc7efb4', '自定义SQL表达式', 'USE_SQL_RULES', '自定义SQL表达式', '9', '1', 'admin', TO_DATE('2019-04-01 10:45:24', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-01 17:49:27', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('58b73b344305c99b9d8db0fc056bbc0a', '72cce0989df68887546746d8f09811aa', '主表', '2', null, '2', '1', 'admin', TO_DATE('2019-03-27 10:13:36', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('5b65a88f076b32e8e69d19bbaadb52d5', '2f0320997ade5dd147c90130f7218c3e', '全体用户', 'ALL', null, null, '1', 'admin', TO_DATE('2020-10-17 21:22:43', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-28 22:17:09', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('5d84a8634c8fdfe96275385075b105c9', '3d9a351be3436fbefb1307d4cfb49bf2', '女', '2', null, '2', '1', null, TO_DATE('2019-01-04 14:56:56', 'YYYY-MM-DD HH24:MI:SS'), null, TO_DATE('2019-01-04 17:38:12', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('66c952ae2c3701a993e7db58f3baf55e', '4e4602b3e3686f0911384e188dc7efb4', '大于', '>', '大于', '1', '1', 'admin', TO_DATE('2019-04-01 10:45:46', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-01 17:48:29', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('6937c5dde8f92e9a00d4e2ded9198694', 'ad7c65ba97c20a6805d5dcdf13cdaf36', 'easyui', '3', null, '1', '1', 'admin', TO_DATE('2019-03-22 16:32:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('69cacf64e244100289ddd4aa9fa3b915', 'a9d9942bd0eccb6e89de92d130ec4c4a', '未发送', '0', null, '1', '1', 'admin', TO_DATE('2019-04-12 18:19:23', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('6a7a9e1403a7943aba69e54ebeff9762', '4f69be5f507accea8d5df5f11346181a', '邮件', '2', null, '2', '1', 'admin', TO_DATE('2031-02-28 10:50:44', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-28 10:59:03', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('6c682d78ddf1715baf79a1d52d2aa8c2', '72cce0989df68887546746d8f09811aa', '单表', '1', null, '1', '1', 'admin', TO_DATE('2019-03-27 10:13:29', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('6d404fd2d82311fbc87722cd302a28bc', '4e4602b3e3686f0911384e188dc7efb4', '模糊', 'LIKE', '模糊', '7', '1', 'admin', TO_DATE('2019-04-01 16:46:02', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-01 17:49:20', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('6d4e26e78e1a09699182e08516c49fc4', '4d7fec1a7799a436d26d02325eff295e', '高', 'H', '高', '1', '1', 'admin', TO_DATE('2019-04-16 17:04:24', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('700e9f030654f3f90e9ba76ab0713551', '6b78e3f59faec1a4750acff08030a79b', '333', '333', null, null, '1', 'admin', TO_DATE('2019-02-21 19:59:47', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('7050c1522702bac3be40e3b7d2e1dfd8', 'c5a14c75172783d72cbee6ee7f5df5d1', '柱状图', 'bar', null, '1', '1', 'admin', TO_DATE('2019-04-12 17:05:17', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('71b924faa93805c5c1579f12e001c809', 'd6e1152968b02d69ff358c75b48a6ee1', 'OA办公', 'oa', null, '2', '1', 'admin', TO_DATE('2021-03-22 19:27:17', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-22 23:24:36', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('75b260d7db45a39fc7f21badeabdb0ed', 'c36169beb12de8a71c8683ee7c28a503', '不启用', '0', null, null, '1', 'admin', TO_DATE('2019-03-18 23:29:41', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-18 23:29:54', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('7688469db4a3eba61e6e35578dc7c2e5', 'c36169beb12de8a71c8683ee7c28a503', '启用', '1', null, null, '1', 'admin', TO_DATE('2019-03-18 23:29:28', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('78ea6cadac457967a4b1c4eb7aaa418c', 'fc6cd58fde2e8481db10d3a1e68ce70c', '正常', '1', null, null, '1', 'admin', TO_DATE('2019-03-18 23:30:28', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('7ccf7b80c70ee002eceb3116854b75cb', 'ac2f7c0c5c5775fcea7e2387bcb22f01', '按钮权限', '2', null, null, '1', 'admin', TO_DATE('2019-03-18 23:25:40', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('81fb2bb0e838dc68b43f96cc309f8257', 'fc6cd58fde2e8481db10d3a1e68ce70c', '冻结', '2', null, null, '1', 'admin', TO_DATE('2019-03-18 23:30:37', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('83250269359855501ec4e9c0b7e21596', '4274efc2292239b6f000b153f50823ff', '显示/访问(授权后显示/可访问)', '1', null, '1', '1', 'admin', TO_DATE('2019-05-10 17:54:51', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('84778d7e928bc843ad4756db1322301f', '4e4602b3e3686f0911384e188dc7efb4', '大于等于', '>=', '大于等于', '5', '1', 'admin', TO_DATE('2019-04-01 10:46:02', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-01 17:49:05', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('848d4da35ebd93782029c57b103e5b36', 'c5a14c75172783d72cbee6ee7f5df5d1', '饼图', 'pie', null, '3', '1', 'admin', TO_DATE('2019-04-12 17:05:49', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('84dfc178dd61b95a72900fcdd624c471', '78bda155fe380b1b3f175f1e88c284c6', '处理中', '2', '处理中', '2', '1', 'admin', TO_DATE('2019-05-09 16:33:01', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('86f19c7e0a73a0bae451021ac05b99dd', 'ac2f7c0c5c5775fcea7e2387bcb22f01', '子菜单', '1', null, null, '1', 'admin', TO_DATE('2019-03-18 23:25:27', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('8bccb963e1cd9e8d42482c54cc609ca2', '4f69be5f507accea8d5df5f11346181a', '微信', '3', null, '3', '1', 'admin', TO_DATE('2021-05-11 14:29:12', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-11 14:29:31', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('8c618902365ca681ebbbe1e28f11a548', '4c753b5293304e7a445fd2741b46529d', '启用', '1', null, '0', '1', 'admin', TO_DATE('2020-07-18 23:19:27', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-05-17 14:51:18', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('8cdf08045056671efd10677b8456c999', '4274efc2292239b6f000b153f50823ff', '可编辑(未授权时禁用)', '2', null, '2', '1', 'admin', TO_DATE('2019-05-10 17:55:38', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('8ff48e657a7c5090d4f2a59b37d1b878', '4d7fec1a7799a436d26d02325eff295e', '中', 'M', '中', '2', '1', 'admin', TO_DATE('2019-04-16 17:04:40', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('9a96c4a4e4c5c9b4e4d0cbf6eb3243cc', '4c753b5293304e7a445fd2741b46529d', '不启用', '0', null, '1', '1', 'admin', TO_DATE('2019-03-18 23:19:53', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('a2321496db6febc956a6c70fab94cb0c', '404a04a15f371566c658ee9ef9fc392a', '3', '3', null, '1', '1', 'admin', TO_DATE('2019-03-30 11:18:18', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('a2be752dd4ec980afaec1efd1fb589af', '8dfe32e2d29ea9430a988b3b558bf233', '已撤销', '2', '已撤销', '3', '1', 'admin', TO_DATE('2019-04-16 17:41:39', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('aa0d8a8042a18715a17f0a888d360aa4', 'ac2f7c0c5c5775fcea7e2387bcb22f01', '一级菜单', '0', null, null, '1', 'admin', TO_DATE('2019-03-18 23:24:52', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('adcf2a1fe93bb99a84833043f475fe0b', '4e4602b3e3686f0911384e188dc7efb4', '包含', 'IN', '包含', '8', '1', 'admin', TO_DATE('2019-04-01 16:45:47', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-01 17:49:24', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('b029a41a851465332ee4ee69dcf0a4c2', '0b5d19e1fce4b2e6647e6b4a17760c14', '系统消息', '2', null, '1', '1', 'admin', TO_DATE('2019-02-22 18:02:08', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-22 18:02:13', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('b2a8b4bb2c8e66c2c4b1bb086337f393', '3486f32803bb953e7155dab3513dc68b', '正常', '0', null, null, '1', 'admin', TO_DATE('2022-10-18 21:46:48', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-28 22:22:20', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('b4a887dc3ff01d2daadaa412e63189ed', '4f69be5f507accea8d5df5f11346181a', '邮件', '2', null, '2', '1', 'admin', TO_DATE('2021-05-11 14:29:03', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-11 14:29:25', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('b57f98b88363188daf38d42f25991956', '6b78e3f59faec1a4750acff08030a79b', '22', '222', null, null, '0', 'admin', TO_DATE('2019-02-21 19:59:43', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-11 21:23:27', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('b5f3bd5f66bb9a83fecd89228c0d93d1', '68168534ff5065a152bfab275c2136f8', '无效', '0', '无效', '1', '1', 'admin', TO_DATE('2019-04-26 19:21:49', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('b9fbe2a3602d4a27b45c100ac5328484', '78bda155fe380b1b3f175f1e88c284c6', '待提交', '1', '待提交', '1', '1', 'admin', TO_DATE('2019-05-09 16:32:35', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('ba27737829c6e0e582e334832703d75e', '236e8a4baff0db8c62c00dd95632834f', '同步', '1', '同步', '1', '1', 'admin', TO_DATE('2019-05-15 15:28:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('cbfcc5b88fc3a90975df23ffc8cbe29c', 'c5a14c75172783d72cbee6ee7f5df5d1', '曲线图', 'line', null, '2', '1', 'admin', TO_DATE('2019-05-12 17:05:30', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-12 17:06:06', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('d1cee7b0dcccff0b07da7325110fcad4', '4f69be5f507accea8d5df5f11346181a', '微信', '3', null, '3', '1', 'admin', TO_DATE('2035-02-28 10:50:53', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-28 10:58:51', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('d217592908ea3e00ff986ce97f24fb98', 'c5a14c75172783d72cbee6ee7f5df5d1', '数据列表', 'table', null, '4', '1', 'admin', TO_DATE('2019-04-12 17:05:56', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('d75b5b3666d0742f08027af0255b4400', '4f69be5f507accea8d5df5f11346181a', '短信', '1', null, '1', '1', 'admin', TO_DATE('2019-04-11 14:28:49', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('df168368dcef46cade2aadd80100d8aa', '3d9a351be3436fbefb1307d4cfb49bf2', '男', '1', null, '1', '1', null, TO_DATE('2027-08-04 14:56:49', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-23 22:44:44', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('e6329e3a66a003819e2eb830b0ca2ea0', '4e4602b3e3686f0911384e188dc7efb4', '小于', '<', '小于', '2', '1', 'admin', TO_DATE('2019-04-01 16:44:15', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-01 17:48:34', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('e94eb7af89f1dbfa0d823580a7a6e66a', '236e8a4baff0db8c62c00dd95632834f', '不同步', '0', '不同步', '2', '1', 'admin', TO_DATE('2019-05-15 15:28:28', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('f0162f4cc572c9273f3e26b2b4d8c082', 'ad7c65ba97c20a6805d5dcdf13cdaf36', 'booostrap', '1', null, '1', '1', 'admin', TO_DATE('2021-08-22 16:32:04', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-22 16:33:57', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_DICT_ITEM" VALUES ('f16c5706f3ae05c57a53850c64ce7c45', 'a9d9942bd0eccb6e89de92d130ec4c4a', '发送成功', '1', null, '2', '1', 'admin', TO_DATE('2019-04-12 18:19:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('f2a7920421f3335afdf6ad2b342f6b5d', '845da5006c97754728bf48b6a10f79cc', '冻结', '2', null, null, '1', 'admin', TO_DATE('2019-03-18 21:46:02', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('f37f90c496ec9841c4c326b065e00bb2', '83bfb33147013cc81640d5fd9eda030c', '登录日志', '1', null, null, '1', 'admin', TO_DATE('2019-03-18 23:22:37', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('f753aff60ff3931c0ecb4812d8b5e643', '4c03fca6bf1f0299c381213961566349', '双排布局', 'double', null, '3', '1', 'admin', TO_DATE('2019-04-12 17:43:51', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('fcec03570f68a175e1964808dc3f1c91', '4c03fca6bf1f0299c381213961566349', 'Tab风格', 'tab', null, '1', '1', 'admin', TO_DATE('2019-04-12 17:43:31', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+
+-- ----------------------------
+-- Records of SYS_LOG
+-- ----------------------------
+INSERT INTO "SYS_LOG" VALUES ('92e514fee917a1a459c4ffdb0ca42516', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 10:20:52', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d3f08843a9b2b3284711e376fb785beb', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 10:58:03', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('76bea561f662ec0ccf05bc370f1ffe35', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 11:08:55', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('273081678d85acebaa6615973bff31db', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 15:02:50', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b26369680b41d581649cf865e88331e9', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 15:03:07', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7313b43ff53015d79a58b4dc7c660721', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 15:03:07', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f99912c5ff252594f14d31b768f8ad15', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 15:03:10', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('dcec1957987abbe6658f1f2c96980366', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 15:05:21', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('c7b6156c4f42b70c562b507766f4546c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 15:14:08', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('52673feae24ea5bc3ca111f19c9a85d4', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 15:16:46', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('507b55d3b5ddc487fb40ca1f716a1253', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 15:43:02', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7351132f4f5f65e5bf157dd7ad5344a4', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 15:51:36', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('961992e05772bc7ad2ca927cf7649440', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 15:55:10', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3b07fda32423a5696b2097e1c23c00d4', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 16:04:32', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('8447099784da63b3b2cd2fbbc5eabcea', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 16:04:49', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b20ff98a10af3c25c1991741fd59ea64', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 16:07:48', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9acebd2d37c9078f9568125fb9696976', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 16:07:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d70c2847d8d0936a2a761f745a84aa48', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 16:39:34', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('279e519d647f1a4e1f85f9b90ab370b9', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 17:01:30', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b605a83a9b5f3cdaaa1b3f4f41a5f12d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 17:04:20', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0a24b1f04f79a2bcb83c4cd12d077cbc', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 17:34:37', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('661c4792f00b0814e486c3d623d7259f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 18:06:11', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d1746c5c937fcb650bd835ff74dabdff', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 18:06:32', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('8ec3a287a37d155047e80a80769d5226', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 18:37:14', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('6cbd2a9257fae1cb7ff7bc2eb264b3ab', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 19:08:14', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f06e8fa83b408be905b4dc7caeaf9a80', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 19:40:33', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f84e86c9a21149134b1f2599a424164b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-21 20:12:27', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('88bfc5b77b4be0d6d0f7c8661cf24853', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-22 10:25:53', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b9bf472a12fc25a9d4b500421b08b025', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-22 10:53:54', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('dbbcfb7f59311637a613ec9a6c63f04a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-22 10:53:57', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('69ea2322f72b41bcdc7f235889132703', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-22 10:54:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('62d197757e2cb40f9e8cb57fa6a207f7', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-22 10:54:54', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ccad29843623a6c3ca59548b1d533b15', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-22 10:56:33', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('4d9299e2daac1f49eac0cec75a90c32e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-22 11:28:39', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('43848099c1e70910ba1572868ee40415', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-22 11:28:48', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('6fb7db45b11bc22347b234fda07700c8', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-22 12:00:22', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e8cde8dcd6253b249d67a05aaf10f968', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-22 12:30:28', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('6a4231540c73ad67128d5a24e6a877ff', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-22 12:54:30', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2b3be3da6ba9d1ee49f378d729d69c50', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-22 13:24:41', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('78f519b618f82a39adad391fbf6b9c7a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-22 13:49:58', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('1487d69ff97888f3a899e2ababb5ae48', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-22 14:21:17', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('cc7fa5567e7833a3475b29b7441a2976', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-22 14:21:31', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('52e36d72cd04bea2604747e006b038ec', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-22 19:47:17', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('523a54948d5edaf421566014b66f9465', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-22 19:50:27', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('48e4e10ac7e583050fd85734f0676a7c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-22 19:58:08', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('dee4d42c439b51b228ab5db5d0723fc0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-22 20:02:56', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('965c74ffe09d8a06bb817efa6d62254b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-23 10:01:35', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('059bac84373e9dae94363ea18802d70f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-23 10:06:56', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9ef3f1ed07003e3abec3445920b062f1', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-23 11:17:05', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0169622dcd4e89b177a0917778ac7f9c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-23 11:17:18', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f8960d64e93606fa52220cc9c4ae35a2', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-23 11:21:02', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('4261867172d0fd5c04c993638661ac0b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-23 11:24:47', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('32464c6f7f772ddda0a963b19ad2fd70', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-23 11:30:20', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d29cf7aae44523bf2f3d187e91356fe8', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-23 12:20:35', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0e9c0d0d26ddc652a7277912e0784d11', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-23 12:27:41', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('25f8b1b345b1c8a070fe81d715540c85', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-23 15:39:46', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('8327cced60486bad4009276e14403502', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-24 09:56:29', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('515c28df59f07478339b61ca5b1b54a8', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-24 10:34:51', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('fa0612372b332b6c3ce787d9ca6dd2cc', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-24 11:48:21', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('8300e85a2c2f16c2358d31e8b364edf7', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-24 11:55:39', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3d9874f248a984608ca98c36c21c5a7a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-24 13:05:56', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('cc8ab347f332c55570830c5fc39bbf9f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-24 13:08:38', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('8742a458bf166fd5f134ac65fa8903f9', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-24 13:09:10', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('bbe2e637bafa0d7f465dc9e1266cff3d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-25 11:16:50', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b3474fc5aad9ec2f36ccbbf7bf864a69', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-25 11:17:24', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('260bb025d91b59d0135d635ef85eeb82', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-25 11:40:13', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('1a5b71c9458c17f9bcb19a5747fd47dd', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-25 11:56:48', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e720278084b0d4316448ec59d4e3399d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-25 15:52:45', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f6646950c8465da1d1219b7a7a209fc2', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-25 19:14:07', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('36358cacfc5eb3ba7e85cfe156218b71', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-25 19:14:17', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ee2bb63c47c868d59a45503b3d2f34ea', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-25 19:16:14', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b0d11dfec52e02f504c63e2f8224b00d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-25 19:27:44', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('4acfbc327681d89dab861c77401f8992', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-28 10:54:36', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('96ada57ac17c4477f4e4c8d596d4cc1a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-28 10:54:44', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e4e40e21437b23b74324e0402cceb71a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-28 11:34:40', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d92d9e003666c6b020f079eaee721f9f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-28 12:08:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('68f7394ca53c59438b2b41e7bb9f3094', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-28 14:09:34', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a9b34565c6460dc9cede00ad150393f9', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-28 14:17:53', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('fa427f74dc6bd9cca3db478b5842f7f7', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-28 14:19:07', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('8b66ec251e3107765768dbd0590eeb29', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-28 14:25:48', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e42a38382fce916909d6d09f66147006', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-28 14:28:44', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ed0bbe9047a7471ae1cdc1c2941eccb1', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-29 17:52:38', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('36fd54ce8bc1ee4aac9e3ea4bfdcd5a8', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-29 18:49:34', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('40b3a9bee45b23548250936310b273f4', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-30 14:42:03', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('c9be887c9292153e39861c91243b7432', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-30 15:12:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e40823376fa8c0e74a4e760de695e824', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-30 15:36:38', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('993010965223b8e3a7a784409f7e377e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-30 15:50:41', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('aa47c8cf2a4f2de16f415b9d9d3dbf05', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-30 16:14:36', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('4a0020835a71fc6dcaefd01968d21f81', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-30 18:46:37', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('fa9cebbb6af23d2830584b3aacd51e46', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-31 13:59:17', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('60a975067f02cf05e74fa7b71e8e862a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-31 14:31:58', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('fbb8834e9736bdd4b6d3baee895c4ca4', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-31 18:05:03', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('623e4bc7c098f368abcc368227235caf', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-01 09:48:57', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9f31eedbe3f3c5c431b490d5fec0094c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-01 09:56:36', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b945fe8b63e0fc26d02c85466f36ebd9', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-01 09:57:34', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('968d434c45aae64c9ad0e86d18238065', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-01 10:02:22', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('732a1015057fde25d81ee12a7fbf66b2', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-01 10:05:08', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d9a0bb9fe6d2c675aa84f9441c0bd8bb', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-11 10:56:23', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9c64406daa2b6e7ad1f6776789d61e43', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-11 10:56:46', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('1912a44dd4a6ffa1636d2dde9c2f1ab7', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-11 11:01:03', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d19b6e77ab1b6d6aa58996a93918754c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-11 11:33:06', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('81f7a606359aff9f97f95c15ce8e7c69', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-11 11:33:42', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7da063020a42db99e0f3bb9500498828', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-11 13:45:36', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b6ee157afd006ceddc8c7558c251192e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-11 14:20:56', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('65ace1ae98891f48ab4121d9258e4f1e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-12 10:45:20', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e2af7674bb716a7c0b703c7c7e20b906', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-12 11:38:55', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('60d4f59974170c67826e64480533d793', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-12 13:25:40', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('775e987a2ca37edc4f21e022b265a84a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-12 13:36:13', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('dd6fbb9b6224c927c0923c16b9285525', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-12 13:37:01', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f3d371d6f71409ea2fe52405b725db4a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-12 13:38:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('c33b4e0bbf998330e44fad65e9d0029e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-12 15:54:56', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('189842bf681338dc99dfa66d366a0e6f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-12 15:55:01', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e14cd21cf5eaad9ea3689730a824a50c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-12 16:12:32', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('5cf2431447eab30fd3623e831033eea0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-12 19:17:29', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9bfe7312f2951503082a28c2cc966ce4', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-13 10:24:02', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('da9a15efcf4e1e4f24647db7e2143238', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-13 11:19:54', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('8317a81bce60a10afeb44af6ef6c807a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-13 11:27:58', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0a6eb1fa998b749012216542a2447ae7', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-13 11:29:30', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e5a9b045449136719d4c19c429c2dd56', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-13 13:08:05', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('aaf10eab9c2b6ed6af1d7a9ce844d146', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-13 13:08:10', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b4ccdfc1280e73439eb1ad183076675b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-13 14:10:45', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('018fe8d3f049a32fb8b541c893058713', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-13 15:17:42', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f3aab8f9dff7bf705aa29c6dcce49011', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-13 15:18:27', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('efa591832b375b4609a5890b0c6f3250', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-13 16:00:13', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2c6822927334eb0810b71465fd9c4945', '1', '用户名: jeecg,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-13 16:02:47', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7289cf420ac87ea0538bde81435b1aaa', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-13 16:03:51', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('db8adca4aa7972fdc283be96d877efe0', '1', '用户名: jeecg,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-13 16:04:28', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('c5e541648bab341230c93377b4d4e262', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-13 16:05:09', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e261674e2640fe6d0a3cd86df631537d', '1', '用户名: jeecg,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-13 16:05:51', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('406e79995e3340d052d85a74a5d40d1b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-13 16:23:16', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('4de1ed55165f7086f1a425a26a2f56ec', '1', '用户名: jeecg,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-13 16:26:27', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d8eed69045aae6cedbff402b4e35f495', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-13 18:22:52', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('bbf4fb593d6918cc767bb50c9b6c16c5', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-14 10:44:20', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('506ce2d73a038b6e491a35a6c74a7343', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-14 13:44:04', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('4303dbb3e502f11a3c4078f899bb3070', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-14 17:28:44', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2de252a92b59ebfbf16860cc563e3865', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-14 22:04:17', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e4c330b381e2fbfde49f1d4dd43e68b7', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-14 22:22:01', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('22735c059b01949a87cb918f5ef3be76', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-14 22:41:28', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('c5954beca75d6a0c014e2de3b621275a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-14 22:41:31', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('db8c89112bf4706fb558664dd741aa46', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-15 09:33:23', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('fa0ce422c12a565461eca56006052891', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-15 10:13:21', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a34ed4c6fef2b9f07a20e54ef4501b99', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-15 10:48:00', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b55cc05e8dd4279c0fa145833db19ba8', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-15 11:37:40', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('5c675eeb69795180eee2c1069efc114b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-15 12:59:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('5dee273feb8dd12989b40c2c92ce8c4a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-15 13:42:58', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('994efef0ebca19292e14a39b385b0e21', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-15 16:22:24', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('fc22aaf9660e66558689a58dfa443074', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-15 16:30:55', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2c6ede513b83fbc23aaedb89dbfa868a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-15 18:03:00', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('13c1e763e9d624a69727a38b85411352', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-15 18:39:00', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('fadb32d678346ee4bab02997988ff3bc', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-15 22:55:16', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0aa792eadeae39a1ed2a98ea5d2f6d27', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-16 09:11:39', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0aa9272c0581e1d7f62b1293375b4574', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-16 17:26:36', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('81c9056ac38e6f881d60f3d41df1845e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-17 11:44:47', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('eb4536aa50a58985baf0a763a1ce2ebf', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-17 19:48:49', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f9062582881b42f6b139c313d8ab0463', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-17 20:47:26', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('22d8a2fbd53eafb21f6f62ae073c0fc1', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-17 22:28:52', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7bc7b1ff923dbb19fb0ecd800cd690bd', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-18 09:34:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('faea0dbfb7f86b571fed0dd270623831', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-18 14:12:14', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('063baad688535096d2ed906ae6f3a128', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-18 22:09:21', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('528baecc596a66eaadc8887bff911f55', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-19 10:08:48', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e540ca989819c54baefffbc3d05e8b58', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-19 10:10:54', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0643f3ad4394de9fb3c491080c6a7a03', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-19 10:18:42', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('eb0b8a7cdf77df133566d7bd5a5f1fc0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-19 11:02:55', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0913bb0e92715892c470cf538726dfbc', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-19 16:17:09', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('5034aec34f0b79da510e66008dbf2fcc', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-19 16:18:29', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e4afd66ac249dde9c3bd9da50f9c2469', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-19 17:41:54', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('07132c1228b1c165f62ea35f4ff1cbe9', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-19 18:15:44', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('4f7f587bec68ed5bf9f68b0ccd76d62b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-19 21:01:47', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('12709e62742056aa4a57fa8c2c82d84a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 09:13:10', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('680b3e6e4768d80d6ea0ce8ba71bdd0e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 09:14:03', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a6e323785535592ee208aa7e53554644', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 09:15:27', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3a4a0e27d77aa8b624180e5fd5e4004e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 09:51:58', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b98b7ac9e890657aa86a900763afbe2a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 11:49:44', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d1eb2a8ebed28d34199c5fc4a1579c4c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 12:55:09', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('85949de2d54078e6b8f3df0a3c79c43d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 17:08:44', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('77579d78a903635cc4942882f568e9e5', '1', '用户名: jeecg,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 17:13:33', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b09ccd219a1ce5c7270bb659748b8330', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 15:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a22ddd4b5b0b84bd7794edd24b25fc64', '2', '添加测试DEMO', null, 'admin', '管理员', '127.0.0.1', 'org.jeecg.modules.demo.test.controller.JeecgDemoController.add()', null, '[{"createBy":"admin","createTime":1547883299809,"email":"zhangdaiscott@163.com","id":"7eac655877842eb39dc2f0469f3964ec","name":"zhang daihao"}]', null, '25', 'admin', TO_DATE('2019-01-19 15:34:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('07a0b3f8b4140a7a586305c2f40a2310', '2', '删除测试DEMO', null, 'admin', '管理员', '127.0.0.1', 'org.jeecg.modules.demo.test.controller.JeecgDemoController.delete()', null, '["7eac655877842eb39dc2f0469f3964ec"]', null, '14', 'admin', TO_DATE('2019-01-19 15:38:11', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d7902eeab2c34611fad046a79bff1c1b', '2', '添加测试DEMO', null, 'admin', '管理员', '127.0.0.1', 'org.jeecg.modules.demo.test.controller.JeecgDemoController.add()', null, '[{"createBy":"admin","createTime":1547883544104,"email":"zhangdaiscott@163.com","id":"4436302a0de50bb83025286bc414d6a9","name":"zhang daihao"}]', null, '1682', 'admin', TO_DATE('2019-01-19 15:39:05', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a68160f37cace166fedd299c4ca0be10', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 15:40:00', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('c6c0316b6989bf1eea0a3803f593bf69', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 15:47:19', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('4b1341863a8fffeccda8bbe413bd815f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 15:59:52', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ed50b1fbc80c3b953f4551081b10335e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 16:19:06', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('dabdcb8e15ea9215a1af22f7567ff73d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 16:48:13', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('446724ea6dd41f4a03111c42e00d80cd', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 16:56:36', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0e41fe3a34d5715bf4c88e220663583a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 17:04:06', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9f2db1ffaf89518a25cc6701da0c5858', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 17:05:07', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('954f1ccb8b230d2d7d4858eec3aba0a4', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 17:08:37', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7374f3a2ccb20216cf8eecb26037ce0a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 18:08:51', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('130de55edac71aab730786307cc65936', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 20:22:57', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0bc44e2d682c9f28525d203589a90b43', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 20:31:08', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('122edcafd54dd06e12838f41123d9d5d', '2', '添加测试DEMO', null, 'admin', '管理员', '127.0.0.1', 'org.jeecg.modules.demo.test.controller.JeecgDemoController.add()', null, '[{"age":28,"birthday":1546617600000,"createBy":"admin","createTime":1547901234989,"id":"42c08b1a2e5b2a96ffa4cc88383d4b11","name":"秦500","punchTime":1546691611000}]', null, '21387', 'admin', TO_DATE('2019-01-19 20:34:11', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('1a570aac0c30ac2955b59e2dc7a6204c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 20:58:26', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('c18db091677ec01d55e913662b9028a9', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 21:19:07', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('88d8b4b50bdab58c52fe25fa711fbbef', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 21:21:39', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('6b876be6e384337b36ad28a4a5868be8', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 21:22:12', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('cb6b52fbbdd4c5698c17edaf9960e11e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 21:22:23', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('fea8e1e2d229557185be0d9a10ebce17', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 21:55:55', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('c1842fc83cdf0b0cc0264bf093e9c55d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 21:56:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('543970eba4d1c522e3cb597b0fd4ad13', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 22:53:18', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e9ce2b3f7ac1fa3f5f7fd247207ca5c0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 22:53:35', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0e365a21c60e4460813bdc4e3cb320a3', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 23:01:34', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d3df1a4057b6d7fb4dab073a727ba21f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 23:14:02', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('8f616500d666a5a67bc98e7ccd73c2e2', '2', '添加测试DEMO', null, 'admin', '管理员', '127.0.0.1', 'org.jeecg.modules.demo.test.controller.JeecgDemoController.add()', null, '[{"createBy":"admin","createTime":1547912194199,"id":"ffa9da1ad40632dfcabac51d766865bd","name":"秦999"}]', null, '386', 'admin', TO_DATE('2019-01-19 23:36:34', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('055cf35c8865761b479c7f289dc36616', '2', '添加测试DEMO', null, 'admin', '管理员', '127.0.0.1', 'org.jeecg.modules.demo.test.controller.JeecgDemoController.add()', null, '[{"createBy":"admin","createTime":1547912238787,"email":"zhangdaiscott@163.com","id":"c2c0d49e3c01913067cf8d1fb3c971d2","name":"zhang daihao"}]', null, '16', 'admin', TO_DATE('2019-01-19 23:37:18', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('69e3164d007be2b9834e4fb398186f39', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-01-19 23:38:17', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e713a89e753cbecf1e10247b2112c3f8', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-24 23:14:36', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('111156480d4d18ebf40427083f25830f', '1', '用户名: admin,登录成功！', null, null, null, '192.168.1.104', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-09 19:48:58', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a9bd713f975bfbff87638432a104b715', '1', '用户名: admin,登录成功！', null, null, null, '192.168.1.104', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-09 20:04:44', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('06fbb85b34f518cd211b948552de72f8', '1', '登录失败，用户名:null不存在！', null, null, null, '192.168.1.104', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-09 20:08:38', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9b568a868e57f24c5ba146848061613f', '1', '用户名: admin,登录成功！', null, null, null, '192.168.1.104', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-09 20:09:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('02026841bf8a9204db2c500c86a4a9be', '1', '用户名: admin,登录成功！', null, null, null, '192.168.1.104', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-09 20:44:58', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('c1a68605bee6b3d1264390c1cfe7a9fa', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-09 20:49:55', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('cbd720f20fc090c7350a98be0738816a', '1', '用户名: admin,登录成功！', null, null, null, '192.168.1.104', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-09 20:55:19', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2676be4ffc66f83221fd95e23d494827', '1', '用户名: admin,登录成功！', null, null, null, '192.168.1.104', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-09 21:31:28', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e9d3202c14f7f2812346fb4c2b781c67', '1', '用户名: admin,登录成功！', null, null, null, '192.168.1.104', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-09 21:38:36', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d9e0150666b69cced93eb4defb19788b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-09 23:11:12', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('1f0b36f7e021aa5d059ffb0a74ef6de4', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-09 23:11:25', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('326b2df4ab05a8dbb03a0a0087e82a25', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-10 11:53:20', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7ae9cad197aee3d50e93bc3a242d68ec', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-10 13:12:26', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('78caf9e97aedfb8c7feef0fc8fdb4fb5', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-10 17:04:46', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d00964eee24c6f9a8609a42eeebef957', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-10 17:04:48', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('04f97d7f906c1e97384a94f3728606a4', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-11 12:08:51', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2b433e88db411bef115bc9357ba6a78b', '1', '用户名: admin,登录成功！', null, null, null, '192.168.1.105', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-11 12:09:36', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('63ccf8dda5d9bf825ecdbfb9ff9f456c', '1', '用户名: admin,登录成功！', null, null, null, '192.168.1.105', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-11 12:14:08', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('404d5fb6cce1001c3553a69089a618c8', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-11 12:29:12', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9ed114408a130e69c0de4c91b2d6bf7e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-11 13:03:40', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2eb964935df6f3a4d2f3af6ac5f2ded1', '1', '用户名: admin,登录成功！', null, null, null, '192.168.1.200', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-11 13:27:18', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e864c0007983211026d6987bd0cd4dc8', '1', '用户名: admin,登录成功！', null, null, null, '192.168.1.114', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-11 13:37:08', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('8b2ad448021fbb5509ea04c9a780b165', '1', '用户名: admin,登录成功！', null, null, null, '192.168.1.104', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-11 14:35:25', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('69a9dfb2fb02e4537b86c9c5c05184ae', '1', '用户名: admin,登录成功！', null, null, null, '192.168.1.104', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-11 15:22:14', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('98b7fc431e4654f403e27ec9af845c7b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-11 17:31:38', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('42bf42af90d4df949ad0a6cd1b39805e', '1', '用户名: admin,登录成功！', null, null, null, '192.168.1.200', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-11 17:39:01', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e234abc35a52f0dd2512b0ce2ea0e4f2', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-11 20:05:26', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('69baa4f883fe881f401ea063ddfd0079', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-12 20:51:03', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a867c282a8d97f7758235f881804bb48', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-13 18:28:20', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('1aa593c64062f0137c0691eabac07521', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-14 10:45:10', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('de978382f59685babf3684d1c090d136', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-14 12:55:55', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('75c7fa1a7d3639be1b112e263561e43a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-14 17:07:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7a9d307d22fb2301d6a9396094afc82f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-14 18:45:04', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('28dbc8d16f98fb4b1f481462fcaba48b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-14 20:56:57', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f1186792c6584729a0f6da4432d951f9', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-14 21:45:52', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('4f31f3ebaf5d1a159d2bb11dd9984909', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-15 11:14:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9a5c1fbf3543880af6461182e24b75db', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-15 13:51:27', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b86958d773b2c2bd79baa2e8c3c84050', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-15 16:49:36', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a052befb699ee69b3197b139fd9263f0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-15 17:34:58', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('6836a652dc96246c028577e510695c6f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-15 20:47:02', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('8fe913a5b037943c6667ee4908f88bea', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-16 11:18:48', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9410b7974fbc9df415867095b210e572', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-16 11:18:58', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('98d4b573769af6d9c10cd5c509bfb7af', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-16 11:21:25', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('18b16a451fec0fe7bf491ab348c65e30', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-16 11:55:45', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('bfa0766f53dbd3a0fe4043f57bd9bbee', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 10:35:33', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e3b531fa12e47ac19a2ab0c883dee595', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 10:40:13', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('18eafaeec588403245269a41732d1a74', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 10:45:14', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('99357d793f2507cfb7b270677b4fe56c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 10:46:42', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b38f42f4e15ee72e494bdf6f6feb0ae7', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 10:49:58', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('bfe758860662ae07a15598396a12cfaa', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 10:50:00', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('69a7a5b960d6aedda5c4bd8b877be0a8', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 10:50:48', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('4084f184160940a96e47d7be1fab4ea3', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 10:51:11', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('1241cf8e9fd0e28478a07bf755f528c5', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 10:51:12', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e0da357be27d66de1c9e9b8ecb22f9f9', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 10:51:13', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9f4960f89a10d7fdcf22d1ea46143fff', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 10:51:13', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ab8a71b7565d356d12e12c6730b0ceb0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 10:51:13', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('35fdedc363d9fe514b44095da40f170b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 10:51:30', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7126b35521cd0dba932e6f04b0dac88f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 10:52:22', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9bd6e11c5a2f0bb70215cfa097a4b29c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 10:57:52', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7e2edea80050d2e46aa2e8faef8e29ce', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 11:01:38', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('190eb7b4d493eb01b13c5b97916eeb13', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 11:09:05', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ea268ad02db29012b2f1bd3d4aea1419', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 11:10:22', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7dc498b45fbf25c59686d9dda0d3eb66', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 11:12:38', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('583d3aa445d408f4ecd19ee0a85514af', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 11:18:04', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9cea908c7a78dc77fdaed975819983bd', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 11:20:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d70329497664391dabc25effe7406c50', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 11:25:12', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0b9940fc5487026a3f16cade73efead5', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 11:28:28', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f21f9f700bf4f5bd9edda7a16ed338f8', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 11:30:05', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f5c08b45885d248c422a5d406cd5f223', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 11:41:54', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e9a31bfc128b3f5ae01656916c605ddb', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 11:44:56', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('6baccd034e970c6f109791cff43bc327', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 11:46:12', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d2b516c5d834bd0fca91cda416fe499e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 11:46:42', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f9abb524e0dc3571571dc6e50ec6db75', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 11:47:13', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d1111594fef195980370c5f91ccf9212', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 11:48:09', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9174fe77fe8ba69243f72d5577b391d3', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 11:48:38', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2ab9cf95ac35fdbb8fe976e13c404c41', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 11:49:05', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9be945480d69038865279f02df5cee45', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 11:49:47', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('c2bfe3b92e6bfb7016cc82e95419a602', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 11:54:05', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7c310b99a84411798a2aaf4074a28e7e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 12:42:57', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b23293288a84ba965509f466ed0e7e2f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 12:43:11', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('cf590576a5f6a42b347e6b5bf5ebf5bd', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 12:43:31', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b5df1807f08af5db640da11affec24d3', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 12:49:25', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2746af3dd0309cdeeff7d27999fbcda1', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 12:52:55', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2a383edf5445dc8493f5240144ca72f5', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 12:56:05', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d2910961a0ff046cc3ef6cf8d33a8094', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 15:38:47', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('00f763e007e5a6bddf4cb8e562a53005', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 15:41:31', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('8ab131214232450ca202103ef81f0a2d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 15:46:29', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('606cb4f81f9bb412e2b2bdaa0f3e5dda', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 16:27:23', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f543c25bdd741055aeb4f77c5b5acf58', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 14:40:58', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('bc594b8921a0bcdb26d4a93916316092', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 14:42:58', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('11f511eeeb2e91af86b9d5e05132fc89', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 15:13:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('810deb9fd39fa2f0a8e30e3db42f7c2b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 18:51:00', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d5b9e5d9bfbbd8e6d651087ead76d9f7', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 20:17:41', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('016510fc662d9bb24d0186c5478df268', '1', '用户名: admin,登录成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-02-26 20:27:18', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('eb6f5196de91dd2e8316696bddd61345', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 22:26:36', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d762a1cba3dc23068f352323d98909e0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 22:26:49', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('69fc2407b46abad64fa44482c0dca59f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-01 12:04:25', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0d6cd835072c83f46d1d2a3cf13225d3', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-01 12:04:44', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e78f8832d61c1603c17767ee2b78ef07', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-01 19:50:03', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0475b4445d5f58f29212258c1644f339', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-01 20:20:23', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2b5a76869a7d1900487cd220de378dba', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-05 16:32:00', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('21b8493a05050584d9bb06cfc2a05a6b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-05 17:29:52', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a61d9db83888d42b0d24621de48a880d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-05 22:49:48', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('097be3e8fdf77a245f5c85884e97b88c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-05 22:52:45', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7b2b322a47e1ce131d71c50b46d7d29e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-06 15:55:20', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('cedf399271592c27dcb6f6ce3312e77d', '2', '删除测试DEMO', null, 'admin', '管理员', '127.0.0.1', 'org.jeecg.modules.demo.test.controller.JeecgDemoController.delete()', null, '["7501"]', null, '24', 'admin', TO_DATE('2019-03-06 16:03:13', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('efe77038e00cfff98d6931c3e7a4c3d6', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-06 16:20:19', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ffac84fff3c65bb17aa1bda3a0d2029e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-06 20:10:50', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('45819fe1b96af820575a12e9f973014e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-07 09:19:22', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('87885bc889d23c7c208614da8e021fb0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-07 10:23:22', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('54c2bad38dafd9e636ce992aa93b26af', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-07 11:57:14', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d3c4f120d8a23b62ec9e24b431a58496', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-07 14:17:24', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d01d658731dac4b580a879d986b03456', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-07 15:00:37', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ab550d09101a88bc999ea57cbb05aa5a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-07 17:59:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('aeb738ab880c262772453d35fc98f2f2', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-07 18:50:30', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('375aadb2833e57a0d5a2ce0546a65ca4', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-07 20:38:52', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('96d7fe922f46123e0497e22dedf89328', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-07 23:10:48', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('636d37d423199e15b4030f35c60859fe', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-08 10:07:21', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a7d1f4a774eb8644e2b1d37ca5f93641', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-08 10:16:03', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('017e9596f489951f1cc7d978085adc00', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-08 10:58:00', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0b42292a532c796495a34d8d9c633afa', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-08 12:58:03', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b428718441be738cf8b5ce92109068c3', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-08 16:21:37', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('89d2bc84e056f327291c53821d421034', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-08 16:57:46', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e09bb0a74c268a9aaf1f94edcc2eb65a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-08 18:26:14', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0dc22e52c9173e4e880728bc7734ff65', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-09 11:14:47', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('5358b182eab53a79eec236a9cee1e0fc', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-09 13:01:21', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('23176e4b29c3d2f3abadd99ebeffa347', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-09 16:37:50', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('703fbcb7e198e8e64978ec0518971420', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-09 17:53:55', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9e9d01c430b72703ce3a94589be54bbe', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-09 18:26:06', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ef54197116da89bf091c0ed58321eea4', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-09 19:22:06', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7b85fba62bc001773fff1a54e1609aef', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 16:28:20', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b3127e34f395e1f1790450da5689a4a1', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 16:28:35', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('fb2871cda1421b766f8e68cb36a22bf3', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 17:35:01', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('29fb5d4297748af3cd1c7f2611b7a2d6', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 17:38:05', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('580256f7c7ea658786dba919009451b6', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 17:39:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('8802209912ca66d56f2ea241ffd0cc13', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 17:52:34', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('4778fe2992fd5efd65f86cb0e00e338e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 17:53:11', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d68957c067fb27e80a23babebdb1591f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 17:55:06', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('472c34745b8f86a46efa28f408465a63', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 17:56:31', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('26975f09c66025d1c8d87a6894a3c262', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 18:29:08', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e4a166fcd0fc4037cb26e35cc1fb87b2', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 18:32:41', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('286af82485388bfcd3bb9821ff1a4727', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 18:34:37', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('eaf74cd1489b02d39c470eed131fc918', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 18:37:39', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e48a6bd82c92a8005c80c5ef36746117', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 19:32:26', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('10922e0d030960e6b026c67c6179247b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 20:07:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b53c9e8ce1e129a09a3cda8c01fe644c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 11:38:49', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('65be8e015c9f2c493bd0a4e405dd8221', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 11:40:20', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('8ff27392165c8c707ee10ec0010c7bb8', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 11:44:07', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('337b647a4085e48f61c7832e6527517d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 11:45:16', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('caee69e55ec929f7ba904280cac971e6', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 11:49:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('bdeae62057ae9858b6a546c1bdb6efc7', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 11:49:29', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ea66ed22fde49640cee5d73c6ef69718', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 11:50:04', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('47c5a5b799e10255c96ccd65286541ef', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 11:50:35', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('cfba34db2d7fbb15a2971212f09b59ec', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 11:51:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('faad055dd212ed9506b444f8f1a920b9', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 12:00:38', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ef7219725c4b84cc71f56f97a8eab01a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 12:08:00', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2811e224e4e8d70f2946c815988b9b7c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 12:08:14', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7feae2fb5001ca0095c05a8b08270317', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 12:17:31', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b4c3c7af9899b9af3f42f730cfabc9b2', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 12:17:58', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('28e8a7ed786eaced3182c70f68c7ea78', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 12:18:33', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3a76114e431912ff9a19a4b6eb795112', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 12:19:41', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('557b3c346d9bc8f7a83fac9f5b12dc1b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 12:20:28', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e92544c6102243e7908e0cbb217f5198', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 12:48:28', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('61445cc950f5d04d91339089b18edef9', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 14:13:22', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('776c2e546c9ab0375d97590b048b8a9d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 14:13:51', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ef7669ac0350730d198f59b8411b19d1', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 14:28:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b3cceb535fa5577cc21b12502535ad29', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 14:29:01', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('18a51a5f04eeaad6530665f6b0883f0c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 14:34:11', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('8a13971104d70e35111d10dd99de392e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 14:34:25', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('6d93d5667245ef8e5d6eafdbc9113f51', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 14:34:42', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7ba3df5d2612ac3dd724e07a55411386', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 14:35:03', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7148b3d58f121ef04bcbea5dd2e5fe3b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 14:35:23', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('709b0f2bf8cb8f785f883509e54ace28', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 14:37:37', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('4114145795da30b34545e9e39b7822d9', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-26 14:39:33', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0d85728028ed67da696137c0e82ab2f6', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-16 12:58:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('4aa770f37a7de0039ba0f720c5246486', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-17 17:26:12', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2fecb508d344c5b3a40f471d7b110f14', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-17 17:36:53', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('61aac4cfe67ec6437cd901f95fbd6f45', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-17 17:40:21', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('62e208389a400e37250cfa51c204bdc8', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-17 17:44:49', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('eb9a522fd947c7a706c5a106ca32b8c9', '1', '用户名: jeecg,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-17 17:50:17', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('bd9167a87aee4574a30d67825acaad0a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-17 17:51:03', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('49f1ec54eb16af2001ff6809a089e940', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-17 17:59:10', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('bdfd95b4d4c271d7d8d38f89f4a55da9', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-17 17:59:12', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('95063e0bdfa5c9817cc0f66e96baad93', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-17 17:59:16', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('30da94dd068a5a57f3cece2ca5ac1a25', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-17 18:01:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('8fde5f89e8ad30cf3811b8683a9a77b1', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-17 18:02:41', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2ebe7f0432f01788d69d39bc6df04a1a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-17 18:05:09', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('beb9ef68b586f05bd7cf43058e01ad4a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-17 22:29:02', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('befbcf5a27ef8d2ca8e6234077f9413d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-18 16:01:33', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('378b44af9c1042c1438450b11c707fcf', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-18 16:07:39', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0571e5730ee624d0dd1b095ad7101738', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-18 16:10:50', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3ec2023daa4a7d6a542bf28b11acf586', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-18 16:18:20', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('64c00f27ddc93fda22f91b38d2b828b5', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-18 17:34:45', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('21bad1470a40da8336294ca7330f443d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-18 17:35:32', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('72ee87d0637fb3365fdff9ccbf286c4a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-18 17:36:44', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d8c43edd685431ab3ef7b867efc29214', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-18 17:37:18', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0ad51ba59da2c8763a4e6ed6e0a292b2', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-18 17:37:53', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d916bd1d956418e569549ee1c7220576', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-18 19:18:42', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('917dbb5db85d1a6f142135827e259bbf', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-18 20:21:03', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('db2b518e7086a0561f936d327a0ab522', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-18 22:39:23', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('61d2d2fd3e9e23f67c23b893a1ae1e72', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-18 22:44:56', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('671a44fd91bf267549d407e0c2a680ee', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-18 22:45:16', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('586e8244eff6d6761077ef15ab9a82d9', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-18 23:03:51', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2b4d33d9be98e1e4cdd408a55f731050', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-19 10:32:00', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3267222d9387284b864792531b450bfe', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-19 10:33:23', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a28de45f52c027a3348a557efab6f430', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-19 10:34:26', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9db7e7d214dbe9fe8fff5ff20634e282', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-19 11:19:34', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('74209dfc97285eb7919868545fc2c649', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-19 11:23:08', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('49d48fda33126595f6936a5d64e47af0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-19 13:17:51', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('fe0dc06eaef69047131f39052fcce5c4', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-19 13:56:05', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f540eff3f6e86c1e0beccd300efd357f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-19 15:15:26', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3fd0d771bbdd34fae8b48690ddd57799', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-19 17:17:22', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('27e8812c9a16889f14935eecacf188eb', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-19 18:52:19', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('88bab180edf685549c7344ec8db7d954', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-19 19:07:06', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ed9b4ffc8afab10732aac2d0f84c567b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-19 19:10:52', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ad97829fe7fefcd38c80d1eb1328e40f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-20 09:28:18', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3d25a4cdd75b9c4c137394ce68e67154', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-20 09:59:31', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('5c7e834e089ef86555d8c2627b1b29b5', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-20 11:25:26', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b3adf055f54878657611ef430f85803e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-20 11:33:57', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('8d105ea6c89691bc8ee7d4fd568aa690', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-20 11:39:33', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('445436e800d306ec1d7763c0fe28ad38', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-20 11:43:00', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7f9c3d539030049a39756208670be394', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-20 11:44:40', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('feaf7c377abc5824c1757d280dd3c164', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-20 11:58:54', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('c72bb25acd132303788699834ae039b4', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-20 12:06:06', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e4c06405615399d6b1ebea45c8112b4d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-20 12:07:26', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f95d517f43ba2229c80c14c1883a4ee9', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-20 12:11:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d18bff297a5c2fa54d708f25a7d790d6', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-20 12:13:05', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b5f6636c6e24e559ddf1feb3e1a77fd5', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-20 12:14:05', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('aeca30df24ce26f008a7e2101f7c513c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-20 12:27:53', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('cd7a7c49e02ca9613b6879fda4e563cf', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-20 12:29:08', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a7ee4b4c236bc0e8f56db5fdf1e5ac38', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-20 13:21:36', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('6d45672f99bbfd01d6385153e9c3ad91', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-20 13:49:20', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('905d2cf4308f70a3a2121a3476e38ed0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-20 14:00:30', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('27d23027dc320175d22391d06f50082f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-20 15:50:06', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('52fde989fb8bb78d03fb9c14242f5613', '1', '用户名: admin,登录成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-03-20 17:04:09', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('952947331f8f3379494c4742be797fc3', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-20 18:42:11', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('39caf3d5d308001aeb0a18e15ae480b9', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 10:31:07', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('772f238d46531a75fff31bae5841057c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 11:31:16', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f79af48e6aeb150432640483f3bb7f2a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 13:09:11', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('20fc3263762c80ab9268ddd3d4b06500', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 13:36:44', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e8b37ad67ef15925352a4ac3342cef07', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 13:38:10', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d6aaf0f8e2428bf3c957becbf4bcedb4', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 13:38:14', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3bc73699a9fd3245b87336787422729b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 13:41:07', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('862aa0e6e101a794715174eef96f7847', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 13:41:09', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a6209166e1e9b224cca09de1e9ea1ed7', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 13:41:10', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b954f7c34dfbe9f6a1fc12244e0a7d59', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 13:41:10', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('64711edfb8c4eb24517d86baca005c96', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 13:41:11', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0efc9df0d52c65ec318e7b46db21655f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 13:42:47', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('c03985d6e038b5d8ebdeec27fce249ba', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 13:43:24', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('69e6fd7891d4b42b0cccdc0874a43752', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 13:45:58', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9b23981621d5265a55681883ec19fa91', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 13:46:05', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('37ca8ff7098b9d118adb0a586bdc0d13', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 13:46:07', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ea5f9191b0f593a1d6cb585538caa815', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 13:46:08', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('8e03def9e0283005161d062d4c0a5a80', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 13:46:09', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f78e24f5e841acac2a720f46f6c554bc', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 13:47:17', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f93279c6899dc5e6cec975906f8bf811', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 13:47:20', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('cd5af66a87bb40026c72a748155b47e8', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 13:47:26', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('5902fb4ba61ccf7ff4d2dd97072b7e5b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 13:48:30', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e1d1fc464cf48ec26b7412585bdded1a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 13:49:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('5ea258e1f478d27e0879e2f4bcb89ecd', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 14:01:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2e44c368eda5a7f7a23305b61d82cddb', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 18:14:23', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('34a6b86424857a63159f0e8254e238c2', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 18:22:08', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ffc6178ffa099bb90b9a4d0a64dae42b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 18:28:32', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3612f8d40add5a7754ea3d54de0b5f20', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 19:59:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7a511b225189342b778647db3db385cd', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 20:50:10', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b7085f003b4336af4d4ba18147f8e5ae', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 22:29:37', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('c66e22782dd3916d1361c76b0cc4ec8a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-21 22:44:06', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('c6cbe54fcb194d025a081e5f91a7e3f0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-22 10:26:38', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('1ab7c74d217152081f4fa59e4a56cc7b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-22 12:03:39', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('5f00b5514a11cd2fe240c131e9ddd136', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-22 16:30:52', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('82cee1c403025fc1db514c60fc7d8d29', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-22 16:41:50', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('af5869701738a6f4c2c58fe8dfe02726', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-22 16:42:40', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('233e39d8b7aa90459ebef23587c25448', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-22 17:38:36', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b0cebd174565a88bb850a2475ce14625', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-22 18:19:39', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('26529d5753ceebbd0d774542ec83a43e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-22 20:17:41', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f3e1f7fb81004ccd64df12d94ef1e695', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-22 21:30:37', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a2e0435673b17f4fb848eecdf8ecacd6', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-22 21:32:37', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('5323f848cddbb80ba4f0d19c0580eba9', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-22 22:58:40', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('5858f2f8436460a94a517904c0bfcacb', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-22 23:42:21', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('8d9ce65020320d46882be43b22b12a62', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-23 10:56:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('11802c7a3644af411bc4e085553cfd4f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-23 14:46:35', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('fc69a1640a4772c8edf2548d053fa6de', '1', '用户名: admin,登录成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-03-23 14:55:33', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e3031f999984909f9048d8ec15543ad0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-23 18:43:02', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f43e38800d779422c75075448af738d1', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-23 18:47:11', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('dcfe23b155d5c6fa9a302c063b19451e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-23 18:47:21', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('802cec0efbe9d862b7cea29fefc5448b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-23 18:58:50', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f58e160e97d13a851f59b70bf54e0d06', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-23 20:11:58', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b8bd2a9de3fb917dfb6b435e58389901', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-23 20:13:31', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e01ed1516e8ae3a2180acbd4e4508fa5', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-23 20:28:12', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b7f33b5a514045878447fc64636ac3e6', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-23 22:00:34', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d0ce9bfc790a573d48d49d3bbbf1a1cb', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-23 22:09:06', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('74c991568d8bcb2049a0dbff53f72875', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-23 22:12:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0251bbee51c28f83459f4a57eeb61777', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-23 22:14:27', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a5848ab4e8d0fb6ecf71ee1d99165468', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-23 22:14:50', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('79a1737fcc199c8262f344e48afb000d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-23 23:25:25', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('6cfeaf6a6be5bb993b9578667999c354', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-24 11:43:34', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('c5d4597b38275dcb890c6568a7c113f2', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-24 12:18:46', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0f173ec7e8819358819aa14aafc724c0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 11:15:58', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ce9893f4d0dd163e900fcd537f2c292d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 11:55:55', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('90711ddb861e28bd8774631c98f3edb9', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 11:57:42', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('fb73d58bf6503270025972f99e50335d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 11:57:56', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3a290289b4b30a1caaac2d03ad3161cd', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 11:58:13', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('716f9f5f066a6f75a58b7b05f2f7f861', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 11:59:01', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('151a9f1b01e4e749124d274313cd138c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 11:59:17', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0ef3e7ae8c073a7e3bdd736068f86c84', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 12:02:27', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0a634ed086442afa7a5fc9aa000b898a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-25 10:10:39', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('679e12ba247575749e03aa8f67347ac6', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 17:14:42', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('5c35117cbeb39428fcc2ddd90ce96a2b', '1', '用户名: jeecg,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 17:18:51', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7225200c3cec4789af4f1da2c46b129d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 17:19:23', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('22ad9f87788506456c774801389d6a01', '1', '用户名: jeecg,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 17:20:10', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('81c95e1c8805fa191753fc99ba54c3e9', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 18:01:21', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7285730e2644f49def0937dc99bfbe3d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 18:07:01', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('4922f2f1173a1edc11dfd11cb2a100ae', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 18:08:27', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e37cce529d0c98c47b4977d7ddf963c0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 18:17:54', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('66493cd0347eeb6ee2ef5ee923604683', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 18:29:47', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f04910792a74c563d057c4fcb345f963', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 18:30:00', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('210a01dcb34302eaed0d1e95820655d0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 18:30:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('48929ec94226d9ccff9fae4ff48e95e3', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 18:32:55', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d2ac19a709ea08f7259286df28efd635', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 18:35:37', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d8fd478e6ceb03a575719e1a54342333', '1', '用户名: jeecg,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 18:43:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a35a476c303983701045507c9af3fa03', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-20 18:44:58', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7e41208e29d412d586fc39375628b0d0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-21 15:34:35', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('1f33d11e1833ae497e3ef65a3f02dd5b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-21 19:51:12', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('dae0658783324c81fa6909b6e4a25a65', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-22 11:46:41', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a77d29673cfe97c9e03cfb879b934f62', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-22 12:41:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('baaf37e5937f938ac92856bc74cc2b86', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-22 13:48:53', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3f47afcdce94596494746ac34eebf13b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-22 13:59:10', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b99fc7c53d4e3edc0c618edc11d3a073', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-22 15:58:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('024a4c5ba78538d05373dac650b227d1', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-22 15:59:50', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('873f425879ef9ca7ced982acda19ea58', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-22 16:35:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('1b05434820cbcb038028da9f5cda31bb', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-22 17:45:16', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('5f314fc45492d7f90b74d1ca74d1d392', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-22 17:45:48', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('20751803c1e5b2d758b981ba22f61fcd', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-22 18:11:05', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('50e8de3e6b45f8625b8fd5590c9fd834', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-22 18:23:18', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('6737424e01b38f2273e9728bf39f3e37', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-22 19:43:37', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0473dedf4aa653b253b008dacff2937c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-24 13:04:44', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a95192071de908f37f4998af4c269bcb', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-24 14:26:53', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3569ada5c43a4022d3d13ac801aff40e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-24 14:50:55', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('562092eb81561ee0f63be5dd9367d298', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-24 22:20:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('131ccd390401b6e3894a37e4d1d195d3', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-24 22:26:52', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('c12e3d7655a5a8b192bb9964a2a66946', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-24 22:35:45', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('6bc98b7dc91a3924f794202867367aca', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-24 22:50:34', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('002b7112a147edeb6149a891494577d0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-24 22:52:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('202344b08b69ad70754e6adaa777eae0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-24 22:54:22', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('eeb1f2e2c1b480e0bb62533848cbb176', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-24 22:55:46', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('94fe4465d779e0438cfe6f0cb1a1aa7e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-24 22:57:42', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d03aaee882d13b796db860cb95f27724', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-24 22:59:54', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('1db82f78233c120c6ec7648ca1177986', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-24 23:07:39', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7dc448f04edf4b9655362ad1a1c58753', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-24 23:10:17', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('fce1553149aea9bfd93e089f387199c8', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-02-24 23:11:35', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('5c04e3d9429e3bcff4d55f6205c4aa83', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-30 18:14:29', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('af8fe96a9f0b325e4833fc0d9c4721bf', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-03-30 18:14:56', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('21910e350c9083e107d39ff4278f51d6', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-30 18:14:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('636309eec5e750bc94ce06fb98526fb2', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-03-30 18:15:03', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9d0416e09fae7aeeeefc8511a61650c2', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-30 18:15:05', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2e63fd1b3b6a6145bc04b2a1df18d2f5', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-30 19:01:33', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2966ed2bdf67c9f3306b058d13bef301', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-30 21:25:10', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3683743d1936d06f3aaa03d6470e5178', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-30 22:40:12', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0ba24c5f61ff53f93134cf932dd486db', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-31 21:06:05', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('bbd3e1f27e025502a67cf54945b0b269', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-31 22:13:16', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('1f8f46118336b2cacf854c1abf8ae144', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-01 11:02:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ac8cf22c2f10a38c7a631fc590551c40', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-01 12:04:16', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7d11535270734de80bd52ec0daa4fc1f', '1', '用户名: admin,登录成功！', null, null, null, '192.168.1.105', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-01 12:20:14', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('6b4cdd499885ccba43b40f10abf64a78', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-01 13:04:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('77a329e5eb85754075165b06b7d877fd', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-01 13:25:17', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0e754ee377033067f7b2f10b56b8784c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-01 17:17:45', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9b7a830914668881335da1b0ce2274b1', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-01 17:19:02', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a1b870eee811cfa4960f577b667b0973', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-01 18:23:44', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('85b3106d757d136b48172a9ab1f35bb6', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-01 18:34:34', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7f31435ca2f5a4ef998a4152b2433dec', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-01 18:36:40', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f20cf3fe228ba6196a48015b98d0d354', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-01 19:25:22', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('65771bce3f5786dfb4d84570df61a47a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-01 22:07:57', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('c98a6367b152cf5311d0eec98fab390c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-01 22:13:34', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('93b4d26f60d7fb45a60524760bf053e4', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-01 22:20:06', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3087ac4988a961fa1ec0b4713615c719', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-01 22:54:24', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a69f4ff4e48754de96ae6fa4fabc1579', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 09:18:48', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a63147887c6ca54ce31f6c9e6279a714', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 09:19:07', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a2950ae3b86f786a6a6c1ce996823b53', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-04-02 09:47:11', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('615625178b01fc20c60184cd28e64a70', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 09:47:13', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('89fbc93e77defb34c609c84a7fe83039', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-04-02 09:47:14', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('432067d777447423f1ce3db11a273f6f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 09:47:17', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7d8539ff876aad698fba235a1c467fb8', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-04-02 09:47:18', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('689b8f2110f99c52e18268cbaf05bbb6', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 09:58:44', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2919d2f18db064978a619707bde4d613', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-04-02 09:58:45', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0dc6d04b99e76ad400eef1ded2d3d97c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 09:59:45', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('45f0309632984f5f7c70b3d40dbafe8b', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-04-02 09:59:46', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d869534109332e770c70fad65ef37998', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 10:02:30', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('c21422fa08f8480a53367fda7ddddf12', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-04-02 10:02:30', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('1e4533a02fb9c739a3555fa7be6e7899', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 10:04:56', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('03c0ab177bd7d840b778713b37daf86f', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-04-02 10:04:57', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('60886d5de8a18935824faf8b0bed489e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 10:11:35', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('4218b30015501ee966548c139c14f43f', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-04-02 10:11:35', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('de938485a45097d1bf3fa311d0216ed4', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 10:15:22', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e1d0b1fd3be59e465b740e32346e85b0', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-04-02 10:16:37', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('cb60857cf41b47b8f260068609140cf0', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-05-17 18:09:39', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('322b9b5a48f73f73bb3223240dac97f7', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg', TO_DATE('2019-05-17 18:09:52', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('033770a85e24ce2642fccdb288bbf504', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg', TO_DATE('2019-05-18 12:01:45', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('4234117751af62ac87343cbf8a6f1e0f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 10:17:17', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('845f732f6a0f0d575debc4103e92bea2', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-04-02 10:17:18', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('cc39057ae0a8a996fb0b3a8ad5b8f341', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 10:20:05', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('155d2991204d541388d837d1457e56ab', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 11:32:57', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2312c2693d6b50ca06799fee0ad2554a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 12:11:32', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d98115c02c0ac478a16d6c35de35053d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 12:50:09', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('55e906361eeabb6ec16d66c7196a06f0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 12:50:20', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3836dc3f91d072e838092bc8d3143906', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 12:50:32', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('add13f513772a63f8ca8bf85634bb72c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 13:09:03', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a6971e63e3d9158020e0186cda81467d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 14:59:23', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2eb75cb6ca5bc60241e01fa7471c0ccf', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 18:34:04', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3e69108be63179550afe424330a8a9e4', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-04-02 18:38:05', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('6c558d70dc5794f9f473d8826485727a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 18:38:44', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('687810e7fea7e480962c58db515a5e1c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 18:42:30', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d23e6766cecf911fb2e593eeee354e18', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 18:42:35', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0819ea9729ddf70f64ace59370a62cf1', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 18:59:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('939b3ff4733247a47efe1352157b1f27', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 19:01:06', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('6cf638853ef5384bf81ed84572a6445d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-02 19:25:24', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('bc28d4275c7c7fcd067e1aef40ec1dd4', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-03 10:53:03', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('43536edd8aa99f9b120872e2c768206c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-03 10:53:26', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7268539fbe77c5cc572fb46d71d838f1', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-03 13:22:48', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f0409312093beb563ac4016f2b2c6dfd', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-03 13:24:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a710ed2de7e31fd72b1efb1b54ba5a87', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-03 15:30:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b01c3f89bcfd263de7cb1a9b0210a7af', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-03 17:53:55', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e1fa52ecbcc0970622cc5a0c06de9317', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-04-03 18:33:04', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('790b722fa99a8f3a0bc38f61e13c1cf4', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-03 18:34:07', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('20e5887d0c9c7981159fe91a51961141', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-03 20:12:07', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ce6aa822166b97a78b0bbea62366f8e0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-03 20:14:29', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3e6116220fa8d4808175738c6de51b12', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-03 21:04:46', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('10a434c326e39b1d046defddc8c57f4a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-03 21:18:29', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('317e3ae1b6ccdfb5db6940789e12d300', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-04-03 21:44:31', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2b801129457c05d23653ecaca88f1711', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-03 21:44:34', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7a99cf653439ca82ac3b0d189ddaad4a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-04 10:41:34', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('68e90e08a866de748e9901e923406959', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-04 12:37:06', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2942a12521ac8e3d441429e6c4b04207', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-04 14:12:10', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('dfacaa7c01ccf0bade680044cced3f11', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-04 15:25:10', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f3cafb545e5693e446f641fa0b5ac8cd', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-04 17:07:56', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('060d541a9571ca2b0d24790a98d170a6', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-04 19:28:04', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9df97c1b3213aa64eda81c6bf818b02b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-04 22:42:48', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('43079866b75ee6a031835795bb681e16', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-04-04 22:44:16', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('55d649432efa7eaecd750b4b6b883f83', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-04 22:44:19', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ca737885d9034f71f70c4ae7986fafa8', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-04 22:47:28', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('1534f0c50e67c5682e91af5160a67a80', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-04 22:47:28', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('93bb98ba996dacebfb4f61503067352e', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-04 22:47:28', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('5c48703e3a2d4f81ee5227f0e2245990', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-04-04 23:12:04', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('70849167f54fd50d8906647176d90fdf', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-04 23:12:29', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('310bb368795f4985ed4eada030a435a0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-04 23:22:20', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('477592ab95cd219a2ccad79de2f69f51', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-05 10:38:24', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e39f051ba6fdb7447f975421f3b090a7', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-05 12:49:18', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('4d1be4b4991a5c2d4d17d0275e4209cf', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-05 20:47:21', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9eb3fb6d9d45e3847a88f65ed47da935', '1', '用户名: jeecg,登录成功！', null, null, null, '192.168.3.22', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-05 20:52:47', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('6664dc299f547f6702f93e2358810cc1', '1', '用户名: admin,登录成功！', null, null, null, '192.168.3.22', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-05 21:04:14', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9c32ec437d8f8d407b1bd1165fc0305d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-08 15:01:25', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('68df65639e82cc6a889282fbef53afbb', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-08 15:01:37', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('79e76353faffd0beb0544c0aede8564f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-08 17:28:14', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('da3fda67aea2e565574ec2bcfab5b750', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-08 22:36:20', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('de37620b6921abcfe642606a0358d30f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-09 15:42:46', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b0e6b3a0ec5d8c73166fb8129d21a834', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-09 16:56:16', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('01075aa535274735e0df0a8bc44f62f9', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-04-09 16:56:46', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('01ebe1cbeae916a9228770f63130fdac', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-09 16:56:50', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('baa53d6a534e669f6150ea47565fa5b9', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-09 17:27:24', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e232f89df26cc9e5eced10476c4e4a2b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-10 10:05:11', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('335956cbad23d1974138752199bf1d84', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-10 10:05:36', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('bd6d7d720b9dd803f8ad26e2d40870f3', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-10 11:04:06', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ff3f7dbda20cd2734b1238fa5ba17fcf', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-04-10 11:26:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('672b527c49dc349689288ebf2c43ed4d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-10 11:26:47', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('21510ebaa4eca640852420ed6f6cbe01', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-10 11:41:26', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3e2574b7b723fbc9c712b8e200ea0c84', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-10 14:24:34', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('0d4582c6b7719b0bfc0260939d97274f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-10 21:48:47', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3e64011b4bea7cdb76953bfbf57135ce', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-10 23:09:32', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a83e37b55a07fe48272b0005a193dee6', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-11 09:17:59', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('30ec2dc50347240f131c1004ee9b3a40', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-11 10:19:05', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7ce1934fb542a406e92867aec5b7254d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-11 14:53:23', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('5ee6d5fe1e6adcc4ad441b230fae802d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-11 15:56:33', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d4ef00700436645680657f72445d38db', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-11 18:05:29', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('aa49341b29865b45588ad2f9b89c47ea', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-04-11 19:42:42', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d3b54be0510db6a6da27bf30becb5335', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-11 19:42:46', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('dd4e1ab492e59719173d8ae0f5dbc9a2', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-04-11 19:47:12', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('056dd4466f4ed51de26c535fd9864828', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-11 19:47:15', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('89bfd8b9d6fa57a8e7017a2345ec1534', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-12 09:27:32', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('51aeabed335ab4e238640a4d17dd51a3', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-04-12 10:12:41', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('67181c36b55b06047a16a031fd1262c1', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg', TO_DATE('2019-05-17 13:55:22', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2d5af41d2df82b316ba31fcdf6168d6a', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg', TO_DATE('2019-05-17 14:43:58', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e2f703771f64b1bcd709204669ae3d93', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-05-17 14:48:39', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('8143ce0b35bfe6e7b8113e1ecc066acd', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg', TO_DATE('2019-05-17 14:48:48', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3174a8b505349ffe026683d8eb3b6503', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-05-17 17:35:36', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('31562c5049a1f9d198eb164b423e2a0c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg', TO_DATE('2019-05-17 17:35:44', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3dca909fd9d1cf5b974391b8a5d2d9ef', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg', TO_DATE('2019-05-17 17:31:03', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d7e7cb4c21372e48b8e0ec7e679466e3', '1', '用户名: null,退出成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 12:02:34', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('15b9599cb02b49a62fb4a1a71ccebc18', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 12:02:50', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ecfee5b948602a274093b8890e5e7f3f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 12:05:11', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('cbf83d11486a8d57814ae38c9822b022', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 12:05:39', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f2ce8024e62740f63c134c3cfb3cae23', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 12:07:41', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('c665d704539483630cc9ed5715ed57a8', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 12:10:12', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e93f1a170e3cd33f90dd132540c7a39b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 12:12:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('fded8eb5d78d13791baec769019fee54', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 12:15:07', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('03ec66b6b6d17c007ec2f918efe5b898', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 12:16:03', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('5e8bac7831de49146d568c9a8477ddad', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 12:16:37', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('cd064a2f6cb6c640cb97a74aaa6041d7', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 12:17:10', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a521d9f2a0087daa37923fa704dea85b', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-03-25 12:45:52', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('4816854636129e31c2a5f9d38af842ef', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-03-25 12:45:54', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('90b4bad7939233a1e0d7935f079ea0fa', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-03-25 12:45:54', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('aec0817ecc0063bde76c1f6b6889d117', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 12:47:06', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e169938510c9320cb1495ddb9aabb9d1', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 12:47:40', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b7478d917ab6f663e03d458f0bb022a3', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 12:50:55', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('642e48f2e5ac8fe64f1bfacf4d234dc8', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-03-25 12:51:21', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ed2740de487c684be9fa3cf72113ae30', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 12:51:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b1e9797721dbfcc51bbe7182142cbdcd', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-03-25 12:52:25', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('6a67bf2ff924548dee04aa97e1d64d38', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 12:52:41', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a56661bbc72b8586778513c71f4764f5', '1', '用户名: jeecg,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 12:53:09', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ae61be664d2f30d4f2248347c5998a45', '1', '用户名: jeecg,退出成功！', null, 'jeecg', 'jeecg', '127.0.0.1', null, null, null, null, null, 'jeecg', TO_DATE('2019-03-25 12:53:17', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('4ab79469ba556fa890258a532623d1dc', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 12:54:20', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3a0330033a8d3b51ffbfb2e0a7db9bba', '1', '用户名: jeecg,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 12:54:27', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('b972484d206b36420efac466fae1c53f', '1', '用户名: jeecg,退出成功！', null, 'jeecg', 'jeecg', '127.0.0.1', null, null, null, null, null, 'jeecg', TO_DATE('2019-03-25 12:54:38', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7e92abdc0c1f54596df499a5a2d11683', '1', '用户名: jeecg,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 12:59:34', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('fa9b4d7d42bc9d1ba058455b4afedbfb', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-03-25 12:59:46', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('1d970c0e396ffc869e3a723d51f88b46', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 13:01:17', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('88d7136ed5c7630057451816dbaff183', '1', '用户名: jeecg,退出成功！', null, 'jeecg', 'jeecg', '127.0.0.1', null, null, null, null, null, 'jeecg', TO_DATE('2019-03-25 13:01:24', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('48eac0dd1c11fe8f0cb49f1bd14529c2', '1', '用户名: jeecg,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 13:01:31', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a8c7ba2d11315b171940def2cbeb0e8f', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-03-25 13:01:40', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('20fea778f4e1ac5c01b5a5a58e3805be', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 19:01:49', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('48e5faf2d21ead650422dc2eaf1bb6c5', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 22:08:09', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f74f759b43afa639fd1c4f215c984ae0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-25 22:08:18', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d82b170459d99fc05eb8aa1774e1a1c9', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-26 18:45:14', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e088a2607864d3e6aadf239874d51756', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-26 18:46:56', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('95d906e6f048c3e71ddbcc0c9448cf49', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-26 19:23:30', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3767186b722b7fefd465e147d3170ad1', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-26 21:57:19', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f21e30d73c337ea913849ed65808525c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-27 10:23:22', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('189e3428e35e27dfe92ece2848b10ba8', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-27 15:52:21', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e2b6d0e751f130d35c0c3b8c6bd2a77e', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-03-27 16:18:40', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('586002e1fb4e60902735070bab48afe3', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-27 16:18:52', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('611fa74c70bd5a7a8af376464a2133e8', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-27 17:48:13', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('90555a39c0b02180df74752e4d33f253', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-27 18:26:25', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('217aa2f713b0903e6be699136e374012', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-27 20:07:32', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('5554869b3475770046602061775e0e57', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-28 14:38:05', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('bfec8c8c88868391041667d924e3af7f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-28 14:38:27', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('675153568c479d8b7c6fe63327066c9f', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-28 15:29:42', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('4930e32672465979adbc592e116226a6', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-28 16:53:28', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('9a1456ef58a2b1fb63cdc54b723f2539', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-28 17:26:39', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('484cdb8db40e3f76ef686552f57d8099', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-28 18:14:49', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('02d4447c9d97ac4fc1c3a9a4c789c2a8', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-03-28 18:24:18', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('59558082e1b1d754fa3def125ed4db3c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-28 18:24:19', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('c434dc5172dc993ee7cd96187ca58653', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-03-28 19:46:08', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a6261bbbf8e964324935722ea1384a5d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-28 19:46:27', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f0748a25728348591c7b73a66f273457', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-03-28 19:46:27', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('14f447d9b60725cc86b3100a5cb20b75', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-28 19:46:30', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7c88e9cf6018a1b97b420b8cb6122815', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-03-28 19:46:30', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('cb7c6178101ef049d3f1820ee41df539', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-28 19:59:19', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('21fed0f2d080e04cf0901436721a77a6', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-28 21:53:31', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('4ba055970859a6f1afcc01227cb82a2d', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-29 09:43:56', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('3ba1e54aa9aa760b59dfe1d1259459bc', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-29 09:44:07', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('7b44138c1b80b67da13b89db756a22b0', '2', '添加测试DEMO', null, null, null, '127.0.0.1', 'org.jeecg.modules.demo.test.controller.JeecgDemoController.add()', null, '[{"createBy":"jeecg-boot","createTime":1553824172062,"id":"5fce01cb7f0457746c97d8ca05628f81","name":"1212"}]', null, '25', 'jeecg-boot', TO_DATE('2019-03-29 09:49:32', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d7e8a7f14967c70d68f5569cb4d11d0a', '2', '删除测试DEMO', null, null, null, '127.0.0.1', 'org.jeecg.modules.demo.test.controller.JeecgDemoController.delete()', null, '["5fce01cb7f0457746c97d8ca05628f81"]', null, '9', 'jeecg-boot', TO_DATE('2019-03-29 09:49:39', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('e7f2b0a7493e7858c5db1f1595fa54b1', '2', '添加测试DEMO', null, null, null, '127.0.0.1', 'org.jeecg.modules.demo.test.controller.JeecgDemoController.add()', null, '[{"createBy":"jeecg-boot","createTime":1553824376817,"id":"e771211b77cd3b326d3e61edfd9a5a19","keyWord":"222","name":"222"}]', null, '7', 'jeecg-boot', TO_DATE('2019-03-29 09:52:56', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('997bb4cb1ad24439b6f7656222af0710', '2', '添加测试DEMO', null, null, null, '127.0.0.1', 'org.jeecg.modules.demo.test.controller.JeecgDemoController.add()', null, '[{"createBy":"jeecg-boot","createTime":1553824768819,"id":"ee84471f0dff5ae88c45e852bfa0280f","keyWord":"22","name":"222"}]', null, '5', 'jeecg-boot', TO_DATE('2019-03-29 09:59:28', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a6c3b28530416dace21371abe8cae00b', '2', '删除测试DEMO', null, null, null, '127.0.0.1', 'org.jeecg.modules.demo.test.controller.JeecgDemoController.delete()', null, '["ee84471f0dff5ae88c45e852bfa0280f"]', null, '9', 'jeecg-boot', TO_DATE('2019-03-29 09:59:48', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('d2fe98d661f1651b639bf74499f124db', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-29 10:16:29', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2186244ae450e83d1487aa01fbeae664', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-29 14:47:43', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a5daa58b078cb8b3653af869aeecebd0', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-29 17:14:31', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f29f3b7b7e14b1389a0c53d263c0b26b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-29 17:44:25', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('2659c59136fb1a284ab0642361b10cdd', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-29 18:40:22', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('a42e5cd05566ea226c2e2fc201860f2c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-30 11:15:50', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('f06048c147c5bcdbed672e32b2c86b1c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-30 14:07:28', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('13c83c56a0de8a702aeb2aa0c330e42c', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-30 14:53:52', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('ab1d707bbfdf44aa17307d30ca872403', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-30 15:50:42', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('5d8ed15778aa7d99224ee62c606589fb', '1', '用户名: 管理员,退出成功！', null, 'admin', '管理员', '127.0.0.1', null, null, null, null, null, 'admin', TO_DATE('2019-03-30 15:51:02', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_LOG" VALUES ('42aef93749cc6222d5debe3fb31ba41b', '1', '用户名: admin,登录成功！', null, null, null, '127.0.0.1', null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-30 15:51:04', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+
+-- ----------------------------
+-- Records of SYS_PERMISSION
+-- ----------------------------
+INSERT INTO "SYS_PERMISSION" VALUES ('7ac9eb9ccbde2f7a033cd4944272bf1e', '540a2936940846cb98114ffb0d145cb8', '卡片列表', '/list/card', 'list/CardList', null, null, '1', null, null, '7', null, null, '1', '1', null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('841057b8a1bef8f6b4b20f9a618a7fa6', '08e6b9dc3c04489c8e1ff2ce6f105aa4', '数据日志', '/sys/dataLog-list', 'system/DataLogList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-03-11 19:26:49', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-12 11:40:47', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('882a73768cfd7f78f3a37584f7299656', '6e73eb3c26099c191bf03852ee1310a1', '个性化设置', '/account/settings/custom', 'account/settings/Custom', null, null, '1', 'CustomSettings', null, null, null, null, '1', '1', null, null, null, TO_DATE('2018-12-26 19:00:46', 'YYYY-MM-DD HH24:MI:SS'), null, TO_DATE('2018-12-26 21:13:25', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('8b3bff2eee6f1939147f5c68292a1642', '700b7f95165c46cc7a78bf227aa8fed3', '服务器信息', '/monitor/SystemInfo', 'modules/monitor/SystemInfo', null, null, '1', null, null, '4', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-02 11:39:19', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-02 15:40:02', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('8d1ebd663688965f1fd86a2f0ead3416', '700b7f95165c46cc7a78bf227aa8fed3', 'Redis监控', '/monitor/redis/info', 'modules/monitor/RedisInfo', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-02 13:11:33', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-05-07 15:18:54', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('8fb8172747a78756c11916216b8b8066', '717f6bee46f44a3897eca9abd6e2ec44', '工作台', '/dashboard/workplace', 'dashboard/Workplace', null, null, '1', null, null, '3', '0', null, '1', '1', '0', null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-02 11:45:02', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('944abf0a8fc22fe1f1154a389a574154', '5c8042bd6c601270b2bbd9b20bccc68b', '消息管理', '/modules/message/sysMessageList', 'modules/message/SysMessageList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-09 11:27:53', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-09 19:31:23', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('9502685863ab87f0ad1134142788a385', null, '首页', '/dashboard/analysis', 'dashboard/Analysis', null, null, '0', null, null, '0', '0', 'home', '1', '1', '0', null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-29 11:04:13', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('97c8629abc7848eccdb6d77c24bb3ebb', '700b7f95165c46cc7a78bf227aa8fed3', '磁盘监控', '/monitor/Disk', 'modules/monitor/DiskMonitoring', null, null, '1', null, null, '6', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-25 14:30:06', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-05-05 14:37:14', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('9a90363f216a6a08f32eecb3f0bf12a3', '2a470fc0c3954d9dbb61de6d80846549', '常用选择组件', '/jeecg/SelectDemo', 'jeecg/SelectDemo', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-03-19 11:19:05', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-10 15:36:50', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('9cb91b8851db0cf7b19d7ecc2a8193dd', '1939e035e803a99ceecb6f5563570fb2', '我的任务表单', '/modules/bpm/task/form/FormModule', 'modules/bpm/task/form/FormModule', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-03-08 16:49:05', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-08 18:37:56', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('a2b11669e98c5fe54a53c3e3c4f35d14', 'f0675b52d89100ee88472b6800754a08', '类别统计报表', '/report/Analysis', 'jeecg/report/Analysis', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-03 19:03:56', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-03 19:05:26', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('a400e4f4d54f79bf5ce160ae432231af', '2a470fc0c3954d9dbb61de6d80846549', '百度', 'http://www.baidu.com', 'layouts/IframePageView', null, null, '1', null, null, '4', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-01-29 19:44:06', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-15 16:25:02', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('ae4fed059f67086fd52a73d913cf473d', '540a2936940846cb98114ffb0d145cb8', '内联编辑表格', '/list/edit-table', 'list/TableInnerEditList', null, null, '1', null, null, '2', null, null, '1', '1', null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('aedbf679b5773c1f25e9f7b10111da73', '08e6b9dc3c04489c8e1ff2ce6f105aa4', 'SQL监控', '{{ window._CONFIG[''domianURL''] }}/druid/', 'layouts/IframePageView', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-01-30 09:43:22', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-23 19:00:46', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('b1cb0a3fedf7ed0e4653cb5a229837ee', '08e6b9dc3c04489c8e1ff2ce6f105aa4', '定时任务', '/isystem/QuartzJobList', 'system/QuartzJobList', null, null, '1', null, null, '3', '0', null, '1', '1', '0', null, null, TO_DATE('2019-01-03 09:38:52', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-02 10:24:13', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('b3c824fc22bd953e2eb16ae6914ac8f9', '4875ebe289344e14844d8e3ea1edd73f', '高级详情页', '/profile/advanced', 'profile/advanced/Advanced', null, null, '1', null, null, '2', null, null, '1', '1', null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('b4dfc7d5dd9e8d5b6dd6d4579b1aa559', 'c65321e57b7949b7a975313220de0422', '500', '/exception/500', 'exception/500', null, null, '1', null, null, '3', null, null, '1', '1', null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('b6bcee2ccc854052d3cc3e9c96d90197', '71102b3b87fb07e5527bbd2c530dd90a', '加班申请', '/modules/extbpm/joa/JoaOvertimeList', 'modules/extbpm/joa/JoaOvertimeList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-03 15:33:10', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-03 15:34:48', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('c431130c0bc0ec71b0a5be37747bb36a', '2a470fc0c3954d9dbb61de6d80846549', '一对多JEditable', '/jeecg/JeecgOrderMainListForJEditableTable', 'jeecg/JeecgOrderMainListForJEditableTable', null, null, '1', null, null, '3', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-03-29 10:51:59', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-04 20:09:39', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('c65321e57b7949b7a975313220de0422', null, '异常页', '/exception', 'layouts/RouteView', null, null, '0', null, null, '8', null, 'warning', '1', '0', null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('c6cf95444d80435eb37b2f9db3971ae6', '2a470fc0c3954d9dbb61de6d80846549', '数据回执模拟', '/jeecg/InterfaceTest', 'jeecg/InterfaceTest', null, null, '1', null, null, '6', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-02-19 16:02:23', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-21 16:25:45', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('cc50656cf9ca528e6f2150eba4714ad2', '4875ebe289344e14844d8e3ea1edd73f', '基础详情页', '/profile/basic', 'profile/basic/Index', null, null, '1', null, null, '1', null, null, '1', '1', null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('d07a2c87a451434c99ab06296727ec4f', '700b7f95165c46cc7a78bf227aa8fed3', 'JVM信息', '/monitor/JvmInfo', 'modules/monitor/JvmInfo', null, null, '1', null, null, '4', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-01 23:07:48', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-02 11:37:16', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('d2bbf9ebca5a8fa2e227af97d2da7548', 'c65321e57b7949b7a975313220de0422', '404', '/exception/404', 'exception/404', null, null, '1', null, null, '2', null, null, '1', '1', null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('d7d6e2e4e2934f2c9385a623fd98c6f3', null, '系统管理', '/isystem', 'layouts/RouteView', null, null, '1', null, null, '4', '0', 'setting', '1', '0', '0', null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-31 22:19:52', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('d86f58e7ab516d3bc6bfb1fe10585f97', '717f6bee46f44a3897eca9abd6e2ec44', '个人中心', '/account/center', 'account/center/Index', null, null, '1', null, null, '1', null, null, '1', '1', null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('de13e0f6328c069748de7399fcc1dbbd', 'fb07ca05a3e13674dbf6d3245956da2e', '搜索列表（项目）', '/list/search/project', 'list/TableList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-02-12 14:01:40', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-12 14:14:18', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('e08cb190ef230d5d4f03824198773950', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '系统通告', '/isystem/annountCement', 'system/SysAnnouncementList', null, null, '1', 'annountCement', null, '6', null, null, '1', '1', null, null, null, TO_DATE('2019-01-02 17:23:01', 'YYYY-MM-DD HH24:MI:SS'), null, TO_DATE('2019-01-02 17:31:23', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('e1979bb53e9ea51cecc74d86fd9d2f64', '2a470fc0c3954d9dbb61de6d80846549', 'PDF预览', '/jeecg/jeecgPdfView', 'jeecg/JeecgPdfView', null, null, '1', null, null, '3', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-25 10:39:35', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('e3c13679c73a4f829bcff2aba8fd68b1', null, '表单页', '/form', 'layouts/PageView', null, null, '0', null, null, '9', '0', 'form', '1', '0', '0', null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-31 22:20:14', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('e5973686ed495c379d829ea8b2881fc6', 'e3c13679c73a4f829bcff2aba8fd68b1', '高级表单', '/form/advanced-form', 'form/advancedForm/AdvancedForm', null, null, '1', null, null, '3', null, null, '1', '1', null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('e6bfd1fcabfd7942fdd05f076d1dad38', '2a470fc0c3954d9dbb61de6d80846549', '打印测试', '/jeecg/PrintDemo', 'jeecg/PrintDemo', null, null, '1', null, null, '3', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-02-19 15:58:48', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-05-07 20:14:39', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('e8af452d8948ea49d37c934f5100ae6a', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '角色管理', '/isystem/role', 'system/RoleList', null, null, '1', null, null, '2', null, null, '1', '1', null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('ec8d607d0156e198b11853760319c646', '6e73eb3c26099c191bf03852ee1310a1', '安全设置', '/account/settings/security', 'account/settings/Security', null, null, '1', 'SecuritySettings', null, null, null, null, '1', '1', null, null, null, TO_DATE('2018-12-26 18:59:52', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('f0675b52d89100ee88472b6800754a08', null, '统计报表', '/report', 'layouts/RouteView', null, null, '0', null, null, '7', '0', 'bar-chart', '1', '0', '0', null, 'admin', TO_DATE('2019-04-03 18:32:02', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-11 19:48:39', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('f1cb187abf927c88b89470d08615f5ac', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '数据字典', '/isystem/dict', 'system/DictList', null, null, '1', null, null, '5', null, null, '1', '1', null, null, null, TO_DATE('2018-12-28 13:54:43', 'YYYY-MM-DD HH24:MI:SS'), null, TO_DATE('2018-12-28 15:37:54', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('f23d9bfff4d9aa6b68569ba2cff38415', '540a2936940846cb98114ffb0d145cb8', '标准列表', '/list/basic-list', 'list/StandardList', null, null, '1', null, null, '6', null, null, '1', '1', null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('f780d0d3083d849ccbdb1b1baee4911d', '5c8042bd6c601270b2bbd9b20bccc68b', '模板管理', '/modules/message/sysMessageTemplateList', 'modules/message/SysMessageTemplateList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-09 11:50:31', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-12 10:16:34', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('fb07ca05a3e13674dbf6d3245956da2e', '540a2936940846cb98114ffb0d145cb8', '搜索列表', '/list/search', 'list/search/SearchLayout', null, '/list/search/article', '1', null, null, '8', '0', null, '1', '0', '0', null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-12 15:09:13', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('fb367426764077dcf94640c843733985', '2a470fc0c3954d9dbb61de6d80846549', '一对多示例', '/jeecg/JeecgOrderMainList', 'jeecg/JeecgOrderMainList', null, null, '1', null, null, '2', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-02-15 16:24:11', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-18 10:50:14', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('fc810a2267dd183e4ef7c71cc60f4670', '700b7f95165c46cc7a78bf227aa8fed3', '请求追踪', '/monitor/HttpTrace', 'modules/monitor/HttpTrace', null, null, '1', null, null, '4', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-02 09:46:19', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-02 11:37:27', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('fedfbf4420536cacc0218557d263dfea', '6e73eb3c26099c191bf03852ee1310a1', '新消息通知', '/account/settings/notification', 'account/settings/Notification', null, null, '1', 'NotificationSettings', null, null, null, null, '1', '1', null, null, null, TO_DATE('2018-12-26 19:02:05', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('00a2a0ae65cdca5e93209cdbde97cbe6', '2e42e3835c2b44ec9f7bc26c146ee531', '成功', '/result/success', 'result/Success', null, null, '1', null, null, '1', null, null, '1', '1', null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('020b06793e4de2eee0007f603000c769', 'f0675b52d89100ee88472b6800754a08', 'ViserChartDemo', '/report/ViserChartDemo', 'jeecg/report/ViserChartDemo', null, null, '1', null, null, '3', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-03 19:08:53', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-03 19:08:53', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('024f1fd1283dc632458976463d8984e1', '700b7f95165c46cc7a78bf227aa8fed3', 'Tomcat信息', '/monitor/TomcatInfo', 'modules/monitor/TomcatInfo', null, null, '1', null, null, '4', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-02 09:44:29', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-05-07 15:19:10', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('05b3c82ddb2536a4a5ee1a4c46b5abef', '540a2936940846cb98114ffb0d145cb8', '用户列表', '/list/user-list', 'list/UserList', null, null, '1', null, null, '3', null, null, '1', '1', null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('0620e402857b8c5b605e1ad9f4b89350', '2a470fc0c3954d9dbb61de6d80846549', '异步树列表Demo', '/jeecg/JeecgTreeTable', 'jeecg/JeecgTreeTable', null, null, '1', null, '0', '3', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-05-13 17:30:30', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-05-13 17:32:17', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', '1');
+INSERT INTO "SYS_PERMISSION" VALUES ('078f9558cdeab239aecb2bda1a8ed0d1', 'fb07ca05a3e13674dbf6d3245956da2e', '搜索列表（文章）', '/list/search/article', 'list/TableList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-02-12 14:00:34', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-12 14:17:54', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('08e6b9dc3c04489c8e1ff2ce6f105aa4', null, '系统监控', '/dashboard3', 'layouts/RouteView', null, null, '0', null, null, '6', '0', 'dashboard', '1', '0', '0', null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-31 22:19:58', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('13212d3416eb690c2e1d5033166ff47a', '2e42e3835c2b44ec9f7bc26c146ee531', '失败', '/result/fail', 'result/Error', null, null, '1', null, null, '2', null, null, '1', '1', null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('1367a93f2c410b169faa7abcbad2f77c', '6e73eb3c26099c191bf03852ee1310a1', '基本设置', '/account/settings/base', 'account/settings/BaseSetting', null, null, '1', 'BaseSettings', null, null, '0', null, '1', '1', '1', null, null, TO_DATE('2018-12-26 18:58:35', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-20 12:57:31', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('190c2b43bec6a5f7a4194a85db67d96a', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '角色维护', '/system/roleUserList', 'system/RoleUserList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-17 15:13:56', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('1a0811914300741f4e11838ff37a1d3a', '3f915b2769fc80648e92d04e84ca059d', '手机号禁用', null, null, null, null, '2', 'user:form:phone', '2', '1', '0', null, '0', '1', '0', null, 'admin', TO_DATE('2019-05-11 17:19:30', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-05-11 18:00:22', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', '1');
+INSERT INTO "SYS_PERMISSION" VALUES ('200006f0edf145a2b50eacca07585451', 'fb07ca05a3e13674dbf6d3245956da2e', '搜索列表（应用）', '/list/search/application', 'list/TableList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-02-12 14:02:51', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-12 14:14:01', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('265de841c58907954b8877fb85212622', '2a470fc0c3954d9dbb61de6d80846549', '图片拖拽排序', '/jeecg/imgDragSort', 'jeecg/ImgDragSort', null, null, '1', null, null, '4', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-25 10:43:08', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-25 10:46:26', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('277bfabef7d76e89b33062b16a9a5020', 'e3c13679c73a4f829bcff2aba8fd68b1', '基础表单', '/form/base-form', 'form/BasicForm', null, null, '1', null, null, '1', '0', null, '1', '0', '0', null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-26 17:02:08', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('2a470fc0c3954d9dbb61de6d80846549', null, '常见案例', '/jeecg', 'layouts/RouteView', null, null, '0', null, null, '7', '0', 'qrcode', '1', '0', '0', null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-02 11:46:42', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('2aeddae571695cd6380f6d6d334d6e7d', 'f0675b52d89100ee88472b6800754a08', '布局统计报表', '/report/ArchivesStatisticst', 'jeecg/report/ArchivesStatisticst', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-03 18:32:48', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('2dbbafa22cda07fa5d169d741b81fe12', '08e6b9dc3c04489c8e1ff2ce6f105aa4', '在线文档', '{{ window._CONFIG[''domianURL''] }}/swagger-ui.html#/', 'layouts/IframePageView', null, null, '1', null, null, '3', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-01-30 10:00:01', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-23 19:44:43', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('2e42e3835c2b44ec9f7bc26c146ee531', null, '结果页', '/result', 'layouts/PageView', null, null, '0', null, null, '8', '0', 'check-circle-o', '1', '0', '0', null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-02 11:46:56', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('339329ed54cf255e1f9392e84f136901', '2a470fc0c3954d9dbb61de6d80846549', 'helloworld', '/jeecg/helloworld', 'jeecg/helloworld', null, null, '1', null, null, '4', '0', null, '1', '1', '0', null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-15 16:24:56', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('3f915b2769fc80648e92d04e84ca059d', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '用户管理', '/isystem/user', 'system/UserList', null, null, '1', null, null, '1', '0', null, '1', '0', '0', null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-16 11:20:33', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('3fac0d3c9cd40fa53ab70d4c583821f8', '2a470fc0c3954d9dbb61de6d80846549', '分屏', '/jeecg/splitPanel', 'jeecg/SplitPanel', null, null, '1', null, null, '6', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-25 16:27:06', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('4148ec82b6acd69f470bea75fe41c357', '2a470fc0c3954d9dbb61de6d80846549', '单表模型示例', '/jeecg/jeecgDemoList', 'jeecg/JeecgDemoList', 'DemoList', null, '1', null, null, '1', '0', null, '1', '1', '0', null, null, TO_DATE('2018-12-28 15:57:30', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-15 16:24:37', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('418964ba087b90a84897b62474496b93', '540a2936940846cb98114ffb0d145cb8', '查询表格', '/list/query-list', 'list/TableList', null, null, '1', null, null, '1', null, null, '1', '1', null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('4356a1a67b564f0988a484f5531fd4d9', '2a470fc0c3954d9dbb61de6d80846549', '内嵌Table', '/jeecg/TableExpandeSub', 'jeecg/TableExpandeSub', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-04 22:48:13', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('45c966826eeff4c99b8f8ebfe74511fc', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '部门管理', '/isystem/depart', 'system/DepartList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-01-29 18:47:40', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-07 19:23:16', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('4875ebe289344e14844d8e3ea1edd73f', null, '详情页', '/profile', 'layouts/RouteView', null, null, '0', null, null, '8', '0', 'profile', '1', '0', '0', null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-02 11:46:48', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('4f66409ef3bbd69c1d80469d6e2a885e', '6e73eb3c26099c191bf03852ee1310a1', '账户绑定', '/account/settings/binding', 'account/settings/Binding', null, null, '1', 'BindingSettings', null, null, null, null, '1', '1', null, null, null, TO_DATE('2018-12-26 19:01:20', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('4f84f9400e5e92c95f05b554724c2b58', '540a2936940846cb98114ffb0d145cb8', '角色列表', '/list/role-list', 'list/RoleList', null, null, '1', null, null, '4', null, null, '1', '1', null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('53a9230444d33de28aa11cc108fb1dba', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '我的消息', '/isps/userAnnouncement', 'system/UserAnnouncementList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-19 10:16:00', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('540a2936940846cb98114ffb0d145cb8', null, '列表页', '/list', 'layouts/PageView', null, '/list/query-list', '0', null, null, '9', '0', 'table', '1', '0', '0', null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-31 22:20:20', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('54dd5457a3190740005c1bfec55b1c34', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '菜单管理', '/isystem/permission', 'system/PermissionList', null, null, '1', null, null, '3', null, null, '1', '1', null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('58857ff846e61794c69208e9d3a85466', '08e6b9dc3c04489c8e1ff2ce6f105aa4', '日志管理', '/isystem/log', 'system/LogList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, null, TO_DATE('2018-12-26 10:11:18', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-02 11:38:17', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('58b9204feaf07e47284ddb36cd2d8468', '2a470fc0c3954d9dbb61de6d80846549', '图片翻页', '/jeecg/imgTurnPage', 'jeecg/ImgTurnPage', null, null, '1', null, null, '4', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-25 11:36:42', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('5c2f42277948043026b7a14692456828', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '我的部门', '/system/departUserList', 'system/DepartUserList', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-17 15:12:24', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('5c8042bd6c601270b2bbd9b20bccc68b', null, '消息中心', '/message', 'layouts/RouteView', null, null, '0', null, null, '6', '0', 'message', '1', '0', '0', null, 'admin', TO_DATE('2019-04-09 11:05:04', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-11 19:47:54', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('6531cf3421b1265aeeeabaab5e176e6d', 'e3c13679c73a4f829bcff2aba8fd68b1', '分步表单', '/form/step-form', 'form/stepForm/StepForm', null, null, '1', null, null, '2', null, null, '1', '1', null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('655563cd64b75dcf52ef7bcdd4836953', '2a470fc0c3954d9dbb61de6d80846549', '图片预览', '/jeecg/ImagPreview', 'jeecg/ImagPreview', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-17 11:18:45', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('65a8f489f25a345836b7f44b1181197a', 'c65321e57b7949b7a975313220de0422', '403', '/exception/403', 'exception/403', null, null, '1', null, null, '1', null, null, '1', '1', null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('6ad53fd1b220989a8b71ff482d683a5a', '2a470fc0c3954d9dbb61de6d80846549', '一对多Tab示例', '/jeecg/tablist/JeecgOrderDMainList', 'jeecg/tablist/JeecgOrderDMainList', null, null, '1', null, null, '2', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-02-20 14:45:09', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-21 16:26:21', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('6e73eb3c26099c191bf03852ee1310a1', '717f6bee46f44a3897eca9abd6e2ec44', '个人设置', '/account/settings/base', 'account/settings/Index', null, null, '1', null, null, '2', '1', null, '1', '0', '0', null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-19 09:41:05', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('700b7f95165c46cc7a78bf227aa8fed3', '08e6b9dc3c04489c8e1ff2ce6f105aa4', '性能监控', '/monitor', 'layouts/RouteView', null, null, '1', null, null, '0', '0', null, '1', '0', '0', null, 'admin', TO_DATE('2019-04-02 11:34:34', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-05-05 17:49:47', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('717f6bee46f44a3897eca9abd6e2ec44', null, '个人页', '/account', 'layouts/RouteView', null, null, '0', null, null, '9', '0', 'user', '1', '0', null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('73678f9daa45ed17a3674131b03432fb', '540a2936940846cb98114ffb0d145cb8', '权限列表', '/list/permission-list', 'list/PermissionList', null, null, '1', null, null, '5', null, null, '1', '1', null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+INSERT INTO "SYS_PERMISSION" VALUES ('7593c9e3523a17bca83b8d7fe8a34e58', '3f915b2769fc80648e92d04e84ca059d', '添加用户按钮', null, null, null, null, '2', 'user:add', '1', '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-03-16 11:20:33', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-05-17 17:50:40', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', '1');
+INSERT INTO "SYS_PERMISSION" VALUES ('7960961b0063228937da5fa8dd73d371', '2a470fc0c3954d9dbb61de6d80846549', 'JEditableTable示例', '/jeecg/JEditableTable', 'jeecg/JeecgEditableTableExample', null, null, '1', null, null, '7', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-03-22 15:22:18', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null);
+
+-- ----------------------------
+-- Records of SYS_PERMISSION_DATA_RULE
+-- ----------------------------
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('32b62cb04d6c788d9d92e3ff5e66854e', '8d4683aacaa997ab86b966b464360338', '000', '00', '!=', '00', '1', TO_DATE('2019-04-02 18:36:08', 'YYYY-MM-DD HH24:MI:SS'), 'admin', null, null);
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('40283181614231d401614234fe670003', '40283181614231d401614232cd1c0001', 'createBy', 'createBy', '=', '#{sys_user_code}', '1', TO_DATE('2018-01-29 21:57:04', 'YYYY-MM-DD HH24:MI:SS'), 'admin', null, null);
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('4028318161424e730161424fca6f0004', '4028318161424e730161424f61510002', 'createBy', 'createBy', '=', '#{sys_user_code}', '1', TO_DATE('2018-01-29 22:26:20', 'YYYY-MM-DD HH24:MI:SS'), 'admin', null, null);
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('402880e6487e661a01487e732c020005', '402889fb486e848101486e93a7c80014', 'SYS_ORG_CODE', 'SYS_ORG_CODE', 'LIKE', '010201%', '1', TO_DATE('2014-09-16 20:32:30', 'YYYY-MM-DD HH24:MI:SS'), 'admin', null, null);
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('402880e6487e661a01487e8153ee0007', '402889fb486e848101486e93a7c80014', 'create_by', 'create_by', null, '#{SYS_USER_CODE}', '1', TO_DATE('2014-09-16 20:47:57', 'YYYY-MM-DD HH24:MI:SS'), 'admin', null, null);
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('402880ec5ddec439015ddf9225060038', '40288088481d019401481d2fcebf000d', '复杂关系', null, 'USE_SQL_RULES', 'name like ''%张%'' or age > 10', '1', null, null, TO_DATE('2017-08-14 15:10:25', 'YYYY-MM-DD HH24:MI:SS'), 'demo');
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('402880ec5ddfdd26015ddfe3e0570011', '4028ab775dca0d1b015dca3fccb60016', '复杂sql配置', null, 'USE_SQL_RULES', 'table_name like ''%test%'' or is_tree = ''Y''', '1', null, null, TO_DATE('2017-08-14 16:38:55', 'YYYY-MM-DD HH24:MI:SS'), 'demo');
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('402880f25b1e2ac7015b1e5fdebc0012', '402880f25b1e2ac7015b1e5cdc340010', '只能看自己数据', 'create_by', '=', '#{sys_user_code}', '1', TO_DATE('2017-03-30 16:40:51', 'YYYY-MM-DD HH24:MI:SS'), 'admin', null, null);
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('402881875b19f141015b19f8125e0014', '40288088481d019401481d2fcebf000d', '可看下属业务数据', 'sys_org_code', 'LIKE', '#{sys_org_code}', '1', null, null, TO_DATE('2017-08-14 15:04:32', 'YYYY-MM-DD HH24:MI:SS'), 'demo');
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('402881e45394d66901539500a4450001', '402881e54df73c73014df75ab670000f', 'sysCompanyCode', 'sysCompanyCode', '=', '#{SYS_COMPANY_CODE}', '1', TO_DATE('2016-03-21 01:09:21', 'YYYY-MM-DD HH24:MI:SS'), 'admin', null, null);
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('402881e45394d6690153950177cb0003', '402881e54df73c73014df75ab670000f', 'sysOrgCode', 'sysOrgCode', '=', '#{SYS_ORG_CODE}', '1', TO_DATE('2016-03-21 01:10:15', 'YYYY-MM-DD HH24:MI:SS'), 'admin', null, null);
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('402881e56266f43101626727aff60067', '402881e56266f43101626724eb730065', '销售自己看自己的数据', 'createBy', '=', '#{sys_user_code}', '1', TO_DATE('2018-03-27 19:11:16', 'YYYY-MM-DD HH24:MI:SS'), 'admin', null, null);
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('402881e56266f4310162672fb1a70082', '402881e56266f43101626724eb730065', '销售经理看所有下级数据', 'sysOrgCode', 'LIKE', '#{sys_org_code}', '1', TO_DATE('2018-03-27 19:20:01', 'YYYY-MM-DD HH24:MI:SS'), 'admin', null, null);
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('402881e56266f431016267387c9f0088', '402881e56266f43101626724eb730065', '只看金额大于1000的数据', 'money', '>=', '1000', '1', TO_DATE('2018-03-27 19:29:37', 'YYYY-MM-DD HH24:MI:SS'), 'admin', null, null);
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('402881f3650de25101650dfb5a3a0010', '402881e56266f4310162671d62050044', '22', null, 'USE_SQL_RULES', '22', '1', TO_DATE('2018-08-06 14:45:01', 'YYYY-MM-DD HH24:MI:SS'), 'admin', null, null);
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('402889fb486e848101486e913cd6000b', '402889fb486e848101486e8e2e8b0007', 'userName', 'userName', '=', 'admin', '1', TO_DATE('2014-09-13 18:31:25', 'YYYY-MM-DD HH24:MI:SS'), 'admin', null, null);
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('402889fb486e848101486e98d20d0016', '402889fb486e848101486e93a7c80014', 'title', 'title', '=', '12', '1', null, null, TO_DATE('2014-09-13 22:18:22', 'YYYY-MM-DD HH24:MI:SS'), 'scott');
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('402889fe47fcb29c0147fcb6b6220001', '8a8ab0b246dc81120146dc8180fe002b', '12', '12', '>', '12', '1', TO_DATE('2014-08-22 15:55:38', 'YYYY-MM-DD HH24:MI:SS'), '8a8ab0b246dc81120146dc8181950052', null, null);
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('4028ab775dca0d1b015dca4183530018', '4028ab775dca0d1b015dca3fccb60016', '表名限制', 'isDbSynch', '=', 'Y', '1', null, null, TO_DATE('2017-08-14 16:43:45', 'YYYY-MM-DD HH24:MI:SS'), 'demo');
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('4028ef815595a881015595b0ccb60001', '40288088481d019401481d2fcebf000d', '限只能看自己', 'create_by', '=', '#{sys_user_code}', '1', null, null, TO_DATE('2017-08-14 15:03:56', 'YYYY-MM-DD HH24:MI:SS'), 'demo');
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('4028ef81574ae99701574aed26530005', '4028ef81574ae99701574aeb97bd0003', '用户名', 'userName', '!=', 'admin', '1', TO_DATE('2016-09-21 12:07:18', 'YYYY-MM-DD HH24:MI:SS'), 'admin', null, null);
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('53609e1854f4a87eb23ed23a18a1042c', '4148ec82b6acd69f470bea75fe41c357', '只看当前部门数据', 'sysOrgCode', '=', '#{sys_org_code}', '1', TO_DATE('2019-05-11 19:40:39', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-05-11 19:40:50', 'YYYY-MM-DD HH24:MI:SS'), 'admin');
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('a7d661ef5ac168b2b162420c6804dac5', '4148ec82b6acd69f470bea75fe41c357', '只看自己的数据', 'createBy', '=', '#{sys_user_code}', '1', TO_DATE('2019-05-11 19:19:05', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-05-11 19:24:58', 'YYYY-MM-DD HH24:MI:SS'), 'admin');
+INSERT INTO "SYS_PERMISSION_DATA_RULE" VALUES ('f852d85d47f224990147f2284c0c0005', null, '小于', 'test', '<=', '11', '1', TO_DATE('2014-08-20 14:43:52', 'YYYY-MM-DD HH24:MI:SS'), '8a8ab0b246dc81120146dc8181950052', null, null);
+
+-- ----------------------------
+-- Records of SYS_QUARTZ_JOB
+-- ----------------------------
+INSERT INTO "SYS_QUARTZ_JOB" VALUES ('df26ecacf0f75d219d746750fe84bbee', null, null, '0', 'admin', TO_DATE('2019-01-19 15:09:41', 'YYYY-MM-DD HH24:MI:SS'), 'org.jeecg.modules.quartz.job.SampleParamJob', '0/1 * * * * ?', 'scott', '带参测试 后台将每隔1秒执行输出日志', '-1');
+INSERT INTO "SYS_QUARTZ_JOB" VALUES ('a253cdfc811d69fa0efc70d052bc8128', 'admin', TO_DATE('2019-03-30 12:44:48', 'YYYY-MM-DD HH24:MI:SS'), '0', 'admin', TO_DATE('2019-03-30 12:44:52', 'YYYY-MM-DD HH24:MI:SS'), 'org.jeecg.modules.quartz.job.SampleJob', '0/1 * * * * ?', null, null, '-1');
+INSERT INTO "SYS_QUARTZ_JOB" VALUES ('5b3d2c087ad41aa755fc4f89697b01e7', 'admin', TO_DATE('2019-04-11 19:04:21', 'YYYY-MM-DD HH24:MI:SS'), '0', 'admin', TO_DATE('2019-04-11 19:49:49', 'YYYY-MM-DD HH24:MI:SS'), 'org.jeecg.modules.message.job.SendMsgJob', '0/60 * * * * ?', null, null, '-1');
+
+-- ----------------------------
+-- Records of SYS_ROLE
+-- ----------------------------
+INSERT INTO "SYS_ROLE" VALUES ('e51758fa916c881624b046d26bd09230', '人力资源部', 'hr', null, 'admin', TO_DATE('2019-01-21 18:07:24', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-17 18:30:41', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_ROLE" VALUES ('ee8626f80f7c2619917b6236f3a7f02b', '临时角色', 'test', '这是新建的临时角色123', null, TO_DATE('2018-12-20 10:59:04', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-19 15:08:37', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_ROLE" VALUES ('f6817f48af4fb3af11b9e8bf182f618b', '管理员', 'admin', '管理员', null, TO_DATE('2018-12-21 18:03:39', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-22 19:49:42', 'YYYY-MM-DD HH24:MI:SS'));
+
+-- ----------------------------
+-- Records of SYS_ROLE_PERMISSION
+-- ----------------------------
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('2779cdea8367fff37db26a42c1a1f531', 'f6817f48af4fb3af11b9e8bf182f618b', 'fef097f3903caf3a3c3a6efa8de43fbb', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('296f9c75ca0e172ae5ce4c1022c996df', '646c628b2b8295fbdab2d34044de0354', '732d48f8e0abe99fe6a23d18a3171cd1', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('29fb4d37aa29b9fa400f389237cf9fe7', 'ee8626f80f7c2619917b6236f3a7f02b', '05b3c82ddb2536a4a5ee1a4c46b5abef', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('29fb6b0ad59a7e911c8d27e0bdc42d23', 'f6817f48af4fb3af11b9e8bf182f618b', '9a90363f216a6a08f32eecb3f0bf12a3', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('2ad37346c1b83ddeebc008f6987b2227', 'f6817f48af4fb3af11b9e8bf182f618b', '8d1ebd663688965f1fd86a2f0ead3416', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('2c462293cbb0eab7e8ae0a3600361b5f', '52b0cf022ac4187b2a70dfa4f8b2d940', '9502685863ab87f0ad1134142788a385', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('2dc1a0eb5e39aaa131ddd0082a492d76', 'ee8626f80f7c2619917b6236f3a7f02b', '08e6b9dc3c04489c8e1ff2ce6f105aa4', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('2ea2382af618ba7d1e80491a0185fb8a', 'ee8626f80f7c2619917b6236f3a7f02b', 'f23d9bfff4d9aa6b68569ba2cff38415', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('2fcfa2ac3dcfadc7c67107dae9a0de6d', 'ee8626f80f7c2619917b6236f3a7f02b', '73678f9daa45ed17a3674131b03432fb', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('2fdaed22dfa4c8d4629e44ef81688c6a', '52b0cf022ac4187b2a70dfa4f8b2d940', 'aedbf679b5773c1f25e9f7b10111da73', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('300c462b7fec09e2ff32574ef8b3f0bd', '52b0cf022ac4187b2a70dfa4f8b2d940', '2a470fc0c3954d9dbb61de6d80846549', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('326181da3248a62a05e872119a462be1', 'ee8626f80f7c2619917b6236f3a7f02b', '3f915b2769fc80648e92d04e84ca059d', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('3369650f5072b330543f8caa556b1b33', 'e51758fa916c881624b046d26bd09230', 'a400e4f4d54f79bf5ce160ae432231af', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('35a7e156c20e93aa7e825fe514bf9787', 'e51758fa916c881624b046d26bd09230', 'c6cf95444d80435eb37b2f9db3971ae6', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('35ac7cae648de39eb56213ca1b649713', '52b0cf022ac4187b2a70dfa4f8b2d940', 'b1cb0a3fedf7ed0e4653cb5a229837ee', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('37112f4d372541e105473f18da3dc50d', 'ee8626f80f7c2619917b6236f3a7f02b', 'a400e4f4d54f79bf5ce160ae432231af', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('37789f70cd8bd802c4a69e9e1f633eaa', 'ee8626f80f7c2619917b6236f3a7f02b', 'ae4fed059f67086fd52a73d913cf473d', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('381504a717cb3ce77dcd4070c9689a7e', 'ee8626f80f7c2619917b6236f3a7f02b', '4f84f9400e5e92c95f05b554724c2b58', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('38a2e55db0960262800576e34b3af44c', 'f6817f48af4fb3af11b9e8bf182f618b', '5c2f42277948043026b7a14692456828', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('38dd7a19711e7ffe864232954c06fae9', 'e51758fa916c881624b046d26bd09230', 'd2bbf9ebca5a8fa2e227af97d2da7548', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('3b1886f727ac503c93fecdd06dcb9622', 'f6817f48af4fb3af11b9e8bf182f618b', 'c431130c0bc0ec71b0a5be37747bb36a', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('3de2a60c7e42a521fecf6fcc5cb54978', 'f6817f48af4fb3af11b9e8bf182f618b', '2d83d62bd2544b8994c8f38cf17b0ddf', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('3e4e38f748b8d87178dd62082e5b7b60', 'f6817f48af4fb3af11b9e8bf182f618b', '7960961b0063228937da5fa8dd73d371', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('3e563751942b0879c88ca4de19757b50', '1750a8fb3e6d90cb7957c02de1dc8e59', '58857ff846e61794c69208e9d3a85466', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('3f1d04075e3c3254666a4138106a4e51', 'f6817f48af4fb3af11b9e8bf182f618b', '3fac0d3c9cd40fa53ab70d4c583821f8', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('412e2de37a35b3442d68db8dd2f3c190', '52b0cf022ac4187b2a70dfa4f8b2d940', 'f1cb187abf927c88b89470d08615f5ac', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('4204f91fb61911ba8ce40afa7c02369f', 'f6817f48af4fb3af11b9e8bf182f618b', '3f915b2769fc80648e92d04e84ca059d', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('439568ff7db6f329bf6dd45b3dfc9456', 'f6817f48af4fb3af11b9e8bf182f618b', '7593c9e3523a17bca83b8d7fe8a34e58', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('444126230885d5d38b8fa6072c9f43f8', 'f6817f48af4fb3af11b9e8bf182f618b', 'f780d0d3083d849ccbdb1b1baee4911d', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('445656dd187bd8a71605f4bbab1938a3', 'f6817f48af4fb3af11b9e8bf182f618b', '020b06793e4de2eee0007f603000c769', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('44b5a73541bcb854dd5d38c6d1fb93a1', 'ee8626f80f7c2619917b6236f3a7f02b', '418964ba087b90a84897b62474496b93', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('455cdb482457f529b79b479a2ff74427', 'f6817f48af4fb3af11b9e8bf182f618b', 'e1979bb53e9ea51cecc74d86fd9d2f64', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('459aa2e7021b435b4d65414cfbc71c66', 'e51758fa916c881624b046d26bd09230', '4148ec82b6acd69f470bea75fe41c357', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('4c0940badae3ef9231ee9d042338f2a4', 'e51758fa916c881624b046d26bd09230', '2a470fc0c3954d9dbb61de6d80846549', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('4d56ce2f67c94b74a1d3abdbea340e42', 'ee8626f80f7c2619917b6236f3a7f02b', 'd86f58e7ab516d3bc6bfb1fe10585f97', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('4dab5a06acc8ef3297889872caa74747', 'f6817f48af4fb3af11b9e8bf182f618b', 'ffb423d25cc59dcd0532213c4a518261', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('4e0a37ed49524df5f08fc6593aee875c', 'f6817f48af4fb3af11b9e8bf182f618b', 'f23d9bfff4d9aa6b68569ba2cff38415', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('4ea403fc1d19feb871c8bdd9f94a4ecc', 'f6817f48af4fb3af11b9e8bf182f618b', '2e42e3835c2b44ec9f7bc26c146ee531', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('4f254549d9498f06f4cc9b23f3e2c070', 'f6817f48af4fb3af11b9e8bf182f618b', '93d5cfb4448f11e9916698e7f462b4b6', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('4faad8ff93cb2b5607cd3d07c1b624ee', 'a799c3b1b12dd3ed4bd046bfaef5fe6e', '70b8f33da5f39de1981bf89cf6c99792', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('504e326de3f03562cdd186748b48a8c7', 'f6817f48af4fb3af11b9e8bf182f618b', '027aee69baee98a0ed2e01806e89c891', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('51b11ce979730f8ce8606da16e4d69bb', 'f6817f48af4fb3af11b9e8bf182f618b', 'e8af452d8948ea49d37c934f5100ae6a', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('520b5989e6fe4a302a573d4fee12a40a', 'f6817f48af4fb3af11b9e8bf182f618b', '6531cf3421b1265aeeeabaab5e176e6d', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('529953da30b8c7a20034f3a2a90dd5b2', 'f6817f48af4fb3af11b9e8bf182f618b', '190c2b43bec6a5f7a4194a85db67d96a', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('54fdf85e52807bdb32ce450814abc256', 'f6817f48af4fb3af11b9e8bf182f618b', 'cc50656cf9ca528e6f2150eba4714ad2', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('57c0b3a547b815ea3ec8e509b08948b3', '1750a8fb3e6d90cb7957c02de1dc8e59', '3f915b2769fc80648e92d04e84ca059d', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('593ee05c4fe4645c7826b7d5e14f23ec', '52b0cf022ac4187b2a70dfa4f8b2d940', '8fb8172747a78756c11916216b8b8066', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('5affc85021fcba07d81c09a6fdfa8dc6', 'ee8626f80f7c2619917b6236f3a7f02b', '078f9558cdeab239aecb2bda1a8ed0d1', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('5d230e6cd2935c4117f6cb9a7a749e39', 'f6817f48af4fb3af11b9e8bf182f618b', 'fc810a2267dd183e4ef7c71cc60f4670', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('5de6871fadb4fe1cdd28989da0126b07', 'f6817f48af4fb3af11b9e8bf182f618b', 'a400e4f4d54f79bf5ce160a3432231af', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('5e4015a9a641cbf3fb5d28d9f885d81a', 'f6817f48af4fb3af11b9e8bf182f618b', '2dbbafa22cda07fa5d169d741b81fe12', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('5e634a89f75b7a421c02aecfd520325f', 'e51758fa916c881624b046d26bd09230', '339329ed54cf255e1f9392e84f136901', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('5e74637c4bec048d1880ad0bd1b00552', 'e51758fa916c881624b046d26bd09230', 'a400e4f4d54f79bf5ce160a3432231af', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('5fc194b709336d354640fe29fefd65a3', 'a799c3b1b12dd3ed4bd046bfaef5fe6e', '9ba60e626bf2882c31c488aba62b89f0', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('60eda4b4db138bdb47edbe8e10e71675', 'f6817f48af4fb3af11b9e8bf182f618b', 'fb07ca05a3e13674dbf6d3245956da2e', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('61835e48f3e675f7d3f5c9dd3a10dcf3', 'f6817f48af4fb3af11b9e8bf182f618b', 'f0675b52d89100ee88472b6800754a08', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('6451dac67ba4acafb570fd6a03f47460', 'ee8626f80f7c2619917b6236f3a7f02b', 'e3c13679c73a4f829bcff2aba8fd68b1', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('660fbc40bcb1044738f7cabdf1708c28', 'f6817f48af4fb3af11b9e8bf182f618b', 'b3c824fc22bd953e2eb16ae6914ac8f9', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('66b202f8f84fe766176b3f51071836ef', 'f6817f48af4fb3af11b9e8bf182f618b', '1367a93f2c410b169faa7abcbad2f77c', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('6c43fd3f10fdaf2a0646434ae68709b5', 'ee8626f80f7c2619917b6236f3a7f02b', '540a2936940846cb98114ffb0d145cb8', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('6c74518eb6bb9a353f6a6c459c77e64b', 'f6817f48af4fb3af11b9e8bf182f618b', 'b4dfc7d5dd9e8d5b6dd6d4579b1aa559', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('6daddafacd7eccb91309530c17c5855d', 'f6817f48af4fb3af11b9e8bf182f618b', 'edfa74d66e8ea63ea432c2910837b150', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('6fb4c2142498dd6d5b6c014ef985cb66', 'f6817f48af4fb3af11b9e8bf182f618b', '6e73eb3c26099c191bf03852ee1310a1', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('71a5f54a90aa8c7a250a38b7dba39f6f', 'ee8626f80f7c2619917b6236f3a7f02b', '8fb8172747a78756c11916216b8b8066', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('737d35f582036cd18bfd4c8e5748eaa4', 'e51758fa916c881624b046d26bd09230', '693ce69af3432bd00be13c3971a57961', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('7413acf23b56c906aedb5a36fb75bd3a', 'f6817f48af4fb3af11b9e8bf182f618b', 'a4fc7b64b01a224da066bb16230f9c5a', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('75002588591820806', '16457350655250432', '5129710648430592', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('75002588604403712', '16457350655250432', '5129710648430593', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('75002588612792320', '16457350655250432', '40238597734928384', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('75002588625375232', '16457350655250432', '57009744761589760', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('75002588633763840', '16457350655250432', '16392452747300864', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('75002588637958144', '16457350655250432', '16392767785668608', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('75002588650541056', '16457350655250432', '16439068543946752', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('76a54a8cc609754360bf9f57e7dbb2db', 'f6817f48af4fb3af11b9e8bf182f618b', 'c65321e57b7949b7a975313220de0422', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277779875336192', '496138616573952', '5129710648430592', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780043108352', '496138616573952', '5129710648430593', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780055691264', '496138616573952', '15701400130424832', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780064079872', '496138616573952', '16678126574637056', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780072468480', '496138616573952', '15701915807518720', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780076662784', '496138616573952', '15708892205944832', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780085051392', '496138616573952', '16678447719911424', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780089245696', '496138616573952', '25014528525733888', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780097634304', '496138616573952', '56898976661639168', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780135383040', '496138616573952', '40238597734928384', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780139577344', '496138616573952', '45235621697949696', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780147965952', '496138616573952', '45235787867885568', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780156354560', '496138616573952', '45235939278065664', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780164743168', '496138616573952', '43117268627886080', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780168937472', '496138616573952', '45236734832676864', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780181520384', '496138616573952', '45237010692050944', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780189908992', '496138616573952', '45237170029465600', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780198297600', '496138616573952', '57009544286441472', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780206686208', '496138616573952', '57009744761589760', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780215074816', '496138616573952', '57009981228060672', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780219269120', '496138616573952', '56309618086776832', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780227657728', '496138616573952', '57212882168844288', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780236046336', '496138616573952', '61560041605435392', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780244434944', '496138616573952', '61560275261722624', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780257017856', '496138616573952', '61560480518377472', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780265406464', '496138616573952', '44986029924421632', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780324126720', '496138616573952', '45235228800716800', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780332515328', '496138616573952', '45069342940860416', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780340903937', '496138616573952', '5129710648430594', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780349292544', '496138616573952', '16687383932047360', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780357681152', '496138616573952', '16689632049631232', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780366069760', '496138616573952', '16689745006432256', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780370264064', '496138616573952', '16689883993083904', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780374458369', '496138616573952', '16690313745666048', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780387041280', '496138616573952', '5129710648430595', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780395429888', '496138616573952', '16694861252005888', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780403818496', '496138616573952', '16695107491205120', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780412207104', '496138616573952', '16695243126607872', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780420595712', '496138616573952', '75002207560273920', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780428984320', '496138616573952', '76215889006956544', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780433178624', '496138616573952', '76216071333351424', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780441567232', '496138616573952', '76216264070008832', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780449955840', '496138616573952', '76216459709124608', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780458344448', '496138616573952', '76216594207870976', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780466733056', '496138616573952', '76216702639017984', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780475121664', '496138616573952', '58480609315524608', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780483510272', '496138616573952', '61394706252173312', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780491898880', '496138616573952', '61417744146370560', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780496093184', '496138616573952', '76606430504816640', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780504481792', '496138616573952', '76914082455752704', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780508676097', '496138616573952', '76607201262702592', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780517064704', '496138616573952', '39915540965232640', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780525453312', '496138616573952', '41370251991977984', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780538036224', '496138616573952', '45264987354042368', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780546424832', '496138616573952', '45265487029866496', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780554813440', '496138616573952', '45265762415284224', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780559007744', '496138616573952', '45265886315024384', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780567396352', '496138616573952', '45266070000373760', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780571590656', '496138616573952', '41363147411427328', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780579979264', '496138616573952', '41363537456533504', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780588367872', '496138616573952', '41364927394353152', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780596756480', '496138616573952', '41371711400054784', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780605145088', '496138616573952', '41469219249852416', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780613533696', '496138616573952', '39916171171991552', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780621922304', '496138616573952', '39918482854252544', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780630310912', '496138616573952', '41373430515240960', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780718391296', '496138616573952', '41375330996326400', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780722585600', '496138616573952', '63741744973352960', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780730974208', '496138616573952', '42082442672082944', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780739362816', '496138616573952', '41376192166629376', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780747751424', '496138616573952', '41377034236071936', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780756140032', '496138616573952', '56911328312299520', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780764528640', '496138616573952', '41378916912336896', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780768722944', '496138616573952', '63482475359244288', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780772917249', '496138616573952', '64290663792906240', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780785500160', '496138616573952', '66790433014943744', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780789694464', '496138616573952', '42087054753927168', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780798083072', '496138616573952', '67027338952445952', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780806471680', '496138616573952', '67027909637836800', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780810665985', '496138616573952', '67042515441684480', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780823248896', '496138616573952', '67082402312228864', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780827443200', '496138616573952', '16392452747300864', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780835831808', '496138616573952', '16392767785668608', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780840026112', '496138616573952', '16438800255291392', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780844220417', '496138616573952', '16438962738434048', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277780852609024', '496138616573952', '16439068543946752', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860062040064', '496138616573953', '5129710648430592', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860070428672', '496138616573953', '5129710648430593', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860078817280', '496138616573953', '40238597734928384', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860091400192', '496138616573953', '43117268627886080', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860099788800', '496138616573953', '57009744761589760', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860112371712', '496138616573953', '56309618086776832', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860120760320', '496138616573953', '44986029924421632', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860129148928', '496138616573953', '5129710648430594', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860141731840', '496138616573953', '5129710648430595', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860150120448', '496138616573953', '75002207560273920', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860158509056', '496138616573953', '58480609315524608', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860162703360', '496138616573953', '76606430504816640', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860171091968', '496138616573953', '76914082455752704', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860179480576', '496138616573953', '76607201262702592', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860187869184', '496138616573953', '39915540965232640', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860196257792', '496138616573953', '41370251991977984', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860204646400', '496138616573953', '41363147411427328', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860208840704', '496138616573953', '41371711400054784', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860213035009', '496138616573953', '39916171171991552', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860221423616', '496138616573953', '39918482854252544', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860225617920', '496138616573953', '41373430515240960', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860234006528', '496138616573953', '41375330996326400', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860242395136', '496138616573953', '63741744973352960', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860250783744', '496138616573953', '42082442672082944', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860254978048', '496138616573953', '41376192166629376', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860263366656', '496138616573953', '41377034236071936', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860271755264', '496138616573953', '56911328312299520', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860313698304', '496138616573953', '41378916912336896', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860322086912', '496138616573953', '63482475359244288', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860326281216', '496138616573953', '64290663792906240', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860334669824', '496138616573953', '66790433014943744', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860343058432', '496138616573953', '42087054753927168', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860347252736', '496138616573953', '67027338952445952', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860351447041', '496138616573953', '67027909637836800', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860359835648', '496138616573953', '67042515441684480', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860364029952', '496138616573953', '67082402312228864', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860368224256', '496138616573953', '16392452747300864', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860372418560', '496138616573953', '16392767785668608', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860376612865', '496138616573953', '16438800255291392', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860385001472', '496138616573953', '16438962738434048', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('77277860389195776', '496138616573953', '16439068543946752', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('7750f9be48ee09cd561fce718219a3e2', 'ee8626f80f7c2619917b6236f3a7f02b', '882a73768cfd7f78f3a37584f7299656', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('7a5d31ba48fe3fb1266bf186dc5f7ba7', '52b0cf022ac4187b2a70dfa4f8b2d940', '58857ff846e61794c69208e9d3a85466', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('7ca833caa5eac837b7200d8b6de8b2e3', 'f6817f48af4fb3af11b9e8bf182f618b', 'fedfbf4420536cacc0218557d263dfea', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('00b0748f04d3ea52c8cfa179c1c9d384', '52b0cf022ac4187b2a70dfa4f8b2d940', 'd7d6e2e4e2934f2c9385a623fd98c6f3', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('00b82058779cca5106fbb84783534c9b', 'f6817f48af4fb3af11b9e8bf182f618b', '4148ec82b6acd69f470bea75fe41c357', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('0254c0b25694ad5479e6d6935bbc176e', 'f6817f48af4fb3af11b9e8bf182f618b', '944abf0a8fc22fe1f1154a389a574154', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('09bd4fc30ffe88c4a44ed3868f442719', 'f6817f48af4fb3af11b9e8bf182f618b', 'e6bfd1fcabfd7942fdd05f076d1dad38', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('0c2d2db76ee3aa81a4fe0925b0f31365', 'f6817f48af4fb3af11b9e8bf182f618b', '024f1fd1283dc632458976463d8984e1', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('0c6b8facbb1cc874964c87a8cf01e4b1', 'f6817f48af4fb3af11b9e8bf182f618b', '841057b8a1bef8f6b4b20f9a618a7fa6', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('0c6e1075e422972083c3e854d9af7851', 'f6817f48af4fb3af11b9e8bf182f618b', '08e6b9dc3c04489c8e1ff2ce6f105aa4', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('0d9d14bc66e9d5e99b0280095fdc8587', 'ee8626f80f7c2619917b6236f3a7f02b', '277bfabef7d76e89b33062b16a9a5020', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('0dec36b68c234767cd35466efef3b941', 'ee8626f80f7c2619917b6236f3a7f02b', '54dd5457a3190740005c1bfec55b1c34', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('0e139e6c1b5b73eee81381ddf0b5a9f3', 'f6817f48af4fb3af11b9e8bf182f618b', '277bfabef7d76e89b33062b16a9a5020', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('0f861cb988fdc639bb1ab943471f3a72', 'f6817f48af4fb3af11b9e8bf182f618b', '97c8629abc7848eccdb6d77c24bb3ebb', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('105c2ac10741e56a618a82cd58c461d7', 'e51758fa916c881624b046d26bd09230', '1663f3faba244d16c94552f849627d84', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('115a6673ae6c0816d3f60de221520274', '21c5a3187763729408b40afb0d0fdfa8', '63b551e81c5956d5c861593d366d8c57', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('126ea9faebeec2b914d6d9bef957afb6', 'f6817f48af4fb3af11b9e8bf182f618b', 'f1cb187abf927c88b89470d08615f5ac', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('145eac8dd88eddbd4ce0a800ab40a92c', 'e51758fa916c881624b046d26bd09230', '08e6b9dc3c04489c8e1ff2ce6f105aa4', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('154edd0599bd1dc2c7de220b489cd1e2', 'f6817f48af4fb3af11b9e8bf182f618b', '7ac9eb9ccbde2f7a033cd4944272bf1e', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('165acd6046a0eaf975099f46a3c898ea', 'f6817f48af4fb3af11b9e8bf182f618b', '4f66409ef3bbd69c1d80469d6e2a885e', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('1664b92dff13e1575e3a929caa2fa14d', 'f6817f48af4fb3af11b9e8bf182f618b', 'd2bbf9ebca5a8fa2e227af97d2da7548', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('16ef8ed3865ccc6f6306200760896c50', 'ee8626f80f7c2619917b6236f3a7f02b', 'e8af452d8948ea49d37c934f5100ae6a', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('17ead5b7d97ed365398ab20009a69ea3', '52b0cf022ac4187b2a70dfa4f8b2d940', 'e08cb190ef230d5d4f03824198773950', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('1ac1688ef8456f384091a03d88a89ab1', '52b0cf022ac4187b2a70dfa4f8b2d940', '693ce69af3432bd00be13c3971a57961', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('1af4babaa4227c3cbb830bc5eb513abb', 'ee8626f80f7c2619917b6236f3a7f02b', 'e08cb190ef230d5d4f03824198773950', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('1ba162bbc2076c25561f8622f610d5bf', 'ee8626f80f7c2619917b6236f3a7f02b', 'aedbf679b5773c1f25e9f7b10111da73', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('1c1dbba68ef1817e7fb19c822d2854e8', 'f6817f48af4fb3af11b9e8bf182f618b', 'fb367426764077dcf94640c843733985', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('1c55c4ced20765b8ebab383caa60f0b6', 'e51758fa916c881624b046d26bd09230', 'fb367426764077dcf94640c843733985', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('1e099baeae01b747d67aca06bdfc34d1', 'e51758fa916c881624b046d26bd09230', '6ad53fd1b220989a8b71ff482d683a5a', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('1e47db875601fd97723254046b5bba90', 'f6817f48af4fb3af11b9e8bf182f618b', 'baf16b7174bd821b6bab23fa9abb200d', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('1fe4d408b85f19618c15bcb768f0ec22', '1750a8fb3e6d90cb7957c02de1dc8e59', '9502685863ab87f0ad1134142788a385', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('20e53c87a785688bdc0a5bb6de394ef1', 'f6817f48af4fb3af11b9e8bf182f618b', '540a2936940846cb98114ffb0d145cb8', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('248d288586c6ff3bd14381565df84163', '52b0cf022ac4187b2a70dfa4f8b2d940', '3f915b2769fc80648e92d04e84ca059d', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('25491ecbd5a9b34f09c8bc447a10ede1', 'f6817f48af4fb3af11b9e8bf182f618b', 'd07a2c87a451434c99ab06296727ec4f', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('25f5443f19c34d99718a016d5f54112e', 'ee8626f80f7c2619917b6236f3a7f02b', '6e73eb3c26099c191bf03852ee1310a1', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('27489816708b18859768dfed5945c405', 'a799c3b1b12dd3ed4bd046bfaef5fe6e', '9502685863ab87f0ad1134142788a385', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('9f8311ecccd44e079723098cf2ffe1cc', '1750a8fb3e6d90cb7957c02de1dc8e59', '693ce69af3432bd00be13c3971a57961', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('a034ed7c38c996b880d3e78f586fe0ae', 'f6817f48af4fb3af11b9e8bf182f618b', 'c89018ea6286e852b424466fd92a2ffc', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('a098e2acc3f90316f161f6648d085640', 'ee8626f80f7c2619917b6236f3a7f02b', 'e6bfd1fcabfd7942fdd05f076d1dad38', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('a307a9349ad64a2eff8ab69582fa9be4', 'f6817f48af4fb3af11b9e8bf182f618b', '0620e402857b8c5b605e1ad9f4b89350', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('a5d25fdb3c62904a8474182706ce11a0', 'f6817f48af4fb3af11b9e8bf182f618b', '418964ba087b90a84897b62474496b93', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('a66feaaf128417ad762e946abccf27ec', 'ee8626f80f7c2619917b6236f3a7f02b', 'c6cf95444d80435eb37b2f9db3971ae6', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('a72c31a3913c736d4eca11d13be99183', 'e51758fa916c881624b046d26bd09230', 'a44c30db536349e91106223957e684eb', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('a7ab87eac0f8fafa2efa4b1f9351923f', 'ee8626f80f7c2619917b6236f3a7f02b', 'fedfbf4420536cacc0218557d263dfea', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('abdc324a2df9f13ee6e73d44c6e62bc8', 'ee8626f80f7c2619917b6236f3a7f02b', 'f1cb187abf927c88b89470d08615f5ac', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('acacce4417e5d7f96a9c3be2ded5b4be', 'f6817f48af4fb3af11b9e8bf182f618b', 'f9d3f4f27653a71c52faa9fb8070fbe7', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('aefc8c22e061171806e59cd222f6b7e1', '52b0cf022ac4187b2a70dfa4f8b2d940', 'e8af452d8948ea49d37c934f5100ae6a', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('af60ac8fafd807ed6b6b354613b9ccbc', 'f6817f48af4fb3af11b9e8bf182f618b', '58857ff846e61794c69208e9d3a85466', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('b0c8a20800b8bf1ebdd7be473bceb44f', 'f6817f48af4fb3af11b9e8bf182f618b', '58b9204feaf07e47284ddb36cd2d8468', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('b128ebe78fa5abb54a3a82c6689bdca3', 'f6817f48af4fb3af11b9e8bf182f618b', 'aedbf679b5773c1f25e9f7b10111da73', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('b131ebeafcfd059f3c7e542606ea9ff5', 'ee8626f80f7c2619917b6236f3a7f02b', 'e5973686ed495c379d829ea8b2881fc6', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('b21b07951bb547b09cc85624a841aea0', 'f6817f48af4fb3af11b9e8bf182f618b', '4356a1a67b564f0988a484f5531fd4d9', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('b2b2dcfff6986d3d7f890ea62d474651', 'ee8626f80f7c2619917b6236f3a7f02b', '200006f0edf145a2b50eacca07585451', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('b495a46fa0e0d4637abe0db7fd12fe1a', 'ee8626f80f7c2619917b6236f3a7f02b', '717f6bee46f44a3897eca9abd6e2ec44', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('b64c4ab9cd9a2ea8ac1e9db5fb7cf522', 'f6817f48af4fb3af11b9e8bf182f618b', '2aeddae571695cd6380f6d6d334d6e7d', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('bbec16ad016efec9ea2def38f4d3d9dc', 'f6817f48af4fb3af11b9e8bf182f618b', '13212d3416eb690c2e1d5033166ff47a', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('bd30561f141f07827b836878137fddd8', 'e51758fa916c881624b046d26bd09230', '65a8f489f25a345836b7f44b1181197a', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('bea2986432079d89203da888d99b3f16', 'f6817f48af4fb3af11b9e8bf182f618b', '54dd5457a3190740005c1bfec55b1c34', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('c09373ebfc73fb5740db5ff02cba4f91', 'f6817f48af4fb3af11b9e8bf182f618b', '339329ed54cf255e1f9392e84f136901', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('c56fb1658ee5f7476380786bf5905399', 'f6817f48af4fb3af11b9e8bf182f618b', 'de13e0f6328c069748de7399fcc1dbbd', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('c689539d20a445b0896270290c58d01f', 'e51758fa916c881624b046d26bd09230', '13212d3416eb690c2e1d5033166ff47a', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('c6fee38d293b9d0596436a0cbd205070', 'f6817f48af4fb3af11b9e8bf182f618b', '4f84f9400e5e92c95f05b554724c2b58', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('c8571839e6b14796e661f3e2843b80b6', 'ee8626f80f7c2619917b6236f3a7f02b', '45c966826eeff4c99b8f8ebfe74511fc', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('c90b0b01c7ca454d2a1cb7408563e696', 'f6817f48af4fb3af11b9e8bf182f618b', '882a73768cfd7f78f3a37584f7299656', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('c9d35261cccd67ab2932107a0967a7d7', 'e51758fa916c881624b046d26bd09230', 'b4dfc7d5dd9e8d5b6dd6d4579b1aa559', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('ced80e43584ce15e97bb07298e93020d', 'e51758fa916c881624b046d26bd09230', '45c966826eeff4c99b8f8ebfe74511fc', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('cf1feb1bf69eafc982295ad6c9c8d698', 'f6817f48af4fb3af11b9e8bf182f618b', 'a2b11669e98c5fe54a53c3e3c4f35d14', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('cf2ef620217673e4042f695743294f01', 'f6817f48af4fb3af11b9e8bf182f618b', '717f6bee46f44a3897eca9abd6e2ec44', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('cf43895aef7fc684669483ab00ef2257', 'f6817f48af4fb3af11b9e8bf182f618b', '700b7f95165c46cc7a78bf227aa8fed3', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('d03d792b0f312e7b490afc5cec3dd6c5', 'e51758fa916c881624b046d26bd09230', '8fb8172747a78756c11916216b8b8066', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('d281a95b8f293d0fa2a136f46c4e0b10', 'f6817f48af4fb3af11b9e8bf182f618b', '5c8042bd6c601270b2bbd9b20bccc68b', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('d37ad568e26f46ed0feca227aa9c2ffa', 'f6817f48af4fb3af11b9e8bf182f618b', '9502685863ab87f0ad1134142788a385', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('d3ddcacee1acdfaa0810618b74e38ef2', 'f6817f48af4fb3af11b9e8bf182f618b', 'c6cf95444d80435eb37b2f9db3971ae6', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('d3fe195d59811531c05d31d8436f5c8b', '1750a8fb3e6d90cb7957c02de1dc8e59', 'e8af452d8948ea49d37c934f5100ae6a', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('d5267597a4450f06d49d2fb63859641a', 'e51758fa916c881624b046d26bd09230', '2dbbafa22cda07fa5d169d741b81fe12', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('d83282192a69514cfe6161b3087ff962', 'f6817f48af4fb3af11b9e8bf182f618b', '53a9230444d33de28aa11cc108fb1dba', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('d8a5c9079df12090e108e21be94b4fd7', 'f6817f48af4fb3af11b9e8bf182f618b', '078f9558cdeab239aecb2bda1a8ed0d1', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('dbc5dd836d45c5bc7bc94b22596ab956', 'f6817f48af4fb3af11b9e8bf182f618b', '1939e035e803a99ceecb6f5563570fb2', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('dc83bb13c0e8c930e79d28b2db26f01f', 'f6817f48af4fb3af11b9e8bf182f618b', '63b551e81c5956d5c861593d366d8c57', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('dc8fd3f79bd85bd832608b42167a1c71', 'f6817f48af4fb3af11b9e8bf182f618b', '91c23960fab49335831cf43d820b0a61', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('de82e89b8b60a3ea99be5348f565c240', 'f6817f48af4fb3af11b9e8bf182f618b', '56ca78fe0f22d815fabc793461af67b8', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('de8f43229e351d34af3c95b1b9f0a15d', 'f6817f48af4fb3af11b9e8bf182f618b', 'a400e4f4d54f79bf5ce160ae432231af', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('e258ca8bf7ee168b93bfee739668eb15', 'ee8626f80f7c2619917b6236f3a7f02b', 'fb367426764077dcf94640c843733985', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('e339f7db7418a4fd2bd2c113f1182186', 'ee8626f80f7c2619917b6236f3a7f02b', 'b1cb0a3fedf7ed0e4653cb5a229837ee', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('e3e922673f4289b18366bb51b6200f17', '52b0cf022ac4187b2a70dfa4f8b2d940', '45c966826eeff4c99b8f8ebfe74511fc', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('e7467726ee72235baaeb47df04a35e73', 'f6817f48af4fb3af11b9e8bf182f618b', 'e08cb190ef230d5d4f03824198773950', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('eaef4486f1c9b0408580bbfa2037eb66', 'f6817f48af4fb3af11b9e8bf182f618b', '2a470fc0c3954d9dbb61de6d80846549', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('ec4bc97829ab56afd83f428b6dc37ff6', 'f6817f48af4fb3af11b9e8bf182f618b', '200006f0edf145a2b50eacca07585451', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('ec846a3f85fdb6813e515be71f11b331', 'f6817f48af4fb3af11b9e8bf182f618b', '732d48f8e0abe99fe6a23d18a3171cd1', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('ec93bb06f5be4c1f19522ca78180e2ef', 'f6817f48af4fb3af11b9e8bf182f618b', '265de841c58907954b8877fb85212622', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('ecdd72fe694e6bba9c1d9fc925ee79de', 'f6817f48af4fb3af11b9e8bf182f618b', '45c966826eeff4c99b8f8ebfe74511fc', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('edefd8d468f5727db465cf1b860af474', 'f6817f48af4fb3af11b9e8bf182f618b', '6ad53fd1b220989a8b71ff482d683a5a', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('ef8bdd20d29447681ec91d3603e80c7b', 'f6817f48af4fb3af11b9e8bf182f618b', 'ae4fed059f67086fd52a73d913cf473d', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('f12b6c90e8913183d7ca547c66600891', 'e51758fa916c881624b046d26bd09230', 'aedbf679b5773c1f25e9f7b10111da73', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('f177acac0276329dc66af0c9ad30558a', 'f6817f48af4fb3af11b9e8bf182f618b', 'c2c356bf4ddd29975347a7047a062440', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('f17ab8ad1e71341140857ef4914ef297', '21c5a3187763729408b40afb0d0fdfa8', '732d48f8e0abe99fe6a23d18a3171cd1', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('f99f99cc3bc27220cdd4f5aced33b7d7', 'f6817f48af4fb3af11b9e8bf182f618b', '655563cd64b75dcf52ef7bcdd4836953', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('fafe73c4448b977fe42880a6750c3ee8', 'f6817f48af4fb3af11b9e8bf182f618b', '9cb91b8851db0cf7b19d7ecc2a8193dd', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('fced905c7598973b970d42d833f73474', 'f6817f48af4fb3af11b9e8bf182f618b', '4875ebe289344e14844d8e3ea1edd73f', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('fd86f6b08eb683720ba499f9d9421726', 'ee8626f80f7c2619917b6236f3a7f02b', '693ce69af3432bd00be13c3971a57961', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('fed41a4671285efb266cd404f24dd378', '52b0cf022ac4187b2a70dfa4f8b2d940', '00a2a0ae65cdca5e93209cdbde97cbe6', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('7d2ea745950be3357747ec7750c31c57', 'ee8626f80f7c2619917b6236f3a7f02b', '2a470fc0c3954d9dbb61de6d80846549', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('7de42bdc0b8c5446b7d428c66a7abc12', '52b0cf022ac4187b2a70dfa4f8b2d940', '54dd5457a3190740005c1bfec55b1c34', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('7e19d90cec0dd87aaef351b9ff8f4902', '646c628b2b8295fbdab2d34044de0354', 'f9d3f4f27653a71c52faa9fb8070fbe7', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('7f862c47003eb20e8bad05f506371f92', 'ee8626f80f7c2619917b6236f3a7f02b', 'd7d6e2e4e2934f2c9385a623fd98c6f3', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('812ed54661b1a24b81b58974691a73f5', 'e51758fa916c881624b046d26bd09230', 'e6bfd1fcabfd7942fdd05f076d1dad38', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('83f704524b21b6a3ae324b8736c65333', 'ee8626f80f7c2619917b6236f3a7f02b', '7ac9eb9ccbde2f7a033cd4944272bf1e', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('84d32474316a43b01256d6644e6e7751', 'ee8626f80f7c2619917b6236f3a7f02b', 'ec8d607d0156e198b11853760319c646', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('84eac2f113c23737128fb099d1d1da89', 'f6817f48af4fb3af11b9e8bf182f618b', '03dc3d93261dda19fc86dd7ca486c6cf', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('85755a6c0bdff78b3860b52d35310c7f', 'e51758fa916c881624b046d26bd09230', 'c65321e57b7949b7a975313220de0422', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('86060e2867a5049d8a80d9fe5d8bc28b', 'f6817f48af4fb3af11b9e8bf182f618b', '765dd244f37b804e3d00f475fd56149b', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('8703a2410cddb713c33232ce16ec04b9', 'ee8626f80f7c2619917b6236f3a7f02b', '1367a93f2c410b169faa7abcbad2f77c', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('884f147c20e003cc80ed5b7efa598cbe', 'f6817f48af4fb3af11b9e8bf182f618b', 'e5973686ed495c379d829ea8b2881fc6', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('885c1a827383e5b2c6c4f8ca72a7b493', 'ee8626f80f7c2619917b6236f3a7f02b', '4148ec82b6acd69f470bea75fe41c357', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('8a60df8d8b4c9ee5fa63f48aeee3ec00', '1750a8fb3e6d90cb7957c02de1dc8e59', 'd7d6e2e4e2934f2c9385a623fd98c6f3', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('8b1e326791375f325d3e6b797753b65e', 'ee8626f80f7c2619917b6236f3a7f02b', '2dbbafa22cda07fa5d169d741b81fe12', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('8ce1022dac4e558ff9694600515cf510', '1750a8fb3e6d90cb7957c02de1dc8e59', '08e6b9dc3c04489c8e1ff2ce6f105aa4', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('8d154c2382a8ae5c8d1b84bd38df2a93', 'f6817f48af4fb3af11b9e8bf182f618b', 'd86f58e7ab516d3bc6bfb1fe10585f97', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('8d848ca7feec5b7ebb3ecb32b2c8857a', '52b0cf022ac4187b2a70dfa4f8b2d940', '4148ec82b6acd69f470bea75fe41c357', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('8dd64f65a1014196078d0882f767cd85', 'f6817f48af4fb3af11b9e8bf182f618b', 'e3c13679c73a4f829bcff2aba8fd68b1', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('8e3dc1671abad4f3c83883b194d2e05a', 'f6817f48af4fb3af11b9e8bf182f618b', 'b1cb0a3fedf7ed0e4653cb5a229837ee', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('8eec2c510f1ac9c5eee26c041b1f00ca', 'ee8626f80f7c2619917b6236f3a7f02b', '58857ff846e61794c69208e9d3a85466', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('8f762ff80253f634b08cf59a77742ba4', 'ee8626f80f7c2619917b6236f3a7f02b', '9502685863ab87f0ad1134142788a385', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('903b790e6090414343502c6dc393b7c9', 'ee8626f80f7c2619917b6236f3a7f02b', 'de13e0f6328c069748de7399fcc1dbbd', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('905bf419332ebcb83863603b3ebe30f0', 'f6817f48af4fb3af11b9e8bf182f618b', '8fb8172747a78756c11916216b8b8066', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('90996d56357730e173e636b99fc48bea', 'ee8626f80f7c2619917b6236f3a7f02b', 'fb07ca05a3e13674dbf6d3245956da2e', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('90e1c607a0631364eec310f3cc4acebd', 'ee8626f80f7c2619917b6236f3a7f02b', '4f66409ef3bbd69c1d80469d6e2a885e', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('9264104cee9b10c96241d527b2d0346d', '1750a8fb3e6d90cb7957c02de1dc8e59', '54dd5457a3190740005c1bfec55b1c34', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('9380121ca9cfee4b372194630fce150e', 'f6817f48af4fb3af11b9e8bf182f618b', '65a8f489f25a345836b7f44b1181197a', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('94911fef73a590f6824105ebf9b6cab3', 'f6817f48af4fb3af11b9e8bf182f618b', '8b3bff2eee6f1939147f5c68292a1642', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('9700d20dbc1ae3cbf7de1c810b521fe6', 'f6817f48af4fb3af11b9e8bf182f618b', 'ec8d607d0156e198b11853760319c646', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('980171fda43adfe24840959b1d048d4d', 'f6817f48af4fb3af11b9e8bf182f618b', 'd7d6e2e4e2934f2c9385a623fd98c6f3', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('987c23b70873bd1d6dca52f30aafd8c2', 'f6817f48af4fb3af11b9e8bf182f618b', '00a2a0ae65cdca5e93209cdbde97cbe6', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('98f02353f91dd569e3c6b8fd6b4f4034', 'ee8626f80f7c2619917b6236f3a7f02b', '6531cf3421b1265aeeeabaab5e176e6d', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('9b2ad767f9861e64a20b097538feafd3', 'f6817f48af4fb3af11b9e8bf182f618b', '73678f9daa45ed17a3674131b03432fb', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('9d8772c310b675ae43eacdbc6c7fa04a', 'a799c3b1b12dd3ed4bd046bfaef5fe6e', '1663f3faba244d16c94552f849627d84', null);
+INSERT INTO "SYS_ROLE_PERMISSION" VALUES ('9d980ec0489040e631a9c24a6af42934', 'f6817f48af4fb3af11b9e8bf182f618b', '05b3c82ddb2536a4a5ee1a4c46b5abef', null);
+
+-- ----------------------------
+-- Records of SYS_SMS
+-- ----------------------------
+INSERT INTO "SYS_SMS" VALUES ('402880e74dc2f361014dc2f8411e0001', '消息推送测试333', '2', '411944058@qq.com', null, '张三你好，你的订单4028d881436d514601436d521ae80165已付款!', TO_DATE('2015-06-05 17:06:01', 'YYYY-MM-DD HH24:MI:SS'), '3', null, null, '认证失败错误的用户名或者密码', 'admin', TO_DATE('2015-06-05 17:05:59', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2015-11-19 22:30:39', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_SMS" VALUES ('402880ea533647b00153364e74770001', '发个问候', '3', 'admin', null, '你好', TO_DATE('2016-03-02 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '2', null, null, null, 'admin', TO_DATE('2016-03-02 15:50:24', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2018-07-05 19:53:01', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_SMS" VALUES ('402880ee5a17e711015a17f3188e013f', '消息推送测试333', '2', '411944058@qq.com', null, '张三你好，你的订单4028d881436d514601436d521ae80165已付款!', null, '2', null, null, null, 'admin', TO_DATE('2017-02-07 17:41:31', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2017-03-10 11:37:05', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_SMS" VALUES ('402880f05ab649b4015ab64b9cd80012', '消息推送测试333', '2', '411944058@qq.com', null, '张三你好，你的订单4028d881436d514601436d521ae80165已付款!', TO_DATE('2017-11-16 15:58:15', 'YYYY-MM-DD HH24:MI:SS'), '3', null, null, null, 'admin', TO_DATE('2017-03-10 11:38:13', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2017-07-31 17:24:54', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_SMS" VALUES ('402880f05ab7b035015ab7c4462c0004', '消息推送测试333', '2', '411944058@qq.com', null, '张三你好，你的订单4028d881436d514601436d521ae80165已付款!', TO_DATE('2017-11-16 15:58:15', 'YYYY-MM-DD HH24:MI:SS'), '3', null, null, null, 'admin', TO_DATE('2017-03-10 18:29:37', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "SYS_SMS" VALUES ('402881f3646a472b01646a4a5af00001', '催办：HR审批', '3', 'admin', null, 'admin，您好！
+请前待办任务办理事项！HR审批
+
+
+===========================
+此消息由系统发出', TO_DATE('2018-07-05 19:53:35', 'YYYY-MM-DD HH24:MI:SS'), '2', null, null, null, 'admin', TO_DATE('2018-07-05 19:53:35', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2018-07-07 13:45:24', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_SMS" VALUES ('402881f3647da06c01647da43a940014', '催办：HR审批', '3', 'admin', null, 'admin，您好！
+请前待办任务办理事项！HR审批
+
+
+===========================
+此消息由系统发出', TO_DATE('2018-07-09 14:04:32', 'YYYY-MM-DD HH24:MI:SS'), '2', null, null, null, 'admin', TO_DATE('2018-07-09 14:04:32', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2018-07-09 18:51:30', 'YYYY-MM-DD HH24:MI:SS'));
+
+-- ----------------------------
+-- Records of SYS_SMS_TEMPLATE
+-- ----------------------------
+INSERT INTO "SYS_SMS_TEMPLATE" VALUES ('4028608164691b000164693108140003', '催办：${taskName}', 'SYS001', '3', '${userName}，您好！
+请前待办任务办理事项！${taskName}
+
+
+===========================
+此消息由系统发出', '{
+"taskName":"HR审批",
+"userName":"admin"
+}', TO_DATE('2018-07-05 14:46:18', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2018-07-05 18:31:34', 'YYYY-MM-DD HH24:MI:SS'), 'admin');
+
+-- ----------------------------
+-- Records of SYS_USER
+-- ----------------------------
+INSERT INTO "SYS_USER" VALUES ('42d153bffeea74f72a9c1697874fa4a7', 'test22', '23232', 'ac52e15671a377cf', '5FMD48RM', 'user/20190314/ly-plate-e_1552531617500.png', TO_DATE('2019-02-09 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '1', 'zhangdaiscott@163.com', '18611782222', null, '1', '0', '1', 'admin', TO_DATE('2019-01-26 18:01:10', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-23 15:05:50', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_USER" VALUES ('a75d45a015c44384a04449ee80dc3503', 'jeecg', 'jeecg', '3dd8371f3cf8240e', 'vDDkDzrK', 'user/20190220/e1fe9925bc315c60addea1b98eb1cb1349547719_1550656892940.jpg', null, '2', null, null, null, '1', '0', '1', 'admin', TO_DATE('2019-02-13 16:02:36', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-09 15:47:36', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_USER" VALUES ('e9ca23d68d884d4ebb19d07889727dae', 'admin', '管理员', 'cb362cfeefbf3d8d', 'RCGTeGiH', 'user/20190119/logo-2_1547868176839.png', TO_DATE('2018-12-05 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '1', '11@qq.com', '18566666666', 'A01', '1', '0', '1', null, TO_DATE('2018-12-21 17:54:10', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-26 17:55:02', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "SYS_USER" VALUES ('f0019fdebedb443c98dcb17d88222c38', 'zhagnxiao', '张小红', 'f898134e5e52ae11a2ffb2c3b57a4e90', 'go3jJ4zX', 'user/20190401/20180607175028Fn1Lq7zw_1554118444672.png', TO_DATE('2019-04-01 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), null, null, null, null, '1', '0', '1', 'admin', TO_DATE('2023-10-01 19:34:10', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-10 22:00:22', 'YYYY-MM-DD HH24:MI:SS'));
+
+-- ----------------------------
+-- Records of SYS_USER_AGENT
+-- ----------------------------
+
+-- ----------------------------
+-- Records of SYS_USER_DEPART
+-- ----------------------------
+INSERT INTO "SYS_USER_DEPART" VALUES ('0c42ba309c2c4cad35836ec2336676fa', '42d153bffeea74f72a9c1697874fa4a7', '6d35e179cd814e3299bd588ea7daed3f');
+INSERT INTO "SYS_USER_DEPART" VALUES ('2835834d133f9118ee87a666e0f5501e', 'a75d45a015c44384a04449ee80dc3503', 'a7d7e77e06c84325a40932163adcdaa6');
+INSERT INTO "SYS_USER_DEPART" VALUES ('1f3a0267811327b9eca86b0cc2b956f3', 'bcbe1290783a469a83ae3bd8effe15d4', '5159cde220114246b045e574adceafe9');
+INSERT INTO "SYS_USER_DEPART" VALUES ('577ae220081f78ceaf8cb26eb75330ab', 'e9ca23d68d884d4ebb19d07889727dae', '4f1765520d6346f9bd9c79e2479e5b12');
+INSERT INTO "SYS_USER_DEPART" VALUES ('15e0d72bcbab86a41e38222b1f09428e', 'e9ca23d68d884d4ebb19d07889727dae', 'c6d7cb4deeac411cb3384b1b31278596');
+INSERT INTO "SYS_USER_DEPART" VALUES ('ac52f23ae625eb6560c9227170b88166', 'f0019fdebedb443c98dcb17d88222c38', '57197590443c44f083d42ae24ef26a2c');
+INSERT INTO "SYS_USER_DEPART" VALUES ('179660a8b9a122f66b73603799a10924', 'f0019fdebedb443c98dcb17d88222c38', '67fc001af12a4f9b8458005d3f19934a');
+
+-- ----------------------------
+-- Records of SYS_USER_ROLE
+-- ----------------------------
+INSERT INTO "SYS_USER_ROLE" VALUES ('b3ffd9311a1ca296c44e2409b547384f', '01b802058ea94b978a2c96f4807f6b48', '1');
+INSERT INTO "SYS_USER_ROLE" VALUES ('0ede6d23d53bc7dc990346ff14faabee', '3db4cf42353f4e868b7ccfeef90505d2', 'ee8626f80f7c2619917b6236f3a7f02b');
+INSERT INTO "SYS_USER_ROLE" VALUES ('e78d210d24aaff48e0a736e2ddff4cdc', '3e177fede453430387a8279ced685679', 'ee8626f80f7c2619917b6236f3a7f02b');
+INSERT INTO "SYS_USER_ROLE" VALUES ('f2de3ae7b5efd8345581aa802a6675d6', '41b1be8d4c52023b0798f51164ca682d', 'e51758fa916c881624b046d26bd09230');
+INSERT INTO "SYS_USER_ROLE" VALUES ('6f9da7310489bac1e5f95e0efe92b4ce', '42d153bffeea74f72a9c1697874fa4a7', 'e51758fa916c881624b046d26bd09230');
+INSERT INTO "SYS_USER_ROLE" VALUES ('f2922a38ba24fb53749e45a0c459adb3', '439ae3e9bcf7418583fcd429cadb1d72', '1');
+INSERT INTO "SYS_USER_ROLE" VALUES ('f72c6190b0722e798147e73c776c6ac9', '439ae3e9bcf7418583fcd429cadb1d72', 'ee8626f80f7c2619917b6236f3a7f02b');
+INSERT INTO "SYS_USER_ROLE" VALUES ('ee45d0343ecec894b6886effc92cb0b7', '4d8fef4667574b24a9ccfedaf257810c', 'f6817f48af4fb3af11b9e8bf182f618b');
+INSERT INTO "SYS_USER_ROLE" VALUES ('be2639167ede09379937daca7fc3bb73', '526f300ab35e44faaed54a9fb0742845', 'ee8626f80f7c2619917b6236f3a7f02b');
+INSERT INTO "SYS_USER_ROLE" VALUES ('31af310584bd5795f76b1fe8c38294a0', '70f5dcf03f36471dabba81381919291f', 'e51758fa916c881624b046d26bd09230');
+INSERT INTO "SYS_USER_ROLE" VALUES ('8d7846ec783e157174e4ce2949231a65', '7ee6630e89d17afbf6d12150197b578d', 'e51758fa916c881624b046d26bd09230');
+INSERT INTO "SYS_USER_ROLE" VALUES ('79d66ef7aa137cfa9957081a1483009d', '9a668858c4c74cf5a2b25ad9608ba095', 'ee8626f80f7c2619917b6236f3a7f02b');
+INSERT INTO "SYS_USER_ROLE" VALUES ('f3a4ca33848daba3e43490707ae859e7', 'a75d45a015c44384a04449ee80dc3503', 'e51758fa916c881624b046d26bd09230');
+INSERT INTO "SYS_USER_ROLE" VALUES ('fe38580871c5061ba59d5c03a0840b0e', 'a75d45a015c44384a04449ee80dc3503', 'ee8626f80f7c2619917b6236f3a7f02b');
+INSERT INTO "SYS_USER_ROLE" VALUES ('6ec01b4aaab790eac4ddb33d7a524a58', 'e9ca23d68d884d4ebb19d07889727dae', 'f6817f48af4fb3af11b9e8bf182f618b');
+INSERT INTO "SYS_USER_ROLE" VALUES ('d2233e5be091d39da5abb0073c766224', 'f0019fdebedb443c98dcb17d88222c38', 'ee8626f80f7c2619917b6236f3a7f02b');
+
+-- ----------------------------
+-- Records of TEST_PERSON
+-- ----------------------------
+INSERT INTO "TEST_PERSON" VALUES ('8ca668defdae47df8649a5477ae08b05', 'admin', TO_DATE('2019-04-12 09:51:37', 'YYYY-MM-DD HH24:MI:SS'), null, null, '1', 'zhangdaiscott', 'dsdsd', TO_DATE('2019-04-12 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '2');
+
+
diff --git a/jeecg-boot/db/jeecg-boot-sqlserver_2008.sql b/jeecg-boot/db/jeecg-boot-sqlserver_2008.sql
new file mode 100644
index 0000000..8e84594
--- /dev/null
+++ b/jeecg-boot/db/jeecg-boot-sqlserver_2008.sql
@@ -0,0 +1,3263 @@
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[joa_demo](
+ [id] [nvarchar](32) NULL,
+ [name] [nvarchar](100) NULL,
+ [days] [int] NULL,
+ [begin_date] [datetime2](7) NULL,
+ [end_date] [datetime2](7) NULL,
+ [reason] [nvarchar](500) NULL,
+ [bpm_status] [nvarchar](50) NULL,
+ [create_by] [nvarchar](32) NULL,
+ [create_time] [datetime2](7) NULL,
+ [update_time] [datetime2](7) NULL,
+ [update_by] [nvarchar](32) NULL
+) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'joa_demo', @level2type=N'COLUMN',@level2name=N'id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'请假人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'joa_demo', @level2type=N'COLUMN',@level2name=N'name'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'请假天数' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'joa_demo', @level2type=N'COLUMN',@level2name=N'days'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'开始时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'joa_demo', @level2type=N'COLUMN',@level2name=N'begin_date'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'请假结束时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'joa_demo', @level2type=N'COLUMN',@level2name=N'end_date'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'请假原因' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'joa_demo', @level2type=N'COLUMN',@level2name=N'reason'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'流程状态' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'joa_demo', @level2type=N'COLUMN',@level2name=N'bpm_status'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建人id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'joa_demo', @level2type=N'COLUMN',@level2name=N'create_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'joa_demo', @level2type=N'COLUMN',@level2name=N'create_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'修改时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'joa_demo', @level2type=N'COLUMN',@level2name=N'update_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'修改人id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'joa_demo', @level2type=N'COLUMN',@level2name=N'update_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'流程测试' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'joa_demo'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[jeecg_project_nature_income](
+ [id] [int] NOT NULL,
+ [nature] [nvarchar](50) NOT NULL,
+ [insurance_fee] [decimal](18, 2) NULL,
+ [risk_consulting_fee] [decimal](18, 2) NULL,
+ [evaluation_fee] [decimal](18, 2) NULL,
+ [insurance_evaluation_fee] [decimal](18, 2) NULL,
+ [bidding_consulting_fee] [decimal](18, 2) NULL,
+ [interol_consulting_fee] [decimal](18, 2) NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目性质' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_project_nature_income', @level2type=N'COLUMN',@level2name=N'nature'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'保险经纪佣金费' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_project_nature_income', @level2type=N'COLUMN',@level2name=N'insurance_fee'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'风险咨询费' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_project_nature_income', @level2type=N'COLUMN',@level2name=N'risk_consulting_fee'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'承保公估评估费' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_project_nature_income', @level2type=N'COLUMN',@level2name=N'evaluation_fee'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'保险公估费' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_project_nature_income', @level2type=N'COLUMN',@level2name=N'insurance_evaluation_fee'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'投标咨询费' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_project_nature_income', @level2type=N'COLUMN',@level2name=N'bidding_consulting_fee'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'内控咨询费' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_project_nature_income', @level2type=N'COLUMN',@level2name=N'interol_consulting_fee'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[jeecg_order_ticket](
+ [id] [nvarchar](32) NOT NULL,
+ [ticket_code] [nvarchar](100) NOT NULL,
+ [tickect_date] [datetime2](7) NULL,
+ [order_id] [nvarchar](32) NOT NULL,
+ [create_by] [nvarchar](32) NULL,
+ [create_time] [datetime2](7) NULL,
+ [update_by] [nvarchar](32) NULL,
+ [update_time] [datetime2](7) NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_ticket', @level2type=N'COLUMN',@level2name=N'id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'航班号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_ticket', @level2type=N'COLUMN',@level2name=N'ticket_code'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'航班时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_ticket', @level2type=N'COLUMN',@level2name=N'tickect_date'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'外键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_ticket', @level2type=N'COLUMN',@level2name=N'order_id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_ticket', @level2type=N'COLUMN',@level2name=N'create_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_ticket', @level2type=N'COLUMN',@level2name=N'create_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'修改人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_ticket', @level2type=N'COLUMN',@level2name=N'update_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'修改时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_ticket', @level2type=N'COLUMN',@level2name=N'update_time'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[jeecg_order_main](
+ [id] [nvarchar](32) NOT NULL,
+ [order_code] [nvarchar](50) NULL,
+ [ctype] [nvarchar](500) NULL,
+ [order_date] [datetime2](7) NULL,
+ [order_money] [real] NULL,
+ [content] [nvarchar](500) NULL,
+ [create_by] [nvarchar](32) NULL,
+ [create_time] [datetime2](7) NULL,
+ [update_by] [nvarchar](32) NULL,
+ [update_time] [datetime2](7) NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_main', @level2type=N'COLUMN',@level2name=N'id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'订单号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_main', @level2type=N'COLUMN',@level2name=N'order_code'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'订单类型' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_main', @level2type=N'COLUMN',@level2name=N'ctype'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'订单日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_main', @level2type=N'COLUMN',@level2name=N'order_date'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'订单金额' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_main', @level2type=N'COLUMN',@level2name=N'order_money'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'订单备注' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_main', @level2type=N'COLUMN',@level2name=N'content'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_main', @level2type=N'COLUMN',@level2name=N'create_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_main', @level2type=N'COLUMN',@level2name=N'create_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'修改人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_main', @level2type=N'COLUMN',@level2name=N'update_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'修改时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_main', @level2type=N'COLUMN',@level2name=N'update_time'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[jeecg_order_customer](
+ [id] [nvarchar](32) NOT NULL,
+ [name] [nvarchar](100) NOT NULL,
+ [sex] [nvarchar](4) NULL,
+ [idcard] [nvarchar](18) NULL,
+ [idcard_pic] [nvarchar](500) NULL,
+ [telphone] [nvarchar](32) NULL,
+ [order_id] [nvarchar](32) NOT NULL,
+ [create_by] [nvarchar](32) NULL,
+ [create_time] [datetime2](7) NULL,
+ [update_by] [nvarchar](32) NULL,
+ [update_time] [datetime2](7) NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_customer', @level2type=N'COLUMN',@level2name=N'id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'客户名' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_customer', @level2type=N'COLUMN',@level2name=N'name'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'性别' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_customer', @level2type=N'COLUMN',@level2name=N'sex'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'身份证号码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_customer', @level2type=N'COLUMN',@level2name=N'idcard'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'身份证扫描件' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_customer', @level2type=N'COLUMN',@level2name=N'idcard_pic'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'电话1' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_customer', @level2type=N'COLUMN',@level2name=N'telphone'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'外键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_customer', @level2type=N'COLUMN',@level2name=N'order_id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_customer', @level2type=N'COLUMN',@level2name=N'create_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_customer', @level2type=N'COLUMN',@level2name=N'create_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'修改人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_customer', @level2type=N'COLUMN',@level2name=N'update_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'修改时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_order_customer', @level2type=N'COLUMN',@level2name=N'update_time'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[jeecg_monthly_growth_analysis](
+ [id] [int] NOT NULL,
+ [year] [nvarchar](50) NULL,
+ [month] [nvarchar](50) NULL,
+ [main_income] [decimal](18, 2) NULL,
+ [other_income] [decimal](18, 2) NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'月份' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_monthly_growth_analysis', @level2type=N'COLUMN',@level2name=N'month'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'佣金/主营收入' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_monthly_growth_analysis', @level2type=N'COLUMN',@level2name=N'main_income'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'其他收入' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'jeecg_monthly_growth_analysis', @level2type=N'COLUMN',@level2name=N'other_income'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[demo](
+ [id] [nvarchar](50) NOT NULL,
+ [name] [nvarchar](30) NULL,
+ [key_word] [nvarchar](255) NULL,
+ [punch_time] [datetime2](7) NULL,
+ [salary_money] [decimal](10, 3) NULL,
+ [bonus_money] [real] NULL,
+ [sex] [nvarchar](2) NULL,
+ [age] [int] NULL,
+ [birthday] [date] NULL,
+ [email] [nvarchar](50) NULL,
+ [content] [nvarchar](1000) NULL,
+ [create_by] [nvarchar](32) NULL,
+ [create_time] [datetime2](7) NULL,
+ [update_by] [nvarchar](32) NULL,
+ [update_time] [datetime2](7) NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'demo', @level2type=N'COLUMN',@level2name=N'id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'姓名' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'demo', @level2type=N'COLUMN',@level2name=N'name'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'关键词' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'demo', @level2type=N'COLUMN',@level2name=N'key_word'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'打卡时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'demo', @level2type=N'COLUMN',@level2name=N'punch_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'工资' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'demo', @level2type=N'COLUMN',@level2name=N'salary_money'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'奖金' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'demo', @level2type=N'COLUMN',@level2name=N'bonus_money'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'性别 {男:1,女:2}' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'demo', @level2type=N'COLUMN',@level2name=N'sex'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'年龄' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'demo', @level2type=N'COLUMN',@level2name=N'age'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'生日' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'demo', @level2type=N'COLUMN',@level2name=N'birthday'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'邮箱' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'demo', @level2type=N'COLUMN',@level2name=N'email'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'个人简介' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'demo', @level2type=N'COLUMN',@level2name=N'content'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'demo', @level2type=N'COLUMN',@level2name=N'create_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'demo', @level2type=N'COLUMN',@level2name=N'create_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'修改人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'demo', @level2type=N'COLUMN',@level2name=N'update_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'修改时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'demo', @level2type=N'COLUMN',@level2name=N'update_time'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+SET ANSI_PADDING ON
+GO
+CREATE TABLE [dbo].[QRTZ_SCHEDULER_STATE](
+ [SCHED_NAME] [varchar](120) NOT NULL,
+ [INSTANCE_NAME] [varchar](200) NOT NULL,
+ [LAST_CHECKIN_TIME] [bigint] NOT NULL,
+ [CHECKIN_INTERVAL] [bigint] NOT NULL,
+ CONSTRAINT [PK_QRTZ_SCHEDULER_STATE] PRIMARY KEY CLUSTERED
+(
+ [SCHED_NAME] ASC,
+ [INSTANCE_NAME] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+SET ANSI_PADDING OFF
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+SET ANSI_PADDING ON
+GO
+CREATE TABLE [dbo].[QRTZ_PAUSED_TRIGGER_GRPS](
+ [SCHED_NAME] [varchar](120) NOT NULL,
+ [TRIGGER_GROUP] [varchar](200) NOT NULL,
+ CONSTRAINT [PK_QRTZ_PAUSED_TRIGGER_GRPS] PRIMARY KEY CLUSTERED
+(
+ [SCHED_NAME] ASC,
+ [TRIGGER_GROUP] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+SET ANSI_PADDING OFF
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+SET ANSI_PADDING ON
+GO
+CREATE TABLE [dbo].[QRTZ_LOCKS](
+ [SCHED_NAME] [varchar](120) NOT NULL,
+ [LOCK_NAME] [varchar](40) NOT NULL,
+ CONSTRAINT [PK_QRTZ_LOCKS] PRIMARY KEY CLUSTERED
+(
+ [SCHED_NAME] ASC,
+ [LOCK_NAME] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+SET ANSI_PADDING OFF
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+SET ANSI_PADDING ON
+GO
+CREATE TABLE [dbo].[QRTZ_JOB_DETAILS](
+ [SCHED_NAME] [varchar](120) NOT NULL,
+ [JOB_NAME] [varchar](200) NOT NULL,
+ [JOB_GROUP] [varchar](200) NOT NULL,
+ [DESCRIPTION] [varchar](250) NULL,
+ [JOB_CLASS_NAME] [varchar](250) NOT NULL,
+ [IS_DURABLE] [varchar](1) NOT NULL,
+ [IS_NONCONCURRENT] [varchar](1) NOT NULL,
+ [IS_UPDATE_DATA] [varchar](1) NOT NULL,
+ [REQUESTS_RECOVERY] [varchar](1) NOT NULL,
+ [JOB_DATA] [image] NULL,
+ CONSTRAINT [PK_QRTZ_JOB_DETAILS] PRIMARY KEY CLUSTERED
+(
+ [SCHED_NAME] ASC,
+ [JOB_NAME] ASC,
+ [JOB_GROUP] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+SET ANSI_PADDING OFF
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+SET ANSI_PADDING ON
+GO
+CREATE TABLE [dbo].[QRTZ_FIRED_TRIGGERS](
+ [SCHED_NAME] [varchar](120) NOT NULL,
+ [ENTRY_ID] [varchar](95) NOT NULL,
+ [TRIGGER_NAME] [varchar](200) NOT NULL,
+ [TRIGGER_GROUP] [varchar](200) NOT NULL,
+ [INSTANCE_NAME] [varchar](200) NOT NULL,
+ [FIRED_TIME] [bigint] NOT NULL,
+ [SCHED_TIME] [bigint] NOT NULL,
+ [PRIORITY] [int] NOT NULL,
+ [STATE] [varchar](16) NOT NULL,
+ [JOB_NAME] [varchar](200) NULL,
+ [JOB_GROUP] [varchar](200) NULL,
+ [IS_NONCONCURRENT] [varchar](1) NULL,
+ [REQUESTS_RECOVERY] [varchar](1) NULL,
+ CONSTRAINT [PK_QRTZ_FIRED_TRIGGERS] PRIMARY KEY CLUSTERED
+(
+ [SCHED_NAME] ASC,
+ [ENTRY_ID] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+SET ANSI_PADDING OFF
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+SET ANSI_PADDING ON
+GO
+CREATE TABLE [dbo].[QRTZ_CALENDARS](
+ [SCHED_NAME] [varchar](120) NOT NULL,
+ [CALENDAR_NAME] [varchar](200) NOT NULL,
+ [CALENDAR] [image] NOT NULL,
+ CONSTRAINT [PK_QRTZ_CALENDARS] PRIMARY KEY CLUSTERED
+(
+ [SCHED_NAME] ASC,
+ [CALENDAR_NAME] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+SET ANSI_PADDING OFF
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[test_person](
+ [id] [nvarchar](36) NOT NULL,
+ [create_by] [nvarchar](50) NULL,
+ [create_time] [datetime2](7) NULL,
+ [update_by] [nvarchar](50) NULL,
+ [update_time] [datetime2](7) NULL,
+ [sex] [nvarchar](32) NULL,
+ [name] [nvarchar](200) NULL,
+ [content] [nvarchar](max) NULL,
+ [be_date] [datetime2](7) NULL,
+ [qj_days] [int] NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'test_person', @level2type=N'COLUMN',@level2name=N'create_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'test_person', @level2type=N'COLUMN',@level2name=N'create_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'test_person', @level2type=N'COLUMN',@level2name=N'update_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'test_person', @level2type=N'COLUMN',@level2name=N'update_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'性别' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'test_person', @level2type=N'COLUMN',@level2name=N'sex'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'用户名' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'test_person', @level2type=N'COLUMN',@level2name=N'name'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'请假原因' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'test_person', @level2type=N'COLUMN',@level2name=N'content'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'请假时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'test_person', @level2type=N'COLUMN',@level2name=N'be_date'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'请假天数' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'test_person', @level2type=N'COLUMN',@level2name=N'qj_days'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[sys_user_role](
+ [id] [nvarchar](32) NOT NULL,
+ [user_id] [nvarchar](32) NULL,
+ [role_id] [nvarchar](32) NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index2_groupuu_ole_id] ON [dbo].[sys_user_role]
+(
+ [role_id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index2_groupuu_user_id] ON [dbo].[sys_user_role]
+(
+ [user_id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index2_groupuu_useridandroleid] ON [dbo].[sys_user_role]
+(
+ [user_id] ASC,
+ [role_id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user_role', @level2type=N'COLUMN',@level2name=N'id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'用户id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user_role', @level2type=N'COLUMN',@level2name=N'user_id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'角色id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user_role', @level2type=N'COLUMN',@level2name=N'role_id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'用户角色表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user_role'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[sys_user_depart](
+ [ID] [nvarchar](32) NOT NULL,
+ [user_id] [nvarchar](32) NULL,
+ [dep_id] [nvarchar](32) NULL,
+PRIMARY KEY CLUSTERED
+(
+ [ID] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_depart_groupk_uidanddid] ON [dbo].[sys_user_depart]
+(
+ [user_id] ASC,
+ [dep_id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_depart_groupk_userid] ON [dbo].[sys_user_depart]
+(
+ [user_id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_depart_groupkorgid] ON [dbo].[sys_user_depart]
+(
+ [dep_id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user_depart', @level2type=N'COLUMN',@level2name=N'ID'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'用户id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user_depart', @level2type=N'COLUMN',@level2name=N'user_id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'部门id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user_depart', @level2type=N'COLUMN',@level2name=N'dep_id'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[sys_user_agent](
+ [id] [nvarchar](32) NOT NULL,
+ [user_name] [nvarchar](100) NULL,
+ [agent_user_name] [nvarchar](100) NULL,
+ [start_time] [datetime2](7) NULL,
+ [end_time] [datetime2](7) NULL,
+ [status] [nvarchar](2) NULL,
+ [create_name] [nvarchar](50) NULL,
+ [create_by] [nvarchar](50) NULL,
+ [create_time] [datetime2](7) NULL,
+ [update_name] [nvarchar](50) NULL,
+ [update_by] [nvarchar](50) NULL,
+ [update_time] [datetime2](7) NULL,
+ [sys_org_code] [nvarchar](50) NULL,
+ [sys_company_code] [nvarchar](50) NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [begintime_index] ON [dbo].[sys_user_agent]
+(
+ [start_time] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [endtime_index] ON [dbo].[sys_user_agent]
+(
+ [end_time] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [statux_index] ON [dbo].[sys_user_agent]
+(
+ [status] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE UNIQUE NONCLUSTERED INDEX [uniq_username] ON [dbo].[sys_user_agent]
+(
+ [user_name] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'序号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user_agent', @level2type=N'COLUMN',@level2name=N'id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'用户名' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user_agent', @level2type=N'COLUMN',@level2name=N'user_name'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'代理人用户名' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user_agent', @level2type=N'COLUMN',@level2name=N'agent_user_name'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'代理开始时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user_agent', @level2type=N'COLUMN',@level2name=N'start_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'代理结束时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user_agent', @level2type=N'COLUMN',@level2name=N'end_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'状态0无效1有效' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user_agent', @level2type=N'COLUMN',@level2name=N'status'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建人名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user_agent', @level2type=N'COLUMN',@level2name=N'create_name'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建人登录名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user_agent', @level2type=N'COLUMN',@level2name=N'create_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user_agent', @level2type=N'COLUMN',@level2name=N'create_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新人名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user_agent', @level2type=N'COLUMN',@level2name=N'update_name'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新人登录名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user_agent', @level2type=N'COLUMN',@level2name=N'update_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user_agent', @level2type=N'COLUMN',@level2name=N'update_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'所属部门' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user_agent', @level2type=N'COLUMN',@level2name=N'sys_org_code'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'所属公司' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user_agent', @level2type=N'COLUMN',@level2name=N'sys_company_code'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'用户代理人设置' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user_agent'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[sys_user](
+ [id] [nvarchar](32) NOT NULL,
+ [username] [nvarchar](100) NULL,
+ [realname] [nvarchar](100) NULL,
+ [password] [nvarchar](255) NULL,
+ [salt] [nvarchar](45) NULL,
+ [avatar] [nvarchar](255) NULL,
+ [birthday] [datetime2](7) NULL,
+ [sex] [int] NULL,
+ [email] [nvarchar](45) NULL,
+ [phone] [nvarchar](45) NULL,
+ [org_code] [nvarchar](100) NULL,
+ [status] [int] NULL,
+ [del_flag] [nvarchar](1) NULL,
+ [activiti_sync] [nvarchar](6) NULL,
+ [create_by] [nvarchar](32) NULL,
+ [create_time] [datetime2](7) NULL,
+ [update_by] [nvarchar](32) NULL,
+ [update_time] [datetime2](7) NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_user_del_flag] ON [dbo].[sys_user]
+(
+ [del_flag] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE UNIQUE NONCLUSTERED INDEX [index_user_name] ON [dbo].[sys_user]
+(
+ [username] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_user_status] ON [dbo].[sys_user]
+(
+ [status] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user', @level2type=N'COLUMN',@level2name=N'id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'登录账号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user', @level2type=N'COLUMN',@level2name=N'username'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'真实姓名' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user', @level2type=N'COLUMN',@level2name=N'realname'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'密码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user', @level2type=N'COLUMN',@level2name=N'password'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'md5密码盐' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user', @level2type=N'COLUMN',@level2name=N'salt'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'头像' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user', @level2type=N'COLUMN',@level2name=N'avatar'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'生日' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user', @level2type=N'COLUMN',@level2name=N'birthday'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'性别（1：男 2：女）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user', @level2type=N'COLUMN',@level2name=N'sex'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'电子邮件' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user', @level2type=N'COLUMN',@level2name=N'email'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'电话' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user', @level2type=N'COLUMN',@level2name=N'phone'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'部门code' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user', @level2type=N'COLUMN',@level2name=N'org_code'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'状态(1：正常 2：冻结 ）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user', @level2type=N'COLUMN',@level2name=N'status'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'删除状态（0，正常，1已删除）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user', @level2type=N'COLUMN',@level2name=N'del_flag'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'同步工作流引擎1同步0不同步' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user', @level2type=N'COLUMN',@level2name=N'activiti_sync'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user', @level2type=N'COLUMN',@level2name=N'create_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user', @level2type=N'COLUMN',@level2name=N'create_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user', @level2type=N'COLUMN',@level2name=N'update_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user', @level2type=N'COLUMN',@level2name=N'update_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'用户表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_user'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[sys_sms_template](
+ [id] [nvarchar](32) NOT NULL,
+ [template_name] [nvarchar](50) NULL,
+ [template_code] [nvarchar](32) NOT NULL,
+ [template_type] [nvarchar](1) NOT NULL,
+ [template_content] [nvarchar](1000) NOT NULL,
+ [template_test_json] [nvarchar](1000) NULL,
+ [create_time] [datetime2](7) NULL,
+ [create_by] [nvarchar](32) NULL,
+ [update_time] [datetime2](7) NULL,
+ [update_by] [nvarchar](32) NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+CREATE UNIQUE NONCLUSTERED INDEX [uniq_templatecode] ON [dbo].[sys_sms_template]
+(
+ [template_code] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms_template', @level2type=N'COLUMN',@level2name=N'id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'模板标题' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms_template', @level2type=N'COLUMN',@level2name=N'template_name'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'模板CODE' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms_template', @level2type=N'COLUMN',@level2name=N'template_code'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'模板类型：1短信 2邮件 3微信' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms_template', @level2type=N'COLUMN',@level2name=N'template_type'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'模板内容' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms_template', @level2type=N'COLUMN',@level2name=N'template_content'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'模板测试json' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms_template', @level2type=N'COLUMN',@level2name=N'template_test_json'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms_template', @level2type=N'COLUMN',@level2name=N'create_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建人登录名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms_template', @level2type=N'COLUMN',@level2name=N'create_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms_template', @level2type=N'COLUMN',@level2name=N'update_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新人登录名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms_template', @level2type=N'COLUMN',@level2name=N'update_by'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[sys_sms](
+ [id] [nvarchar](32) NOT NULL,
+ [es_title] [nvarchar](100) NULL,
+ [es_type] [nvarchar](1) NULL,
+ [es_receiver] [nvarchar](50) NULL,
+ [es_param] [nvarchar](1000) NULL,
+ [es_content] [nvarchar](max) NULL,
+ [es_send_time] [datetime2](7) NULL,
+ [es_send_status] [nvarchar](1) NULL,
+ [es_send_num] [int] NULL,
+ [es_result] [nvarchar](255) NULL,
+ [remark] [nvarchar](500) NULL,
+ [create_by] [nvarchar](32) NULL,
+ [create_time] [datetime2](7) NULL,
+ [update_by] [nvarchar](32) NULL,
+ [update_time] [datetime2](7) NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_receiver] ON [dbo].[sys_sms]
+(
+ [es_receiver] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_sendtime] ON [dbo].[sys_sms]
+(
+ [es_send_time] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_status] ON [dbo].[sys_sms]
+(
+ [es_send_status] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_type] ON [dbo].[sys_sms]
+(
+ [es_type] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms', @level2type=N'COLUMN',@level2name=N'id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'消息标题' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms', @level2type=N'COLUMN',@level2name=N'es_title'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'发送方式：1短信 2邮件 3微信' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms', @level2type=N'COLUMN',@level2name=N'es_type'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'接收人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms', @level2type=N'COLUMN',@level2name=N'es_receiver'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'发送所需参数Json格式' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms', @level2type=N'COLUMN',@level2name=N'es_param'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'推送内容' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms', @level2type=N'COLUMN',@level2name=N'es_content'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'推送时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms', @level2type=N'COLUMN',@level2name=N'es_send_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'推送状态 0未推送 1推送成功 2推送失败 -1失败不再发送' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms', @level2type=N'COLUMN',@level2name=N'es_send_status'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'发送次数 超过5次不再发送' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms', @level2type=N'COLUMN',@level2name=N'es_send_num'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'推送失败原因' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms', @level2type=N'COLUMN',@level2name=N'es_result'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'备注' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms', @level2type=N'COLUMN',@level2name=N'remark'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建人登录名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms', @level2type=N'COLUMN',@level2name=N'create_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms', @level2type=N'COLUMN',@level2name=N'create_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新人登录名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms', @level2type=N'COLUMN',@level2name=N'update_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_sms', @level2type=N'COLUMN',@level2name=N'update_time'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[sys_role_permission](
+ [id] [nvarchar](32) NOT NULL,
+ [role_id] [nvarchar](32) NULL,
+ [permission_id] [nvarchar](32) NULL,
+ [data_rule_ids] [nvarchar](1000) NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_group_per_id] ON [dbo].[sys_role_permission]
+(
+ [permission_id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_group_role_id] ON [dbo].[sys_role_permission]
+(
+ [role_id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_group_role_per_id] ON [dbo].[sys_role_permission]
+(
+ [role_id] ASC,
+ [permission_id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'角色id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_role_permission', @level2type=N'COLUMN',@level2name=N'role_id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'权限id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_role_permission', @level2type=N'COLUMN',@level2name=N'permission_id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'角色权限表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_role_permission'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[sys_role](
+ [id] [nvarchar](32) NOT NULL,
+ [role_name] [nvarchar](200) NULL,
+ [role_code] [nvarchar](100) NOT NULL,
+ [description] [nvarchar](255) NULL,
+ [create_by] [nvarchar](32) NULL,
+ [create_time] [datetime2](7) NULL,
+ [update_by] [nvarchar](32) NULL,
+ [update_time] [datetime2](7) NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+CREATE UNIQUE NONCLUSTERED INDEX [index_role_code] ON [dbo].[sys_role]
+(
+ [role_code] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_role', @level2type=N'COLUMN',@level2name=N'id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'角色名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_role', @level2type=N'COLUMN',@level2name=N'role_name'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'角色编码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_role', @level2type=N'COLUMN',@level2name=N'role_code'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'描述' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_role', @level2type=N'COLUMN',@level2name=N'description'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_role', @level2type=N'COLUMN',@level2name=N'create_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_role', @level2type=N'COLUMN',@level2name=N'create_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_role', @level2type=N'COLUMN',@level2name=N'update_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_role', @level2type=N'COLUMN',@level2name=N'update_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'角色表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_role'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[sys_quartz_job](
+ [id] [nvarchar](32) NOT NULL,
+ [create_by] [nvarchar](32) NULL,
+ [create_time] [datetime2](7) NULL,
+ [del_flag] [int] NULL,
+ [update_by] [nvarchar](32) NULL,
+ [update_time] [datetime2](7) NULL,
+ [job_class_name] [nvarchar](255) NULL,
+ [cron_expression] [nvarchar](255) NULL,
+ [parameter] [nvarchar](255) NULL,
+ [description] [nvarchar](255) NULL,
+ [status] [int] NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_quartz_job', @level2type=N'COLUMN',@level2name=N'create_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_quartz_job', @level2type=N'COLUMN',@level2name=N'create_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'删除状态' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_quartz_job', @level2type=N'COLUMN',@level2name=N'del_flag'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'修改人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_quartz_job', @level2type=N'COLUMN',@level2name=N'update_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'修改时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_quartz_job', @level2type=N'COLUMN',@level2name=N'update_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'任务类名' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_quartz_job', @level2type=N'COLUMN',@level2name=N'job_class_name'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'cron表达式' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_quartz_job', @level2type=N'COLUMN',@level2name=N'cron_expression'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'参数' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_quartz_job', @level2type=N'COLUMN',@level2name=N'parameter'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'描述' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_quartz_job', @level2type=N'COLUMN',@level2name=N'description'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'状态 0正常 -1停止' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_quartz_job', @level2type=N'COLUMN',@level2name=N'status'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[sys_permission_data_rule](
+ [id] [nvarchar](32) NOT NULL,
+ [permission_id] [nvarchar](32) NULL,
+ [rule_name] [nvarchar](50) NULL,
+ [rule_column] [nvarchar](50) NULL,
+ [rule_conditions] [nvarchar](50) NULL,
+ [rule_value] [nvarchar](300) NULL,
+ [status] [nvarchar](3) NULL,
+ [create_time] [datetime2](7) NULL,
+ [create_by] [nvarchar](32) NULL,
+ [update_time] [datetime2](7) NULL,
+ [update_by] [nvarchar](32) NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_fucntionid] ON [dbo].[sys_permission_data_rule]
+(
+ [permission_id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission_data_rule', @level2type=N'COLUMN',@level2name=N'id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'菜单ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission_data_rule', @level2type=N'COLUMN',@level2name=N'permission_id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'规则名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission_data_rule', @level2type=N'COLUMN',@level2name=N'rule_name'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'字段' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission_data_rule', @level2type=N'COLUMN',@level2name=N'rule_column'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'条件' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission_data_rule', @level2type=N'COLUMN',@level2name=N'rule_conditions'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'规则值' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission_data_rule', @level2type=N'COLUMN',@level2name=N'rule_value'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'权限有效状态1有0否' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission_data_rule', @level2type=N'COLUMN',@level2name=N'status'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission_data_rule', @level2type=N'COLUMN',@level2name=N'create_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'修改时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission_data_rule', @level2type=N'COLUMN',@level2name=N'update_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'修改人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission_data_rule', @level2type=N'COLUMN',@level2name=N'update_by'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[sys_permission](
+ [id] [nvarchar](32) NOT NULL,
+ [parent_id] [nvarchar](32) NULL,
+ [name] [nvarchar](100) NULL,
+ [url] [nvarchar](255) NULL,
+ [component] [nvarchar](255) NULL,
+ [component_name] [nvarchar](100) NULL,
+ [redirect] [nvarchar](255) NULL,
+ [menu_type] [int] NULL,
+ [perms] [nvarchar](255) NULL,
+ [perms_type] [nvarchar](10) NULL,
+ [sort_no] [int] NULL,
+ [always_show] [tinyint] NULL,
+ [icon] [nvarchar](100) NULL,
+ [is_route] [tinyint] NULL,
+ [is_leaf] [tinyint] NULL,
+ [hidden] [int] NULL,
+ [description] [nvarchar](255) NULL,
+ [create_by] [nvarchar](32) NULL,
+ [create_time] [datetime2](7) NULL,
+ [update_by] [nvarchar](32) NULL,
+ [update_time] [datetime2](7) NULL,
+ [del_flag] [int] NULL,
+ [rule_flag] [int] NULL,
+ [status] [nvarchar](2) NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_prem_del_flag] ON [dbo].[sys_permission]
+(
+ [del_flag] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_prem_is_leaf] ON [dbo].[sys_permission]
+(
+ [is_leaf] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_prem_is_route] ON [dbo].[sys_permission]
+(
+ [is_route] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_prem_pid] ON [dbo].[sys_permission]
+(
+ [parent_id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_prem_sort_no] ON [dbo].[sys_permission]
+(
+ [sort_no] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'父id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'parent_id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'菜单标题' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'name'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'路径' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'url'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'组件' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'component'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'组件名字' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'component_name'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'一级菜单跳转地址' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'redirect'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'菜单类型(0:一级菜单; 1:子菜单:2:按钮权限)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'menu_type'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'菜单权限编码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'perms'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'权限策略1显示2禁用' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'perms_type'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'菜单排序' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'sort_no'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'聚合子路由: 1是0否' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'always_show'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'菜单图标' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'icon'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'是否路由菜单: 0:不是 1:是（默认值1）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'is_route'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'是否叶子节点: 1:是 0:不是' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'is_leaf'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'是否隐藏路由: 0否,1是' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'hidden'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'描述' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'description'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'create_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'create_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'update_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'update_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'删除状态 0正常 1已删除' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'del_flag'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'是否添加数据权限1是0否' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'rule_flag'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'按钮权限状态(0无效1有效)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission', @level2type=N'COLUMN',@level2name=N'status'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'菜单权限表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_permission'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[sys_log](
+ [id] [nvarchar](32) NOT NULL,
+ [log_type] [int] NULL,
+ [log_content] [nvarchar](1000) NULL,
+ [operate_type] [int] NULL,
+ [userid] [nvarchar](32) NULL,
+ [username] [nvarchar](100) NULL,
+ [ip] [nvarchar](100) NULL,
+ [method] [nvarchar](500) NULL,
+ [request_url] [nvarchar](255) NULL,
+ [request_param] [nvarchar](255) NULL,
+ [request_type] [nvarchar](10) NULL,
+ [cost_time] [bigint] NULL,
+ [create_by] [nvarchar](32) NULL,
+ [create_time] [datetime2](7) NULL,
+ [update_by] [nvarchar](32) NULL,
+ [update_time] [datetime2](7) NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_log_type] ON [dbo].[sys_log]
+(
+ [log_type] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_logt_ype] ON [dbo].[sys_log]
+(
+ [log_type] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_operate_type] ON [dbo].[sys_log]
+(
+ [operate_type] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_table_userid] ON [dbo].[sys_log]
+(
+ [userid] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'日志类型（1登录日志，2操作日志）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_log', @level2type=N'COLUMN',@level2name=N'log_type'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'日志内容' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_log', @level2type=N'COLUMN',@level2name=N'log_content'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'操作类型' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_log', @level2type=N'COLUMN',@level2name=N'operate_type'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'操作用户账号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_log', @level2type=N'COLUMN',@level2name=N'userid'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'操作用户名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_log', @level2type=N'COLUMN',@level2name=N'username'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'IP' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_log', @level2type=N'COLUMN',@level2name=N'ip'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'请求java方法' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_log', @level2type=N'COLUMN',@level2name=N'method'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'请求路径' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_log', @level2type=N'COLUMN',@level2name=N'request_url'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'请求参数' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_log', @level2type=N'COLUMN',@level2name=N'request_param'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'请求类型' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_log', @level2type=N'COLUMN',@level2name=N'request_type'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'耗时' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_log', @level2type=N'COLUMN',@level2name=N'cost_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_log', @level2type=N'COLUMN',@level2name=N'create_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_log', @level2type=N'COLUMN',@level2name=N'create_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_log', @level2type=N'COLUMN',@level2name=N'update_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_log', @level2type=N'COLUMN',@level2name=N'update_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'系统日志表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_log'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[sys_dict_item](
+ [id] [nvarchar](32) NOT NULL,
+ [dict_id] [nvarchar](32) NULL,
+ [item_text] [nvarchar](100) NULL,
+ [item_value] [nvarchar](100) NULL,
+ [description] [nvarchar](255) NULL,
+ [sort_order] [int] NULL,
+ [status] [int] NULL,
+ [create_by] [nvarchar](32) NULL,
+ [create_time] [datetime2](7) NULL,
+ [update_by] [nvarchar](32) NULL,
+ [update_time] [datetime2](7) NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_table_dict_id] ON [dbo].[sys_dict_item]
+(
+ [dict_id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_table_dict_status] ON [dbo].[sys_dict_item]
+(
+ [status] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_table_sort_order] ON [dbo].[sys_dict_item]
+(
+ [sort_order] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'字典id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_dict_item', @level2type=N'COLUMN',@level2name=N'dict_id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'字典项文本' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_dict_item', @level2type=N'COLUMN',@level2name=N'item_text'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'字典项值' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_dict_item', @level2type=N'COLUMN',@level2name=N'item_value'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'描述' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_dict_item', @level2type=N'COLUMN',@level2name=N'description'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'排序' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_dict_item', @level2type=N'COLUMN',@level2name=N'sort_order'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'状态（1启用 0不启用）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_dict_item', @level2type=N'COLUMN',@level2name=N'status'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[sys_dict](
+ [id] [nvarchar](32) NOT NULL,
+ [dict_name] [nvarchar](100) NULL,
+ [dict_code] [nvarchar](100) NULL,
+ [description] [nvarchar](255) NULL,
+ [del_flag] [int] NULL,
+ [create_by] [nvarchar](32) NULL,
+ [create_time] [datetime2](7) NULL,
+ [update_by] [nvarchar](32) NULL,
+ [update_time] [datetime2](7) NULL,
+ [type] [int] NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+CREATE UNIQUE NONCLUSTERED INDEX [indextable_dict_code] ON [dbo].[sys_dict]
+(
+ [dict_code] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'字典名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_dict', @level2type=N'COLUMN',@level2name=N'dict_name'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'字典编码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_dict', @level2type=N'COLUMN',@level2name=N'dict_code'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'描述' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_dict', @level2type=N'COLUMN',@level2name=N'description'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'删除状态' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_dict', @level2type=N'COLUMN',@level2name=N'del_flag'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_dict', @level2type=N'COLUMN',@level2name=N'create_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_dict', @level2type=N'COLUMN',@level2name=N'create_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_dict', @level2type=N'COLUMN',@level2name=N'update_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_dict', @level2type=N'COLUMN',@level2name=N'update_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'字典类型0为string,1为number' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_dict', @level2type=N'COLUMN',@level2name=N'type'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[sys_depart](
+ [id] [nvarchar](32) NOT NULL,
+ [parent_id] [nvarchar](32) NULL,
+ [depart_name] [nvarchar](100) NOT NULL,
+ [depart_name_en] [nvarchar](500) NULL,
+ [depart_name_abbr] [nvarchar](500) NULL,
+ [depart_order] [int] NULL,
+ [description] [nvarchar](max) NULL,
+ [org_type] [nvarchar](10) NULL,
+ [org_code] [nvarchar](64) NOT NULL,
+ [mobile] [nvarchar](32) NULL,
+ [fax] [nvarchar](32) NULL,
+ [address] [nvarchar](100) NULL,
+ [memo] [nvarchar](500) NULL,
+ [status] [nvarchar](1) NULL,
+ [del_flag] [nvarchar](1) NULL,
+ [create_by] [nvarchar](32) NULL,
+ [create_time] [datetime2](7) NULL,
+ [update_by] [nvarchar](32) NULL,
+ [update_time] [datetime2](7) NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_depart_depart_order] ON [dbo].[sys_depart]
+(
+ [depart_order] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_depart_org_code] ON [dbo].[sys_depart]
+(
+ [org_code] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [index_depart_parent_id] ON [dbo].[sys_depart]
+(
+ [parent_id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_depart', @level2type=N'COLUMN',@level2name=N'id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'父机构ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_depart', @level2type=N'COLUMN',@level2name=N'parent_id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'机构/部门名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_depart', @level2type=N'COLUMN',@level2name=N'depart_name'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'英文名' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_depart', @level2type=N'COLUMN',@level2name=N'depart_name_en'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'缩写' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_depart', @level2type=N'COLUMN',@level2name=N'depart_name_abbr'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'排序' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_depart', @level2type=N'COLUMN',@level2name=N'depart_order'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'描述' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_depart', @level2type=N'COLUMN',@level2name=N'description'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'机构类型 1一级部门 2子部门' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_depart', @level2type=N'COLUMN',@level2name=N'org_type'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'机构编码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_depart', @level2type=N'COLUMN',@level2name=N'org_code'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'手机号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_depart', @level2type=N'COLUMN',@level2name=N'mobile'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'传真' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_depart', @level2type=N'COLUMN',@level2name=N'fax'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'地址' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_depart', @level2type=N'COLUMN',@level2name=N'address'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'备注' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_depart', @level2type=N'COLUMN',@level2name=N'memo'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'状态（1启用，0不启用）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_depart', @level2type=N'COLUMN',@level2name=N'status'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'删除状态（0，正常，1已删除）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_depart', @level2type=N'COLUMN',@level2name=N'del_flag'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_depart', @level2type=N'COLUMN',@level2name=N'create_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_depart', @level2type=N'COLUMN',@level2name=N'create_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_depart', @level2type=N'COLUMN',@level2name=N'update_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_depart', @level2type=N'COLUMN',@level2name=N'update_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'组织机构表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_depart'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[sys_data_log](
+ [id] [nvarchar](32) NOT NULL,
+ [create_by] [nvarchar](32) NULL,
+ [create_time] [datetime2](7) NULL,
+ [update_by] [nvarchar](32) NULL,
+ [update_time] [datetime2](7) NULL,
+ [data_table] [nvarchar](32) NULL,
+ [data_id] [nvarchar](32) NULL,
+ [data_content] [nvarchar](max) NULL,
+ [data_version] [int] NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+CREATE NONCLUSTERED INDEX [sindex] ON [dbo].[sys_data_log]
+(
+ [data_table] ASC,
+ [data_id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = ON, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_data_log', @level2type=N'COLUMN',@level2name=N'id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建人登录名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_data_log', @level2type=N'COLUMN',@level2name=N'create_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_data_log', @level2type=N'COLUMN',@level2name=N'create_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新人登录名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_data_log', @level2type=N'COLUMN',@level2name=N'update_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_data_log', @level2type=N'COLUMN',@level2name=N'update_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'表名' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_data_log', @level2type=N'COLUMN',@level2name=N'data_table'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'数据ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_data_log', @level2type=N'COLUMN',@level2name=N'data_id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'数据内容' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_data_log', @level2type=N'COLUMN',@level2name=N'data_content'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'版本号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_data_log', @level2type=N'COLUMN',@level2name=N'data_version'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[sys_announcement_send](
+ [id] [nvarchar](32) NULL,
+ [annt_id] [nvarchar](32) NULL,
+ [user_id] [nvarchar](32) NULL,
+ [read_flag] [nvarchar](10) NULL,
+ [read_time] [datetime2](7) NULL,
+ [create_by] [nvarchar](32) NULL,
+ [create_time] [datetime2](7) NULL,
+ [update_by] [nvarchar](32) NULL,
+ [update_time] [datetime2](7) NULL
+) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'通告ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement_send', @level2type=N'COLUMN',@level2name=N'annt_id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'用户id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement_send', @level2type=N'COLUMN',@level2name=N'user_id'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'阅读状态（0未读，1已读）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement_send', @level2type=N'COLUMN',@level2name=N'read_flag'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'阅读时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement_send', @level2type=N'COLUMN',@level2name=N'read_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement_send', @level2type=N'COLUMN',@level2name=N'create_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement_send', @level2type=N'COLUMN',@level2name=N'create_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement_send', @level2type=N'COLUMN',@level2name=N'update_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement_send', @level2type=N'COLUMN',@level2name=N'update_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'用户通告阅读标记表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement_send'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[sys_announcement](
+ [id] [nvarchar](32) NOT NULL,
+ [titile] [nvarchar](100) NULL,
+ [msg_content] [nvarchar](max) NULL,
+ [start_time] [datetime2](7) NULL,
+ [end_time] [datetime2](7) NULL,
+ [sender] [nvarchar](100) NULL,
+ [priority] [nvarchar](255) NULL,
+ [msg_category] [nvarchar](10) NOT NULL,
+ [msg_type] [nvarchar](10) NULL,
+ [send_status] [nvarchar](10) NULL,
+ [send_time] [datetime2](7) NULL,
+ [cancel_time] [datetime2](7) NULL,
+ [del_flag] [nvarchar](1) NULL,
+ [create_by] [nvarchar](32) NULL,
+ [create_time] [datetime2](7) NULL,
+ [update_by] [nvarchar](32) NULL,
+ [update_time] [datetime2](7) NULL,
+ [user_ids] [nvarchar](max) NULL,
+PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'标题' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement', @level2type=N'COLUMN',@level2name=N'titile'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'内容' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement', @level2type=N'COLUMN',@level2name=N'msg_content'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'开始时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement', @level2type=N'COLUMN',@level2name=N'start_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'结束时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement', @level2type=N'COLUMN',@level2name=N'end_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'发布人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement', @level2type=N'COLUMN',@level2name=N'sender'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'优先级（L低，M中，H高）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement', @level2type=N'COLUMN',@level2name=N'priority'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'消息类型1:通知公告2:系统消息' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement', @level2type=N'COLUMN',@level2name=N'msg_category'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'通告对象类型（USER:指定用户，ALL:全体用户）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement', @level2type=N'COLUMN',@level2name=N'msg_type'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'发布状态（0未发布，1已发布，2已撤销）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement', @level2type=N'COLUMN',@level2name=N'send_status'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'发布时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement', @level2type=N'COLUMN',@level2name=N'send_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'撤销时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement', @level2type=N'COLUMN',@level2name=N'cancel_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'删除状态（0，正常，1已删除）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement', @level2type=N'COLUMN',@level2name=N'del_flag'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement', @level2type=N'COLUMN',@level2name=N'create_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement', @level2type=N'COLUMN',@level2name=N'create_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement', @level2type=N'COLUMN',@level2name=N'update_by'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'更新时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement', @level2type=N'COLUMN',@level2name=N'update_time'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'指定用户' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement', @level2type=N'COLUMN',@level2name=N'user_ids'
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'系统通告表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'sys_announcement'
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+SET ANSI_PADDING ON
+GO
+CREATE TABLE [dbo].[QRTZ_TRIGGERS](
+ [SCHED_NAME] [varchar](120) NOT NULL,
+ [TRIGGER_NAME] [varchar](200) NOT NULL,
+ [TRIGGER_GROUP] [varchar](200) NOT NULL,
+ [JOB_NAME] [varchar](200) NOT NULL,
+ [JOB_GROUP] [varchar](200) NOT NULL,
+ [DESCRIPTION] [varchar](250) NULL,
+ [NEXT_FIRE_TIME] [bigint] NULL,
+ [PREV_FIRE_TIME] [bigint] NULL,
+ [PRIORITY] [int] NULL,
+ [TRIGGER_STATE] [varchar](16) NOT NULL,
+ [TRIGGER_TYPE] [varchar](8) NOT NULL,
+ [START_TIME] [bigint] NOT NULL,
+ [END_TIME] [bigint] NULL,
+ [CALENDAR_NAME] [varchar](200) NULL,
+ [MISFIRE_INSTR] [smallint] NULL,
+ [JOB_DATA] [image] NULL,
+ CONSTRAINT [PK_QRTZ_TRIGGERS] PRIMARY KEY CLUSTERED
+(
+ [SCHED_NAME] ASC,
+ [TRIGGER_NAME] ASC,
+ [TRIGGER_GROUP] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+SET ANSI_PADDING OFF
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+SET ANSI_PADDING ON
+GO
+CREATE TABLE [dbo].[QRTZ_BLOB_TRIGGERS](
+ [SCHED_NAME] [varchar](120) NOT NULL,
+ [TRIGGER_NAME] [varchar](200) NOT NULL,
+ [TRIGGER_GROUP] [varchar](200) NOT NULL,
+ [BLOB_DATA] [image] NULL
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+SET ANSI_PADDING OFF
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+SET ANSI_PADDING ON
+GO
+CREATE TABLE [dbo].[QRTZ_CRON_TRIGGERS](
+ [SCHED_NAME] [varchar](120) NOT NULL,
+ [TRIGGER_NAME] [varchar](200) NOT NULL,
+ [TRIGGER_GROUP] [varchar](200) NOT NULL,
+ [CRON_EXPRESSION] [varchar](120) NOT NULL,
+ [TIME_ZONE_ID] [varchar](80) NULL,
+ CONSTRAINT [PK_QRTZ_CRON_TRIGGERS] PRIMARY KEY CLUSTERED
+(
+ [SCHED_NAME] ASC,
+ [TRIGGER_NAME] ASC,
+ [TRIGGER_GROUP] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+SET ANSI_PADDING OFF
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+SET ANSI_PADDING ON
+GO
+CREATE TABLE [dbo].[QRTZ_SIMPROP_TRIGGERS](
+ [SCHED_NAME] [varchar](120) NOT NULL,
+ [TRIGGER_NAME] [varchar](200) NOT NULL,
+ [TRIGGER_GROUP] [varchar](200) NOT NULL,
+ [STR_PROP_1] [varchar](512) NULL,
+ [STR_PROP_2] [varchar](512) NULL,
+ [STR_PROP_3] [varchar](512) NULL,
+ [INT_PROP_1] [int] NULL,
+ [INT_PROP_2] [int] NULL,
+ [LONG_PROP_1] [bigint] NULL,
+ [LONG_PROP_2] [bigint] NULL,
+ [DEC_PROP_1] [numeric](13, 4) NULL,
+ [DEC_PROP_2] [numeric](13, 4) NULL,
+ [BOOL_PROP_1] [varchar](1) NULL,
+ [BOOL_PROP_2] [varchar](1) NULL,
+ CONSTRAINT [PK_QRTZ_SIMPROP_TRIGGERS] PRIMARY KEY CLUSTERED
+(
+ [SCHED_NAME] ASC,
+ [TRIGGER_NAME] ASC,
+ [TRIGGER_GROUP] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+SET ANSI_PADDING OFF
+GO
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+SET ANSI_PADDING ON
+GO
+CREATE TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS](
+ [SCHED_NAME] [varchar](120) NOT NULL,
+ [TRIGGER_NAME] [varchar](200) NOT NULL,
+ [TRIGGER_GROUP] [varchar](200) NOT NULL,
+ [REPEAT_COUNT] [bigint] NOT NULL,
+ [REPEAT_INTERVAL] [bigint] NOT NULL,
+ [TIMES_TRIGGERED] [bigint] NOT NULL,
+ CONSTRAINT [PK_QRTZ_SIMPLE_TRIGGERS] PRIMARY KEY CLUSTERED
+(
+ [SCHED_NAME] ASC,
+ [TRIGGER_NAME] ASC,
+ [TRIGGER_GROUP] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+SET ANSI_PADDING OFF
+GO
+ALTER TABLE [dbo].[QRTZ_TRIGGERS] WITH CHECK ADD CONSTRAINT [FK_QRTZ_TRIGGERS_QRTZ_JOB_DETAILS] FOREIGN KEY([SCHED_NAME], [JOB_NAME], [JOB_GROUP])
+REFERENCES [dbo].[QRTZ_JOB_DETAILS] ([SCHED_NAME], [JOB_NAME], [JOB_GROUP])
+GO
+ALTER TABLE [dbo].[QRTZ_TRIGGERS] CHECK CONSTRAINT [FK_QRTZ_TRIGGERS_QRTZ_JOB_DETAILS]
+GO
+ALTER TABLE [dbo].[QRTZ_BLOB_TRIGGERS] WITH CHECK ADD CONSTRAINT [FK_QRTZ_BLOB_TRIGGERS_QRTZ_TRIGGERS] FOREIGN KEY([SCHED_NAME], [TRIGGER_NAME], [TRIGGER_GROUP])
+REFERENCES [dbo].[QRTZ_TRIGGERS] ([SCHED_NAME], [TRIGGER_NAME], [TRIGGER_GROUP])
+ON DELETE CASCADE
+GO
+ALTER TABLE [dbo].[QRTZ_BLOB_TRIGGERS] CHECK CONSTRAINT [FK_QRTZ_BLOB_TRIGGERS_QRTZ_TRIGGERS]
+GO
+ALTER TABLE [dbo].[QRTZ_CRON_TRIGGERS] WITH CHECK ADD CONSTRAINT [FK_QRTZ_CRON_TRIGGERS_QRTZ_TRIGGERS] FOREIGN KEY([SCHED_NAME], [TRIGGER_NAME], [TRIGGER_GROUP])
+REFERENCES [dbo].[QRTZ_TRIGGERS] ([SCHED_NAME], [TRIGGER_NAME], [TRIGGER_GROUP])
+ON DELETE CASCADE
+GO
+ALTER TABLE [dbo].[QRTZ_CRON_TRIGGERS] CHECK CONSTRAINT [FK_QRTZ_CRON_TRIGGERS_QRTZ_TRIGGERS]
+GO
+ALTER TABLE [dbo].[QRTZ_SIMPROP_TRIGGERS] WITH CHECK ADD CONSTRAINT [FK_QRTZ_SIMPROP_TRIGGERS_QRTZ_TRIGGERS] FOREIGN KEY([SCHED_NAME], [TRIGGER_NAME], [TRIGGER_GROUP])
+REFERENCES [dbo].[QRTZ_TRIGGERS] ([SCHED_NAME], [TRIGGER_NAME], [TRIGGER_GROUP])
+ON DELETE CASCADE
+GO
+ALTER TABLE [dbo].[QRTZ_SIMPROP_TRIGGERS] CHECK CONSTRAINT [FK_QRTZ_SIMPROP_TRIGGERS_QRTZ_TRIGGERS]
+GO
+ALTER TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS] WITH CHECK ADD CONSTRAINT [FK_QRTZ_SIMPLE_TRIGGERS_QRTZ_TRIGGERS] FOREIGN KEY([SCHED_NAME], [TRIGGER_NAME], [TRIGGER_GROUP])
+REFERENCES [dbo].[QRTZ_TRIGGERS] ([SCHED_NAME], [TRIGGER_NAME], [TRIGGER_GROUP])
+ON DELETE CASCADE
+GO
+ALTER TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS] CHECK CONSTRAINT [FK_QRTZ_SIMPLE_TRIGGERS_QRTZ_TRIGGERS]
+GO
+
+
+
+
+
+INSERT [dbo].[jeecg_project_nature_income] ([id], [nature], [insurance_fee], [risk_consulting_fee], [evaluation_fee], [insurance_evaluation_fee], [bidding_consulting_fee], [interol_consulting_fee]) VALUES (1, N'市场化-电商业务', CAST(4865.41 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_project_nature_income] ([id], [nature], [insurance_fee], [risk_consulting_fee], [evaluation_fee], [insurance_evaluation_fee], [bidding_consulting_fee], [interol_consulting_fee]) VALUES (2, N'统筹型', CAST(35767081.88 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_project_nature_income] ([id], [nature], [insurance_fee], [risk_consulting_fee], [evaluation_fee], [insurance_evaluation_fee], [bidding_consulting_fee], [interol_consulting_fee]) VALUES (3, N'市场化-非股东', CAST(1487045.35 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_project_nature_income] ([id], [nature], [insurance_fee], [risk_consulting_fee], [evaluation_fee], [insurance_evaluation_fee], [bidding_consulting_fee], [interol_consulting_fee]) VALUES (4, N'市场化-参控股', CAST(382690.56 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_project_nature_income] ([id], [nature], [insurance_fee], [risk_consulting_fee], [evaluation_fee], [insurance_evaluation_fee], [bidding_consulting_fee], [interol_consulting_fee]) VALUES (5, N'市场化-员工福利', CAST(256684.91 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_project_nature_income] ([id], [nature], [insurance_fee], [risk_consulting_fee], [evaluation_fee], [insurance_evaluation_fee], [bidding_consulting_fee], [interol_consulting_fee]) VALUES (6, N'市场化-再保险', CAST(563451.03 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_project_nature_income] ([id], [nature], [insurance_fee], [risk_consulting_fee], [evaluation_fee], [insurance_evaluation_fee], [bidding_consulting_fee], [interol_consulting_fee]) VALUES (7, N'市场化-海外业务', CAST(760576.25 AS Decimal(18, 2)), CAST(770458.75 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_project_nature_income] ([id], [nature], [insurance_fee], [risk_consulting_fee], [evaluation_fee], [insurance_evaluation_fee], [bidding_consulting_fee], [interol_consulting_fee]) VALUES (8, N'市场化-风险咨询', CAST(910183.93 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(226415.09 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0f0e3a40a215958f807eea08a6e1ac0a', N'88', NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0fa3bd0bbcf53650c0bb3c0cac6d8cb7', N'ffff', CAST(0x070000000000563F0B AS DateTime2), N'eb13ab35d2946a2b0cfe3452bca1e73f', N'admin', CAST(0x078088D5418A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'14221afb4f5f749c1deef26ac56fdac3', N'33', CAST(0x070000000000663F0B AS DateTime2), N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15538561502730', N'222', NULL, N'0d4a2e67b538ee1bc881e5ed34f670f0', N'jeecg-boot', CAST(0x078021A1DE9C7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15538561526461', N'2244', CAST(0x0700000000007A3F0B AS DateTime2), N'0d4a2e67b538ee1bc881e5ed34f670f0', N'jeecg-boot', CAST(0x078021A1DE9C7A3F0B AS DateTime2), N'admin', CAST(0x07005B1BF19C7A3F0B AS DateTime2))
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15541168478913', N'hhhhh', NULL, N'f71f7f8930b5b6b1703d9948d189982b', N'admin', CAST(0x07805C807AA07D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15541169272810', N'22211', CAST(0x0700B2489BA07D3F0B AS DateTime2), N'f618a85b17e2c4dd58d268220c8dd9a1', N'admin', CAST(0x07809160ABA07D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15541169302331', N'333311', CAST(0x0700B2489BA07D3F0B AS DateTime2), N'f618a85b17e2c4dd58d268220c8dd9a1', N'admin', CAST(0x07809160ABA07D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15541169713092', N'333311', CAST(0x0780CF749FA07D3F0B AS DateTime2), N'f618a85b17e2c4dd58d268220c8dd9a1', N'admin', CAST(0x07809160ABA07D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15542604293170', N'c', NULL, N'fe81ee5d19bbf9eef2066d4f29dfbe0f', N'jeecg-boot', CAST(0x078065AF4A5C7F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15542604374431', N'd', NULL, N'fe81ee5d19bbf9eef2066d4f29dfbe0f', N'jeecg-boot', CAST(0x078065AF4A5C7F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15543695362380', N'ccc2', NULL, N'5d6e2b9e44037526270b6206196f6689', N'admin', CAST(0x07009E603D91803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15543695381291', N'cccc1', NULL, N'5d6e2b9e44037526270b6206196f6689', N'admin', CAST(0x07009E603D91803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15543695740352', N'dddd', NULL, N'5d6e2b9e44037526270b6206196f6689', N'admin', CAST(0x07009E603D91803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'18905bc89ee3851805aab38ed3b505ec', N'44', NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1f809cbd26f4e574697e1c10de575d72', N'A100', NULL, N'e73434dad84ebdce2d4e0c2a2f06d8ea', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'21051adb51529bdaa8798b5a3dd7f7f7', N'C10029', CAST(0x070000000000553F0B AS DateTime2), N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'269576e766b917f8b6509a2bb0c4d4bd', N'A100', NULL, N'163e2efcbc6d7d54eb3f8a137da8a75a', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2d473ffc79e5b38a17919e15f8b7078e', N'66', CAST(0x0700000000007A3F0B AS DateTime2), N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3655b66fca5fef9c6aac6d70182ffda2', N'AA123', CAST(0x0700000000007D3F0B AS DateTime2), N'd908bfee3377e946e59220c4a4eb414a', N'admin', CAST(0x0780A5A8E3897D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'365d5919155473ade45840fd626c51a9', N'dddd', CAST(0x0780CA650D92803F0B AS DateTime2), N'8ab1186410a65118c4d746eb085d3bed', N'admin', CAST(0x078024C80F92803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4889a782e78706ab4306a925cfb163a5', N'C34', CAST(0x0700000000007D3F0B AS DateTime2), N'd908bfee3377e946e59220c4a4eb414a', N'admin', CAST(0x070012F9FF8A7D3F0B AS DateTime2), N'admin', CAST(0x07802F25048B7D3F0B AS DateTime2))
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'48d385796382cf87fa4bdf13b42d9a28', N'导入A100', NULL, N'3a867ebf2cebce9bae3f79676d8d86f3', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'541faed56efbeb4be9df581bd8264d3a', N'88', NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'57a27a7dfd6a48e7d981f300c181b355', N'6', CAST(0x0700000000007B3F0B AS DateTime2), N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5ce4dc439c874266e42e6c0ff8dc8b5c', N'导入A100', NULL, N'a2cce75872cc8fcc47f78de9ffd378c2', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5f16e6a64ab22a161bd94cc205f2c662', N'222', CAST(0x070000000000583F0B AS DateTime2), N'b190737bd04cca8360e6f87c9ef9ec4e', N'admin', CAST(0x0700A601468A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'645a06152998a576c051474157625c41', N'88', CAST(0x0780F7960E92803F0B AS DateTime2), N'8ab1186410a65118c4d746eb085d3bed', N'admin', CAST(0x078024C80F92803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6e3562f2571ea9e96b2d24497b5f5eec', N'55', CAST(0x070000000000743F0B AS DateTime2), N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8fd2b389151568738b1cc4d8e27a6110', N'导入A100', NULL, N'a2cce75872cc8fcc47f78de9ffd378c2', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'93f1a84053e546f59137432ff5564cac', N'55', NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'969ddc5d2e198d50903686917f996470', N'A10029', CAST(0x0700000000007D3F0B AS DateTime2), N'f71f7f8930b5b6b1703d9948d189982b', N'admin', CAST(0x07805C807AA07D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'96e7303a8d22a5c384e08d7bcf7ac2bf', N'A100', NULL, N'e73434dad84ebdce2d4e0c2a2f06d8ea', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9e8a3336f6c63f558f2b68ce2e1e666e', N'dddd', NULL, N'9a57c850e4f68cf94ef7d8585dbaf7e6', N'admin', CAST(0x078071B5CF92803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a28db02c810c65660015095cb81ed434', N'A100', NULL, N'f8889aaef6d1bccffd98d2889c0aafb5', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b217bb0e4ec6a45b6cbf6db880060c0f', N'A100', NULL, N'6a719071a29927a14f19482f8693d69a', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ba708df70bb2652ed1051a394cfa0bb3', N'333', NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'beabbfcb195d39bedeeafe8318794562', N'A1345', CAST(0x0700000000007D3F0B AS DateTime2), N'd908bfee3377e946e59220c4a4eb414a', N'admin', CAST(0x07003C41E4897D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'bf450223cb505f89078a311ef7b6ed16', N'777', CAST(0x0700000000007B3F0B AS DateTime2), N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c06165b6603e3e1335db187b3c841eef', N'fff', NULL, N'9a57c850e4f68cf94ef7d8585dbaf7e6', N'admin', CAST(0x0700357FD192803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c113136abc26ace3a6da4e41d7dc1c7e', N'44', CAST(0x0700000000006C3F0B AS DateTime2), N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c1abdc2e30aeb25de13ad6ee3488ac24', N'77', CAST(0x070000000000733F0B AS DateTime2), N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c23751a7deb44f553ce50a94948c042a', N'33', CAST(0x070000000000663F0B AS DateTime2), N'8ab1186410a65118c4d746eb085d3bed', N'admin', CAST(0x078024C80F92803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c64547666b634b3d6a0feedcf05f25ce', N'C10019', CAST(0x0700000000007D3F0B AS DateTime2), N'f71f7f8930b5b6b1703d9948d189982b', N'admin', CAST(0x07805C807AA07D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c8b8d3217f37da78dddf711a1f7da485', N'A100', NULL, N'163e2efcbc6d7d54eb3f8a137da8a75a', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'cab691c1c1ff7a6dfd7248421917fd3c', N'A100', NULL, N'f8889aaef6d1bccffd98d2889c0aafb5', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'cca10a9a850b456d9b72be87da7b0883', N'77', NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd2fbba11f4814d9b1d3cb1a3f342234a', N'C10019', CAST(0x070000000000533F0B AS DateTime2), N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd746c1ed956a562e97eef9c6faf94efa', N'111', CAST(0x070000000000423F0B AS DateTime2), N'b190737bd04cca8360e6f87c9ef9ec4e', N'admin', CAST(0x0700A601468A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'dbdb07a16826808e4276e84b2aa4731a', N'导入A100', NULL, N'3a867ebf2cebce9bae3f79676d8d86f3', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e7075639c37513afc0bbc4bf7b5d98b9', N'88', NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'fa759dc104d0371f8aa28665b323dab6', N'888', NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_ticket] ([id], [ticket_code], [tickect_date], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ff197da84a9a3af53878eddc91afbb2e', N'33', NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_main] ([id], [order_code], [ctype], [order_date], [order_money], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'163e2efcbc6d7d54eb3f8a137da8a75a', N'B100', NULL, NULL, 3000, NULL, N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_main] ([id], [order_code], [ctype], [order_date], [order_money], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3a867ebf2cebce9bae3f79676d8d86f3', N'导入B100', N'2222', NULL, 3000, NULL, N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), N'admin', CAST(0x07801E7D6993843F0B AS DateTime2))
+INSERT [dbo].[jeecg_order_main] ([id], [order_code], [ctype], [order_date], [order_money], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4bca3ea6881d39dbf67ef1e42c649766', N'1212', NULL, NULL, NULL, NULL, N'admin', CAST(0x078061419A5B7F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_main] ([id], [order_code], [ctype], [order_date], [order_money], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4cba137333127e8e31df7ad168cc3732', N'青岛订单A0001', N'2', CAST(0x07807D8FA85B7F3F0B AS DateTime2), NULL, NULL, N'admin', CAST(0x0780D7F1AA5B7F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_main] ([id], [order_code], [ctype], [order_date], [order_money], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'54e739bef5b67569c963c38da52581ec', N'NC911', N'1', CAST(0x07807F8BA853533F0B AS DateTime2), 40, NULL, N'admin', CAST(0x07802529A653533F0B AS DateTime2), N'admin', CAST(0x07803350AD53533F0B AS DateTime2))
+INSERT [dbo].[jeecg_order_main] ([id], [order_code], [ctype], [order_date], [order_money], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5d6e2b9e44037526270b6206196f6689', N'N333', NULL, CAST(0x078091172C91803F0B AS DateTime2), NULL, N'聪明00', N'admin', CAST(0x07009E603D91803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_main] ([id], [order_code], [ctype], [order_date], [order_money], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6a719071a29927a14f19482f8693d69a', N'c100', NULL, NULL, 5000, NULL, N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_main] ([id], [order_code], [ctype], [order_date], [order_money], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8ab1186410a65118c4d746eb085d3bed', N'导入400', N'1', CAST(0x07807F8BA853533F0B AS DateTime2), 40, NULL, N'admin', CAST(0x07802529A653533F0B AS DateTime2), N'admin', CAST(0x07803350AD53533F0B AS DateTime2))
+INSERT [dbo].[jeecg_order_main] ([id], [order_code], [ctype], [order_date], [order_money], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9a57c850e4f68cf94ef7d8585dbaf7e6', N'halou100dd', NULL, CAST(0x0700ECFFC192803F0B AS DateTime2), NULL, NULL, N'admin', CAST(0x0780365DC792803F0B AS DateTime2), N'admin', CAST(0x07001675D792803F0B AS DateTime2))
+INSERT [dbo].[jeecg_order_main] ([id], [order_code], [ctype], [order_date], [order_money], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a2cce75872cc8fcc47f78de9ffd378c2', N'导入B100', NULL, NULL, 3000, NULL, N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_main] ([id], [order_code], [ctype], [order_date], [order_money], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b190737bd04cca8360e6f87c9ef9ec4e', N'B0018888', N'1', NULL, NULL, NULL, N'admin', CAST(0x078006D8639C503F0B AS DateTime2), N'admin', CAST(0x0780BA9C689C503F0B AS DateTime2))
+INSERT [dbo].[jeecg_order_main] ([id], [order_code], [ctype], [order_date], [order_money], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd908bfee3377e946e59220c4a4eb414a', N'SSSS001', NULL, NULL, 599, NULL, N'admin', CAST(0x07809D18BE837D3F0B AS DateTime2), N'admin', CAST(0x07002E1ADD897D3F0B AS DateTime2))
+INSERT [dbo].[jeecg_order_main] ([id], [order_code], [ctype], [order_date], [order_money], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e73434dad84ebdce2d4e0c2a2f06d8ea', N'导入200', NULL, NULL, 3000, NULL, N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_main] ([id], [order_code], [ctype], [order_date], [order_money], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'eb13ab35d2946a2b0cfe3452bca1e73f', N'BJ9980', N'1', NULL, 90, NULL, N'admin', CAST(0x070071899E93513F0B AS DateTime2), N'admin', CAST(0x0700E4AAF494513F0B AS DateTime2))
+INSERT [dbo].[jeecg_order_main] ([id], [order_code], [ctype], [order_date], [order_money], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f618a85b17e2c4dd58d268220c8dd9a1', N'N001', NULL, CAST(0x07005BA284A07D3F0B AS DateTime2), 2222, NULL, N'admin', CAST(0x0780CF749FA07D3F0B AS DateTime2), N'admin', CAST(0x07007434A7A07D3F0B AS DateTime2))
+INSERT [dbo].[jeecg_order_main] ([id], [order_code], [ctype], [order_date], [order_money], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f71f7f8930b5b6b1703d9948d189982b', N'BY911', NULL, CAST(0x0780D5EC76A0823F0B AS DateTime2), NULL, NULL, N'admin', CAST(0x070085ED248B7D3F0B AS DateTime2), N'admin', CAST(0x07000C81288B7D3F0B AS DateTime2))
+INSERT [dbo].[jeecg_order_main] ([id], [order_code], [ctype], [order_date], [order_money], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f8889aaef6d1bccffd98d2889c0aafb5', N'A100', NULL, CAST(0x070000000000D03E0B AS DateTime2), 6000, NULL, N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_main] ([id], [order_code], [ctype], [order_date], [order_money], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'fe81ee5d19bbf9eef2066d4f29dfbe0f', N'uuuu', NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078065AF4A5C7F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15538561502720', N'3333', N'1', N'', NULL, N'', N'0d4a2e67b538ee1bc881e5ed34f670f0', N'jeecg-boot', CAST(0x078021A1DE9C7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15538561512681', N'3332333', N'2', N'', NULL, N'', N'0d4a2e67b538ee1bc881e5ed34f670f0', N'jeecg-boot', CAST(0x078021A1DE9C7A3F0B AS DateTime2), N'admin', CAST(0x070020C3E89C7A3F0B AS DateTime2))
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15538561550142', N'4442', N'2', N'', NULL, N'', N'0d4a2e67b538ee1bc881e5ed34f670f0', N'jeecg-boot', CAST(0x078021A1DE9C7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15541168497342', N'444', N'', N'', N'', N'', N'f71f7f8930b5b6b1703d9948d189982b', N'admin', CAST(0x07805C807AA07D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15541168499553', N'5555', N'', N'', N'', N'', N'f71f7f8930b5b6b1703d9948d189982b', N'admin', CAST(0x07805C807AA07D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15541169272690', N'小王1', N'1', N'', N'', N'18611788525', N'f618a85b17e2c4dd58d268220c8dd9a1', N'admin', CAST(0x07809160ABA07D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15541169288141', N'效力1', N'1', N'', N'', N'18611788525', N'f618a85b17e2c4dd58d268220c8dd9a1', N'admin', CAST(0x07809160ABA07D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15541169441372', N'小红1', N'1', N'', N'', N'18611788525', N'f618a85b17e2c4dd58d268220c8dd9a1', N'admin', CAST(0x07809160ABA07D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15543695362380', N'1111', N'', N'', N'', N'', N'5d6e2b9e44037526270b6206196f6689', N'admin', CAST(0x07009E603D91803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15543695397221', N'222', N'', N'', N'', N'', N'5d6e2b9e44037526270b6206196f6689', N'admin', CAST(0x07009E603D91803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15543695398992', N'333', N'', N'', N'', N'', N'5d6e2b9e44037526270b6206196f6689', N'admin', CAST(0x07009E603D91803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'18dc5eb1068ccdfe90e358951ca1a3d6', N'dr2', N'', N'', N'', N'', N'8ab1186410a65118c4d746eb085d3bed', N'admin', CAST(0x078024C80F92803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'195d280490fe88ca1475512ddcaf2af9', N'12', NULL, NULL, NULL, NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'217a2bf83709775d2cd85bf598392327', N'2', NULL, NULL, NULL, NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'22bc052ae53ed09913b946abba93fa89', N'1', NULL, NULL, NULL, NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'23bafeae88126c3bf3322a29a04f0d5e', N'x秦风', NULL, NULL, NULL, NULL, N'163e2efcbc6d7d54eb3f8a137da8a75a', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'25c4a552c6843f36fad6303bfa99a382', N'1', NULL, NULL, NULL, NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2d32144e2bee63264f3f16215c258381', N'33333', N'2', NULL, NULL, NULL, N'd908bfee3377e946e59220c4a4eb414a', N'admin', CAST(0x0780A5A8E3897D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2d43170d6327f941bd1a017999495e25', N'1', NULL, NULL, NULL, NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2e5f62a8b6e0a0ce19b52a6feae23d48', N'3', NULL, NULL, NULL, NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'313abf99558ac5f13ecca3b87e562ad1', N'scott', N'2', NULL, NULL, NULL, N'b190737bd04cca8360e6f87c9ef9ec4e', N'admin', CAST(0x0700A601468A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'34a1c5cf6cee360ed610ed0bed70e0f9', N'导入秦风', NULL, NULL, NULL, NULL, N'a2cce75872cc8fcc47f78de9ffd378c2', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3c87400f8109b4cf43c5598f0d40e34d', N'2', NULL, NULL, NULL, NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'40964bcbbecb38e5ac15e6d08cf3cd43', N'233', NULL, NULL, NULL, NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'41e3dee0b0b6e6530eccb7fbb22fd7a3', N'4555', N'1', N'370285198602058823', NULL, N'18611788674', N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4808ae8344c7679a4a2f461db5dc3a70', N'44', N'1', N'370285198602058823', NULL, N'18611788674', N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4b6cef12f195fad94d57279b2241770d', N'dr12', N'', N'', N'', N'', N'8ab1186410a65118c4d746eb085d3bed', N'admin', CAST(0x078024C80F92803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'524e695283f8e8c256cc24f39d6d8542', N'小王', N'2', N'370285198604033222', NULL, N'18611788674', N'eb13ab35d2946a2b0cfe3452bca1e73f', N'admin', CAST(0x078088D5418A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'57c2a8367db34016114cbc9fa368dba0', N'2', NULL, NULL, NULL, NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5df36a1608b8c7ac99ad9bc408fe54bf', N'4', NULL, NULL, NULL, NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6b694e9ba54bb289ae9cc499e40031e7', N'x秦风', N'1', NULL, NULL, NULL, N'b190737bd04cca8360e6f87c9ef9ec4e', N'admin', CAST(0x0700A601468A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6c6fd2716c2dcd044ed03c2c95d261f8', N'李四', N'2', N'370285198602058833', N'', N'18611788676', N'f71f7f8930b5b6b1703d9948d189982b', N'admin', CAST(0x07805C807AA07D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'742d008214dee0afff2145555692973e', N'秦风', N'1', N'370285198602058822', NULL, N'18611788676', N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7469c3e5d371767ff90a739d297689b5', N'导入秦风', N'2', NULL, NULL, NULL, N'3a867ebf2cebce9bae3f79676d8d86f3', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), N'admin', CAST(0x0700A7EE6293843F0B AS DateTime2))
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7a96e2c7b24847d4a29940dbc0eda6e5', N'drscott', NULL, NULL, NULL, NULL, N'e73434dad84ebdce2d4e0c2a2f06d8ea', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7f5a40818e225ee18bda6da7932ac5f9', N'2', NULL, NULL, NULL, NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8011575abfd7c8085e71ff66df1124b9', N'1', NULL, NULL, NULL, NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8404f31d7196221a573c9bd6c8f15003', N'小张', N'1', N'370285198602058211', NULL, N'18611788676', N'eb13ab35d2946a2b0cfe3452bca1e73f', N'admin', CAST(0x078088D5418A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'859020e10a2f721f201cdbff78cf7b9f', N'scott', NULL, NULL, NULL, NULL, N'163e2efcbc6d7d54eb3f8a137da8a75a', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8cc3c4d26e3060975df3a2adb781eeb4', N'dr33', NULL, NULL, NULL, NULL, N'b2feb454e43c46b2038768899061e464', N'jeecg-boot', CAST(0x07807CF3B991803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8d1725c23a6a50685ff0dedfd437030d', N'4', NULL, NULL, NULL, NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'933cae3a79f60a93922d59aace5346ce', N'小王', NULL, N'370285198604033222', NULL, N'18611788674', N'6a719071a29927a14f19482f8693d69a', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9bdb5400b709ba4eaf3444de475880d7', N'dr22', NULL, NULL, NULL, NULL, N'22c17790dcd04b296c4a2a089f71895f', N'jeecg-boot', CAST(0x07807CF3B991803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9f87677f70e5f864679314389443a3eb', N'33', N'2', N'370285198602058823', NULL, N'18611788674', N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a2c2b7101f75c02deb328ba777137897', N'44', N'2', N'370285198602058823', NULL, N'18611788674', N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ab4d002dc552c326147e318c87d3bed4', N'ddddd', N'1', N'370285198604033222', NULL, N'18611755848', N'9a57c850e4f68cf94ef7d8585dbaf7e6', N'admin', CAST(0x0780BDF0CA92803F0B AS DateTime2), N'admin', CAST(0x078060D2DC92803F0B AS DateTime2))
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ad116f722a438e5f23095a0b5fcc8e89', N'dr秦风', NULL, NULL, NULL, NULL, N'e73434dad84ebdce2d4e0c2a2f06d8ea', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b1ba147b75f5eaa48212586097fc3fd1', N'2', NULL, NULL, NULL, NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b43bf432c251f0e6b206e403b8ec29bc', N'lisi', NULL, NULL, NULL, NULL, N'f8889aaef6d1bccffd98d2889c0aafb5', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'bcdd300a7d44c45a66bdaac14903c801', N'33', NULL, NULL, NULL, NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'beb983293e47e2dc1a9b3d649aa3eb34', N'ddd3', NULL, NULL, NULL, NULL, N'd908bfee3377e946e59220c4a4eb414a', N'admin', CAST(0x0780A5A8E3897D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c219808196406f1b8c7f1062589de4b5', N'44', N'1', N'370285198602058823', NULL, N'18611788674', N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c8ed061d4b27c0c7a64e100f2b1c8ab5', N'张经理', N'2', N'370285198602058823', NULL, N'18611788674', N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'cc5de4af7f06cd6d250965ebe92a0395', N'1', NULL, NULL, NULL, NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'cf8817bd703bf7c7c77a2118edc26cc7', N'1', NULL, NULL, NULL, NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd72b26fae42e71270fce2097a88da58a', N'导入scott', NULL, N'www', NULL, NULL, N'3a867ebf2cebce9bae3f79676d8d86f3', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), N'admin', CAST(0x07806AB86493843F0B AS DateTime2))
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'dbdc60a6ac1a8c43f24afee384039b68', N'xiaowang', NULL, NULL, NULL, NULL, N'f8889aaef6d1bccffd98d2889c0aafb5', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'dc5883b50466de94d900919ed96d97af', N'33', N'1', N'370285198602058823', NULL, N'18611788674', N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'deeb73e553ad8dc0a0b3cfd5a338de8e', N'3333', NULL, NULL, NULL, NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e2570278bf189ac05df3673231326f47', N'1', NULL, NULL, NULL, NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e39cb23bb950b2bdedfc284686c6128a', N'1', NULL, NULL, NULL, NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e46fe9111a9100844af582a18a2aa402', N'1', NULL, NULL, NULL, NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ee7af0acb9beb9bf8d8b3819a8a7fdc3', N'2', NULL, NULL, NULL, NULL, N'54e739bef5b67569c963c38da52581ec', N'admin', CAST(0x0780FD5A218D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f5d2605e844192d9e548f9bd240ac908', N'小张', NULL, N'370285198602058211', NULL, N'18611788676', N'6a719071a29927a14f19482f8693d69a', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_order_customer] ([id], [name], [sex], [idcard], [idcard_pic], [telphone], [order_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f6db6547382126613a3e46e7cd58a5f2', N'导入scott', NULL, NULL, NULL, NULL, N'a2cce75872cc8fcc47f78de9ffd378c2', N'jeecg-boot', CAST(0x0780C1C6049D7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (1, N'2018', N'1月', CAST(114758.90 AS Decimal(18, 2)), CAST(4426054.19 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (2, N'2018', N'2月', CAST(8970734.12 AS Decimal(18, 2)), CAST(1230188.67 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (3, N'2018', N'3月', CAST(26755421.23 AS Decimal(18, 2)), CAST(2048836.84 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (4, N'2018', N'4月', CAST(2404990.63 AS Decimal(18, 2)), CAST(374171.44 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (5, N'2018', N'5月', CAST(5450793.02 AS Decimal(18, 2)), CAST(502306.10 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (6, N'2018', N'6月', CAST(17186212.11 AS Decimal(18, 2)), CAST(1375154.97 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (7, N'2018', N'7月', CAST(579975.67 AS Decimal(18, 2)), CAST(461483.99 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (8, N'2018', N'8月', CAST(1393590.06 AS Decimal(18, 2)), CAST(330403.76 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (9, N'2018', N'9月', CAST(735761.21 AS Decimal(18, 2)), CAST(1647474.92 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (10, N'2018', N'10月', CAST(1670442.44 AS Decimal(18, 2)), CAST(3423368.33 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (11, N'2018', N'11月', CAST(2993130.34 AS Decimal(18, 2)), CAST(3552024.00 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (12, N'2018', N'12月', CAST(4206227.26 AS Decimal(18, 2)), CAST(3645614.92 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (13, N'2019', N'1月', CAST(483834.66 AS Decimal(18, 2)), CAST(418046.77 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (14, N'2019', N'2月', CAST(11666578.65 AS Decimal(18, 2)), CAST(731352.20 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (15, N'2019', N'3月', CAST(27080982.08 AS Decimal(18, 2)), CAST(1878538.81 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (16, N'2019', N'4月', CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (17, N'2019', N'5月', CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (18, N'2019', N'6月', CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (19, N'2019', N'7月', CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (20, N'2019', N'8月', CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (21, N'2019', N'9月', CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (22, N'2019', N'10月', CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (23, N'2019', N'11月', CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)))
+INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (24, N'2019', N'12月', CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)))
+INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'08375a2dff80e821d5a158dd98302b23', N'导入小虎', NULL, NULL, NULL, NULL, N'2', 28, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078076733362863F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1c2ba51b29a42d9de02bbd708ea8121a', N'777777', N'777', CAST(0x078078824DA50A3F0B AS DateTime2), NULL, NULL, NULL, 7, CAST(0x0A3F0B00 AS Date), NULL, NULL, NULL, NULL, N'admin', CAST(0x0700C606849A563F0B AS DateTime2))
+INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1dc29e80be14d1400f165b5c6b30c707', N'zhang daihao', NULL, NULL, NULL, NULL, N'2', NULL, NULL, N'zhangdaiscott@163.com', NULL, NULL, NULL, NULL, NULL)
+INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'304e651dc769d5c9b6e08fb30457a602', N'小白兔', NULL, NULL, NULL, NULL, N'2', 28, NULL, NULL, NULL, N'scott', CAST(0x0780B8B7C36E353F0B AS DateTime2), N'qinfeng', CAST(0x0700E40ACF6E353F0B AS DateTime2))
+INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4', N'Sandy', N'开源，很好', CAST(0x070000000000123F0B AS DateTime2), NULL, NULL, N'2', 21, CAST(0x123F0B00 AS Date), N'test4@baomidou.com', N'聪明00', NULL, NULL, N'admin', CAST(0x07804D7D398A5A3F0B AS DateTime2))
+INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'42c08b1a2e5b2a96ffa4cc88383d4b11', N'秦50090', NULL, CAST(0x07805FFE51AC273F0B AS DateTime2), NULL, NULL, NULL, 28, CAST(0x273F0B00 AS Date), NULL, NULL, N'admin', CAST(0x0700E5B35FAC353F0B AS DateTime2), N'admin', CAST(0x0780789074AC353F0B AS DateTime2))
+INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4436302a0de50bb83025286bc414d6a9', N'zhang daihao', NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'zhangdaiscott@163.com', NULL, N'admin', CAST(0x07001CA42F83353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4981637bf71b0c1ed1365241dfcfa0ea', N'小虎', NULL, NULL, NULL, NULL, N'2', 28, NULL, NULL, NULL, N'scott', CAST(0x0780B8B7C36E353F0B AS DateTime2), N'qinfeng', CAST(0x0700E40ACF6E353F0B AS DateTime2))
+INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5c16e6a5c31296bcd3f1053d5d118815', N'导入zhangdaiscott', NULL, NULL, NULL, NULL, N'1', NULL, CAST(0x253F0B00 AS Date), NULL, NULL, N'jeecg-boot', CAST(0x078076733362863F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7', N'zhangdaiscott', NULL, NULL, NULL, NULL, N'1', NULL, CAST(0x253F0B00 AS Date), NULL, NULL, NULL, NULL, NULL, NULL)
+INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'73bc58611012617ca446d8999379e4ac', N'郭靖11a', N'777', CAST(0x0700000000000A3F0B AS DateTime2), NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07809D423399793F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'917e240eaa0b1b2d198ae869b64a81c3', N'zhang daihao', NULL, NULL, NULL, NULL, N'2', 0, CAST(0x023F0B00 AS Date), N'zhangdaiscott@163.com', NULL, NULL, NULL, NULL, NULL)
+INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'94420c5d8fc4420dde1e7196154b3a24', N'秦111', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'scott', CAST(0x0700BDF7426C353F0B AS DateTime2), N'qinfeng', CAST(0x07007116AA6E353F0B AS DateTime2))
+INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'95740656751c5f22e5932ab0ae33b1e4', N'杨康22a', N'奸臣', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07809D423399793F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b86897900c770503771c7bb88e5d1e9b', N'scott1', N'开源、很好、hello', NULL, NULL, NULL, N'1', NULL, NULL, N'zhangdaiscott@163.com', NULL, N'scott', CAST(0x0700E140BC67353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c0b7c3de7c62a295ab715943de8a315d', N'秦风555', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0700D7958C6F353F0B AS DateTime2), N'admin', CAST(0x07009981986F353F0B AS DateTime2))
+INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c28fa8391ef81d6fabd8bd894a7615aa', N'小麦', NULL, NULL, NULL, NULL, N'2', NULL, NULL, N'zhangdaiscott@163.com', NULL, N'jeecg-boot', CAST(0x07801E230791803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c2c0d49e3c01913067cf8d1fb3c971d2', N'zhang daihao', NULL, NULL, NULL, NULL, N'2', NULL, NULL, N'zhangdaiscott@163.com', NULL, N'admin', CAST(0x07000B99FEC5353F0B AS DateTime2), N'admin', CAST(0x07006D3AF88C373F0B AS DateTime2))
+INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c96279c666b4b82e3ef1e4e2978701ce', N'报名时间', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700E2CDFE96793F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd24668721446e8478eeeafe4db66dcff', N'zhang daihao999', NULL, NULL, NULL, NULL, N'1', NULL, NULL, N'zhangdaiscott@163.com', NULL, NULL, NULL, NULL, NULL)
+INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'eaa6c1116b41dc10a94eae34cf990133', N'zhang daihao', NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'zhangdaiscott@163.com', NULL, NULL, NULL, NULL, NULL)
+INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ffa9da1ad40632dfcabac51d766865bd', N'秦999', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x07002D5FE4C5353F0B AS DateTime2), N'admin', CAST(0x0780638EC8924F3F0B AS DateTime2))
+INSERT [dbo].[QRTZ_LOCKS] ([SCHED_NAME], [LOCK_NAME]) VALUES (N'quartzScheduler', N'TRIGGER_ACCESS')
+INSERT [dbo].[test_person] ([id], [create_by], [create_time], [update_by], [update_time], [sex], [name], [content], [be_date], [qj_days]) VALUES (N'8ca668defdae47df8649a5477ae08b05', N'admin', CAST(0x07805ADCA552883F0B AS DateTime2), NULL, NULL, N'1', N'zhangdaiscott', N'dsdsd', CAST(0x070000000000883F0B AS DateTime2), 2)
+INSERT [dbo].[sys_user_role] ([id], [user_id], [role_id]) VALUES (N'b3ffd9311a1ca296c44e2409b547384f', N'01b802058ea94b978a2c96f4807f6b48', N'1')
+INSERT [dbo].[sys_user_role] ([id], [user_id], [role_id]) VALUES (N'0ede6d23d53bc7dc990346ff14faabee', N'3db4cf42353f4e868b7ccfeef90505d2', N'ee8626f80f7c2619917b6236f3a7f02b')
+INSERT [dbo].[sys_user_role] ([id], [user_id], [role_id]) VALUES (N'e78d210d24aaff48e0a736e2ddff4cdc', N'3e177fede453430387a8279ced685679', N'ee8626f80f7c2619917b6236f3a7f02b')
+INSERT [dbo].[sys_user_role] ([id], [user_id], [role_id]) VALUES (N'f2de3ae7b5efd8345581aa802a6675d6', N'41b1be8d4c52023b0798f51164ca682d', N'e51758fa916c881624b046d26bd09230')
+INSERT [dbo].[sys_user_role] ([id], [user_id], [role_id]) VALUES (N'6f9da7310489bac1e5f95e0efe92b4ce', N'42d153bffeea74f72a9c1697874fa4a7', N'e51758fa916c881624b046d26bd09230')
+INSERT [dbo].[sys_user_role] ([id], [user_id], [role_id]) VALUES (N'f2922a38ba24fb53749e45a0c459adb3', N'439ae3e9bcf7418583fcd429cadb1d72', N'1')
+INSERT [dbo].[sys_user_role] ([id], [user_id], [role_id]) VALUES (N'f72c6190b0722e798147e73c776c6ac9', N'439ae3e9bcf7418583fcd429cadb1d72', N'ee8626f80f7c2619917b6236f3a7f02b')
+INSERT [dbo].[sys_user_role] ([id], [user_id], [role_id]) VALUES (N'ee45d0343ecec894b6886effc92cb0b7', N'4d8fef4667574b24a9ccfedaf257810c', N'f6817f48af4fb3af11b9e8bf182f618b')
+INSERT [dbo].[sys_user_role] ([id], [user_id], [role_id]) VALUES (N'be2639167ede09379937daca7fc3bb73', N'526f300ab35e44faaed54a9fb0742845', N'ee8626f80f7c2619917b6236f3a7f02b')
+INSERT [dbo].[sys_user_role] ([id], [user_id], [role_id]) VALUES (N'31af310584bd5795f76b1fe8c38294a0', N'70f5dcf03f36471dabba81381919291f', N'e51758fa916c881624b046d26bd09230')
+INSERT [dbo].[sys_user_role] ([id], [user_id], [role_id]) VALUES (N'8d7846ec783e157174e4ce2949231a65', N'7ee6630e89d17afbf6d12150197b578d', N'e51758fa916c881624b046d26bd09230')
+INSERT [dbo].[sys_user_role] ([id], [user_id], [role_id]) VALUES (N'79d66ef7aa137cfa9957081a1483009d', N'9a668858c4c74cf5a2b25ad9608ba095', N'ee8626f80f7c2619917b6236f3a7f02b')
+INSERT [dbo].[sys_user_role] ([id], [user_id], [role_id]) VALUES (N'f3a4ca33848daba3e43490707ae859e7', N'a75d45a015c44384a04449ee80dc3503', N'e51758fa916c881624b046d26bd09230')
+INSERT [dbo].[sys_user_role] ([id], [user_id], [role_id]) VALUES (N'fe38580871c5061ba59d5c03a0840b0e', N'a75d45a015c44384a04449ee80dc3503', N'ee8626f80f7c2619917b6236f3a7f02b')
+INSERT [dbo].[sys_user_role] ([id], [user_id], [role_id]) VALUES (N'6ec01b4aaab790eac4ddb33d7a524a58', N'e9ca23d68d884d4ebb19d07889727dae', N'f6817f48af4fb3af11b9e8bf182f618b')
+INSERT [dbo].[sys_user_role] ([id], [user_id], [role_id]) VALUES (N'd2233e5be091d39da5abb0073c766224', N'f0019fdebedb443c98dcb17d88222c38', N'ee8626f80f7c2619917b6236f3a7f02b')
+INSERT [dbo].[sys_user_depart] ([ID], [user_id], [dep_id]) VALUES (N'0c42ba309c2c4cad35836ec2336676fa', N'42d153bffeea74f72a9c1697874fa4a7', N'6d35e179cd814e3299bd588ea7daed3f')
+INSERT [dbo].[sys_user_depart] ([ID], [user_id], [dep_id]) VALUES (N'2835834d133f9118ee87a666e0f5501e', N'a75d45a015c44384a04449ee80dc3503', N'a7d7e77e06c84325a40932163adcdaa6')
+INSERT [dbo].[sys_user_depart] ([ID], [user_id], [dep_id]) VALUES (N'1f3a0267811327b9eca86b0cc2b956f3', N'bcbe1290783a469a83ae3bd8effe15d4', N'5159cde220114246b045e574adceafe9')
+INSERT [dbo].[sys_user_depart] ([ID], [user_id], [dep_id]) VALUES (N'577ae220081f78ceaf8cb26eb75330ab', N'e9ca23d68d884d4ebb19d07889727dae', N'4f1765520d6346f9bd9c79e2479e5b12')
+INSERT [dbo].[sys_user_depart] ([ID], [user_id], [dep_id]) VALUES (N'15e0d72bcbab86a41e38222b1f09428e', N'e9ca23d68d884d4ebb19d07889727dae', N'c6d7cb4deeac411cb3384b1b31278596')
+INSERT [dbo].[sys_user_depart] ([ID], [user_id], [dep_id]) VALUES (N'ac52f23ae625eb6560c9227170b88166', N'f0019fdebedb443c98dcb17d88222c38', N'57197590443c44f083d42ae24ef26a2c')
+INSERT [dbo].[sys_user_depart] ([ID], [user_id], [dep_id]) VALUES (N'179660a8b9a122f66b73603799a10924', N'f0019fdebedb443c98dcb17d88222c38', N'67fc001af12a4f9b8458005d3f19934a')
+INSERT [dbo].[sys_user] ([id], [username], [realname], [password], [salt], [avatar], [birthday], [sex], [email], [phone], [org_code], [status], [del_flag], [activiti_sync], [create_by], [create_time], [update_by], [update_time]) VALUES (N'42d153bffeea74f72a9c1697874fa4a7', N'test22', N'23232', N'ac52e15671a377cf', N'5FMD48RM', N'user/20190314/ly-plate-e_1552531617500.png', CAST(0x0700000000004A3F0B AS DateTime2), 1, N'zhangdaiscott@163.com', N'18611782222', NULL, 1, N'0', N'1', N'admin', CAST(0x0700778809973C3F0B AS DateTime2), N'admin', CAST(0x0700DB1F8B7E743F0B AS DateTime2))
+INSERT [dbo].[sys_user] ([id], [username], [realname], [password], [salt], [avatar], [birthday], [sex], [email], [phone], [org_code], [status], [del_flag], [activiti_sync], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a75d45a015c44384a04449ee80dc3503', N'jeecg', N'jeecg', N'3dd8371f3cf8240e', N'vDDkDzrK', N'user/20190220/e1fe9925bc315c60addea1b98eb1cb1349547719_1550656892940.jpg', NULL, 2, NULL, NULL, NULL, 1, N'0', N'1', N'admin', CAST(0x0700364279864E3F0B AS DateTime2), N'admin', CAST(0x07001CD16084853F0B AS DateTime2))
+INSERT [dbo].[sys_user] ([id], [username], [realname], [password], [salt], [avatar], [birthday], [sex], [email], [phone], [org_code], [status], [del_flag], [activiti_sync], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e9ca23d68d884d4ebb19d07889727dae', N'admin', N'管理员', N'cb362cfeefbf3d8d', N'RCGTeGiH', N'user/20190119/logo-2_1547868176839.png', CAST(0x070000000000083F0B AS DateTime2), 1, N'11@qq.com', N'18566666666', N'A01', 1, N'0', N'1', NULL, CAST(0x07008D310F96183F0B AS DateTime2), N'admin', CAST(0x07001F302E965B3F0B AS DateTime2))
+INSERT [dbo].[sys_user] ([id], [username], [realname], [password], [salt], [avatar], [birthday], [sex], [email], [phone], [org_code], [status], [del_flag], [activiti_sync], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f0019fdebedb443c98dcb17d88222c38', N'zhagnxiao', N'张小红', N'f898134e5e52ae11a2ffb2c3b57a4e90', N'go3jJ4zX', N'user/20190401/20180607175028Fn1Lq7zw_1554118444672.png', CAST(0x0700000000007D3F0B AS DateTime2), NULL, NULL, NULL, NULL, 1, N'0', N'1', N'admin', CAST(0x0700E57807A4E9450B AS DateTime2), N'admin', CAST(0x0700DFFD73B8863F0B AS DateTime2))
+INSERT [dbo].[sys_sms_template] ([id], [template_name], [template_code], [template_type], [template_content], [template_test_json], [create_time], [create_by], [update_time], [update_by]) VALUES (N'4028608164691b000164693108140003', N'催办：${taskName}', N'SYS001', N'3', N'${userName}，您好！
+请前待办任务办理事项！${taskName}
+
+
+===========================
+此消息由系统发出', N'{
+"taskName":"HR审批",
+"userName":"admin"
+}', CAST(0x0700D98ED07B6F3E0B AS DateTime2), N'admin', CAST(0x0700C7B8489B6F3E0B AS DateTime2), N'admin')
+INSERT [dbo].[sys_sms] ([id], [es_title], [es_type], [es_receiver], [es_param], [es_content], [es_send_time], [es_send_status], [es_send_num], [es_result], [remark], [create_by], [create_time], [update_by], [update_time]) VALUES (N'402880e74dc2f361014dc2f8411e0001', N'消息推送测试333', N'2', N'411944058@qq.com', NULL, N'张三你好，你的订单4028d881436d514601436d521ae80165已付款!', CAST(0x07802237558F093A0B AS DateTime2), N'3', NULL, NULL, N'认证失败错误的用户名或者密码', N'admin', CAST(0x0780F505548F093A0B AS DateTime2), N'admin', CAST(0x07801102AFBCB03A0B AS DateTime2))
+INSERT [dbo].[sys_sms] ([id], [es_title], [es_type], [es_receiver], [es_param], [es_content], [es_send_time], [es_send_status], [es_send_num], [es_result], [remark], [create_by], [create_time], [update_by], [update_time]) VALUES (N'402880ea533647b00153364e74770001', N'发个问候', N'3', N'admin', NULL, N'你好', CAST(0x070000000000183B0B AS DateTime2), N'2', NULL, NULL, NULL, N'admin', CAST(0x0700E0F3C484183B0B AS DateTime2), N'admin', CAST(0x0780CC99A9A66F3E0B AS DateTime2))
+INSERT [dbo].[sys_sms] ([id], [es_title], [es_type], [es_receiver], [es_param], [es_content], [es_send_time], [es_send_status], [es_send_num], [es_result], [remark], [create_by], [create_time], [update_by], [update_time]) VALUES (N'402880ee5a17e711015a17f3188e013f', N'消息推送测试333', N'2', N'411944058@qq.com', NULL, N'张三你好，你的订单4028d881436d514601436d521ae80165已付款!', NULL, N'2', NULL, NULL, NULL, N'admin', CAST(0x078057CB4A946E3C0B AS DateTime2), N'admin', CAST(0x078086A461618D3C0B AS DateTime2))
+INSERT [dbo].[sys_sms] ([id], [es_title], [es_type], [es_receiver], [es_param], [es_content], [es_send_time], [es_send_status], [es_send_num], [es_result], [remark], [create_by], [create_time], [update_by], [update_time]) VALUES (N'402880f05ab649b4015ab64b9cd80012', N'消息推送测试333', N'2', N'411944058@qq.com', NULL, N'张三你好，你的订单4028d881436d514601436d521ae80165已付款!', CAST(0x0780C5B0DD85883D0B AS DateTime2), N'3', NULL, NULL, NULL, N'admin', CAST(0x0780802C8A618D3C0B AS DateTime2), N'admin', CAST(0x07003789F8911C3D0B AS DateTime2))
+INSERT [dbo].[sys_sms] ([id], [es_title], [es_type], [es_receiver], [es_param], [es_content], [es_send_time], [es_send_status], [es_send_num], [es_result], [remark], [create_by], [create_time], [update_by], [update_time]) VALUES (N'402880f05ab7b035015ab7c4462c0004', N'消息推送测试333', N'2', N'411944058@qq.com', NULL, N'张三你好，你的订单4028d881436d514601436d521ae80165已付款!', CAST(0x0780C5B0DD85883D0B AS DateTime2), N'3', NULL, NULL, NULL, N'admin', CAST(0x0780FEFB029B8D3C0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_sms] ([id], [es_title], [es_type], [es_receiver], [es_param], [es_content], [es_send_time], [es_send_status], [es_send_num], [es_result], [remark], [create_by], [create_time], [update_by], [update_time]) VALUES (N'402881f3646a472b01646a4a5af00001', N'催办：HR审批', N'3', N'admin', NULL, N'admin，您好！
+请前待办任务办理事项！HR审批
+
+
+===========================
+此消息由系统发出', CAST(0x0780C9DDBDA66F3E0B AS DateTime2), N'2', NULL, NULL, NULL, N'admin', CAST(0x0780C9DDBDA66F3E0B AS DateTime2), N'admin', CAST(0x0700B29A4E73713E0B AS DateTime2))
+INSERT [dbo].[sys_sms] ([id], [es_title], [es_type], [es_receiver], [es_param], [es_content], [es_send_time], [es_send_status], [es_send_num], [es_result], [remark], [create_by], [create_time], [update_by], [update_time]) VALUES (N'402881f3647da06c01647da43a940014', N'催办：HR审批', N'3', N'admin', NULL, N'admin，您好！
+请前待办任务办理事项！HR审批
+
+
+===========================
+此消息由系统发出', CAST(0x070098DDFA75733E0B AS DateTime2), N'2', NULL, NULL, NULL, N'admin', CAST(0x070098DDFA75733E0B AS DateTime2), N'admin', CAST(0x0700E597119E733E0B AS DateTime2))
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'00b0748f04d3ea52c8cfa179c1c9d384', N'52b0cf022ac4187b2a70dfa4f8b2d940', N'd7d6e2e4e2934f2c9385a623fd98c6f3', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'00b82058779cca5106fbb84783534c9b', N'f6817f48af4fb3af11b9e8bf182f618b', N'4148ec82b6acd69f470bea75fe41c357', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'0254c0b25694ad5479e6d6935bbc176e', N'f6817f48af4fb3af11b9e8bf182f618b', N'944abf0a8fc22fe1f1154a389a574154', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'09bd4fc30ffe88c4a44ed3868f442719', N'f6817f48af4fb3af11b9e8bf182f618b', N'e6bfd1fcabfd7942fdd05f076d1dad38', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'0c2d2db76ee3aa81a4fe0925b0f31365', N'f6817f48af4fb3af11b9e8bf182f618b', N'024f1fd1283dc632458976463d8984e1', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'0c6b8facbb1cc874964c87a8cf01e4b1', N'f6817f48af4fb3af11b9e8bf182f618b', N'841057b8a1bef8f6b4b20f9a618a7fa6', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'0c6e1075e422972083c3e854d9af7851', N'f6817f48af4fb3af11b9e8bf182f618b', N'08e6b9dc3c04489c8e1ff2ce6f105aa4', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'0d9d14bc66e9d5e99b0280095fdc8587', N'ee8626f80f7c2619917b6236f3a7f02b', N'277bfabef7d76e89b33062b16a9a5020', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'0dec36b68c234767cd35466efef3b941', N'ee8626f80f7c2619917b6236f3a7f02b', N'54dd5457a3190740005c1bfec55b1c34', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'0e139e6c1b5b73eee81381ddf0b5a9f3', N'f6817f48af4fb3af11b9e8bf182f618b', N'277bfabef7d76e89b33062b16a9a5020', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'0f861cb988fdc639bb1ab943471f3a72', N'f6817f48af4fb3af11b9e8bf182f618b', N'97c8629abc7848eccdb6d77c24bb3ebb', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'105c2ac10741e56a618a82cd58c461d7', N'e51758fa916c881624b046d26bd09230', N'1663f3faba244d16c94552f849627d84', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'115a6673ae6c0816d3f60de221520274', N'21c5a3187763729408b40afb0d0fdfa8', N'63b551e81c5956d5c861593d366d8c57', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'126ea9faebeec2b914d6d9bef957afb6', N'f6817f48af4fb3af11b9e8bf182f618b', N'f1cb187abf927c88b89470d08615f5ac', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'145eac8dd88eddbd4ce0a800ab40a92c', N'e51758fa916c881624b046d26bd09230', N'08e6b9dc3c04489c8e1ff2ce6f105aa4', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'154edd0599bd1dc2c7de220b489cd1e2', N'f6817f48af4fb3af11b9e8bf182f618b', N'7ac9eb9ccbde2f7a033cd4944272bf1e', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'165acd6046a0eaf975099f46a3c898ea', N'f6817f48af4fb3af11b9e8bf182f618b', N'4f66409ef3bbd69c1d80469d6e2a885e', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'1664b92dff13e1575e3a929caa2fa14d', N'f6817f48af4fb3af11b9e8bf182f618b', N'd2bbf9ebca5a8fa2e227af97d2da7548', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'16ef8ed3865ccc6f6306200760896c50', N'ee8626f80f7c2619917b6236f3a7f02b', N'e8af452d8948ea49d37c934f5100ae6a', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'17ead5b7d97ed365398ab20009a69ea3', N'52b0cf022ac4187b2a70dfa4f8b2d940', N'e08cb190ef230d5d4f03824198773950', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'1ac1688ef8456f384091a03d88a89ab1', N'52b0cf022ac4187b2a70dfa4f8b2d940', N'693ce69af3432bd00be13c3971a57961', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'1af4babaa4227c3cbb830bc5eb513abb', N'ee8626f80f7c2619917b6236f3a7f02b', N'e08cb190ef230d5d4f03824198773950', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'1ba162bbc2076c25561f8622f610d5bf', N'ee8626f80f7c2619917b6236f3a7f02b', N'aedbf679b5773c1f25e9f7b10111da73', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'1c1dbba68ef1817e7fb19c822d2854e8', N'f6817f48af4fb3af11b9e8bf182f618b', N'fb367426764077dcf94640c843733985', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'1c55c4ced20765b8ebab383caa60f0b6', N'e51758fa916c881624b046d26bd09230', N'fb367426764077dcf94640c843733985', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'1e099baeae01b747d67aca06bdfc34d1', N'e51758fa916c881624b046d26bd09230', N'6ad53fd1b220989a8b71ff482d683a5a', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'1e47db875601fd97723254046b5bba90', N'f6817f48af4fb3af11b9e8bf182f618b', N'baf16b7174bd821b6bab23fa9abb200d', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'1fe4d408b85f19618c15bcb768f0ec22', N'1750a8fb3e6d90cb7957c02de1dc8e59', N'9502685863ab87f0ad1134142788a385', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'20e53c87a785688bdc0a5bb6de394ef1', N'f6817f48af4fb3af11b9e8bf182f618b', N'540a2936940846cb98114ffb0d145cb8', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'248d288586c6ff3bd14381565df84163', N'52b0cf022ac4187b2a70dfa4f8b2d940', N'3f915b2769fc80648e92d04e84ca059d', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'25491ecbd5a9b34f09c8bc447a10ede1', N'f6817f48af4fb3af11b9e8bf182f618b', N'd07a2c87a451434c99ab06296727ec4f', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'25f5443f19c34d99718a016d5f54112e', N'ee8626f80f7c2619917b6236f3a7f02b', N'6e73eb3c26099c191bf03852ee1310a1', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'27489816708b18859768dfed5945c405', N'a799c3b1b12dd3ed4bd046bfaef5fe6e', N'9502685863ab87f0ad1134142788a385', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'2779cdea8367fff37db26a42c1a1f531', N'f6817f48af4fb3af11b9e8bf182f618b', N'fef097f3903caf3a3c3a6efa8de43fbb', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'296f9c75ca0e172ae5ce4c1022c996df', N'646c628b2b8295fbdab2d34044de0354', N'732d48f8e0abe99fe6a23d18a3171cd1', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'29fb4d37aa29b9fa400f389237cf9fe7', N'ee8626f80f7c2619917b6236f3a7f02b', N'05b3c82ddb2536a4a5ee1a4c46b5abef', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'29fb6b0ad59a7e911c8d27e0bdc42d23', N'f6817f48af4fb3af11b9e8bf182f618b', N'9a90363f216a6a08f32eecb3f0bf12a3', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'2ad37346c1b83ddeebc008f6987b2227', N'f6817f48af4fb3af11b9e8bf182f618b', N'8d1ebd663688965f1fd86a2f0ead3416', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'2c462293cbb0eab7e8ae0a3600361b5f', N'52b0cf022ac4187b2a70dfa4f8b2d940', N'9502685863ab87f0ad1134142788a385', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'2dc1a0eb5e39aaa131ddd0082a492d76', N'ee8626f80f7c2619917b6236f3a7f02b', N'08e6b9dc3c04489c8e1ff2ce6f105aa4', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'2ea2382af618ba7d1e80491a0185fb8a', N'ee8626f80f7c2619917b6236f3a7f02b', N'f23d9bfff4d9aa6b68569ba2cff38415', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'2fcfa2ac3dcfadc7c67107dae9a0de6d', N'ee8626f80f7c2619917b6236f3a7f02b', N'73678f9daa45ed17a3674131b03432fb', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'2fdaed22dfa4c8d4629e44ef81688c6a', N'52b0cf022ac4187b2a70dfa4f8b2d940', N'aedbf679b5773c1f25e9f7b10111da73', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'300c462b7fec09e2ff32574ef8b3f0bd', N'52b0cf022ac4187b2a70dfa4f8b2d940', N'2a470fc0c3954d9dbb61de6d80846549', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'326181da3248a62a05e872119a462be1', N'ee8626f80f7c2619917b6236f3a7f02b', N'3f915b2769fc80648e92d04e84ca059d', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'3369650f5072b330543f8caa556b1b33', N'e51758fa916c881624b046d26bd09230', N'a400e4f4d54f79bf5ce160ae432231af', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'35a7e156c20e93aa7e825fe514bf9787', N'e51758fa916c881624b046d26bd09230', N'c6cf95444d80435eb37b2f9db3971ae6', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'35ac7cae648de39eb56213ca1b649713', N'52b0cf022ac4187b2a70dfa4f8b2d940', N'b1cb0a3fedf7ed0e4653cb5a229837ee', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'37112f4d372541e105473f18da3dc50d', N'ee8626f80f7c2619917b6236f3a7f02b', N'a400e4f4d54f79bf5ce160ae432231af', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'37789f70cd8bd802c4a69e9e1f633eaa', N'ee8626f80f7c2619917b6236f3a7f02b', N'ae4fed059f67086fd52a73d913cf473d', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'381504a717cb3ce77dcd4070c9689a7e', N'ee8626f80f7c2619917b6236f3a7f02b', N'4f84f9400e5e92c95f05b554724c2b58', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'38a2e55db0960262800576e34b3af44c', N'f6817f48af4fb3af11b9e8bf182f618b', N'5c2f42277948043026b7a14692456828', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'38dd7a19711e7ffe864232954c06fae9', N'e51758fa916c881624b046d26bd09230', N'd2bbf9ebca5a8fa2e227af97d2da7548', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'3b1886f727ac503c93fecdd06dcb9622', N'f6817f48af4fb3af11b9e8bf182f618b', N'c431130c0bc0ec71b0a5be37747bb36a', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'3de2a60c7e42a521fecf6fcc5cb54978', N'f6817f48af4fb3af11b9e8bf182f618b', N'2d83d62bd2544b8994c8f38cf17b0ddf', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'3e4e38f748b8d87178dd62082e5b7b60', N'f6817f48af4fb3af11b9e8bf182f618b', N'7960961b0063228937da5fa8dd73d371', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'3e563751942b0879c88ca4de19757b50', N'1750a8fb3e6d90cb7957c02de1dc8e59', N'58857ff846e61794c69208e9d3a85466', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'3f1d04075e3c3254666a4138106a4e51', N'f6817f48af4fb3af11b9e8bf182f618b', N'3fac0d3c9cd40fa53ab70d4c583821f8', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'412e2de37a35b3442d68db8dd2f3c190', N'52b0cf022ac4187b2a70dfa4f8b2d940', N'f1cb187abf927c88b89470d08615f5ac', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'4204f91fb61911ba8ce40afa7c02369f', N'f6817f48af4fb3af11b9e8bf182f618b', N'3f915b2769fc80648e92d04e84ca059d', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'439568ff7db6f329bf6dd45b3dfc9456', N'f6817f48af4fb3af11b9e8bf182f618b', N'7593c9e3523a17bca83b8d7fe8a34e58', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'444126230885d5d38b8fa6072c9f43f8', N'f6817f48af4fb3af11b9e8bf182f618b', N'f780d0d3083d849ccbdb1b1baee4911d', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'445656dd187bd8a71605f4bbab1938a3', N'f6817f48af4fb3af11b9e8bf182f618b', N'020b06793e4de2eee0007f603000c769', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'44b5a73541bcb854dd5d38c6d1fb93a1', N'ee8626f80f7c2619917b6236f3a7f02b', N'418964ba087b90a84897b62474496b93', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'455cdb482457f529b79b479a2ff74427', N'f6817f48af4fb3af11b9e8bf182f618b', N'e1979bb53e9ea51cecc74d86fd9d2f64', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'459aa2e7021b435b4d65414cfbc71c66', N'e51758fa916c881624b046d26bd09230', N'4148ec82b6acd69f470bea75fe41c357', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'4c0940badae3ef9231ee9d042338f2a4', N'e51758fa916c881624b046d26bd09230', N'2a470fc0c3954d9dbb61de6d80846549', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'4d56ce2f67c94b74a1d3abdbea340e42', N'ee8626f80f7c2619917b6236f3a7f02b', N'd86f58e7ab516d3bc6bfb1fe10585f97', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'4dab5a06acc8ef3297889872caa74747', N'f6817f48af4fb3af11b9e8bf182f618b', N'ffb423d25cc59dcd0532213c4a518261', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'4e0a37ed49524df5f08fc6593aee875c', N'f6817f48af4fb3af11b9e8bf182f618b', N'f23d9bfff4d9aa6b68569ba2cff38415', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'4ea403fc1d19feb871c8bdd9f94a4ecc', N'f6817f48af4fb3af11b9e8bf182f618b', N'2e42e3835c2b44ec9f7bc26c146ee531', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'4f254549d9498f06f4cc9b23f3e2c070', N'f6817f48af4fb3af11b9e8bf182f618b', N'93d5cfb4448f11e9916698e7f462b4b6', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'4faad8ff93cb2b5607cd3d07c1b624ee', N'a799c3b1b12dd3ed4bd046bfaef5fe6e', N'70b8f33da5f39de1981bf89cf6c99792', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'504e326de3f03562cdd186748b48a8c7', N'f6817f48af4fb3af11b9e8bf182f618b', N'027aee69baee98a0ed2e01806e89c891', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'51b11ce979730f8ce8606da16e4d69bb', N'f6817f48af4fb3af11b9e8bf182f618b', N'e8af452d8948ea49d37c934f5100ae6a', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'520b5989e6fe4a302a573d4fee12a40a', N'f6817f48af4fb3af11b9e8bf182f618b', N'6531cf3421b1265aeeeabaab5e176e6d', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'529953da30b8c7a20034f3a2a90dd5b2', N'f6817f48af4fb3af11b9e8bf182f618b', N'190c2b43bec6a5f7a4194a85db67d96a', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'54fdf85e52807bdb32ce450814abc256', N'f6817f48af4fb3af11b9e8bf182f618b', N'cc50656cf9ca528e6f2150eba4714ad2', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'57c0b3a547b815ea3ec8e509b08948b3', N'1750a8fb3e6d90cb7957c02de1dc8e59', N'3f915b2769fc80648e92d04e84ca059d', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'593ee05c4fe4645c7826b7d5e14f23ec', N'52b0cf022ac4187b2a70dfa4f8b2d940', N'8fb8172747a78756c11916216b8b8066', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'5affc85021fcba07d81c09a6fdfa8dc6', N'ee8626f80f7c2619917b6236f3a7f02b', N'078f9558cdeab239aecb2bda1a8ed0d1', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'5d230e6cd2935c4117f6cb9a7a749e39', N'f6817f48af4fb3af11b9e8bf182f618b', N'fc810a2267dd183e4ef7c71cc60f4670', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'5de6871fadb4fe1cdd28989da0126b07', N'f6817f48af4fb3af11b9e8bf182f618b', N'a400e4f4d54f79bf5ce160a3432231af', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'5e4015a9a641cbf3fb5d28d9f885d81a', N'f6817f48af4fb3af11b9e8bf182f618b', N'2dbbafa22cda07fa5d169d741b81fe12', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'5e634a89f75b7a421c02aecfd520325f', N'e51758fa916c881624b046d26bd09230', N'339329ed54cf255e1f9392e84f136901', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'5e74637c4bec048d1880ad0bd1b00552', N'e51758fa916c881624b046d26bd09230', N'a400e4f4d54f79bf5ce160a3432231af', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'5fc194b709336d354640fe29fefd65a3', N'a799c3b1b12dd3ed4bd046bfaef5fe6e', N'9ba60e626bf2882c31c488aba62b89f0', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'60eda4b4db138bdb47edbe8e10e71675', N'f6817f48af4fb3af11b9e8bf182f618b', N'fb07ca05a3e13674dbf6d3245956da2e', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'61835e48f3e675f7d3f5c9dd3a10dcf3', N'f6817f48af4fb3af11b9e8bf182f618b', N'f0675b52d89100ee88472b6800754a08', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'6451dac67ba4acafb570fd6a03f47460', N'ee8626f80f7c2619917b6236f3a7f02b', N'e3c13679c73a4f829bcff2aba8fd68b1', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'660fbc40bcb1044738f7cabdf1708c28', N'f6817f48af4fb3af11b9e8bf182f618b', N'b3c824fc22bd953e2eb16ae6914ac8f9', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'66b202f8f84fe766176b3f51071836ef', N'f6817f48af4fb3af11b9e8bf182f618b', N'1367a93f2c410b169faa7abcbad2f77c', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'6c43fd3f10fdaf2a0646434ae68709b5', N'ee8626f80f7c2619917b6236f3a7f02b', N'540a2936940846cb98114ffb0d145cb8', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'6c74518eb6bb9a353f6a6c459c77e64b', N'f6817f48af4fb3af11b9e8bf182f618b', N'b4dfc7d5dd9e8d5b6dd6d4579b1aa559', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'6daddafacd7eccb91309530c17c5855d', N'f6817f48af4fb3af11b9e8bf182f618b', N'edfa74d66e8ea63ea432c2910837b150', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'6fb4c2142498dd6d5b6c014ef985cb66', N'f6817f48af4fb3af11b9e8bf182f618b', N'6e73eb3c26099c191bf03852ee1310a1', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'71a5f54a90aa8c7a250a38b7dba39f6f', N'ee8626f80f7c2619917b6236f3a7f02b', N'8fb8172747a78756c11916216b8b8066', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'737d35f582036cd18bfd4c8e5748eaa4', N'e51758fa916c881624b046d26bd09230', N'693ce69af3432bd00be13c3971a57961', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'7413acf23b56c906aedb5a36fb75bd3a', N'f6817f48af4fb3af11b9e8bf182f618b', N'a4fc7b64b01a224da066bb16230f9c5a', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'75002588591820806', N'16457350655250432', N'5129710648430592', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'75002588604403712', N'16457350655250432', N'5129710648430593', NULL)
+GO
+print 'Processed 100 total records'
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'75002588612792320', N'16457350655250432', N'40238597734928384', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'75002588625375232', N'16457350655250432', N'57009744761589760', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'75002588633763840', N'16457350655250432', N'16392452747300864', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'75002588637958144', N'16457350655250432', N'16392767785668608', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'75002588650541056', N'16457350655250432', N'16439068543946752', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'76a54a8cc609754360bf9f57e7dbb2db', N'f6817f48af4fb3af11b9e8bf182f618b', N'c65321e57b7949b7a975313220de0422', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277779875336192', N'496138616573952', N'5129710648430592', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780043108352', N'496138616573952', N'5129710648430593', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780055691264', N'496138616573952', N'15701400130424832', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780064079872', N'496138616573952', N'16678126574637056', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780072468480', N'496138616573952', N'15701915807518720', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780076662784', N'496138616573952', N'15708892205944832', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780085051392', N'496138616573952', N'16678447719911424', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780089245696', N'496138616573952', N'25014528525733888', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780097634304', N'496138616573952', N'56898976661639168', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780135383040', N'496138616573952', N'40238597734928384', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780139577344', N'496138616573952', N'45235621697949696', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780147965952', N'496138616573952', N'45235787867885568', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780156354560', N'496138616573952', N'45235939278065664', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780164743168', N'496138616573952', N'43117268627886080', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780168937472', N'496138616573952', N'45236734832676864', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780181520384', N'496138616573952', N'45237010692050944', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780189908992', N'496138616573952', N'45237170029465600', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780198297600', N'496138616573952', N'57009544286441472', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780206686208', N'496138616573952', N'57009744761589760', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780215074816', N'496138616573952', N'57009981228060672', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780219269120', N'496138616573952', N'56309618086776832', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780227657728', N'496138616573952', N'57212882168844288', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780236046336', N'496138616573952', N'61560041605435392', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780244434944', N'496138616573952', N'61560275261722624', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780257017856', N'496138616573952', N'61560480518377472', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780265406464', N'496138616573952', N'44986029924421632', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780324126720', N'496138616573952', N'45235228800716800', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780332515328', N'496138616573952', N'45069342940860416', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780340903937', N'496138616573952', N'5129710648430594', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780349292544', N'496138616573952', N'16687383932047360', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780357681152', N'496138616573952', N'16689632049631232', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780366069760', N'496138616573952', N'16689745006432256', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780370264064', N'496138616573952', N'16689883993083904', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780374458369', N'496138616573952', N'16690313745666048', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780387041280', N'496138616573952', N'5129710648430595', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780395429888', N'496138616573952', N'16694861252005888', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780403818496', N'496138616573952', N'16695107491205120', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780412207104', N'496138616573952', N'16695243126607872', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780420595712', N'496138616573952', N'75002207560273920', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780428984320', N'496138616573952', N'76215889006956544', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780433178624', N'496138616573952', N'76216071333351424', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780441567232', N'496138616573952', N'76216264070008832', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780449955840', N'496138616573952', N'76216459709124608', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780458344448', N'496138616573952', N'76216594207870976', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780466733056', N'496138616573952', N'76216702639017984', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780475121664', N'496138616573952', N'58480609315524608', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780483510272', N'496138616573952', N'61394706252173312', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780491898880', N'496138616573952', N'61417744146370560', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780496093184', N'496138616573952', N'76606430504816640', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780504481792', N'496138616573952', N'76914082455752704', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780508676097', N'496138616573952', N'76607201262702592', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780517064704', N'496138616573952', N'39915540965232640', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780525453312', N'496138616573952', N'41370251991977984', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780538036224', N'496138616573952', N'45264987354042368', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780546424832', N'496138616573952', N'45265487029866496', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780554813440', N'496138616573952', N'45265762415284224', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780559007744', N'496138616573952', N'45265886315024384', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780567396352', N'496138616573952', N'45266070000373760', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780571590656', N'496138616573952', N'41363147411427328', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780579979264', N'496138616573952', N'41363537456533504', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780588367872', N'496138616573952', N'41364927394353152', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780596756480', N'496138616573952', N'41371711400054784', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780605145088', N'496138616573952', N'41469219249852416', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780613533696', N'496138616573952', N'39916171171991552', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780621922304', N'496138616573952', N'39918482854252544', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780630310912', N'496138616573952', N'41373430515240960', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780718391296', N'496138616573952', N'41375330996326400', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780722585600', N'496138616573952', N'63741744973352960', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780730974208', N'496138616573952', N'42082442672082944', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780739362816', N'496138616573952', N'41376192166629376', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780747751424', N'496138616573952', N'41377034236071936', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780756140032', N'496138616573952', N'56911328312299520', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780764528640', N'496138616573952', N'41378916912336896', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780768722944', N'496138616573952', N'63482475359244288', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780772917249', N'496138616573952', N'64290663792906240', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780785500160', N'496138616573952', N'66790433014943744', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780789694464', N'496138616573952', N'42087054753927168', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780798083072', N'496138616573952', N'67027338952445952', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780806471680', N'496138616573952', N'67027909637836800', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780810665985', N'496138616573952', N'67042515441684480', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780823248896', N'496138616573952', N'67082402312228864', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780827443200', N'496138616573952', N'16392452747300864', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780835831808', N'496138616573952', N'16392767785668608', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780840026112', N'496138616573952', N'16438800255291392', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780844220417', N'496138616573952', N'16438962738434048', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277780852609024', N'496138616573952', N'16439068543946752', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860062040064', N'496138616573953', N'5129710648430592', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860070428672', N'496138616573953', N'5129710648430593', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860078817280', N'496138616573953', N'40238597734928384', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860091400192', N'496138616573953', N'43117268627886080', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860099788800', N'496138616573953', N'57009744761589760', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860112371712', N'496138616573953', N'56309618086776832', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860120760320', N'496138616573953', N'44986029924421632', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860129148928', N'496138616573953', N'5129710648430594', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860141731840', N'496138616573953', N'5129710648430595', NULL)
+GO
+print 'Processed 200 total records'
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860150120448', N'496138616573953', N'75002207560273920', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860158509056', N'496138616573953', N'58480609315524608', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860162703360', N'496138616573953', N'76606430504816640', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860171091968', N'496138616573953', N'76914082455752704', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860179480576', N'496138616573953', N'76607201262702592', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860187869184', N'496138616573953', N'39915540965232640', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860196257792', N'496138616573953', N'41370251991977984', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860204646400', N'496138616573953', N'41363147411427328', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860208840704', N'496138616573953', N'41371711400054784', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860213035009', N'496138616573953', N'39916171171991552', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860221423616', N'496138616573953', N'39918482854252544', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860225617920', N'496138616573953', N'41373430515240960', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860234006528', N'496138616573953', N'41375330996326400', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860242395136', N'496138616573953', N'63741744973352960', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860250783744', N'496138616573953', N'42082442672082944', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860254978048', N'496138616573953', N'41376192166629376', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860263366656', N'496138616573953', N'41377034236071936', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860271755264', N'496138616573953', N'56911328312299520', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860313698304', N'496138616573953', N'41378916912336896', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860322086912', N'496138616573953', N'63482475359244288', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860326281216', N'496138616573953', N'64290663792906240', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860334669824', N'496138616573953', N'66790433014943744', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860343058432', N'496138616573953', N'42087054753927168', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860347252736', N'496138616573953', N'67027338952445952', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860351447041', N'496138616573953', N'67027909637836800', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860359835648', N'496138616573953', N'67042515441684480', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860364029952', N'496138616573953', N'67082402312228864', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860368224256', N'496138616573953', N'16392452747300864', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860372418560', N'496138616573953', N'16392767785668608', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860376612865', N'496138616573953', N'16438800255291392', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860385001472', N'496138616573953', N'16438962738434048', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'77277860389195776', N'496138616573953', N'16439068543946752', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'7750f9be48ee09cd561fce718219a3e2', N'ee8626f80f7c2619917b6236f3a7f02b', N'882a73768cfd7f78f3a37584f7299656', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'7a5d31ba48fe3fb1266bf186dc5f7ba7', N'52b0cf022ac4187b2a70dfa4f8b2d940', N'58857ff846e61794c69208e9d3a85466', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'7ca833caa5eac837b7200d8b6de8b2e3', N'f6817f48af4fb3af11b9e8bf182f618b', N'fedfbf4420536cacc0218557d263dfea', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'7d2ea745950be3357747ec7750c31c57', N'ee8626f80f7c2619917b6236f3a7f02b', N'2a470fc0c3954d9dbb61de6d80846549', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'7de42bdc0b8c5446b7d428c66a7abc12', N'52b0cf022ac4187b2a70dfa4f8b2d940', N'54dd5457a3190740005c1bfec55b1c34', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'7e19d90cec0dd87aaef351b9ff8f4902', N'646c628b2b8295fbdab2d34044de0354', N'f9d3f4f27653a71c52faa9fb8070fbe7', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'7f862c47003eb20e8bad05f506371f92', N'ee8626f80f7c2619917b6236f3a7f02b', N'd7d6e2e4e2934f2c9385a623fd98c6f3', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'812ed54661b1a24b81b58974691a73f5', N'e51758fa916c881624b046d26bd09230', N'e6bfd1fcabfd7942fdd05f076d1dad38', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'83f704524b21b6a3ae324b8736c65333', N'ee8626f80f7c2619917b6236f3a7f02b', N'7ac9eb9ccbde2f7a033cd4944272bf1e', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'84d32474316a43b01256d6644e6e7751', N'ee8626f80f7c2619917b6236f3a7f02b', N'ec8d607d0156e198b11853760319c646', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'84eac2f113c23737128fb099d1d1da89', N'f6817f48af4fb3af11b9e8bf182f618b', N'03dc3d93261dda19fc86dd7ca486c6cf', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'85755a6c0bdff78b3860b52d35310c7f', N'e51758fa916c881624b046d26bd09230', N'c65321e57b7949b7a975313220de0422', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'86060e2867a5049d8a80d9fe5d8bc28b', N'f6817f48af4fb3af11b9e8bf182f618b', N'765dd244f37b804e3d00f475fd56149b', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'8703a2410cddb713c33232ce16ec04b9', N'ee8626f80f7c2619917b6236f3a7f02b', N'1367a93f2c410b169faa7abcbad2f77c', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'884f147c20e003cc80ed5b7efa598cbe', N'f6817f48af4fb3af11b9e8bf182f618b', N'e5973686ed495c379d829ea8b2881fc6', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'885c1a827383e5b2c6c4f8ca72a7b493', N'ee8626f80f7c2619917b6236f3a7f02b', N'4148ec82b6acd69f470bea75fe41c357', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'8a60df8d8b4c9ee5fa63f48aeee3ec00', N'1750a8fb3e6d90cb7957c02de1dc8e59', N'd7d6e2e4e2934f2c9385a623fd98c6f3', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'8b1e326791375f325d3e6b797753b65e', N'ee8626f80f7c2619917b6236f3a7f02b', N'2dbbafa22cda07fa5d169d741b81fe12', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'8ce1022dac4e558ff9694600515cf510', N'1750a8fb3e6d90cb7957c02de1dc8e59', N'08e6b9dc3c04489c8e1ff2ce6f105aa4', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'8d154c2382a8ae5c8d1b84bd38df2a93', N'f6817f48af4fb3af11b9e8bf182f618b', N'd86f58e7ab516d3bc6bfb1fe10585f97', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'8d848ca7feec5b7ebb3ecb32b2c8857a', N'52b0cf022ac4187b2a70dfa4f8b2d940', N'4148ec82b6acd69f470bea75fe41c357', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'8dd64f65a1014196078d0882f767cd85', N'f6817f48af4fb3af11b9e8bf182f618b', N'e3c13679c73a4f829bcff2aba8fd68b1', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'8e3dc1671abad4f3c83883b194d2e05a', N'f6817f48af4fb3af11b9e8bf182f618b', N'b1cb0a3fedf7ed0e4653cb5a229837ee', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'8eec2c510f1ac9c5eee26c041b1f00ca', N'ee8626f80f7c2619917b6236f3a7f02b', N'58857ff846e61794c69208e9d3a85466', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'8f762ff80253f634b08cf59a77742ba4', N'ee8626f80f7c2619917b6236f3a7f02b', N'9502685863ab87f0ad1134142788a385', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'903b790e6090414343502c6dc393b7c9', N'ee8626f80f7c2619917b6236f3a7f02b', N'de13e0f6328c069748de7399fcc1dbbd', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'905bf419332ebcb83863603b3ebe30f0', N'f6817f48af4fb3af11b9e8bf182f618b', N'8fb8172747a78756c11916216b8b8066', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'90996d56357730e173e636b99fc48bea', N'ee8626f80f7c2619917b6236f3a7f02b', N'fb07ca05a3e13674dbf6d3245956da2e', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'90e1c607a0631364eec310f3cc4acebd', N'ee8626f80f7c2619917b6236f3a7f02b', N'4f66409ef3bbd69c1d80469d6e2a885e', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'9264104cee9b10c96241d527b2d0346d', N'1750a8fb3e6d90cb7957c02de1dc8e59', N'54dd5457a3190740005c1bfec55b1c34', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'9380121ca9cfee4b372194630fce150e', N'f6817f48af4fb3af11b9e8bf182f618b', N'65a8f489f25a345836b7f44b1181197a', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'94911fef73a590f6824105ebf9b6cab3', N'f6817f48af4fb3af11b9e8bf182f618b', N'8b3bff2eee6f1939147f5c68292a1642', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'9700d20dbc1ae3cbf7de1c810b521fe6', N'f6817f48af4fb3af11b9e8bf182f618b', N'ec8d607d0156e198b11853760319c646', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'980171fda43adfe24840959b1d048d4d', N'f6817f48af4fb3af11b9e8bf182f618b', N'd7d6e2e4e2934f2c9385a623fd98c6f3', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'987c23b70873bd1d6dca52f30aafd8c2', N'f6817f48af4fb3af11b9e8bf182f618b', N'00a2a0ae65cdca5e93209cdbde97cbe6', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'98f02353f91dd569e3c6b8fd6b4f4034', N'ee8626f80f7c2619917b6236f3a7f02b', N'6531cf3421b1265aeeeabaab5e176e6d', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'9b2ad767f9861e64a20b097538feafd3', N'f6817f48af4fb3af11b9e8bf182f618b', N'73678f9daa45ed17a3674131b03432fb', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'9d8772c310b675ae43eacdbc6c7fa04a', N'a799c3b1b12dd3ed4bd046bfaef5fe6e', N'1663f3faba244d16c94552f849627d84', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'9d980ec0489040e631a9c24a6af42934', N'f6817f48af4fb3af11b9e8bf182f618b', N'05b3c82ddb2536a4a5ee1a4c46b5abef', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'9f8311ecccd44e079723098cf2ffe1cc', N'1750a8fb3e6d90cb7957c02de1dc8e59', N'693ce69af3432bd00be13c3971a57961', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'a034ed7c38c996b880d3e78f586fe0ae', N'f6817f48af4fb3af11b9e8bf182f618b', N'c89018ea6286e852b424466fd92a2ffc', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'a098e2acc3f90316f161f6648d085640', N'ee8626f80f7c2619917b6236f3a7f02b', N'e6bfd1fcabfd7942fdd05f076d1dad38', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'a307a9349ad64a2eff8ab69582fa9be4', N'f6817f48af4fb3af11b9e8bf182f618b', N'0620e402857b8c5b605e1ad9f4b89350', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'a5d25fdb3c62904a8474182706ce11a0', N'f6817f48af4fb3af11b9e8bf182f618b', N'418964ba087b90a84897b62474496b93', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'a66feaaf128417ad762e946abccf27ec', N'ee8626f80f7c2619917b6236f3a7f02b', N'c6cf95444d80435eb37b2f9db3971ae6', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'a72c31a3913c736d4eca11d13be99183', N'e51758fa916c881624b046d26bd09230', N'a44c30db536349e91106223957e684eb', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'a7ab87eac0f8fafa2efa4b1f9351923f', N'ee8626f80f7c2619917b6236f3a7f02b', N'fedfbf4420536cacc0218557d263dfea', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'abdc324a2df9f13ee6e73d44c6e62bc8', N'ee8626f80f7c2619917b6236f3a7f02b', N'f1cb187abf927c88b89470d08615f5ac', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'acacce4417e5d7f96a9c3be2ded5b4be', N'f6817f48af4fb3af11b9e8bf182f618b', N'f9d3f4f27653a71c52faa9fb8070fbe7', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'aefc8c22e061171806e59cd222f6b7e1', N'52b0cf022ac4187b2a70dfa4f8b2d940', N'e8af452d8948ea49d37c934f5100ae6a', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'af60ac8fafd807ed6b6b354613b9ccbc', N'f6817f48af4fb3af11b9e8bf182f618b', N'58857ff846e61794c69208e9d3a85466', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'b0c8a20800b8bf1ebdd7be473bceb44f', N'f6817f48af4fb3af11b9e8bf182f618b', N'58b9204feaf07e47284ddb36cd2d8468', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'b128ebe78fa5abb54a3a82c6689bdca3', N'f6817f48af4fb3af11b9e8bf182f618b', N'aedbf679b5773c1f25e9f7b10111da73', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'b131ebeafcfd059f3c7e542606ea9ff5', N'ee8626f80f7c2619917b6236f3a7f02b', N'e5973686ed495c379d829ea8b2881fc6', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'b21b07951bb547b09cc85624a841aea0', N'f6817f48af4fb3af11b9e8bf182f618b', N'4356a1a67b564f0988a484f5531fd4d9', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'b2b2dcfff6986d3d7f890ea62d474651', N'ee8626f80f7c2619917b6236f3a7f02b', N'200006f0edf145a2b50eacca07585451', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'b495a46fa0e0d4637abe0db7fd12fe1a', N'ee8626f80f7c2619917b6236f3a7f02b', N'717f6bee46f44a3897eca9abd6e2ec44', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'b64c4ab9cd9a2ea8ac1e9db5fb7cf522', N'f6817f48af4fb3af11b9e8bf182f618b', N'2aeddae571695cd6380f6d6d334d6e7d', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'bbec16ad016efec9ea2def38f4d3d9dc', N'f6817f48af4fb3af11b9e8bf182f618b', N'13212d3416eb690c2e1d5033166ff47a', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'bd30561f141f07827b836878137fddd8', N'e51758fa916c881624b046d26bd09230', N'65a8f489f25a345836b7f44b1181197a', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'bea2986432079d89203da888d99b3f16', N'f6817f48af4fb3af11b9e8bf182f618b', N'54dd5457a3190740005c1bfec55b1c34', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'c09373ebfc73fb5740db5ff02cba4f91', N'f6817f48af4fb3af11b9e8bf182f618b', N'339329ed54cf255e1f9392e84f136901', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'c56fb1658ee5f7476380786bf5905399', N'f6817f48af4fb3af11b9e8bf182f618b', N'de13e0f6328c069748de7399fcc1dbbd', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'c689539d20a445b0896270290c58d01f', N'e51758fa916c881624b046d26bd09230', N'13212d3416eb690c2e1d5033166ff47a', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'c6fee38d293b9d0596436a0cbd205070', N'f6817f48af4fb3af11b9e8bf182f618b', N'4f84f9400e5e92c95f05b554724c2b58', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'c8571839e6b14796e661f3e2843b80b6', N'ee8626f80f7c2619917b6236f3a7f02b', N'45c966826eeff4c99b8f8ebfe74511fc', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'c90b0b01c7ca454d2a1cb7408563e696', N'f6817f48af4fb3af11b9e8bf182f618b', N'882a73768cfd7f78f3a37584f7299656', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'c9d35261cccd67ab2932107a0967a7d7', N'e51758fa916c881624b046d26bd09230', N'b4dfc7d5dd9e8d5b6dd6d4579b1aa559', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'ced80e43584ce15e97bb07298e93020d', N'e51758fa916c881624b046d26bd09230', N'45c966826eeff4c99b8f8ebfe74511fc', NULL)
+GO
+print 'Processed 300 total records'
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'cf1feb1bf69eafc982295ad6c9c8d698', N'f6817f48af4fb3af11b9e8bf182f618b', N'a2b11669e98c5fe54a53c3e3c4f35d14', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'cf2ef620217673e4042f695743294f01', N'f6817f48af4fb3af11b9e8bf182f618b', N'717f6bee46f44a3897eca9abd6e2ec44', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'cf43895aef7fc684669483ab00ef2257', N'f6817f48af4fb3af11b9e8bf182f618b', N'700b7f95165c46cc7a78bf227aa8fed3', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'd03d792b0f312e7b490afc5cec3dd6c5', N'e51758fa916c881624b046d26bd09230', N'8fb8172747a78756c11916216b8b8066', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'd281a95b8f293d0fa2a136f46c4e0b10', N'f6817f48af4fb3af11b9e8bf182f618b', N'5c8042bd6c601270b2bbd9b20bccc68b', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'd37ad568e26f46ed0feca227aa9c2ffa', N'f6817f48af4fb3af11b9e8bf182f618b', N'9502685863ab87f0ad1134142788a385', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'd3ddcacee1acdfaa0810618b74e38ef2', N'f6817f48af4fb3af11b9e8bf182f618b', N'c6cf95444d80435eb37b2f9db3971ae6', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'd3fe195d59811531c05d31d8436f5c8b', N'1750a8fb3e6d90cb7957c02de1dc8e59', N'e8af452d8948ea49d37c934f5100ae6a', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'd5267597a4450f06d49d2fb63859641a', N'e51758fa916c881624b046d26bd09230', N'2dbbafa22cda07fa5d169d741b81fe12', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'd83282192a69514cfe6161b3087ff962', N'f6817f48af4fb3af11b9e8bf182f618b', N'53a9230444d33de28aa11cc108fb1dba', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'd8a5c9079df12090e108e21be94b4fd7', N'f6817f48af4fb3af11b9e8bf182f618b', N'078f9558cdeab239aecb2bda1a8ed0d1', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'dbc5dd836d45c5bc7bc94b22596ab956', N'f6817f48af4fb3af11b9e8bf182f618b', N'1939e035e803a99ceecb6f5563570fb2', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'dc83bb13c0e8c930e79d28b2db26f01f', N'f6817f48af4fb3af11b9e8bf182f618b', N'63b551e81c5956d5c861593d366d8c57', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'dc8fd3f79bd85bd832608b42167a1c71', N'f6817f48af4fb3af11b9e8bf182f618b', N'91c23960fab49335831cf43d820b0a61', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'de82e89b8b60a3ea99be5348f565c240', N'f6817f48af4fb3af11b9e8bf182f618b', N'56ca78fe0f22d815fabc793461af67b8', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'de8f43229e351d34af3c95b1b9f0a15d', N'f6817f48af4fb3af11b9e8bf182f618b', N'a400e4f4d54f79bf5ce160ae432231af', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'e258ca8bf7ee168b93bfee739668eb15', N'ee8626f80f7c2619917b6236f3a7f02b', N'fb367426764077dcf94640c843733985', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'e339f7db7418a4fd2bd2c113f1182186', N'ee8626f80f7c2619917b6236f3a7f02b', N'b1cb0a3fedf7ed0e4653cb5a229837ee', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'e3e922673f4289b18366bb51b6200f17', N'52b0cf022ac4187b2a70dfa4f8b2d940', N'45c966826eeff4c99b8f8ebfe74511fc', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'e7467726ee72235baaeb47df04a35e73', N'f6817f48af4fb3af11b9e8bf182f618b', N'e08cb190ef230d5d4f03824198773950', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'eaef4486f1c9b0408580bbfa2037eb66', N'f6817f48af4fb3af11b9e8bf182f618b', N'2a470fc0c3954d9dbb61de6d80846549', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'ec4bc97829ab56afd83f428b6dc37ff6', N'f6817f48af4fb3af11b9e8bf182f618b', N'200006f0edf145a2b50eacca07585451', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'ec846a3f85fdb6813e515be71f11b331', N'f6817f48af4fb3af11b9e8bf182f618b', N'732d48f8e0abe99fe6a23d18a3171cd1', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'ec93bb06f5be4c1f19522ca78180e2ef', N'f6817f48af4fb3af11b9e8bf182f618b', N'265de841c58907954b8877fb85212622', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'ecdd72fe694e6bba9c1d9fc925ee79de', N'f6817f48af4fb3af11b9e8bf182f618b', N'45c966826eeff4c99b8f8ebfe74511fc', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'edefd8d468f5727db465cf1b860af474', N'f6817f48af4fb3af11b9e8bf182f618b', N'6ad53fd1b220989a8b71ff482d683a5a', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'ef8bdd20d29447681ec91d3603e80c7b', N'f6817f48af4fb3af11b9e8bf182f618b', N'ae4fed059f67086fd52a73d913cf473d', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'f12b6c90e8913183d7ca547c66600891', N'e51758fa916c881624b046d26bd09230', N'aedbf679b5773c1f25e9f7b10111da73', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'f177acac0276329dc66af0c9ad30558a', N'f6817f48af4fb3af11b9e8bf182f618b', N'c2c356bf4ddd29975347a7047a062440', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'f17ab8ad1e71341140857ef4914ef297', N'21c5a3187763729408b40afb0d0fdfa8', N'732d48f8e0abe99fe6a23d18a3171cd1', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'f99f99cc3bc27220cdd4f5aced33b7d7', N'f6817f48af4fb3af11b9e8bf182f618b', N'655563cd64b75dcf52ef7bcdd4836953', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'fafe73c4448b977fe42880a6750c3ee8', N'f6817f48af4fb3af11b9e8bf182f618b', N'9cb91b8851db0cf7b19d7ecc2a8193dd', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'fced905c7598973b970d42d833f73474', N'f6817f48af4fb3af11b9e8bf182f618b', N'4875ebe289344e14844d8e3ea1edd73f', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'fd86f6b08eb683720ba499f9d9421726', N'ee8626f80f7c2619917b6236f3a7f02b', N'693ce69af3432bd00be13c3971a57961', NULL)
+INSERT [dbo].[sys_role_permission] ([id], [role_id], [permission_id], [data_rule_ids]) VALUES (N'fed41a4671285efb266cd404f24dd378', N'52b0cf022ac4187b2a70dfa4f8b2d940', N'00a2a0ae65cdca5e93209cdbde97cbe6', NULL)
+INSERT [dbo].[sys_role] ([id], [role_name], [role_code], [description], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e51758fa916c881624b046d26bd09230', N'人力资源部', N'hr', N'人力资源部', N'admin', CAST(0x07005674E897373F0B AS DateTime2), N'admin', CAST(0x0750C8A8ED82AB3F0B AS DateTime2))
+INSERT [dbo].[sys_role] ([id], [role_name], [role_code], [description], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ee8626f80f7c2619917b6236f3a7f02b', N'临时角色', N'test', N'这是新建的临时角色123', NULL, CAST(0x07008C0F125C173F0B AS DateTime2), N'admin', CAST(0x078008AAEE7E543F0B AS DateTime2))
+INSERT [dbo].[sys_role] ([id], [role_name], [role_code], [description], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f6817f48af4fb3af11b9e8bf182f618b', N'管理员', N'admin', N'管理员', NULL, CAST(0x07800F586297183F0B AS DateTime2), N'admin', CAST(0x07E05B6D5083AB3F0B AS DateTime2))
+INSERT [dbo].[sys_quartz_job] ([id], [create_by], [create_time], [del_flag], [update_by], [update_time], [job_class_name], [cron_expression], [parameter], [description], [status]) VALUES (N'5b3d2c087ad41aa755fc4f89697b01e7', N'admin', CAST(0x07802825DD9F873F0B AS DateTime2), 0, N'admin', CAST(0x0780EC2837A6873F0B AS DateTime2), N'org.jeecg.modules.message.job.SendMsgJob', N'0/60 * * * * ?', NULL, NULL, -1)
+INSERT [dbo].[sys_quartz_job] ([id], [create_by], [create_time], [del_flag], [update_by], [update_time], [job_class_name], [cron_expression], [parameter], [description], [status]) VALUES (N'a253cdfc811d69fa0efc70d052bc8128', N'admin', CAST(0x07002061D76A7B3F0B AS DateTime2), 0, N'admin', CAST(0x07007AC3D96A7B3F0B AS DateTime2), N'org.jeecg.modules.quartz.job.SampleJob', N'0/1 * * * * ?', NULL, NULL, -1)
+INSERT [dbo].[sys_quartz_job] ([id], [create_by], [create_time], [del_flag], [update_by], [update_time], [job_class_name], [cron_expression], [parameter], [description], [status]) VALUES (N'df26ecacf0f75d219d746750fe84bbee', NULL, NULL, 0, N'admin', CAST(0x0780A8CF147F353F0B AS DateTime2), N'org.jeecg.modules.quartz.job.SampleParamJob', N'0/1 * * * * ?', N'scott', N'带参测试 后台将每隔1秒执行输出日志', -1)
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'32b62cb04d6c788d9d92e3ff5e66854e', N'8d4683aacaa997ab86b966b464360338', N'000', N'00', N'!=', N'00', N'1', CAST(0x0700DC09EC9B7E3F0B AS DateTime2), N'admin', NULL, NULL)
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'40283181614231d401614234fe670003', N'40283181614231d401614232cd1c0001', N'createBy', N'createBy', N'=', N'#{sys_user_code}', N'1', CAST(0x070078F9FDB7D23D0B AS DateTime2), N'admin', NULL, NULL)
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'4028318161424e730161424fca6f0004', N'4028318161424e730161424f61510002', N'createBy', N'createBy', N'=', N'#{sys_user_code}', N'1', CAST(0x0700CEA114BCD23D0B AS DateTime2), N'admin', NULL, NULL)
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'402880e6487e661a01487e732c020005', N'402889fb486e848101486e93a7c80014', N'SYS_ORG_CODE', N'SYS_ORG_CODE', N'LIKE', N'010201%', N'1', CAST(0x070083A22DAC03390B AS DateTime2), N'admin', NULL, NULL)
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'402880e6487e661a01487e8153ee0007', N'402889fb486e848101486e93a7c80014', N'create_by', N'create_by', N'', N'#{SYS_USER_CODE}', N'1', CAST(0x07807C2B56AE03390B AS DateTime2), N'admin', NULL, NULL)
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'402880ec5ddec439015ddf9225060038', N'40288088481d019401481d2fcebf000d', N'复杂关系', N'', N'USE_SQL_RULES', N'name like ''%张%'' or age > 10', N'1', NULL, NULL, CAST(0x078086092F7F2A3D0B AS DateTime2), N'demo')
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'402880ec5ddfdd26015ddfe3e0570011', N'4028ab775dca0d1b015dca3fccb60016', N'复杂sql配置', N'', N'USE_SQL_RULES', N'table_name like ''%test%'' or is_tree = ''Y''', N'1', NULL, NULL, CAST(0x0780390B8C8B2A3D0B AS DateTime2), N'demo')
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'402880f25b1e2ac7015b1e5fdebc0012', N'402880f25b1e2ac7015b1e5cdc340010', N'只能看自己数据', N'create_by', N'=', N'#{sys_user_code}', N'1', CAST(0x07806B2FD18BA13C0B AS DateTime2), N'admin', NULL, NULL)
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'402881875b19f141015b19f8125e0014', N'40288088481d019401481d2fcebf000d', N'可看下属业务数据', N'sys_org_code', N'LIKE', N'#{sys_org_code}', N'1', NULL, NULL, CAST(0x070000A25C7E2A3D0B AS DateTime2), N'demo')
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'402881e45394d66901539500a4450001', N'402881e54df73c73014df75ab670000f', N'sysCompanyCode', N'sysCompanyCode', N'=', N'#{SYS_COMPANY_CODE}', N'1', CAST(0x07803626B0092B3B0B AS DateTime2), N'admin', NULL, NULL)
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'402881e45394d6690153950177cb0003', N'402881e54df73c73014df75ab670000f', N'sysOrgCode', N'sysOrgCode', N'=', N'#{SYS_ORG_CODE}', N'1', CAST(0x0780F555D0092B3B0B AS DateTime2), N'admin', NULL, NULL)
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'402881e56266f43101626727aff60067', N'402881e56266f43101626724eb730065', N'销售自己看自己的数据', N'createBy', N'=', N'#{sys_user_code}', N'1', CAST(0x07002281D4A00B3E0B AS DateTime2), N'admin', NULL, NULL)
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'402881e56266f4310162672fb1a70082', N'402881e56266f43101626724eb730065', N'销售经理看所有下级数据', N'sysOrgCode', N'LIKE', N'#{sys_org_code}', N'1', CAST(0x0780C66D0DA20B3E0B AS DateTime2), N'admin', NULL, NULL)
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'402881e56266f431016267387c9f0088', N'402881e56266f43101626724eb730065', N'只看金额大于1000的数据', N'money', N'>=', N'1000', N'1', CAST(0x078066C064A30B3E0B AS DateTime2), N'admin', NULL, NULL)
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'402881f3650de25101650dfb5a3a0010', N'402881e56266f4310162671d62050044', N'22', N'', N'USE_SQL_RULES', N'22', N'1', CAST(0x078094A9A27B8F3E0B AS DateTime2), N'admin', NULL, NULL)
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'402889fb486e848101486e913cd6000b', N'402889fb486e848101486e8e2e8b0007', N'userName', N'userName', N'=', N'admin', N'1', CAST(0x07807C5B439B00390B AS DateTime2), N'admin', NULL, NULL)
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'402889fb486e848101486e98d20d0016', N'402889fb486e848101486e93a7c80014', N'title', N'title', N'=', N'12', N'1', NULL, NULL, CAST(0x0700CBB8F7BA00390B AS DateTime2), N'scott')
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'402889fe47fcb29c0147fcb6b6220001', N'8a8ab0b246dc81120146dc8180fe002b', N'12', N'12', N'>', N'12', N'1', CAST(0x0700791C8085EA380B AS DateTime2), N'8a8ab0b246dc81120146dc8181950052', NULL, NULL)
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'4028ab775dca0d1b015dca4183530018', N'4028ab775dca0d1b015dca3fccb60016', N'表名限制', N'isDbSynch', N'=', N'Y', N'1', NULL, NULL, CAST(0x0780B6E5388C2A3D0B AS DateTime2), N'demo')
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'4028ef815595a881015595b0ccb60001', N'40288088481d019401481d2fcebf000d', N'限只能看自己', N'create_by', N'=', N'#{sys_user_code}', N'1', NULL, NULL, CAST(0x0700D62C477E2A3D0B AS DateTime2), N'demo')
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'4028ef81574ae99701574aed26530005', N'4028ef81574ae99701574aeb97bd0003', N'用户名', N'userName', N'!=', N'admin', N'1', CAST(0x07005F469A65E33B0B AS DateTime2), N'admin', NULL, NULL)
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'53609e1854f4a87eb23ed23a18a1042c', N'4148ec82b6acd69f470bea75fe41c357', N'只看当前部门数据', N'sysOrgCode', N'=', N'#{sys_org_code}', N'1', CAST(0x07809555EFA4A53F0B AS DateTime2), N'admin', CAST(0x07000DE4F5A4A53F0B AS DateTime2), N'admin')
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'a7d661ef5ac168b2b162420c6804dac5', N'4148ec82b6acd69f470bea75fe41c357', N'只看自己的数据', N'createBy', N'=', N'#{sys_user_code}', N'1', CAST(0x0780DA0CECA1A53F0B AS DateTime2), N'admin', CAST(0x07006174BEA2A53F0B AS DateTime2), N'admin')
+INSERT [dbo].[sys_permission_data_rule] ([id], [permission_id], [rule_name], [rule_column], [rule_conditions], [rule_value], [status], [create_time], [create_by], [update_time], [update_by]) VALUES (N'f852d85d47f224990147f2284c0c0005', NULL, N'小于', N'test', N'<=', N'11', N'1', CAST(0x07000489797BE8380B AS DateTime2), N'8a8ab0b246dc81120146dc8181950052', NULL, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'00a2a0ae65cdca5e93209cdbde97cbe6', N'2e42e3835c2b44ec9f7bc26c146ee531', N'成功', N'/result/success', N'result/Success', NULL, NULL, 1, NULL, NULL, 1, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'020b06793e4de2eee0007f603000c769', N'f0675b52d89100ee88472b6800754a08', N'ViserChartDemo', N'/report/ViserChartDemo', N'jeecg/report/ViserChartDemo', NULL, NULL, 1, NULL, NULL, 3, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x078010457FA07F3F0B AS DateTime2), N'admin', CAST(0x078010457FA07F3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'024f1fd1283dc632458976463d8984e1', N'700b7f95165c46cc7a78bf227aa8fed3', N'Tomcat信息', N'/monitor/TomcatInfo', N'modules/monitor/TomcatInfo', NULL, NULL, 1, NULL, NULL, 4, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x0780BCC0A6517E3F0B AS DateTime2), N'admin', CAST(0x07002BF66780A13F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'05b3c82ddb2536a4a5ee1a4c46b5abef', N'540a2936940846cb98114ffb0d145cb8', N'用户列表', N'/list/user-list', N'list/UserList', NULL, NULL, 1, NULL, NULL, 3, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'0620e402857b8c5b605e1ad9f4b89350', N'2a470fc0c3954d9dbb61de6d80846549', N'异步树列表Demo', N'/jeecg/JeecgTreeTable', N'jeecg/JeecgTreeTable', NULL, NULL, 1, NULL, N'0', 3, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x0700BFCEC092A73F0B AS DateTime2), N'admin', CAST(0x0780A6950093A73F0B AS DateTime2), 0, 0, N'1')
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'078f9558cdeab239aecb2bda1a8ed0d1', N'fb07ca05a3e13674dbf6d3245956da2e', N'搜索列表（文章）', N'/list/search/article', N'list/TableList', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x0700AD016D754D3F0B AS DateTime2), N'admin', CAST(0x070015E5D8774D3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'08e6b9dc3c04489c8e1ff2ce6f105aa4', N'', N'系统监控', N'/dashboard3', N'layouts/RouteView', NULL, NULL, 0, NULL, NULL, 6, 0, N'dashboard', 1, 0, 0, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), N'admin', CAST(0x07003BF130BB7C3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'13212d3416eb690c2e1d5033166ff47a', N'2e42e3835c2b44ec9f7bc26c146ee531', N'失败', N'/result/fail', N'result/Error', NULL, NULL, 1, NULL, NULL, 2, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'1367a93f2c410b169faa7abcbad2f77c', N'6e73eb3c26099c191bf03852ee1310a1', N'基本设置', N'/account/settings/base', N'account/settings/BaseSetting', NULL, NULL, 1, N'BaseSettings', NULL, NULL, 0, NULL, 1, 1, 1, NULL, NULL, CAST(0x0780BFE90E9F1D3F0B AS DateTime2), N'admin', CAST(0x0780AF299E6C713F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'190c2b43bec6a5f7a4194a85db67d96a', N'd7d6e2e4e2934f2c9385a623fd98c6f3', N'角色维护', N'/system/roleUserList', N'system/RoleUserList', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x070092CDAC7F8D3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'1a0811914300741f4e11838ff37a1d3a', N'3f915b2769fc80648e92d04e84ca059d', N'手机号禁用', NULL, NULL, NULL, NULL, 2, N'user:form:phone', N'2', 1, 0, NULL, 0, 1, 0, NULL, N'admin', CAST(0x0700BD6A3791A53F0B AS DateTime2), N'admin', CAST(0x07003FECEC96A53F0B AS DateTime2), 0, 0, N'1')
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'200006f0edf145a2b50eacca07585451', N'fb07ca05a3e13674dbf6d3245956da2e', N'搜索列表（应用）', N'/list/search/application', N'list/TableList', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x078037AABE754D3F0B AS DateTime2), N'admin', CAST(0x07801A044E774D3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'265de841c58907954b8877fb85212622', N'2a470fc0c3954d9dbb61de6d80846549', N'图片拖拽排序', N'/jeecg/imgDragSort', N'jeecg/ImgDragSort', NULL, NULL, 1, NULL, NULL, 4, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x0700863DD859953F0B AS DateTime2), N'admin', CAST(0x0700ED414E5A953F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'277bfabef7d76e89b33062b16a9a5020', N'e3c13679c73a4f829bcff2aba8fd68b1', N'基础表单', N'/form/base-form', N'form/BasicForm', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 0, 0, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), N'admin', CAST(0x07002856CA8E5B3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'2a470fc0c3954d9dbb61de6d80846549', N'', N'常见案例', N'/jeecg', N'layouts/RouteView', NULL, NULL, 0, NULL, NULL, 7, 0, N'qrcode', 1, 0, 0, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), N'admin', CAST(0x0700BD8FB9627E3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'2aeddae571695cd6380f6d6d334d6e7d', N'f0675b52d89100ee88472b6800754a08', N'布局统计报表', N'/report/ArchivesStatisticst', N'jeecg/report/ArchivesStatisticst', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x070048D4749B7F3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'2dbbafa22cda07fa5d169d741b81fe12', N'08e6b9dc3c04489c8e1ff2ce6f105aa4', N'在线文档', N'{{ window._CONFIG[''domianURL''] }}/swagger-ui.html#/', N'layouts/IframePageView', NULL, NULL, 1, NULL, NULL, 3, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x0780A644D253403F0B AS DateTime2), N'admin', CAST(0x078007C580A5743F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'2e42e3835c2b44ec9f7bc26c146ee531', N'', N'结果页', N'/result', N'layouts/PageView', NULL, NULL, 0, NULL, NULL, 8, 0, N'check-circle-o', 1, 0, 0, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), N'admin', CAST(0x0700F8E7C1627E3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'339329ed54cf255e1f9392e84f136901', N'2a470fc0c3954d9dbb61de6d80846549', N'helloworld', N'/jeecg/helloworld', N'jeecg/helloworld', NULL, NULL, 1, NULL, NULL, 4, 0, NULL, 1, 1, 0, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), N'admin', CAST(0x0700FCF59789503F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'3f915b2769fc80648e92d04e84ca059d', N'd7d6e2e4e2934f2c9385a623fd98c6f3', N'用户管理', N'/isystem/user', N'system/UserList', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 0, 0, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), N'admin', CAST(0x0780565D125F6D3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'3fac0d3c9cd40fa53ab70d4c583821f8', N'2a470fc0c3954d9dbb61de6d80846549', N'分屏', N'/jeecg/splitPanel', N'jeecg/SplitPanel', NULL, NULL, 1, NULL, NULL, 6, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x07006972E589953F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'4148ec82b6acd69f470bea75fe41c357', N'2a470fc0c3954d9dbb61de6d80846549', N'单表模型示例', N'/jeecg/jeecgDemoList', N'jeecg/JeecgDemoList', N'DemoList', NULL, 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, NULL, CAST(0x070051DEC2851F3F0B AS DateTime2), N'admin', CAST(0x0780D0A28C89503F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'418964ba087b90a84897b62474496b93', N'540a2936940846cb98114ffb0d145cb8', N'查询表格', N'/list/query-list', N'list/TableList', NULL, NULL, 1, NULL, NULL, 1, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'4356a1a67b564f0988a484f5531fd4d9', N'2a470fc0c3954d9dbb61de6d80846549', N'内嵌Table', N'/jeecg/TableExpandeSub', N'jeecg/TableExpandeSub', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x0780B43D23BF803F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'45c966826eeff4c99b8f8ebfe74511fc', N'd7d6e2e4e2934f2c9385a623fd98c6f3', N'部门管理', N'/isystem/depart', N'system/DepartList', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x0700AE80889D3F3F0B AS DateTime2), N'admin', CAST(0x07006AA881A2643F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'4875ebe289344e14844d8e3ea1edd73f', N'', N'详情页', N'/profile', N'layouts/RouteView', NULL, NULL, 0, NULL, NULL, 8, 0, N'profile', 1, 0, 0, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), N'admin', CAST(0x07004423BD627E3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'4f66409ef3bbd69c1d80469d6e2a885e', N'6e73eb3c26099c191bf03852ee1310a1', N'账户绑定', N'/account/settings/binding', N'account/settings/Binding', NULL, NULL, 1, N'BindingSettings', NULL, NULL, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x0700C042719F1D3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'4f84f9400e5e92c95f05b554724c2b58', N'540a2936940846cb98114ffb0d145cb8', N'角色列表', N'/list/role-list', N'list/RoleList', NULL, NULL, 1, NULL, NULL, 4, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'53a9230444d33de28aa11cc108fb1dba', N'd7d6e2e4e2934f2c9385a623fd98c6f3', N'我的消息', N'/isps/userAnnouncement', N'system/UserAnnouncementList', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x070070E00D568F3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'540a2936940846cb98114ffb0d145cb8', N'', N'列表页', N'/list', N'layouts/PageView', NULL, N'/list/query-list', 0, NULL, NULL, 9, 0, N'table', 1, 0, 0, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), N'admin', CAST(0x07002A0E3EBB7C3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'54dd5457a3190740005c1bfec55b1c34', N'd7d6e2e4e2934f2c9385a623fd98c6f3', N'菜单管理', N'/isystem/permission', N'system/PermissionList', NULL, NULL, 1, NULL, NULL, 3, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'58857ff846e61794c69208e9d3a85466', N'08e6b9dc3c04489c8e1ff2ce6f105aa4', N'日志管理', N'/isystem/log', N'system/LogList', NULL, NULL, 1, NULL, NULL, 1, 0, N'', 1, 1, 0, NULL, NULL, CAST(0x0700A7CA65551D3F0B AS DateTime2), N'admin', CAST(0x0780DA8E8C617E3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'58b9204feaf07e47284ddb36cd2d8468', N'2a470fc0c3954d9dbb61de6d80846549', N'图片翻页', N'/jeecg/imgTurnPage', N'jeecg/ImgTurnPage', NULL, NULL, 1, NULL, NULL, 4, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x070001EF5361953F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'5c2f42277948043026b7a14692456828', N'd7d6e2e4e2934f2c9385a623fd98c6f3', N'我的部门', N'/system/departUserList', N'system/DepartUserList', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x07007CF7757F8D3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'5c8042bd6c601270b2bbd9b20bccc68b', N'', N'消息中心', N'/message', N'layouts/RouteView', NULL, NULL, 0, NULL, NULL, 6, 0, N'message', 1, 0, 0, NULL, N'admin', CAST(0x070030A3E85C853F0B AS DateTime2), N'admin', CAST(0x0700519DF2A5873F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'6531cf3421b1265aeeeabaab5e176e6d', N'e3c13679c73a4f829bcff2aba8fd68b1', N'分步表单', N'/form/step-form', N'form/stepForm/StepForm', NULL, NULL, 1, NULL, NULL, 2, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'655563cd64b75dcf52ef7bcdd4836953', N'2a470fc0c3954d9dbb61de6d80846549', N'图片预览', N'/jeecg/ImagPreview', N'jeecg/ImagPreview', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x0780D8FDD15E8D3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'65a8f489f25a345836b7f44b1181197a', N'c65321e57b7949b7a975313220de0422', N'403', N'/exception/403', N'exception/403', NULL, NULL, 1, NULL, NULL, 1, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'6ad53fd1b220989a8b71ff482d683a5a', N'2a470fc0c3954d9dbb61de6d80846549', N'一对多Tab示例', N'/jeecg/tablist/JeecgOrderDMainList', N'jeecg/tablist/JeecgOrderDMainList', NULL, NULL, 1, NULL, NULL, 2, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x0780486EA77B553F0B AS DateTime2), N'admin', CAST(0x0780F49FCA89563F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'6e73eb3c26099c191bf03852ee1310a1', N'717f6bee46f44a3897eca9abd6e2ec44', N'个人设置', N'/account/settings/base', N'account/settings/Index', NULL, NULL, 1, NULL, NULL, 2, 1, NULL, 1, 0, 0, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), N'admin', CAST(0x0780CE282D518F3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'700b7f95165c46cc7a78bf227aa8fed3', N'08e6b9dc3c04489c8e1ff2ce6f105aa4', N'性能监控', N'/monitor', N'layouts/RouteView', NULL, NULL, 1, NULL, NULL, 0, 0, NULL, 1, 0, 0, NULL, N'admin', CAST(0x0700C1A307617E3F0B AS DateTime2), N'admin', CAST(0x0780EF6E72959F3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'717f6bee46f44a3897eca9abd6e2ec44', NULL, N'个人页', N'/account', N'layouts/RouteView', NULL, NULL, 0, NULL, NULL, 9, 0, N'user', 1, 0, NULL, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'73678f9daa45ed17a3674131b03432fb', N'540a2936940846cb98114ffb0d145cb8', N'权限列表', N'/list/permission-list', N'list/PermissionList', NULL, NULL, 1, NULL, NULL, 5, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'7593c9e3523a17bca83b8d7fe8a34e58', N'3f915b2769fc80648e92d04e84ca059d', N'添加用户按钮', N'', NULL, NULL, NULL, 2, N'user:add', N'1', 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x0780565D125F6D3F0B AS DateTime2), N'admin', CAST(0x0710F6406580AB3F0B AS DateTime2), 0, 0, N'1')
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'7960961b0063228937da5fa8dd73d371', N'2a470fc0c3954d9dbb61de6d80846549', N'JEditableTable示例', N'/jeecg/JEditableTable', N'jeecg/JeecgEditableTableExample', NULL, NULL, 1, NULL, NULL, 7, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x0700B104D880733F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'7ac9eb9ccbde2f7a033cd4944272bf1e', N'540a2936940846cb98114ffb0d145cb8', N'卡片列表', N'/list/card', N'list/CardList', NULL, NULL, 1, NULL, NULL, 7, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'841057b8a1bef8f6b4b20f9a618a7fa6', N'08e6b9dc3c04489c8e1ff2ce6f105aa4', N'数据日志', N'/sys/dataLog-list', N'system/DataLogList', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x0780A29D00A3683F0B AS DateTime2), N'admin', CAST(0x078009F7E561693F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'882a73768cfd7f78f3a37584f7299656', N'6e73eb3c26099c191bf03852ee1310a1', N'个性化设置', N'/account/settings/custom', N'account/settings/Custom', NULL, NULL, 1, N'CustomSettings', NULL, NULL, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x0700C3FE5C9F1D3F0B AS DateTime2), NULL, CAST(0x0780C8EDE4B11D3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'8b3bff2eee6f1939147f5c68292a1642', N'700b7f95165c46cc7a78bf227aa8fed3', N'服务器信息', N'/monitor/SystemInfo', N'modules/monitor/SystemInfo', NULL, NULL, 1, NULL, NULL, 4, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x07804D83B1617E3F0B AS DateTime2), N'admin', CAST(0x0700353652837E3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'8d1ebd663688965f1fd86a2f0ead3416', N'700b7f95165c46cc7a78bf227aa8fed3', N'Redis监控', N'/monitor/redis/info', N'modules/monitor/RedisInfo', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x0780B008946E7E3F0B AS DateTime2), N'admin', CAST(0x0700C36C5E80A13F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'8fb8172747a78756c11916216b8b8066', N'717f6bee46f44a3897eca9abd6e2ec44', N'工作台', N'/dashboard/workplace', N'dashboard/Workplace', NULL, NULL, 1, NULL, NULL, 3, 0, NULL, 1, 1, 0, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), N'admin', CAST(0x0700F3F47D627E3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'944abf0a8fc22fe1f1154a389a574154', N'5c8042bd6c601270b2bbd9b20bccc68b', N'消息管理', N'/modules/message/sysMessageList', N'modules/message/SysMessageList', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x078002A01860853F0B AS DateTime2), N'admin', CAST(0x0780B7EEA3A3853F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'9502685863ab87f0ad1134142788a385', N'', N'首页', N'/dashboard/analysis', N'dashboard/Analysis', NULL, NULL, 0, NULL, NULL, 0, 0, N'home', 1, 1, 0, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), N'admin', CAST(0x0780343DCA5C7A3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'97c8629abc7848eccdb6d77c24bb3ebb', N'700b7f95165c46cc7a78bf227aa8fed3', N'磁盘监控', N'/monitor/Disk', N'modules/monitor/DiskMonitoring', NULL, NULL, 1, NULL, NULL, 6, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x07006B338D79953F0B AS DateTime2), N'admin', CAST(0x0700094F8C7A9F3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'9a90363f216a6a08f32eecb3f0bf12a3', N'2a470fc0c3954d9dbb61de6d80846549', N'常用选择组件', N'/jeecg/SelectDemo', N'jeecg/SelectDemo', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x07809AE9DD5E703F0B AS DateTime2), N'admin', CAST(0x070055C5DF82863F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'9cb91b8851db0cf7b19d7ecc2a8193dd', N'1939e035e803a99ceecb6f5563570fb2', N'我的任务表单', N'/modules/bpm/task/form/FormModule', N'modules/bpm/task/form/FormModule', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x0780D6A1F78C653F0B AS DateTime2), N'admin', CAST(0x07005A692C9C653F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'a2b11669e98c5fe54a53c3e3c4f35d14', N'f0675b52d89100ee88472b6800754a08', N'类别统计报表', N'/report/Analysis', N'jeecg/report/Analysis', NULL, N'', 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x0700763ECE9F7F3F0B AS DateTime2), N'admin', CAST(0x07005FE303A07F3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'a400e4f4d54f79bf5ce160ae432231af', N'2a470fc0c3954d9dbb61de6d80846549', N'百度', N'http://www.baidu.com', N'layouts/IframePageView', NULL, NULL, 1, NULL, NULL, 4, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x070047B76AA53F3F0B AS DateTime2), N'admin', CAST(0x070083899B89503F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'ae4fed059f67086fd52a73d913cf473d', N'540a2936940846cb98114ffb0d145cb8', N'内联编辑表格', N'/list/edit-table', N'list/TableInnerEditList', NULL, NULL, 1, NULL, NULL, 2, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'aedbf679b5773c1f25e9f7b10111da73', N'08e6b9dc3c04489c8e1ff2ce6f105aa4', N'SQL监控', N'{{ window._CONFIG[''domianURL''] }}/druid/', N'layouts/IframePageView', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x070059D17E51403F0B AS DateTime2), N'admin', CAST(0x0700C3FE5C9F743F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'b1cb0a3fedf7ed0e4653cb5a229837ee', N'08e6b9dc3c04489c8e1ff2ce6f105aa4', N'定时任务', N'/isystem/QuartzJobList', N'system/QuartzJobList', NULL, NULL, 1, NULL, NULL, 3, 0, NULL, 1, 1, 0, NULL, NULL, CAST(0x07009EE2DD50253F0B AS DateTime2), N'admin', CAST(0x078044BA33577E3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'b3c824fc22bd953e2eb16ae6914ac8f9', N'4875ebe289344e14844d8e3ea1edd73f', N'高级详情页', N'/profile/advanced', N'profile/advanced/Advanced', NULL, NULL, 1, NULL, NULL, 2, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'b4dfc7d5dd9e8d5b6dd6d4579b1aa559', N'c65321e57b7949b7a975313220de0422', N'500', N'/exception/500', N'exception/500', NULL, NULL, 1, NULL, NULL, 3, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'b6bcee2ccc854052d3cc3e9c96d90197', N'71102b3b87fb07e5527bbd2c530dd90a', N'加班申请', N'/modules/extbpm/joa/JoaOvertimeList', N'modules/extbpm/joa/JoaOvertimeList', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x0700FFA35C827F3F0B AS DateTime2), N'admin', CAST(0x07009C0D97827F3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'c431130c0bc0ec71b0a5be37747bb36a', N'2a470fc0c3954d9dbb61de6d80846549', N'一对多JEditable', N'/jeecg/JeecgOrderMainListForJEditableTable', N'jeecg/JeecgOrderMainListForJEditableTable', NULL, NULL, 1, NULL, NULL, 3, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x0780B1BD145B7A3F0B AS DateTime2), N'admin', CAST(0x07808374FCA8803F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'c65321e57b7949b7a975313220de0422', NULL, N'异常页', N'/exception', N'layouts/RouteView', NULL, NULL, 0, NULL, NULL, 8, NULL, N'warning', 1, 0, NULL, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'c6cf95444d80435eb37b2f9db3971ae6', N'2a470fc0c3954d9dbb61de6d80846549', N'数据回执模拟', N'/jeecg/InterfaceTest', N'jeecg/InterfaceTest', NULL, NULL, 1, NULL, NULL, 6, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x078091827186543F0B AS DateTime2), N'admin', CAST(0x0780CA2AB589563F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'cc50656cf9ca528e6f2150eba4714ad2', N'4875ebe289344e14844d8e3ea1edd73f', N'基础详情页', N'/profile/basic', N'profile/basic/Index', NULL, NULL, 1, NULL, NULL, 1, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'd07a2c87a451434c99ab06296727ec4f', N'700b7f95165c46cc7a78bf227aa8fed3', N'JVM信息', N'/monitor/JvmInfo', N'modules/monitor/JvmInfo', NULL, NULL, 1, NULL, NULL, 4, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x07007A98DFC17D3F0B AS DateTime2), N'admin', CAST(0x0700FE3268617E3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'd2bbf9ebca5a8fa2e227af97d2da7548', N'c65321e57b7949b7a975313220de0422', N'404', N'/exception/404', N'exception/404', NULL, NULL, 1, NULL, NULL, 2, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'd7d6e2e4e2934f2c9385a623fd98c6f3', N'', N'系统管理', N'/isystem', N'layouts/RouteView', NULL, NULL, 1, NULL, NULL, 4, 0, N'setting', 1, 0, 0, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), N'admin', CAST(0x0700B45D2DBB7C3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'd86f58e7ab516d3bc6bfb1fe10585f97', N'717f6bee46f44a3897eca9abd6e2ec44', N'个人中心', N'/account/center', N'account/center/Index', NULL, NULL, 1, NULL, NULL, 1, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'de13e0f6328c069748de7399fcc1dbbd', N'fb07ca05a3e13674dbf6d3245956da2e', N'搜索列表（项目）', N'/list/search/project', N'list/TableList', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x07007A5894754D3F0B AS DateTime2), N'admin', CAST(0x0700192658774D3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'e08cb190ef230d5d4f03824198773950', N'd7d6e2e4e2934f2c9385a623fd98c6f3', N'系统通告', N'/isystem/annountCement', N'system/SysAnnouncementList', NULL, NULL, 1, N'annountCement', NULL, 6, NULL, N'', 1, 1, NULL, NULL, NULL, CAST(0x0780C82EB591243F0B AS DateTime2), NULL, CAST(0x0780E765E092243F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'e1979bb53e9ea51cecc74d86fd9d2f64', N'2a470fc0c3954d9dbb61de6d80846549', N'PDF预览', N'/jeecg/jeecgPdfView', N'jeecg/JeecgPdfView', NULL, NULL, 1, NULL, NULL, 3, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x07804D485959953F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'e3c13679c73a4f829bcff2aba8fd68b1', N'', N'表单页', N'/form', N'layouts/PageView', NULL, NULL, 0, NULL, NULL, 9, 0, N'form', 1, 0, 0, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), N'admin', CAST(0x0700A37A3ABB7C3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'e5973686ed495c379d829ea8b2881fc6', N'e3c13679c73a4f829bcff2aba8fd68b1', N'高级表单', N'/form/advanced-form', N'form/advancedForm/AdvancedForm', NULL, NULL, 1, NULL, NULL, 3, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'e6bfd1fcabfd7942fdd05f076d1dad38', N'2a470fc0c3954d9dbb61de6d80846549', N'打印测试', N'/jeecg/PrintDemo', N'jeecg/PrintDemo', NULL, NULL, 1, NULL, NULL, 3, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x07002C5CF185543F0B AS DateTime2), N'admin', CAST(0x0780E144AFA9A13F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'e8af452d8948ea49d37c934f5100ae6a', N'd7d6e2e4e2934f2c9385a623fd98c6f3', N'角色管理', N'/isystem/role', N'system/RoleList', NULL, NULL, 1, NULL, NULL, 2, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'ec8d607d0156e198b11853760319c646', N'6e73eb3c26099c191bf03852ee1310a1', N'安全设置', N'/account/settings/security', N'account/settings/Security', NULL, NULL, 1, N'SecuritySettings', NULL, NULL, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x070004CF3C9F1D3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'f0675b52d89100ee88472b6800754a08', N'', N'统计报表', N'/report', N'layouts/RouteView', NULL, NULL, 0, NULL, NULL, 7, 0, N'bar-chart', 1, 0, 0, NULL, N'admin', CAST(0x07003D69599B7F3F0B AS DateTime2), N'admin', CAST(0x0780C56F0DA6873F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'f1cb187abf927c88b89470d08615f5ac', N'd7d6e2e4e2934f2c9385a623fd98c6f3', N'数据字典', N'/isystem/dict', N'system/DictList', NULL, NULL, 1, NULL, NULL, 5, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x078053CB9B741F3F0B AS DateTime2), NULL, CAST(0x0700F5EA05831F3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'f23d9bfff4d9aa6b68569ba2cff38415', N'540a2936940846cb98114ffb0d145cb8', N'标准列表', N'/list/basic-list', N'list/StandardList', NULL, NULL, 1, NULL, NULL, 6, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'f780d0d3083d849ccbdb1b1baee4911d', N'5c8042bd6c601270b2bbd9b20bccc68b', N'模板管理', N'/modules/message/sysMessageTemplateList', N'modules/message/SysMessageTemplateList', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x07805D0E4263853F0B AS DateTime2), N'admin', CAST(0x07006D242256883F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'fb07ca05a3e13674dbf6d3245956da2e', N'540a2936940846cb98114ffb0d145cb8', N'搜索列表', N'/list/search', N'list/search/SearchLayout', NULL, N'/list/search/article', 1, NULL, NULL, 8, 0, NULL, 1, 0, 0, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), N'admin', CAST(0x0780321F047F4D3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'fb367426764077dcf94640c843733985', N'2a470fc0c3954d9dbb61de6d80846549', N'一对多示例', N'/jeecg/JeecgOrderMainList', N'jeecg/JeecgOrderMainList', NULL, NULL, 1, NULL, NULL, 2, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x078087237D89503F0B AS DateTime2), N'admin', CAST(0x0700F727D65A533F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'fc810a2267dd183e4ef7c71cc60f4670', N'700b7f95165c46cc7a78bf227aa8fed3', N'请求追踪', N'/monitor/HttpTrace', N'modules/monitor/HttpTrace', NULL, NULL, 1, NULL, NULL, 4, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x07806751E8517E3F0B AS DateTime2), N'admin', CAST(0x078075C16E617E3F0B AS DateTime2), 0, 0, NULL)
+INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'fedfbf4420536cacc0218557d263dfea', N'6e73eb3c26099c191bf03852ee1310a1', N'新消息通知', N'/account/settings/notification', N'account/settings/Notification', NULL, NULL, 1, N'NotificationSettings', NULL, NULL, NULL, N'', 1, 1, NULL, NULL, NULL, CAST(0x078034158C9F1D3F0B AS DateTime2), NULL, NULL, 0, 0, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'002b7112a147edeb6149a891494577d0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F97BB3BF593F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'00f763e007e5a6bddf4cb8e562a53005', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780874287835A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'01075aa535274735e0df0a8bc44f62f9', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0700DB680A8E853F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'016510fc662d9bb24d0186c5478df268', 1, N'用户名: admin,登录成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x070017AB73AB5B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0169622dcd4e89b177a0917778ac7f9c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700B3229E5E393F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'017e9596f489951f1cc7d978085adc00', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700ECE9EB5B653F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'018fe8d3f049a32fb8b541c893058713', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07006F8233804E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'01ebe1cbeae916a9228770f63130fdac', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070035CB0C8E853F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'02026841bf8a9204db2c500c86a4a9be', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'192.168.1.104', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700417AEBAD663F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'024a4c5ba78538d05373dac650b227d1', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07009F501686573F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0251bbee51c28f83459f4a57eeb61777', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A3A66BBA743F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'02d4447c9d97ac4fc1c3a9a4c789c2a8', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x070075D8449A793F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'03c0ab177bd7d840b778713b37daf86f', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0780AAB282547E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'03ec66b6b6d17c007ec2f918efe5b898', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07800333D366763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0473dedf4aa653b253b008dacff2937c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07003E40A06D593F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0475b4445d5f58f29212258c1644f339', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07801D4F7CAA5E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'04f97d7f906c1e97384a94f3728606a4', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07800BB5D165683F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'055cf35c8865761b479c7f289dc36616', 2, N'添加测试DEMO', NULL, N'admin', N'管理员', N'127.0.0.1', N'org.jeecg.modules.demo.test.controller.JeecgDemoController.add()', NULL, N'[{"createBy":"admin","createTime":1547912238787,"email":"zhangdaiscott@163.com","id":"c2c0d49e3c01913067cf8d1fb3c971d2","name":"zhang daihao"}]', NULL, 16, N'admin', CAST(0x07000B99FEC5353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'056dd4466f4ed51de26c535fd9864828', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780635EDBA5873F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0571e5730ee624d0dd1b095ad7101738', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700A1B49F876F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'059bac84373e9dae94363ea18802d70f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700A0A0C954393F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'060d541a9571ca2b0d24790a98d170a6', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700BA512DA3803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'063baad688535096d2ed906ae6f3a128', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780BE42B5B9533F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0643f3ad4394de9fb3c491080c6a7a03', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700AD6F6E56543F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'06fbb85b34f518cd211b948552de72f8', 1, N'登录失败，用户名:null不存在！', NULL, NULL, NULL, N'192.168.1.104', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700A718D8A8663F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'07132c1228b1c165f62ea35f4ff1cbe9', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700487A1299543F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'07a0b3f8b4140a7a586305c2f40a2310', 2, N'删除测试DEMO', NULL, N'admin', N'管理员', N'127.0.0.1', N'org.jeecg.modules.demo.test.controller.JeecgDemoController.delete()', NULL, N'["7eac655877842eb39dc2f0469f3964ec"]', NULL, 14, N'admin', CAST(0x0780F30C1083353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0819ea9729ddf70f64ace59370a62cf1', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780B971379F7E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0913bb0e92715892c470cf538726dfbc', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780709B8188543F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'097be3e8fdf77a245f5c85884e97b88c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07809C5DC5BF623F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0a24b1f04f79a2bcb83c4cd12d077cbc', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F4075493373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0a634ed086442afa7a5fc9aa000b898a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780B98B4E555A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0a6eb1fa998b749012216542a2447ae7', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700097152604E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0aa792eadeae39a1ed2a98ea5d2f6d27', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780978A104D513F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0aa9272c0581e1d7f62b1293375b4574', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07002E553592513F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0ad51ba59da2c8763a4e6ed6e0a292b2', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07802EDBC8936F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0b42292a532c796495a34d8d9c633afa', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07807F3CB16C653F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0b9940fc5487026a3f16cade73efead5', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700967C2D605A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0ba24c5f61ff53f93134cf932dd486db', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07801CABDEB07C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0bc44e2d682c9f28525d203589a90b43', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07004EC2FCAB353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0d4582c6b7719b0bfc0260939d97274f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078049BDD5B6863F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0d6cd835072c83f46d1d2a3cf13225d3', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700D67B3E655E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0d85728028ed67da696137c0e82ab2f6', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07800314C96C6D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0dc22e52c9173e4e880728bc7734ff65', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780ED21445E663F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0dc6d04b99e76ad400eef1ded2d3d97c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07803EBBC8537E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0e365a21c60e4460813bdc4e3cb320a3', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07009BAC00C1353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0e41fe3a34d5715bf4c88e220663583a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070087AB108F353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0e754ee377033067f7b2f10b56b8784c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078002D5F8907D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0e9c0d0d26ddc652a7277912e0784d11', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07805C3D7368393F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0ef3e7ae8c073a7e3bdd736068f86c84', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07804BD3EC64763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0efc9df0d52c65ec318e7b46db21655f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07806506F172723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0f173ec7e8819358819aa14aafc724c0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700AB736E5E763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'10922e0d030960e6b026c67c6179247b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780B9D9C0A85A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'10a434c326e39b1d046defddc8c57f4a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078080209AB27F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'111156480d4d18ebf40427083f25830f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'192.168.1.104', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700F1C218A6663F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'11802c7a3644af411bc4e085553cfd4f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780D7B0DA7B743F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'11f511eeeb2e91af86b9d5e05132fc89', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780ED0DA57F5B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'122edcafd54dd06e12838f41123d9d5d', 2, N'添加测试DEMO', NULL, N'admin', N'管理员', N'127.0.0.1', N'org.jeecg.modules.demo.test.controller.JeecgDemoController.add()', NULL, N'[{"age":28,"birthday":1546617600000,"createBy":"admin","createTime":1547901234989,"id":"42c08b1a2e5b2a96ffa4cc88383d4b11","name":"秦500","punchTime":1546691611000}]', NULL, 21387, N'admin', CAST(0x0780E3D569AC353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1241cf8e9fd0e28478a07bf755f528c5', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070010BAF85A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'12709e62742056aa4a57fa8c2c82d84a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070017C8464D553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'130de55edac71aab730786307cc65936', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A619D8AA353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'131ccd390401b6e3894a37e4d1d195d3', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07009EB427BC593F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'13c1e763e9d624a69727a38b85411352', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700FA8E529C503F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'13c83c56a0de8a702aeb2aa0c330e42c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700C029DF7C7B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1487d69ff97888f3a899e2ababb5ae48', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07806CE45178383F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'14f447d9b60725cc86b3100a5cb20b75', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700EF8BC0A5793F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'151a9f1b01e4e749124d274313cd138c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078098937B64763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1534f0c50e67c5682e91af5160a67a80', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700406B08BF803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'155d2991204d541388d837d1457e56ab', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780BAD2CD607E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'15b9599cb02b49a62fb4a1a71ccebc18', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700D188FA64763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'189842bf681338dc99dfa66d366a0e6f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780B80E6A854D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'189e3428e35e27dfe92ece2848b10ba8', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A8B00A85783F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'18a51a5f04eeaad6530665f6b0883f0c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780733B1F7A5B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'18b16a451fec0fe7bf491ab348c65e30', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F636FD636D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'18eafaeec588403245269a41732d1a74', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07009957235A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'190eb7b4d493eb01b13c5b97916eeb13', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780DE48785D5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1912a44dd4a6ffa1636d2dde9c2f1ab7', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078081FD585C4C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1a570aac0c30ac2955b59e2dc7a6204c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07004515CDAF353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1a5b71c9458c17f9bcb19a5747fd47dd', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070000C422643B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1aa593c64062f0137c0691eabac07521', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07003FF5205A6B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1ab7c74d217152081f4fa59e4a56cc7b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07809FBD1765733F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1b05434820cbcb038028da9f5cda31bb', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07009EE7D094573F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1d970c0e396ffc869e3a723d51f88b46', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07808CDE246D763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1db82f78233c120c6ec7648ca1177986', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07802F3BDAC1593F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1e4533a02fb9c739a3555fa7be6e7899', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700141A82547E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1f0b36f7e021aa5d059ffb0a74ef6de4', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07800CF060C2663F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1f33d11e1833ae497e3ef65a3f02dd5b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700B8A168A6563F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1f8f46118336b2cacf854c1abf8ae144', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780B3219E5C7D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'202344b08b69ad70754e6adaa777eae0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700A32EFFBF593F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'20751803c1e5b2d758b981ba22f61fcd', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780422E6C98573F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'20e5887d0c9c7981159fe91a51961141', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078085AB54A97F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'20fc3263762c80ab9268ddd3d4b06500', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700FEA81872723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'20fea778f4e1ac5c01b5a5a58e3805be', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780CC8B829F763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'210a01dcb34302eaed0d1e95820655d0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078055A2199B553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'21510ebaa4eca640852420ed6f6cbe01', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700F735FD61863F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'217aa2f713b0903e6be699136e374012', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700DAC1B0A8783F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2186244ae450e83d1487aa01fbeae664', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780D138037C7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'21910e350c9083e107d39ff4278f51d6', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780D3A7F7987B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'21b8493a05050584d9bb06cfc2a05a6b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07006828AA92623F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'21bad1470a40da8336294ca7330f443d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07004AD074936F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'21fed0f2d080e04cf0901436721a77a6', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07803F047FB7793F0B AS DateTime2), NULL, NULL)
+GO
+print 'Processed 100 total records'
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'22735c059b01949a87cb918f5ef3be76', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07009CD731BE4F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'22ad9f87788506456c774801389d6a01', 1, N'用户名: jeecg,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070041424F91553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'22d8a2fbd53eafb21f6f62ae073c0fc1', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07002A3B6FBC523F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2312c2693d6b50ca06799fee0ad2554a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700B2AB31667E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'23176e4b29c3d2f3abadd99ebeffa347', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700034D658B663F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'233e39d8b7aa90459ebef23587c25448', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700767CE293733F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'25f8b1b345b1c8a070fe81d715540c85', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700CDAC4883393F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'260bb025d91b59d0135d635ef85eeb82', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07800CB3D1613B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'26529d5753ceebbd0d774542ec83a43e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780E0BF1BAA733F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2659c59136fb1a284ab0642361b10cdd', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07002F6F839C7A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2676be4ffc66f83221fd95e23d494827', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'192.168.1.104', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070078726AB4663F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'26975f09c66025d1c8d87a6894a3c262', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700F2B2F19A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'273081678d85acebaa6615973bff31db', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070009D61F7E373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2746af3dd0309cdeeff7d27999fbcda1', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07806DA7F96B5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'279e519d647f1a4e1f85f9b90ab370b9', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700D1AFB38E373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'27d23027dc320175d22391d06f50082f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07004B39BA84713F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'27e8812c9a16889f14935eecacf188eb', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780B3CC2E9E703F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2811e224e4e8d70f2946c815988b9b7c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07004BA7BB655B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'286af82485388bfcd3bb9821ff1a4727', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07805CCCB59B5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'28dbc8d16f98fb4b1f481462fcaba48b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F20898AF6B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'28e8a7ed786eaced3182c70f68c7ea78', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780329B2C675B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2919d2f18db064978a619707bde4d613', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0780F8F7A4537E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2942a12521ac8e3d441429e6c4b04207', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700D9DA0B77803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2966ed2bdf67c9f3306b058d13bef301', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07003F2489B37B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'29fb5d4297748af3cd1c7f2611b7a2d6', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07803C02D0935A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2a383edf5445dc8493f5240144ca72f5', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078020E76A6C5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2ab9cf95ac35fdbb8fe976e13c404c41', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780CECB0E635A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2b3be3da6ba9d1ee49f378d729d69c50', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F2B76970383F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2b433e88db411bef115bc9357ba6a78b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'192.168.1.105', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07008087EC65683F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2b4d33d9be98e1e4cdd408a55f731050', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700D0144A58703F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2b5a76869a7d1900487cd220de378dba', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070040AF948A623F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2b801129457c05d23653ecaca88f1711', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07008DF03EB67F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2c6822927334eb0810b71465fd9c4945', 1, N'用户名: jeecg,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780ADD07F864E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2c6ede513b83fbc23aaedb89dbfa868a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070022194B97503F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2d5af41d2df82b316ba31fcdf6168d6a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg', CAST(0x07008B1C7D7BAB3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2de252a92b59ebfbf16860cc563e3865', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780061000B94F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2e44c368eda5a7f7a23305b61d82cddb', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A932E298723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2e63fd1b3b6a6145bc04b2a1df18d2f5', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07806402799F7B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2eb75cb6ca5bc60241e01fa7471c0ccf', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700F620A29B7E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2eb964935df6f3a4d2f3af6ac5f2ded1', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'192.168.1.200', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07003F4CC770683F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2ebe7f0432f01788d69d39bc6df04a1a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F8FC97976E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2fecb508d344c5b3a40f471d7b110f14', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780E817A5936E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3087ac4988a961fa1ec0b4713615c719', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700D05F00C07D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'30da94dd068a5a57f3cece2ca5ac1a25', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780DD331D976E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'30ec2dc50347240f131c1004ee9b3a40', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078032257C56873F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'310bb368795f4985ed4eada030a435a0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07001E59E7C3803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'317e3ae1b6ccdfb5db6940789e12d300', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0780C9263DB67F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'32464c6f7f772ddda0a963b19ad2fd70', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07006E3E7060393F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3267222d9387284b864792531b450bfe', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07809B8D7B58703F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'326b2df4ab05a8dbb03a0a0087e82a25', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700B8C9A663673F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'335956cbad23d1974138752199bf1d84', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070098F19954863F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'337b647a4085e48f61c7832e6527517d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07002E4D86625B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'34a6b86424857a63159f0e8254e238c2', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700085CF799723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3569ada5c43a4022d3d13ac801aff40e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780B1A9757C593F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'35fdedc363d9fe514b44095da40f170b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700A574035B5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3612f8d40add5a7754ea3d54de0b5f20', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078089BFA2A7723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'36358cacfc5eb3ba7e85cfe156218b71', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07808A6340A13B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3683743d1936d06f3aaa03d6470e5178', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700EE8A04BE7B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'36fd54ce8bc1ee4aac9e3ea4bfdcd5a8', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700B373CC9D3F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'375aadb2833e57a0d5a2ce0546a65ca4', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700165311AD643F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3767186b722b7fefd465e147d3170ad1', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078049EA06B8773F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'378b44af9c1042c1438450b11c707fcf', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078057DC2D876F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'37ca8ff7098b9d118adb0a586bdc0d13', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F93B6873723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3836dc3f91d072e838092bc8d3143906', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07005C6BA46B7E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'39caf3d5d308001aeb0a18e15ae480b9', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A77D2A58723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3a0330033a8d3b51ffbfb2e0a7db9bba', 1, N'用户名: jeecg,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780837D306C763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3a290289b4b30a1caaac2d03ad3161cd', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F86D5564763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3a4a0e27d77aa8b624180e5fd5e4004e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700B360B252553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3a76114e431912ff9a19a4b6eb795112', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07802C2355675B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3b07fda32423a5696b2097e1c23c00d4', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07006866BE86373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3ba1e54aa9aa760b59dfe1d1259459bc', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780CDA399517A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3bc73699a9fd3245b87336787422729b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07809B6BB572723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3d25a4cdd75b9c4c137394ce68e67154', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07800363C053713F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3d9874f248a984608ca98c36c21c5a7a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700922ACB6D3A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3e2574b7b723fbc9c712b8e200ea0c84', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07003D50C778863F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3e6116220fa8d4808175738c6de51b12', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700AB94AFB07F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3e64011b4bea7cdb76953bfbf57135ce', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07009E951DC2863F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3e69108be63179550afe424330a8a9e4', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0780A4C6319C7E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3ec2023daa4a7d6a542bf28b11acf586', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07002EEDAB886F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3f47afcdce94596494746ac34eebf13b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07004BF03A75573F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3fd0d771bbdd34fae8b48690ddd57799', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07007D1FEB90703F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'404d5fb6cce1001c3553a69089a618c8', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700DC7AA968683F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'406e79995e3340d052d85a74a5d40d1b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700325B5C894E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4084f184160940a96e47d7be1fab4ea3', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07807921F85A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'40b3a9bee45b23548250936310b273f4', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780EF90387B403F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4114145795da30b34545e9e39b7822d9', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780C028DF7A5B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4218b30015501ee966548c139c14f43f', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0780A5EC6F557E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4234117751af62ac87343cbf8a6f1e0f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780B4C53B567E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4261867172d0fd5c04c993638661ac0b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A9C2A95F393F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4263de16a41a9ffd083a727e1e2b3cf0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg', CAST(0x07A0B19D7680AB3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'42aef93749cc6222d5debe3fb31ba41b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070064CBDC847B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'42bf42af90d4df949ad0a6cd1b39805e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'192.168.1.200', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07802863F193683F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4303dbb3e502f11a3c4078f899bb3070', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07006EA081924F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'43079866b75ee6a031835795bb681e16', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x070060FA95BE803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'432067d777447423f1ce3db11a273f6f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078080E30A527E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'43536edd8aa99f9b120872e2c768206c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700D798485B7F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'43848099c1e70910ba1572868ee40415', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070058683960383F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'445436e800d306ec1d7763c0fe28ad38', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07003A3D3562713F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'446724ea6dd41f4a03111c42e00d80cd', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700FA72048E353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'45819fe1b96af820575a12e9f973014e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700C982244E643F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'45f0309632984f5f7c70b3d40dbafe8b', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0700D553C9537E3F0B AS DateTime2), NULL, NULL)
+GO
+print 'Processed 200 total records'
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'472c34745b8f86a46efa28f408465a63', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780713C63965A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'477592ab95cd219a2ccad79de2f69f51', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070090F62E59813F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4778fe2992fd5efd65f86cb0e00e338e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780DD06EC955A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'47c5a5b799e10255c96ccd65286541ef', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780B77044635B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4816854636129e31c2a5f9d38af842ef', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0700EDB7FE6A763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'484cdb8db40e3f76ef686552f57d8099', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F2B1F198793F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'48929ec94226d9ccff9fae4ff48e95e3', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07806500799B553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'48e4e10ac7e583050fd85734f0676a7c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700489660A7383F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'48e5faf2d21ead650422dc2eaf1bb6c5', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07806A588AB9763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'48eac0dd1c11fe8f0cb49f1bd14529c2', 1, N'用户名: jeecg,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780C7362D6D763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4922f2f1173a1edc11dfd11cb2a100ae', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07805F010E98553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4930e32672465979adbc592e116226a6', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07007464948D793F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'49d48fda33126595f6936a5d64e47af0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780E956756F703F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'49f1ec54eb16af2001ff6809a089e940', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700EB01C2966E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4a0020835a71fc6dcaefd01968d21f81', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A4F3629D403F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4aa770f37a7de0039ba0f720c5246486', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700120727926E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4ab79469ba556fa890258a532623d1dc', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070066512C6C763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4acfbc327681d89dab861c77401f8992', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700FE51725B3E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4b1341863a8fffeccda8bbe413bd815f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700CC811786353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4ba055970859a6f1afcc01227cb82a2d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700561593517A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4d1be4b4991a5c2d4d17d0275e4209cf', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078052B640AE813F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4d9299e2daac1f49eac0cec75a90c32e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07800D0B3460383F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4de1ed55165f7086f1a425a26a2f56ec', 1, N'用户名: jeecg,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07807B33CE894E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4f237cdf7860dc71ffabff620fdd3ab3', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg', CAST(0x07B0282A1880AB3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4f31f3ebaf5d1a159d2bb11dd9984909', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07801D0F315E6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4f7f587bec68ed5bf9f68b0ccd76d62b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07806FE344B0543F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5034aec34f0b79da510e66008dbf2fcc', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780784AB188543F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'506ce2d73a038b6e491a35a6c74a7343', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700AAEB1E734F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'507b55d3b5ddc487fb40ca1f716a1253', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07000780BD83373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'50e8de3e6b45f8625b8fd5590c9fd834', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07002F15219A573F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'515c28df59f07478339b61ca5b1b54a8', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07805701B0583A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'51aeabed335ab4e238640a4d17dd51a3', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078072439755883F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'523a54948d5edaf421566014b66f9465', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078043CF4DA6383F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'52673feae24ea5bc3ca111f19c9a85d4', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070083211280373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'528baecc596a66eaadc8887bff911f55', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070078620C55543F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'52e36d72cd04bea2604747e006b038ec', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780908FDCA5383F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'52fde989fb8bb78d03fb9c14242f5613', 1, N'用户名: admin,登录成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x07804A75128F713F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5323f848cddbb80ba4f0d19c0580eba9', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070050F698C0733F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5358b182eab53a79eec236a9cee1e0fc', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780E640276D663F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'543970eba4d1c522e3cb597b0fd4ad13', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07000309D9BF353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'54c2bad38dafd9e636ce992aa93b26af', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070049433264643F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5554869b3475770046602061775e0e57', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078004B5AA7A793F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'557b3c346d9bc8f7a83fac9f5b12dc1b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700CE2671675B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'55d649432efa7eaecd750b4b6b883f83', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078023C497BE803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'55e906361eeabb6ec16d66c7196a06f0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07004E449D6B7E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'562092eb81561ee0f63be5dd9367d298', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780174D55BB593F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'580256f7c7ea658786dba919009451b6', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780D96B0A945A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'583d3aa445d408f4ecd19ee0a85514af', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700BE8DB95E5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5858f2f8436460a94a517904c0bfcacb', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07802C33B3C6733F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'586002e1fb4e60902735070bab48afe3', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700FEFFBE88783F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'586e8244eff6d6761077ef15ab9a82d9', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780255552C16F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5902fb4ba61ccf7ff4d2dd97072b7e5b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07000B78BD73723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'59558082e1b1d754fa3def125ed4db3c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07800B71459A793F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5c04e3d9429e3bcff4d55f6205c4aa83', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078030C6E5987B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5c35117cbeb39428fcc2ddd90ce96a2b', 1, N'用户名: jeecg,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780CF2B2091553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5c48703e3a2d4f81ee5227f0e2245990', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0700FA2E78C2803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5c675eeb69795180eee2c1069efc114b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078049D7EC6C503F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5c7e834e089ef86555d8c2627b1b29b5', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07009701C15F713F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5cf2431447eab30fd3623e831033eea0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07806AD4B2A14D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5d8ed15778aa7d99224ee62c606589fb', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0700379ADB847B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5dee273feb8dd12989b40c2c92ce8c4a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700DD94F772503F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5e8bac7831de49146d568c9a8477ddad', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07800077E766763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5ea258e1f478d27e0879e2f4bcb89ecd', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A5AB9F75723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5ee6d5fe1e6adcc4ad441b230fae802d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780CEE4A085873F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5f00b5514a11cd2fe240c131e9ddd136', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070046276C8A733F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5f314fc45492d7f90b74d1ca74d1d392', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07006EFAE394573F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'606cb4f81f9bb412e2b2bdaa0f3e5dda', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07806794EF895A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'60886d5de8a18935824faf8b0bed489e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A5EC6F557E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'60a975067f02cf05e74fa7b71e8e862a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070043F5CF79413F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'60d4f59974170c67826e64480533d793', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700A2E28C704D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'611fa74c70bd5a7a8af376464a2133e8', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780AC673A95783F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'61445cc950f5d04d91339089b18edef9', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07002DC536775B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'615625178b01fc20c60184cd28e64a70', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780268108527E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'61aac4cfe67ec6437cd901f95fbd6f45', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780301221946E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'61d2d2fd3e9e23f67c23b893a1ae1e72', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700E4D1ADBE6F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'623e4bc7c098f368abcc368227235caf', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07804A7E4652423F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'62d197757e2cb40f9e8cb57fa6a207f7', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700930C7D5B383F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'62e208389a400e37250cfa51c204bdc8', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780BECFC0946E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'636309eec5e750bc94ce06fb98526fb2', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x07802D0AFA987B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'636d37d423199e15b4030f35c60859fe', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07805287D854653F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'63ccf8dda5d9bf825ecdbfb9ff9f456c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'192.168.1.105', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070068A78E66683F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'642e48f2e5ac8fe64f1bfacf4d234dc8', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x07802AA0C16B763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'64711edfb8c4eb24517d86baca005c96', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F5CDB772723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'64c00f27ddc93fda22f91b38d2b828b5', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A8CC58936F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'65771bce3f5786dfb4d84570df61a47a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07805C3183B97D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'65ace1ae98891f48ab4121d9258e4f1e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070020EB265A4D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'65be8e015c9f2c493bd0a4e405dd8221', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07002ADFD5615B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'661c4792f00b0814e486c3d623d7259f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07806BF1BC97373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'66493cd0347eeb6ee2ef5ee923604683', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780DFF1089B553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6664dc299f547f6702f93e2358810cc1', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'192.168.3.22', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700DB819CB0813F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'67181c36b55b06047a16a031fd1262c1', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg', CAST(0x0700410AB374AB3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'671a44fd91bf267549d407e0c2a680ee', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700A6BDB9BE6F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'672b527c49dc349689288ebf2c43ed4d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07803549F15F863F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6737424e01b38f2273e9728bf39f3e37', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07803A6E59A5573F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'675153568c479d8b7c6fe63327066c9f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700B7A9E081793F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'679e12ba247575749e03aa8f67347ac6', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07006DC18B90553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'680b3e6e4768d80d6ea0ce8ba71bdd0e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07803F5F664D553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6836a652dc96246c028577e510695c6f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700276335AE6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'687810e7fea7e480962c58db515a5e1c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07006FBACF9C7E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'689b8f2110f99c52e18268cbaf05bbb6', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700625FA4537E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'68df65639e82cc6a889282fbef53afbb', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07801E53F47D843F0B AS DateTime2), NULL, NULL)
+GO
+print 'Processed 300 total records'
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'68e90e08a866de748e9901e923406959', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07008501C469803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'68f7394ca53c59438b2b41e7bb9f3094', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070023DFAE763E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'69a7a5b960d6aedda5c4bd8b877be0a8', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700F46BEA5A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'69a9dfb2fb02e4537b86c9c5c05184ae', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'192.168.1.104', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070057A2D580683F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'69baa4f883fe881f401ea063ddfd0079', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780D508C5AE693F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'69e3164d007be2b9834e4fb398186f39', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780BAC321C6353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'69e6fd7891d4b42b0cccdc0874a43752', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700AFDE6273723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'69ea2322f72b41bcdc7f235889132703', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07801B7E765B383F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'69fc2407b46abad64fa44482c0dca59f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780AA2833655E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6a4231540c73ad67128d5a24e6a877ff', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07004747326C383F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6a67bf2ff924548dee04aa97e1d64d38', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780324FF16B763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6b4cdd499885ccba43b40f10abf64a78', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A7A79F6D7D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6b876be6e384337b36ad28a4a5868be8', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07009A0B1FB3353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6baccd034e970c6f109791cff43bc327', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07001AAEA7625A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6bc98b7dc91a3924f794202867367aca', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700994877BF593F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6c558d70dc5794f9f473d8826485727a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07009205499C7E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6cbd2a9257fae1cb7ff7bc2eb264b3ab', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700230668A0373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6cf638853ef5384bf81ed84572a6445d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700AAF3CDA27E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6cfeaf6a6be5bb993b9578667999c354', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070037814962753F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6d45672f99bbfd01d6385153e9c3ad91', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07007045DB73713F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6d93d5667245ef8e5d6eafdbc9113f51', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700ADB5317A5B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6fb7db45b11bc22347b234fda07700c8', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700CF51A264383F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'703fbcb7e198e8e64978ec0518971420', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780BB400696663F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'70849167f54fd50d8906647176d90fdf', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780AC1587C2803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'709b0f2bf8cb8f785f883509e54ace28', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07808E049A7A5B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7126b35521cd0dba932e6f04b0dac88f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07003773225B5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7148b3d58f121ef04bcbea5dd2e5fe3b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780C7254A7A5B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'716f9f5f066a6f75a58b7b05f2f7f861', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780300A7264763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7225200c3cec4789af4f1da2c46b129d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07809F3E3391553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7268539fbe77c5cc572fb46d71d838f1', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700845D26707F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7285730e2644f49def0937dc99bfbe3d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780D0BEDA97553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7289cf420ac87ea0538bde81435b1aaa', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07804DF6A5864E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'72ee87d0637fb3365fdff9ccbf286c4a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07009EBA9F936F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7313b43ff53015d79a58b4dc7c660721', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078007F8297E373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'732a1015057fde25d81ee12a7fbf66b2', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070022418954423F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7351132f4f5f65e5bf157dd7ad5344a4', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070034DEEF84373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7374f3a2ccb20216cf8eecb26037ce0a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07807B4F1C98353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'74209dfc97285eb7919868545fc2c649', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070076C06E5F703F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'74c991568d8bcb2049a0dbff53f72875', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078009F91CBA743F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'75c7fa1a7d3639be1b112e263561e43a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780818C9B8F6B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'76bea561f662ec0ccf05bc370f1ffe35', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780FD52725D373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'772f238d46531a75fff31bae5841057c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07005A9F9160723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'77579d78a903635cc4942882f568e9e5', 1, N'用户名: jeecg,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780DCA06290553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'775e987a2ca37edc4f21e022b265a84a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780C42E06724D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'776c2e546c9ab0375d97590b048b8a9d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780390E48775B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'77a329e5eb85754075165b06b7d877fd', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07801C2D7F707D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'78caf9e97aedfb8c7feef0fc8fdb4fb5', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07000B83288F673F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'78f519b618f82a39adad391fbf6b9c7a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700C7EBF173383F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'790b722fa99a8f3a0bc38f61e13c1cf4', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780B9EAA39B7F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'79a1737fcc199c8262f344e48afb000d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780E09D55C4743F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'79e76353faffd0beb0544c0aede8564f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700CBBE6F92843F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7a511b225189342b778647db3db385cd', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700AD71A5AE723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7a99cf653439ca82ac3b0d189ddaad4a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07004336A059803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7a9d307d22fb2301d6a9396094afc82f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700F8842B9D6B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7ae9cad197aee3d50e93bc3a242d68ec', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700D99FB36E673F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7b2b322a47e1ce131d71c50b46d7d29e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700E4617585633F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7b44138c1b80b67da13b89db756a22b0', 2, N'添加测试DEMO', NULL, NULL, NULL, N'127.0.0.1', N'org.jeecg.modules.demo.test.controller.JeecgDemoController.add()', NULL, N'[{"createBy":"jeecg-boot","createTime":1553824172062,"id":"5fce01cb7f0457746c97d8ca05628f81","name":"1212"}]', NULL, 25, N'jeecg-boot', CAST(0x0700DE5A5B527A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7b85fba62bc001773fff1a54e1609aef', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700EA8D118A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7ba3df5d2612ac3dd724e07a55411386', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780053A3E7A5B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7bc7b1ff923dbb19fb0ecd800cd690bd', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A3015350533F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7c310b99a84411798a2aaf4074a28e7e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780DE37956A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7c88e9cf6018a1b97b420b8cb6122815', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0700EF8BC0A5793F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7ce1934fb542a406e92867aec5b7254d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780B3E0CD7C873F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7d11535270734de80bd52ec0daa4fc1f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'192.168.1.105', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070093CE68677D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7d8539ff876aad698fba235a1c467fb8', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0700177C0B527E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7da063020a42db99e0f3bb9500498828', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700C0C155734C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7dc448f04edf4b9655362ad1a1c58753', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780126838C2593F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7dc498b45fbf25c59686d9dda0d3eb66', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700173EF75D5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7e2edea80050d2e46aa2e8faef8e29ce', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070015DA6D5C5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7e41208e29d412d586fc39375628b0d0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F74D8F82563F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7e92abdc0c1f54596df499a5a2d11683', 1, N'用户名: jeecg,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700FF79E76C763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7f31435ca2f5a4ef998a4152b2433dec', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700AC1CFF9B7D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7f9c3d539030049a39756208670be394', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070004D87062713F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7feae2fb5001ca0095c05a8b08270317', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780BFA607675B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'802cec0efbe9d862b7cea29fefc5448b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070091DA179F743F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'810deb9fd39fa2f0a8e30e3db42f7c2b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070042B6FF9D5B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8143ce0b35bfe6e7b8113e1ecc066acd', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg', CAST(0x070008F7297CAB3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'81b06ae2cd24ac0daeb213722e620f72', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg', CAST(0x07B001C4A962AC3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'81c9056ac38e6f881d60f3d41df1845e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078021047562523F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'81c95e1c8805fa191753fc99ba54c3e9', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780EE161097553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'81f7a606359aff9f97f95c15ce8e7c69', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07002FA5E8604C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'82cee1c403025fc1db514c60fc7d8d29', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07001B5AF48B733F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8300e85a2c2f16c2358d31e8b364edf7', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07806FA3F9633A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8317a81bce60a10afeb44af6ef6c807a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700F39A1B604E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8327cced60486bad4009276e14403502', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078004E853533A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8447099784da63b3b2cd2fbbc5eabcea', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07806688C886373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'845f732f6a0f0d575debc4103e92bea2', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x07004B5E3C567E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'85949de2d54078e6b8f3df0a3c79c43d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700F65EB68F553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'85b3106d757d136b48172a9ab1f35bb6', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07009902B49B7D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'862aa0e6e101a794715174eef96f7847', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780C89CB672723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'873f425879ef9ca7ced982acda19ea58', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780C123238B573F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8742a458bf166fd5f134ac65fa8903f9', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07009FCC3E6E3A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'87885bc889d23c7c208614da8e021fb0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070049541557643F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8802209912ca66d56f2ea241ffd0cc13', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07001DF9D5955A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'88bab180edf685549c7344ec8db7d954', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700297E3FA0703F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'88bfc5b77b4be0d6d0f7c8661cf24853', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07800E556F57383F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'88d7136ed5c7630057451816dbaff183', 1, N'用户名: jeecg,退出成功！', NULL, N'jeecg', N'jeecg', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg', CAST(0x0700AA0A296D763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'88d8b4b50bdab58c52fe25fa711fbbef', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078033600BB3353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'89bfd8b9d6fa57a8e7017a2345ec1534', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700DA92484F883F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'89d2bc84e056f327291c53821d421034', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700212C2E8E653F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'89fbc93e77defb34c609c84a7fe83039', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0700BD1909527E3F0B AS DateTime2), NULL, NULL)
+GO
+print 'Processed 400 total records'
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8a13971104d70e35111d10dd99de392e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780AE93277A5B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8ab131214232450ca202103ef81f0a2d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780B8E138845A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8b2ad448021fbb5509ea04c9a780b165', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'192.168.1.104', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F4564B7A683F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8b66ec251e3107765768dbd0590eeb29', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700BE6BF3783E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8d105ea6c89691bc8ee7d4fd568aa690', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078088DBB961713F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8d9ce65020320d46882be43b22b12a62', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A704BE5B743F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8e03def9e0283005161d062d4c0a5a80', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780266D6973723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8ec3a287a37d155047e80a80769d5226', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700A960139C373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8f616500d666a5a67bc98e7ccd73c2e2', 2, N'添加测试DEMO', NULL, N'admin', N'管理员', N'127.0.0.1', N'org.jeecg.modules.demo.test.controller.JeecgDemoController.add()', NULL, N'[{"createBy":"admin","createTime":1547912194199,"id":"ffa9da1ad40632dfcabac51d766865bd","name":"秦999"}]', NULL, 386, N'admin', CAST(0x07002D5FE4C5353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8fde5f89e8ad30cf3811b8683a9a77b1', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F6C53F976E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8fe913a5b037943c6667ee4908f88bea', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07009CC7D35E6D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8ff27392165c8c707ee10ec0010c7bb8', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07809D2C5D625B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'90555a39c0b02180df74752e4d33f253', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07801E8B909A783F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'905d2cf4308f70a3a2121a3476e38ed0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700539F6A75713F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'90711ddb861e28bd8774631c98f3edb9', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700BFF34264763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'90b4bad7939233a1e0d7935f079ea0fa', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0700EDB7FE6A763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9174fe77fe8ba69243f72d5577b391d3', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700EFB3FE625A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'917dbb5db85d1a6f142135827e259bbf', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A12694AA6F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'92e514fee917a1a459c4ffdb0ca42516', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07001AECBB56373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'939b3ff4733247a47efe1352157b1f27', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070085EA689F7E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'93b4d26f60d7fb45a60524760bf053e4', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700EFB535BB7D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'93bb98ba996dacebfb4f61503067352e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700406B08BF803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9410b7974fbc9df415867095b210e572', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07007DBDD95E6D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'94fe4465d779e0438cfe6f0cb1a1aa7e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700376476C0593F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'95063e0bdfa5c9817cc0f66e96baad93', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07007295C5966E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'952947331f8f3379494c4742be797fc3', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07804367C49C713F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'954f1ccb8b230d2d7d4858eec3aba0a4', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780D832B28F353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'95d906e6f048c3e71ddbcc0c9448cf49', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700A5008AA2773F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'961992e05772bc7ad2ca927cf7649440', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700036C6F85373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'965c74ffe09d8a06bb817efa6d62254b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780E94B0A54393F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'968d434c45aae64c9ad0e86d18238065', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07008B4F2654423F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'96ada57ac17c4477f4e4c8d596d4cc1a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700B216775B3E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'96d7fe922f46123e0497e22dedf89328', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07004CE24AC2643F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'98b7fc431e4654f403e27ec9af845c7b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700B956E992683F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'98d4b573769af6d9c10cd5c509bfb7af', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780E85B315F6D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'993010965223b8e3a7a784409f7e377e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780DE15CF84403F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'99357d793f2507cfb7b270677b4fe56c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070055CB575A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'994efef0ebca19292e14a39b385b0e21', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700A05C3D89503F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'997bb4cb1ad24439b6f7656222af0710', 2, N'添加测试DEMO', NULL, NULL, NULL, N'127.0.0.1', N'org.jeecg.modules.demo.test.controller.JeecgDemoController.add()', NULL, N'[{"createBy":"jeecg-boot","createTime":1553824768819,"id":"ee84471f0dff5ae88c45e852bfa0280f","keyWord":"22","name":"222"}]', NULL, 5, N'jeecg-boot', CAST(0x07004099BE537A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9a1456ef58a2b1fb63cdc54b723f2539', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F11E3792793F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9a5c1fbf3543880af6461182e24b75db', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078019F826746C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9acebd2d37c9078f9568125fb9696976', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078019C83987373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9b23981621d5265a55681883ec19fa91', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780CC0A6773723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9b568a868e57f24c5ba146848061613f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'192.168.1.104', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07806726EEA8663F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9b7a830914668881335da1b0ce2274b1', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070047BA26917D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9bd6e11c5a2f0bb70215cfa097a4b29c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07003825E75B5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9be945480d69038865279f02df5cee45', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07807FD427635A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9bfe7312f2951503082a28c2cc966ce4', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700CD2B2D574E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9c32ec437d8f8d407b1bd1165fc0305d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780102CED7D843F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9c64406daa2b6e7ad1f6776789d61e43', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07006BCEBF5B4C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9cea908c7a78dc77fdaed975819983bd', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780C1A2075F5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9d0416e09fae7aeeeefc8511a61650c2', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07805A3BFB987B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9db7e7d214dbe9fe8fff5ff20634e282', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700A732EF5E703F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9df97c1b3213aa64eda81c6bf818b02b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700A48661BE803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9e9d01c430b72703ce3a94589be54bbe', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700F337859A663F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9eb3fb6d9d45e3847a88f65ed47da935', 1, N'用户名: jeecg,登录成功！', NULL, NULL, NULL, N'192.168.3.22', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F90503AF813F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9ed114408a130e69c0de4c91b2d6bf7e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07009E1A7A6D683F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9ef3f1ed07003e3abec3445920b062f1', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07800E63965E393F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9f2db1ffaf89518a25cc6701da0c5858', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07806307358F353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9f31eedbe3f3c5c431b490d5fec0094c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070022145853423F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9f4960f89a10d7fdcf22d1ea46143fff', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A652F95A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a052befb699ee69b3197b139fd9263f0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07004D8C60936C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a1b870eee811cfa4960f577b667b0973', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07007894309A7D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a22ddd4b5b0b84bd7794edd24b25fc64', 2, N'添加测试DEMO', NULL, N'admin', N'管理员', N'127.0.0.1', N'org.jeecg.modules.demo.test.controller.JeecgDemoController.add()', NULL, N'[{"createBy":"admin","createTime":1547883299809,"email":"zhangdaiscott@163.com","id":"7eac655877842eb39dc2f0469f3964ec","name":"zhang daihao"}]', NULL, 25, N'admin', CAST(0x0780139C9D82353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a28de45f52c027a3348a557efab6f430', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700A51AA158703F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a2950ae3b86f786a6a6c1ce996823b53', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0780F94F07527E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a2e0435673b17f4fb848eecdf8ecacd6', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780089393B4733F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a34ed4c6fef2b9f07a20e54ef4501b99', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07003049865A503F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a35a476c303983701045507c9af3fa03', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070071F1279D553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a42e5cd05566ea226c2e2fc201860f2c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700F7AE695E7B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a521d9f2a0087daa37923fa704dea85b', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0700C086FD6A763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a56661bbc72b8586778513c71f4764f5', 1, N'用户名: jeecg,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A8FF016C763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a5848ab4e8d0fb6ecf71ee1d99165468', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700295C79BA743F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a5daa58b078cb8b3653af869aeecebd0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F53285907A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a61d9db83888d42b0d24621de48a880d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07008EDD5BBF623F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a6209166e1e9b224cca09de1e9ea1ed7', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07005F35B772723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a6261bbbf8e964324935722ea1384a5d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07802BC2BEA5793F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a63147887c6ca54ce31f6c9e6279a714', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F7911B4E7E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a68160f37cace166fedd299c4ca0be10', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070008055183353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a6971e63e3d9158020e0186cda81467d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07805774A47D7E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a69f4ff4e48754de96ae6fa4fabc1579', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700CC3E104E7E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a6c3b28530416dace21371abe8cae00b', 2, N'删除测试DEMO', NULL, NULL, NULL, N'127.0.0.1', N'org.jeecg.modules.demo.test.controller.JeecgDemoController.delete()', NULL, N'["ee84471f0dff5ae88c45e852bfa0280f"]', NULL, 9, N'jeecg-boot', CAST(0x07000285CA537A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a6e323785535592ee208aa7e53554644', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A170984D553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a710ed2de7e31fd72b1efb1b54ba5a87', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780930505827F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a77d29673cfe97c9e03cfb879b934f62', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780E76B586A573F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a7d1f4a774eb8644e2b1d37ca5f93641', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078033AA0F56653F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a7ee4b4c236bc0e8f56db5fdf1e5ac38', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07003073FB6F713F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a83e37b55a07fe48272b0005a193dee6', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780FD09F34D873F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a867c282a8d97f7758235f881804bb48', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700BA16D59A6A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a8c7ba2d11315b171940def2cbeb0e8f', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x07001294326D763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a95192071de908f37f4998af4c269bcb', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F4291A79593F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a9b34565c6460dc9cede00ad150393f9', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07807E4CD8773E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a9bd713f975bfbff87638432a104b715', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'192.168.1.104', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700169F4CA8663F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'aa47c8cf2a4f2de16f415b9d9d3dbf05', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07007E692688403F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'aa49341b29865b45588ad2f9b89c47ea', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0700E5A538A5873F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'aaf10eab9c2b6ed6af1d7a9ce844d146', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070059091B6E4E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ab1d707bbfdf44aa17307d30ca872403', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070075AECF847B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ab550d09101a88bc999ea57cbb05aa5a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780B936DF96643F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ab8a71b7565d356d12e12c6730b0ceb0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A652F95A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ac8cf22c2f10a38c7a631fc590551c40', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070060CB2D657D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ad97829fe7fefcd38c80d1eb1328e40f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700E5FD634F713F0B AS DateTime2), NULL, NULL)
+GO
+print 'Processed 500 total records'
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'add13f513772a63f8ca8bf85634bb72c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078081A03A6E7E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ae61be664d2f30d4f2248347c5998a45', 1, N'用户名: jeecg,退出成功！', NULL, N'jeecg', N'jeecg', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg', CAST(0x07805CC4066C763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'aeb738ab880c262772453d35fc98f2f2', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07009FD4ED9D643F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'aec0817ecc0063bde76c1f6b6889d117', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070041A2296B763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'aeca30df24ce26f008a7e2101f7c513c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07806A647A68713F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'af5869701738a6f4c2c58fe8dfe02726', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07008027128C733F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'af8fe96a9f0b325e4833fc0d9c4721bf', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x070010DEF5987B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b01c3f89bcfd263de7cb1a9b0210a7af', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780BB4006967F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b09ccd219a1ce5c7270bb659748b8330', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700BB179182353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b0cebd174565a88bb850a2475ce14625', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07806F8C9E99733F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b0d11dfec52e02f504c63e2f8224b00d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700F86521A33B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b0e6b3a0ec5d8c73166fb8129d21a834', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07003887F88D853F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b1e9797721dbfcc51bbe7182142cbdcd', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0780CAC5E76B763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b20ff98a10af3c25c1991741fd59ea64', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700A2393387373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b23293288a84ba965509f466ed0e7e2f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078019909D6A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b26369680b41d581649cf865e88331e9', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078007F8297E373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b3127e34f395e1f1790450da5689a4a1', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780BB7E1A8A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b3474fc5aad9ec2f36ccbbf7bf864a69', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07003AB6A15E3B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b38f42f4e15ee72e494bdf6f6feb0ae7', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07008F9ECC5A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b3adf055f54878657611ef430f85803e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07800096F160713F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b3cceb535fa5577cc21b12502535ad29', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780347566795B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b428718441be738cf8b5ce92109068c3', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780FE582189653F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b4c3c7af9899b9af3f42f730cfabc9b2', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07009FBE17675B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b4ccdfc1280e73439eb1ad183076675b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780E030D9764E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b53c9e8ce1e129a09a3cda8c01fe644c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780AAA19F615B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b55cc05e8dd4279c0fa145833db19ba8', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07001A817661503F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b5df1807f08af5db640da11affec24d3', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F87B7C6B5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b5f6636c6e24e559ddf1feb3e1a77fd5', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A4DD8C66713F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b605a83a9b5f3cdaaa1b3f4f41a5f12d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700C203198F373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b6ee157afd006ceddc8c7558c251192e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700146045784C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b7085f003b4336af4d4ba18147f8e5ae', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07809E0D8ABC723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b7478d917ab6f663e03d458f0bb022a3', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780E120B26B763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b7f33b5a514045878447fc64636ac3e6', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700ED247BB8743F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b86958d773b2c2bd79baa2e8c3c84050', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700101C0A8D6C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b8bd2a9de3fb917dfb6b435e58389901', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780E7BC86A9743F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b945fe8b63e0fc26d02c85466f36ebd9', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07003BA67A53423F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b954f7c34dfbe9f6a1fc12244e0a7d59', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07005F35B772723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b972484d206b36420efac466fae1c53f', 1, N'用户名: jeecg,退出成功！', NULL, N'jeecg', N'jeecg', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg', CAST(0x0700FB0B376C763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b98b7ac9e890657aa86a900763afbe2a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700BC0A2663553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b99fc7c53d4e3edc0c618edc11d3a073', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07803B61EE85573F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b9bf472a12fc25a9d4b500421b08b025', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07004D49595B383F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'baa53d6a534e669f6150ea47565fa5b9', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070066F15192853F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'baaf37e5937f938ac92856bc74cc2b86', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780902DCB73573F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'bbd3e1f27e025502a67cf54945b0b269', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700E65441BA7C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'bbe2e637bafa0d7f465dc9e1266cff3d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07003D728D5E3B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'bbf4fb593d6918cc767bb50c9b6c16c5', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700DA27035A4F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'bc28d4275c7c7fcd067e1aef40ec1dd4', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078051E33A5B7F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'bc594b8921a0bcdb26d4a93916316092', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07004559597B5B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'bd6d7d720b9dd803f8ad26e2d40870f3', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07001711C65C863F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'bd9167a87aee4574a30d67825acaad0a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07809DBB9F956E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'bdeae62057ae9858b6a546c1bdb6efc7', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780EA191D635B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'bdfd95b4d4c271d7d8d38f89f4a55da9', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07001833C3966E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'beb9ef68b586f05bd7cf43058e01ad4a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07000B3175BC6E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'befbcf5a27ef8d2ca8e6234077f9413d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07802CB553866F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'bfa0766f53dbd3a0fe4043f57bd9bbee', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780080AC9585A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'bfe758860662ae07a15598396a12cfaa', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700BCCFCD5A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'bfec8c8c88868391041667d924e3af7f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F3D1B77A793F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c03985d6e038b5d8ebdeec27fce249ba', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070026140773723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c12e3d7655a5a8b192bb9964a2a66946', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F66565BD593F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c1842fc83cdf0b0cc0264bf093e9c55d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A9C4E0B7353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c18db091677ec01d55e913662b9028a9', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780D7C6B0B2353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c1a68605bee6b3d1264390c1cfe7a9fa', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780DB809CAE663F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c21422fa08f8480a53367fda7ddddf12', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x07003F142B547E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c2bfe3b92e6bfb7016cc82e95419a602', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07802C9CC1635A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c33b4e0bbf998330e44fad65e9d0029e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700C81367854D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c434dc5172dc993ee7cd96187ca58653', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0700006FB3A5793F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c5954beca75d6a0c014e2de3b621275a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07805FA133BE4F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c5d4597b38275dcb890c6568a7c113f2', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700D75A3467753F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c5e541648bab341230c93377b4d4e262', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07802874D4864E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c665d704539483630cc9ed5715ed57a8', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700AAFC0166763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c66e22782dd3916d1361c76b0cc4ec8a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07007F0490BE723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c6c0316b6989bf1eea0a3803f593bf69', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07801DAF5684353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c6cbe54fcb194d025a081e5f91a7e3f0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070083278A57733F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c72bb25acd132303788699834ae039b4', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07000B5C6F65713F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c7b6156c4f42b70c562b507766f4546c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700A0F4B37F373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c98a6367b152cf5311d0eec98fab390c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07007B0F4CBA7D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c9be887c9292153e39861c91243b7432', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780319A707F403F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ca737885d9034f71f70c4ae7986fafa8', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700406B08BF803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'caee69e55ec929f7ba904280cac971e6', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780AFC114635B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'cb6b52fbbdd4c5698c17edaf9960e11e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780119A25B3353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'cb7c6178101ef049d3f1820ee41df539', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078005E88AA7793F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'cbd720f20fc090c7350a98be0738816a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'192.168.1.104', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780559F5DAF663F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'cbf83d11486a8d57814ae38c9822b022', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07802B445F65763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'cc39057ae0a8a996fb0b3a8ad5b8f341', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078078E89F567E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'cc7fa5567e7833a3475b29b7441a2976', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A73C5A78383F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'cc8ab347f332c55570830c5fc39bbf9f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700CFB92B6E3A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ccad29843623a6c3ca59548b1d533b15', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780C60EB85B383F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'cd064a2f6cb6c640cb97a74aaa6041d7', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07006722FB66763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'cd5af66a87bb40026c72a748155b47e8', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07006B529773723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'cd7a7c49e02ca9613b6879fda4e563cf', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07008218A768713F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ce6aa822166b97a78b0bbea62366f8e0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780004FA9A97F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ce9893f4d0dd163e900fcd537f2c292d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780D72C0364763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'cedf399271592c27dcb6f6ce3312e77d', 2, N'删除测试DEMO', NULL, N'admin', N'管理员', N'127.0.0.1', N'org.jeecg.modules.demo.test.controller.JeecgDemoController.delete()', NULL, N'["7501"]', NULL, 24, N'admin', CAST(0x0780F64F8F86633F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'cf590576a5f6a42b347e6b5bf5ebf5bd', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780DB7BA96A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'cfba34db2d7fbb15a2971212f09b59ec', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780B1F86C635B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd00964eee24c6f9a8609a42eeebef957', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070038B4298F673F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd01d658731dac4b580a879d986b03456', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780D88FD07D643F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd03aaee882d13b796db860cb95f27724', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700D111C5C0593F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd0ce9bfc790a573d48d49d3bbbf1a1cb', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700ED51ACB9743F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd1111594fef195980370c5f91ccf9212', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780E26AED625A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd1746c5c937fcb650bd835ff74dabdff', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700C475C997373F0B AS DateTime2), NULL, NULL)
+GO
+print 'Processed 600 total records'
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd18bff297a5c2fa54d708f25a7d790d6', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07805E1A6966713F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd19b6e77ab1b6d6aa58996a93918754c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07000530D3604C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd1eb2a8ebed28d34199c5fc4a1579c4c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07803486496C553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd23e6766cecf911fb2e593eeee354e18', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07805FB5D29C7E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd2910961a0ff046cc3ef6cf8d33a8094', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07801D8225835A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd29cf7aae44523bf2f3d187e91356fe8', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780EB527567393F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd2ac19a709ea08f7259286df28efd635', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A28FD99B553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd2b516c5d834bd0fca91cda416fe499e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700BD8FB9625A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd2fe98d661f1651b639bf74499f124db', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07807C291F567A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd3b54be0510db6a6da27bf30becb5335', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07003F083BA5873F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd3c4f120d8a23b62ec9e24b431a58496', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07007203C777643F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd3df1a4057b6d7fb4dab073a727ba21f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07005984BEC2353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd3f08843a9b2b3284711e376fb785beb', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780AFB3ED5B373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd4ef00700436645680657f72445d38db', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780BAE8A397873F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd5b9e5d9bfbbd8e6d651087ead76d9f7', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780E0BF1BAA5B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd68957c067fb27e80a23babebdb1591f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700799230965A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd6aaf0f8e2428bf3c957becbf4bcedb4', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700E74D4E72723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd70329497664391dabc25effe7406c50', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07005CA9B85F5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd70c2847d8d0936a2a761f745a84aa48', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700274AA38B373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd762a1cba3dc23068f352323d98909e0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780DAEA25BC5B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd7902eeab2c34611fad046a79bff1c1b', 2, N'添加测试DEMO', NULL, N'admin', N'管理员', N'127.0.0.1', N'org.jeecg.modules.demo.test.controller.JeecgDemoController.add()', NULL, N'[{"createBy":"admin","createTime":1547883544104,"email":"zhangdaiscott@163.com","id":"4436302a0de50bb83025286bc414d6a9","name":"zhang daihao"}]', NULL, 1682, N'admin', CAST(0x0780B23C3083353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd7e7cb4c21372e48b8e0ec7e679466e3', 1, N'用户名: null,退出成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070069FFF064763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd7e8a7f14967c70d68f5569cb4d11d0a', 2, N'删除测试DEMO', NULL, NULL, NULL, N'127.0.0.1', N'org.jeecg.modules.demo.test.controller.JeecgDemoController.delete()', NULL, N'["5fce01cb7f0457746c97d8ca05628f81"]', NULL, 9, N'jeecg-boot', CAST(0x0780FB865F527A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd82b170459d99fc05eb8aa1774e1a1c9', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700D97A319D773F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd869534109332e770c70fad65ef37998', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07003F142B547E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd8c43edd685431ab3ef7b867efc29214', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07009BFEB3936F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd8eed69045aae6cedbff402b4e35f495', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700E695119A4E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd8fd478e6ceb03a575719e1a54342333', 1, N'用户名: jeecg,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780593DFB9C553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd916bd1d956418e569549ee1c7220576', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07005557DEA16F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd92d9e003666c6b020f079eaee721f9f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078057F0CC653E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd98115c02c0ac478a16d6c35de35053d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780D6B5966B7E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd9a0bb9fe6d2c675aa84f9441c0bd8bb', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780E518B25B4C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd9e0150666b69cced93eb4defb19788b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700683059C2663F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'da3fda67aea2e565574ec2bcfab5b750', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07008A427ABD843F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'da9a15efcf4e1e4f24647db7e2143238', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700691EFB5E4E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'dabdcb8e15ea9215a1af22f7567ff73d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078044A3D88C353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'dae0658783324c81fa6909b6e4a25a65', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078026F7B862573F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'db2b518e7086a0561f936d327a0ab522', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07801F56E7BD6F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'db8adca4aa7972fdc283be96d877efe0', 1, N'用户名: jeecg,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07000E04BC864E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'db8c89112bf4706fb558664dd741aa46', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078033C91950503F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'dbbcfb7f59311637a613ec9a6c63f04a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078010135B5B383F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'dcec1957987abbe6658f1f2c96980366', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780CED6797E373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'dcfe23b155d5c6fa9a302c063b19451e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780822D7D9D743F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'dd4e1ab492e59719173d8ae0f5dbc9a2', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0700A094D9A5873F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'dd6fbb9b6224c927c0923c16b9285525', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780FCCA22724D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'de37620b6921abcfe642606a0358d30f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07009FF6B383853F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'de938485a45097d1bf3fa311d0216ed4', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700193AF7557E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'de978382f59685babf3684d1c090d136', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07803FF1646C6B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'dee4d42c439b51b228ab5db5d0723fc0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700983F0CA8383F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'dfacaa7c01ccf0bade680044cced3f11', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700CF893E81803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e01ed1516e8ae3a2180acbd4e4508fa5', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700D6DA93AB743F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e088a2607864d3e6aadf239874d51756', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700D0466E9D773F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e09bb0a74c268a9aaf1f94edcc2eb65a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700A7FC899A653F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e0da357be27d66de1c9e9b8ecb22f9f9', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A652F95A5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e14cd21cf5eaad9ea3689730a824a50c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07009880DC874D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e169938510c9320cb1495ddb9aabb9d1', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07003EE63D6B763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e1d0b1fd3be59e465b740e32346e85b0', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x078030EE23567E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e1d1fc464cf48ec26b7412585bdded1a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07807F4AD873723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e1fa52ecbcc0970622cc5a0c06de9317', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0700B05D7E9B7F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e232f89df26cc9e5eced10476c4e4a2b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780E50A8B54863F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e234abc35a52f0dd2512b0ce2ea0e4f2', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700C7A765A8683F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e261674e2640fe6d0a3cd86df631537d', 1, N'用户名: jeecg,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780D97CED864E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e2af7674bb716a7c0b703c7c7e20b906', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07803135A3614D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e2b6d0e751f130d35c0c3b8c6bd2a77e', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0700F0D8B788783F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e2f703771f64b1bcd709204669ae3d93', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0780BD99247CAB3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e3031f999984909f9048d8ec15543ad0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07003FCDE29C743F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e37cce529d0c98c47b4977d7ddf963c0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700B5F65F99553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e39f051ba6fdb7447f975421f3b090a7', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700DB4F786B813F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e3b531fa12e47ac19a2ab0c883dee595', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A4EE6F595A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e40823376fa8c0e74a4e760de695e824', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700479ED882403F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e42a38382fce916909d6d09f66147006', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070036535C793E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e48a6bd82c92a8005c80c5ef36746117', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700C17BC9A35A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e4a166fcd0fc4037cb26e35cc1fb87b2', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07802AA8709B5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e4afd66ac249dde9c3bd9da50f9c2469', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700DD805894543F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e4c06405615399d6b1ebea45c8112b4d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700130B9F65713F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e4c330b381e2fbfde49f1d4dd43e68b7', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07808A417ABB4F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e4e40e21437b23b74324e0402cceb71a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070048370B613E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e540ca989819c54baefffbc3d05e8b58', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07008B7C5755543F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e5a9b045449136719d4c19c429c2dd56', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780680E186E4E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e713a89e753cbecf1e10247b2112c3f8', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070056C8D2C2593F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e720278084b0d4316448ec59d4e3399d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780C4FE18853B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e78f8832d61c1603c17767ee2b78ef07', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078027813FA65E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e7f2b0a7493e7858c5db1f1595fa54b1', 2, N'添加测试DEMO', NULL, NULL, NULL, N'127.0.0.1', N'org.jeecg.modules.demo.test.controller.JeecgDemoController.add()', NULL, N'[{"createBy":"jeecg-boot","createTime":1553824376817,"id":"e771211b77cd3b326d3e61edfd9a5a19","keyWord":"222","name":"222"}]', NULL, 7, N'jeecg-boot', CAST(0x0700CCF2D4527A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e864c0007983211026d6987bd0cd4dc8', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'192.168.1.114', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07001AF72672683F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e8b37ad67ef15925352a4ac3342cef07', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07008DEB4B72723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e8cde8dcd6253b249d67a05aaf10f968', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07008AC7D668383F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e92544c6102243e7908e0cbb217f5198', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070076825A6B5B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e93f1a170e3cd33f90dd132540c7a39b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07806FFD5B66763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e9a31bfc128b3f5ae01656916c605ddb', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07006C617A625A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e9ce2b3f7ac1fa3f5f7fd247207ca5c0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780012BE3BF353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e9d3202c14f7f2812346fb4c2b781c67', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'192.168.1.104', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700168E69B5663F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ea268ad02db29012b2f1bd3d4aea1419', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700232EA65D5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ea5f9191b0f593a1d6cb585538caa815', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070090D46873723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ea66ed22fde49640cee5d73c6ef69718', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07007EF631635B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'eaf74cd1489b02d39c470eed131fc918', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07805B47229C5A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'eb0b8a7cdf77df133566d7bd5a5f1fc0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078059BF9B5C543F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'eb4536aa50a58985baf0a763a1ce2ebf', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A66513A6523F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'eb6f5196de91dd2e8316696bddd61345', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700362B1EBC5B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'eb9a522fd947c7a706c5a106ca32b8c9', 1, N'用户名: jeecg,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780925084956E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ecfee5b948602a274093b8890e5e7f3f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780B5934E65763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ed0bbe9047a7471ae1cdc1c2941eccb1', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700775BD8953F3F0B AS DateTime2), NULL, NULL)
+GO
+print 'Processed 700 total records'
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ed2740de487c684be9fa3cf72113ae30', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078019BDCE6B763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ed50b1fbc80c3b953f4551081b10335e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07003958C788353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ed9b4ffc8afab10732aac2d0f84c567b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07000633C6A0703F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ee2bb63c47c868d59a45503b3d2f34ea', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700532086A13B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'eeb1f2e2c1b480e0bb62533848cbb176', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700054031C0593F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ef54197116da89bf091c0ed58321eea4', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070043EF57A2663F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ef7219725c4b84cc71f56f97a8eab01a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700104FB3655B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ef7669ac0350730d198f59b8411b19d1', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07809FBA5B795B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'efa591832b375b4609a5890b0c6f3250', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780240624864E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'efe77038e00cfff98d6931c3e7a4c3d6', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078023DBF288633F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f0409312093beb563ac4016f2b2c6dfd', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780877274707F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f04910792a74c563d057c4fcb345f963', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070084B1109B553F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f06048c147c5bcdbed672e32b2c86b1c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070010C563767B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f06e8fa83b408be905b4dc7caeaf9a80', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07800EC2EBA4373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f0748a25728348591c7b73a66f273457', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x07802BC2BEA5793F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f1186792c6584729a0f6da4432d951f9', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700686E6DB66B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f20416373c8fbae120991fa2b46534ee', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0760A85E7280AB3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f20cf3fe228ba6196a48015b98d0d354', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07007DC2CCA27D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f21e30d73c337ea913849ed65808525c', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070049541557783F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f21f9f700bf4f5bd9edda7a16ed338f8', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07809C4D67605A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f29f3b7b7e14b1389a0c53d263c0b26b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A281B2947A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f2ce8024e62740f63c134c3cfb3cae23', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780E4FBA765763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f3aab8f9dff7bf705aa29c6dcce49011', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780E3544E804E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f3cafb545e5693e446f641fa0b5ac8cd', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700BEC2998F803F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f3d371d6f71409ea2fe52405b725db4a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07807DE64E724D3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f3e1f7fb81004ccd64df12d94ef1e695', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07807C0C4CB4733F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f43e38800d779422c75075448af738d1', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A137779D743F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f540eff3f6e86c1e0beccd300efd357f', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07007B72E27F703F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f543c25bdd741055aeb4f77c5b5acf58', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700B9D2117B5B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f58e160e97d13a851f59b70bf54e0d06', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07003B4E4FA9743F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f5c08b45885d248c422a5d406cd5f223', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07006DE60D625A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f6646950c8465da1d1219b7a7a209fc2', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780A96D3AA13B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f74f759b43afa639fd1c4f215c984ae0', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700B5B58FB9763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f78e24f5e841acac2a720f46f6c554bc', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078020F59173723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f79af48e6aeb150432640483f3bb7f2a', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078035653F6E723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f84e86c9a21149134b1f2599a424164b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780479760A9373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f8960d64e93606fa52220cc9c4ae35a2', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070063A6235F393F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f9062582881b42f6b139c313d8ab0463', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070043B143AE523F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f93279c6899dc5e6cec975906f8bf811', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700E4BE9373723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f95d517f43ba2229c80c14c1883a4ee9', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078091C34166713F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f99912c5ff252594f14d31b768f8ad15', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700CBC12B7E373F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f9abb524e0dc3571571dc6e50ec6db75', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F609CC625A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'fa0612372b332b6c3ce787d9ca6dd2cc', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F091F4623A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'fa0ce422c12a565461eca56006052891', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780F61AAF55503F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'fa427f74dc6bd9cca3db478b5842f7f7', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780FF6704783E3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'fa9b4d7d42bc9d1ba058455b4afedbfb', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x07000DA1EE6C763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'fa9cebbb6af23d2830584b3aacd51e46', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780681C3F75413F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'faad055dd212ed9506b444f8f1a920b9', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070037DBAB645B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'fadb32d678346ee4bab02997988ff3bc', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700625E1FC0503F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'faea0dbfb7f86b571fed0dd270623831', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700333D0E77533F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'fb2871cda1421b766f8e68cb36a22bf3', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780105662935A3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'fb73d58bf6503270025972f99e50335d', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700FA4B4B64763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'fbb8834e9736bdd4b6d3baee895c4ca4', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078071699497413F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'fc22aaf9660e66558689a58dfa443074', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078009F16D8A503F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'fc69a1640a4772c8edf2548d053fa6de', 1, N'用户名: admin,登录成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0780205D1B7D743F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'fce1553149aea9bfd93e089f387199c8', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780EDE566C2593F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'fded8eb5d78d13791baec769019fee54', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078017D2B166763F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'fe0dc06eaef69047131f39052fcce5c4', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078088ABCC74703F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'fea8e1e2d229557185be0d9a10ebce17', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0780E7D8D4B7353F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'feaf7c377abc5824c1757d280dd3c164', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070013DE6D64713F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ff3f7dbda20cd2734b1238fa5ba17fcf', 1, N'用户名: 管理员,退出成功！', NULL, N'admin', N'管理员', N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0780DBE6EE5F863F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ffac84fff3c65bb17aa1bda3a0d2029e', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x070041C626A9633F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_log] ([id], [log_type], [log_content], [operate_type], [userid], [username], [ip], [method], [request_url], [request_param], [request_type], [cost_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ffc6178ffa099bb90b9a4d0a64dae42b', 1, N'用户名: admin,登录成功！', NULL, NULL, NULL, N'127.0.0.1', NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700C83DDC9A723F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0072d115e07c875d76c9b022e2179128', N'4d7fec1a7799a436d26d02325eff295e', N'低', N'L', N'低', 3, 1, N'admin', CAST(0x0780AF42308F8C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'05a2e732ce7b00aa52141ecc3e330b4e', N'3486f32803bb953e7155dab3513dc68b', N'已删除', N'1', NULL, NULL, 1, N'admin', CAST(0x0700089493B6D5480B AS DateTime2), N'admin', CAST(0x0700FC57A9BB793F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'096c2e758d823def3855f6376bc736fb', N'bd1b8bc28e65d6feefefb6f3c79f42fd', N'SQL', N'sql', NULL, 1, 1, N'admin', CAST(0x07004D5F2F92883F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0c9532916f5cd722017b46bc4d953e41', N'2f0320997ade5dd147c90130f7218c3e', N'指定用户', N'USER', NULL, NULL, 1, N'admin', CAST(0x0780B73723B36E3F0B AS DateTime2), N'admin', CAST(0x0700029528B36E3F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'0ca4beba9efc4f9dd54af0911a946d5c', N'72cce0989df68887546746d8f09811aa', N'附表', N'3', NULL, 3, 1, N'admin', CAST(0x0780E537BC55783F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1030a2652608f5eac3b49d70458b8532', N'2e02df51611a4b9632828ab7e5338f00', N'禁用', N'2', N'禁用', 2, 1, N'admin', CAST(0x07002818B69A52420B AS DateTime2), N'admin', CAST(0x0780711D599C963F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'147c48ff4b51545032a9119d13f3222a', N'd6e1152968b02d69ff358c75b48a6ee1', N'测试流程', N'test', NULL, 1, 1, N'admin', CAST(0x07800A270AA3733F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1543fe7e5e26fb97cdafe4981bedc0c8', N'4c03fca6bf1f0299c381213961566349', N'单排布局', N'single', NULL, 2, 1, N'admin', CAST(0x0780971697942B440B AS DateTime2), N'admin', CAST(0x07802CD1A194883F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1b8a6341163062dad8cb2fddd34e0c3b', N'404a04a15f371566c658ee9ef9fc392a', N'22', N'222', NULL, 1, 1, N'admin', CAST(0x07005604B05E7B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1ce390c52453891f93514c1bd2795d44', N'ad7c65ba97c20a6805d5dcdf13cdaf36', N'000', N'00', NULL, 1, 1, N'admin', CAST(0x0700C979F08A733F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1db531bcff19649fa82a644c8a939dc4', N'4c03fca6bf1f0299c381213961566349', N'组合布局', N'combination', N'', 4, 1, N'admin', CAST(0x07001E621B87A53F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'222705e11ef0264d4214affff1fb4ff9', N'4f69be5f507accea8d5df5f11346181a', N'短信', N'1', N'', 1, 1, N'admin', CAST(0x0700E644E35A12450B AS DateTime2), N'admin', CAST(0x07806378F25B983F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'23a5bb76004ed0e39414e928c4cde155', N'4e4602b3e3686f0911384e188dc7efb4', N'不等于', N'!=', N'不等于', 3, 1, N'admin', CAST(0x0780E54D928C7D3F0B AS DateTime2), N'admin', CAST(0x07008C7F4A957D3F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'25847e9cb661a7c711f9998452dc09e6', N'4e4602b3e3686f0911384e188dc7efb4', N'小于等于', N'<=', N'小于等于', 6, 1, N'admin', CAST(0x0700851A568C7D3F0B AS DateTime2), N'admin', CAST(0x07002F615C957D3F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'2d51376643f220afdeb6d216a8ac2c01', N'68168534ff5065a152bfab275c2136f8', N'有效', N'1', N'有效', 2, 1, N'admin', CAST(0x078052F454A2963F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'308c8aadf0c37ecdde188b97ca9833f5', N'8dfe32e2d29ea9430a988b3b558bf233', N'已发布', N'1', N'已发布', 2, 1, N'admin', CAST(0x07003A9F46948C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'333e6b2196e01ef9a5f76d74e86a6e33', N'8dfe32e2d29ea9430a988b3b558bf233', N'未发布', N'0', N'未发布', 1, 1, N'admin', CAST(0x07002C783F948C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'337ea1e401bda7233f6258c284ce4f50', N'bd1b8bc28e65d6feefefb6f3c79f42fd', N'JSON', N'json', NULL, 1, 1, N'admin', CAST(0x07806A8B3392883F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'33bc9d9f753cf7dc40e70461e50fdc54', N'a9d9942bd0eccb6e89de92d130ec4c4a', N'发送失败', N'2', NULL, 3, 1, N'admin', CAST(0x0700F541AC99883F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'3fbc03d6c994ae06d083751248037c0e', N'78bda155fe380b1b3f175f1e88c284c6', N'已完成', N'3', N'已完成', 3, 1, N'admin', CAST(0x07803859C78AA33F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'41d7aaa40c9b61756ffb1f28da5ead8e', N'0b5d19e1fce4b2e6647e6b4a17760c14', N'通知公告', N'1', NULL, 1, 1, N'admin', CAST(0x0780188C2597923F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'41fa1e9571505d643aea87aeb83d4d76', N'4e4602b3e3686f0911384e188dc7efb4', N'等于', N'=', N'等于', 4, 1, N'admin', CAST(0x0700EAE7738C7D3F0B AS DateTime2), N'admin', CAST(0x07004E6B56957D3F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'43d2295b8610adce9510ff196a49c6e9', N'845da5006c97754728bf48b6a10f79cc', N'正常', N'1', NULL, NULL, 1, N'admin', CAST(0x0780D1D56CB66F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4f05fb5376f4c61502c5105f52e4dd2b', N'83bfb33147013cc81640d5fd9eda030c', N'操作日志', N'2', NULL, NULL, 1, N'admin', CAST(0x07802AA2F8C36F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'50223341bfb5ba30bf6319789d8d17fe', N'd6e1152968b02d69ff358c75b48a6ee1', N'业务办理', N'business', NULL, 3, 1, N'admin', CAST(0x078050EA2DA347450B AS DateTime2), N'admin', CAST(0x0780D5323AC4733F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'538fca35afe004972c5f3947c039e766', N'2e02df51611a4b9632828ab7e5338f00', N'显示', N'1', N'显示', 1, 1, N'admin', CAST(0x07805627AD9A07480B AS DateTime2), N'admin', CAST(0x078017BB569C963F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5584c21993bde231bbde2b966f2633ac', N'4e4602b3e3686f0911384e188dc7efb4', N'自定义SQL表达式', N'USE_SQL_RULES', N'自定义SQL表达式', 9, 1, N'admin', CAST(0x07007A4D295A7D3F0B AS DateTime2), N'admin', CAST(0x07802D8366957D3F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'58b73b344305c99b9d8db0fc056bbc0a', N'72cce0989df68887546746d8f09811aa', N'主表', N'2', NULL, 2, 1, N'admin', CAST(0x0700C80BB855783F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5b65a88f076b32e8e69d19bbaadb52d5', N'2f0320997ade5dd147c90130f7218c3e', N'全体用户', N'ALL', NULL, NULL, 1, N'admin', CAST(0x0780D38531B3B2410B AS DateTime2), N'admin', CAST(0x0780E035CCBA793F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5d84a8634c8fdfe96275385075b105c9', N'3d9a351be3436fbefb1307d4cfb49bf2', N'女', N'2', NULL, 2, 1, NULL, CAST(0x0700ECD54C7D263F0B AS DateTime2), NULL, CAST(0x07005A2ED493263F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'66c952ae2c3701a993e7db58f3baf55e', N'4e4602b3e3686f0911384e188dc7efb4', N'大于', N'>', N'大于', 1, 1, N'admin', CAST(0x0700696A365A7D3F0B AS DateTime2), N'admin', CAST(0x078014F143957D3F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6937c5dde8f92e9a00d4e2ded9198694', N'ad7c65ba97c20a6805d5dcdf13cdaf36', N'easyui', N'3', NULL, 1, 1, N'admin', CAST(0x078011A09D8A733F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'69cacf64e244100289ddd4aa9fa3b915', N'a9d9942bd0eccb6e89de92d130ec4c4a', N'未发送', N'0', NULL, 1, 1, N'admin', CAST(0x078007039599883F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6a7a9e1403a7943aba69e54ebeff9762', N'4f69be5f507accea8d5df5f11346181a', N'邮件', N'2', N'', 2, 1, N'admin', CAST(0x07009A09E85A7C500B AS DateTime2), N'admin', CAST(0x0780F576115C983F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6c682d78ddf1715baf79a1d52d2aa8c2', N'72cce0989df68887546746d8f09811aa', N'单表', N'1', NULL, 1, 1, N'admin', CAST(0x0780AADFB355783F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6d404fd2d82311fbc87722cd302a28bc', N'4e4602b3e3686f0911384e188dc7efb4', N'模糊', N'LIKE', N'模糊', 7, 1, N'admin', CAST(0x0700418E8A8C7D3F0B AS DateTime2), N'admin', CAST(0x0700105762957D3F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6d4e26e78e1a09699182e08516c49fc4', N'4d7fec1a7799a436d26d02325eff295e', N'高', N'H', N'高', 1, 1, N'admin', CAST(0x07001C661B8F8C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'700e9f030654f3f90e9ba76ab0713551', N'6b78e3f59faec1a4750acff08030a79b', N'333', N'333', NULL, NULL, 1, N'admin', CAST(0x07807B989BA7563F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7050c1522702bac3be40e3b7d2e1dfd8', N'c5a14c75172783d72cbee6ee7f5df5d1', N'柱状图', N'bar', NULL, 1, 1, N'admin', CAST(0x078044FD3A8F883F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'71b924faa93805c5c1579f12e001c809', N'd6e1152968b02d69ff358c75b48a6ee1', N'OA办公', N'oa', NULL, 2, 1, N'admin', CAST(0x0780184E11A34E420B AS DateTime2), N'admin', CAST(0x0700126938C4733F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'75b260d7db45a39fc7f21badeabdb0ed', N'c36169beb12de8a71c8683ee7c28a503', N'不启用', N'0', NULL, NULL, 1, N'admin', CAST(0x07806034EEC46F3F0B AS DateTime2), N'admin', CAST(0x070005F4F5C46F3F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7688469db4a3eba61e6e35578dc7c2e5', N'c36169beb12de8a71c8683ee7c28a503', N'启用', N'1', NULL, NULL, 1, N'admin', CAST(0x0700BC74E6C46F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'78ea6cadac457967a4b1c4eb7aaa418c', N'fc6cd58fde2e8481db10d3a1e68ce70c', N'正常', N'1', NULL, NULL, 1, N'admin', CAST(0x070002380AC56F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7ccf7b80c70ee002eceb3116854b75cb', N'ac2f7c0c5c5775fcea7e2387bcb22f01', N'按钮权限', N'2', NULL, NULL, 1, N'admin', CAST(0x0700B28E5EC46F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'81fb2bb0e838dc68b43f96cc309f8257', N'fc6cd58fde2e8481db10d3a1e68ce70c', N'冻结', N'2', NULL, NULL, 1, N'admin', CAST(0x07804C950FC56F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'83250269359855501ec4e9c0b7e21596', N'4274efc2292239b6f000b153f50823ff', N'显示/访问(授权后显示/可访问)', N'1', N'', 1, 1, N'admin', CAST(0x0780A7A12796A43F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'84778d7e928bc843ad4756db1322301f', N'4e4602b3e3686f0911384e188dc7efb4', N'大于等于', N'>=', N'大于等于', 5, 1, N'admin', CAST(0x0700D1F33F5A7D3F0B AS DateTime2), N'admin', CAST(0x07803E6659957D3F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'848d4da35ebd93782029c57b103e5b36', N'c5a14c75172783d72cbee6ee7f5df5d1', N'饼图', N'pie', NULL, 3, 1, N'admin', CAST(0x078014104E8F883F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'84dfc178dd61b95a72900fcdd624c471', N'78bda155fe380b1b3f175f1e88c284c6', N'处理中', N'2', N'处理中', 2, 1, N'admin', CAST(0x07801C0BB98AA33F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'86f19c7e0a73a0bae451021ac05b99dd', N'ac2f7c0c5c5775fcea7e2387bcb22f01', N'子菜单', N'1', NULL, NULL, 1, N'admin', CAST(0x07800DCF56C46F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8bccb963e1cd9e8d42482c54cc609ca2', N'4f69be5f507accea8d5df5f11346181a', N'微信', N'3', NULL, 3, 1, N'admin', CAST(0x0700AC036D7980420B AS DateTime2), N'admin', CAST(0x0780D7567879873F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8c618902365ca681ebbbe1e28f11a548', N'4c753b5293304e7a445fd2741b46529d', N'启用', N'1', N'', 0, 1, N'admin', CAST(0x0780693B80C357410B AS DateTime2), N'admin', CAST(0x0700375F837CAB3F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8cdf08045056671efd10677b8456c999', N'4274efc2292239b6f000b153f50823ff', N'可编辑(未授权时禁用)', N'2', N'', 2, 1, N'admin', CAST(0x070049A54396A43F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'8ff48e657a7c5090d4f2a59b37d1b878', N'4d7fec1a7799a436d26d02325eff295e', N'中', N'M', N'中', 2, 1, N'admin', CAST(0x070084EF248F8C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'9a96c4a4e4c5c9b4e4d0cbf6eb3243cc', N'4c753b5293304e7a445fd2741b46529d', N'不启用', N'0', NULL, 1, 1, N'admin', CAST(0x0780B2BA8FC36F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a2321496db6febc956a6c70fab94cb0c', N'404a04a15f371566c658ee9ef9fc392a', N'3', N'3', NULL, 1, 1, N'admin', CAST(0x0700F9E5C15E7B3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a2be752dd4ec980afaec1efd1fb589af', N'8dfe32e2d29ea9430a988b3b558bf233', N'已撤销', N'2', N'已撤销', 3, 1, N'admin', CAST(0x07800B904F948C3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'aa0d8a8042a18715a17f0a888d360aa4', N'ac2f7c0c5c5775fcea7e2387bcb22f01', N'一级菜单', N'0', NULL, NULL, 1, N'admin', CAST(0x07007AF241C46F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'adcf2a1fe93bb99a84833043f475fe0b', N'4e4602b3e3686f0911384e188dc7efb4', N'包含', N'IN', N'包含', 8, 1, N'admin', CAST(0x07806F9D818C7D3F0B AS DateTime2), N'admin', CAST(0x07006AB964957D3F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b029a41a851465332ee4ee69dcf0a4c2', N'0b5d19e1fce4b2e6647e6b4a17760c14', N'系统消息', N'2', NULL, 1, 1, N'admin', CAST(0x0700901A2C97573F0B AS DateTime2), N'admin', CAST(0x078080152F97923F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b2a8b4bb2c8e66c2c4b1bb086337f393', N'3486f32803bb953e7155dab3513dc68b', N'正常', N'0', NULL, NULL, 1, N'admin', CAST(0x070054CF8EB68D440B AS DateTime2), N'admin', CAST(0x0700B69485BB793F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b4a887dc3ff01d2daadaa412e63189ed', N'4f69be5f507accea8d5df5f11346181a', N'邮件', N'2', NULL, 2, 1, N'admin', CAST(0x078061A6677980420B AS DateTime2), N'admin', CAST(0x078050C37479873F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b57f98b88363188daf38d42f25991956', N'6b78e3f59faec1a4750acff08030a79b', N'22', N'222', NULL, NULL, 0, N'admin', CAST(0x0780213699A7563F0B AS DateTime2), N'admin', CAST(0x0780B1BF4BB3683F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b5f3bd5f66bb9a83fecd89228c0d93d1', N'68168534ff5065a152bfab275c2136f8', N'无效', N'0', N'无效', 1, 1, N'admin', CAST(0x078044CD4DA2963F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b9fbe2a3602d4a27b45c100ac5328484', N'78bda155fe380b1b3f175f1e88c284c6', N'待提交', N'1', N'待提交', 1, 1, N'admin', CAST(0x0780D38BA98AA33F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ba27737829c6e0e582e334832703d75e', N'236e8a4baff0db8c62c00dd95632834f', N'同步', N'1', N'同步', 1, 1, N'admin', CAST(0x078091CEAC8166420B AS DateTime2), N'admin', CAST(0x0710CEF02D80AB3F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'cbfcc5b88fc3a90975df23ffc8cbe29c', N'c5a14c75172783d72cbee6ee7f5df5d1', N'曲线图', N'line', NULL, 2, 1, N'admin', CAST(0x0700E9BC428FA63F0B AS DateTime2), N'admin', CAST(0x07001332588F883F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd1cee7b0dcccff0b07da7325110fcad4', N'4f69be5f507accea8d5df5f11346181a', N'微信', N'3', N'', 3, 1, N'admin', CAST(0x0780E466ED5A31560B AS DateTime2), N'admin', CAST(0x0780E74F0A5C983F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd217592908ea3e00ff986ce97f24fb98', N'c5a14c75172783d72cbee6ee7f5df5d1', N'数据列表', N'table', NULL, 4, 1, N'admin', CAST(0x0700323C528F883F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd75b5b3666d0742f08027af0255b4400', N'4f69be5f507accea8d5df5f11346181a', N'短信', N'1', NULL, 1, 1, N'admin', CAST(0x0780264E5F79873F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'df168368dcef46cade2aadd80100d8aa', N'3d9a351be3436fbefb1307d4cfb49bf2', N'男', N'1', NULL, 1, 1, NULL, CAST(0x0780CEA9487D644B0B AS DateTime2), N'admin', CAST(0x0700D6AAA6BE743F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e6329e3a66a003819e2eb830b0ca2ea0', N'4e4602b3e3686f0911384e188dc7efb4', N'小于', N'<', N'小于', 2, 1, N'admin', CAST(0x078059C74A8C7D3F0B AS DateTime2), N'admin', CAST(0x070005EC46957D3F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'e94eb7af89f1dbfa0d823580a7a6e66a', N'236e8a4baff0db8c62c00dd95632834f', N'不同步', N'0', N'不同步', 2, 1, N'admin', CAST(0x0700368EB481A93F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f0162f4cc572c9273f3e26b2b4d8c082', N'ad7c65ba97c20a6805d5dcdf13cdaf36', N'booostrap', N'1', NULL, 1, 1, N'admin', CAST(0x07009A11978AE7420B AS DateTime2), N'admin', CAST(0x0780086CDA8A733F0B AS DateTime2))
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f16c5706f3ae05c57a53850c64ce7c45', N'a9d9942bd0eccb6e89de92d130ec4c4a', N'发送成功', N'1', NULL, 2, 1, N'admin', CAST(0x0780C9EEA099883F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f2a7920421f3335afdf6ad2b342f6b5d', N'845da5006c97754728bf48b6a10f79cc', N'冻结', N'2', NULL, NULL, 1, N'admin', CAST(0x0700496473B66F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f37f90c496ec9841c4c326b065e00bb2', N'83bfb33147013cc81640d5fd9eda030c', N'登录日志', N'1', NULL, NULL, 1, N'admin', CAST(0x07801C7BF1C36F3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'f753aff60ff3931c0ecb4812d8b5e643', N'4c03fca6bf1f0299c381213961566349', N'双排布局', N'double', NULL, 3, 1, N'admin', CAST(0x0780A53D9E94883F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'fcec03570f68a175e1964808dc3f1c91', N'4c03fca6bf1f0299c381213961566349', N'Tab风格', N'tab', NULL, 1, 1, N'admin', CAST(0x0780E3519294883F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'fe50b23ae5e68434def76f67cef35d2d', N'78bda155fe380b1b3f175f1e88c284c6', N'已作废', N'4', N'已作废', 4, 1, N'admin', CAST(0x0780CD13D28AF9420B AS DateTime2), N'admin', CAST(0x0700500DF48AA33F0B AS DateTime2))
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'0b5d19e1fce4b2e6647e6b4a17760c14', N'通告类型', N'msg_category', N'消息类型1:通知公告2:系统消息', 1, N'admin', CAST(0x0780296F1897923F0B AS DateTime2), NULL, NULL, 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'236e8a4baff0db8c62c00dd95632834f', N'同步工作流引擎', N'activiti_sync', N'同步工作流引擎', 1, N'admin', CAST(0x0780E0C59381A93F0B AS DateTime2), NULL, NULL, 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'2e02df51611a4b9632828ab7e5338f00', N'权限策略', N'perms_type', N'权限策略', 1, N'admin', CAST(0x0780C16CA29A963F0B AS DateTime2), NULL, NULL, 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'2f0320997ade5dd147c90130f7218c3e', N'推送类别', N'msg_type', N'', 1, N'admin', CAST(0x0700163407B36E3F0B AS DateTime2), N'admin', CAST(0x0780C2E052A7773F0B AS DateTime2), 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'3486f32803bb953e7155dab3513dc68b', N'删除状态', N'del_flag', NULL, 1, N'admin', CAST(0x070065B281B6343F0B AS DateTime2), N'admin', CAST(0x078095F6995E7B3F0B AS DateTime2), 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'3d9a351be3436fbefb1307d4cfb49bf2', N'性别', N'sex', NULL, 1, NULL, CAST(0x0700D0873E7D263F0B AS DateTime2), N'admin', CAST(0x0780FFE32C607B3F0B AS DateTime2), 1)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'404a04a15f371566c658ee9ef9fc392a', N'cehis2', N'22', NULL, 2, N'admin', CAST(0x078076EC9F5E403F0B AS DateTime2), N'admin', CAST(0x07007252BE5E7B3F0B AS DateTime2), 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'4274efc2292239b6f000b153f50823ff', N'全局权限策略', N'global_perms_type', N'全局权限策略', 1, N'admin', CAST(0x07809C360C96A43F0B AS DateTime2), NULL, NULL, 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'4c03fca6bf1f0299c381213961566349', N'Online图表展示模板', N'online_graph_display_template', N'Online图表展示模板', 1, N'admin', CAST(0x0700F5338592883F0B AS DateTime2), NULL, NULL, 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'4c753b5293304e7a445fd2741b46529d', N'字典状态', N'dict_item_status', NULL, 1, N'admin', CAST(0x0700F56865C339410B AS DateTime2), N'admin', CAST(0x070050BEFCA37B3F0B AS DateTime2), 1)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'4d7fec1a7799a436d26d02325eff295e', N'优先级', N'priority', N'优先级', 1, N'admin', CAST(0x0700B798FD8E6D3F0B AS DateTime2), N'admin', CAST(0x07801780FE938C3F0B AS DateTime2), 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'4e4602b3e3686f0911384e188dc7efb4', N'条件规则', N'rule_conditions', N'', 1, N'admin', CAST(0x0780EDE6EB557D3F0B AS DateTime2), N'admin', CAST(0x0780E5911E587D3F0B AS DateTime2), 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'4f69be5f507accea8d5df5f11346181a', N'发送消息类型', N'msgType', NULL, 1, N'admin', CAST(0x07805CB32379873F0B AS DateTime2), NULL, NULL, 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'68168534ff5065a152bfab275c2136f8', N'有效无效状态', N'valid_status', N'有效无效状态', 1, N'admin', CAST(0x0700B1F038A29D410B AS DateTime2), N'admin', CAST(0x0780FB4D3EA2963F0B AS DateTime2), 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'6b78e3f59faec1a4750acff08030a79b', N'用户类型', N'user_type', NULL, 2, NULL, CAST(0x07806857977D263F0B AS DateTime2), N'admin', CAST(0x070095BBBCC46F3F0B AS DateTime2), 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'72cce0989df68887546746d8f09811aa', N'Online表单类型', N'cgform_table_type', N'', 1, N'admin', CAST(0x0700CBC7A3553D3F0B AS DateTime2), N'admin', CAST(0x0700C01E74617B3F0B AS DateTime2), 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'78bda155fe380b1b3f175f1e88c284c6', N'流程状态', N'bpm_status', N'流程状态', 1, N'admin', CAST(0x07008CEA8F8AA33F0B AS DateTime2), NULL, NULL, 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'83bfb33147013cc81640d5fd9eda030c', N'日志类型', N'log_type', NULL, 1, N'admin', CAST(0x078087C0E6C36F3F0B AS DateTime2), NULL, NULL, 1)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'845da5006c97754728bf48b6a10f79cc', N'状态', N'status', NULL, 2, N'admin', CAST(0x078088565DB66F3F0B AS DateTime2), N'admin', CAST(0x078016412EB86F3F0B AS DateTime2), 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'8dfe32e2d29ea9430a988b3b558bf233', N'发布状态', N'send_status', N'发布状态', 1, N'admin', CAST(0x070089962D948C3F0B AS DateTime2), NULL, NULL, 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'a9d9942bd0eccb6e89de92d130ec4c4a', N'消息发送状态', N'msgSendStatus', NULL, 1, N'admin', CAST(0x07803AAC6D99883F0B AS DateTime2), NULL, NULL, 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'ac2f7c0c5c5775fcea7e2387bcb22f01', N'菜单类型', N'menu_type', NULL, 1, N'admin', CAST(0x0700B80636C4F0410B AS DateTime2), N'admin', CAST(0x070001AE83817D3F0B AS DateTime2), 1)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'ad7c65ba97c20a6805d5dcdf13cdaf36', N'onlineT类型', N'ceshi_online', NULL, 2, N'admin', CAST(0x0780C8208E8A733F0B AS DateTime2), N'admin', CAST(0x070034BFE58A733F0B AS DateTime2), 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'bd1b8bc28e65d6feefefb6f3c79f42fd', N'Online图表数据类型', N'online_graph_data_type', N'Online图表数据类型', 1, N'admin', CAST(0x070094A7E691883F0B AS DateTime2), N'admin', CAST(0x0780FA52FA91883F0B AS DateTime2), 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'c36169beb12de8a71c8683ee7c28a503', N'部门状态', N'depart_status', NULL, 1, N'admin', CAST(0x0780A58361B86F3F0B AS DateTime2), NULL, NULL, 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'c5a14c75172783d72cbee6ee7f5df5d1', N'Online图表类型', N'online_graph_type', N'Online图表类型', 1, N'admin', CAST(0x070087AB108F883F0B AS DateTime2), NULL, NULL, 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'd6e1152968b02d69ff358c75b48a6ee1', N'流程类型', N'bpm_process_type', NULL, 1, N'admin', CAST(0x0700939803A332420B AS DateTime2), N'admin', CAST(0x070002B7EE987B3F0B AS DateTime2), 0)
+INSERT [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'fc6cd58fde2e8481db10d3a1e68ce70c', N'用户状态', N'user_status', NULL, 1, N'admin', CAST(0x0780D07D0AB86F3F0B AS DateTime2), N'admin', CAST(0x0700739B74C26F3F0B AS DateTime2), 1)
+INSERT [dbo].[sys_depart] ([id], [parent_id], [depart_name], [depart_name_en], [depart_name_abbr], [depart_order], [description], [org_type], [org_code], [mobile], [fax], [address], [memo], [status], [del_flag], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4f1765520d6346f9bd9c79e2479e5b12', N'c6d7cb4deeac411cb3384b1b31278596', N'市场部', NULL, NULL, 0, NULL, N'2', N'A01A03', NULL, NULL, NULL, NULL, NULL, N'0', N'admin', CAST(0x0700FFBFAA90553F0B AS DateTime2), N'admin', CAST(0x0700ED762E8B5B3F0B AS DateTime2))
+INSERT [dbo].[sys_depart] ([id], [parent_id], [depart_name], [depart_name_en], [depart_name_abbr], [depart_order], [description], [org_type], [org_code], [mobile], [fax], [address], [memo], [status], [del_flag], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5159cde220114246b045e574adceafe9', N'6d35e179cd814e3299bd588ea7daed3f', N'研发部', NULL, NULL, 0, NULL, N'2', N'A02A02', NULL, NULL, NULL, N'', NULL, N'0', N'admin', CAST(0x0700DF7C588C5B3F0B AS DateTime2), N'admin', CAST(0x07A05FEC6783AB3F0B AS DateTime2))
+INSERT [dbo].[sys_depart] ([id], [parent_id], [depart_name], [depart_name_en], [depart_name_abbr], [depart_order], [description], [org_type], [org_code], [mobile], [fax], [address], [memo], [status], [del_flag], [create_by], [create_time], [update_by], [update_time]) VALUES (N'57197590443c44f083d42ae24ef26a2c', N'c6d7cb4deeac411cb3384b1b31278596', N'研发部', NULL, NULL, 0, NULL, N'2', N'A01A05', NULL, NULL, NULL, NULL, NULL, N'0', N'admin', CAST(0x07806E642988563F0B AS DateTime2), N'admin', CAST(0x0780E49811A0783F0B AS DateTime2))
+INSERT [dbo].[sys_depart] ([id], [parent_id], [depart_name], [depart_name_en], [depart_name_abbr], [depart_order], [description], [org_type], [org_code], [mobile], [fax], [address], [memo], [status], [del_flag], [create_by], [create_time], [update_by], [update_time]) VALUES (N'67fc001af12a4f9b8458005d3f19934a', N'c6d7cb4deeac411cb3384b1b31278596', N'财务部', NULL, NULL, 0, NULL, N'2', N'A01A04', NULL, NULL, NULL, NULL, NULL, N'0', N'admin', CAST(0x0780E7D02588563F0B AS DateTime2), N'admin', CAST(0x07806005866B5A3F0B AS DateTime2))
+INSERT [dbo].[sys_depart] ([id], [parent_id], [depart_name], [depart_name_en], [depart_name_abbr], [depart_order], [description], [org_type], [org_code], [mobile], [fax], [address], [memo], [status], [del_flag], [create_by], [create_time], [update_by], [update_time]) VALUES (N'6d35e179cd814e3299bd588ea7daed3f', N'', N'卓尔互动公司', NULL, NULL, 0, NULL, N'1', N'A02', NULL, NULL, NULL, NULL, NULL, N'0', N'admin', CAST(0x078045FB3A8B5B3F0B AS DateTime2), N'admin', CAST(0x07800C07BC8C733F0B AS DateTime2))
+INSERT [dbo].[sys_depart] ([id], [parent_id], [depart_name], [depart_name_en], [depart_name_abbr], [depart_order], [description], [org_type], [org_code], [mobile], [fax], [address], [memo], [status], [del_flag], [create_by], [create_time], [update_by], [update_time]) VALUES (N'743ba9dbdc114af8953a11022ef3096a', N'f28c6f53abd841ac87ead43afc483433', N'财务部', NULL, NULL, 0, NULL, N'2', N'A03A01', NULL, NULL, NULL, NULL, NULL, N'0', N'admin', CAST(0x0780153B7F8C733F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_depart] ([id], [parent_id], [depart_name], [depart_name_en], [depart_name_abbr], [depart_order], [description], [org_type], [org_code], [mobile], [fax], [address], [memo], [status], [del_flag], [create_by], [create_time], [update_by], [update_time]) VALUES (N'a7d7e77e06c84325a40932163adcdaa6', N'6d35e179cd814e3299bd588ea7daed3f', N'财务部', NULL, NULL, 0, NULL, N'2', N'A02A01', NULL, NULL, NULL, NULL, NULL, N'0', N'admin', CAST(0x0780F9BF3F8B5B3F0B AS DateTime2), N'admin', CAST(0x07805066568B5B3F0B AS DateTime2))
+INSERT [dbo].[sys_depart] ([id], [parent_id], [depart_name], [depart_name_en], [depart_name_abbr], [depart_order], [description], [org_type], [org_code], [mobile], [fax], [address], [memo], [status], [del_flag], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c6d7cb4deeac411cb3384b1b31278596', N'', N'北京国炬公司', NULL, NULL, 0, NULL, N'1', N'A01', NULL, NULL, NULL, NULL, NULL, N'0', N'admin', CAST(0x0780692866784C3F0B AS DateTime2), N'admin', CAST(0x07808573B88C733F0B AS DateTime2))
+INSERT [dbo].[sys_data_log] ([id], [create_by], [create_time], [update_by], [update_time], [data_table], [data_id], [data_content], [data_version]) VALUES (N'402880f05ab0d198015ab12274bf0006', N'admin', CAST(0x078054801C618C3C0B AS DateTime2), NULL, NULL, N'jeecg_demo', N'4028ef81550c1a7901550c1cd6e70001', N'{"mobilePhone":"","officePhone":"","email":"","createDate":"Jun 23, 2016 12:00:00 PM","sex":"1","depId":"402880e447e99cf10147e9a03b320003","userName":"9001","status":"1","content":"111","id":"4028ef81550c1a7901550c1cd6e70001"}', 3)
+INSERT [dbo].[sys_data_log] ([id], [create_by], [create_time], [update_by], [update_time], [data_table], [data_id], [data_content], [data_version]) VALUES (N'402880f05ab6d12b015ab700bead0009', N'admin', CAST(0x0780C33E2D7D8D3C0B AS DateTime2), NULL, NULL, N'jeecg_demo', N'402880f05ab6d12b015ab700be8d0008', N'{"mobilePhone":"","officePhone":"","email":"","createDate":"Mar 10, 2017 2:56:03 PM","sex":"0","depId":"402880e447e99cf10147e9a03b320003","userName":"111","status":"0","id":"402880f05ab6d12b015ab700be8d0008"}', 1)
+INSERT [dbo].[sys_data_log] ([id], [create_by], [create_time], [update_by], [update_time], [data_table], [data_id], [data_content], [data_version]) VALUES (N'402880f05ab6d12b015ab705a23f000d', N'admin', CAST(0x07007A93EC7D8D3C0B AS DateTime2), NULL, NULL, N'jeecg_demo', N'402880f05ab6d12b015ab705a233000c', N'{"mobilePhone":"","officePhone":"11","email":"","createDate":"Mar 10, 2017 3:01:24 PM","sex":"0","depId":"402880e447e99cf10147e9a03b320003","userName":"11","status":"0","id":"402880f05ab6d12b015ab705a233000c"}', 1)
+INSERT [dbo].[sys_data_log] ([id], [create_by], [create_time], [update_by], [update_time], [data_table], [data_id], [data_content], [data_version]) VALUES (N'402880f05ab6d12b015ab712a6420013', N'admin', CAST(0x0780F200E97F8D3C0B AS DateTime2), NULL, NULL, N'jeecg_demo', N'402880f05ab6d12b015ab712a6360012', N'{"mobilePhone":"","officePhone":"","email":"","createDate":"Mar 10, 2017 3:15:37 PM","sex":"0","depId":"402880e447e99cf10147e9a03b320003","userName":"小王","status":"0","id":"402880f05ab6d12b015ab712a6360012"}', 1)
+INSERT [dbo].[sys_data_log] ([id], [create_by], [create_time], [update_by], [update_time], [data_table], [data_id], [data_content], [data_version]) VALUES (N'402880f05ab6d12b015ab712d0510015', N'admin', CAST(0x0780D3F6EE7F8D3C0B AS DateTime2), NULL, NULL, N'jeecg_demo', N'402880f05ab6d12b015ab712a6360012', N'{"mobilePhone":"18611788525","officePhone":"","email":"","createDate":"Mar 10, 2017 3:15:37 AM","sex":"0","depId":"402880e447e99cf10147e9a03b320003","userName":"小王","status":"0","id":"402880f05ab6d12b015ab712a6360012"}', 2)
+INSERT [dbo].[sys_data_log] ([id], [create_by], [create_time], [update_by], [update_time], [data_table], [data_id], [data_content], [data_version]) VALUES (N'402880f05ab6d12b015ab71308240018', N'admin', CAST(0x0700A5E7F77F8D3C0B AS DateTime2), NULL, NULL, N'jeecg_demo', N'8a8ab0b246dc81120146dc81860f016f', N'{"mobilePhone":"13111111111","officePhone":"66666666","email":"demo@jeecg.com","age":12,"salary":10.00,"birthday":"Feb 14, 2014 12:00:00 AM","sex":"1","depId":"402880e447e99cf10147e9a03b320003","userName":"小明","status":"","content":"","id":"8a8ab0b246dc81120146dc81860f016f"}', 1)
+INSERT [dbo].[sys_data_log] ([id], [create_by], [create_time], [update_by], [update_time], [data_table], [data_id], [data_content], [data_version]) VALUES (N'402880f05ab6d12b015ab72806c3001b', N'admin', CAST(0x070095102C838D3C0B AS DateTime2), NULL, NULL, N'jeecg_demo', N'8a8ab0b246dc81120146dc81860f016f', N'{"mobilePhone":"18611788888","officePhone":"66666666","email":"demo@jeecg.com","age":12,"salary":10.00,"birthday":"Feb 14, 2014 12:00:00 AM","sex":"1","depId":"402880e447e99cf10147e9a03b320003","userName":"小明","status":"","content":"","id":"8a8ab0b246dc81120146dc81860f016f"}', 2)
+INSERT [dbo].[sys_data_log] ([id], [create_by], [create_time], [update_by], [update_time], [data_table], [data_id], [data_content], [data_version]) VALUES (N'4028ef815318148a0153181567690001', N'admin', CAST(0x07807E192F9F123B0B AS DateTime2), NULL, NULL, N'jeecg_demo', N'4028ef815318148a0153181566270000', N'{"mobilePhone":"13423423423","officePhone":"1","email":"","age":1,"salary":1,"birthday":"Feb 25, 2016 12:00:00 AM","createDate":"Feb 25, 2016 6:59:24 PM","depId":"402880e447e9a9570147e9b6a3be0005","userName":"1","status":"0","id":"4028ef815318148a0153181566270000"}', 1)
+INSERT [dbo].[sys_data_log] ([id], [create_by], [create_time], [update_by], [update_time], [data_table], [data_id], [data_content], [data_version]) VALUES (N'4028ef815318148a01531815ec5c0003', N'admin', CAST(0x07807B5D439F123B0B AS DateTime2), NULL, NULL, N'jeecg_demo', N'4028ef815318148a0153181566270000', N'{"mobilePhone":"13426498659","officePhone":"1","email":"","age":1,"salary":1.00,"birthday":"Feb 25, 2016 12:00:00 AM","createDate":"Feb 25, 2016 6:59:24 AM","depId":"402880e447e9a9570147e9b6a3be0005","userName":"1","status":"0","id":"4028ef815318148a0153181566270000"}', 2)
+INSERT [dbo].[sys_data_log] ([id], [create_by], [create_time], [update_by], [update_time], [data_table], [data_id], [data_content], [data_version]) VALUES (N'4028ef8153c028db0153c0502e6b0003', N'admin', CAST(0x07805A442F5C333B0B AS DateTime2), NULL, NULL, N'jeecg_demo', N'4028ef8153c028db0153c0502d420002', N'{"mobilePhone":"18455477548","officePhone":"123","email":"","createDate":"Mar 29, 2016 10:59:53 AM","depId":"402880e447e99cf10147e9a03b320003","userName":"123","status":"0","id":"4028ef8153c028db0153c0502d420002"}', 1)
+INSERT [dbo].[sys_data_log] ([id], [create_by], [create_time], [update_by], [update_time], [data_table], [data_id], [data_content], [data_version]) VALUES (N'4028ef8153c028db0153c0509aa40006', N'admin', CAST(0x0780D0F43F5C333B0B AS DateTime2), NULL, NULL, N'jeecg_demo', N'4028ef8153c028db0153c0509a3e0005', N'{"mobilePhone":"13565486458","officePhone":"","email":"","createDate":"Mar 29, 2016 11:00:21 AM","depId":"402880e447e99cf10147e9a03b320003","userName":"22","status":"0","id":"4028ef8153c028db0153c0509a3e0005"}', 1)
+INSERT [dbo].[sys_data_log] ([id], [create_by], [create_time], [update_by], [update_time], [data_table], [data_id], [data_content], [data_version]) VALUES (N'4028ef8153c028db0153c051c4a70008', N'admin', CAST(0x07807E416D5C333B0B AS DateTime2), NULL, NULL, N'jeecg_demo', N'4028ef8153c028db0153c0509a3e0005', N'{"mobilePhone":"13565486458","officePhone":"","email":"","createDate":"Mar 29, 2016 11:00:21 AM","depId":"402880e447e99cf10147e9a03b320003","userName":"22","status":"0","id":"4028ef8153c028db0153c0509a3e0005"}', 2)
+INSERT [dbo].[sys_data_log] ([id], [create_by], [create_time], [update_by], [update_time], [data_table], [data_id], [data_content], [data_version]) VALUES (N'4028ef8153c028db0153c051d4b5000a', N'admin', CAST(0x0780D8A36F5C333B0B AS DateTime2), NULL, NULL, N'jeecg_demo', N'4028ef8153c028db0153c0502d420002', N'{"mobilePhone":"13565486458","officePhone":"123","email":"","createDate":"Mar 29, 2016 10:59:53 AM","depId":"402880e447e99cf10147e9a03b320003","userName":"123","status":"0","id":"4028ef8153c028db0153c0502d420002"}', 2)
+INSERT [dbo].[sys_data_log] ([id], [create_by], [create_time], [update_by], [update_time], [data_table], [data_id], [data_content], [data_version]) VALUES (N'4028ef8153c028db0153c07033d8000d', N'admin', CAST(0x0700565E1261333B0B AS DateTime2), NULL, NULL, N'jeecg_demo', N'4028ef8153c028db0153c0502d420002', N'{"mobilePhone":"13565486458","officePhone":"123","email":"","age":23,"createDate":"Mar 29, 2016 10:59:53 AM","depId":"402880e447e99cf10147e9a03b320003","userName":"123","status":"0","id":"4028ef8153c028db0153c0502d420002"}', 3)
+INSERT [dbo].[sys_data_log] ([id], [create_by], [create_time], [update_by], [update_time], [data_table], [data_id], [data_content], [data_version]) VALUES (N'4028ef8153c028db0153c070492e000f', N'admin', CAST(0x078046591561333B0B AS DateTime2), NULL, NULL, N'jeecg_demo', N'4028ef8153c028db0153c0509a3e0005', N'{"mobilePhone":"13565486458","officePhone":"","email":"","age":22,"createDate":"Mar 29, 2016 11:00:21 AM","depId":"402880e447e99cf10147e9a03b320003","userName":"22","status":"0","id":"4028ef8153c028db0153c0509a3e0005"}', 3)
+INSERT [dbo].[sys_data_log] ([id], [create_by], [create_time], [update_by], [update_time], [data_table], [data_id], [data_content], [data_version]) VALUES (N'4028ef81550c1a7901550c1cd7850002', N'admin', CAST(0x07000C4E7FB2733B0B AS DateTime2), NULL, NULL, N'jeecg_demo', N'4028ef81550c1a7901550c1cd6e70001', N'{"mobilePhone":"","officePhone":"","email":"","createDate":"Jun 1, 2016 9:17:44 PM","sex":"1","depId":"402880e447e99cf10147e9a03b320003","userName":"121221","status":"0","id":"4028ef81550c1a7901550c1cd6e70001"}', 1)
+INSERT [dbo].[sys_data_log] ([id], [create_by], [create_time], [update_by], [update_time], [data_table], [data_id], [data_content], [data_version]) VALUES (N'4028ef81568c31ec01568c3307080004', N'admin', CAST(0x07802202755EBE3B0B AS DateTime2), NULL, NULL, N'jeecg_demo', N'4028ef81550c1a7901550c1cd6e70001', N'{"mobilePhone":"","officePhone":"","email":"","createDate":"Jun 23, 2016 12:00:00 PM","sex":"1","depId":"402880e447e99cf10147e9a03b320003","userName":"9001","status":"1","content":"111","id":"4028ef81550c1a7901550c1cd6e70001"}', 2)
+INSERT [dbo].[sys_announcement_send] ([id], [annt_id], [user_id], [read_flag], [read_time], [create_by], [create_time], [update_by], [update_time]) VALUES (N'646c0c405ec643d4dc4160db2446f8ff', N'93a9060a1c20e4bf98b3f768a02c2ff9', N'e9ca23d68d884d4ebb19d07889727dae', N'0', NULL, N'admin', CAST(0x070010F55063AB3F0B AS DateTime2), NULL, NULL)
+INSERT [dbo].[sys_announcement] ([id], [titile], [msg_content], [start_time], [end_time], [sender], [priority], [msg_category], [msg_type], [send_status], [send_time], [cancel_time], [del_flag], [create_by], [create_time], [update_by], [update_time], [user_ids]) VALUES (N'1b714f8ebc3cc33f8b4f906103b6a18d', N'5467567', NULL, NULL, NULL, N'admin', NULL, N'2', NULL, N'1', CAST(0x0700275E426A7B3F0B AS DateTime2), NULL, N'0', N'admin', CAST(0x07007B15C4915B3F0B AS DateTime2), N'admin', CAST(0x07005BB367935B3F0B AS DateTime2), NULL)
+INSERT [dbo].[sys_announcement] ([id], [titile], [msg_content], [start_time], [end_time], [sender], [priority], [msg_category], [msg_type], [send_status], [send_time], [cancel_time], [del_flag], [create_by], [create_time], [update_by], [update_time], [user_ids]) VALUES (N'3d11237ccdf62450d20bb8abdb331178', N'111222', NULL, NULL, NULL, NULL, NULL, N'2', NULL, N'0', NULL, NULL, N'1', N'admin', CAST(0x0780BB8C41917A3F0B AS DateTime2), N'admin', CAST(0x07007F5643917A3F0B AS DateTime2), NULL)
+INSERT [dbo].[sys_announcement] ([id], [titile], [msg_content], [start_time], [end_time], [sender], [priority], [msg_category], [msg_type], [send_status], [send_time], [cancel_time], [del_flag], [create_by], [create_time], [update_by], [update_time], [user_ids]) VALUES (N'7ef04e95f8de030b1d5f7a9144090dc6', N'111', NULL, CAST(0x0700715C6D92473F0B AS DateTime2), CAST(0x078007F56D92653F0B AS DateTime2), NULL, NULL, N'2', NULL, N'0', NULL, NULL, N'1', N'admin', CAST(0x07808E8871925B3F0B AS DateTime2), N'admin', CAST(0x0780A8C99CA7773F0B AS DateTime2), NULL)
+INSERT [dbo].[sys_announcement] ([id], [titile], [msg_content], [start_time], [end_time], [sender], [priority], [msg_category], [msg_type], [send_status], [send_time], [cancel_time], [del_flag], [create_by], [create_time], [update_by], [update_time], [user_ids]) VALUES (N'93a9060a1c20e4bf98b3f768a02c2ff9', N'111', N'111', CAST(0x07805E6E5391473F0B AS DateTime2), CAST(0x070022385591563F0B AS DateTime2), N'admin', N'M', N'2', N'ALL', N'1', CAST(0x078084A2E9915B3F0B AS DateTime2), NULL, N'0', N'admin', CAST(0x070091BEC9905B3F0B AS DateTime2), N'admin', CAST(0x0780AD653A915B3F0B AS DateTime2), NULL)
+INSERT [dbo].[sys_announcement] ([id], [titile], [msg_content], [start_time], [end_time], [sender], [priority], [msg_category], [msg_type], [send_status], [send_time], [cancel_time], [del_flag], [create_by], [create_time], [update_by], [update_time], [user_ids]) VALUES (N'de1dc57f31037079e1e55c8347fe6ef7', N'222', N'2222', CAST(0x0700D9E57692473F0B AS DateTime2), CAST(0x070006177892583F0B AS DateTime2), N'admin', N'M', N'2', N'ALL', N'1', CAST(0x070006EA46917A3F0B AS DateTime2), NULL, N'1', N'admin', CAST(0x0700BADB7C925B3F0B AS DateTime2), N'admin', CAST(0x0700143E7F925B3F0B AS DateTime2), NULL)
+INSERT [dbo].[sys_announcement] ([id], [titile], [msg_content], [start_time], [end_time], [sender], [priority], [msg_category], [msg_type], [send_status], [send_time], [cancel_time], [del_flag], [create_by], [create_time], [update_by], [update_time], [user_ids]) VALUES (N'e52f3eb6215f139cb2224c52517af3bd', N'334', N'334', NULL, NULL, NULL, NULL, N'2', NULL, N'0', NULL, NULL, N'1', N'admin', CAST(0x070046683C6A7B3F0B AS DateTime2), N'admin', CAST(0x0700A0CA3E6A7B3F0B AS DateTime2), NULL)
diff --git a/jeecg-boot/docs/- 项目说明 b/jeecg-boot/docs/- 项目说明
deleted file mode 100644
index 5be93e8..0000000
--- a/jeecg-boot/docs/- 项目说明
+++ /dev/null
@@ -1,17 +0,0 @@
-
-一、技术文档
- http://jeecg-boot.mydoc.io
-
-
-二、 零基础学习看这个
- http://jeecg-boot.mydoc.io/?t=344845
-
-三、线上部署文档
- 1. 修改redis、
- 2. 数据库配置文件
- 3. 修改上传文件目录
- 4. 修改前端API的图片访问域名
- 详细看这个链接：http://jeecg-boot.mydoc.io/?t=344852
-
-四、默认账号密码（需手工初始化数据库脚步）
- 默认账号密码： admin/123456
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-base-common/pom.xml b/jeecg-boot/jeecg-boot-base-common/pom.xml
new file mode 100644
index 0000000..59c9845
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-base-common/pom.xml
@@ -0,0 +1,33 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jeecg-boot-base-common</artifactId>
+ <version>2.0.0</version>
+
+ <parent>
+ <groupId>org.jeecgframework.boot</groupId>
+ <artifactId>jeecg-boot-parent</artifactId>
+ <version>2.0.0</version>
+ </parent>
+
+ <repositories>
+ <repository>
+ <id>aliyun</id>
+ <name>aliyun Repository</name>
+ <url>http://maven.aliyun.com/nexus/content/groups/public</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>jeecg</id>
+ <name>jeecg Repository</name>
+ <url>http://maven.jeecg.org/nexus/content/repositories/jeecg</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+</project>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/api/vo/Result.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/api/vo/Result.java
index abe923d..d021c7f 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/api/vo/Result.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/api/vo/Result.java
@@ -2,6 +2,8 @@ package org.jeecg.common.api.vo;
import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import org.jeecg.common.constant.CommonConstant;
import lombok.Data;
@@ -13,6 +15,7 @@ import lombok.Data;
* @date 2019年1月19日
*/
@Data
+@ApiModel(value="接口返回对象", description="接口返回对象")
public class Result<T> implements Serializable {
private static final long serialVersionUID = 1L;
@@ -20,21 +23,25 @@ public class Result<T> implements Serializable {
/**
* 成功标志
*/
+ @ApiModelProperty(value = "成功标志")
private boolean success = true;
/**
* 返回处理消息
*/
+ @ApiModelProperty(value = "返回处理消息")
private String message = "操作成功！";
/**
* 返回代码
*/
+ @ApiModelProperty(value = "返回代码")
private Integer code = 0;
/**
* 返回数据对象 data
*/
+ @ApiModelProperty(value = "返回数据对象")
private T result;
public Result() {
@@ -44,6 +51,7 @@ public class Result<T> implements Serializable {
/**
* 时间戳
*/
+ @ApiModelProperty(value = "时间戳")
private long timestamp = System.currentTimeMillis();
public void error500(String message) {
@@ -70,6 +78,14 @@ public class Result<T> implements Serializable {
return r;
}
+ public static Result<Object> ok() {
+ Result<Object> r = new Result<Object>();
+ r.setSuccess(true);
+ r.setCode(CommonConstant.SC_OK_200);
+ r.setMessage("成功");
+ return r;
+ }
+
public static Result<Object> ok(String msg) {
Result<Object> r = new Result<Object>();
r.setSuccess(true);
@@ -85,4 +101,4 @@ public class Result<T> implements Serializable {
r.setResult(data);
return r;
}
-}
+}
\ No newline at end of file
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java
index 50aa2c9..4cf7797 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java
@@ -11,9 +11,9 @@ import org.jeecg.common.constant.CommonConstant;
/**
* 系统日志注解
*
- * @author scott
+ * @Author scott
* @email jeecgos@163.com
- * @date 2019年1月14日
+ * @Date 2019年1月14日
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/aspect/annotation/Dict.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/aspect/annotation/Dict.java
index 5accee8..5accee8 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/aspect/annotation/Dict.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/aspect/annotation/Dict.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java
index 79de944..1d8f399 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java
@@ -8,13 +8,17 @@ import java.lang.annotation.Target;
/**
* 数据权限注解
- * @author taoyan
- * @date 2019年4月11日
+ * @Author taoyan
+ * @Date 2019年4月11日
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE,ElementType.METHOD})
@Documented
public @interface PermissionData {
+ /**
+ * 暂时没用
+ * @return
+ */
String value() default "";
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/constant/CommonConstant.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/constant/CommonConstant.java
index 0ed185a..3859980 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/constant/CommonConstant.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/constant/CommonConstant.java
@@ -38,12 +38,14 @@ public interface CommonConstant {
/** {@code 200 OK} (HTTP/1.0 - RFC 1945) */
public static final Integer SC_OK_200 = 200;
-
- public static String PREFIX_USER_ROLE = "PREFIX_USER_ROLE";
- public static String PREFIX_USER_PERMISSION = "PREFIX_USER_PERMISSION ";
+ /** 登录用户拥有角色缓存KEY前缀 */
+ public static String LOGIN_USER_CACHERULES_ROLE = "loginUser_cacheRules::Roles_";
+ /** 登录用户拥有权限缓存KEY前缀 */
+ public static String LOGIN_USER_CACHERULES_PERMISSION = "loginUser_cacheRules::Permissions_";
+ /** 登录用户令牌缓存KEY前缀 */
public static int TOKEN_EXPIRE_TIME = 3600; //3600秒即是一小时
- public static String PREFIX_USER_TOKEN = "PREFIX_USER_TOKEN ";
+ public static String PREFIX_USER_TOKEN = "PREFIX_USER_TOKEN_";
/**
* 0：一级菜单
@@ -57,4 +59,22 @@ public interface CommonConstant {
* 2：按钮权限
*/
public static Integer MENU_TYPE_2 = 2;
+
+ /**通告对象类型（USER:指定用户，ALL:全体用户）*/
+ public static String MSG_TYPE_UESR = "USER";
+ public static String MSG_TYPE_ALL = "ALL";
+
+ /**发布状态（0未发布，1已发布，2已撤销）*/
+ public static String NO_SEND = "0";
+ public static String HAS_SEND = "1";
+ public static String HAS_CANCLE = "2";
+
+ /**阅读状态（0未读，1已读）*/
+ public static String HAS_READ_FLAG = "1";
+ public static String NO_READ_FLAG = "0";
+
+ /**优先级（L低，M中，H高）*/
+ public static String PRIORITY_L = "L";
+ public static String PRIORITY_M = "M ";
+ public static String PRIORITY_H = "H";
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/constant/CommonSendStatus.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/constant/CommonSendStatus.java
index 88e43db..82c53b1 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/constant/CommonSendStatus.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/constant/CommonSendStatus.java
@@ -2,7 +2,7 @@ package org.jeecg.common.constant;
/**
* 系统通告 - 发布状态
- * @author LeeShaoQing
+ * @Author LeeShaoQing
*
*/
public interface CommonSendStatus {
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/constant/DataBaseConstant.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/constant/DataBaseConstant.java
index 5c35bbc..3778205 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/constant/DataBaseConstant.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/constant/DataBaseConstant.java
@@ -6,17 +6,14 @@ public interface DataBaseConstant {
//*********系统上下文变量****************************************
/**
- * 数据-所属公司编码
- */
- public static final String SYS_COMPANY_CODE = "sysCompanyCode";
- /**
- * 数据-所属公司编码
+ * 数据-所属机构编码
*/
- public static final String SYS_COMPANY_CODE_TABLE = "sys_company_code";
+ public static final String SYS_ORG_CODE = "sysOrgCode";
/**
* 数据-所属机构编码
*/
- public static final String SYS_ORG_CODE = "sysOrgCode";
+ public static final String SYS_MULTI_ORG_CODE = "sysMultiOrgCode";
+
/**
* 数据-所属机构编码
*/
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/exception/JeecgBootException.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/exception/JeecgBootException.java
index 703b7e7..703b7e7 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/exception/JeecgBootException.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/exception/JeecgBootException.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java
index 8c00e5f..accb0d9 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java
@@ -1,8 +1,10 @@
package org.jeecg.common.exception;
import org.apache.shiro.authz.AuthorizationException;
+import org.apache.shiro.authz.UnauthorizedException;
import org.jeecg.common.api.vo.Result;
import org.springframework.dao.DuplicateKeyException;
+import org.springframework.web.HttpRequestMethodNotSupportedException;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.servlet.NoHandlerFoundException;
@@ -12,8 +14,8 @@ import lombok.extern.slf4j.Slf4j;
/**
* 异常处理器
*
- * @author scott
- * @date 2019
+ * @Author scott
+ * @Date 2019
*/
@RestControllerAdvice
@Slf4j
@@ -40,7 +42,7 @@ public class JeecgBootExceptionHandler {
return Result.error("数据库中已存在该记录");
}
- @ExceptionHandler(AuthorizationException.class)
+ @ExceptionHandler({UnauthorizedException.class, AuthorizationException.class})
public Result<?> handleAuthorizationException(AuthorizationException e){
log.error(e.getMessage(), e);
return Result.error("没有权限，请联系管理员授权");
@@ -51,4 +53,16 @@ public class JeecgBootExceptionHandler {
log.error(e.getMessage(), e);
return Result.error(e.getMessage());
}
+
+ /**
+ * @Author 政辉
+ * @param e
+ * @return
+ */
+ @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
+ public Result<?> HttpRequestMethodNotSupportedException(Exception e){
+ log.error(e.getMessage(), e);
+ return Result.error("没有权限，请联系管理员授权");
+ }
+
}
diff --git a/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
new file mode 100644
index 0000000..f43cde8
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
@@ -0,0 +1,75 @@
+package org.jeecg.common.system.api;
+
+import java.sql.SQLException;
+import java.util.List;
+import org.jeecg.common.system.vo.DictModel;
+import org.jeecg.common.system.vo.LoginUser;
+
+/**
+ * @Description: 底层共通业务API，提供其他独立模块调用
+ * @Author: scott
+ * @Date:2019-4-20
+ * @Version:V1.0
+ */
+public interface ISysBaseAPI {
+
+ /**
+ * 日志添加
+ * @param LogContent 内容
+ * @param logType 日志类型(0:操作日志;1:登录日志;2:定时任务)
+ * @param operatetype 操作类型(1:添加;2:修改;3:删除;)
+ */
+ void addLog(String LogContent, Integer logType, Integer operatetype);
+
+ /**
+ * 根据用户账号查询登录用户信息
+ * @param username
+ * @return
+ */
+ public LoginUser getUserByName(String username);
+
+ /**
+ * 通过用户账号查询角色集合
+ * @param username
+ * @return
+ */
+ public List<String> getRolesByUsername(String username);
+
+ /**
+ * 获取当前数据库类型
+ * @return
+ * @throws Exception
+ */
+ public String getDatabaseType() throws SQLException;
+
+ /**
+ * 获取数据字典
+ * @param code
+ * @return
+ */
+ public List<DictModel> queryDictItemsByCode(String code);
+
+ /**
+ * 获取表数据字典
+ * @param table
+ * @param text
+ * @param code
+ * @return
+ */
+ List<DictModel> queryTableDictItemsByCode(String table, String text, String code);
+
+ /**
+ * 查询所有部门 作为字典信息 id -->value,departName -->text
+ * @return
+ */
+ public List<DictModel> queryAllDepartBackDictModel();
+
+ /**
+ * 发送系统消息
+ * @param fromUser 发送人(用户登录账户)
+ * @param toUser 发送给(用户登录账户)
+ * @param title 消息主题
+ * @param msgContent 消息内容
+ */
+ public void sendSysAnnouncement(String fromUser,String toUser,String title, String msgContent);
+}
diff --git a/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java
new file mode 100644
index 0000000..6aa1f73
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java
@@ -0,0 +1,101 @@
+package org.jeecg.common.system.base.controller;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecg.common.system.base.service.JeecgService;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @Description: Controller基类
+ * @Author: dangzhenghui@163.com
+ * @Date: 2019-4-21 8:13
+ * @Version: 1.0
+ */
+@Slf4j
+public class JeecgController<T extends JeecgEntity, S extends JeecgService<T>> {
+ @Autowired
+ S service;
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param response
+ */
+ protected ModelAndView exportXls(HttpServletRequest request,T object,Class<T> clazz,String title) {
+ //--------------------------------------------------------------------------------
+ //获取当前用户
+ LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+ //--------------------------------------------------------------------------------
+ // Step.1 组装查询条件
+ QueryWrapper<T> queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap());
+
+ // Step.2 AutoPoi 导出Excel
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ List<T> pageList = service.list(queryWrapper);
+ // 导出文件名称
+ mv.addObject(NormalExcelConstants.FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下
+ mv.addObject(NormalExcelConstants.CLASS, clazz);
+ mv.addObject(NormalExcelConstants.PARAMS, new ExportParams(title + "报表", "导出人:"+sysUser.getRealname(), title + "表"));
+ mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+ return mv;
+ }
+
+ /**
+ * 通过excel导入数据
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ protected Result<?> importExcel(HttpServletRequest request, HttpServletResponse response, Class<T> clazz) {
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+ for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+ MultipartFile file = entity.getValue();// 获取上传文件对象
+ ImportParams params = new ImportParams();
+ params.setTitleRows(2);
+ params.setHeadRows(1);
+ params.setNeedSave(true);
+ try {
+ List<T> list = ExcelImportUtil.importExcel(file.getInputStream(), clazz, params);
+ for (T t : list) {
+ service.save(t);
+ }
+ return Result.ok("文件导入成功！数据行数：" + list.size());
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ return Result.error("文件导入失败:" + e.getMessage());
+ } finally {
+ try {
+ file.getInputStream().close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ return Result.error("文件导入失败！");
+ }
+}
diff --git a/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java
new file mode 100644
index 0000000..4d9234a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java
@@ -0,0 +1,50 @@
+package org.jeecg.common.system.base.entity;
+
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: Entity基类
+ * @Author: dangzhenghui@163.com
+ * @Date: 2019-4-28
+ * @Version: 1.1
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class JeecgEntity {
+
+ /** ID */
+ @TableId(type = IdType.UUID)
+ @ApiModelProperty(value = "ID")
+ private java.lang.String id;
+ /** 创建人 */
+ @ApiModelProperty(value = "创建人")
+ @Excel(name = "创建人", width = 15)
+ private java.lang.String createBy;
+ /** 创建时间 */
+ @ApiModelProperty(value = "创建时间")
+ @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private java.util.Date createTime;
+ /** 更新人 */
+ @ApiModelProperty(value = "更新人")
+ @Excel(name = "更新人", width = 15)
+ private java.lang.String updateBy;
+ /** 更新时间 */
+ @ApiModelProperty(value = "更新时间")
+ @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private java.util.Date updateTime;
+}
diff --git a/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/base/service/JeecgService.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/base/service/JeecgService.java
new file mode 100644
index 0000000..919f3ff
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/base/service/JeecgService.java
@@ -0,0 +1,12 @@
+package org.jeecg.common.system.base.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: Service基类
+ * @Author: dangzhenghui@163.com
+ * @Date: 2019-4-21 8:13
+ * @Version: 1.0
+ */
+public interface JeecgService<T> extends IService<T> {
+}
diff --git a/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/base/service/impl/JeecgServiceImpl.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/base/service/impl/JeecgServiceImpl.java
new file mode 100644
index 0000000..f19ba84
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/base/service/impl/JeecgServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.common.system.base.service.impl;
+
+import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecg.common.system.base.service.JeecgService;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @Description: ServiceImpl基类
+ * @Author: dangzhenghui@163.com
+ * @Date: 2019-4-21 8:13
+ * @Version: 1.0
+ */
+@Slf4j
+public class JeecgServiceImpl<M extends BaseMapper<T>, T extends JeecgEntity> extends ServiceImpl<M, T> implements JeecgService<T> {
+
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/system/controller/CommonController.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/controller/CommonController.java
index 7e1b663..6cb460a 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/system/controller/CommonController.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/controller/CommonController.java
@@ -13,7 +13,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.system.entity.SysUser;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.AntPathMatcher;
import org.springframework.util.FileCopyUtils;
@@ -24,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.HandlerMapping;
+import org.springframework.web.servlet.ModelAndView;
import lombok.extern.slf4j.Slf4j;
@@ -32,7 +32,7 @@ import lombok.extern.slf4j.Slf4j;
* 用户表 前端控制器
* </p>
*
- * @author scott
+ * @Author scott
* @since 2018-12-20
*/
@Slf4j
@@ -43,13 +43,22 @@ public class CommonController {
@Value(value = "${jeecg.path.upload}")
private String uploadpath;
+ /**
+ * @Author 政辉
+ * @return
+ */
+ @GetMapping("/403")
+ public Result<?> noauth() {
+ return Result.error("没有权限，请联系管理员授权");
+ }
+
@PostMapping(value = "/upload")
- public Result<SysUser> upload(HttpServletRequest request, HttpServletResponse response) {
- Result<SysUser> result = new Result<>();
+ public Result<?> upload(HttpServletRequest request, HttpServletResponse response) {
+ Result<?> result = new Result<>();
try {
String ctxPath = uploadpath;
String fileName = null;
- String bizPath = "user";
+ String bizPath = "files";
String nowday = new SimpleDateFormat("yyyyMMdd").format(new Date());
File file = new File(ctxPath + File.separator + bizPath + File.separator + nowday);
if (!file.exists()) {
@@ -71,7 +80,7 @@ public class CommonController {
} catch (IOException e) {
result.setSuccess(false);
result.setMessage(e.getMessage());
- e.printStackTrace();
+ log.error(e.getMessage(), e);
}
return result;
}
@@ -107,7 +116,65 @@ public class CommonController {
}
response.flushBuffer();
} catch (IOException e) {
- log.info("预览图片失败" + e.getMessage());
+ log.error("预览图片失败" + e.getMessage());
+ // e.printStackTrace();
+ } finally {
+ if (inputStream != null) {
+ try {
+ inputStream.close();
+ } catch (IOException e) {
+ log.error(e.getMessage(), e);
+ }
+ }
+ if (outputStream != null) {
+ try {
+ outputStream.close();
+ } catch (IOException e) {
+ log.error(e.getMessage(), e);
+ }
+ }
+ }
+
+ }
+
+ /**
+ * 下载文件
+ * 请求地址：http://localhost:8080/common/download/{user/20190119/e1fe9925bc315c60addea1b98eb1cb1349547719_1547866868179.jpg}
+ *
+ * @param request
+ * @param response
+ * @throws Exception
+ */
+ @GetMapping(value = "/download/**")
+ public void download(HttpServletRequest request, HttpServletResponse response) throws Exception {
+ // ISO-8859-1 ==> UTF-8 进行编码转换
+ String filePath = extractPathFromPattern(request);
+ // 其余处理略
+ InputStream inputStream = null;
+ OutputStream outputStream = null;
+ try {
+ filePath = filePath.replace("..", "");
+ if (filePath.endsWith(",")) {
+ filePath = filePath.substring(0, filePath.length() - 1);
+ }
+ String localPath = uploadpath;
+ String downloadFilePath = localPath + File.separator + filePath;
+ File file = new File(downloadFilePath);
+ if (file.exists()) {
+ response.setContentType("application/force-download");// 设置强制下载不打开
+ response.addHeader("Content-Disposition", "attachment;fileName=" + new String(file.getName().getBytes("UTF-8"),"iso-8859-1"));
+ inputStream = new BufferedInputStream(new FileInputStream(file));
+ outputStream = response.getOutputStream();
+ byte[] buf = new byte[1024];
+ int len;
+ while ((len = inputStream.read(buf)) > 0) {
+ outputStream.write(buf, 0, len);
+ }
+ response.flushBuffer();
+ }
+
+ } catch (Exception e) {
+ log.info("文件下载失败" + e.getMessage());
// e.printStackTrace();
} finally {
if (inputStream != null) {
@@ -127,6 +194,16 @@ public class CommonController {
}
}
+ /**
+ * @功能：pdf预览Iframe
+ * @param modelAndView
+ * @return
+ */
+ @RequestMapping("/pdf/pdfPreviewIframe")
+ public ModelAndView pdfPreviewIframe(ModelAndView modelAndView) {
+ modelAndView.setViewName("pdfPreviewIframe");
+ return modelAndView;
+ }
/**
* 把指定URL后的字符串全部截断当成参数
@@ -139,5 +216,5 @@ public class CommonController {
String bestMatchPattern = (String) request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE);
return new AntPathMatcher().extractPathWithinPattern(bestMatchPattern, path);
}
-
+
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/system/query/QueryCondition.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/query/QueryCondition.java
index a9bad2a..a9bad2a 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/system/query/QueryCondition.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/query/QueryCondition.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/system/query/QueryGenerator.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/query/QueryGenerator.java
index 9c921f7..6be287c 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/system/query/QueryGenerator.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/query/QueryGenerator.java
@@ -16,10 +16,10 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.beanutils.PropertyUtils;
+import org.jeecg.common.system.util.JeecgDataAutorUtils;
+import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.shiro.authc.util.JwtUtil;
import org.jeecg.modules.system.entity.SysPermissionDataRule;
-import org.jeecg.modules.system.util.JeecgDataAutorUtils;
import org.springframework.util.NumberUtils;
import com.alibaba.fastjson.JSON;
@@ -67,7 +67,7 @@ public class QueryGenerator {
long start = System.currentTimeMillis();
QueryWrapper<T> queryWrapper = new QueryWrapper<T>();
installMplus(queryWrapper, searchObj, parameterMap);
- log.info("---查询条件构造器初始化完成,耗时:"+(System.currentTimeMillis()-start)+"毫秒----");
+ log.debug("---查询条件构造器初始化完成,耗时:"+(System.currentTimeMillis()-start)+"毫秒----");
return queryWrapper;
}
@@ -109,7 +109,7 @@ public class QueryGenerator {
continue;
}
- //权限查询
+ //数据权限查询
if(ruleMap.containsKey(name)) {
addRuleToQueryWrapper(ruleMap.get(name), name, origDescriptors[i].getPropertyType(), queryWrapper);
}
@@ -152,7 +152,7 @@ public class QueryGenerator {
}
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e.getMessage(), e);
}
}
// 排序逻辑 处理
@@ -172,7 +172,7 @@ public class QueryGenerator {
if(parameterMap!=null&& parameterMap.containsKey(ORDER_TYPE)) {
order = parameterMap.get(ORDER_TYPE)[0];
}
- log.info("排序规则>>列:"+column+",排序方式:"+order);
+ log.debug("排序规则>>列:"+column+",排序方式:"+order);
if (oConvertUtils.isNotEmpty(column) && oConvertUtils.isNotEmpty(order)) {
if (order.toUpperCase().indexOf(ORDER_TYPE_ASC)>=0) {
queryWrapper.orderByAsc(oConvertUtils.camelToUnderline(column));
@@ -194,8 +194,7 @@ public class QueryGenerator {
try {
superQueryParams = URLDecoder.decode(superQueryParams, "UTF-8");
} catch (UnsupportedEncodingException e) {
- log.error("--高级查询参数转码失败!");
- e.printStackTrace();
+ log.error("--高级查询参数转码失败!", e);
}
List<QueryCondition> conditions = JSON.parseArray(superQueryParams, QueryCondition.class);
log.info("---高级查询参数-->"+conditions.toString());
@@ -213,7 +212,7 @@ public class QueryGenerator {
* @param value
* @return
*/
- private static QueryRuleEnum convert2Rule(Object value) {
+ public static QueryRuleEnum convert2Rule(Object value) {
// 避免空数据
if (value == null) {
return null;
@@ -222,12 +221,16 @@ public class QueryGenerator {
if (val.length() == 0) {
return null;
}
- // step 1 .> <
- QueryRuleEnum rule = QueryRuleEnum.getByValue(val.substring(0, 1));
+ QueryRuleEnum rule =null;
// step 2 .>= =<
if (rule == null && val.length() >= 2) {
rule = QueryRuleEnum.getByValue(val.substring(0, 2));
}
+ // step 1 .> <
+ if (rule == null && val.length() >= 1) {
+ rule = QueryRuleEnum.getByValue(val.substring(0, 1));
+ }
+
// step 3 like
if (rule == null && val.contains(STAR)) {
if (val.startsWith(STAR) && val.endsWith(STAR)) {
@@ -257,7 +260,7 @@ public class QueryGenerator {
* @param value
* @return
*/
- private static Object replaceValue(QueryRuleEnum rule, Object value) {
+ public static Object replaceValue(QueryRuleEnum rule, Object value) {
if (rule == null) {
return null;
}
@@ -461,12 +464,15 @@ public class QueryGenerator {
sqlRule = sqlRule.replace("#{"+var+"}",tempValue);
}
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e.getMessage(), e);
}
return sqlRule;
}
- private static Set<String> getSqlRuleParams(String sql) {
+ /**
+ * 获取sql中的#{key} 这个key组成的set
+ */
+ public static Set<String> getSqlRuleParams(String sql) {
if(oConvertUtils.isEmpty(sql)){
return null;
}
@@ -481,4 +487,104 @@ public class QueryGenerator {
}
return varParams;
}
+
+ /**
+ * 获取查询条件
+ * @param field
+ * @param alias
+ * @param value
+ * @param isString
+ * @return
+ */
+ public static String getSingleQueryConditionSql(String field,String alias,Object value,boolean isString) {
+ if (value == null) {
+ return "";
+ }
+ field = alias+oConvertUtils.camelToUnderline(field);
+ QueryRuleEnum rule = QueryGenerator.convert2Rule(value);
+ String res = "";
+ switch (rule) {
+ case GT:
+ res =field+rule.getValue()+getFieldConditionValue(value, isString);
+ break;
+ case GE:
+ res = field+rule.getValue()+getFieldConditionValue(value, isString);
+ break;
+ case LT:
+ res = field+rule.getValue()+getFieldConditionValue(value, isString);
+ break;
+ case LE:
+ res = field+rule.getValue()+getFieldConditionValue(value, isString);
+ break;
+ case EQ:
+ res = field+rule.getValue()+getFieldConditionValue(value, isString);
+ break;
+ case NE:
+ res = field+" <> "+getFieldConditionValue(value, isString);
+ break;
+ case IN:
+ res = field + " in "+getInConditionValue(value, isString);
+ break;
+ case LIKE:
+ res = field + " like "+getLikeConditionValue(value);
+ break;
+ case LEFT_LIKE:
+ res = field + " like "+getLikeConditionValue(value);
+ break;
+ case RIGHT_LIKE:
+ res = field + " like "+getLikeConditionValue(value);
+ break;
+ default:
+ res = field+" = "+getFieldConditionValue(value, isString);
+ break;
+ }
+ return res;
+ }
+ private static String getFieldConditionValue(Object value,boolean isString) {
+ String str = value.toString().trim();
+ if(str.startsWith("!")) {
+ str = str.substring(1);
+ }else if(str.startsWith(">=")) {
+ str = str.substring(2);
+ }else if(str.startsWith("<=")) {
+ str = str.substring(2);
+ }else if(str.startsWith(">")) {
+ str = str.substring(1);
+ }else if(str.startsWith("<")) {
+ str = str.substring(1);
+ }
+ if(isString) {
+ return " '"+str+"' ";
+ }else {
+ return value.toString();
+ }
+ }
+
+ private static String getInConditionValue(Object value,boolean isString) {
+ if(isString) {
+ String temp[] = value.toString().split(",");
+ String res="";
+ for (String string : temp) {
+ res+=",'"+string+"'";
+ }
+ return "("+res.substring(1)+")";
+ }else {
+ return "("+value.toString()+")";
+ }
+ }
+
+ private static String getLikeConditionValue(Object value) {
+ String str = value.toString().trim();
+ if(str.startsWith("*") && str.endsWith("*")) {
+ return "'%"+str.substring(1,str.length()-1)+"%'";
+ }else if(str.startsWith("*")) {
+ return "'%"+str.substring(1)+"'";
+ }else if(str.endsWith("*")) {
+ return "'"+str.substring(0,str.length()-1)+"%'";
+ }else {
+ return str;
+ }
+ }
+
+
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java
index b7c86fe..0edbac2 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java
@@ -4,8 +4,8 @@ import org.jeecg.common.util.oConvertUtils;
/**
* Query 规则 常量
- * @author Scott
- * @date 2019年02月14日
+ * @Author Scott
+ * @Date 2019年02月14日
*/
public enum QueryRuleEnum {
diff --git a/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java
new file mode 100644
index 0000000..2ba7981
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java
@@ -0,0 +1,90 @@
+package org.jeecg.common.system.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.jeecg.common.system.vo.SysUserCacheInfo;
+import org.jeecg.common.util.SpringContextUtils;
+import org.jeecg.modules.system.entity.SysPermissionDataRule;
+import org.springframework.util.StringUtils;
+
+/**
+ * @ClassName: JeecgDataAutorUtils
+ * @Description: 数据权限查询规则容器工具类
+ * @Author: 张代浩
+ * @Date: 2012-12-15 下午11:27:39
+ *
+ */
+public class JeecgDataAutorUtils {
+
+ public static final String MENU_DATA_AUTHOR_RULES = "MENU_DATA_AUTHOR_RULES";
+
+ public static final String MENU_DATA_AUTHOR_RULE_SQL = "MENU_DATA_AUTHOR_RULE_SQL";
+
+ public static final String SYS_USER_INFO = "SYS_USER_INFO";
+
+ /**
+ * 往链接请求里面，传入数据查询条件
+ *
+ * @param request
+ * @param MENU_DATA_AUTHOR_RULES
+ */
+ public static synchronized void installDataSearchConditon(HttpServletRequest request, List<SysPermissionDataRule> dataRules) {
+ @SuppressWarnings("unchecked")
+ List<SysPermissionDataRule> list = (List<SysPermissionDataRule>)loadDataSearchConditon();// 1.先从request获取MENU_DATA_AUTHOR_RULES，如果存则获取到LIST
+ if (list==null) {
+ // 2.如果不存在，则new一个list
+ list = new ArrayList<SysPermissionDataRule>();
+ }
+ for (SysPermissionDataRule tsDataRule : dataRules) {
+ list.add(tsDataRule);
+ }
+ request.setAttribute(MENU_DATA_AUTHOR_RULES, list); // 3.往list里面增量存指
+ }
+
+ /**
+ * 获取请求对应的数据权限规则
+ *
+ * @param request
+ * @return
+ */
+ @SuppressWarnings("unchecked")
+ public static synchronized List<SysPermissionDataRule> loadDataSearchConditon() {
+ return (List<SysPermissionDataRule>) SpringContextUtils.getHttpServletRequest().getAttribute(MENU_DATA_AUTHOR_RULES);
+
+ }
+
+ /**
+ * 获取请求对应的数据权限SQL
+ *
+ * @param request
+ * @return
+ */
+ public static synchronized String loadDataSearchConditonSQLString() {
+ return (String) SpringContextUtils.getHttpServletRequest().getAttribute(MENU_DATA_AUTHOR_RULE_SQL);
+ }
+
+ /**
+ * 往链接请求里面，传入数据查询条件
+ *
+ * @param request
+ * @param MENU_DATA_AUTHOR_RULE_SQL
+ */
+ public static synchronized void installDataSearchConditon(HttpServletRequest request, String sql) {
+ String ruleSql = (String)loadDataSearchConditonSQLString();
+ if (!StringUtils.hasText(ruleSql)) {
+ request.setAttribute(MENU_DATA_AUTHOR_RULE_SQL,sql);
+ }
+ }
+
+ public static synchronized void installUserInfo(HttpServletRequest request, SysUserCacheInfo userinfo) {
+ request.setAttribute(SYS_USER_INFO, userinfo);
+ }
+
+ public static synchronized SysUserCacheInfo loadUserInfo() {
+ return (SysUserCacheInfo) SpringContextUtils.getHttpServletRequest().getAttribute(SYS_USER_INFO);
+
+ }
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/shiro/authc/util/JwtUtil.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/util/JwtUtil.java
index 98641b0..a9da048 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/shiro/authc/util/JwtUtil.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/util/JwtUtil.java
@@ -1,4 +1,4 @@
-package org.jeecg.modules.shiro.authc.util;
+package org.jeecg.common.system.util;
import com.auth0.jwt.JWT;
import com.auth0.jwt.JWTVerifier;
@@ -13,15 +13,14 @@ import javax.servlet.http.HttpSession;
import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.vo.SysUserCacheInfo;
import org.jeecg.common.util.SpringContextUtils;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.model.SysUserCacheInfo;
-import org.jeecg.modules.system.util.JeecgDataAutorUtils;
/**
- * @author Scott
- * @create 2018-07-12 14:23
- * @desc JWT工具类
+ * @Author Scott
+ * @Date 2018-07-12 14:23
+ * @Desc JWT工具类
**/
public class JwtUtil {
@@ -149,16 +148,16 @@ public class JwtUtil {
returnValue = user.getSysUserName();
}
- //替换为系统登录用户的公司编码
- if (key.equals(DataBaseConstant.SYS_COMPANY_CODE)|| key.equals(DataBaseConstant.SYS_COMPANY_CODE_TABLE)) {
- returnValue = user.getCompanyCode();
- }
//替换为系统用户登录所使用的机构编码
if (key.equals(DataBaseConstant.SYS_ORG_CODE)|| key.equals(DataBaseConstant.SYS_ORG_CODE_TABLE)) {
+ returnValue = user.getSysOrgCode();
+ }
+ //替换为系统用户所拥有的所有机构编码
+ if (key.equals(DataBaseConstant.SYS_MULTI_ORG_CODE)|| key.equals(DataBaseConstant.SYS_MULTI_ORG_CODE)) {
if(user.isOneDepart()) {
- returnValue = user.getSysOrgCode().get(0);
+ returnValue = user.getSysMultiOrgCode().get(0);
}else {
- returnValue = Joiner.on(",").join(user.getSysOrgCode());
+ returnValue = Joiner.on(",").join(user.getSysMultiOrgCode());
}
}
//替换为当前系统时间(年月日)
diff --git a/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/vo/DictModel.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/vo/DictModel.java
new file mode 100644
index 0000000..3564f9b
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/vo/DictModel.java
@@ -0,0 +1,31 @@
+package org.jeecg.common.system.vo;
+
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DictModel implements Serializable{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 字典value
+ */
+ private String value;
+ /**
+ * 字典文本
+ */
+ private String text;
+
+ /**
+ * 特殊用途： JgEditableTable
+ * @return
+ */
+ public String getTitle() {
+ return this.text;
+ }
+}
diff --git a/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/vo/LoginUser.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/vo/LoginUser.java
new file mode 100644
index 0000000..c2b5440
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/vo/LoginUser.java
@@ -0,0 +1,83 @@
+package org.jeecg.common.system.vo;
+
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 在线用户信息
+ * </p>
+ *
+ * @Author scott
+ * @since 2018-12-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class LoginUser {
+
+ /**
+ * 登录人id
+ */
+ private String id;
+
+ /**
+ * 登录人账号
+ */
+ private String username;
+
+ /**
+ * 登录人名字
+ */
+ private String realname;
+
+ /**
+ * 当前登录部门code
+ */
+ private String orgCode;
+ /**
+ * 头像
+ */
+ private String avatar;
+
+ /**
+ * 生日
+ */
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date birthday;
+
+ /**
+ * 性别（1：男 2：女）
+ */
+ private Integer sex;
+
+ /**
+ * 电子邮件
+ */
+ private String email;
+
+ /**
+ * 电话
+ */
+ private String phone;
+
+ /**
+ * 状态(1：正常 2：冻结 ）
+ */
+ private Integer status;
+
+ private String delFlag;
+ /**
+ * 同步工作流引擎1同步0不同步
+ */
+ private String activitiSync;
+
+}
diff --git a/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.java
new file mode 100644
index 0000000..edbda8d
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.java
@@ -0,0 +1,67 @@
+package org.jeecg.common.system.vo;
+
+import java.util.List;
+
+import org.jeecg.common.util.DateUtils;
+
+public class SysUserCacheInfo {
+
+ private String sysUserCode;
+
+ private String sysUserName;
+
+ private String sysOrgCode;
+
+ private List<String> sysMultiOrgCode;
+
+ private boolean oneDepart;
+
+ public boolean isOneDepart() {
+ return oneDepart;
+ }
+
+ public void setOneDepart(boolean oneDepart) {
+ this.oneDepart = oneDepart;
+ }
+
+ public String getSysDate() {
+ return DateUtils.formatDate();
+ }
+
+ public String getSysTime() {
+ return DateUtils.now();
+ }
+
+ public String getSysUserCode() {
+ return sysUserCode;
+ }
+
+ public void setSysUserCode(String sysUserCode) {
+ this.sysUserCode = sysUserCode;
+ }
+
+ public String getSysUserName() {
+ return sysUserName;
+ }
+
+ public void setSysUserName(String sysUserName) {
+ this.sysUserName = sysUserName;
+ }
+
+ public String getSysOrgCode() {
+ return sysOrgCode;
+ }
+
+ public void setSysOrgCode(String sysOrgCode) {
+ this.sysOrgCode = sysOrgCode;
+ }
+
+ public List<String> getSysMultiOrgCode() {
+ return sysMultiOrgCode;
+ }
+
+ public void setSysMultiOrgCode(List<String> sysMultiOrgCode) {
+ this.sysMultiOrgCode = sysMultiOrgCode;
+ }
+
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/util/BrowserType.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/BrowserType.java
index fb17062..9363b08 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/util/BrowserType.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/BrowserType.java
@@ -1,8 +1,8 @@
-package org.jeecg.modules.online.cgreport.util;
+package org.jeecg.common.util;
/**
*
- * @author 张代浩
+ * @Author 张代浩
*
*/
public enum BrowserType {
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/util/BrowserUtils.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/BrowserUtils.java
index ab8d640..29e6fb8 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/util/BrowserUtils.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/BrowserUtils.java
@@ -1,4 +1,4 @@
-package org.jeecg.modules.online.cgreport.util;
+package org.jeecg.common.util;
import java.util.HashMap;
import java.util.Map;
@@ -9,7 +9,7 @@ import javax.servlet.http.HttpServletRequest;
/**
*
- * @author 张代浩
+ * @Author 张代浩
*
*/
public class BrowserUtils {
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/util/DateUtils.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DateUtils.java
index ec21068..36a9ab4 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/util/DateUtils.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DateUtils.java
@@ -15,8 +15,9 @@ import org.springframework.util.StringUtils;
*
* 类描述：时间操作定义类
*
- * @author: 张代浩 @date： 日期：2012-12-8 时间：下午12:15:03
- * @version 1.0
+ * @Author: 张代浩
+ * @Date:2012-12-8 12:15:03
+ * @Version 1.0
*/
public class DateUtils extends PropertyEditorSupport {
// 各种时间格式
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/util/IPUtils.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/IPUtils.java
index 492b859..8a4c7f7 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/util/IPUtils.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/IPUtils.java
@@ -9,9 +9,9 @@ import javax.servlet.http.HttpServletRequest;
/**
* IP地址
*
- * @author scott
+ * @Author scott
* @email jeecgos@163.com
- * @date 2019年01月14日
+ * @Date 2019年01月14日
*/
public class IPUtils {
private static Logger logger = LoggerFactory.getLogger(IPUtils.class);
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/util/MD5Util.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/MD5Util.java
index cf70fa9..cf70fa9 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/util/MD5Util.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/MD5Util.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/util/MyClassLoader.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/MyClassLoader.java
index 464759d..06bffde 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/util/MyClassLoader.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/MyClassLoader.java
@@ -1,7 +1,7 @@
package org.jeecg.common.util;
/**
- * @author 张代浩
+ * @Author 张代浩
*/
public class MyClassLoader extends ClassLoader {
public static Class getClassByScn(String className) {
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/util/PasswordUtil.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/PasswordUtil.java
index 382f94a..382f94a 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/util/PasswordUtil.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/PasswordUtil.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/util/RedisUtil.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/RedisUtil.java
index 16f8f39..2ad63b8 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/util/RedisUtil.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/RedisUtil.java
@@ -13,7 +13,7 @@ import org.springframework.util.CollectionUtils;
/**
* redis 工具类
- * @author Scott
+ * @Author Scott
*
*/
@Component
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/util/SpringContextUtils.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/SpringContextUtils.java
index fa229fd..fa229fd 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/util/SpringContextUtils.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/SpringContextUtils.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/util/UUIDGenerator.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/UUIDGenerator.java
index 6e8c667..bed2277 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/util/UUIDGenerator.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/UUIDGenerator.java
@@ -5,7 +5,7 @@ import java.net.InetAddress;
/**
*
- * @author 张代浩
+ * @Author 张代浩
*
*/
public class UUIDGenerator {
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java
index 0ee043f..2cd14e1 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java
@@ -6,7 +6,7 @@ import io.netty.util.internal.StringUtil;
* 流水号生成规则(按默认规则递增，数字从1-99开始递增，数字到99，递增字母;位数不够增加位数)
* A001
* A001A002
- * @author zhangdaihao
+ * @Author zhangdaihao
*
*/
public class YouBianCodeUtil {
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/jsonschema/CommonProperty.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/jsonschema/CommonProperty.java
index a3e4484..0ad7611 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/jsonschema/CommonProperty.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/jsonschema/CommonProperty.java
@@ -1,9 +1,11 @@
-package org.jeecg.common.jsonschema;
+package org.jeecg.common.util.jsonschema;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
+import org.jeecg.common.system.vo.DictModel;
+
import com.alibaba.fastjson.JSONObject;
/**
@@ -35,7 +37,7 @@ public abstract class CommonProperty implements Serializable{
* "enum": ["1", "2", "3"] 需要的话可以通过这个include转一下
* }
*/
- protected List<Map<String,Object>> include;
+ protected List<DictModel> include;
/**
* 对应JsonSchema的const
@@ -49,6 +51,16 @@ public abstract class CommonProperty implements Serializable{
protected String title;//数据库字段备注
protected Integer order;//字段显示排序
+ protected boolean disabled;//是否禁用
+
+ public boolean isDisabled() {
+ return disabled;
+ }
+
+ public void setDisabled(boolean disabled) {
+ this.disabled = disabled;
+ }
+
public String getView() {
return view;
}
@@ -73,11 +85,11 @@ public abstract class CommonProperty implements Serializable{
this.type = type;
}
- public List<Map<String, Object>> getInclude() {
+ public List<DictModel> getInclude() {
return include;
}
- public void setInclude(List<Map<String, Object>> include) {
+ public void setInclude(List<DictModel> include) {
this.include = include;
}
@@ -133,6 +145,11 @@ public abstract class CommonProperty implements Serializable{
}else {
json.put("view", view);
}
+ if(disabled) {
+ String str = "{\"widgetattrs\":{\"disabled\":true}}";
+ JSONObject ui = JSONObject.parseObject(str);
+ json.put("ui", ui);
+ }
return json;
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/jsonschema/JsonSchemaDescrip.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/jsonschema/JsonSchemaDescrip.java
index 1df0dde..d45de8f 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/jsonschema/JsonSchemaDescrip.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/jsonschema/JsonSchemaDescrip.java
@@ -1,4 +1,4 @@
-package org.jeecg.common.jsonschema;
+package org.jeecg.common.util.jsonschema;
import java.io.Serializable;
import java.util.List;
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/jsonschema/JsonschemaUtil.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/jsonschema/JsonschemaUtil.java
index 8aaa757..e7db0a3 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/jsonschema/JsonschemaUtil.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/jsonschema/JsonschemaUtil.java
@@ -1,4 +1,4 @@
-package org.jeecg.common.jsonschema;
+package org.jeecg.common.util.jsonschema;
import java.util.ArrayList;
import java.util.List;
@@ -34,7 +34,8 @@ public class JsonschemaUtil {
properties.put(map.get("key").toString(), map.get("prop"));
}
obj.put("properties", properties);
- log.info("---JSONSchema--->"+obj.toString());
+ //鬼知道这里为什么报错 org.jeecg.modules.system.model.DictModel cannot be cast to org.jeecg.modules.system.model.DictModel
+ //log.info("---JSONSchema--->"+obj.toJSONString());
return obj;
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/jsonschema/validate/NumberProperty.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/jsonschema/validate/NumberProperty.java
index c98bfde..db111c0 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/jsonschema/validate/NumberProperty.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/jsonschema/validate/NumberProperty.java
@@ -1,10 +1,11 @@
-package org.jeecg.common.jsonschema.validate;
+package org.jeecg.common.util.jsonschema.validate;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.jeecg.common.jsonschema.CommonProperty;
+import org.jeecg.common.system.vo.DictModel;
+import org.jeecg.common.util.jsonschema.CommonProperty;
import com.alibaba.fastjson.JSONObject;
@@ -105,7 +106,7 @@ public class NumberProperty extends CommonProperty {
* @param view list-checkbox-radio
* @param include
*/
- public NumberProperty(String key,String title,String view,List<Map<String,Object>> include) {
+ public NumberProperty(String key,String title,String view,List<DictModel> include) {
this.type = "integer";
this.key = key;
this.view = view;
diff --git a/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/jsonschema/validate/PopupProperty.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/jsonschema/validate/PopupProperty.java
new file mode 100644
index 0000000..b619e7c
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/jsonschema/validate/PopupProperty.java
@@ -0,0 +1,76 @@
+package org.jeecg.common.util.jsonschema.validate;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jeecg.common.util.jsonschema.CommonProperty;
+
+import com.alibaba.fastjson.JSONObject;
+
+public class PopupProperty extends CommonProperty {
+
+ private static final long serialVersionUID = -3200493311633999539L;
+
+ private String code;
+
+ private String destFields;
+
+ private String orgFields;
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getDestFields() {
+ return destFields;
+ }
+
+ public void setDestFields(String destFields) {
+ this.destFields = destFields;
+ }
+
+ public String getOrgFields() {
+ return orgFields;
+ }
+
+ public void setOrgFields(String orgFields) {
+ this.orgFields = orgFields;
+ }
+
+ public PopupProperty() {}
+
+ public PopupProperty(String key,String title,String code,String destFields,String orgFields) {
+ this.view = "popup";
+ this.type = "string";
+ this.key = key;
+ this.title = title;
+ this.code = code;
+ this.destFields=destFields;
+ this.orgFields=orgFields;
+ }
+
+
+ @Override
+ public Map<String, Object> getPropertyJson() {
+ Map<String,Object> map = new HashMap<>();
+ map.put("key",getKey());
+ JSONObject prop = getCommonJson();
+ if(code!=null) {
+ prop.put("code",code);
+ }
+ if(destFields!=null) {
+ prop.put("destFields",destFields);
+ }
+ if(orgFields!=null) {
+ prop.put("orgFields",orgFields);
+ }
+ map.put("prop",prop);
+ return map;
+ }
+
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/jsonschema/validate/StringProperty.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/jsonschema/validate/StringProperty.java
index ce2cce8..313456b 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/jsonschema/validate/StringProperty.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/jsonschema/validate/StringProperty.java
@@ -1,10 +1,11 @@
-package org.jeecg.common.jsonschema.validate;
+package org.jeecg.common.util.jsonschema.validate;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.jeecg.common.jsonschema.CommonProperty;
+import org.jeecg.common.system.vo.DictModel;
+import org.jeecg.common.util.jsonschema.CommonProperty;
import com.alibaba.fastjson.JSONObject;
@@ -71,7 +72,7 @@ public class StringProperty extends CommonProperty {
* @param maxLength 数据库字段最大长度
* @param include 数据字典
*/
- public StringProperty(String key,String title,String view,Integer maxLength,List<Map<String,Object>> include) {
+ public StringProperty(String key,String title,String view,Integer maxLength,List<DictModel> include) {
this.maxLength = maxLength;
this.key = key;
this.view = view;
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/util/oConvertUtils.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/oConvertUtils.java
index f8ea68e..249a4bf 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/util/oConvertUtils.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/oConvertUtils.java
@@ -1,6 +1,7 @@
package org.jeecg.common.util;
import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.net.InetAddress;
@@ -8,9 +9,12 @@ import java.net.NetworkInterface;
import java.net.SocketException;
import java.net.UnknownHostException;
import java.sql.Date;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.Set;
@@ -21,7 +25,7 @@ import javax.servlet.http.HttpServletRequest;
/**
*
- * @author 张代浩
+ * @Author 张代浩
*
*/
public class oConvertUtils {
@@ -519,9 +523,13 @@ public class oConvertUtils {
* @return
*/
public static String camelToUnderline(String para){
+ if(para.length()<3){
+ return para.toLowerCase();
+ }
StringBuilder sb=new StringBuilder(para);
int temp=0;//定位
- for(int i=0;i<para.length();i++){
+ //从第三个字符开始 避免命名不规范
+ for(int i=2;i<para.length();i++){
if(Character.isUpperCase(para.charAt(i))){
sb.insert(i+temp, "_");
temp+=1;
@@ -544,4 +552,21 @@ public class oConvertUtils {
return sb.toString();
}
+ /**
+ * 获取类的所有属性，包括父类
+ *
+ * @param object
+ * @return
+ */
+ public static Field[] getAllFields(Object object) {
+ Class<?> clazz = object.getClass();
+ List<Field> fieldList = new ArrayList<>();
+ while (clazz != null) {
+ fieldList.addAll(new ArrayList<>(Arrays.asList(clazz.getDeclaredFields())));
+ clazz = clazz.getSuperclass();
+ }
+ Field[] fields = new Field[fieldList.size()];
+ fieldList.toArray(fields);
+ return fields;
+ }
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/util/superSearch/ObjectParseUtil.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/superSearch/ObjectParseUtil.java
index 2a6ad3c..7b1311c 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/util/superSearch/ObjectParseUtil.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/superSearch/ObjectParseUtil.java
@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
* 判断类型，追加查询规则
*
- * @author Scott
- * @date 2019年02月14日
+ * @Author Scott
+ * @Date 2019年02月14日
*/
public class ObjectParseUtil {
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java
index 4345479..d89b414 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java
@@ -4,8 +4,8 @@ import org.jeecg.common.util.oConvertUtils;
/**
* Query 规则 常量
- * @author Scott
- * @date 2019年02月14日
+ * @Author Scott
+ * @Date 2019年02月14日
*/
public enum QueryRuleEnum {
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/util/superSearch/QueryRuleVo.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/superSearch/QueryRuleVo.java
index b3e3303..b3e3303 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/util/superSearch/QueryRuleVo.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/superSearch/QueryRuleVo.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java
index d85a7eb..fefc5f0 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java
@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
* 菜单权限规则表
* </p>
*
- * @author huangzhilin
+ * @Author huangzhilin
* @since 2019-03-29
*/
@Data
diff --git a/jeecg-boot/jeecg-boot-module-system/pom.xml b/jeecg-boot/jeecg-boot-module-system/pom.xml
new file mode 100644
index 0000000..d1c00e8
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/pom.xml
@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jeecg-boot-module-system</artifactId>
+ <version>2.0.0</version>
+
+ <parent>
+ <groupId>org.jeecgframework.boot</groupId>
+ <artifactId>jeecg-boot-parent</artifactId>
+ <version>2.0.0</version>
+ </parent>
+
+ <repositories>
+ <repository>
+ <id>aliyun</id>
+ <name>aliyun Repository</name>
+ <url>http://maven.aliyun.com/nexus/content/groups/public</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>jeecg</id>
+ <name>jeecg Repository</name>
+ <url>http://maven.jeecg.org/nexus/content/repositories/jeecg</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jeecgframework.boot</groupId>
+ <artifactId>jeecg-boot-base-common</artifactId>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgApplication.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgApplication.java
new file mode 100644
index 0000000..1ec29fc
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgApplication.java
@@ -0,0 +1,37 @@
+package org.jeecg;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.env.Environment;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+@Slf4j
+@EnableSwagger2
+@SpringBootApplication
+@EnableAutoConfiguration
+public class JeecgApplication {
+
+ public static void main(String[] args) throws UnknownHostException {
+ //System.setProperty("spring.devtools.restart.enabled", "true");
+
+ ConfigurableApplicationContext application = SpringApplication.run(JeecgApplication.class, args);
+ Environment env = application.getEnvironment();
+ String ip = InetAddress.getLocalHost().getHostAddress();
+ String port = env.getProperty("server.port");
+ String path = env.getProperty("server.servlet.context-path");
+ log.info("\n----------------------------------------------------------\n\t" +
+ "Application Jeecg-Boot is running! Access URLs:\n\t" +
+ "Local: \t\thttp://localhost:" + port + path + "/\n\t" +
+ "External: \thttp://" + ip + ":" + port + path + "/\n\t" +
+ "swagger-ui: \thttp://" + ip + ":" + port + path + "/swagger-ui.html\n\t" +
+ "Doc: \t\thttp://" + ip + ":" + port + path + "/doc.html\n" +
+ "----------------------------------------------------------");
+
+ }
+}
\ No newline at end of file
diff --git a/jeecg-boot/src/main/java/org/jeecg/JeecgOneGUI.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgOneGUI.java
index f10fc23..f25f67b 100644
--- a/jeecg-boot/src/main/java/org/jeecg/JeecgOneGUI.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgOneGUI.java
@@ -4,9 +4,9 @@ import org.jeecgframework.codegenerate.window.CodeWindow;
/**
* @Title: 单表代码生成器入口
- * @author 张代浩
+ * @Author 张代浩
* @site www.jeecg.org
- * @version：V1.0.1
+ * @Version:V1.0.1
*/
public class JeecgOneGUI {
diff --git a/jeecg-boot/src/main/java/org/jeecg/JeecgOneToMainUtil.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgOneToMainUtil.java
index 63a470e..ef1c719 100644
--- a/jeecg-boot/src/main/java/org/jeecg/JeecgOneToMainUtil.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgOneToMainUtil.java
@@ -9,7 +9,7 @@ import org.jeecgframework.codegenerate.generate.pojo.onetomany.SubTableVo;
/**
* 代码生成器入口【一对多】
- * @author 张代浩
+ * @Author 张代浩
* @site www.jeecg.org
*
*/
diff --git a/jeecg-boot/src/main/java/org/jeecg/config/AutoPoiConfig.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/AutoPoiConfig.java
index d17dc04..5f7725d 100644
--- a/jeecg-boot/src/main/java/org/jeecg/config/AutoPoiConfig.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/AutoPoiConfig.java
@@ -5,8 +5,8 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
- * @author: Scott
- * @date: 2018/2/7
+ * @Author: Scott
+ * @Date: 2018/2/7
* @description: autopoi 配置类
*/
diff --git a/jeecg-boot/src/main/java/org/jeecg/config/MybatisPlusConfig.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/MybatisPlusConfig.java
index 6bde7f3..84690d9 100644
--- a/jeecg-boot/src/main/java/org/jeecg/config/MybatisPlusConfig.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/MybatisPlusConfig.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
/**
* 单数据源配置（jeecg.datasource.open = false时生效）
- * @author zhoujf
+ * @Author zhoujf
*
*/
@Configuration
diff --git a/jeecg-boot/src/main/java/org/jeecg/config/RedisConfig.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/RedisConfig.java
index 940b043..6d59330 100644
--- a/jeecg-boot/src/main/java/org/jeecg/config/RedisConfig.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/RedisConfig.java
@@ -1,13 +1,19 @@
package org.jeecg.config;
import java.lang.reflect.Method;
+import java.time.Duration;
import javax.annotation.Resource;
+
+import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.CachingConfigurerSupport;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.cache.interceptor.KeyGenerator;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.cache.RedisCacheWriter;
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
@@ -46,14 +52,6 @@ public class RedisConfig extends CachingConfigurerSupport {
};
}
- // 这个注释不能放开，发现自定义缓存管理器，会导致实体解析失败
- //TODO
-// @Bean
-// public CacheManager cacheManager() {
-// RedisCacheManager.RedisCacheManagerBuilder builder = RedisCacheManager.RedisCacheManagerBuilder.fromConnectionFactory(lettuceConnectionFactory);
-// return builder.build();
-// }
-
/**
* RedisTemplate配置
*/
@@ -77,4 +75,27 @@ public class RedisConfig extends CachingConfigurerSupport {
return redisTemplate;
}
+ /**
+ * 缓存配置管理器
+ */
+ @Bean
+ public CacheManager cacheManager(LettuceConnectionFactory factory) {
+ // 以锁写入的方式创建RedisCacheWriter对象
+ RedisCacheWriter writer = RedisCacheWriter.lockingRedisCacheWriter(factory);
+ /**
+ * 设置CacheManager的Value序列化方式为JdkSerializationRedisSerializer,
+ * 但其实RedisCacheConfiguration默认就是使用 StringRedisSerializer序列化key，
+ * JdkSerializationRedisSerializer序列化value, 所以以下注释代码就是默认实现，没必要写，直接注释掉
+ */
+ // RedisSerializationContext.SerializationPair pair =
+ // RedisSerializationContext.SerializationPair.fromSerializer(new
+ // JdkSerializationRedisSerializer(this.getClass().getClassLoader()));
+ // RedisCacheConfiguration config =
+ // RedisCacheConfiguration.defaultCacheConfig().serializeValuesWith(pair);
+ // 创建默认缓存配置对象
+ RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig().entryTtl(Duration.ofHours(1)); // 设置缓存有效期一小时;
+ RedisCacheManager cacheManager = new RedisCacheManager(writer, config);
+ return cacheManager;
+ }
+
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/config/ShiroConfig.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java
index b149a34..02bda26 100644
--- a/jeecg-boot/src/main/java/org/jeecg/config/ShiroConfig.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java
@@ -3,7 +3,9 @@ package org.jeecg.config;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
+
import javax.servlet.Filter;
+
import org.apache.shiro.mgt.DefaultSessionStorageEvaluator;
import org.apache.shiro.mgt.DefaultSubjectDAO;
import org.apache.shiro.mgt.SecurityManager;
@@ -11,9 +13,8 @@ import org.apache.shiro.spring.LifecycleBeanPostProcessor;
import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
-import org.jeecg.modules.shiro.authc.MyRealm;
+import org.jeecg.modules.shiro.authc.ShiroRealm;
import org.jeecg.modules.shiro.authc.aop.JwtFilter;
-import org.jeecg.modules.shiro.authc.aop.ResourceCheckFilter;
import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -44,12 +45,12 @@ public class ShiroConfig {
// 配置不会被拦截的链接 顺序判断
filterChainDefinitionMap.put("/sys/login", "anon"); //登录接口排除
filterChainDefinitionMap.put("/auth/2step-code", "anon");//登录验证码
- filterChainDefinitionMap.put("/test/jeecgDemo/**", "anon"); //测试接口
- filterChainDefinitionMap.put("/test/jeecgOrderMain/**", "anon"); //测试接口
- filterChainDefinitionMap.put("/**/exportXls", "anon"); //导出接口
- filterChainDefinitionMap.put("/**/importExcel", "anon"); //导入接口
filterChainDefinitionMap.put("/sys/common/view/**", "anon");//图片预览不限制token
+ filterChainDefinitionMap.put("/sys/common/download/**", "anon");//文件下载不限制token
+ filterChainDefinitionMap.put("/sys/common/pdf/**", "anon");//pdf预览
+ filterChainDefinitionMap.put("/generic/**", "anon");//pdf预览需要文件
filterChainDefinitionMap.put("/", "anon");
+ filterChainDefinitionMap.put("/doc.html", "anon");
filterChainDefinitionMap.put("/**/*.js", "anon");
filterChainDefinitionMap.put("/**/*.css", "anon");
filterChainDefinitionMap.put("/**/*.html", "anon");
@@ -66,12 +67,9 @@ public class ShiroConfig {
//性能监控
filterChainDefinitionMap.put("/actuator/metrics/**", "anon");
filterChainDefinitionMap.put("/actuator/httptrace/**", "anon");
- filterChainDefinitionMap.put("/redis/**", "anon");
+ filterChainDefinitionMap.put("/actuator/redis/**", "anon");
+
- //TODO 排除Online请求
- filterChainDefinitionMap.put("/auto/cgform/**", "anon");
- filterChainDefinitionMap.put("/online/cgreport/api/exportXls/**", "anon");
-
// 添加自己的过滤器并且取名为jwt
Map<String, Filter> filterMap = new HashMap<String, Filter>(1);
filterMap.put("jwt", new JwtFilter());
@@ -79,14 +77,15 @@ public class ShiroConfig {
// <!-- 过滤链定义，从上向下顺序执行，一般将/**放在最为下边
filterChainDefinitionMap.put("/**", "jwt");
- // 未授权界面;
- shiroFilterFactoryBean.setUnauthorizedUrl("/403");
+ // 未授权界面返回JSON
+ shiroFilterFactoryBean.setUnauthorizedUrl("/sys/common/403");
+ shiroFilterFactoryBean.setLoginUrl("/sys/common/403");
shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap);
return shiroFilterFactoryBean;
}
@Bean("securityManager")
- public DefaultWebSecurityManager securityManager(MyRealm myRealm) {
+ public DefaultWebSecurityManager securityManager(ShiroRealm myRealm) {
DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager();
securityManager.setRealm(myRealm);
diff --git a/jeecg-boot/src/main/java/org/jeecg/config/Swagger2Config.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/Swagger2Config.java
index d09e078..4d0be0e 100644
--- a/jeecg-boot/src/main/java/org/jeecg/config/Swagger2Config.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/Swagger2Config.java
@@ -9,6 +9,8 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrapUI;
+
import io.swagger.annotations.ApiOperation;
import springfox.documentation.service.Parameter;
import lombok.extern.slf4j.Slf4j;
@@ -23,11 +25,12 @@ import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
/**
- * @author scott
+ * @Author scott
*/
@Slf4j
@Configuration
@EnableSwagger2
+@EnableSwaggerBootstrapUI
public class Swagger2Config implements WebMvcConfigurer {
/**
@@ -39,6 +42,7 @@ public class Swagger2Config implements WebMvcConfigurer {
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+ registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/config/WebMvcConfiguration.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/WebMvcConfiguration.java
index 4ddc33a..3fcbf9e 100644
--- a/jeecg-boot/src/main/java/org/jeecg/config/WebMvcConfiguration.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/WebMvcConfiguration.java
@@ -13,7 +13,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
/**
* Spring Boot 2.0 解决跨域问题
*
- * @author qinfeng
+ * @Author qinfeng
*
*/
@Configuration
diff --git a/jeecg-boot/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java
index 4fff963..63f555a 100644
--- a/jeecg-boot/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java
@@ -14,6 +14,7 @@ import org.apache.ibatis.plugin.Invocation;
import org.apache.ibatis.plugin.Plugin;
import org.apache.ibatis.plugin.Signature;
import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.system.entity.SysUser;
import org.springframework.stereotype.Component;
@@ -22,8 +23,8 @@ import lombok.extern.slf4j.Slf4j;
/**
* mybatis拦截器，自动注入创建人、创建时间、修改人、修改时间
- * @author scott
- * @date 2019-01-19
+ * @Author scott
+ * @Date 2019-01-19
*
*/
@Slf4j
@@ -44,23 +45,23 @@ public class MybatisInterceptor implements Interceptor {
return invocation.proceed();
}
if (SqlCommandType.INSERT == sqlCommandType) {
- Field[] fields = parameter.getClass().getDeclaredFields();
+ Field[] fields = oConvertUtils.getAllFields(parameter);
for (Field field : fields) {
log.debug("------field.name------" + field.getName());
try {
+ // 获取登录用户信息
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if ("createBy".equals(field.getName())) {
field.setAccessible(true);
Object local_createBy = field.get(parameter);
field.setAccessible(false);
if (local_createBy == null || local_createBy.equals("")) {
- String createBy = "jeecg-boot";
- // 获取登录用户信息
- SysUser sysUser = (SysUser) SecurityUtils.getSubject().getPrincipal();
+ String createBy = "jeecg";
if (sysUser != null) {
// 登录账号
createBy = sysUser.getUsername();
}
- if (!oConvertUtils.isEmpty(createBy)) {
+ if (oConvertUtils.isNotEmpty(createBy)) {
field.setAccessible(true);
field.set(parameter, createBy);
field.setAccessible(false);
@@ -78,6 +79,25 @@ public class MybatisInterceptor implements Interceptor {
field.setAccessible(false);
}
}
+ //注入部门编码
+ if ("sysOrgCode".equals(field.getName())) {
+ field.setAccessible(true);
+ Object local_sysOrgCode = field.get(parameter);
+ field.setAccessible(false);
+ if (local_sysOrgCode == null || local_sysOrgCode.equals("")) {
+ String sysOrgCode = "";
+ // 获取登录用户信息
+ if (sysUser != null) {
+ // 登录账号
+ sysOrgCode = sysUser.getOrgCode();
+ }
+ if (oConvertUtils.isNotEmpty(sysOrgCode)) {
+ field.setAccessible(true);
+ field.set(parameter, sysOrgCode);
+ field.setAccessible(false);
+ }
+ }
+ }
} catch (Exception e) {
}
}
@@ -87,9 +107,9 @@ public class MybatisInterceptor implements Interceptor {
if (parameter instanceof ParamMap) {
ParamMap<?> p = (ParamMap<?>) parameter;
parameter = p.get("param1");
- fields = parameter.getClass().getDeclaredFields();
+ fields = oConvertUtils.getAllFields(parameter);
} else {
- fields = parameter.getClass().getDeclaredFields();
+ fields = oConvertUtils.getAllFields(parameter);
}
for (Field field : fields) {
@@ -100,14 +120,14 @@ public class MybatisInterceptor implements Interceptor {
Object local_updateBy = field.get(parameter);
field.setAccessible(false);
if (local_updateBy == null || local_updateBy.equals("")) {
- String updateBy = "jeecg-boot";
+ String updateBy = "jeecg";
// 获取登录用户信息
- SysUser sysUser = (SysUser) SecurityUtils.getSubject().getPrincipal();
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (sysUser != null) {
// 登录账号
updateBy = sysUser.getUsername();
}
- if (!oConvertUtils.isEmpty(updateBy)) {
+ if (oConvertUtils.isNotEmpty(updateBy)) {
field.setAccessible(true);
field.set(parameter, updateBy);
field.setAccessible(false);
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/MockController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/MockController.java
index b882a45..c27efd2 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/MockController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/MockController.java
@@ -27,6 +27,8 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
public class MockController {
+ private final String JSON_PATH = "classpath:org/jeecg/modules/demo/mock/json";
+
/**
* 通用json访问接口
* 格式： http://localhost:8080/jeecg-boot/api/json/{filename}
@@ -39,6 +41,11 @@ public class MockController {
return readJson(jsonpath);
}
+ @GetMapping(value = "/asynTreeList")
+ public String asynTreeList(String id) {
+ return readJson(JSON_PATH + "/asyn_tree_list_" + id + ".json");
+ }
+
@GetMapping(value = "/user")
public String user() {
return readJson("classpath:org/jeecg/modules/demo/mock/json/user.json");
@@ -189,7 +196,7 @@ public class MockController {
InputStream stream = getClass().getClassLoader().getResourceAsStream(jsonSrc.replace("classpath:", ""));
json = IOUtils.toString(stream);
} catch (IOException e) {
- e.printStackTrace();
+ log.error(e.getMessage(),e);
}
return json;
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/area.json b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/area.json
index bce06a6..bce06a6 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/area.json
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/area.json
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_0.json b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_0.json
new file mode 100644
index 0000000..4eabd4e
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_0.json
@@ -0,0 +1,29 @@
+{
+ "status": 200,
+ "success": true,
+ "message": "ok",
+ "result": [
+ {
+ "id": 1,
+ "name": "首页",
+ "component": "dashboard/Analysis",
+ "orderNum": 1,
+ "hasChildren": false
+ },
+ {
+ "id": 2,
+ "name": "常见案例",
+ "component": "layouts/RouteView",
+ "orderNum": 2,
+ "hasChildren": true
+ },
+ {
+ "id": 3,
+ "name": "系统监控",
+ "component": "layouts/RouteView",
+ "orderNum": 3,
+ "hasChildren": true
+ }
+ ],
+ "timestamp": 1554950583837
+}
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_1.json b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_1.json
new file mode 100644
index 0000000..3b58917
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_1.json
@@ -0,0 +1,29 @@
+{
+ "status": 200,
+ "success": true,
+ "message": "ok",
+ "result": [
+ {
+ "id": 11,
+ "name": "首页",
+ "component": "dashboard/Analysis",
+ "orderNum": 1,
+ "hasChildren": false
+ },
+ {
+ "id": 12,
+ "name": "系统管理",
+ "component": "layouts/RouteView",
+ "orderNum": 2,
+ "hasChildren": true
+ },
+ {
+ "id": 13,
+ "name": "常见案例",
+ "component": "layouts/RouteView",
+ "orderNum": 3,
+ "hasChildren": true
+ }
+ ],
+ "timestamp": 1554950583837
+}
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_2.json b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_2.json
new file mode 100644
index 0000000..380247b
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_2.json
@@ -0,0 +1,29 @@
+{
+ "status": 200,
+ "success": true,
+ "message": "ok",
+ "result": [
+ {
+ "id": 21,
+ "name": "弹框选择Demo",
+ "component": "jeecg/SelectDemo",
+ "orderNum": 1,
+ "hasChildren": false
+ },
+ {
+ "id": 22,
+ "name": "单表模型示例",
+ "component": "jeecg/JeecgDemoList",
+ "orderNum": 2,
+ "hasChildren": false
+ },
+ {
+ "id": 23,
+ "name": "一对多Tab示例",
+ "component": "jeecg/tablist/JeecgOrderDMainList",
+ "orderNum": 3,
+ "hasChildren": false
+ }
+ ],
+ "timestamp": 1554950583837
+}
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_3.json b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_3.json
new file mode 100644
index 0000000..fc447e8
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_3.json
@@ -0,0 +1,29 @@
+{
+ "status": 200,
+ "success": true,
+ "message": "ok",
+ "result": [
+ {
+ "id": 31,
+ "name": "性能监控",
+ "component": "layouts/RouteView",
+ "orderNum": 1,
+ "hasChildren": true
+ },
+ {
+ "id": 32,
+ "name": "在线文档",
+ "component": "layouts/IframePageView",
+ "orderNum": 2,
+ "hasChildren": false
+ },
+ {
+ "id": 33,
+ "name": "工作台",
+ "component": "dashboard/Workplace",
+ "orderNum": 3,
+ "hasChildren": false
+ }
+ ],
+ "timestamp": 1554950583837
+}
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_31.json b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_31.json
new file mode 100644
index 0000000..e4f20f1
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_31.json
@@ -0,0 +1,29 @@
+{
+ "status": 200,
+ "success": true,
+ "message": "ok",
+ "result": [
+ {
+ "id": 311,
+ "name": "Redis监控",
+ "component": "modules/monitor/RedisInfo",
+ "orderNum": 1,
+ "hasChildren": false
+ },
+ {
+ "id": 312,
+ "name": "JVM信息",
+ "component": "modules/monitor/JvmInfo",
+ "orderNum": 2,
+ "hasChildren": false
+ },
+ {
+ "id": 313,
+ "name": "Tomcat信息",
+ "component": "modules/monitor/TomcatInfo",
+ "orderNum": 3,
+ "hasChildren": false
+ }
+ ],
+ "timestamp": 1554950583837
+}
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json
new file mode 100644
index 0000000..5b65704
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json
@@ -0,0 +1,63 @@
+{
+ "success": true,
+ "message": "查询成功",
+ "code": null,
+ "result": [
+ {
+ "resultIndex": 0,
+ "yearcount": 623,
+ "year": 2016,
+ "month": "四月",
+ "monthcount": 3255,
+ "classifyname": "证明类",
+ "cntrnocount": 24,
+ "cabinetname": "一号柜",
+ "cabinetcocunt": 12
+ },
+ {
+ "resultIndex": 1,
+ "yearcount": 243,
+ "year": 2017,
+ "month": "五月",
+ "monthcount": 5673,
+ "classifyname": "产权类",
+ "cntrnocount": 52,
+ "cabinetname": "二号柜",
+ "cabinetcocunt": 52
+ },
+ {
+ "resultIndex": 2,
+ "yearcount": 345,
+ "year": 2018,
+ "month": "六月",
+ "monthcount": 2673,
+ "classifyname": "知识类",
+ "cntrnocount": 85,
+ "cabinetname": "三号柜",
+ "cabinetcocunt": 24
+ },
+ {
+ "resultIndex": 3,
+ "yearcount": 452,
+ "year": 2019,
+ "month": "七月",
+ "monthcount": 2341,
+ "classifyname": "技术类",
+ "cntrnocount": 67,
+ "cabinetname": "四号柜",
+ "cabinetcocunt": 45
+ },
+ {
+ "resultIndex": 4,
+ "yearcount": 645,
+ "year": 2020,
+ "month": "八月",
+ "monthcount": 7473,
+ "classifyname": "工具类",
+ "cntrnocount": 93,
+ "cabinetname": "五号柜",
+ "cabinetcocunt": 94
+ }
+ ],
+ "timestamp": 1554285003594
+}
\ No newline at end of file
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/graphreport_chart.json b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/graphreport_chart.json
index 5432e14..5432e14 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/graphreport_chart.json
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/graphreport_chart.json
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/permission.json b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/permission.json
index 96e8d2e..96e8d2e 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/permission.json
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/permission.json
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/permission_no_page.json b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/permission_no_page.json
index 58be9d7..58be9d7 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/permission_no_page.json
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/permission_no_page.json
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/role.json b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/role.json
index 8ffb0ed..8ffb0ed 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/role.json
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/role.json
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/service.json b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/service.json
index 53a591f..53a591f 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/service.json
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/service.json
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/sysdatalog.json b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/sysdatalog.json
index b127324..b127324 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/sysdatalog.json
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/sysdatalog.json
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/task_process.json b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/task_process.json
index b986c8c..b986c8c 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/task_process.json
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/task_process.json
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/user.json b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/user.json
index 060ee7a..060ee7a 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/user.json
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/user.json
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/user_info.json b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/user_info.json
index 3123c58..3123c58 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/user_info.json
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/user_info.json
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/workplace_activity.json b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/workplace_activity.json
index 83c7321..83c7321 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/workplace_activity.json
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/workplace_activity.json
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/workplace_projects.json b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/workplace_projects.json
index 7c9f8c2..7c9f8c2 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/workplace_projects.json
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/workplace_projects.json
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/workplace_radar.json b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/workplace_radar.json
index e9f7382..e9f7382 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/workplace_radar.json
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/workplace_radar.json
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/workplace_teams.json b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/workplace_teams.json
index 043ce0d..043ce0d 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/workplace_teams.json
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/workplace_teams.json
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java
index 1441ce0..e5cfee0 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java
@@ -1,30 +1,22 @@
package org.jeecg.modules.demo.test.controller;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
-import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.aspect.annotation.PermissionData;
+import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.RedisUtil;
-import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.test.entity.JeecgDemo;
import org.jeecg.modules.demo.test.service.IJeecgDemoService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -36,31 +28,29 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
/**
- * @Title: Controller
* @Description: 测试demo
- * @author： jeecg-boot
- * @date： 2018-12-29
- * @version：V1.0
+ * @Author: jeecg-boot
+ * @Date:2018-12-29
+ * @Version:V1.0
*/
+@Slf4j
+@Api(tags="单表DEMO")
@RestController
@RequestMapping("/test/jeecgDemo")
-@Slf4j
-public class JeecgDemoController {
+public class JeecgDemoController extends JeecgController<JeecgDemo,IJeecgDemoService> {
@Autowired
private IJeecgDemoService jeecgDemoService;
@@ -76,52 +66,44 @@ public class JeecgDemoController {
* @param req
* @return
*/
-
- @ApiOperation(value = "获取Demo数据列表", notes = "获取所有Demo数据列表", produces = "application/json")
+ @ApiOperation(value = "获取Demo数据列表", notes = "获取所有Demo数据列表")
@GetMapping(value = "/list")
+ @PermissionData(pageComponent="jeecg/JeecgDemoList")
public Result<IPage<JeecgDemo>> list(JeecgDemo jeecgDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<JeecgDemo>> result = new Result<IPage<JeecgDemo>>();
- /*QueryWrapper<JeecgDemo> queryWrapper = null;
- //================================================================================
- //高级组合查询
- try {
- String superQueryParams = req.getParameter("superQueryParams");
- if(oConvertUtils.isNotEmpty(superQueryParams)) {
- // 解码
- superQueryParams = URLDecoder.decode(superQueryParams, "UTF-8");
- List<QueryRuleVo> userList = JSON.parseArray(superQueryParams, QueryRuleVo.class);
- log.info(superQueryParams);
- queryWrapper = new QueryWrapper<JeecgDemo>();
- for (QueryRuleVo rule : userList) {
- if(oConvertUtils.isNotEmpty(rule.getField()) && oConvertUtils.isNotEmpty(rule.getRule()) && oConvertUtils.isNotEmpty(rule.getVal())){
- ObjectParseUtil.addCriteria(queryWrapper, rule.getField(), QueryRuleEnum.getByValue(rule.getRule()), rule.getVal());
- }
- }
- }
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
- //================================================================================
+ /*
+ * QueryWrapper<JeecgDemo> queryWrapper = null;
+ * //===========================================================================
+ * ===== //高级组合查询 try { String superQueryParams =
+ * req.getParameter("superQueryParams");
+ * if(oConvertUtils.isNotEmpty(superQueryParams)) { // 解码 superQueryParams =
+ * URLDecoder.decode(superQueryParams, "UTF-8"); List<QueryRuleVo> userList =
+ * JSON.parseArray(superQueryParams, QueryRuleVo.class);
+ * log.info(superQueryParams); queryWrapper = new QueryWrapper<JeecgDemo>(); for
+ * (QueryRuleVo rule : userList) { if(oConvertUtils.isNotEmpty(rule.getField())
+ * && oConvertUtils.isNotEmpty(rule.getRule()) &&
+ * oConvertUtils.isNotEmpty(rule.getVal())){
+ * ObjectParseUtil.addCriteria(queryWrapper, rule.getField(),
+ * QueryRuleEnum.getByValue(rule.getRule()), rule.getVal()); } } } } catch
+ * (UnsupportedEncodingException e) { e.printStackTrace(); }
+ * //===========================================================================
+ * =====
+ *
+ * // 手工转换实体驼峰字段为下划线分隔表字段 queryWrapper = queryWrapper==null?new
+ * QueryWrapper<JeecgDemo>(jeecgDemo):queryWrapper; Page<JeecgDemo> page = new
+ * Page<JeecgDemo>(pageNo, pageSize);
+ *
+ * // 排序逻辑 处理 String column = req.getParameter("column"); String order =
+ * req.getParameter("order"); if (oConvertUtils.isNotEmpty(column) &&
+ * oConvertUtils.isNotEmpty(order)) { if ("asc".equals(order)) {
+ * queryWrapper.orderByAsc(oConvertUtils.camelToUnderline(column)); } else {
+ * queryWrapper.orderByDesc(oConvertUtils.camelToUnderline(column)); } }
+ */
- // 手工转换实体驼峰字段为下划线分隔表字段
- queryWrapper = queryWrapper==null?new QueryWrapper<JeecgDemo>(jeecgDemo):queryWrapper;
- Page<JeecgDemo> page = new Page<JeecgDemo>(pageNo, pageSize);
-
- // 排序逻辑 处理
- String column = req.getParameter("column");
- String order = req.getParameter("order");
- if (oConvertUtils.isNotEmpty(column) && oConvertUtils.isNotEmpty(order)) {
- if ("asc".equals(order)) {
- queryWrapper.orderByAsc(oConvertUtils.camelToUnderline(column));
- } else {
- queryWrapper.orderByDesc(oConvertUtils.camelToUnderline(column));
- }
- }*/
-
QueryWrapper<JeecgDemo> queryWrapper = QueryGenerator.initQueryWrapper(jeecgDemo, req.getParameterMap());
Page<JeecgDemo> page = new Page<JeecgDemo>(pageNo, pageSize);
-
+
IPage<JeecgDemo> pageList = jeecgDemoService.page(page, queryWrapper);
// log.info("查询当前页：" + pageList.getCurrent());
// log.info("查询当前页数量：" + pageList.getSize());
@@ -140,14 +122,14 @@ public class JeecgDemoController {
*/
@PostMapping(value = "/add")
@AutoLog(value = "添加测试DEMO")
+ @ApiOperation(value = "添加DEMO", notes = "添加DEMO")
public Result<JeecgDemo> add(@RequestBody JeecgDemo jeecgDemo) {
Result<JeecgDemo> result = new Result<JeecgDemo>();
try {
jeecgDemoService.save(jeecgDemo);
result.success("添加成功！");
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.error(e.getMessage(), e);
result.error500("操作失败");
}
return result;
@@ -160,6 +142,7 @@ public class JeecgDemoController {
* @return
*/
@PutMapping(value = "/edit")
+ @ApiOperation(value = "编辑DEMO", notes = "编辑DEMO")
public Result<JeecgDemo> eidt(@RequestBody JeecgDemo jeecgDemo) {
Result<JeecgDemo> result = new Result<JeecgDemo>();
JeecgDemo jeecgDemoEntity = jeecgDemoService.getById(jeecgDemo.getId());
@@ -184,6 +167,7 @@ public class JeecgDemoController {
*/
@AutoLog(value = "删除测试DEMO")
@DeleteMapping(value = "/delete")
+ @ApiOperation(value = "通过ID删除DEMO", notes = "通过ID删除DEMO")
public Result<JeecgDemo> delete(@RequestParam(name = "id", required = true) String id) {
Result<JeecgDemo> result = new Result<JeecgDemo>();
JeecgDemo jeecgDemo = jeecgDemoService.getById(id);
@@ -206,6 +190,7 @@ public class JeecgDemoController {
* @return
*/
@DeleteMapping(value = "/deleteBatch")
+ @ApiOperation(value = "批量删除DEMO", notes = "批量删除DEMO")
public Result<JeecgDemo> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
Result<JeecgDemo> result = new Result<JeecgDemo>();
if (ids == null || "".equals(ids.trim())) {
@@ -223,8 +208,8 @@ public class JeecgDemoController {
* @param id
* @return
*/
- @ApiOperation(value = "获取Demo信息", tags = { "获取Demo信息" }, notes = "注意问题点")
@GetMapping(value = "/queryById")
+ @ApiOperation(value = "通过ID查询DEMO", notes = "通过ID查询DEMO")
public Result<JeecgDemo> queryById(@ApiParam(name = "id", value = "示例id", required = true) @RequestParam(name = "id", required = true) String id) {
Result<JeecgDemo> result = new Result<JeecgDemo>();
JeecgDemo jeecgDemo = jeecgDemoService.getById(id);
@@ -236,80 +221,31 @@ public class JeecgDemoController {
}
return result;
}
-
/**
* 导出excel
+ *
* @param request
* @param response
*/
@RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
- // Step.1 组装查询条件
- QueryWrapper<JeecgDemo> queryWrapper = null;
- try {
- String paramsStr = request.getParameter("paramsStr");
- if (oConvertUtils.isNotEmpty(paramsStr)) {
- String deString = URLDecoder.decode(paramsStr, "UTF-8");
- JeecgDemo jeecgDemo = JSON.parseObject(deString, JeecgDemo.class);
- queryWrapper = QueryGenerator.initQueryWrapper(jeecgDemo, request.getParameterMap());
- log.info(paramsStr);
- log.info(jeecgDemo.toString());
- }
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
-
- //Step.2 AutoPoi 导出Excel
- ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
- List<JeecgDemo> pageList = jeecgDemoService.list(queryWrapper);
- //导出文件名称
- mv.addObject(NormalExcelConstants.FILE_NAME,"Excel导出文件名字");
- //注解对象Class
- mv.addObject(NormalExcelConstants.CLASS,JeecgDemo.class);
- //自定义表格参数
- mv.addObject(NormalExcelConstants.PARAMS,new ExportParams("自定义导出Excel模板内容标题","导出人:Jeecg","导出信息"));
- //导出数据列表
- mv.addObject(NormalExcelConstants.DATA_LIST,pageList);
- return mv;
+ @PermissionData(pageComponent="jeecg/JeecgDemoList")
+ public ModelAndView exportXls(HttpServletRequest request, JeecgDemo jeecgDemo) {
+ return super.exportXls(request, jeecgDemo, JeecgDemo.class, "单表模型");
}
-
+
/**
* 通过excel导入数据
+ *
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
- Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
- for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
- MultipartFile file = entity.getValue();// 获取上传文件对象
- ImportParams params = new ImportParams();
- params.setTitleRows(2);
- params.setHeadRows(1);
- params.setNeedSave(true);
- try {
- List<JeecgDemo> listJeecgDemos = ExcelImportUtil.importExcel(file.getInputStream(), JeecgDemo.class, params);
- for (JeecgDemo jeecgDemoExcel : listJeecgDemos) {
- jeecgDemoService.save(jeecgDemoExcel);
- }
- return Result.ok("文件导入成功！数据行数：" + listJeecgDemos.size());
- } catch (Exception e) {
- log.error(e.getMessage());
- return Result.error("文件导入失败！");
- } finally {
- try {
- file.getInputStream().close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- return Result.ok("文件导入失败！");
+ return super.importExcel(request, response, JeecgDemo.class);
}
-
+
// ================================================================================================================
/**
* redis操作 -- set
@@ -378,9 +314,9 @@ public class JeecgDemoController {
}
// ================================================================================================================
-
-
- // ==========================================动态表单 JSON接收测试===========================================//
+
+ // ==========================================动态表单
+ // JSON接收测试===========================================//
@PostMapping(value = "/testOnlineAdd")
public Result<JeecgDemo> testOnlineAdd(@RequestBody JSONObject json) {
Result<JeecgDemo> result = new Result<JeecgDemo>();
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderDMainController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderDMainController.java
index 4db3c54..4f5a57c 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderDMainController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderDMainController.java
@@ -34,9 +34,9 @@ import lombok.extern.slf4j.Slf4j;
/**
* @Title: Controller
* @Description: 订单模拟
- * @author: ZhiLin
+ * @Author: ZhiLin
* @Date: 2019-02-20
- * @version: v1.0
+ * @Version: v1.0
*/
@Slf4j
@RestController
@@ -95,8 +95,7 @@ public class JeecgOrderDMainController {
jeecgOrderMainService.save(jeecgOrderMain);
result.success("添加成功！");
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.error(e.getMessage(),e);
result.error500("操作失败");
}
return result;
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java
index 1782b24..ef9d42d 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java
@@ -50,9 +50,9 @@ import lombok.extern.slf4j.Slf4j;
/**
* @Title: Controller
* @Description: 订单
- * @author： jeecg-boot
- * @date： 2019-02-15
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date:2019-02-15
+ * @Version: V1.0
*/
@RestController
@RequestMapping("/test/jeecgOrderMain")
@@ -104,8 +104,7 @@ public class JeecgOrderMainController {
jeecgOrderMainService.saveMain(jeecgOrderMain, jeecgOrderMainPage.getJeecgOrderCustomerList(), jeecgOrderMainPage.getJeecgOrderTicketList());
result.success("添加成功！");
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.error(e.getMessage(),e);
result.error500("操作失败");
}
return result;
@@ -227,22 +226,9 @@ public class JeecgOrderMainController {
* @param response
*/
@RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+ public ModelAndView exportXls(HttpServletRequest request, JeecgOrderMain jeecgOrderMain) {
// Step.1 组装查询条件
- QueryWrapper<JeecgOrderMain> queryWrapper = null;
- try {
- String paramsStr = request.getParameter("paramsStr");
- if (oConvertUtils.isNotEmpty(paramsStr)) {
- String deString = URLDecoder.decode(paramsStr, "UTF-8");
- JeecgOrderMain jeecgOrderMain = JSON.parseObject(deString, JeecgOrderMain.class);
- queryWrapper = QueryGenerator.initQueryWrapper(jeecgOrderMain, request.getParameterMap());
- log.info(paramsStr);
- log.info(jeecgOrderMain.toString());
- }
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
-
+ QueryWrapper<JeecgOrderMain> queryWrapper = QueryGenerator.initQueryWrapper(jeecgOrderMain, request.getParameterMap());
//Step.2 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
List<JeecgOrderMainPage> pageList = new ArrayList<JeecgOrderMainPage>();
@@ -297,8 +283,8 @@ public class JeecgOrderMainController {
}
return Result.ok("文件导入成功！");
} catch (Exception e) {
- log.error(e.toString());
- return Result.ok("文件导入失败！");
+ log.error(e.getMessage(),e);
+ return Result.error("文件导入失败："+e.getMessage());
} finally {
try {
file.getInputStream().close();
@@ -307,7 +293,7 @@ public class JeecgOrderMainController {
}
}
}
- return Result.ok("文件导入失败！");
+ return Result.error("文件导入失败！");
}
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/message/controller/SysMessageController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java
index 5942cb0..7482e4b 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/controller/SysMessageController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java
@@ -1,68 +1,76 @@
-package org.jeecg.modules.message.controller;
+package org.jeecg.modules.demo.test.controller;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.message.entity.SysMessage;
-import org.jeecg.modules.message.service.ISysMessageService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
+import org.jeecg.modules.demo.test.entity.JoaDemo;
+import org.jeecg.modules.demo.test.service.IJoaDemoService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
+
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import lombok.extern.slf4j.Slf4j;
/**
- * @Title: Controller
- * @Description: 消息
- * @author： jeecg-boot
- * @date： 2019-04-09
- * @version： V1.0
+ * @Description: 流程测试
+ * @Author: jeecg-boot
+ * @Date: 2019-05-14
+ * @Version: V1.0
*/
@RestController
-@RequestMapping("/message/sysMessage")
+@RequestMapping("/test/joaDemo")
@Slf4j
-public class SysMessageController {
+public class JoaDemoController {
@Autowired
- private ISysMessageService sysMessageService;
+ private IJoaDemoService joaDemoService;
/**
* 分页列表查询
- * @param sysMessage
+ * @param joaDemo
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@GetMapping(value = "/list")
- public Result<IPage<SysMessage>> queryPageList(SysMessage sysMessage,
+ public Result<IPage<JoaDemo>> queryPageList(JoaDemo joaDemo,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
- Result<IPage<SysMessage>> result = new Result<IPage<SysMessage>>();
- QueryWrapper<SysMessage> queryWrapper = QueryGenerator.initQueryWrapper(sysMessage, req.getParameterMap());
- Page<SysMessage> page = new Page<SysMessage>(pageNo, pageSize);
- IPage<SysMessage> pageList = sysMessageService.page(page, queryWrapper);
+ Result<IPage<JoaDemo>> result = new Result<IPage<JoaDemo>>();
+ QueryWrapper<JoaDemo> queryWrapper = QueryGenerator.initQueryWrapper(joaDemo, req.getParameterMap());
+ Page<JoaDemo> page = new Page<JoaDemo>(pageNo, pageSize);
+ IPage<JoaDemo> pageList = joaDemoService.page(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
return result;
@@ -70,18 +78,17 @@ public class SysMessageController {
/**
* 添加
- * @param sysMessage
+ * @param joaDemo
* @return
*/
@PostMapping(value = "/add")
- public Result<SysMessage> add(@RequestBody SysMessage sysMessage) {
- Result<SysMessage> result = new Result<SysMessage>();
+ public Result<JoaDemo> add(@RequestBody JoaDemo joaDemo) {
+ Result<JoaDemo> result = new Result<JoaDemo>();
try {
- sysMessageService.save(sysMessage);
+ joaDemoService.save(joaDemo);
result.success("添加成功！");
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.error(e.getMessage(),e);
result.error500("操作失败");
}
return result;
@@ -89,17 +96,17 @@ public class SysMessageController {
/**
* 编辑
- * @param sysMessage
+ * @param joaDemo
* @return
*/
@PutMapping(value = "/edit")
- public Result<SysMessage> edit(@RequestBody SysMessage sysMessage) {
- Result<SysMessage> result = new Result<SysMessage>();
- SysMessage sysMessageEntity = sysMessageService.getById(sysMessage.getId());
- if(sysMessageEntity==null) {
+ public Result<JoaDemo> edit(@RequestBody JoaDemo joaDemo) {
+ Result<JoaDemo> result = new Result<JoaDemo>();
+ JoaDemo joaDemoEntity = joaDemoService.getById(joaDemo.getId());
+ if(joaDemoEntity==null) {
result.error500("未找到对应实体");
}else {
- boolean ok = sysMessageService.updateById(sysMessage);
+ boolean ok = joaDemoService.updateById(joaDemo);
//TODO 返回false说明什么？
if(ok) {
result.success("修改成功!");
@@ -115,13 +122,13 @@ public class SysMessageController {
* @return
*/
@DeleteMapping(value = "/delete")
- public Result<SysMessage> delete(@RequestParam(name="id",required=true) String id) {
- Result<SysMessage> result = new Result<SysMessage>();
- SysMessage sysMessage = sysMessageService.getById(id);
- if(sysMessage==null) {
+ public Result<JoaDemo> delete(@RequestParam(name="id",required=true) String id) {
+ Result<JoaDemo> result = new Result<JoaDemo>();
+ JoaDemo joaDemo = joaDemoService.getById(id);
+ if(joaDemo==null) {
result.error500("未找到对应实体");
}else {
- boolean ok = sysMessageService.removeById(id);
+ boolean ok = joaDemoService.removeById(id);
if(ok) {
result.success("删除成功!");
}
@@ -136,12 +143,12 @@ public class SysMessageController {
* @return
*/
@DeleteMapping(value = "/deleteBatch")
- public Result<SysMessage> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- Result<SysMessage> result = new Result<SysMessage>();
+ public Result<JoaDemo> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ Result<JoaDemo> result = new Result<JoaDemo>();
if(ids==null || "".equals(ids.trim())) {
result.error500("参数不识别！");
}else {
- this.sysMessageService.removeByIds(Arrays.asList(ids.split(",")));
+ this.joaDemoService.removeByIds(Arrays.asList(ids.split(",")));
result.success("删除成功!");
}
return result;
@@ -153,13 +160,13 @@ public class SysMessageController {
* @return
*/
@GetMapping(value = "/queryById")
- public Result<SysMessage> queryById(@RequestParam(name="id",required=true) String id) {
- Result<SysMessage> result = new Result<SysMessage>();
- SysMessage sysMessage = sysMessageService.getById(id);
- if(sysMessage==null) {
+ public Result<JoaDemo> queryById(@RequestParam(name="id",required=true) String id) {
+ Result<JoaDemo> result = new Result<JoaDemo>();
+ JoaDemo joaDemo = joaDemoService.getById(id);
+ if(joaDemo==null) {
result.error500("未找到对应实体");
}else {
- result.setResult(sysMessage);
+ result.setResult(joaDemo);
result.setSuccess(true);
}
return result;
@@ -174,13 +181,13 @@ public class SysMessageController {
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
// Step.1 组装查询条件
- QueryWrapper<SysMessage> queryWrapper = null;
+ QueryWrapper<JoaDemo> queryWrapper = null;
try {
String paramsStr = request.getParameter("paramsStr");
if (oConvertUtils.isNotEmpty(paramsStr)) {
String deString = URLDecoder.decode(paramsStr, "UTF-8");
- SysMessage sysMessage = JSON.parseObject(deString, SysMessage.class);
- queryWrapper = QueryGenerator.initQueryWrapper(sysMessage, request.getParameterMap());
+ JoaDemo joaDemo = JSON.parseObject(deString, JoaDemo.class);
+ queryWrapper = QueryGenerator.initQueryWrapper(joaDemo, request.getParameterMap());
}
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
@@ -188,11 +195,11 @@ public class SysMessageController {
//Step.2 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
- List<SysMessage> pageList = sysMessageService.list(queryWrapper);
+ List<JoaDemo> pageList = joaDemoService.list(queryWrapper);
//导出文件名称
- mv.addObject(NormalExcelConstants.FILE_NAME, "消息列表");
- mv.addObject(NormalExcelConstants.CLASS, SysMessage.class);
- mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("消息列表数据", "导出人:Jeecg", "导出信息"));
+ mv.addObject(NormalExcelConstants.FILE_NAME, "流程测试列表");
+ mv.addObject(NormalExcelConstants.CLASS, JoaDemo.class);
+ mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("流程测试列表数据", "导出人:Jeecg", "导出信息"));
mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
return mv;
}
@@ -215,14 +222,14 @@ public class SysMessageController {
params.setHeadRows(1);
params.setNeedSave(true);
try {
- List<SysMessage> listSysMessages = ExcelImportUtil.importExcel(file.getInputStream(), SysMessage.class, params);
- for (SysMessage sysMessageExcel : listSysMessages) {
- sysMessageService.save(sysMessageExcel);
+ List<JoaDemo> listJoaDemos = ExcelImportUtil.importExcel(file.getInputStream(), JoaDemo.class, params);
+ for (JoaDemo joaDemoExcel : listJoaDemos) {
+ joaDemoService.save(joaDemoExcel);
}
- return Result.ok("文件导入成功！数据行数：" + listSysMessages.size());
+ return Result.ok("文件导入成功！数据行数:" + listJoaDemos.size());
} catch (Exception e) {
- log.error(e.getMessage());
- return Result.error("文件导入失败！");
+ log.error(e.getMessage(),e);
+ return Result.error("文件导入失败:"+e.getMessage());
} finally {
try {
file.getInputStream().close();
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java
index 21d1d0a..0dde6d0 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java
@@ -1,73 +1,76 @@
package org.jeecg.modules.demo.test.entity;
-import java.io.Serializable;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
/**
* @Description: jeecg 测试demo
- * @author： jeecg-boot
- * @date： 2018-12-29
- * @version：V1.0
+ * @Author: jeecg-boot
+ * @Date: 2018-12-29
+ * @Version:V1.0
*/
@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="测试DEMO对象", description="测试DEMO")
@TableName("demo")
-public class JeecgDemo implements Serializable {
- private static final long serialVersionUID = 1L;
+public class JeecgDemo extends JeecgEntity {
- /** 主键ID */
- @TableId(type = IdType.UUID)
- private java.lang.String id;
+ /** 部门编码 */
+ @Excel(name="部门编码",width=25)
+ @ApiModelProperty(value = "部门编码")
+ private java.lang.String sysOrgCode;
/** 姓名 */
@Excel(name="姓名",width=25)
+ @ApiModelProperty(value = "姓名")
private java.lang.String name;
/** 关键词 */
+ @ApiModelProperty(value = "关键词")
@Excel(name="关键词",width=15)
private java.lang.String keyWord;
/** 打卡时间 */
+ @ApiModelProperty(value = "打卡时间")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name="打卡时间",width=20,format="yyyy-MM-dd HH:mm:ss")
private java.util.Date punchTime;
/** 工资 */
+ @ApiModelProperty(value = "工资",example = "0")
@Excel(name="工资",width=15)
private java.math.BigDecimal salaryMoney;
/** 奖金 */
+ @ApiModelProperty(value = "奖金",example = "0")
@Excel(name="奖金",width=15)
private java.lang.Double bonusMoney;
/** 性别 {男:1,女:2} */
+ @ApiModelProperty(value = "性别")
@Excel(name = "性别", width = 15, dicCode = "sex")
private java.lang.String sex;
/** 年龄 */
+ @ApiModelProperty(value = "年龄",example = "0")
@Excel(name="年龄",width=15)
private java.lang.Integer age;
/** 生日 */
+ @ApiModelProperty(value = "生日")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name="生日",format="yyyy-MM-dd")
private java.util.Date birthday;
/** 邮箱 */
+ @ApiModelProperty(value = "邮箱")
@Excel(name="邮箱",width=30)
private java.lang.String email;
/** 个人简介 */
+ @ApiModelProperty(value = "个人简介")
private java.lang.String content;
- /** createTime */
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private java.util.Date createTime;
- /** 创建人 */
- private String createBy;
- /** 更新人 */
- private String updateBy;
- /** 更新时间 */
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderCustomer.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderCustomer.java
index 7feef84..4e338b2 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderCustomer.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderCustomer.java
@@ -12,9 +12,9 @@ import org.springframework.format.annotation.DateTimeFormat;
/**
* @Description: 订单客户
- * @author： jeecg-boot
- * @date： 2019-02-15
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-02-15
+ * @Version: V1.0
*/
@Data
@TableName("jeecg_order_customer")
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderMain.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderMain.java
index 7c1fa63..67a759c 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderMain.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderMain.java
@@ -11,9 +11,9 @@ import org.springframework.format.annotation.DateTimeFormat;
/**
* @Description: 订单
- * @author： jeecg-boot
- * @date： 2019-02-15
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-02-15
+ * @Version: V1.0
*/
@Data
@TableName("jeecg_order_main")
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderTicket.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderTicket.java
index a1aa318..3218b7a 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderTicket.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderTicket.java
@@ -11,9 +11,9 @@ import org.springframework.format.annotation.DateTimeFormat;
/**
* @Description: 订单机票
- * @author： jeecg-boot
- * @date： 2019-02-15
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-02-15
+ * @Version: V1.0
*/
@Data
@TableName("jeecg_order_ticket")
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/entity/JoaDemo.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/entity/JoaDemo.java
new file mode 100644
index 0000000..ccd6089
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/entity/JoaDemo.java
@@ -0,0 +1,67 @@
+package org.jeecg.modules.demo.test.entity;
+
+import java.io.Serializable;
+
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+
+/**
+ * @Description: 流程测试
+ * @Author: jeecg-boot
+ * @Date: 2019-05-14
+ * @Version: V1.0
+ */
+@Data
+@TableName("joa_demo")
+public class JoaDemo implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**ID*/
+ @TableId(type = IdType.UUID)
+ private java.lang.String id;
+ /**请假人*/
+ @Excel(name = "请假人", width = 15)
+ private java.lang.String name;
+ /**请假天数*/
+ @Excel(name = "请假天数", width = 15)
+ private java.lang.Integer days;
+ /**开始时间*/
+ @Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ private java.util.Date beginDate;
+ /**请假结束时间*/
+ @Excel(name = "请假结束时间", width = 20, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ private java.util.Date endDate;
+ /**请假原因*/
+ @Excel(name = "请假原因", width = 15)
+ private java.lang.String reason;
+ /**流程状态*/
+ @Excel(name = "流程状态", width = 15)
+ private java.lang.String bpmStatus;
+ /**创建人id*/
+ @Excel(name = "创建人id", width = 15)
+ private java.lang.String createBy;
+ /**创建时间*/
+ @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private java.util.Date createTime;
+ /**修改时间*/
+ @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private java.util.Date updateTime;
+ /**修改人id*/
+ @Excel(name = "修改人id", width = 15)
+ private java.lang.String updateBy;
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgDemoMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgDemoMapper.java
index d50d563..7fc9485 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgDemoMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgDemoMapper.java
@@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: jeecg 测试demo
- * @author： jeecg-boot
- * @date： 2018-12-29
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2018-12-29
+ * @Version: V1.0
*/
public interface JeecgDemoMapper extends BaseMapper<JeecgDemo> {
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderCustomerMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderCustomerMapper.java
index f3ab0de..c454ef7 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderCustomerMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderCustomerMapper.java
@@ -10,9 +10,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 订单客户
- * @author： jeecg-boot
- * @date： 2019-02-15
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-02-15
+ * @Version: V1.0
*/
public interface JeecgOrderCustomerMapper extends BaseMapper<JeecgOrderCustomer> {
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderMainMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderMainMapper.java
index a47f53b..8c549d6 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderMainMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderMainMapper.java
@@ -8,9 +8,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 订单
- * @author： jeecg-boot
- * @date： 2019-02-15
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-02-15
+ * @Version: V1.0
*/
public interface JeecgOrderMainMapper extends BaseMapper<JeecgOrderMain> {
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderTicketMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderTicketMapper.java
index 0eb93ea..cee579d 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderTicketMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderTicketMapper.java
@@ -9,9 +9,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 订单机票
- * @author： jeecg-boot
- * @date： 2019-02-15
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-02-15
+ * @Version: V1.0
*/
public interface JeecgOrderTicketMapper extends BaseMapper<JeecgOrderTicket> {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/mapper/JoaDemoMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/mapper/JoaDemoMapper.java
new file mode 100644
index 0000000..6f93713
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/mapper/JoaDemoMapper.java
@@ -0,0 +1,15 @@
+package org.jeecg.modules.demo.test.mapper;
+
+import org.jeecg.modules.demo.test.entity.JoaDemo;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 流程测试
+ * @Author: jeecg-boot
+ * @Date: 2019-05-14
+ * @Version: V1.0
+ */
+public interface JoaDemoMapper extends BaseMapper<JoaDemo> {
+
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml
index 9f4fe89..9f4fe89 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderCustomerMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderCustomerMapper.xml
index 759b03f..759b03f 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderCustomerMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderCustomerMapper.xml
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderMainMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderMainMapper.xml
index ec2d056..ec2d056 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderMainMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderMainMapper.xml
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderTicketMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderTicketMapper.xml
index 46530bd..46530bd 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderTicketMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderTicketMapper.xml
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/xml/OnlCgreportItemMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JoaDemoMapper.xml
index 1148da9..b739701 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/xml/OnlCgreportItemMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JoaDemoMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.online.cgreport.mapper.OnlCgreportItemMapper">
+<mapper namespace="org.jeecg.modules.demo.test.mapper.JoaDemoMapper">
</mapper>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDemoService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDemoService.java
index ced19ea..54efa2b 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDemoService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDemoService.java
@@ -1,16 +1,16 @@
package org.jeecg.modules.demo.test.service;
+import org.jeecg.common.system.base.service.JeecgService;
import org.jeecg.modules.demo.test.entity.JeecgDemo;
-import com.baomidou.mybatisplus.extension.service.IService;
-
/**
* @Description: jeecg 测试demo
- * @author： jeecg-boot
- * @date： 2018-12-29
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2018-12-29
+ * @Version: V1.0
*/
-public interface IJeecgDemoService extends IService<JeecgDemo> {
+public interface IJeecgDemoService extends JeecgService<JeecgDemo> {
+
public void testTran();
public JeecgDemo getByIdCacheable(String id);
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderCustomerService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderCustomerService.java
index 70682fa..7248f7f 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderCustomerService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderCustomerService.java
@@ -8,9 +8,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 订单客户
- * @author： jeecg-boot
- * @date： 2019-02-15
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-02-15
+ * @Version: V1.0
*/
public interface IJeecgOrderCustomerService extends IService<JeecgOrderCustomer> {
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderMainService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderMainService.java
index bdd4c28..4b00bcd 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderMainService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderMainService.java
@@ -12,9 +12,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 订单
- * @author： jeecg-boot
- * @date： 2019-02-15
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-02-15
+ * @Version: V1.0
*/
public interface IJeecgOrderMainService extends IService<JeecgOrderMain> {
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderTicketService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderTicketService.java
index 11aa645..c40a214 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderTicketService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderTicketService.java
@@ -8,9 +8,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 订单机票
- * @author： jeecg-boot
- * @date： 2019-02-15
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-02-15
+ * @Version: V1.0
*/
public interface IJeecgOrderTicketService extends IService<JeecgOrderTicket> {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/IJoaDemoService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/IJoaDemoService.java
new file mode 100644
index 0000000..499c049
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/IJoaDemoService.java
@@ -0,0 +1,15 @@
+package org.jeecg.modules.demo.test.service;
+
+import org.jeecg.modules.demo.test.entity.JoaDemo;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 流程测试
+ * @Author: jeecg-boot
+ * @Date: 2019-05-14
+ * @Version: V1.0
+ */
+public interface IJoaDemoService extends IService<JoaDemo> {
+
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java
index cc4e5e8..33a1c7b 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.demo.test.service.impl;
+import org.jeecg.common.system.base.service.impl.JeecgServiceImpl;
import org.jeecg.modules.demo.test.entity.JeecgDemo;
import org.jeecg.modules.demo.test.mapper.JeecgDemoMapper;
import org.jeecg.modules.demo.test.service.IJeecgDemoService;
@@ -8,20 +9,17 @@ import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
/**
* @Description: jeecg 测试demo
- * @author： jeecg-boot
- * @date： 2018-12-29
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2018-12-29
+ * @Version: V1.0
*/
@Service
-public class JeecgDemoServiceImpl extends ServiceImpl<JeecgDemoMapper, JeecgDemo> implements IJeecgDemoService {
+public class JeecgDemoServiceImpl extends JeecgServiceImpl<JeecgDemoMapper, JeecgDemo> implements IJeecgDemoService {
@Autowired
JeecgDemoMapper jeecgDemoMapper;
-
/**
* 事务控制在service层面
* 加上注解：@Transactional，声明的方法就是一个独立的事务（有异常DB操作全部回滚）
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderCustomerServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderCustomerServiceImpl.java
index bb9931b..664f736 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderCustomerServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderCustomerServiceImpl.java
@@ -12,9 +12,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 订单客户
- * @author： jeecg-boot
- * @date： 2019-02-15
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-02-15
+ * @Version: V1.0
*/
@Service
public class JeecgOrderCustomerServiceImpl extends ServiceImpl<JeecgOrderCustomerMapper, JeecgOrderCustomer> implements IJeecgOrderCustomerService {
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java
index e8a43ee..f5a11df 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java
@@ -19,9 +19,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 订单
- * @author： jeecg-boot
- * @date： 2019-02-15
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-02-15
+ * @Version: V1.0
*/
@Service
public class JeecgOrderMainServiceImpl extends ServiceImpl<JeecgOrderMainMapper, JeecgOrderMain> implements IJeecgOrderMainService {
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderTicketServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderTicketServiceImpl.java
index af221cf..8d57c04 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderTicketServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderTicketServiceImpl.java
@@ -12,9 +12,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 订单机票
- * @author： jeecg-boot
- * @date： 2019-02-15
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-02-15
+ * @Version: V1.0
*/
@Service
public class JeecgOrderTicketServiceImpl extends ServiceImpl<JeecgOrderTicketMapper, JeecgOrderTicket> implements IJeecgOrderTicketService {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/impl/JoaDemoServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/impl/JoaDemoServiceImpl.java
new file mode 100644
index 0000000..22ee115
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/service/impl/JoaDemoServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.demo.test.service.impl;
+
+import org.jeecg.modules.demo.test.entity.JoaDemo;
+import org.jeecg.modules.demo.test.mapper.JoaDemoMapper;
+import org.jeecg.modules.demo.test.service.IJoaDemoService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 流程测试
+ * @Author: jeecg-boot
+ * @Date: 2019-05-14
+ * @Version: V1.0
+ */
+@Service
+public class JoaDemoServiceImpl extends ServiceImpl<JoaDemoMapper, JoaDemo> implements IJoaDemoService {
+
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/vo/JeecgOrderMainPage.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/vo/JeecgOrderMainPage.java
index eb309ed..eb309ed 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/test/vo/JeecgOrderMainPage.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/vo/JeecgOrderMainPage.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportItemController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/controller/SysMessageController.java
index 701f5e2..d28adf1 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportItemController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/controller/SysMessageController.java
@@ -1,15 +1,16 @@
-package org.jeecg.modules.online.cgreport.controller;
+package org.jeecg.modules.message.controller;
import java.util.Arrays;
-import java.util.List;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.poi.ss.formula.functions.T;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.online.cgreport.entity.OnlCgreportItem;
-import org.jeecg.modules.online.cgreport.service.IOnlCgreportItemService;
+import org.jeecg.modules.message.entity.SysMessage;
+import org.jeecg.modules.message.service.ISysMessageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -27,52 +29,34 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
/**
- * @Title: Controller
- * @Description: 在线报表配置
+ * @Description: 消息
* @author: jeecg-boot
- * @date: 2019-03-08
+ * @date: 2019-04-09
* @version: V1.0
*/
-@RestController
-@RequestMapping("/online/cgreport/item")
@Slf4j
-public class OnlCgreportItemController {
-
+@RestController
+@RequestMapping("/message/sysMessage")
+public class SysMessageController extends JeecgController<SysMessage, ISysMessageService> {
@Autowired
- private IOnlCgreportItemService onlCgreportItemService;
-
- /**
- * 根据 headId 查询出 所有的 item
- */
- @GetMapping(value = "/listByHeadId")
- public Result<?> queryPageListByHeadId(String headId) {
-
- QueryWrapper<OnlCgreportItem> queryWrapper = new QueryWrapper<OnlCgreportItem>();
- queryWrapper.eq("cgrhead_id", headId);
- queryWrapper.orderByAsc("order_num");
- List<OnlCgreportItem> list = onlCgreportItemService.list(queryWrapper);
-
- Result<List<OnlCgreportItem>> result = new Result<List<OnlCgreportItem>>();
- result.setSuccess(true);
- result.setResult(list);
- return result;
- }
+ private ISysMessageService sysMessageService;
/**
* 分页列表查询
*
- * @param onlCgreportItem
+ * @param sysMessage
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@GetMapping(value = "/list")
- public Result<IPage<OnlCgreportItem>> queryPageList(OnlCgreportItem onlCgreportItem, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
- Result<IPage<OnlCgreportItem>> result = new Result<IPage<OnlCgreportItem>>();
- QueryWrapper<OnlCgreportItem> queryWrapper = QueryGenerator.initQueryWrapper(onlCgreportItem, req.getParameterMap());
- Page<OnlCgreportItem> page = new Page<OnlCgreportItem>(pageNo, pageSize);
- IPage<OnlCgreportItem> pageList = onlCgreportItemService.page(page, queryWrapper);
+ public Result<IPage<SysMessage>> queryPageList(SysMessage sysMessage, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ Result<IPage<SysMessage>> result = new Result<IPage<SysMessage>>();
+ QueryWrapper<SysMessage> queryWrapper = QueryGenerator.initQueryWrapper(sysMessage, req.getParameterMap());
+ Page<SysMessage> page = new Page<SysMessage>(pageNo, pageSize);
+ IPage<SysMessage> pageList = sysMessageService.page(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
return result;
@@ -81,18 +65,17 @@ public class OnlCgreportItemController {
/**
* 添加
*
- * @param onlCgreportItem
+ * @param sysMessage
* @return
*/
@PostMapping(value = "/add")
- public Result<OnlCgreportItem> add(@RequestBody OnlCgreportItem onlCgreportItem) {
- Result<OnlCgreportItem> result = new Result<OnlCgreportItem>();
+ public Result<T> add(@RequestBody SysMessage sysMessage) {
+ Result<T> result = new Result<T>();
try {
- onlCgreportItemService.save(onlCgreportItem);
+ sysMessageService.save(sysMessage);
result.success("添加成功！");
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.info(e.getMessage(), e);
result.error500("操作失败");
}
return result;
@@ -101,23 +84,23 @@ public class OnlCgreportItemController {
/**
* 编辑
*
- * @param onlCgreportItem
+ * @param sysMessage
* @return
*/
@PutMapping(value = "/edit")
- public Result<OnlCgreportItem> edit(@RequestBody OnlCgreportItem onlCgreportItem) {
- Result<OnlCgreportItem> result = new Result<OnlCgreportItem>();
- OnlCgreportItem onlCgreportItemEntity = onlCgreportItemService.getById(onlCgreportItem.getId());
- if (onlCgreportItemEntity == null) {
+ public Result<T> edit(@RequestBody SysMessage sysMessage) {
+ Result<T> result = new Result<T>();
+ SysMessage sysMessageEntity = sysMessageService.getById(sysMessage.getId());
+ if (sysMessageEntity == null) {
result.error500("未找到对应实体");
} else {
- boolean ok = onlCgreportItemService.updateById(onlCgreportItem);
- // TODO 返回false说明什么？
+ boolean ok = sysMessageService.updateById(sysMessage);
if (ok) {
result.success("修改成功!");
+ } else {
+ result.error500("修改失败!");
}
}
-
return result;
}
@@ -128,18 +111,17 @@ public class OnlCgreportItemController {
* @return
*/
@DeleteMapping(value = "/delete")
- public Result<OnlCgreportItem> delete(@RequestParam(name = "id", required = true) String id) {
- Result<OnlCgreportItem> result = new Result<OnlCgreportItem>();
- OnlCgreportItem onlCgreportItem = onlCgreportItemService.getById(id);
- if (onlCgreportItem == null) {
+ public Result<T> delete(@RequestParam(name = "id", required = true) String id) {
+ Result<T> result = new Result<T>();
+ SysMessage sysMessage = sysMessageService.getById(id);
+ if (sysMessage == null) {
result.error500("未找到对应实体");
} else {
- boolean ok = onlCgreportItemService.removeById(id);
+ boolean ok = sysMessageService.removeById(id);
if (ok) {
result.success("删除成功!");
}
}
-
return result;
}
@@ -150,12 +132,12 @@ public class OnlCgreportItemController {
* @return
*/
@DeleteMapping(value = "/deleteBatch")
- public Result<OnlCgreportItem> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
- Result<OnlCgreportItem> result = new Result<OnlCgreportItem>();
+ public Result<T> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ Result<T> result = new Result<T>();
if (ids == null || "".equals(ids.trim())) {
- result.error500("参数不识别！");
+ result.error500("ids参数不允许为空！");
} else {
- this.onlCgreportItemService.removeByIds(Arrays.asList(ids.split(",")));
+ this.sysMessageService.removeByIds(Arrays.asList(ids.split(",")));
result.success("删除成功!");
}
return result;
@@ -168,16 +150,39 @@ public class OnlCgreportItemController {
* @return
*/
@GetMapping(value = "/queryById")
- public Result<OnlCgreportItem> queryById(@RequestParam(name = "id", required = true) String id) {
- Result<OnlCgreportItem> result = new Result<OnlCgreportItem>();
- OnlCgreportItem onlCgreportItem = onlCgreportItemService.getById(id);
- if (onlCgreportItem == null) {
+ public Result<SysMessage> queryById(@RequestParam(name = "id", required = true) String id) {
+ Result<SysMessage> result = new Result<SysMessage>();
+ SysMessage sysMessage = sysMessageService.getById(id);
+ if (sysMessage == null) {
result.error500("未找到对应实体");
} else {
- result.setResult(onlCgreportItem);
+ result.setResult(sysMessage);
result.setSuccess(true);
}
return result;
}
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param response
+ */
+ @GetMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, SysMessage sysMessage) {
+ return super.exportXls(request,sysMessage,SysMessage.class, "推送消息模板");
+ }
+
+ /**
+ * excel导入
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @PostMapping(value = "/importExcel")
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, SysMessage.class);
+ }
+
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/message/controller/SysMessageTemplateController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/controller/SysMessageTemplateController.java
index e09df7b..593b374 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/controller/SysMessageTemplateController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/controller/SysMessageTemplateController.java
@@ -1,62 +1,55 @@
package org.jeecg.modules.message.controller;
import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import org.apache.poi.ss.formula.functions.T;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.message.entity.MsgParams;
-import org.jeecg.modules.message.entity.SysMessage;
import org.jeecg.modules.message.entity.SysMessageTemplate;
-import org.jeecg.modules.message.service.ISysMessageService;
import org.jeecg.modules.message.service.ISysMessageTemplateService;
import org.jeecg.modules.message.util.PushMsgUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
+import lombok.extern.slf4j.Slf4j;
- /**
- * @Title: Controller
+/**
* @Description: 消息模板
- * @author： jeecg-boot
- * @date： 2019-04-09
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Sate: 2019-04-09
+ * @Version: V1.0
*/
+@Slf4j
@RestController
@RequestMapping("/message/sysMessageTemplate")
-@Slf4j
-public class SysMessageTemplateController {
+public class SysMessageTemplateController extends JeecgController<SysMessageTemplate, ISysMessageTemplateService> {
@Autowired
private ISysMessageTemplateService sysMessageTemplateService;
@Autowired
- private ISysMessageService sysMessageService;
- @Autowired
private PushMsgUtil pushMsgUtil;
-
+
/**
- * 分页列表查询
+ * 分页列表查询
+ *
* @param sysMessageTemplate
* @param pageNo
* @param pageSize
@@ -64,10 +57,8 @@ public class SysMessageTemplateController {
* @return
*/
@GetMapping(value = "/list")
- public Result<IPage<SysMessageTemplate>> queryPageList(SysMessageTemplate sysMessageTemplate,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
+ public Result<IPage<SysMessageTemplate>> queryPageList(SysMessageTemplate sysMessageTemplate, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
Result<IPage<SysMessageTemplate>> result = new Result<IPage<SysMessageTemplate>>();
QueryWrapper<SysMessageTemplate> queryWrapper = QueryGenerator.initQueryWrapper(sysMessageTemplate, req.getParameterMap());
Page<SysMessageTemplate> page = new Page<SysMessageTemplate>(pageNo, pageSize);
@@ -76,173 +67,132 @@ public class SysMessageTemplateController {
result.setResult(pageList);
return result;
}
-
+
/**
- * 添加
+ * 添加
+ *
* @param sysMessageTemplate
* @return
*/
@PostMapping(value = "/add")
- public Result<SysMessageTemplate> add(@RequestBody SysMessageTemplate sysMessageTemplate) {
- Result<SysMessageTemplate> result = new Result<SysMessageTemplate>();
+ public Result<T> add(@RequestBody SysMessageTemplate sysMessageTemplate) {
+ Result<T> result = new Result<T>();
try {
sysMessageTemplateService.save(sysMessageTemplate);
result.success("添加成功！");
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.info(e.getMessage(), e);
result.error500("操作失败");
}
return result;
}
-
+
/**
- * 编辑
+ * 编辑
+ *
* @param sysMessageTemplate
* @return
*/
@PutMapping(value = "/edit")
- public Result<SysMessageTemplate> edit(@RequestBody SysMessageTemplate sysMessageTemplate) {
- Result<SysMessageTemplate> result = new Result<SysMessageTemplate>();
+ public Result<T> edit(@RequestBody SysMessageTemplate sysMessageTemplate) {
+ Result<T> result = new Result<T>();
SysMessageTemplate sysMessageTemplateEntity = sysMessageTemplateService.getById(sysMessageTemplate.getId());
- if(sysMessageTemplateEntity==null) {
+ if (sysMessageTemplateEntity == null) {
result.error500("未找到对应实体");
- }else {
+ } else {
boolean ok = sysMessageTemplateService.updateById(sysMessageTemplate);
- //TODO 返回false说明什么？
- if(ok) {
+ if (ok) {
result.success("修改成功!");
+ } else {
+ result.error500("修改失败!");
}
}
-
+
return result;
}
-
+
/**
- * 通过id删除
+ * 通过id删除
+ *
* @param id
* @return
*/
@DeleteMapping(value = "/delete")
- public Result<SysMessageTemplate> delete(@RequestParam(name="id",required=true) String id) {
- Result<SysMessageTemplate> result = new Result<SysMessageTemplate>();
+ public Result<T> delete(@RequestParam(name = "id", required = true) String id) {
+ Result<T> result = new Result<T>();
SysMessageTemplate sysMessageTemplate = sysMessageTemplateService.getById(id);
- if(sysMessageTemplate==null) {
+ if (sysMessageTemplate == null) {
result.error500("未找到对应实体");
- }else {
+ } else {
boolean ok = sysMessageTemplateService.removeById(id);
- if(ok) {
+ if (ok) {
result.success("删除成功!");
}
}
-
+
return result;
}
-
+
/**
- * 批量删除
+ * 批量删除
+ *
* @param ids
* @return
*/
@DeleteMapping(value = "/deleteBatch")
- public Result<SysMessageTemplate> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- Result<SysMessageTemplate> result = new Result<SysMessageTemplate>();
- if(ids==null || "".equals(ids.trim())) {
- result.error500("参数不识别！");
- }else {
+ public Result<T> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ Result<T> result = new Result<T>();
+ if (ids == null || "".equals(ids.trim())) {
+ result.error500("ids参数不允许为空！");
+ } else {
this.sysMessageTemplateService.removeByIds(Arrays.asList(ids.split(",")));
result.success("删除成功!");
}
return result;
}
-
+
/**
- * 通过id查询
+ * 通过id查询
+ *
* @param id
* @return
*/
@GetMapping(value = "/queryById")
- public Result<SysMessageTemplate> queryById(@RequestParam(name="id",required=true) String id) {
+ public Result<SysMessageTemplate> queryById(@RequestParam(name = "id", required = true) String id) {
Result<SysMessageTemplate> result = new Result<SysMessageTemplate>();
SysMessageTemplate sysMessageTemplate = sysMessageTemplateService.getById(id);
- if(sysMessageTemplate==null) {
+ if (sysMessageTemplate == null) {
result.error500("未找到对应实体");
- }else {
+ } else {
result.setResult(sysMessageTemplate);
result.setSuccess(true);
}
return result;
}
- /**
- * 导出excel
- *
- * @param request
- * @param response
- */
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
- // Step.1 组装查询条件
- QueryWrapper<SysMessageTemplate> queryWrapper = null;
- try {
- String paramsStr = request.getParameter("paramsStr");
- if (oConvertUtils.isNotEmpty(paramsStr)) {
- String deString = URLDecoder.decode(paramsStr, "UTF-8");
- SysMessageTemplate sysMessageTemplate = JSON.parseObject(deString, SysMessageTemplate.class);
- queryWrapper = QueryGenerator.initQueryWrapper(sysMessageTemplate, request.getParameterMap());
- }
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param response
+ */
+ @GetMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request,SysMessageTemplate sysMessageTemplate) {
+ return super.exportXls(request, sysMessageTemplate, SysMessageTemplate.class,"推送消息模板");
+ }
- //Step.2 AutoPoi 导出Excel
- ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
- List<SysMessageTemplate> pageList = sysMessageTemplateService.list(queryWrapper);
- //导出文件名称
- mv.addObject(NormalExcelConstants.FILE_NAME, "消息模板列表");
- mv.addObject(NormalExcelConstants.CLASS, SysMessageTemplate.class);
- mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("消息模板列表数据", "导出人:Jeecg", "导出信息"));
- mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
- return mv;
- }
+ /**
+ * excel导入
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @PostMapping(value = "/importExcel")
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, SysMessageTemplate.class);
+ }
- /**
- * 通过excel导入数据
- *
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
- Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
- for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
- MultipartFile file = entity.getValue();// 获取上传文件对象
- ImportParams params = new ImportParams();
- params.setTitleRows(2);
- params.setHeadRows(1);
- params.setNeedSave(true);
- try {
- List<SysMessageTemplate> listSysMessageTemplates = ExcelImportUtil.importExcel(file.getInputStream(), SysMessageTemplate.class, params);
- for (SysMessageTemplate sysMessageTemplateExcel : listSysMessageTemplates) {
- sysMessageTemplateService.save(sysMessageTemplateExcel);
- }
- return Result.ok("文件导入成功！数据行数：" + listSysMessageTemplates.size());
- } catch (Exception e) {
- log.error(e.getMessage());
- return Result.error("文件导入失败！");
- } finally {
- try {
- file.getInputStream().close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- return Result.ok("文件导入失败！");
- }
-
/**
* 发送消息
*/
@@ -256,8 +206,7 @@ public class SysMessageTemplateController {
result.error500("解析Json出错！");
return result;
}
- boolean is_sendSuccess = pushMsgUtil.sendMessage(msgParams.getMsgType(), msgParams.getTemplateCode(), map,
- msgParams.getReceiver());
+ boolean is_sendSuccess = pushMsgUtil.sendMessage(msgParams.getMsgType(), msgParams.getTemplateCode(), map, msgParams.getReceiver());
if (is_sendSuccess)
result.success("发送消息任务添加成功！");
else
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/message/entity/MsgParams.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/entity/MsgParams.java
index a640742..a640742 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/entity/MsgParams.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/entity/MsgParams.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/message/entity/SysMessage.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/entity/SysMessage.java
index 3115172..bad1c85 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/entity/SysMessage.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/entity/SysMessage.java
@@ -1,34 +1,28 @@
package org.jeecg.modules.message.entity;
-import java.io.Serializable;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
/**
* @Description: 消息
- * @author： jeecg-boot
- * @date： 2019-04-09
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-04-09
+ * @Version: V1.0
*/
@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
@TableName("sys_sms")
-public class SysMessage implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**创建人登录名称*/
- @Excel(name = "创建人登录名称", width = 15)
- private java.lang.String createBy;
- /**创建日期*/
- @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private java.util.Date createTime;
+public class SysMessage extends JeecgEntity {
/**推送内容*/
@Excel(name = "推送内容", width = 15)
private java.lang.Object esContent;
@@ -46,6 +40,7 @@ public class SysMessage implements Serializable {
private java.lang.Integer esSendNum;
/**推送状态 0未推送 1推送成功 2推送失败*/
@Excel(name = "推送状态 0未推送 1推送成功 2推送失败", width = 15)
+ @Dict(dicCode = "msgSendStatus")
private java.lang.String esSendStatus;
/**推送时间*/
@Excel(name = "推送时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@@ -57,19 +52,9 @@ public class SysMessage implements Serializable {
private java.lang.String esTitle;
/**推送方式：1短信 2邮件 3微信*/
@Excel(name = "推送方式：1短信 2邮件 3微信", width = 15)
+ @Dict(dicCode = "msgType")
private java.lang.String esType;
- /**ID*/
- @TableId(type = IdType.UUID)
- private java.lang.String id;
/**备注*/
@Excel(name = "备注", width = 15)
private java.lang.String remark;
- /**更新人登录名称*/
- @Excel(name = "更新人登录名称", width = 15)
- private java.lang.String updateBy;
- /**更新日期*/
- @Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private java.util.Date updateTime;
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/message/entity/SysMessageTemplate.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/entity/SysMessageTemplate.java
index 7f29ee5..929937a 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/entity/SysMessageTemplate.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/entity/SysMessageTemplate.java
@@ -1,58 +1,38 @@
package org.jeecg.modules.message.entity;
-import java.io.Serializable;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
import com.baomidou.mybatisplus.annotation.TableName;
+
import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
/**
* @Description: 消息模板
- * @author： jeecg-boot
- * @date： 2019-04-09
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-04-09
+ * @Version: V1.0
*/
@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
@TableName("sys_sms_template")
-public class SysMessageTemplate implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**主键*/
- @TableId(type = IdType.UUID)
- private java.lang.String id;
+public class SysMessageTemplate extends JeecgEntity{
/**模板CODE*/
@Excel(name = "模板CODE", width = 15)
private java.lang.String templateCode;
- /**模板内容*/
- @Excel(name = "模板内容", width = 15)
- private java.lang.String templateContent;
/**模板标题*/
- @Excel(name = "模板标题", width = 15)
+ @Excel(name = "模板标题", width = 30)
private java.lang.String templateName;
+ /**模板内容*/
+ @Excel(name = "模板内容", width = 50)
+ private java.lang.String templateContent;
/**模板测试json*/
@Excel(name = "模板测试json", width = 15)
private java.lang.String templateTestJson;
/**模板类型*/
@Excel(name = "模板类型", width = 15)
private java.lang.String templateType;
- /**创建人登录名称*/
- @Excel(name = "创建人登录名称", width = 15)
- private java.lang.String createBy;
- /**创建日期*/
- @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private java.util.Date createTime;
- /**更新人登录名称*/
- @Excel(name = "更新人登录名称", width = 15)
- private java.lang.String updateBy;
- /**更新日期*/
- @Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private java.util.Date updateTime;
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/ISendMsgHandle.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/ISendMsgHandle.java
index 87a2e18..87a2e18 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/ISendMsgHandle.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/ISendMsgHandle.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgStatusEnum.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgStatusEnum.java
index 5b062b1..5b062b1 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgStatusEnum.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgStatusEnum.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgTypeEnum.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgTypeEnum.java
index bf86d5f..bf86d5f 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgTypeEnum.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgTypeEnum.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.java
index 6d5b5fd..6d5b5fd 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/impl/SmsSendMsgHandle.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/impl/SmsSendMsgHandle.java
index a85266f..a85266f 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/impl/SmsSendMsgHandle.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/impl/SmsSendMsgHandle.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/impl/WxSendMsgHandle.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/impl/WxSendMsgHandle.java
index a6601cd..a6601cd 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/handle/impl/WxSendMsgHandle.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/impl/WxSendMsgHandle.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/message/job/SendMsgJob.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/job/SendMsgJob.java
index 7ae76cb..807fa2f 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/job/SendMsgJob.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/job/SendMsgJob.java
@@ -50,7 +50,7 @@ public class SendMsgJob implements Job {
sendMsgHandle = (ISendMsgHandle) Class.forName(SendMsgTypeEnum.WX.getImplClass()).newInstance();
}
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e.getMessage(),e);
}
Integer sendNum = sysMessage.getEsSendNum();
try {
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/message/mapper/SysMessageMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/mapper/SysMessageMapper.java
index 1e19b58..100d35e 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/mapper/SysMessageMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/mapper/SysMessageMapper.java
@@ -8,9 +8,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 消息
- * @author： jeecg-boot
- * @date： 2019-04-09
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-04-09
+ * @Version: V1.0
*/
public interface SysMessageMapper extends BaseMapper<SysMessage> {
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/message/mapper/SysMessageTemplateMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/mapper/SysMessageTemplateMapper.java
index 27fd3b4..fd0c650 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/mapper/SysMessageTemplateMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/mapper/SysMessageTemplateMapper.java
@@ -8,9 +8,9 @@ import java.util.List;
/**
* @Description: 消息模板
- * @author： jeecg-boot
- * @date： 2019-04-09
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-04-09
+ * @Version: V1.0
*/
public interface SysMessageTemplateMapper extends BaseMapper<SysMessageTemplate> {
@Select("SELECT * FROM SYS_SMS_TEMPLATE WHERE TEMPLATE_CODE = #{code}")
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/message/mapper/xml/SysMessageMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/mapper/xml/SysMessageMapper.xml
index a07a19a..a07a19a 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/mapper/xml/SysMessageMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/mapper/xml/SysMessageMapper.xml
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/message/mapper/xml/SysMessageTemplateMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/mapper/xml/SysMessageTemplateMapper.xml
index e3a0006..e3a0006 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/mapper/xml/SysMessageTemplateMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/mapper/xml/SysMessageTemplateMapper.xml
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/message/service/ISysMessageService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/service/ISysMessageService.java
index 89dfd3b..744f35e 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/service/ISysMessageService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/service/ISysMessageService.java
@@ -1,14 +1,14 @@
package org.jeecg.modules.message.service;
+import org.jeecg.common.system.base.service.JeecgService;
import org.jeecg.modules.message.entity.SysMessage;
-import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 消息
- * @author： jeecg-boot
- * @date： 2019-04-09
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-04-09
+ * @Version: V1.0
*/
-public interface ISysMessageService extends IService<SysMessage> {
+public interface ISysMessageService extends JeecgService<SysMessage> {
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/message/service/ISysMessageTemplateService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/service/ISysMessageTemplateService.java
index 1440691..d81c5e6 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/service/ISysMessageTemplateService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/service/ISysMessageTemplateService.java
@@ -1,16 +1,16 @@
package org.jeecg.modules.message.service;
-import org.jeecg.modules.message.entity.SysMessageTemplate;
-import com.baomidou.mybatisplus.extension.service.IService;
-
import java.util.List;
+import org.jeecg.common.system.base.service.JeecgService;
+import org.jeecg.modules.message.entity.SysMessageTemplate;
+
/**
* @Description: 消息模板
- * @author： jeecg-boot
- * @date： 2019-04-09
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-04-09
+ * @Version: V1.0
*/
-public interface ISysMessageTemplateService extends IService<SysMessageTemplate> {
+public interface ISysMessageTemplateService extends JeecgService<SysMessageTemplate> {
List<SysMessageTemplate> selectByCode(String code);
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/message/service/impl/SysMessageServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/service/impl/SysMessageServiceImpl.java
index ca7a0ad..ff836a5 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/service/impl/SysMessageServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/service/impl/SysMessageServiceImpl.java
@@ -1,19 +1,18 @@
package org.jeecg.modules.message.service.impl;
+import org.jeecg.common.system.base.service.impl.JeecgServiceImpl;
import org.jeecg.modules.message.entity.SysMessage;
import org.jeecg.modules.message.mapper.SysMessageMapper;
import org.jeecg.modules.message.service.ISysMessageService;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
/**
* @Description: 消息
- * @author： jeecg-boot
- * @date： 2019-04-09
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-04-09
+ * @Version: V1.0
*/
@Service
-public class SysMessageServiceImpl extends ServiceImpl<SysMessageMapper, SysMessage> implements ISysMessageService {
+public class SysMessageServiceImpl extends JeecgServiceImpl<SysMessageMapper, SysMessage> implements ISysMessageService {
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/message/service/impl/SysMessageTemplateServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/service/impl/SysMessageTemplateServiceImpl.java
index 0cf1f29..7bce592 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/service/impl/SysMessageTemplateServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/service/impl/SysMessageTemplateServiceImpl.java
@@ -1,22 +1,21 @@
package org.jeecg.modules.message.service.impl;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.system.base.service.impl.JeecgServiceImpl;
import org.jeecg.modules.message.entity.SysMessageTemplate;
import org.jeecg.modules.message.mapper.SysMessageTemplateMapper;
import org.jeecg.modules.message.service.ISysMessageTemplateService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
import java.util.List;
/**
* @Description: 消息模板
- * @author： jeecg-boot
- * @date： 2019-04-09
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-04-09
+ * @Version: V1.0
*/
@Service
-public class SysMessageTemplateServiceImpl extends ServiceImpl<SysMessageTemplateMapper, SysMessageTemplate> implements ISysMessageTemplateService {
+public class SysMessageTemplateServiceImpl extends JeecgServiceImpl<SysMessageTemplateMapper, SysMessageTemplate> implements ISysMessageTemplateService {
@Autowired
private SysMessageTemplateMapper sysMessageTemplateMapper;
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/message/util/PushMsgUtil.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/util/PushMsgUtil.java
index e907992..f5f63d4 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/message/util/PushMsgUtil.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/util/PushMsgUtil.java
@@ -44,10 +44,12 @@ public class PushMsgUtil {
String title = sysSmsTemplate.getTemplateName();
//模板内容
String content = sysSmsTemplate.getTemplateContent();
- for (Map.Entry<String, String> entry : map.entrySet()) {
- String str = "${" + entry.getKey() + "}";
- title = title.replace(str, entry.getValue());
- content = content.replace(str, entry.getValue());
+ if(map!=null) {
+ for (Map.Entry<String, String> entry : map.entrySet()) {
+ String str = "${" + entry.getKey() + "}";
+ title = title.replace(str, entry.getValue());
+ content = content.replace(str, entry.getValue());
+ }
}
sysMessage.setEsTitle(title);
sysMessage.setEsContent(content);
@@ -55,8 +57,9 @@ public class PushMsgUtil {
sysMessage.setEsSendTime(new Date());
sysMessage.setEsSendStatus(SendMsgStatusEnum.WAIT.getCode());
sysMessage.setEsSendNum(0);
- if(sysMessageService.save(sysMessage))
- return true;
+ if(sysMessageService.save(sysMessage)) {
+ return true;
+ }
}
return false;
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/monitor/controller/RedisController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/monitor/controller/ActuatorRedisController.java
index bb9cc9c..618d2cf 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/monitor/controller/RedisController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/monitor/controller/ActuatorRedisController.java
@@ -1,12 +1,18 @@
package org.jeecg.modules.monitor.controller;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.swing.filechooser.FileSystemView;
+
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.monitor.domain.RedisInfo;
import org.jeecg.modules.monitor.service.RedisService;
-import org.jeecg.modules.system.controller.LoginController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,10 +20,10 @@ import org.springframework.web.bind.annotation.RestController;
import lombok.extern.slf4j.Slf4j;
-@RestController
-@RequestMapping("redis")
@Slf4j
-public class RedisController {
+@RestController
+@RequestMapping("/actuator/redis")
+public class ActuatorRedisController {
@Autowired
private RedisService redisService;
@@ -27,20 +33,59 @@ public class RedisController {
* @return
* @throws Exception
*/
- @GetMapping("info")
+ @GetMapping("/info")
public Result<?> getRedisInfo() throws Exception {
List<RedisInfo> infoList = this.redisService.getRedisInfo();
log.info(infoList.toString());
return Result.ok(infoList);
}
- @GetMapping("keysSize")
+ @GetMapping("/keysSize")
public Map<String, Object> getKeysSize() throws Exception {
return redisService.getKeysSize();
}
- @GetMapping("memoryInfo")
+ @GetMapping("/memoryInfo")
public Map<String, Object> getMemoryInfo() throws Exception {
return redisService.getMemoryInfo();
}
+
+ //update-begin--Author:zhangweijian Date:20190425 for：获取磁盘信息
+ /**
+ * @功能：获取磁盘信息
+ * @param request
+ * @param response
+ * @return
+ */
+ @GetMapping("/queryDiskInfo")
+ public Result<List<Map<String,Object>>> queryDiskInfo(HttpServletRequest request, HttpServletResponse response){
+ Result<List<Map<String,Object>>> res = new Result<>();
+ try {
+ // 当前文件系统类
+ FileSystemView fsv = FileSystemView.getFileSystemView();
+ // 列出所有windows 磁盘
+ File[] fs = File.listRoots();
+ log.info("查询磁盘信息:"+fs.length+"个");
+ List<Map<String,Object>> list = new ArrayList<>();
+
+ for (int i = 0; i < fs.length; i++) {
+ if(fs[i].getTotalSpace()==0) {
+ continue;
+ }
+ Map<String,Object> map = new HashMap<>();
+ map.put("name", fsv.getSystemDisplayName(fs[i]));
+ map.put("max", fs[i].getTotalSpace());
+ map.put("rest", fs[i].getFreeSpace());
+ map.put("restPPT", (fs[i].getTotalSpace()-fs[i].getFreeSpace())*100/fs[i].getTotalSpace());
+ list.add(map);
+ log.info(map.toString());
+ }
+ res.setResult(list);
+ res.success("查询成功");
+ } catch (Exception e) {
+ res.error500("查询失败"+e.getMessage());
+ }
+ return res;
+ }
+ //update-end--Author:zhangweijian Date:20190425 for：获取磁盘信息
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/monitor/domain/RedisInfo.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/monitor/domain/RedisInfo.java
index e605f9a..e605f9a 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/monitor/domain/RedisInfo.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/monitor/domain/RedisInfo.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/monitor/exception/RedisConnectException.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/monitor/exception/RedisConnectException.java
index 0391c2a..0391c2a 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/monitor/exception/RedisConnectException.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/monitor/exception/RedisConnectException.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/monitor/service/RedisService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/monitor/service/RedisService.java
index 756e80a..756e80a 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/monitor/service/RedisService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/monitor/service/RedisService.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/monitor/service/impl/RedisServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/monitor/service/impl/RedisServiceImpl.java
index 9fc764d..fd2358e 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/monitor/service/impl/RedisServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/monitor/service/impl/RedisServiceImpl.java
@@ -20,7 +20,7 @@ import lombok.extern.slf4j.Slf4j;
/**
* Redis 监控信息获取
*
- * @author MrBird
+ * @Author MrBird
*/
@Service("redisService")
@Slf4j
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/aop/LogRecordAspect.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/ngalain/aop/LogRecordAspect.java
index ceb0476..ceb0476 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/aop/LogRecordAspect.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/ngalain/aop/LogRecordAspect.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/controller/NgAlainController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/ngalain/controller/NgAlainController.java
index 93b99ba..bca04aa 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/controller/NgAlainController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/ngalain/controller/NgAlainController.java
@@ -1,26 +1,27 @@
package org.jeecg.modules.ngalain.controller;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.common.system.vo.DictModel;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.ngalain.service.NgAlainService;
-import org.jeecg.modules.system.entity.SysDict;
-import org.jeecg.modules.system.entity.SysUser;
-import org.jeecg.modules.system.model.SysDictTree;
import org.jeecg.modules.system.service.ISysDictService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import com.alibaba.fastjson.JSONObject;
+
+import lombok.extern.slf4j.Slf4j;
@Slf4j
@RestController
@@ -36,7 +37,7 @@ public class NgAlainController {
public JSONObject getAppData(HttpServletRequest request) throws Exception {
String token=request.getHeader("X-Access-Token");
JSONObject j = new JSONObject();
- SysUser user = (SysUser) SecurityUtils.getSubject().getPrincipal();
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
JSONObject userObjcet = new JSONObject();
userObjcet.put("name", user.getUsername());
userObjcet.put("avatar", user.getAvatar());
@@ -54,26 +55,26 @@ public class NgAlainController {
@RequestMapping(value = "/getDictItems/{dictCode}", method = RequestMethod.GET)
public Object getDictItems(@PathVariable String dictCode) {
log.info(" dictCode : "+ dictCode);
- Result<List<Map<String,Object>>> result = new Result<List<Map<String,Object>>>();
- List<Map<String,Object>> ls = null;
+ Result<List<DictModel>> result = new Result<List<DictModel>>();
+ List<DictModel> ls = null;
try {
ls = sysDictService.queryDictItemsByCode(dictCode);
result.setSuccess(true);
result.setResult(ls);
} catch (Exception e) {
- log.info(e.getMessage());
+ log.error(e.getMessage(),e);
result.error500("操作失败");
return result;
}
List<JSONObject> dictlist=new ArrayList<>();
- for (Map<String, Object> l : ls) {
+ for (DictModel l : ls) {
JSONObject dict=new JSONObject();
try {
- dict.put("value",Integer.parseInt((String)l.get("value")));
+ dict.put("value",Integer.parseInt(l.getValue()));
} catch (NumberFormatException e) {
- dict.put("value",l.get("value"));
+ dict.put("value",l.getValue());
}
- dict.put("label",l.get("text"));
+ dict.put("label",l.getText());
dictlist.add(dict);
}
return dictlist;
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/mapper/NgAlainMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/ngalain/mapper/NgAlainMapper.java
index 2a10fea..2a10fea 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/mapper/NgAlainMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/ngalain/mapper/NgAlainMapper.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/mapper/xml/NgAlainMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/ngalain/mapper/xml/NgAlainMapper.xml
index affc851..affc851 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/mapper/xml/NgAlainMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/ngalain/mapper/xml/NgAlainMapper.xml
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/service/NgAlainService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/ngalain/service/NgAlainService.java
index dd450cd..dd450cd 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/service/NgAlainService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/ngalain/service/NgAlainService.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java
index 1a4f98d..1a4f98d 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java
index ba4d9c9..9ca4b51 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java
@@ -10,7 +10,6 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.alibaba.fastjson.JSON;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.exception.JeecgBootException;
@@ -18,49 +17,45 @@ import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.quartz.entity.QuartzJob;
import org.jeecg.modules.quartz.service.IQuartzJobService;
-import org.jeecg.modules.system.entity.SysUser;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.quartz.CronScheduleBuilder;
-import org.quartz.CronTrigger;
-import org.quartz.Job;
-import org.quartz.JobBuilder;
-import org.quartz.JobDetail;
import org.quartz.JobKey;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
-import org.quartz.TriggerBuilder;
-import org.quartz.TriggerKey;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
/**
- * @Title: Controller
- * @Description: 定时任务在线管理
- * @author： jeecg-boot
- * @date： 2019-01-02
- * @version：V1.0
+ * @Description: 定时任务在线管理
+ * @Author: jeecg-boot
+ * @Date: 2019-01-02
+ * @Version:V1.0
*/
@RestController
@RequestMapping("/sys/quartzJob")
@Slf4j
+@Api(tags = "定时任务接口")
public class QuartzJobController {
@Autowired
private IQuartzJobService quartzJobService;
@@ -103,16 +98,13 @@ public class QuartzJobController {
return Result.error("该定时任务类名已存在");
}
try {
- schedulerAdd(quartzJob.getJobClassName().trim(), quartzJob.getCronExpression().trim(), quartzJob.getParameter());
- //
- quartzJob.setDelFlag(CommonConstant.DEL_FLAG_0);
- quartzJob.setStatus(CommonConstant.STATUS_NORMAL);
- quartzJobService.save(quartzJob);
- result.success("创建定时任务成功");
+ boolean ok = quartzJobService.saveAndScheduleJob(quartzJob);
+ if (ok) {
+ result.success("创建定时任务成功");
+ }
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
- result.error500("创建定时任务失败，"+e.getMessage());
+ log.error(e.getMessage(), e);
+ result.error500("创建定时任务失败，" + e.getMessage());
}
return result;
}
@@ -124,17 +116,19 @@ public class QuartzJobController {
* @return
*/
@RequestMapping(value = "/edit", method = RequestMethod.PUT)
- public Result<QuartzJob> eidt(@RequestBody QuartzJob quartzJob) {
+ public Result<?> eidt(@RequestBody QuartzJob quartzJob) {
Result<QuartzJob> result = new Result<QuartzJob>();
QuartzJob quartzJobEntity = quartzJobService.getById(quartzJob.getId());
if (quartzJobEntity == null) {
result.error500("未找到对应实体");
} else {
- schedulerDelete(quartzJob.getJobClassName().trim());
- if(CommonConstant.STATUS_NORMAL == quartzJob.getStatus()) {
- schedulerAdd(quartzJob.getJobClassName().trim(), quartzJob.getCronExpression().trim(), quartzJob.getParameter());
+ boolean ok = true;
+ try {
+ ok = quartzJobService.editAndScheduleJob(quartzJob);
+ } catch (SchedulerException e) {
+ log.error(e.getMessage(),e);
+ return Result.error("更新定时任务失败!");
}
- boolean ok = quartzJobService.updateById(quartzJob);
if (ok) {
result.success("更新定时任务成功!");
}
@@ -155,9 +149,7 @@ public class QuartzJobController {
if (quartzJob == null) {
result.error500("未找到对应实体");
} else {
- QuartzJob job = quartzJobService.getById(id);
- schedulerDelete(job.getJobClassName().trim());
- boolean ok = quartzJobService.removeById(id);
+ boolean ok = quartzJobService.deleteAndStopJob(quartzJob);
if (ok) {
result.success("删除成功!");
}
@@ -180,8 +172,7 @@ public class QuartzJobController {
} else {
for (String id : Arrays.asList(ids.split(","))) {
QuartzJob job = quartzJobService.getById(id);
- schedulerDelete(job.getJobClassName().trim());
- quartzJobService.removeById(id);
+ quartzJobService.deleteAndStopJob(job);
}
result.success("删除定时任务成功!");
}
@@ -190,15 +181,20 @@ public class QuartzJobController {
/**
* 暂停定时任务
+ *
* @param job
* @return
*/
- @RequestMapping(value = "/pause", method = RequestMethod.POST)
+ @GetMapping(value = "/pause")
@ApiOperation(value = "暂停定时任务")
- public Result<Object> pauseJob(@RequestBody QuartzJob job) {
-
+ public Result<Object> pauseJob(@RequestParam(name = "jobClassName", required = true) String jobClassName) {
+ QuartzJob job = null;
try {
- scheduler.pauseJob(JobKey.jobKey(job.getJobClassName().trim()));
+ job = quartzJobService.getOne(new LambdaQueryWrapper<QuartzJob>().eq(QuartzJob::getJobClassName, jobClassName));
+ if (job == null) {
+ return Result.error("定时任务不存在！");
+ }
+ scheduler.pauseJob(JobKey.jobKey(jobClassName.trim()));
} catch (SchedulerException e) {
throw new JeecgBootException("暂停定时任务失败");
}
@@ -209,20 +205,19 @@ public class QuartzJobController {
/**
* 启动定时任务
+ *
* @param job
* @return
*/
- @RequestMapping(value = "/resume", method = RequestMethod.POST)
+ @GetMapping(value = "/resume")
@ApiOperation(value = "恢复定时任务")
- public Result<Object> resumeJob(@RequestBody QuartzJob job) {
-
- try {
- scheduler.resumeJob(JobKey.jobKey(job.getJobClassName().trim()));
- } catch (SchedulerException e) {
- throw new JeecgBootException("恢复定时任务失败");
+ public Result<Object> resumeJob(@RequestParam(name = "jobClassName", required = true) String jobClassName) {
+ QuartzJob job = quartzJobService.getOne(new LambdaQueryWrapper<QuartzJob>().eq(QuartzJob::getJobClassName, jobClassName));
+ if (job == null) {
+ return Result.error("定时任务不存在！");
}
- job.setStatus(CommonConstant.STATUS_NORMAL);
- quartzJobService.updateById(job);
+ quartzJobService.resumeJob(job);
+ //scheduler.resumeJob(JobKey.jobKey(job.getJobClassName().trim()));
return Result.ok("恢复定时任务成功");
}
@@ -246,90 +241,29 @@ public class QuartzJobController {
}
/**
- * 添加定时任务
- *
- * @param jobClassName
- * @param cronExpression
- * @param parameter
- */
- private void schedulerAdd(String jobClassName, String cronExpression, String parameter) {
-
- try {
- // 启动调度器
- scheduler.start();
-
- // 构建job信息
- JobDetail jobDetail = JobBuilder.newJob(getClass(jobClassName).getClass()).withIdentity(jobClassName).usingJobData("parameter", parameter).build();
-
- // 表达式调度构建器(即任务执行的时间)
- CronScheduleBuilder scheduleBuilder = CronScheduleBuilder.cronSchedule(cronExpression);
-
- // 按新的cronExpression表达式构建一个新的trigger
- CronTrigger trigger = TriggerBuilder.newTrigger().withIdentity(jobClassName).withSchedule(scheduleBuilder).build();
-
- scheduler.scheduleJob(jobDetail, trigger);
- } catch (SchedulerException e) {
- log.error(e.toString());
- throw new JeecgBootException("创建定时任务失败");
- } catch (Exception e) {
- throw new JeecgBootException("后台找不到该类名任务");
- }
- }
-
- /**
- * 删除定时任务
- *
- * @param jobClassName
- */
- private void schedulerDelete(String jobClassName) {
-
- try {
- scheduler.pauseTrigger(TriggerKey.triggerKey(jobClassName));
- scheduler.unscheduleJob(TriggerKey.triggerKey(jobClassName));
- scheduler.deleteJob(JobKey.jobKey(jobClassName));
- } catch (Exception e) {
- throw new JeecgBootException("删除定时任务失败");
- }
- }
-
- private static Job getClass(String classname) throws Exception {
- Class<?> class1 = Class.forName(classname);
- return (Job) class1.newInstance();
- }
-
- /**
* 导出excel
+ *
* @param request
* @param response
*/
@RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+ public ModelAndView exportXls(HttpServletRequest request, QuartzJob quartzJob) {
// Step.1 组装查询条件
- QueryWrapper<QuartzJob> queryWrapper = null;
- try {
- String paramsStr = request.getParameter("paramsStr");
- if (oConvertUtils.isNotEmpty(paramsStr)) {
- String deString = URLDecoder.decode(paramsStr, "UTF-8");
- QuartzJob quartzJob = JSON.parseObject(deString, QuartzJob.class);
- queryWrapper = QueryGenerator.initQueryWrapper(quartzJob, request.getParameterMap());
- }
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
-
- //Step.2 AutoPoi 导出Excel
+ QueryWrapper<QuartzJob> queryWrapper = QueryGenerator.initQueryWrapper(quartzJob, request.getParameterMap());
+ // Step.2 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
List<QuartzJob> pageList = quartzJobService.list(queryWrapper);
- //导出文件名称
- mv.addObject(NormalExcelConstants.FILE_NAME,"定时任务列表");
- mv.addObject(NormalExcelConstants.CLASS,QuartzJob.class);
- mv.addObject(NormalExcelConstants.PARAMS,new ExportParams("定时任务列表数据","导出人:Jeecg","导出信息"));
- mv.addObject(NormalExcelConstants.DATA_LIST,pageList);
+ // 导出文件名称
+ mv.addObject(NormalExcelConstants.FILE_NAME, "定时任务列表");
+ mv.addObject(NormalExcelConstants.CLASS, QuartzJob.class);
+ mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("定时任务列表数据", "导出人:Jeecg", "导出信息"));
+ mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
return mv;
}
/**
* 通过excel导入数据
+ *
* @param request
* @param response
* @return
@@ -351,7 +285,7 @@ public class QuartzJobController {
}
return Result.ok("文件导入成功！数据行数：" + listQuartzJobs.size());
} catch (Exception e) {
- log.error(e.getMessage());
+ log.error(e.getMessage(), e);
return Result.error("文件导入失败！");
} finally {
try {
@@ -361,6 +295,6 @@ public class QuartzJobController {
}
}
}
- return Result.ok("文件导入失败！");
+ return Result.error("文件导入失败！");
}
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java
index 320a3fe..d754211 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java
@@ -14,9 +14,9 @@ import lombok.Data;
/**
* @Description: 定时任务在线管理
- * @author： jeecg-boot
- * @date： 2019-01-02
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-01-02
+ * @Version: V1.0
*/
@Data
@TableName("sys_quartz_job")
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/quartz/job/SampleJob.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/job/SampleJob.java
index 844a7a1..0ea62e9 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/quartz/job/SampleJob.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/job/SampleJob.java
@@ -10,7 +10,7 @@ import lombok.extern.slf4j.Slf4j;
/**
* 示例不带参定时任务
*
- * @author Scott
+ * @Author Scott
*/
@Slf4j
public class SampleJob implements Job {
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/quartz/job/SampleParamJob.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/job/SampleParamJob.java
index 0489744..42dd6f4 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/quartz/job/SampleParamJob.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/job/SampleParamJob.java
@@ -10,7 +10,7 @@ import lombok.extern.slf4j.Slf4j;
/**
* 示例带参定时任务
*
- * @author Scott
+ * @Author Scott
*/
@Slf4j
public class SampleParamJob implements Job {
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/quartz/mapper/QuartzJobMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/mapper/QuartzJobMapper.java
index 87df52b..764019e 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/quartz/mapper/QuartzJobMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/mapper/QuartzJobMapper.java
@@ -9,9 +9,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 定时任务在线管理
- * @author： jeecg-boot
- * @date： 2019-01-02
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-01-02
+ * @Version: V1.0
*/
public interface QuartzJobMapper extends BaseMapper<QuartzJob> {
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/quartz/mapper/xml/QuartzJobMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/mapper/xml/QuartzJobMapper.xml
index 2f6f0a0..2f6f0a0 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/quartz/mapper/xml/QuartzJobMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/mapper/xml/QuartzJobMapper.xml
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/quartz/service/IQuartzJobService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/service/IQuartzJobService.java
index 0ceda4b..c647948 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/quartz/service/IQuartzJobService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/service/IQuartzJobService.java
@@ -3,17 +3,25 @@ package org.jeecg.modules.quartz.service;
import java.util.List;
import org.jeecg.modules.quartz.entity.QuartzJob;
+import org.quartz.SchedulerException;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 定时任务在线管理
- * @author： jeecg-boot
- * @date： 2019-01-02
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-04-28
+ * @Version: V1.1
*/
public interface IQuartzJobService extends IService<QuartzJob> {
List<QuartzJob> findByJobClassName(String jobClassName);
+ boolean saveAndScheduleJob(QuartzJob quartzJob);
+
+ boolean editAndScheduleJob(QuartzJob quartzJob) throws SchedulerException;
+
+ boolean deleteAndStopJob(QuartzJob quartzJob);
+
+ boolean resumeJob(QuartzJob quartzJob);
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/service/impl/QuartzJobServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/service/impl/QuartzJobServiceImpl.java
new file mode 100644
index 0000000..39f2bbb
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/service/impl/QuartzJobServiceImpl.java
@@ -0,0 +1,146 @@
+package org.jeecg.modules.quartz.service.impl;
+
+import java.util.List;
+
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.modules.quartz.entity.QuartzJob;
+import org.jeecg.modules.quartz.mapper.QuartzJobMapper;
+import org.jeecg.modules.quartz.service.IQuartzJobService;
+import org.quartz.CronScheduleBuilder;
+import org.quartz.CronTrigger;
+import org.quartz.Job;
+import org.quartz.JobBuilder;
+import org.quartz.JobDetail;
+import org.quartz.JobKey;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.TriggerBuilder;
+import org.quartz.TriggerKey;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @Description: 定时任务在线管理
+ * @Author: jeecg-boot
+ * @Date: 2019-04-28
+ * @Version: V1.1
+ */
+@Slf4j
+@Service
+public class QuartzJobServiceImpl extends ServiceImpl<QuartzJobMapper, QuartzJob> implements IQuartzJobService {
+ @Autowired
+ private QuartzJobMapper quartzJobMapper;
+ @Autowired
+ private Scheduler scheduler;
+
+ @Override
+ public List<QuartzJob> findByJobClassName(String jobClassName) {
+ return quartzJobMapper.findByJobClassName(jobClassName);
+ }
+
+ /**
+ * 保存&启动定时任务
+ */
+ @Override
+ public boolean saveAndScheduleJob(QuartzJob quartzJob) {
+ if (CommonConstant.STATUS_NORMAL == quartzJob.getStatus()) {
+ // 定时器添加
+ this.schedulerAdd(quartzJob.getJobClassName().trim(), quartzJob.getCronExpression().trim(), quartzJob.getParameter());
+ }
+ // DB设置修改
+ quartzJob.setDelFlag(CommonConstant.DEL_FLAG_0);
+ return this.save(quartzJob);
+ }
+
+ /**
+ * 恢复定时任务
+ */
+ @Override
+ public boolean resumeJob(QuartzJob quartzJob) {
+ schedulerDelete(quartzJob.getJobClassName().trim());
+ schedulerAdd(quartzJob.getJobClassName().trim(), quartzJob.getCronExpression().trim(), quartzJob.getParameter());
+ quartzJob.setStatus(CommonConstant.STATUS_NORMAL);
+ return this.updateById(quartzJob);
+ }
+
+ /**
+ * 编辑&启停定时任务
+ * @throws SchedulerException
+ */
+ @Override
+ public boolean editAndScheduleJob(QuartzJob quartzJob) throws SchedulerException {
+ if (CommonConstant.STATUS_NORMAL == quartzJob.getStatus()) {
+ schedulerDelete(quartzJob.getJobClassName().trim());
+ schedulerAdd(quartzJob.getJobClassName().trim(), quartzJob.getCronExpression().trim(), quartzJob.getParameter());
+ }else{
+ scheduler.pauseJob(JobKey.jobKey(quartzJob.getJobClassName().trim()));
+ }
+ return this.updateById(quartzJob);
+ }
+
+ /**
+ * 删除&停止删除定时任务
+ */
+ @Override
+ public boolean deleteAndStopJob(QuartzJob job) {
+ schedulerDelete(job.getJobClassName().trim());
+ boolean ok = this.removeById(job.getId());
+ return ok;
+ }
+
+ /**
+ * 添加定时任务
+ *
+ * @param jobClassName
+ * @param cronExpression
+ * @param parameter
+ */
+ private void schedulerAdd(String jobClassName, String cronExpression, String parameter) {
+ try {
+ // 启动调度器
+ scheduler.start();
+
+ // 构建job信息
+ JobDetail jobDetail = JobBuilder.newJob(getClass(jobClassName).getClass()).withIdentity(jobClassName).usingJobData("parameter", parameter).build();
+
+ // 表达式调度构建器(即任务执行的时间)
+ CronScheduleBuilder scheduleBuilder = CronScheduleBuilder.cronSchedule(cronExpression);
+
+ // 按新的cronExpression表达式构建一个新的trigger
+ CronTrigger trigger = TriggerBuilder.newTrigger().withIdentity(jobClassName).withSchedule(scheduleBuilder).build();
+
+ scheduler.scheduleJob(jobDetail, trigger);
+ } catch (SchedulerException e) {
+ throw new JeecgBootException("创建定时任务失败", e);
+ } catch (Exception e) {
+ throw new JeecgBootException("后台找不到该类名：" + jobClassName, e);
+ }
+ }
+
+ /**
+ * 删除定时任务
+ *
+ * @param jobClassName
+ */
+ private void schedulerDelete(String jobClassName) {
+ try {
+ scheduler.pauseTrigger(TriggerKey.triggerKey(jobClassName));
+ scheduler.unscheduleJob(TriggerKey.triggerKey(jobClassName));
+ scheduler.deleteJob(JobKey.jobKey(jobClassName));
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ throw new JeecgBootException("删除定时任务失败");
+ }
+ }
+
+ private static Job getClass(String classname) throws Exception {
+ Class<?> class1 = Class.forName(classname);
+ return (Job) class1.newInstance();
+ }
+
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/shiro/authc/JwtToken.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/authc/JwtToken.java
index 058b711..de357ac 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/shiro/authc/JwtToken.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/authc/JwtToken.java
@@ -3,7 +3,7 @@ package org.jeecg.modules.shiro.authc;
import org.apache.shiro.authc.AuthenticationToken;
/**
- * @author Scott
+ * @Author Scott
* @create 2018-07-12 15:19
* @desc
**/
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/shiro/authc/MyRealm.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/authc/ShiroRealm.java
index 72b4e57..ba0bab6 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/shiro/authc/MyRealm.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/authc/ShiroRealm.java
@@ -1,10 +1,6 @@
package org.jeecg.modules.shiro.authc;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
import java.util.Set;
-import java.util.concurrent.TimeUnit;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationInfo;
@@ -15,37 +11,35 @@ import org.apache.shiro.authz.SimpleAuthorizationInfo;
import org.apache.shiro.realm.AuthorizingRealm;
import org.apache.shiro.subject.PrincipalCollection;
import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.util.JwtUtil;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.shiro.authc.util.JwtUtil;
-import org.jeecg.modules.system.entity.SysPermission;
import org.jeecg.modules.system.entity.SysUser;
-import org.jeecg.modules.system.service.ISysPermissionService;
import org.jeecg.modules.system.service.ISysUserService;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
-import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j;
/**
- * @author Scott
- * @create 2018-07-12 15:23
- * @desc
- **/
+ * @Description: 用户登录鉴权和获取用户授权
+ * @Author: Scott
+ * @Date: 2019-4-23 8:13
+ * @Version: 1.1
+ */
@Component
@Slf4j
-public class MyRealm extends AuthorizingRealm {
+public class ShiroRealm extends AuthorizingRealm {
@Autowired
- private ISysPermissionService sysPermissionService;
- @Autowired
+ @Lazy
private ISysUserService sysUserService;
- @Autowired
- private StringRedisTemplate stringRedisTemplate;
- @Autowired
- private RedisUtil redisUtil;
+ @Autowired
+ @Lazy
+ private RedisUtil redisUtil;
/**
* 必须重写此方法，不然Shiro会报错
@@ -56,74 +50,56 @@ public class MyRealm extends AuthorizingRealm {
}
/**
- * 获取授权信息 Shiro中，只有当需要检测用户权限的时候才会调用此方法，例如checkRole,checkPermission之类的
+ * 功能： 获取用户权限信息，包括角色以及权限。只有当触发检测用户权限时才会调用此方法，例如checkRole,checkPermission
+ *
+ * @param token token
+ * @return AuthorizationInfo 权限信息
*/
@Override
protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
log.info("————权限认证 [ roles、permissions]————");
- SysUser sysUser = null;
+ LoginUser sysUser = null;
String username = null;
- if(principals!=null) {
- sysUser = (SysUser) principals.getPrimaryPrincipal();
+ if (principals != null) {
+ sysUser = (LoginUser) principals.getPrimaryPrincipal();
username = sysUser.getUsername();
}
-
SimpleAuthorizationInfo info = new SimpleAuthorizationInfo();
- // 设置该用户拥有角色
- List<String> roles = null;
- //从redis缓存中查询权限角色
- String rolesStr = stringRedisTemplate.opsForValue().get(CommonConstant.PREFIX_USER_ROLE + username);
- if (rolesStr != null) {
- roles = JSON.parseArray(rolesStr.toString(), String.class);
- } else {
- //从数据库查询权限放到redis中
- roles = sysUserService.getRole(username);
- stringRedisTemplate.opsForValue().set(CommonConstant.PREFIX_USER_ROLE + username, JSON.toJSONString(roles));
- }
- //设置超时时间（1小时）
- stringRedisTemplate.expire(CommonConstant.PREFIX_USER_ROLE + username, CommonConstant.TOKEN_EXPIRE_TIME, TimeUnit.SECONDS);
-
- /**
- * 设置该用户拥有的角色，比如“admin,test”
- */
- info.setRoles(new HashSet<>(roles));
-
- // TODO 测试数据
- String permissions = "sys:role:update2,sys:role:add,/sys/user/add";
- Set<String> permission = new HashSet<>(Arrays.asList(permissions.split(",")));
-
- // 从数据库获取所有的权限
- Set<String> permissionSet = new HashSet<>();
- List<SysPermission> permissionList = sysPermissionService.queryByUser(username);
- for (SysPermission po : permissionList) {
- if (oConvertUtils.isNotEmpty(po.getUrl()) || oConvertUtils.isNotEmpty(po.getPerms())) {
- if (oConvertUtils.isNotEmpty(po.getUrl())) {
- //TODO URL是怎么控制的？
- permissionSet.add(po.getUrl());
- } else if (oConvertUtils.isNotEmpty(po.getPerms())) {
- permissionSet.add(po.getPerms());
- }
- }
- }
-
+ // 设置用户拥有的角色集合，比如“admin,test”
+ Set<String> roleSet = sysUserService.getUserRolesSet(username);
+ info.setRoles(roleSet);
+
+ // 设置用户拥有的权限集合，比如“sys:role:add,sys:user:add”
+ Set<String> permissionSet = sysUserService.getUserPermissionsSet(username);
info.addStringPermissions(permissionSet);
return info;
}
/**
- * 获取身份验证信息 Shiro中，默认使用此方法进行用户名正确与否验证，错误抛出异常即可。
+ * 功能： 用来进行身份认证，也就是说验证用户输入的账号和密码是否正确，获取身份验证信息，错误抛出异常
*
* @param authenticationToken 用户身份信息 token
* @return 返回封装了用户信息的 AuthenticationInfo 实例
*/
@Override
protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken auth) throws AuthenticationException {
- log.debug("————身份认证方法————");
+ log.debug("————身份认证————");
String token = (String) auth.getCredentials();
if (token == null) {
throw new AuthenticationException("token为空!");
}
+ // 校验token有效性
+ LoginUser loginUser = this.checkUserTokenIsEffect(token);
+ return new SimpleAuthenticationInfo(loginUser, token, getName());
+ }
+
+ /**
+ * 校验token的有效性
+ *
+ * @param token
+ */
+ public LoginUser checkUserTokenIsEffect(String token) throws AuthenticationException {
// 解密获得username，用于和数据库进行对比
String username = JwtUtil.getUsername(token);
if (username == null) {
@@ -131,25 +107,25 @@ public class MyRealm extends AuthorizingRealm {
}
// 查询用户信息
+ LoginUser loginUser = new LoginUser();
SysUser sysUser = sysUserService.getUserByName(username);
if (sysUser == null) {
throw new AuthenticationException("用户不存在!");
}
- //校验token是否超时失效 & 或者账号密码是否错误
+ // 校验token是否超时失效 & 或者账号密码是否错误
if (!jwtTokenRefresh(token, username, sysUser.getPassword())) {
- throw new AuthenticationException("用户名或密码错误!");
+ throw new AuthenticationException("Token失效，请重新登录!");
}
// 判断用户状态
if (sysUser.getStatus() != 1) {
throw new AuthenticationException("账号已被锁定,请联系管理员!");
}
-
- return new SimpleAuthenticationInfo(sysUser, token, getName());
+ BeanUtils.copyProperties(sysUser, loginUser);
+ return loginUser;
}
-
-
+
/**
* JWTToken刷新生命周期 （解决用户一直在线操作，提供Token失效问题）
* 1、登录成功后将用户的JWT生成的Token作为k、v存储到cache缓存里面(这时候k、v值一样)
@@ -159,7 +135,7 @@ public class MyRealm extends AuthorizingRealm {
* 5、当该用户这次请求jwt在生成的token值已经超时，并在cache中不存在对应的k，则表示该用户账户空闲超时，返回用户信息已失效，请重新登录。
* 6、每次当返回为true情况下，都会给Response的Header中设置Authorization，该Authorization映射的v为cache对应的v值。
* 7、注：当前端接收到Response的Header中的Authorization值会存储起来，作为以后请求token使用
- * 参考方案：https://blog.csdn.net/qq394829044/article/details/82763936
+ * 参考方案：https://blog.csdn.net/qq394829044/article/details/82763936
*
* @param userName
* @param passWord
@@ -168,16 +144,16 @@ public class MyRealm extends AuthorizingRealm {
public boolean jwtTokenRefresh(String token, String userName, String passWord) {
String cacheToken = String.valueOf(redisUtil.get(CommonConstant.PREFIX_USER_TOKEN + token));
if (oConvertUtils.isNotEmpty(cacheToken)) {
- //校验token有效性
+ // 校验token有效性
if (!JwtUtil.verify(token, userName, passWord)) {
String newAuthorization = JwtUtil.sign(userName, passWord);
redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, newAuthorization);
- //设置超时时间
- redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME/1000);
+ // 设置超时时间
+ redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 1000);
} else {
redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, cacheToken);
- //设置超时时间
- redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME/1000);
+ // 设置超时时间
+ redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 1000);
}
return true;
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/shiro/authc/aop/JwtFilter.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/authc/aop/JwtFilter.java
index ea45a1d..f55ff88 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/shiro/authc/aop/JwtFilter.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/authc/aop/JwtFilter.java
@@ -13,9 +13,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
import lombok.extern.slf4j.Slf4j;
/**
- * @author Scott
- * @create 2018-07-12 15:56
- * @desc 鉴权登录拦截器
+ * @Description: 鉴权登录拦截器
+ * @Author: Scott
+ * @Date: 2018/10/7
**/
@Slf4j
public class JwtFilter extends BasicHttpAuthenticationFilter {
@@ -30,12 +30,12 @@ public class JwtFilter extends BasicHttpAuthenticationFilter {
*/
@Override
protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) {
- try {
- executeLogin(request, response);
- return true;
- } catch (Exception e) {
- throw new AuthenticationException("Token失效，请重新登录", e);
- }
+ try {
+ executeLogin(request, response);
+ return true;
+ } catch (Exception e) {
+ throw new AuthenticationException("Token失效，请重新登录", e);
+ }
}
/**
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/shiro/authc/aop/ResourceCheckFilter.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/authc/aop/ResourceCheckFilter.java
index 087cd3e..283e575 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/shiro/authc/aop/ResourceCheckFilter.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/authc/aop/ResourceCheckFilter.java
@@ -11,62 +11,59 @@ import org.apache.shiro.web.filter.AccessControlFilter;
import lombok.extern.slf4j.Slf4j;
/**
- * @author Scott
+ * @Author Scott
* @create 2019-02-01 15:56
- * @desc 鉴权请求URL访问权限拦截器
+ * @desc 鉴权请求URL访问权限拦截器
*/
@Slf4j
public class ResourceCheckFilter extends AccessControlFilter {
- private String errorUrl;
+ private String errorUrl;
- public String getErrorUrl() {
- return errorUrl;
- }
+ public String getErrorUrl() {
+ return errorUrl;
+ }
- public void setErrorUrl(String errorUrl) {
- this.errorUrl = errorUrl;
- }
+ public void setErrorUrl(String errorUrl) {
+ this.errorUrl = errorUrl;
+ }
+ /**
+ * 表示是否允许访问 ，如果允许访问返回true，否则false；
+ *
+ * @param servletRequest
+ * @param servletResponse
+ * @param o 表示写在拦截器中括号里面的字符串 mappedValue 就是 [urls] 配置中拦截器参数部分
+ * @return
+ * @throws Exception
+ */
+ @Override
+ protected boolean isAccessAllowed(ServletRequest servletRequest, ServletResponse servletResponse, Object o) throws Exception {
+ Subject subject = getSubject(servletRequest, servletResponse);
+ String url = getPathWithinApplication(servletRequest);
+ log.info("当前用户正在访问的 url => " + url);
+ return subject.isPermitted(url);
+ }
- /**
- * 表示是否允许访问 ，如果允许访问返回true，否则false；
- * @param servletRequest
- * @param servletResponse
- * @param o 表示写在拦截器中括号里面的字符串 mappedValue 就是 [urls] 配置中拦截器参数部分
- * @return
- * @throws Exception
- */
- @Override
- protected boolean isAccessAllowed(ServletRequest servletRequest, ServletResponse servletResponse, Object o) throws Exception {
- Subject subject = getSubject(servletRequest,servletResponse);
- String url = getPathWithinApplication(servletRequest);
- log.info("当前用户正在访问的 url => " + url);
- return subject.isPermitted(url);
- }
+ /**
+ * onAccessDenied：表示当访问拒绝时是否已经处理了； 如果返回 true 表示需要继续处理； 如果返回 false
+ * 表示该拦截器实例已经处理了，将直接返回即可。
+ *
+ * @param servletRequest
+ * @param servletResponse
+ * @return
+ * @throws Exception
+ */
+ @Override
+ protected boolean onAccessDenied(ServletRequest servletRequest, ServletResponse servletResponse) throws Exception {
+ log.info("当 isAccessAllowed 返回 false 的时候，才会执行 method onAccessDenied ");
+ HttpServletRequest request = (HttpServletRequest) servletRequest;
+ HttpServletResponse response = (HttpServletResponse) servletResponse;
+ response.sendRedirect(request.getContextPath() + this.errorUrl);
- /**
- * onAccessDenied：表示当访问拒绝时是否已经处理了；
- * 如果返回 true 表示需要继续处理；
- * 如果返回 false 表示该拦截器实例已经处理了，将直接返回即可。
-
- * @param servletRequest
- * @param servletResponse
- * @return
- * @throws Exception
- */
- @Override
- protected boolean onAccessDenied(ServletRequest servletRequest, ServletResponse servletResponse) throws Exception {
- log.info("当 isAccessAllowed 返回 false 的时候，才会执行 method onAccessDenied ");
-
- HttpServletRequest request =(HttpServletRequest) servletRequest;
- HttpServletResponse response =(HttpServletResponse) servletResponse;
- response.sendRedirect(request.getContextPath() + this.errorUrl);
-
-
- // 返回 false 表示已经处理，例如页面跳转啥的，表示不在走以下的拦截器了（如果还有配置的话）
- return false;
- }
+ // 返回 false 表示已经处理，例如页面跳转啥的，表示不在走以下的拦截器了（如果还有配置的话）
+ return false;
+ }
}
\ No newline at end of file
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/shiro/vo/DefContants.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/vo/DefContants.java
index 3cbf3e7..3cbf3e7 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/shiro/vo/DefContants.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/vo/DefContants.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/shiro/vo/ResponseBean.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/vo/ResponseBean.java
index 9536bc8..9536bc8 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/shiro/vo/ResponseBean.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/vo/ResponseBean.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/shiro/vo/UserBean.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/vo/UserBean.java
index a526a7e..a526a7e 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/shiro/vo/UserBean.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/vo/UserBean.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/shiro/web/TestWebController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/web/TestWebController.java
index 89d474f..35c9db3 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/shiro/web/TestWebController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/web/TestWebController.java
@@ -7,8 +7,8 @@ import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.authz.annotation.RequiresRoles;
import org.apache.shiro.subject.Subject;
+import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.util.PasswordUtil;
-import org.jeecg.modules.shiro.authc.util.JwtUtil;
import org.jeecg.modules.shiro.vo.ResponseBean;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
@@ -21,8 +21,6 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;
-import io.swagger.annotations.ApiOperation;
-
@RestController
public class TestWebController {
@@ -34,7 +32,6 @@ public class TestWebController {
}
@PostMapping("/login")
- @ApiOperation(value="用户登录", notes="用户登录")
public ResponseBean login(@RequestParam("username") String username,
@RequestParam("password") String password) {
SysUser user = userService.getUserByName(username);
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/AutoLogAspect.java
index 06a1c61..515bb91 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/AutoLogAspect.java
@@ -1,4 +1,9 @@
-package org.jeecg.common.aspect;
+package org.jeecg.modules.system.aspect;
+
+import java.lang.reflect.Method;
+import java.util.Date;
+
+import javax.servlet.http.HttpServletRequest;
import org.apache.shiro.SecurityUtils;
import org.aspectj.lang.ProceedingJoinPoint;
@@ -7,25 +12,23 @@ import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.IPUtils;
import org.jeecg.common.util.SpringContextUtils;
import org.jeecg.modules.system.entity.SysLog;
-import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
import com.alibaba.fastjson.JSONObject;
-import javax.servlet.http.HttpServletRequest;
-import java.lang.reflect.Method;
-import java.util.Date;
/**
* 系统日志，切面处理类
*
- * @author scott
+ * @Author scott
* @email jeecgos@163.com
- * @date 2018年1月14日
+ * @Date 2018年1月14日
*/
@Aspect
@Component
@@ -84,7 +87,7 @@ public class AutoLogAspect {
sysLog.setIp(IPUtils.getIpAddr(request));
//获取登录用户信息
- SysUser sysUser = (SysUser)SecurityUtils.getSubject().getPrincipal();
+ LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
if(sysUser!=null){
sysLog.setUserid(sysUser.getUsername());
sysLog.setUsername(sysUser.getRealname());
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/aspect/DictAspect.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/DictAspect.java
index 689f5f1..550d80f 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/aspect/DictAspect.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/DictAspect.java
@@ -1,4 +1,4 @@
-package org.jeecg.common.aspect;
+package org.jeecg.modules.system.aspect;
import java.lang.reflect.Field;
import java.text.SimpleDateFormat;
@@ -13,8 +13,6 @@ import org.aspectj.lang.annotation.Pointcut;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.modules.system.service.ISysDictService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
@@ -37,11 +35,10 @@ import lombok.extern.slf4j.Slf4j;
@Component
@Slf4j
public class DictAspect {
- private static final Logger logger = LoggerFactory.getLogger(DictAspect.class);
@Autowired
private ISysDictService dictService;
// 定义切点Pointcut
- @Pointcut("execution(public * org.jeecg.modules.*.*.*Controller.*(..))")
+ @Pointcut("execution(public * org.jeecg.modules..*.*Controller.*(..))")
public void excudeService() {
}
@@ -91,8 +88,7 @@ public class DictAspect {
//解决@JsonFormat注解解析不了的问题详见SysAnnouncement类的@JsonFormat
json = mapper.writeValueAsString(record);
} catch (JsonProcessingException e) {
- logger.error("json解析失败"+e.getMessage());
- e.printStackTrace();
+ log.error("json解析失败"+e.getMessage(),e);
}
JSONObject item = JSONObject.parseObject(json);
for (Field field : record.getClass().getDeclaredFields()) {
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/PermissionDataAspect.java
index e5807b4..766f991 100644
--- a/jeecg-boot/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/PermissionDataAspect.java
@@ -1,4 +1,4 @@
-package org.jeecg.common.aspect;
+package org.jeecg.modules.system.aspect;
import java.lang.reflect.Method;
import java.util.List;
@@ -11,16 +11,16 @@ import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
import org.jeecg.common.aspect.annotation.PermissionData;
+import org.jeecg.common.system.util.JeecgDataAutorUtils;
+import org.jeecg.common.system.util.JwtUtil;
+import org.jeecg.common.system.vo.SysUserCacheInfo;
import org.jeecg.common.util.SpringContextUtils;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.shiro.authc.util.JwtUtil;
import org.jeecg.modules.system.entity.SysPermission;
import org.jeecg.modules.system.entity.SysPermissionDataRule;
-import org.jeecg.modules.system.model.SysUserCacheInfo;
import org.jeecg.modules.system.service.ISysPermissionDataRuleService;
import org.jeecg.modules.system.service.ISysPermissionService;
import org.jeecg.modules.system.service.ISysUserService;
-import org.jeecg.modules.system.util.JeecgDataAutorUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.AntPathMatcher;
@@ -33,7 +33,7 @@ import lombok.extern.slf4j.Slf4j;
/**
* 数据权限切面处理类
* 当被请求的方法有注解PermissionData时,会在往当前request中写入数据权限信息
- * @date 2019年4月10日
+ * @Date 2019年4月10日
* @Version: 1.0
*/
@Aspect
@@ -112,9 +112,9 @@ public class PermissionDataAspect {
if(url.indexOf("//")>=0){
url = filterUrl(url);
}
- if(url.startsWith("/")){
+ /*if(url.startsWith("/")){
url=url.substring(1);
- }
+ }*/
}
return url;
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java
index 6009415..d5f6253 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java
@@ -10,19 +10,22 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
/**
* @Title: DuplicateCheckAction
* @Description: 重复校验工具
- * @author 张代浩
- * @date 2019-03-25
- * @version V1.0
+ * @Author 张代浩
+ * @Date 2019-03-25
+ * @Version V1.0
*/
@Slf4j
@RestController
@RequestMapping("/sys/duplicate")
+@Api(tags="重复校验")
public class DuplicateCheckController {
@Autowired
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/LoginController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java
index 3720272..4d51b1c 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/LoginController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java
@@ -1,5 +1,10 @@
package org.jeecg.modules.system.controller;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.List;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -8,12 +13,15 @@ import org.apache.shiro.subject.Subject;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.api.ISysBaseAPI;
+import org.jeecg.common.system.util.JwtUtil;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.PasswordUtil;
import org.jeecg.common.util.RedisUtil;
-import org.jeecg.modules.shiro.authc.util.JwtUtil;
import org.jeecg.modules.shiro.vo.DefContants;
+import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.model.SysLoginModel;
+import org.jeecg.modules.system.service.ISysDepartService;
import org.jeecg.modules.system.service.ISysLogService;
import org.jeecg.modules.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,20 +29,21 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+
import com.alibaba.fastjson.JSONObject;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
/**
- * @author scott
+ * @Author scott
* @since 2018-12-17
*/
@RestController
@RequestMapping("/sys")
-@Api("用户登录")
+@Api(tags="用户登录")
@Slf4j
public class LoginController {
@Autowired
@@ -45,7 +54,8 @@ public class LoginController {
private ISysLogService logService;
@Autowired
private RedisUtil redisUtil;
-
+ @Autowired
+ private ISysDepartService sysDepartService;
@RequestMapping(value = "/login", method = RequestMethod.POST)
@ApiOperation("登录接口")
@@ -72,7 +82,18 @@ public class LoginController {
//设置超时时间
redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME/1000);
+ //获取用户部门信息
JSONObject obj = new JSONObject();
+ List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId());
+ obj.put("departs",departs);
+ if(departs==null || departs.size()==0) {
+ obj.put("multi_depart",0);
+ }else if(departs.size()==1){
+ sysUserService.updateUserDepart(username, departs.get(0).getOrgCode());
+ obj.put("multi_depart",1);
+ }else {
+ obj.put("multi_depart",2);
+ }
obj.put("token", token);
obj.put("userInfo", sysUser);
result.setResult(obj);
@@ -91,7 +112,7 @@ public class LoginController {
public Result<Object> logout(HttpServletRequest request,HttpServletResponse response) {
//用户退出逻辑
Subject subject = SecurityUtils.getSubject();
- SysUser sysUser = (SysUser)subject.getPrincipal();
+ LoginUser sysUser = (LoginUser)subject.getPrincipal();
sysBaseAPI.addLog("用户名: "+sysUser.getRealname()+",退出成功！", CommonConstant.LOG_TYPE_1, null);
log.info(" 用户名: "+sysUser.getRealname()+",退出成功！ ");
subject.logout();
@@ -99,8 +120,9 @@ public class LoginController {
String token = request.getHeader(DefContants.X_ACCESS_TOKEN);
//清空用户Token缓存
redisUtil.del(CommonConstant.PREFIX_USER_TOKEN + token);
- //清空用户角色缓存
- redisUtil.del(CommonConstant.PREFIX_USER_ROLE + sysUser.getUsername());
+ //清空用户权限缓存：权限Perms和角色集合
+ redisUtil.del(CommonConstant.LOGIN_USER_CACHERULES_ROLE + sysUser.getUsername());
+ redisUtil.del(CommonConstant.LOGIN_USER_CACHERULES_PERMISSION + sysUser.getUsername());
return Result.ok("退出登录成功！");
}
@@ -112,16 +134,41 @@ public class LoginController {
public Result<JSONObject> loginfo() {
Result<JSONObject> result = new Result<JSONObject>();
JSONObject obj = new JSONObject();
+ //update-begin--Author:zhangweijian Date:20190428 for：传入开始时间，结束时间参数
+ // 获取一天的开始和结束时间
+ Calendar calendar = new GregorianCalendar();
+ calendar.set(Calendar.HOUR_OF_DAY,0);
+ calendar.set(Calendar.MINUTE,0);
+ calendar.set(Calendar.SECOND,0);
+ calendar.set(Calendar.MILLISECOND,0);
+ Date dayStart = calendar.getTime();
+ calendar.add(calendar.DATE, 1);
+ Date dayEnd = calendar.getTime();
// 获取系统访问记录
Long totalVisitCount = logService.findTotalVisitCount();
obj.put("totalVisitCount", totalVisitCount);
- Long todayVisitCount = logService.findTodayVisitCount();
+ Long todayVisitCount = logService.findTodayVisitCount(dayStart,dayEnd);
obj.put("todayVisitCount", todayVisitCount);
- Long todayIp = logService.findTodayIp();
+ Long todayIp = logService.findTodayIp(dayStart,dayEnd);
+ //update-end--Author:zhangweijian Date:20190428 for：传入开始时间，结束时间参数
obj.put("todayIp", todayIp);
result.setResult(obj);
result.success("登录成功");
return result;
}
+
+ /**
+ * 登陆成功选择用户当前部门
+ * @param user
+ * @return
+ */
+ @RequestMapping(value = "/selectDepart", method = RequestMethod.PUT)
+ public Result<?> selectDepart(@RequestBody SysUser user) {
+ String username = user.getUsername();
+ String orgCode= user.getOrgCode();
+ this.sysUserService.updateUserDepart(username, orgCode);
+ return Result.ok();
+ }
+
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java
index be35ae3..3019e43 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java
@@ -3,23 +3,26 @@ package org.jeecg.modules.system.controller;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
-import java.util.Arrays;
+import java.util.Collection;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.alibaba.fastjson.JSON;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.CommonSendStatus;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.util.JwtUtil;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.shiro.authc.util.JwtUtil;
import org.jeecg.modules.system.entity.SysAnnouncement;
-import org.jeecg.modules.system.entity.SysDict;
-import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.entity.SysAnnouncementSend;
+import org.jeecg.modules.system.service.ISysAnnouncementSendService;
import org.jeecg.modules.system.service.ISysAnnouncementService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -32,20 +35,24 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
/**
* @Title: Controller
* @Description: 系统通告表
- * @author： jeecg-boot
- * @date： 2019-01-02
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-01-02
+ * @Version: V1.0
*/
@RestController
@RequestMapping("/sys/annountCement")
@@ -53,6 +60,8 @@ import org.springframework.web.servlet.ModelAndView;
public class SysAnnouncementController {
@Autowired
private ISysAnnouncementService sysAnnouncementService;
+ @Autowired
+ private ISysAnnouncementSendService sysAnnouncementSendService;
/**
* 分页列表查询
@@ -69,14 +78,28 @@ public class SysAnnouncementController {
HttpServletRequest req) {
Result<IPage<SysAnnouncement>> result = new Result<IPage<SysAnnouncement>>();
sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
- QueryWrapper<SysAnnouncement> queryWrapper = QueryGenerator.initQueryWrapper(sysAnnouncement, req.getParameterMap());
- Page<SysAnnouncement> page = new Page<SysAnnouncement>(pageNo, pageSize);
+ QueryWrapper<SysAnnouncement> queryWrapper = new QueryWrapper<SysAnnouncement>(sysAnnouncement);
+ Page<SysAnnouncement> page = new Page<SysAnnouncement>(pageNo,pageSize);
+ //排序逻辑 处理
+ String column = req.getParameter("column");
+ String order = req.getParameter("order");
+ if(oConvertUtils.isNotEmpty(column) && oConvertUtils.isNotEmpty(order)) {
+ if("asc".equals(order)) {
+ queryWrapper.orderByAsc(oConvertUtils.camelToUnderline(column));
+ }else {
+ queryWrapper.orderByDesc(oConvertUtils.camelToUnderline(column));
+ }
+ }
IPage<SysAnnouncement> pageList = sysAnnouncementService.page(page, queryWrapper);
+ log.info("查询当前页："+pageList.getCurrent());
+ log.info("查询当前页数量："+pageList.getSize());
+ log.info("查询结果数量："+pageList.getRecords().size());
+ log.info("数据总数："+pageList.getTotal());
result.setSuccess(true);
result.setResult(pageList);
return result;
}
-
+
/**
* 添加
* @param sysAnnouncement
@@ -88,38 +111,37 @@ public class SysAnnouncementController {
try {
sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
sysAnnouncement.setSendStatus(CommonSendStatus.UNPUBLISHED_STATUS_0);//未发布
- sysAnnouncementService.save(sysAnnouncement);
+ sysAnnouncementService.saveAnnouncement(sysAnnouncement);
result.success("添加成功！");
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.error(e.getMessage(),e);
result.error500("操作失败");
}
return result;
}
-
+
/**
* 编辑
* @param sysAnnouncement
* @return
*/
@RequestMapping(value = "/edit", method = RequestMethod.PUT)
- public Result<SysAnnouncement> edit(@RequestBody SysAnnouncement sysAnnouncement) {
+ public Result<SysAnnouncement> eidt(@RequestBody SysAnnouncement sysAnnouncement) {
Result<SysAnnouncement> result = new Result<SysAnnouncement>();
SysAnnouncement sysAnnouncementEntity = sysAnnouncementService.getById(sysAnnouncement.getId());
if(sysAnnouncementEntity==null) {
result.error500("未找到对应实体");
}else {
- boolean ok = sysAnnouncementService.updateById(sysAnnouncement);
+ boolean ok = sysAnnouncementService.upDateAnnouncement(sysAnnouncement);
//TODO 返回false说明什么？
if(ok) {
result.success("修改成功!");
}
}
-
+
return result;
}
-
+
/**
* 通过id删除
* @param id
@@ -138,10 +160,10 @@ public class SysAnnouncementController {
result.success("删除成功!");
}
}
-
+
return result;
}
-
+
/**
* 批量删除
* @param ids
@@ -163,7 +185,7 @@ public class SysAnnouncementController {
}
return result;
}
-
+
/**
* 通过id查询
* @param id
@@ -181,7 +203,7 @@ public class SysAnnouncementController {
}
return result;
}
-
+
/**
* 更新发布操作
* @param id
@@ -203,10 +225,10 @@ public class SysAnnouncementController {
result.success("该系统通知发布成功");
}
}
-
+
return result;
}
-
+
/**
* 更新撤销操作
* @param id
@@ -226,10 +248,53 @@ public class SysAnnouncementController {
result.success("该系统通知撤销成功");
}
}
-
+
+ return result;
+ }
+
+ /**
+ * @功能：补充用户数据，并返回系统消息
+ * @param id
+ * @return
+ */
+ @RequestMapping(value = "/listByUser", method = RequestMethod.GET)
+ public Result<Map<String,Object>> listByUser() {
+ Result<Map<String,Object>> result = new Result<Map<String,Object>>();
+ LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+ String userId = sysUser.getId();
+ // 1.将系统消息补充到用户通告阅读标记表中
+ Collection<String> anntIds = sysAnnouncementSendService.queryByUserId(userId);
+ LambdaQueryWrapper<SysAnnouncement> querySaWrapper = new LambdaQueryWrapper<SysAnnouncement>();
+ querySaWrapper.eq(SysAnnouncement::getMsgType,CommonConstant.MSG_TYPE_ALL); // 全部人员
+ querySaWrapper.eq(SysAnnouncement::getDelFlag,CommonConstant.DEL_FLAG_0); // 未删除
+ querySaWrapper.eq(SysAnnouncement::getSendStatus, CommonConstant.HAS_SEND); //已发布
+ querySaWrapper.notIn(SysAnnouncement::getId, anntIds);
+ List<SysAnnouncement> announcements = sysAnnouncementService.list(querySaWrapper);
+ if(announcements.size()>0) {
+ for(int i=0;i<announcements.size();i++) {
+ SysAnnouncementSend announcementSend = new SysAnnouncementSend();
+ announcementSend.setAnntId(announcements.get(i).getId());
+ announcementSend.setUserId(userId);
+ announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG);
+ sysAnnouncementSendService.save(announcementSend);
+ }
+ }
+ // 2.查询用户未读的系统消息
+ Page<SysAnnouncement> anntMsgList = new Page<SysAnnouncement>(0,5);
+ anntMsgList = sysAnnouncementService.querySysCementPageByUserId(anntMsgList,userId,"1");//通知公告消息
+ Page<SysAnnouncement> sysMsgList = new Page<SysAnnouncement>(0,5);
+ sysMsgList = sysAnnouncementService.querySysCementPageByUserId(sysMsgList,userId,"2");//系统消息
+ Map<String,Object> sysMsgMap = new HashMap<String, Object>();
+ sysMsgMap.put("sysMsgList", sysMsgList.getRecords());
+ sysMsgMap.put("sysMsgTotal", sysMsgList.getTotal());
+ sysMsgMap.put("anntMsgList", anntMsgList.getRecords());
+ sysMsgMap.put("anntMsgTotal", anntMsgList.getTotal());
+ result.setSuccess(true);
+ result.setResult(sysMsgMap);
return result;
}
+
/**
* 导出excel
*
@@ -237,20 +302,9 @@ public class SysAnnouncementController {
* @param response
*/
@RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+ public ModelAndView exportXls(SysAnnouncement sysAnnouncement,HttpServletRequest request) {
// Step.1 组装查询条件
- QueryWrapper<SysAnnouncement> queryWrapper = null;
- try {
- String paramsStr = request.getParameter("paramsStr");
- if (oConvertUtils.isNotEmpty(paramsStr)) {
- String deString = URLDecoder.decode(paramsStr, "UTF-8");
- SysAnnouncement sysAnnouncement = JSON.parseObject(deString, SysAnnouncement.class);
- queryWrapper = QueryGenerator.initQueryWrapper(sysAnnouncement, request.getParameterMap());
- }
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
-
+ QueryWrapper<SysAnnouncement> queryWrapper = QueryGenerator.initQueryWrapper(sysAnnouncement, request.getParameterMap());
//Step.2 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
List<SysAnnouncement> pageList = sysAnnouncementService.list(queryWrapper);
@@ -289,7 +343,7 @@ public class SysAnnouncementController {
}
return Result.ok("文件导入成功！数据行数：" + listSysAnnouncements.size());
} catch (Exception e) {
- log.error(e.getMessage());
+ log.error(e.getMessage(),e);
return Result.error("文件导入失败！");
} finally {
try {
@@ -299,6 +353,6 @@ public class SysAnnouncementController {
}
}
}
- return Result.ok("文件导入失败！");
+ return Result.error("文件导入失败！");
}
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java
new file mode 100644
index 0000000..6c5933d
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java
@@ -0,0 +1,242 @@
+package org.jeecg.modules.system.controller;
+
+import java.util.Arrays;
+import java.util.Date;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.system.entity.SysAnnouncementSend;
+import org.jeecg.modules.system.model.AnnouncementSendModel;
+import org.jeecg.modules.system.service.ISysAnnouncementSendService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import lombok.extern.slf4j.Slf4j;
+
+ /**
+ * @Title: Controller
+ * @Description: 用户通告阅读标记表
+ * @Author: jeecg-boot
+ * @Date: 2019-02-21
+ * @Version: V1.0
+ */
+@RestController
+@RequestMapping("/system/sysAnnouncementSend")
+@Slf4j
+public class SysAnnouncementSendController {
+ @Autowired
+ private ISysAnnouncementSendService sysAnnouncementSendService;
+
+ /**
+ * 分页列表查询
+ * @param sysAnnouncementSend
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @GetMapping(value = "/list")
+ public Result<IPage<SysAnnouncementSend>> queryPageList(SysAnnouncementSend sysAnnouncementSend,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ Result<IPage<SysAnnouncementSend>> result = new Result<IPage<SysAnnouncementSend>>();
+ QueryWrapper<SysAnnouncementSend> queryWrapper = new QueryWrapper<SysAnnouncementSend>(sysAnnouncementSend);
+ Page<SysAnnouncementSend> page = new Page<SysAnnouncementSend>(pageNo,pageSize);
+ //排序逻辑 处理
+ String column = req.getParameter("column");
+ String order = req.getParameter("order");
+ if(oConvertUtils.isNotEmpty(column) && oConvertUtils.isNotEmpty(order)) {
+ if("asc".equals(order)) {
+ queryWrapper.orderByAsc(oConvertUtils.camelToUnderline(column));
+ }else {
+ queryWrapper.orderByDesc(oConvertUtils.camelToUnderline(column));
+ }
+ }
+ IPage<SysAnnouncementSend> pageList = sysAnnouncementSendService.page(page, queryWrapper);
+ //log.info("查询当前页："+pageList.getCurrent());
+ //log.info("查询当前页数量："+pageList.getSize());
+ //log.info("查询结果数量："+pageList.getRecords().size());
+ //log.info("数据总数："+pageList.getTotal());
+ result.setSuccess(true);
+ result.setResult(pageList);
+ return result;
+ }
+
+ /**
+ * 添加
+ * @param sysAnnouncementSend
+ * @return
+ */
+ @PostMapping(value = "/add")
+ public Result<SysAnnouncementSend> add(@RequestBody SysAnnouncementSend sysAnnouncementSend) {
+ Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
+ try {
+ sysAnnouncementSendService.save(sysAnnouncementSend);
+ result.success("添加成功！");
+ } catch (Exception e) {
+ log.error(e.getMessage(),e);
+ result.error500("操作失败");
+ }
+ return result;
+ }
+
+ /**
+ * 编辑
+ * @param sysAnnouncementSend
+ * @return
+ */
+ @PutMapping(value = "/edit")
+ public Result<SysAnnouncementSend> eidt(@RequestBody SysAnnouncementSend sysAnnouncementSend) {
+ Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
+ SysAnnouncementSend sysAnnouncementSendEntity = sysAnnouncementSendService.getById(sysAnnouncementSend.getId());
+ if(sysAnnouncementSendEntity==null) {
+ result.error500("未找到对应实体");
+ }else {
+ boolean ok = sysAnnouncementSendService.updateById(sysAnnouncementSend);
+ //TODO 返回false说明什么？
+ if(ok) {
+ result.success("修改成功!");
+ }
+ }
+
+ return result;
+ }
+
+ /**
+ * 通过id删除
+ * @param id
+ * @return
+ */
+ @DeleteMapping(value = "/delete")
+ public Result<SysAnnouncementSend> delete(@RequestParam(name="id",required=true) String id) {
+ Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
+ SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id);
+ if(sysAnnouncementSend==null) {
+ result.error500("未找到对应实体");
+ }else {
+ boolean ok = sysAnnouncementSendService.removeById(id);
+ if(ok) {
+ result.success("删除成功!");
+ }
+ }
+
+ return result;
+ }
+
+ /**
+ * 批量删除
+ * @param ids
+ * @return
+ */
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<SysAnnouncementSend> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
+ if(ids==null || "".equals(ids.trim())) {
+ result.error500("参数不识别！");
+ }else {
+ this.sysAnnouncementSendService.removeByIds(Arrays.asList(ids.split(",")));
+ result.success("删除成功!");
+ }
+ return result;
+ }
+
+ /**
+ * 通过id查询
+ * @param id
+ * @return
+ */
+ @GetMapping(value = "/queryById")
+ public Result<SysAnnouncementSend> queryById(@RequestParam(name="id",required=true) String id) {
+ Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
+ SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id);
+ if(sysAnnouncementSend==null) {
+ result.error500("未找到对应实体");
+ }else {
+ result.setResult(sysAnnouncementSend);
+ result.setSuccess(true);
+ }
+ return result;
+ }
+
+ /**
+ * @功能：更新用户系统消息阅读状态
+ * @param json
+ * @return
+ */
+ @PutMapping(value = "/editByAnntIdAndUserId")
+ public Result<SysAnnouncementSend> editById(@RequestBody JSONObject json) {
+ Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
+ String anntId = json.getString("anntId");
+ LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+ String userId = sysUser.getId();
+ LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new UpdateWrapper().lambda();
+ updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG);
+ updateWrapper.set(SysAnnouncementSend::getReadTime, new Date());
+ updateWrapper.last("where annt_id ='"+anntId+"' and user_id ='"+userId+"'");
+ SysAnnouncementSend announcementSend = new SysAnnouncementSend();
+ sysAnnouncementSendService.update(announcementSend, updateWrapper);
+ result.setSuccess(true);
+ return result;
+ }
+
+ /**
+ * @功能：获取我的消息
+ * @return
+ */
+ @GetMapping(value = "/getMyAnnouncementSend")
+ public Result<IPage<AnnouncementSendModel>> getMyAnnouncementSend(AnnouncementSendModel announcementSendModel,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+ Result<IPage<AnnouncementSendModel>> result = new Result<IPage<AnnouncementSendModel>>();
+ LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+ String userId = sysUser.getId();
+ announcementSendModel.setUserId(userId);
+ announcementSendModel.setPageNo((pageNo-1)*pageSize);
+ announcementSendModel.setPageSize(pageSize);
+ Page<AnnouncementSendModel> pageList = new Page<AnnouncementSendModel>(pageNo,pageSize);
+ pageList = sysAnnouncementSendService.getMyAnnouncementSendPage(pageList, announcementSendModel);
+ result.setResult(pageList);
+ result.setSuccess(true);
+ return result;
+ }
+
+ /**
+ * @功能：一键已读
+ * @return
+ */
+ @PutMapping(value = "/readAll")
+ public Result<SysAnnouncementSend> readAll() {
+ Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
+ LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+ String userId = sysUser.getId();
+ LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new UpdateWrapper().lambda();
+ updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG);
+ updateWrapper.set(SysAnnouncementSend::getReadTime, new Date());
+ updateWrapper.last("where user_id ='"+userId+"'");
+ SysAnnouncementSend announcementSend = new SysAnnouncementSend();
+ sysAnnouncementSendService.update(announcementSend, updateWrapper);
+ result.setSuccess(true);
+ result.setMessage("全部已读");
+ return result;
+ }
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java
index 3d31a4d..14a56eb 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java
@@ -63,7 +63,7 @@ public class SysDataLogController {
result.setResult(list);
result.setSuccess(true);
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e.getMessage(),e);
}
return result;
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
index 4a5689f..aa92dbd 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
@@ -1,28 +1,51 @@
package org.jeecg.modules.system.controller;
-import lombok.extern.slf4j.Slf4j;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.RequiresRoles;
import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.shiro.authc.util.JwtUtil;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.model.DepartIdModel;
import org.jeecg.modules.system.model.SysDepartTreeModel;
import org.jeecg.modules.system.service.ISysDepartService;
+import org.jeecg.modules.system.service.ISysUserDepartService;
+import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.system.util.FindsDepartsChildrenUtil;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
-import java.util.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import javax.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
/**
* <p>
* 部门表 前端控制器
* <p>
*
- * @author： Steve @Since： 2019-01-22
+ * @Author: Steve @Since： 2019-01-22
*/
@RestController
@RequestMapping("/sysdepart/sysDepart")
@@ -31,6 +54,10 @@ public class SysDepartController {
@Autowired
private ISysDepartService sysDepartService;
+ @Autowired
+ private ISysUserService sysUserService;
+ @Autowired
+ private ISysUserDepartService sysUserDepartService;
/**
* 查询数据 查出所有部门,并以树结构数据格式响应给前端
@@ -45,7 +72,7 @@ public class SysDepartController {
result.setResult(list);
result.setSuccess(true);
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e.getMessage(),e);
}
return result;
}
@@ -56,6 +83,7 @@ public class SysDepartController {
* @param sysDepart
* @return
*/
+ @RequiresRoles({"admin"})
@RequestMapping(value = "/add", method = RequestMethod.POST)
public Result<SysDepart> add(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
Result<SysDepart> result = new Result<SysDepart>();
@@ -65,8 +93,7 @@ public class SysDepartController {
sysDepartService.saveDepartData(sysDepart, username);
result.success("添加成功！");
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.error(e.getMessage(),e);
result.error500("操作失败");
}
return result;
@@ -78,9 +105,9 @@ public class SysDepartController {
* @param sysDepart
* @return
*/
+ @RequiresRoles({"admin"})
@RequestMapping(value = "/edit", method = RequestMethod.PUT)
public Result<SysDepart> edit(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
-
String username = JwtUtil.getUserNameByToken(request);
sysDepart.setUpdateBy(username);
Result<SysDepart> result = new Result<SysDepart>();
@@ -102,6 +129,7 @@ public class SysDepartController {
* @param id
* @return
*/
+ @RequiresRoles({"admin"})
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
public Result<SysDepart> delete(@RequestParam(name="id",required=true) String id) {
@@ -125,6 +153,7 @@ public class SysDepartController {
* @param ids
* @return
*/
+ @RequiresRoles({"admin"})
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
public Result<SysDepart> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
@@ -143,25 +172,28 @@ public class SysDepartController {
*
* @return
*/
- @RequestMapping(value = "/queryIdTree", method = RequestMethod.GET)
- public Result<List<DepartIdModel>> queryIdTree() {
- Result<List<DepartIdModel>> result = new Result<List<DepartIdModel>>();
- List<DepartIdModel> idList;
- try {
- idList = FindsDepartsChildrenUtil.wrapDepartIdModel();
- if(idList != null && idList.size() > 0) {
- result.setResult(idList); result.setSuccess(true);
- }else {
- sysDepartService.queryTreeList();
- idList = FindsDepartsChildrenUtil.wrapDepartIdModel();
- result.setResult(idList); result.setSuccess(true);
- }
- return result;
- } catch(Exception e) {
- e.printStackTrace(); result.setSuccess(false);
- return result;
- }
- }
+ @RequestMapping(value = "/queryIdTree", method = RequestMethod.GET)
+ public Result<List<DepartIdModel>> queryIdTree() {
+ Result<List<DepartIdModel>> result = new Result<List<DepartIdModel>>();
+ List<DepartIdModel> idList;
+ try {
+ idList = FindsDepartsChildrenUtil.wrapDepartIdModel();
+ if (idList != null && idList.size() > 0) {
+ result.setResult(idList);
+ result.setSuccess(true);
+ } else {
+ sysDepartService.queryTreeList();
+ idList = FindsDepartsChildrenUtil.wrapDepartIdModel();
+ result.setResult(idList);
+ result.setSuccess(true);
+ }
+ return result;
+ } catch (Exception e) {
+ log.error(e.getMessage(),e);
+ result.setSuccess(false);
+ return result;
+ }
+ }
/**
* <p>
@@ -190,4 +222,96 @@ public class SysDepartController {
}
}
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param response
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(SysDepart sysDepart,HttpServletRequest request) {
+ // Step.1 组装查询条件
+ QueryWrapper<SysDepart> queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, request.getParameterMap());
+ //Step.2 AutoPoi 导出Excel
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ List<SysDepart> pageList = sysDepartService.list(queryWrapper);
+ //按字典排序
+ Collections.sort(pageList, new Comparator<SysDepart>() {
+ @Override
+ public int compare(SysDepart arg0, SysDepart arg1) {
+ return arg0.getOrgCode().compareTo(arg1.getOrgCode());
+ }
+ });
+ //导出文件名称
+ mv.addObject(NormalExcelConstants.FILE_NAME, "部门列表");
+ mv.addObject(NormalExcelConstants.CLASS, SysDepart.class);
+ mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("部门列表数据", "导出人:Jeecg", "导出信息"));
+ mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+ return mv;
+ }
+
+ /**
+ * 通过excel导入数据
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+ for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+ MultipartFile file = entity.getValue();// 获取上传文件对象
+ ImportParams params = new ImportParams();
+ params.setTitleRows(2);
+ params.setHeadRows(1);
+ params.setNeedSave(true);
+ try {
+ // orgCode编码长度
+ int codeLength = 3;
+ List<SysDepart> listSysDeparts = ExcelImportUtil.importExcel(file.getInputStream(), SysDepart.class, params);
+ //按长度排序
+ Collections.sort(listSysDeparts, new Comparator<SysDepart>() {
+ @Override
+ public int compare(SysDepart arg0, SysDepart arg1) {
+ return arg0.getOrgCode().length() - arg1.getOrgCode().length();
+ }
+ });
+ for (SysDepart sysDepart : listSysDeparts) {
+ String orgCode = sysDepart.getOrgCode();
+ if(orgCode.length() > codeLength) {
+ String parentCode = orgCode.substring(0, orgCode.length()-codeLength);
+ QueryWrapper<SysDepart> queryWrapper = new QueryWrapper<SysDepart>();
+ queryWrapper.eq("org_code", parentCode);
+ try {
+ SysDepart parentDept = sysDepartService.getOne(queryWrapper);
+ if(!parentDept.equals(null)) {
+ sysDepart.setParentId(parentDept.getId());
+ } else {
+ sysDepart.setParentId("");
+ }
+ }catch (Exception e) {
+ //没有查找到parentDept
+ }
+ }else{
+ sysDepart.setParentId("");
+ }
+ sysDepartService.save(sysDepart);
+ }
+ return Result.ok("文件导入成功！数据行数：" + listSysDeparts.size());
+ } catch (Exception e) {
+ log.error(e.getMessage(),e);
+ return Result.error("文件导入失败:"+e.getMessage());
+ } finally {
+ try {
+ file.getInputStream().close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ return Result.error("文件导入失败！");
+ }
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysDictController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
index 66b8d6b..bf88edc 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
@@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSON;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.DictModel;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer;
import org.jeecg.modules.demo.test.entity.JeecgOrderMain;
@@ -55,7 +56,7 @@ import org.springframework.web.servlet.ModelAndView;
* 字典表 前端控制器
* </p>
*
- * @author zhangweijian
+ * @Author zhangweijian
* @since 2018-12-28
*/
@RestController
@@ -74,6 +75,7 @@ public class SysDictController {
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
Result<IPage<SysDict>> result = new Result<IPage<SysDict>>();
QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict, req.getParameterMap());
+ queryWrapper.eq("del_flag", "1");
Page<SysDict> page = new Page<SysDict>(pageNo, pageSize);
IPage<SysDict> pageList = sysDictService.page(page, queryWrapper);
log.info("查询当前页："+pageList.getCurrent());
@@ -123,10 +125,10 @@ public class SysDictController {
* @return
*/
@RequestMapping(value = "/getDictItems/{dictCode}", method = RequestMethod.GET)
- public Result<List<Map<String, Object>>> getDictItems(@PathVariable String dictCode) {
+ public Result<List<DictModel>> getDictItems(@PathVariable String dictCode) {
log.info(" dictCode : "+ dictCode);
- Result<List<Map<String,Object>>> result = new Result<List<Map<String,Object>>>();
- List<Map<String,Object>> ls = null;
+ Result<List<DictModel>> result = new Result<List<DictModel>>();
+ List<DictModel> ls = null;
try {
if(dictCode.indexOf(",")!=-1) {
//关联表字典（举例：sys_user,realname,id）
@@ -145,7 +147,7 @@ public class SysDictController {
result.setResult(ls);
log.info(result.toString());
} catch (Exception e) {
- log.info(e.getMessage());
+ log.error(e.getMessage(),e);
result.error500("操作失败");
return result;
}
@@ -168,7 +170,7 @@ public class SysDictController {
result.setSuccess(true);
result.setResult(text);
} catch (Exception e) {
- log.info(e.getMessage());
+ log.error(e.getMessage(),e);
result.error500("操作失败");
return result;
}
@@ -188,8 +190,7 @@ public class SysDictController {
sysDictService.save(sysDict);
result.success("保存成功！");
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.error(e.getMessage(),e);
result.error500("操作失败");
}
return result;
@@ -230,8 +231,9 @@ public class SysDictController {
if(sysDict==null) {
result.error500("未找到对应实体");
}else {
- sysDict.setDelFlag(2);
- boolean ok = sysDictService.updateById(sysDict);
+ //update-begin--Author:huangzhilin Date:20140417 for：[bugfree号]数据字典增加级联删除功能--------------------
+ boolean ok = sysDictService.deleteByDictId(sysDict);
+ //update-begin--Author:huangzhilin Date:20140417 for：[bugfree号]数据字典增加级联删除功能--------------------
if(ok) {
result.success("删除成功!");
}
@@ -269,22 +271,9 @@ public class SysDictController {
* @param response
*/
@RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+ public ModelAndView exportXls(SysDict sysDict,HttpServletRequest request) {
// Step.1 组装查询条件
- QueryWrapper<SysDict> queryWrapper = null;
- try {
- String paramsStr = request.getParameter("paramsStr");
- if (oConvertUtils.isNotEmpty(paramsStr)) {
- String deString = URLDecoder.decode(paramsStr, "UTF-8");
- SysDict sysDict = JSON.parseObject(deString, SysDict.class);
- queryWrapper = QueryGenerator.initQueryWrapper(sysDict, request.getParameterMap());
- log.info(paramsStr);
- log.info(sysDict.toString());
- }
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
-
+ QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict, request.getParameterMap());
//Step.2 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
List<SysDictPage> pageList = new ArrayList<SysDictPage>();
@@ -339,8 +328,8 @@ public class SysDictController {
}
return Result.ok("文件导入成功！");
} catch (Exception e) {
- log.error(e.toString());
- return Result.ok("文件导入失败！");
+ log.error(e.getMessage(),e);
+ return Result.error("文件导入失败:"+e.getMessage());
} finally {
try {
file.getInputStream().close();
@@ -349,7 +338,7 @@ public class SysDictController {
}
}
}
- return Result.ok("文件导入失败！");
+ return Result.error("文件导入失败！");
}
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java
index e7584d6..be54e56 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java
@@ -30,7 +30,7 @@ import lombok.extern.slf4j.Slf4j;
* 前端控制器
* </p>
*
- * @author zhangweijian
+ * @Author zhangweijian
* @since 2018-12-28
*/
@RestController
@@ -76,8 +76,7 @@ public class SysDictItemController {
sysDictItemService.save(sysDictItem);
result.success("保存成功！");
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.error(e.getMessage(),e);
result.error500("操作失败");
}
return result;
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysLogController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysLogController.java
index e4347f6..9409845 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysLogController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysLogController.java
@@ -28,7 +28,7 @@ import lombok.extern.slf4j.Slf4j;
* 系统日志表 前端控制器
* </p>
*
- * @author zhangweijian
+ * @Author zhangweijian
* @since 2018-12-26
*/
@RestController
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
index 044e6ae..36c2f94 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
@@ -1,18 +1,15 @@
package org.jeecg.modules.system.controller;
-
import java.util.ArrayList;
-
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.shiro.authz.annotation.RequiresRoles;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.util.MD5Util;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.system.entity.SysPermission;
@@ -25,6 +22,7 @@ import org.jeecg.modules.system.service.ISysPermissionService;
import org.jeecg.modules.system.service.ISysRolePermissionService;
import org.jeecg.modules.system.util.PermissionDataUtil;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -43,26 +41,26 @@ import lombok.extern.slf4j.Slf4j;
* 菜单权限表 前端控制器
* </p>
*
- * @author scott
+ * @Author scott
* @since 2018-12-21
*/
@Slf4j
@RestController
@RequestMapping("/sys/permission")
public class SysPermissionController {
-
+
@Autowired
private ISysPermissionService sysPermissionService;
-
+
@Autowired
private ISysRolePermissionService sysRolePermissionService;
-
+
@Autowired
private ISysPermissionDataRuleService sysPermissionDataRuleService;
-
-
+
/**
* 加载数据节点
+ *
* @return
*/
@RequestMapping(value = "/list", method = RequestMethod.GET)
@@ -78,36 +76,80 @@ public class SysPermissionController {
result.setResult(treeList);
result.setSuccess(true);
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e.getMessage(), e);
}
return result;
}
-
-
+
+// /**
+// * 查询用户拥有的菜单权限和按钮权限（根据用户账号）
+// *
+// * @return
+// */
+// @RequestMapping(value = "/queryByUser", method = RequestMethod.GET)
+// public Result<JSONArray> queryByUser(HttpServletRequest req) {
+// Result<JSONArray> result = new Result<>();
+// try {
+// String username = req.getParameter("username");
+// List<SysPermission> metaList = sysPermissionService.queryByUser(username);
+// JSONArray jsonArray = new JSONArray();
+// this.getPermissionJsonArray(jsonArray, metaList, null);
+// result.setResult(jsonArray);
+// result.success("查询成功");
+// } catch (Exception e) {
+// result.error500("查询失败:" + e.getMessage());
+// log.error(e.getMessage(), e);
+// }
+// return result;
+// }
+
/**
- * 查询用户拥有的菜单权限和按钮权限（根据用户账号）
+ * 查询用户拥有的菜单权限和按钮权限（根据TOKEN）
+ *
* @return
*/
- @RequestMapping(value = "/queryByUser", method = RequestMethod.GET)
- public Result<JSONArray> queryByUser(HttpServletRequest req) {
- Result<JSONArray> result = new Result<>();
+ @RequestMapping(value = "/getUserPermissionByToken", method = RequestMethod.GET)
+ public Result<?> getUserPermissionByToken(@RequestParam(name = "token", required = true) String token) {
+ Result<JSONObject> result = new Result<JSONObject>();
try {
- String username = req.getParameter("username");
+ if (oConvertUtils.isEmpty(token)) {
+ return Result.error("TOKEN不允许为空！");
+ }
+ log.info(" ------ 通过令牌获取用户拥有的访问菜单 ---- TOKEN ------ " + token);
+ String username = JwtUtil.getUsername(token);
List<SysPermission> metaList = sysPermissionService.queryByUser(username);
- JSONArray jsonArray = new JSONArray();
- this.getPermissionJsonArray(jsonArray, metaList, null);
- result.setResult(jsonArray);
+ PermissionDataUtil.addIndexPage(metaList);
+ JSONObject json = new JSONObject();
+ JSONArray menujsonArray = new JSONArray();
+ this.getPermissionJsonArray(menujsonArray, metaList, null);
+ JSONArray authjsonArray = new JSONArray();
+ this.getAuthJsonArray(authjsonArray, metaList);
+ //查询所有的权限
+ LambdaQueryWrapper<SysPermission> query = new LambdaQueryWrapper<SysPermission>();
+ query.eq(SysPermission::getDelFlag, 0);
+ query.eq(SysPermission::getMenuType, 2);
+ //query.eq(SysPermission::getStatus, "1");
+ List<SysPermission> allAuthList = sysPermissionService.list(query);
+ JSONArray allauthjsonArray = new JSONArray();
+ this.getAllAuthJsonArray(allauthjsonArray, allAuthList);
+ json.put("menu", menujsonArray);
+ json.put("auth", authjsonArray);
+ json.put("allAuth", allauthjsonArray);
+ result.setResult(json);
result.success("查询成功");
} catch (Exception e) {
- result.error500("查询失败:"+e.getMessage());
- e.printStackTrace();
+ result.error500("查询失败:" + e.getMessage());
+ log.error(e.getMessage(), e);
}
return result;
}
-
-
-
+ /**
+ * 添加菜单
+ * @param permission
+ * @return
+ */
+ @RequiresRoles({ "admin" })
@RequestMapping(value = "/add", method = RequestMethod.POST)
public Result<SysPermission> add(@RequestBody SysPermission permission) {
Result<SysPermission> result = new Result<SysPermission>();
@@ -116,14 +158,20 @@ public class SysPermissionController {
sysPermissionService.addPermission(permission);
result.success("添加成功！");
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.error(e.getMessage(), e);
result.error500("操作失败");
}
return result;
}
-
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+
+ /**
+ * 编辑菜单
+ * @param permission
+ * @return
+ */
+ @RequiresRoles({ "admin" })
+ @CacheEvict(value="loginUser_cacheRules", allEntries=true)
+ @RequestMapping(value = "/edit", method = { RequestMethod.PUT, RequestMethod.POST })
public Result<SysPermission> edit(@RequestBody SysPermission permission) {
Result<SysPermission> result = new Result<>();
try {
@@ -131,287 +179,348 @@ public class SysPermissionController {
sysPermissionService.editPermission(permission);
result.success("修改成功！");
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.error(e.getMessage(), e);
result.error500("操作失败");
}
return result;
}
-
+
+ /**
+ * 删除菜单
+ * @param id
+ * @return
+ */
+ @RequiresRoles({ "admin" })
+ @CacheEvict(value="loginUser_cacheRules", allEntries=true)
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
- public Result<SysPermission> delete(@RequestParam(name="id",required=true) String id) {
+ public Result<SysPermission> delete(@RequestParam(name = "id", required = true) String id) {
Result<SysPermission> result = new Result<>();
try {
sysPermissionService.deletePermission(id);
sysPermissionService.deletePermRuleByPermId(id);
result.success("删除成功!");
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e.getMessage(), e);
result.error500(e.getMessage());
}
return result;
}
-
-
+
+ /**
+ * 批量删除菜单
+ * @param ids
+ * @return
+ */
+ @RequiresRoles({ "admin" })
+ @CacheEvict(value="loginUser_cacheRules", allEntries=true)
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
- public Result<SysPermission> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ public Result<SysPermission> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
Result<SysPermission> result = new Result<>();
try {
String arr[] = ids.split(",");
for (String id : arr) {
- if(oConvertUtils.isNotEmpty(id)) {
+ if (oConvertUtils.isNotEmpty(id)) {
sysPermissionService.deletePermission(id);
}
}
result.success("删除成功!");
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e.getMessage(), e);
result.error500("删除成功!");
}
return result;
}
-
+
/**
- * 获取全部的权限树
+ * 获取全部的权限树
+ *
* @return
*/
@RequestMapping(value = "/queryTreeList", method = RequestMethod.GET)
- public Result<Map<String,Object>> queryTreeList() {
- Result<Map<String,Object>> result = new Result<>();
- //全部权限ids
+ public Result<Map<String, Object>> queryTreeList() {
+ Result<Map<String, Object>> result = new Result<>();
+ // 全部权限ids
List<String> ids = new ArrayList<>();
try {
LambdaQueryWrapper<SysPermission> query = new LambdaQueryWrapper<SysPermission>();
query.eq(SysPermission::getDelFlag, 0);
query.orderByAsc(SysPermission::getSortNo);
List<SysPermission> list = sysPermissionService.list(query);
- for(SysPermission sysPer : list) {
+ for (SysPermission sysPer : list) {
ids.add(sysPer.getId());
}
List<TreeModel> treeList = new ArrayList<>();
getTreeModelList(treeList, list, null);
-
- Map<String,Object> resMap = new HashMap<String,Object>();
- resMap.put("treeList", treeList); //全部树节点数据
- resMap.put("ids", ids);//全部树ids
+
+ Map<String, Object> resMap = new HashMap<String, Object>();
+ resMap.put("treeList", treeList); // 全部树节点数据
+ resMap.put("ids", ids);// 全部树ids
result.setResult(resMap);
result.setSuccess(true);
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e.getMessage(), e);
}
return result;
}
+
/**
* 异步加载数据节点
+ *
* @return
*/
@RequestMapping(value = "/queryListAsync", method = RequestMethod.GET)
- public Result<List<TreeModel>> queryAsync(@RequestParam(name="pid",required=false) String parentId) {
+ public Result<List<TreeModel>> queryAsync(@RequestParam(name = "pid", required = false) String parentId) {
Result<List<TreeModel>> result = new Result<>();
try {
List<TreeModel> list = sysPermissionService.queryListByParentId(parentId);
- if(list==null||list.size()<=0) {
+ if (list == null || list.size() <= 0) {
result.error500("未找到角色信息");
- }else {
+ } else {
result.setResult(list);
result.setSuccess(true);
}
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e.getMessage(), e);
}
-
+
return result;
}
-
-
-
+
/**
- * 查询角色授权
+ * 查询角色授权
+ *
* @return
*/
@RequestMapping(value = "/queryRolePermission", method = RequestMethod.GET)
- public Result<List<String>> queryRolePermission(@RequestParam(name="roleId",required=true) String roleId) {
+ public Result<List<String>> queryRolePermission(@RequestParam(name = "roleId", required = true) String roleId) {
Result<List<String>> result = new Result<>();
try {
List<SysRolePermission> list = sysRolePermissionService.list(new QueryWrapper<SysRolePermission>().lambda().eq(SysRolePermission::getRoleId, roleId));
result.setResult(list.stream().map(SysRolePermission -> String.valueOf(SysRolePermission.getPermissionId())).collect(Collectors.toList()));
result.setSuccess(true);
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e.getMessage(), e);
}
return result;
}
-
+
/**
- * 保存角色授权
+ * 保存角色授权
+ *
* @return
*/
@RequestMapping(value = "/saveRolePermission", method = RequestMethod.POST)
+ @RequiresRoles({ "admin" })
public Result<String> saveRolePermission(@RequestBody JSONObject json) {
+ long start = System.currentTimeMillis();
Result<String> result = new Result<>();
try {
String roleId = json.getString("roleId");
String permissionIds = json.getString("permissionIds");
- this.sysRolePermissionService.saveRolePermission(roleId, permissionIds);
+ String lastPermissionIds = json.getString("lastpermissionIds");
+ this.sysRolePermissionService.saveRolePermission(roleId, permissionIds, lastPermissionIds);
result.success("保存成功！");
+ log.info("======角色授权成功=====耗时:" + (System.currentTimeMillis() - start) + "毫秒");
} catch (Exception e) {
result.error500("授权失败！");
- e.printStackTrace();
+ log.error(e.getMessage(), e);
}
return result;
}
-
-
- private void getTreeList(List<SysPermissionTree> treeList,List<SysPermission> metaList,SysPermissionTree temp) {
+
+ private void getTreeList(List<SysPermissionTree> treeList, List<SysPermission> metaList, SysPermissionTree temp) {
for (SysPermission permission : metaList) {
String tempPid = permission.getParentId();
SysPermissionTree tree = new SysPermissionTree(permission);
- if(temp==null && oConvertUtils.isEmpty(tempPid)) {
+ if (temp == null && oConvertUtils.isEmpty(tempPid)) {
treeList.add(tree);
- if(!tree.getIsLeaf()) {
+ if (!tree.getIsLeaf()) {
getTreeList(treeList, metaList, tree);
}
- }else if(temp!=null && tempPid!=null && tempPid.equals(temp.getId())){
+ } else if (temp != null && tempPid != null && tempPid.equals(temp.getId())) {
temp.getChildren().add(tree);
- if(!tree.getIsLeaf()) {
+ if (!tree.getIsLeaf()) {
getTreeList(treeList, metaList, tree);
}
}
-
+
}
}
-
- private void getTreeModelList(List<TreeModel> treeList,List<SysPermission> metaList,TreeModel temp) {
+
+ private void getTreeModelList(List<TreeModel> treeList, List<SysPermission> metaList, TreeModel temp) {
for (SysPermission permission : metaList) {
String tempPid = permission.getParentId();
TreeModel tree = new TreeModel(permission);
- if(temp==null && oConvertUtils.isEmpty(tempPid)) {
+ if (temp == null && oConvertUtils.isEmpty(tempPid)) {
treeList.add(tree);
- if(!tree.getIsLeaf()) {
+ if (!tree.getIsLeaf()) {
getTreeModelList(treeList, metaList, tree);
}
- }else if(temp!=null && tempPid!=null && tempPid.equals(temp.getKey())){
+ } else if (temp != null && tempPid != null && tempPid.equals(temp.getKey())) {
temp.getChildren().add(tree);
- if(!tree.getIsLeaf()) {
+ if (!tree.getIsLeaf()) {
getTreeModelList(treeList, metaList, tree);
}
}
-
+
}
}
+
/**
- * 获取菜单JSON数组
+ * 获取权限JSON数组
+ * @param jsonArray
+ * @param metaList
+ * @param parentJson
+ */
+ private void getAllAuthJsonArray(JSONArray jsonArray,List<SysPermission> allList) {
+ JSONObject json = null;
+ for (SysPermission permission : allList) {
+ json = new JSONObject();
+ json.put("action", permission.getPerms());
+ json.put("status", permission.getStatus());
+ json.put("type", permission.getPermsType());
+ json.put("describe", permission.getName());
+ jsonArray.add(json);
+ }
+ }
+
+ /**
+ * 获取权限JSON数组
* @param jsonArray
* @param metaList
* @param parentJson
*/
- private void getPermissionJsonArray(JSONArray jsonArray,List<SysPermission> metaList,JSONObject parentJson) {
+ private void getAuthJsonArray(JSONArray jsonArray,List<SysPermission> metaList) {
for (SysPermission permission : metaList) {
if(permission.getMenuType()==null) {
continue;
}
+ JSONObject json = null;
+ if(permission.getMenuType()==2&&"1".equals(permission.getStatus())) {
+ json = new JSONObject();
+ json.put("action", permission.getPerms());
+ json.put("type", permission.getPermsType());
+ json.put("describe", permission.getName());
+ jsonArray.add(json);
+ }
+ }
+ }
+ /**
+ * 获取菜单JSON数组
+ * @param jsonArray
+ * @param metaList
+ * @param parentJson
+ */
+ private void getPermissionJsonArray(JSONArray jsonArray, List<SysPermission> metaList, JSONObject parentJson) {
+ for (SysPermission permission : metaList) {
+ if (permission.getMenuType() == null) {
+ continue;
+ }
String tempPid = permission.getParentId();
JSONObject json = getPermissionJsonObject(permission);
- if(parentJson==null && oConvertUtils.isEmpty(tempPid)) {
+ if(json==null) {
+ continue;
+ }
+ if (parentJson == null && oConvertUtils.isEmpty(tempPid)) {
jsonArray.add(json);
- if(!permission.isLeaf()) {
+ if (!permission.isLeaf()) {
getPermissionJsonArray(jsonArray, metaList, json);
}
- }else if(parentJson!=null && oConvertUtils.isNotEmpty(tempPid) && tempPid.equals(parentJson.getString("id"))){
- //类型( 0：一级菜单 1：子菜单 2：按钮 )
- if(permission.getMenuType()==2) {
+ } else if (parentJson != null && oConvertUtils.isNotEmpty(tempPid) && tempPid.equals(parentJson.getString("id"))) {
+ // 类型( 0：一级菜单 1：子菜单 2：按钮 )
+ if (permission.getMenuType() == 2) {
JSONObject metaJson = parentJson.getJSONObject("meta");
- if(metaJson.containsKey("permissionList")) {
+ if (metaJson.containsKey("permissionList")) {
metaJson.getJSONArray("permissionList").add(json);
- }else {
+ } else {
JSONArray permissionList = new JSONArray();
permissionList.add(json);
metaJson.put("permissionList", permissionList);
}
- //类型( 0：一级菜单 1：子菜单 2：按钮 )
- }else if(permission.getMenuType()==1|| permission.getMenuType()==0) {
- if(parentJson.containsKey("children")) {
+ // 类型( 0：一级菜单 1：子菜单 2：按钮 )
+ } else if (permission.getMenuType() == 1 || permission.getMenuType() == 0) {
+ if (parentJson.containsKey("children")) {
parentJson.getJSONArray("children").add(json);
- }else {
+ } else {
JSONArray children = new JSONArray();
children.add(json);
parentJson.put("children", children);
}
-
- if(!permission.isLeaf()) {
+
+ if (!permission.isLeaf()) {
getPermissionJsonArray(jsonArray, metaList, json);
}
}
}
-
-
+
}
}
-
+
private JSONObject getPermissionJsonObject(SysPermission permission) {
JSONObject json = new JSONObject();
- //类型(0：一级菜单 1：子菜单 2：按钮)
- if(permission.getMenuType()==2) {
- json.put("action", permission.getPerms());
- json.put("describe", permission.getName());
- }else if(permission.getMenuType()==0||permission.getMenuType()==1) {
+ // 类型(0：一级菜单 1：子菜单 2：按钮)
+ if (permission.getMenuType() == 2) {
+ //json.put("action", permission.getPerms());
+ //json.put("type", permission.getPermsType());
+ //json.put("describe", permission.getName());
+ return null;
+ } else if (permission.getMenuType() == 0 || permission.getMenuType() == 1) {
json.put("id", permission.getId());
- if(permission.isRoute()) {
- json.put("route", "1");//表示生成路由
- }else {
- json.put("route", "0");//表示不生成路由
+ if (permission.isRoute()) {
+ json.put("route", "1");// 表示生成路由
+ } else {
+ json.put("route", "0");// 表示不生成路由
}
-
- if(isWWWHttpUrl(permission.getUrl())) {
+
+ if (isWWWHttpUrl(permission.getUrl())) {
json.put("path", MD5Util.MD5Encode(permission.getUrl(), "utf-8"));
- }else {
+ } else {
json.put("path", permission.getUrl());
}
-
- //重要规则：路由name (通过URL生成路由name,路由name供前端开发，页面跳转使用)
- if(oConvertUtils.isNotEmpty(permission.getComponentName())) {
+
+ // 重要规则：路由name (通过URL生成路由name,路由name供前端开发，页面跳转使用)
+ if (oConvertUtils.isNotEmpty(permission.getComponentName())) {
json.put("name", permission.getComponentName());
- }else {
+ } else {
json.put("name", urlToRouteName(permission.getUrl()));
}
-
- //是否隐藏路由，默认都是显示的
- if(permission.isHidden()) {
- json.put("hidden",true);
+
+ // 是否隐藏路由，默认都是显示的
+ if (permission.isHidden()) {
+ json.put("hidden", true);
}
- //聚合路由
- if(permission.isAlwaysShow()) {
- json.put("alwaysShow",true);
+ // 聚合路由
+ if (permission.isAlwaysShow()) {
+ json.put("alwaysShow", true);
}
json.put("component", permission.getComponent());
JSONObject meta = new JSONObject();
- //默认所有的菜单都加路由缓存，提高系统性能
+ // 默认所有的菜单都加路由缓存，提高系统性能
meta.put("keepAlive", "true");
meta.put("title", permission.getName());
- if(oConvertUtils.isEmpty(permission.getParentId())) {
- //一级菜单跳转地址
- json.put("redirect",permission.getRedirect());
- if(oConvertUtils.isNotEmpty(permission.getIcon())) {
+ if (oConvertUtils.isEmpty(permission.getParentId())) {
+ // 一级菜单跳转地址
+ json.put("redirect", permission.getRedirect());
+ if (oConvertUtils.isNotEmpty(permission.getIcon())) {
meta.put("icon", permission.getIcon());
}
- }else {
- if(oConvertUtils.isNotEmpty(permission.getIcon())) {
+ } else {
+ if (oConvertUtils.isNotEmpty(permission.getIcon())) {
meta.put("icon", permission.getIcon());
}
}
- if(isWWWHttpUrl(permission.getUrl())) {
+ if (isWWWHttpUrl(permission.getUrl())) {
meta.put("url", permission.getUrl());
}
json.put("meta", meta);
}
-
+
return json;
}
-
+
/**
- * 判断是否外网URL 例如： http://localhost:8080/jeecg-boot/swagger-ui.html#/
- * 支持特殊格式： {{ window._CONFIG['domianURL'] }}/druid/
- * {{ JS代码片段 }}，前台解析会自动执行JS代码片段
+ * 判断是否外网URL 例如： http://localhost:8080/jeecg-boot/swagger-ui.html#/ 支持特殊格式： {{
+ * window._CONFIG['domianURL'] }}/druid/ {{ JS代码片段 }}，前台解析会自动执行JS代码片段
*
* @return
*/
@@ -421,28 +530,28 @@ public class SysPermissionController {
}
return false;
}
-
+
/**
- * 通过URL生成路由name（去掉URL前缀斜杠，替换内容中的斜杠‘/’为-）
- * 举例： URL = /isystem/role
- * RouteName = isystem-role
+ * 通过URL生成路由name（去掉URL前缀斜杠，替换内容中的斜杠‘/’为-） 举例： URL = /isystem/role RouteName =
+ * isystem-role
+ *
* @return
*/
private String urlToRouteName(String url) {
- if(oConvertUtils.isNotEmpty(url)) {
- if(url.startsWith("/")) {
+ if (oConvertUtils.isNotEmpty(url)) {
+ if (url.startsWith("/")) {
url = url.substring(1);
}
url = url.replace("/", "-");
-
- //特殊标记
+
+ // 特殊标记
url = url.replace(":", "@");
return url;
- }else {
+ } else {
return null;
}
}
-
+
/**
* 根据菜单id来获取其对应的权限数据
*
@@ -469,11 +578,10 @@ public class SysPermissionController {
Result<SysPermissionDataRule> result = new Result<SysPermissionDataRule>();
try {
sysPermissionDataRule.setCreateTime(new Date());
- sysPermissionDataRuleService.save(sysPermissionDataRule);
+ sysPermissionDataRuleService.savePermissionDataRule(sysPermissionDataRule);
result.success("添加成功！");
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.error(e.getMessage(), e);
result.error500("操作失败");
}
return result;
@@ -486,8 +594,7 @@ public class SysPermissionController {
sysPermissionDataRuleService.saveOrUpdate(sysPermissionDataRule);
result.success("更新成功！");
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.error(e.getMessage(), e);
result.error500("操作失败");
}
return result;
@@ -503,11 +610,10 @@ public class SysPermissionController {
public Result<SysPermissionDataRule> deletePermissionRule(@RequestParam(name = "id", required = true) String id) {
Result<SysPermissionDataRule> result = new Result<SysPermissionDataRule>();
try {
- sysPermissionDataRuleService.removeById(id);
+ sysPermissionDataRuleService.deletePermissionDataRule(id);
result.success("删除成功！");
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.error(e.getMessage(), e);
result.error500("操作失败");
}
return result;
@@ -527,11 +633,10 @@ public class SysPermissionController {
result.setResult(permRuleList);
result.success("查询成功！");
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.error(e.getMessage(), e);
result.error500("操作失败");
}
return result;
}
-
+
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java
index d02b9be..52dc2a2 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java
@@ -14,6 +14,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresRoles;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
@@ -22,6 +23,7 @@ import org.jeecg.modules.system.entity.SysPermission;
import org.jeecg.modules.system.entity.SysPermissionDataRule;
import org.jeecg.modules.system.entity.SysRole;
import org.jeecg.modules.system.entity.SysRolePermission;
+import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.model.TreeModel;
import org.jeecg.modules.system.service.ISysPermissionDataRuleService;
import org.jeecg.modules.system.service.ISysPermissionService;
@@ -33,6 +35,7 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
@@ -59,7 +62,7 @@ import lombok.extern.slf4j.Slf4j;
* 角色表 前端控制器
* </p>
*
- * @author scott
+ * @Author scott
* @since 2018-12-19
*/
@RestController
@@ -113,8 +116,7 @@ public class SysRoleController {
sysRoleService.save(role);
result.success("添加成功！");
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.error(e.getMessage(), e);
result.error500("操作失败");
}
return result;
@@ -125,6 +127,7 @@ public class SysRoleController {
* @param role
* @return
*/
+ @RequiresRoles({"admin"})
@RequestMapping(value = "/edit", method = RequestMethod.PUT)
public Result<SysRole> edit(@RequestBody SysRole role) {
Result<SysRole> result = new Result<SysRole>();
@@ -148,6 +151,8 @@ public class SysRoleController {
* @param id
* @return
*/
+ @RequiresRoles({"admin"})
+ @CacheEvict(value="loginUser_cacheRules", allEntries=true)
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
public Result<SysRole> delete(@RequestParam(name="id",required=true) String id) {
Result<SysRole> result = new Result<SysRole>();
@@ -169,6 +174,8 @@ public class SysRoleController {
* @param ids
* @return
*/
+ @RequiresRoles({"admin"})
+ @CacheEvict(value="loginUser_cacheRules", allEntries=true)
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
public Result<SysRole> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
Result<SysRole> result = new Result<SysRole>();
@@ -256,20 +263,9 @@ public class SysRoleController {
* @param response
*/
@RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+ public ModelAndView exportXls(SysRole sysRole,HttpServletRequest request) {
// Step.1 组装查询条件
- QueryWrapper<SysRole> queryWrapper = null;
- try {
- String paramsStr = request.getParameter("paramsStr");
- if (oConvertUtils.isNotEmpty(paramsStr)) {
- String deString = URLDecoder.decode(paramsStr, "UTF-8");
- SysRole sysRole = JSON.parseObject(deString, SysRole.class);
- queryWrapper = QueryGenerator.initQueryWrapper(sysRole, request.getParameterMap());
- }
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
-
+ QueryWrapper<SysRole> queryWrapper = QueryGenerator.initQueryWrapper(sysRole, request.getParameterMap());
//Step.2 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
List<SysRole> pageList = sysRoleService.list(queryWrapper);
@@ -304,17 +300,17 @@ public class SysRoleController {
}
return Result.ok("文件导入成功！数据行数：" + listSysRoles.size());
} catch (Exception e) {
- log.error(e.getMessage());
- return Result.error("文件导入失败！");
+ log.error(e.getMessage(), e);
+ return Result.error("文件导入失败:"+e.getMessage());
} finally {
try {
file.getInputStream().close();
} catch (IOException e) {
- e.printStackTrace();
+ log.error(e.getMessage(), e);
}
}
}
- return Result.ok("文件导入失败！");
+ return Result.error("文件导入失败！");
}
/**
@@ -366,8 +362,7 @@ public class SysRoleController {
this.sysRolePermissionService.updateById(sysRolePermission);
}
} catch (Exception e) {
- e.printStackTrace();
- log.info("SysRoleController.saveDatarule()发生异常：" + e.getMessage());
+ log.error("SysRoleController.saveDatarule()发生异常：" + e.getMessage());
return Result.error("保存失败");
}
return Result.ok("保存成功!");
@@ -390,13 +385,6 @@ public class SysRoleController {
query.orderByAsc(SysPermission::getSortNo);
List<SysPermission> list = sysPermissionService.list(query);
for(SysPermission sysPer : list) {
- //查询菜单数据规则配置如果有数据 则需要在前端显示一个小图标
- int dtCount = sysPermissionDataRuleService.count(new LambdaQueryWrapper<SysPermissionDataRule>().eq(SysPermissionDataRule::getPermissionId, sysPer.getId()));
- if(dtCount>0) {
- sysPer.setIcon("1");
- }else {
- sysPer.setIcon(null);
- }
ids.add(sysPer.getId());
}
List<TreeModel> treeList = new ArrayList<>();
@@ -407,7 +395,7 @@ public class SysRoleController {
result.setResult(resMap);
result.setSuccess(true);
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e.getMessage(), e);
}
return result;
}
@@ -415,7 +403,7 @@ public class SysRoleController {
private void getTreeModelList(List<TreeModel> treeList,List<SysPermission> metaList,TreeModel temp) {
for (SysPermission permission : metaList) {
String tempPid = permission.getParentId();
- TreeModel tree = new TreeModel(permission.getId(), tempPid, permission.getName(),permission.getIcon(), permission.isLeaf());
+ TreeModel tree = new TreeModel(permission.getId(), tempPid, permission.getName(),permission.getRuleFlag(), permission.isLeaf());
if(temp==null && oConvertUtils.isEmpty(tempPid)) {
treeList.add(tree);
if(!tree.getIsLeaf()) {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserAgentController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserAgentController.java
new file mode 100644
index 0000000..6555a1d
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserAgentController.java
@@ -0,0 +1,255 @@
+package org.jeecg.modules.system.controller;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.system.entity.SysUserAgent;
+import org.jeecg.modules.system.service.ISysUserAgentService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import lombok.extern.slf4j.Slf4j;
+
+ /**
+ * @Title: Controller
+ * @Description: 用户代理人设置
+ * @Author: jeecg-boot
+ * @Date: 2019-04-17
+ * @Version: V1.0
+ */
+@RestController
+@RequestMapping("/system/sysUserAgent")
+@Slf4j
+public class SysUserAgentController {
+ @Autowired
+ private ISysUserAgentService sysUserAgentService;
+
+ /**
+ * 分页列表查询
+ * @param sysUserAgent
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @GetMapping(value = "/list")
+ public Result<IPage<SysUserAgent>> queryPageList(SysUserAgent sysUserAgent,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ Result<IPage<SysUserAgent>> result = new Result<IPage<SysUserAgent>>();
+ QueryWrapper<SysUserAgent> queryWrapper = QueryGenerator.initQueryWrapper(sysUserAgent, req.getParameterMap());
+ Page<SysUserAgent> page = new Page<SysUserAgent>(pageNo, pageSize);
+ IPage<SysUserAgent> pageList = sysUserAgentService.page(page, queryWrapper);
+ result.setSuccess(true);
+ result.setResult(pageList);
+ return result;
+ }
+
+ /**
+ * 添加
+ * @param sysUserAgent
+ * @return
+ */
+ @PostMapping(value = "/add")
+ public Result<SysUserAgent> add(@RequestBody SysUserAgent sysUserAgent) {
+ Result<SysUserAgent> result = new Result<SysUserAgent>();
+ try {
+ sysUserAgentService.save(sysUserAgent);
+ result.success("代理人设置成功！");
+ } catch (Exception e) {
+ log.error(e.getMessage(),e);
+ result.error500("操作失败");
+ }
+ return result;
+ }
+
+ /**
+ * 编辑
+ * @param sysUserAgent
+ * @return
+ */
+ @PutMapping(value = "/edit")
+ public Result<SysUserAgent> edit(@RequestBody SysUserAgent sysUserAgent) {
+ Result<SysUserAgent> result = new Result<SysUserAgent>();
+ SysUserAgent sysUserAgentEntity = sysUserAgentService.getById(sysUserAgent.getId());
+ if(sysUserAgentEntity==null) {
+ result.error500("未找到对应实体");
+ }else {
+ boolean ok = sysUserAgentService.updateById(sysUserAgent);
+ //TODO 返回false说明什么？
+ if(ok) {
+ result.success("代理人设置成功!");
+ }
+ }
+
+ return result;
+ }
+
+ /**
+ * 通过id删除
+ * @param id
+ * @return
+ */
+ @DeleteMapping(value = "/delete")
+ public Result<SysUserAgent> delete(@RequestParam(name="id",required=true) String id) {
+ Result<SysUserAgent> result = new Result<SysUserAgent>();
+ SysUserAgent sysUserAgent = sysUserAgentService.getById(id);
+ if(sysUserAgent==null) {
+ result.error500("未找到对应实体");
+ }else {
+ boolean ok = sysUserAgentService.removeById(id);
+ if(ok) {
+ result.success("删除成功!");
+ }
+ }
+
+ return result;
+ }
+
+ /**
+ * 批量删除
+ * @param ids
+ * @return
+ */
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<SysUserAgent> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ Result<SysUserAgent> result = new Result<SysUserAgent>();
+ if(ids==null || "".equals(ids.trim())) {
+ result.error500("参数不识别！");
+ }else {
+ this.sysUserAgentService.removeByIds(Arrays.asList(ids.split(",")));
+ result.success("删除成功!");
+ }
+ return result;
+ }
+
+ /**
+ * 通过id查询
+ * @param id
+ * @return
+ */
+ @GetMapping(value = "/queryById")
+ public Result<SysUserAgent> queryById(@RequestParam(name="id",required=true) String id) {
+ Result<SysUserAgent> result = new Result<SysUserAgent>();
+ SysUserAgent sysUserAgent = sysUserAgentService.getById(id);
+ if(sysUserAgent==null) {
+ result.error500("未找到对应实体");
+ }else {
+ result.setResult(sysUserAgent);
+ result.setSuccess(true);
+ }
+ return result;
+ }
+
+ /**
+ * 通过userName查询
+ * @param userName
+ * @return
+ */
+ @GetMapping(value = "/queryByUserName")
+ public Result<SysUserAgent> queryByUserName(@RequestParam(name="userName",required=true) String userName) {
+ Result<SysUserAgent> result = new Result<SysUserAgent>();
+ LambdaQueryWrapper<SysUserAgent> queryWrapper = new LambdaQueryWrapper<SysUserAgent>();
+ queryWrapper.eq(SysUserAgent::getUserName, userName);
+ SysUserAgent sysUserAgent = sysUserAgentService.getOne(queryWrapper);
+ if(sysUserAgent==null) {
+ result.error500("未找到对应实体");
+ }else {
+ result.setResult(sysUserAgent);
+ result.setSuccess(true);
+ }
+ return result;
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param response
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(SysUserAgent sysUserAgent,HttpServletRequest request) {
+ // Step.1 组装查询条件
+ QueryWrapper<SysUserAgent> queryWrapper = QueryGenerator.initQueryWrapper(sysUserAgent, request.getParameterMap());
+ //Step.2 AutoPoi 导出Excel
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ List<SysUserAgent> pageList = sysUserAgentService.list(queryWrapper);
+ //导出文件名称
+ mv.addObject(NormalExcelConstants.FILE_NAME, "用户代理人设置列表");
+ mv.addObject(NormalExcelConstants.CLASS, SysUserAgent.class);
+ mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("用户代理人设置列表数据", "导出人:Jeecg", "导出信息"));
+ mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+ return mv;
+ }
+
+ /**
+ * 通过excel导入数据
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+ for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+ MultipartFile file = entity.getValue();// 获取上传文件对象
+ ImportParams params = new ImportParams();
+ params.setTitleRows(2);
+ params.setHeadRows(1);
+ params.setNeedSave(true);
+ try {
+ List<SysUserAgent> listSysUserAgents = ExcelImportUtil.importExcel(file.getInputStream(), SysUserAgent.class, params);
+ for (SysUserAgent sysUserAgentExcel : listSysUserAgents) {
+ sysUserAgentService.save(sysUserAgentExcel);
+ }
+ return Result.ok("文件导入成功！数据行数：" + listSysUserAgents.size());
+ } catch (Exception e) {
+ log.error(e.getMessage(),e);
+ return Result.error("文件导入失败！");
+ } finally {
+ try {
+ file.getInputStream().close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ return Result.error("文件导入失败！");
+ }
+
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
index e0aee18..47ff8df 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -2,10 +2,9 @@ package org.jeecg.modules.system.controller;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -14,20 +13,23 @@ import java.util.UUID;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.authz.annotation.RequiresRoles;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.PasswordUtil;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysRole;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.entity.SysUserDepart;
import org.jeecg.modules.system.entity.SysUserRole;
import org.jeecg.modules.system.model.DepartIdModel;
import org.jeecg.modules.system.model.SysUserDepartsVO;
+import org.jeecg.modules.system.service.ISysDepartService;
import org.jeecg.modules.system.service.ISysUserDepartService;
import org.jeecg.modules.system.service.ISysUserRoleService;
import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.vo.SysDepartUsersVO;
+import org.jeecg.modules.system.vo.SysUserRoleVO;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -39,6 +41,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -49,16 +54,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
/**
* <p>
* 用户表 前端控制器
* </p>
*
- * @author scott
+ * @Author scott
* @since 2018-12-20
*/
@Slf4j
@@ -69,6 +71,9 @@ public class SysUserController {
@Autowired
private ISysUserService sysUserService;
+ @Autowired
+ private ISysDepartService sysDepartService;
+
@Autowired
private ISysUserRoleService sysUserRoleService;
@@ -91,6 +96,7 @@ public class SysUserController {
}
@RequestMapping(value = "/add", method = RequestMethod.POST)
+ @RequiresPermissions("user:add")
public Result<SysUser> add(@RequestBody JSONObject jsonObject) {
Result<SysUser> result = new Result<SysUser>();
String selectedRoles = jsonObject.getString("selectedroles");
@@ -106,14 +112,14 @@ public class SysUserController {
sysUserService.addUserWithRole(user, selectedRoles);
result.success("添加成功！");
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.error(e.getMessage(), e);
result.error500("操作失败");
}
return result;
}
@RequestMapping(value = "/edit", method = RequestMethod.PUT)
+ @RequiresPermissions("user:edit")
public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
Result<SysUser> result = new Result<SysUser>();
try {
@@ -130,13 +136,16 @@ public class SysUserController {
result.success("修改成功!");
}
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.error(e.getMessage(), e);
result.error500("操作失败");
}
return result;
}
+ /**
+ * 删除用户
+ */
+ @RequiresRoles({"admin"})
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
public Result<SysUser> delete(@RequestParam(name="id",required=true) String id) {
Result<SysUser> result = new Result<SysUser>();
@@ -158,6 +167,10 @@ public class SysUserController {
return result;
}
+ /**
+ * 批量删除用户
+ */
+ @RequiresRoles({"admin"})
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
public Result<SysUser> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
// 定义SysUserDepart实体类的数据库查询对象LambdaQueryWrapper
@@ -183,7 +196,7 @@ public class SysUserController {
* @param jsonObject
* @return
*/
-
+ @RequiresRoles({"admin"})
@RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT)
public Result<SysUser> frozenBatch(@RequestBody JSONObject jsonObject) {
Result<SysUser> result = new Result<SysUser>();
@@ -198,7 +211,7 @@ public class SysUserController {
}
}
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e.getMessage(), e);
result.error500("操作失败"+e.getMessage());
}
result.success("操作成功!");
@@ -287,6 +300,7 @@ public class SysUserController {
/**
* 修改密码
*/
+ @RequiresRoles({"admin"})
@RequestMapping(value = "/changPassword", method = RequestMethod.PUT)
public Result<SysUser> changPassword(@RequestBody SysUser sysUser) {
Result<SysUser> result = new Result<SysUser>();
@@ -317,7 +331,7 @@ public class SysUserController {
Result<List<DepartIdModel>> result = new Result<>();
try {
List<DepartIdModel> depIdModelList = this.sysUserDepartService.queryDepartIdsOfUser(userId);
- if (depIdModelList != null || depIdModelList.size() > 0) {
+ if (depIdModelList != null && depIdModelList.size() > 0) {
result.setSuccess(true);
result.setMessage("查找成功");
result.setResult(depIdModelList);
@@ -327,7 +341,7 @@ public class SysUserController {
}
return result;
} catch (Exception e) {
- e.fillInStackTrace();
+ log.error(e.getMessage(), e);
result.setSuccess(false);
result.setMessage("查找过程中出现了异常: " + e.getMessage());
return result;
@@ -354,7 +368,7 @@ public class SysUserController {
}
return result;
} catch (Exception e) {
- e.fillInStackTrace();
+ log.error(e.getMessage(), e);
result.setSuccess(true);
result.setMessage("添加数据的过程中出现市场了: " + e.getMessage());
return result;
@@ -412,7 +426,7 @@ public class SysUserController {
result.setResult(userList);
return result;
} catch (Exception e) {
- e.fillInStackTrace();
+ log.error(e.getMessage(), e);
result.setSuccess(false);
return result;
}
@@ -439,20 +453,9 @@ public class SysUserController {
* @param response
*/
@RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+ public ModelAndView exportXls(SysUser sysUser,HttpServletRequest request) {
// Step.1 组装查询条件
- QueryWrapper<SysUser> queryWrapper = null;
- try {
- String paramsStr = request.getParameter("paramsStr");
- if (oConvertUtils.isNotEmpty(paramsStr)) {
- String deString = URLDecoder.decode(paramsStr, "UTF-8");
- SysUser sysUser = JSON.parseObject(deString, SysUser.class);
- queryWrapper = QueryGenerator.initQueryWrapper(sysUser, request.getParameterMap());
- }
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
-
+ QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(sysUser, request.getParameterMap());
//Step.2 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
List<SysUser> pageList = sysUserService.list(queryWrapper);
@@ -472,6 +475,7 @@ public class SysUserController {
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ @RequiresPermissions("user:import")
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
@@ -492,16 +496,245 @@ public class SysUserController {
}
return Result.ok("文件导入成功！数据行数：" + listSysUsers.size());
} catch (Exception e) {
- log.error(e.getMessage());
- return Result.error("文件导入失败！");
+ log.error(e.getMessage(),e);
+ return Result.error("抱歉! 您导入的数据中用户名已经存在.");
} finally {
try {
file.getInputStream().close();
} catch (IOException e) {
- e.printStackTrace();
+ log.error(e.getMessage(), e);
+ }
+ }
+ }
+ return Result.error("文件导入失败！");
+ }
+
+ /**
+ * @功能：根据id 批量查询
+ * @param userIds
+ * @return
+ */
+ @RequestMapping(value = "/queryByIds", method = RequestMethod.GET)
+ public Result<Collection<SysUser>> queryByIds(@RequestParam String userIds) {
+ Result<Collection<SysUser>> result = new Result<>();
+ String[] userId = userIds.split(",");
+ Collection<String> idList = Arrays.asList(userId);
+ Collection<SysUser> userRole = sysUserService.listByIds(idList);
+ result.setSuccess(true);
+ result.setResult(userRole);
+ return result;
+ }
+
+ /**
+ * 首页密码修改
+ */
+ @RequiresRoles({"admin"})
+ @RequestMapping(value = "/updatePassword", method = RequestMethod.PUT)
+ public Result<SysUser> changPassword(@RequestBody JSONObject json) {
+ Result<SysUser> result = new Result<SysUser>();
+ String username = json.getString("username");
+ String oldpassword = json.getString("oldpassword");
+ SysUser user = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, username));
+ if(user==null) {
+ result.error500("未找到用户!");
+ return result;
+ }
+ String passwordEncode = PasswordUtil.encrypt(username, oldpassword, user.getSalt());
+ if(!user.getPassword().equals(passwordEncode)) {
+ result.error500("旧密码输入错误!");
+ return result;
+ }
+
+ String password = json.getString("password");
+ String confirmpassword = json.getString("confirmpassword");
+ if(oConvertUtils.isEmpty(password)) {
+ result.error500("新密码不存在!");
+ return result;
+ }
+
+ if(!password.equals(confirmpassword)) {
+ result.error500("两次输入密码不一致!");
+ return result;
+ }
+ String newpassword = PasswordUtil.encrypt(username, password, user.getSalt());
+ this.sysUserService.update(new SysUser().setPassword(newpassword), new LambdaQueryWrapper<SysUser>().eq(SysUser::getId, user.getId()));
+ result.success("密码修改完成！");
+ return result;
+ }
+
+ @RequestMapping(value = "/userRoleList", method = RequestMethod.GET)
+ public Result<IPage<SysUser>> userRoleList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
+ Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
+ Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
+ String roleId = req.getParameter("roleId");
+ String username = req.getParameter("username");
+ IPage<SysUser> pageList = sysUserService.getUserByRoleId(page,roleId,username);
+ result.setSuccess(true);
+ result.setResult(pageList);
+ return result;
+ }
+
+ /**
+ * 给指定角色添加用户
+ *
+ * @param
+ * @return
+ */
+ @RequestMapping(value = "/addSysUserRole", method = RequestMethod.POST)
+ public Result<String> addSysUserRole(@RequestBody SysUserRoleVO sysUserRoleVO) {
+ Result<String> result = new Result<String>();
+ try {
+ String sysRoleId = sysUserRoleVO.getRoleId();
+ for(String sysUserId:sysUserRoleVO.getUserIdList()) {
+ SysUserRole sysUserRole = new SysUserRole(sysUserId,sysRoleId);
+ QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<SysUserRole>();
+ queryWrapper.eq("role_id", sysRoleId).eq("user_id",sysUserId);
+ SysUserRole one = sysUserRoleService.getOne(queryWrapper);
+ if(one==null){
+ sysUserRoleService.save(sysUserRole);
+ }
+
+ }
+
+ result.setMessage("添加成功!");
+ result.setSuccess(true);
+ return result;
+ }catch(Exception e) {
+ log.error(e.getMessage(), e);
+ result.setSuccess(false);
+ result.setMessage("出错了: " + e.getMessage());
+ return result;
+ }
+ }
+ /**
+ * 删除指定角色的用户关系
+ * @param
+ * @return
+ */
+ @RequestMapping(value = "/deleteUserRole", method = RequestMethod.DELETE)
+ public Result<SysUserRole> deleteUserRole(@RequestParam(name="roleId") String roleId,
+ @RequestParam(name="userId",required=true) String userId
+ ) {
+ Result<SysUserRole> result = new Result<SysUserRole>();
+ try {
+ QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<SysUserRole>();
+ queryWrapper.eq("role_id", roleId).eq("user_id",userId);
+ sysUserRoleService.remove(queryWrapper);
+ result.success("删除成功!");
+ }catch(Exception e) {
+ log.error(e.getMessage(), e);
+ result.error500("删除失败！");
+ }
+ return result;
+ }
+
+ /**
+ * 批量删除指定角色的用户关系
+ *
+ * @param
+ * @return
+ */
+ @RequestMapping(value = "/deleteUserRoleBatch", method = RequestMethod.DELETE)
+ public Result<SysUserRole> deleteUserRoleBatch(
+ @RequestParam(name="roleId") String roleId,
+ @RequestParam(name="userIds",required=true) String userIds) {
+ Result<SysUserRole> result = new Result<SysUserRole>();
+ try {
+ QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<SysUserRole>();
+ queryWrapper.eq("role_id", roleId).in("user_id",Arrays.asList(userIds.split(",")));
+ sysUserRoleService.remove(queryWrapper);
+ result.success("删除成功!");
+ }catch(Exception e) {
+ log.error(e.getMessage(), e);
+ result.error500("删除失败！");
+ }
+ return result;
+ }
+
+ /**
+ * 部门用户列表
+ */
+ @RequestMapping(value = "/departUserList", method = RequestMethod.GET)
+ public Result<IPage<SysUser>> departUserList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
+ Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
+ Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
+ String depId = req.getParameter("depId");
+ String username = req.getParameter("username");
+ IPage<SysUser> pageList = sysUserService.getUserByDepId(page,depId,username);
+ result.setSuccess(true);
+ result.setResult(pageList);
+ return result;
+ }
+
+ /**
+ * 给指定部门添加对应的用户
+ */
+ @RequestMapping(value = "/editSysDepartWithUser", method = RequestMethod.POST)
+ public Result<String> editSysDepartWithUser(@RequestBody SysDepartUsersVO sysDepartUsersVO) {
+ Result<String> result = new Result<String>();
+ try {
+ String sysDepId = sysDepartUsersVO.getDepId();
+ for(String sysUserId:sysDepartUsersVO.getUserIdList()) {
+ SysUserDepart sysUserDepart = new SysUserDepart(null,sysUserId,sysDepId);
+ QueryWrapper<SysUserDepart> queryWrapper = new QueryWrapper<SysUserDepart>();
+ queryWrapper.eq("dep_id", sysDepId).eq("user_id",sysUserId);
+ SysUserDepart one = sysUserDepartService.getOne(queryWrapper);
+ if(one==null){
+ sysUserDepartService.save(sysUserDepart);
}
}
+
+ result.setMessage("添加成功!");
+ result.setSuccess(true);
+ return result;
+ }catch(Exception e) {
+ log.error(e.getMessage(), e);
+ result.setSuccess(false);
+ result.setMessage("出错了: " + e.getMessage());
+ return result;
+ }
+ }
+
+ /**
+ * 删除指定机构的用户关系
+ */
+ @RequestMapping(value = "/deleteUserInDepart", method = RequestMethod.DELETE)
+ public Result<SysUserDepart> deleteUserInDepart(@RequestParam(name="depId") String depId,
+ @RequestParam(name="userId",required=true) String userId
+ ) {
+ Result<SysUserDepart> result = new Result<SysUserDepart>();
+ try {
+ QueryWrapper<SysUserDepart> queryWrapper = new QueryWrapper<SysUserDepart>();
+ queryWrapper.eq("dep_id", depId).eq("user_id",userId);
+ sysUserDepartService.remove(queryWrapper);
+ result.success("删除成功!");
+ }catch(Exception e) {
+ log.error(e.getMessage(), e);
+ result.error500("删除失败！");
}
- return Result.ok("文件导入失败！");
+ return result;
}
+
+ /**
+ * 批量删除指定机构的用户关系
+ */
+ @RequestMapping(value = "/deleteUserInDepartBatch", method = RequestMethod.DELETE)
+ public Result<SysUserDepart> deleteUserInDepartBatch(
+ @RequestParam(name="depId") String depId,
+ @RequestParam(name="userIds",required=true) String userIds) {
+ Result<SysUserDepart> result = new Result<SysUserDepart>();
+ try {
+ QueryWrapper<SysUserDepart> queryWrapper = new QueryWrapper<SysUserDepart>();
+ queryWrapper.eq("dep_id", depId).in("user_id",Arrays.asList(userIds.split(",")));
+ sysUserDepartService.remove(queryWrapper);
+ result.success("删除成功!");
+ }catch(Exception e) {
+ log.error(e.getMessage(), e);
+ result.error500("删除失败！");
+ }
+ return result;
+ }
+
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java
index f907623..4639f51 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java
@@ -14,9 +14,9 @@ import org.springframework.format.annotation.DateTimeFormat;
/**
* @Description: 系统通告表
- * @author： jeecg-boot
- * @date： 2019-01-02
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-01-02
+ * @Version: V1.0
*/
@Data
@TableName("sys_announcement")
@@ -37,7 +37,7 @@ public class SysAnnouncement implements Serializable {
* 内容
*/
@Excel(name = "内容", width = 30)
- private java.lang.Object msgContent;
+ private java.lang.String msgContent;
/**
* 开始时间
*/
@@ -60,19 +60,26 @@ public class SysAnnouncement implements Serializable {
/**
* 优先级（L低，M中，H高）
*/
- @Excel(name = "优先级", width = 15)
+ @Excel(name = "优先级", width = 15, dicCode = "priority")
@Dict(dicCode = "priority")
private java.lang.String priority;
+
+ /**
+ * 消息类型1:通知公告2:系统消息
+ */
+ @Excel(name = "消息类型", width = 15, dicCode = "msg_category")
+ @Dict(dicCode = "msg_category")
+ private java.lang.String msgCategory;
/**
* 通告对象类型（USER:指定用户，ALL:全体用户）
*/
- @Excel(name = "通告对象类型", width = 15)
+ @Excel(name = "通告对象类型", width = 15, dicCode = "msg_type")
@Dict(dicCode = "msg_type")
private java.lang.String msgType;
/**
* 发布状态（0未发布，1已发布，2已撤销）
*/
- @Excel(name = "发布状态", width = 15)
+ @Excel(name = "发布状态", width = 15, dicCode = "send_status")
@Dict(dicCode = "send_status")
private java.lang.String sendStatus;
/**
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.java
new file mode 100644
index 0000000..5b6b672
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.java
@@ -0,0 +1,48 @@
+package org.jeecg.modules.system.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @Description: 用户通告阅读标记表
+ * @Author: jeecg-boot
+ * @Date: 2019-02-21
+ * @Version: V1.0
+ */
+@Data
+@TableName("sys_announcement_send")
+public class SysAnnouncementSend implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**id*/
+ @TableId(type = IdType.UUID)
+ private java.lang.String id;
+ /**通告id*/
+ private java.lang.String anntId;
+ /**用户id*/
+ private java.lang.String userId;
+ /**阅读状态（0未读，1已读）*/
+ private java.lang.String readFlag;
+ /**阅读时间*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private java.util.Date readTime;
+ /**创建人*/
+ private java.lang.String createBy;
+ /**创建时间*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private java.util.Date createTime;
+ /**更新人*/
+ private java.lang.String updateBy;
+ /**更新时间*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private java.util.Date updateTime;
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java
index eec47b5..eec47b5 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysDepart.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
index f007f07..01f4ade 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.modules.system.model.SysDepartTreeModel;
+import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -19,7 +20,7 @@ import java.util.Objects;
* 部门表
* <p>
*
- * @author Steve
+ * @Author Steve
* @Since 2019-01-22
*/
@Data
@@ -33,32 +34,43 @@ public class SysDepart implements Serializable {
/**父机构ID*/
private String parentId;
/**机构/部门名称*/
+ @Excel(name="机构/部门名称",width=15)
private String departName;
/**英文名*/
+ @Excel(name="英文名",width=15)
private String departNameEn;
/**缩写*/
private String departNameAbbr;
/**排序*/
+ @Excel(name="排序",width=15)
private Integer departOrder;
/**描述*/
+ @Excel(name="描述",width=15)
private Object description;
/**机构类型*/
+ @Excel(name="机构类型",width=15)
private String orgType;
/**机构编码*/
+ @Excel(name="机构编码",width=15)
private String orgCode;
/**手机号*/
+ @Excel(name="手机号",width=15)
private String mobile;
/**传真*/
+ @Excel(name="传真",width=15)
private String fax;
/**地址*/
+ @Excel(name="地址",width=15)
private String address;
/**备注*/
+ @Excel(name="备注",width=15)
private String memo;
/**状态（1启用，0不启用）*/
+ @Excel(name="状态",width=15)
@Dict(dicCode = "depart_status")
private String status;
-
/**删除状态（0，正常，1已删除）*/
+ @Excel(name="删除状态",width=15)
@Dict(dicCode = "del_flag")
private String delFlag;
/**创建人*/
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysDict.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDict.java
index 86d4491..5e72e98 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysDict.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDict.java
@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
* 字典表
* </p>
*
- * @author zhangweijian
+ * @Author zhangweijian
* @since 2018-12-28
*/
@Data
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java
index c0778f9..b462692 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java
@@ -18,7 +18,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
*
* </p>
*
- * @author zhangweijian
+ * @Author zhangweijian
* @since 2018-12-28
*/
@Data
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysLog.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysLog.java
index 29387ae..8f2ff10 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysLog.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysLog.java
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
* 系统日志表
* </p>
*
- * @author zhangweijian
+ * @Author zhangweijian
* @since 2018-12-26
*/
@Data
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysPermission.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermission.java
index 2dfb1b0..f6e53be 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysPermission.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermission.java
@@ -9,13 +9,14 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
/**
* <p>
* 菜单权限表
* </p>
*
- * @author scott
+ * @Author scott
* @since 2018-12-21
*/
@Data
@@ -45,6 +46,10 @@ public class SysPermission implements Serializable {
* 菜单权限编码，例如：“sys:schedule:list,sys:schedule:info”,多个逗号隔开
*/
private String perms;
+ /**
+ * 权限策略1显示2禁用
+ */
+ private String permsType;
/**
* 菜单图标
@@ -109,6 +114,11 @@ public class SysPermission implements Serializable {
private Integer delFlag;
/**
+ * 是否配置菜单的数据权限 1是0否 默认0
+ */
+ private Integer ruleFlag;
+
+ /**
* 是否隐藏路由菜单: 0否,1是（默认值0）
*/
private boolean hidden;
@@ -128,6 +138,31 @@ public class SysPermission implements Serializable {
*/
private Date updateTime;
+ /**按钮权限状态(0无效1有效)*/
+ private java.lang.String status;
+
/**alwaysShow*/
private boolean alwaysShow;
+
+ public SysPermission() {
+
+ }
+ public SysPermission(boolean index) {
+ if(index) {
+ this.id = "9502685863ab87f0ad1134142788a385";
+ this.name="首页";
+ this.component="dashboard/Analysis";
+ this.url="/dashboard/analysis";
+ this.icon="home";
+ this.menuType=0;
+ this.sortNo=0;
+ this.ruleFlag=0;
+ this.delFlag=0;
+ this.alwaysShow=false;
+ this.route=true;
+ this.leaf=true;
+ this.hidden=false;
+ }
+
+ }
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java
new file mode 100644
index 0000000..f89251b
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java
@@ -0,0 +1,83 @@
+package org.jeecg.modules.system.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 菜单权限规则表
+ * </p>
+ *
+ * @Author huangzhilin
+ * @since 2019-03-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysPermissionDataRule implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * id
+ */
+ @TableId(type = IdType.UUID)
+ private String id;
+
+ /**
+ * 对应的菜单id
+ */
+ private String permissionId;
+
+ /**
+ * 规则名称
+ */
+ private String ruleName;
+
+ /**
+ * 字段
+ */
+ private String ruleColumn;
+
+ /**
+ * 条件
+ */
+ private String ruleConditions;
+
+ /**
+ * 规则值
+ */
+ private String ruleValue;
+
+ /**
+ * 状态值 1有效 0无效
+ */
+ private String status;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 创建人
+ */
+ private String createBy;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 修改人
+ */
+ private String updateBy;
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysRole.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysRole.java
index 5b5f181..c62e9aa 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysRole.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysRole.java
@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
* 角色表
* </p>
*
- * @author scott
+ * @Author scott
* @since 2018-12-19
*/
@Data
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java
index ec79162..636e19c 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java
@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
* 角色权限表
* </p>
*
- * @author scott
+ * @Author scott
* @since 2018-12-21
*/
@Data
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysUser.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java
index d7a66dc..bdab156 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysUser.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java
@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
* 用户表
* </p>
*
- * @author scott
+ * @Author scott
* @since 2018-12-20
*/
@Data
@@ -93,6 +93,11 @@ public class SysUser implements Serializable {
private String phone;
/**
+ * 部门code
+ */
+ private String orgCode;
+
+ /**
* 状态(1：正常 2：冻结 ）
*/
@Excel(name = "状态", width = 15,dicCode="user_status")
@@ -124,6 +129,10 @@ public class SysUser implements Serializable {
* 更新时间
*/
private Date updateTime;
+ /**
+ * 同步工作流引擎1同步0不同步
+ */
+ private String activitiSync;
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.java
new file mode 100644
index 0000000..11ac72c
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.java
@@ -0,0 +1,74 @@
+package org.jeecg.modules.system.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @Description: 用户代理人设置
+ * @Author: jeecg-boot
+ * @Date: 2019-04-17
+ * @Version: V1.0
+ */
+@Data
+@TableName("sys_user_agent")
+public class SysUserAgent implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**序号*/
+ @TableId(type = IdType.UUID)
+ private java.lang.String id;
+ /**用户名*/
+ @Excel(name = "用户名", width = 15)
+ private java.lang.String userName;
+ /**代理人用户名*/
+ @Excel(name = "代理人用户名", width = 15)
+ private java.lang.String agentUserName;
+ /**代理开始时间*/
+ @Excel(name = "代理开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private java.util.Date startTime;
+ /**代理结束时间*/
+ @Excel(name = "代理结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private java.util.Date endTime;
+ /**状态0无效1有效*/
+ @Excel(name = "状态0无效1有效", width = 15)
+ private java.lang.String status;
+ /**创建人名称*/
+ @Excel(name = "创建人名称", width = 15)
+ private java.lang.String createName;
+ /**创建人登录名称*/
+ @Excel(name = "创建人登录名称", width = 15)
+ private java.lang.String createBy;
+ /**创建日期*/
+ @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private java.util.Date createTime;
+ /**更新人名称*/
+ @Excel(name = "更新人名称", width = 15)
+ private java.lang.String updateName;
+ /**更新人登录名称*/
+ @Excel(name = "更新人登录名称", width = 15)
+ private java.lang.String updateBy;
+ /**更新日期*/
+ @Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private java.util.Date updateTime;
+ /**所属部门*/
+ @Excel(name = "所属部门", width = 15)
+ private java.lang.String sysOrgCode;
+ /**所属公司*/
+ @Excel(name = "所属公司", width = 15)
+ private java.lang.String sysCompanyCode;
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java
index 474ace1..474ace1 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java
index 4a3a35e..6a34c3a 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java
@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
* 用户角色表
* </p>
*
- * @author scott
+ * @Author scott
* @since 2018-12-21
*/
@Data
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java
index a3c7bc8..e38af04 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java
@@ -2,16 +2,20 @@ package org.jeecg.modules.system.mapper;
import java.util.List;
-import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.system.entity.SysAnnouncement;
+
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
/**
* @Description: 系统通告表
- * @author： jeecg-boot
- * @date： 2019-01-02
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-01-02
+ * @Version: V1.0
*/
public interface SysAnnouncementMapper extends BaseMapper<SysAnnouncement> {
+
+ List<SysAnnouncement> querySysCementListByUserId(Page<SysAnnouncement> page, String userId,String msgCategory);
+
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java
new file mode 100644
index 0000000..52d3b44
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java
@@ -0,0 +1,31 @@
+package org.jeecg.modules.system.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.system.entity.SysAnnouncementSend;
+import org.jeecg.modules.system.model.AnnouncementSendModel;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+/**
+ * @Description: 用户通告阅读标记表
+ * @Author: jeecg-boot
+ * @Date: 2019-02-21
+ * @Version: V1.0
+ */
+public interface SysAnnouncementSendMapper extends BaseMapper<SysAnnouncementSend> {
+
+ public List<String> queryByUserId(@Param("userId") String userId);
+
+ /**
+ * @功能：获取我的消息
+ * @param announcementSendModel
+ * @param pageSize
+ * @param pageNo
+ * @return
+ */
+ public List<AnnouncementSendModel> getMyAnnouncementSendList(Page<AnnouncementSendModel> page,AnnouncementSendModel announcementSendModel);
+
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java
index e6abc3b..e6abc3b 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java
index 45457e9..9f97508 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java
@@ -13,7 +13,7 @@ import java.util.List;
* 部门 Mapper 接口
* <p>
*
- * @author： Steve
+ * @Author: Steve
* @Since： 2019-01-22
*/
public interface SysDepartMapper extends BaseMapper<SysDepart> {
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java
index dbf85bd..2e90603 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java
@@ -11,7 +11,7 @@ import java.util.List;
* Mapper 接口
* </p>
*
- * @author zhangweijian
+ * @Author zhangweijian
* @since 2018-12-28
*/
public interface SysDictItemMapper extends BaseMapper<SysDictItem> {
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java
index 62afdb5..4e3b08d 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java
@@ -1,9 +1,8 @@
package org.jeecg.modules.system.mapper;
import java.util.List;
-import java.util.Map;
-
import org.apache.ibatis.annotations.Param;
+import org.jeecg.common.system.vo.DictModel;
import org.jeecg.modules.system.entity.SysDict;
import org.jeecg.modules.system.model.DuplicateCheckVo;
@@ -14,7 +13,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 字典表 Mapper 接口
* </p>
*
- * @author zhangweijian
+ * @Author zhangweijian
* @since 2018-12-28
*/
public interface SysDictMapper extends BaseMapper<SysDict> {
@@ -26,13 +25,25 @@ public interface SysDictMapper extends BaseMapper<SysDict> {
public Long duplicateCheckCountSql(DuplicateCheckVo duplicateCheckVo);
public Long duplicateCheckCountSqlNoDataId(DuplicateCheckVo duplicateCheckVo);
- public List<Map<String,Object>> queryDictItemsByCode(@Param("code") String code);
- public List<Map<String,Object>> queryTableDictItemsByCode(@Param("table") String table,@Param("text") String text,@Param("code") String code);
+ public List<DictModel> queryDictItemsByCode(@Param("code") String code);
+ public List<DictModel> queryTableDictItemsByCode(@Param("table") String table,@Param("text") String text,@Param("code") String code);
public String queryDictTextByKey(@Param("code") String code,@Param("key") String key);
public String queryTableDictTextByKey(@Param("table") String table,@Param("text") String text,@Param("code") String code,@Param("key") String key);
+
+ /**
+ * 查询所有部门 作为字典信息 id -->value,departName -->text
+ * @return
+ */
+ public List<DictModel> queryAllDepartBackDictModel();
+
+ /**
+ * 查询所有用户 作为字典信息 username -->value,realname -->text
+ * @return
+ */
+ public List<DictModel> queryAllUserBackDictModel();
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java
index 098db61..dfdac68 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java
@@ -1,6 +1,10 @@
package org.jeecg.modules.system.mapper;
+import java.util.Date;
+
+import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.system.entity.SysLog;
+
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
@@ -8,7 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 系统日志表 Mapper 接口
* </p>
*
- * @author zhangweijian
+ * @Author zhangweijian
* @since 2018-12-26
*/
public interface SysLogMapper extends BaseMapper<SysLog> {
@@ -25,18 +29,19 @@ public interface SysLogMapper extends BaseMapper<SysLog> {
*/
Long findTotalVisitCount();
+ //update-begin--Author:zhangweijian Date:20190428 for：传入开始时间，结束时间参数
/**
* 获取系统今日访问次数
*
* @return Long
*/
- Long findTodayVisitCount();
+ Long findTodayVisitCount(@Param("dayStart") Date dayStart, @Param("dayEnd") Date dayEnd);
/**
* 获取系统今日访问 IP数
*
* @return Long
*/
- Long findTodayIp();
-
+ Long findTodayIp(@Param("dayStart") Date dayStart, @Param("dayEnd") Date dayEnd);
+ //update-end--Author:zhangweijian Date:20190428 for：传入开始时间，结束时间参数
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java
index 7f9ef41..61a55a4 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java
@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 权限规则 Mapper 接口
* </p>
*
- * @author huangzhilin
+ * @Author huangzhilin
* @since 2019-04-01
*/
public interface SysPermissionDataRuleMapper extends BaseMapper<SysPermissionDataRule> {
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java
index 0b45d6a..2449a09 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java
@@ -15,7 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 菜单权限表 Mapper 接口
* </p>
*
- * @author scott
+ * @Author scott
* @since 2018-12-21
*/
public interface SysPermissionMapper extends BaseMapper<SysPermission> {
@@ -37,7 +37,9 @@ public interface SysPermissionMapper extends BaseMapper<SysPermission> {
@Update("update sys_permission set is_leaf=#{leaf} where id = #{id}")
public int setMenuLeaf(@Param("id") String id,@Param("leaf") int leaf);
-
+ /**
+ * 获取模糊匹配规则的数据权限URL
+ */
@Select("SELECT url FROM sys_permission WHERE del_flag = 0 and menu_type = 2 and url like '%*%'")
public List<String> queryPermissionUrlWithStar();
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java
index 1db56f1..7761581 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 角色表 Mapper 接口
* </p>
*
- * @author scott
+ * @Author scott
* @since 2018-12-19
*/
public interface SysRoleMapper extends BaseMapper<SysRole> {
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysRolePermissionMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysRolePermissionMapper.java
index fd517ae..25c08d2 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysRolePermissionMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysRolePermissionMapper.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 角色权限表 Mapper 接口
* </p>
*
- * @author scott
+ * @Author scott
* @since 2018-12-21
*/
public interface SysRolePermissionMapper extends BaseMapper<SysRolePermission> {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserAgentMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserAgentMapper.java
new file mode 100644
index 0000000..346933b
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserAgentMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.system.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.system.entity.SysUserAgent;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 用户代理人设置
+ * @Author: jeecg-boot
+ * @Date: 2019-04-17
+ * @Version: V1.0
+ */
+public interface SysUserAgentMapper extends BaseMapper<SysUserAgent> {
+
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java
index 6dbfb6f..6dbfb6f 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
index d6cc2d1..4695c44 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
@@ -1,5 +1,7 @@
package org.jeecg.modules.system.mapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.system.entity.SysUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -9,7 +11,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 用户表 Mapper 接口
* </p>
*
- * @author scott
+ * @Author scott
* @since 2018-12-20
*/
public interface SysUserMapper extends BaseMapper<SysUser> {
@@ -19,4 +21,27 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
* @return
*/
public SysUser getUserByName(@Param("username") String username);
+
+ /**
+ * 根据部门Id查询用户信息
+ * @param page
+ * @param departId
+ * @return
+ */
+ IPage<SysUser> getUserByDepId(Page page, @Param("departId") String departId, @Param("username") String username);
+
+ /**
+ * 根据角色Id查询用户信息
+ * @param page
+ * @param
+ * @return
+ */
+ IPage<SysUser> getUserByRoleId(Page page, @Param("roleId") String roleId, @Param("username") String username);
+
+ /**
+ * 根据用户名设置部门ID
+ * @param username
+ * @param departId
+ */
+ void updateUserDepart(@Param("username") String username,@Param("orgCode") String orgCode);
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.java
index 61f4766..b0f588d 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.java
@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 用户角色表 Mapper 接口
* </p>
*
- * @author scott
+ * @Author scott
* @since 2018-12-21
*/
public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml
new file mode 100644
index 0000000..7999c75
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.system.mapper.SysAnnouncementMapper">
+
+ <resultMap id="SysAnnouncement" type="org.jeecg.modules.system.entity.SysAnnouncement" >
+ <result column="id" property="id" jdbcType="VARCHAR"/>
+ <result column="titile" property="titile" jdbcType="VARCHAR"/>
+ <result column="msg_content" property="msgContent" jdbcType="VARCHAR"/>
+ <result column="start_time" property="startTime" jdbcType="TIMESTAMP"/>
+ <result column="end_time" property="endTime" jdbcType="TIMESTAMP"/>
+ <result column="sender" property="sender" jdbcType="VARCHAR"/>
+ <result column="priority" property="priority" jdbcType="VARCHAR"/>
+ <result column="msg_category" property="msgCategory" jdbcType="VARCHAR"/>
+ <result column="msg_type" property="msgType" jdbcType="VARCHAR"/>
+ <result column="send_status" property="sendStatus" jdbcType="VARCHAR"/>
+ <result column="send_time" property="sendTime" jdbcType="VARCHAR"/>
+ <result column="cancel_time" property="cancelTime" jdbcType="VARCHAR"/>
+ <result column="del_flag" property="delFlag" jdbcType="VARCHAR"/>
+ <result column="create_by" property="createBy" jdbcType="VARCHAR"/>
+ <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+ <result column="update_by" property="updateBy" jdbcType="VARCHAR"/>
+ <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+ <result column="user_ids" property="userIds" jdbcType="VARCHAR"/>
+ </resultMap>
+
+
+ <select id="querySysCementListByUserId" parameterType="String" resultMap="SysAnnouncement">
+ select sa.* from sys_announcement sa,sys_announcement_send sas
+ where sa.id = sas.annt_id
+ and sa.send_status = '1'
+ and sa.del_flag = '0'
+ and sas.user_id = #{userId}
+ and sa.msg_category = #{msgCategory}
+ and sas.read_flag = '0'
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
new file mode 100644
index 0000000..6876422
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.system.mapper.SysAnnouncementSendMapper">
+
+ <resultMap id="AnnouncementSendModel" type="org.jeecg.modules.system.model.AnnouncementSendModel" >
+ <result column="id" property="id" jdbcType="VARCHAR"/>
+ <result column="annt_id" property="anntId" jdbcType="VARCHAR"/>
+ <result column="user_id" property="userId" jdbcType="VARCHAR"/>
+ <result column="titile" property="titile" jdbcType="VARCHAR"/>
+ <result column="msg_content" property="msgContent" jdbcType="VARCHAR"/>
+ <result column="sender" property="sender" jdbcType="VARCHAR"/>
+ <result column="priority" property="priority" jdbcType="VARCHAR"/>
+ <result column="msg_category" property="msgCategory" jdbcType="VARCHAR"/>
+ <result column="send_time" property="sendTime" jdbcType="TIMESTAMP"/>
+ </resultMap>
+
+ <select id="queryByUserId" parameterType="String" resultType="String">
+ select sas.annt_id from sys_announcement_send sas
+ where sas.user_id = #{userId}
+ </select>
+
+ <select id="getMyAnnouncementSendList" parameterType="Object" resultMap="AnnouncementSendModel">
+ select
+ sas.id,
+ sas.annt_id,
+ sas.user_id,
+ sas.read_flag,
+ sa.titile as titile,
+ sa.msg_content as msg_content,
+ sa.sender as sender,
+ sa.priority as priority,
+ sa.msg_category,
+ sa.send_time as send_time
+ from sys_announcement_send sas
+ left join sys_announcement sa ON sas.annt_id = sa.id
+ where sa.send_status = '1'
+ and sa.del_flag = '0'
+ and sas.user_id = #{announcementSendModel.userId}
+ <if test="announcementSendModel.titile !=null and announcementSendModel.titile != ''">
+ and sa.titile = #{announcementSendModel.titile}
+ </if>
+ <if test="announcementSendModel.sender !=null and announcementSendModel.sender != ''">
+ and sa.sender = #{announcementSendModel.sender}
+ </if>
+ order by sa.send_time desc
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysDataLogMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDataLogMapper.xml
index 29b9c3a..29b9c3a 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysDataLogMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDataLogMapper.xml
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml
index 3347151..3347151 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictItemMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictItemMapper.xml
index a1eee4c..a1eee4c 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictItemMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictItemMapper.xml
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml
index 28c2e68..174bfb0 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.jeecg.modules.system.mapper.SysDictMapper">
<!-- 通过字典code获取字典数据 -->
- <select id="queryDictItemsByCode" parameterType="String" resultType="java.util.HashMap">
+ <select id="queryDictItemsByCode" parameterType="String" resultType="org.jeecg.common.system.vo.DictModel">
select s.item_value value,s.item_text text from sys_dict_item s
where dict_id = (select id from sys_dict where dict_code = #{code})
order by s.sort_order asc
@@ -18,13 +18,13 @@
<!--通过查询指定table的 text code 获取字典-->
- <select id="queryTableDictItemsByCode" parameterType="String" resultType="java.util.HashMap">
+ <select id="queryTableDictItemsByCode" parameterType="String" resultType="org.jeecg.common.system.vo.DictModel">
select ${text} as 'text',${code} as 'value' from ${table}
</select>
<!--通过查询指定table的 text code key 获取字典值-->
- <select id="queryTableDictTextByKey" parameterType="String" resultType="java.util.HashMap">
- select ${code} as 'value', ${text} as 'text' from ${table} where ${code}= #{key}
+ <select id="queryTableDictTextByKey" parameterType="String" resultType="String">
+ select ${text} as 'text' from ${table} where ${code}= #{key}
</select>
<!-- 重复校验 sql语句 -->
@@ -36,4 +36,14 @@
<select id="duplicateCheckCountSqlNoDataId" resultType="Long" parameterType="org.jeecg.modules.system.model.DuplicateCheckVo">
SELECT COUNT(*) FROM ${tableName} WHERE ${fieldName} = #{fieldVal}
</select>
+
+ <!-- 查询部门信息 作为字典数据 -->
+ <select id="queryAllDepartBackDictModel" resultType="org.jeecg.common.system.vo.DictModel">
+ select id as value,depart_name as text from sys_depart where del_flag = '0'
+ </select>
+
+ <!-- 查询部门信息 作为字典数据 -->
+ <select id="queryAllUserBackDictModel" resultType="org.jeecg.common.system.vo.DictModel">
+ select username as value,realname as text from sys_depart where del_flag = '0'
+ </select>
</mapper>
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysLogMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysLogMapper.xml
index 6f3342c..aa85a64 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysLogMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysLogMapper.xml
@@ -14,12 +14,12 @@
<!-- 获取今日访问总数 -->
<select id="findTodayVisitCount" resultType="long">
- select count(1) from sys_log where log_type = 1 and datediff(create_time,now())=0
+ select count(1) from sys_log where log_type = 1 and create_time >= #{dayStart} and create_time < #{dayEnd}
</select>
<!-- 获取今日访问总IP数 -->
<select id="findTodayIp" resultType="long">
- select count(distinct(ip)) from sys_log where log_type = 1 and datediff(create_time,now())=0
+ select count(distinct(ip)) from sys_log where log_type = 1 and create_time >= #{dayStart} and create_time < #{dayEnd}
</select>
</mapper>
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionDataRuleMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionDataRuleMapper.xml
index eae3fb7..eae3fb7 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionDataRuleMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionDataRuleMapper.xml
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml
index bf0e42a..5bc15c9 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml
@@ -38,6 +38,7 @@
</choose>
</select>
+ <!-- 获取登录用户拥有的权限 -->
<select id="queryByUser" parameterType="Object" resultMap="SysPermission">
SELECT p.*
FROM sys_permission p
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserAgentMapper.xml
index 2dbfe55..8bc1b75 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserAgentMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysAnnouncementMapper">
+<mapper namespace="org.jeecg.modules.system.mapper.SysUserAgentMapper">
</mapper>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml
index 139e597..139e597 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
new file mode 100644
index 0000000..d4e495a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.system.mapper.SysUserMapper">
+
+ <!-- 根据用户名查询 -->
+ <select id="getUserByName" resultType="org.jeecg.modules.system.entity.SysUser">
+ select * from sys_user where username = #{username}
+ </select>
+
+ <!-- 根据部门Id查询 -->
+ <select id="getUserByDepId" resultType="org.jeecg.modules.system.entity.SysUser">
+ select * from sys_user where id in (select user_id from sys_user_depart where dep_id=#{departId})
+ <if test="username!=null and username!=''">
+ and username = #{username}
+ </if>
+ </select>
+
+ <!-- 根据角色Id查询 -->
+ <select id="getUserByRoleId" resultType="org.jeecg.modules.system.entity.SysUser">
+ select * from sys_user where id in (select user_id from sys_user_role where role_id=#{roleId})
+ <if test="username!=null and username!=''">
+ and username = #{username}
+ </if>
+ </select>
+
+ <!-- 修改用户部门code -->
+ <update id="updateUserDepart">
+ UPDATE sys_user SET org_code = #{orgCode} where username = #{username}
+ </update>
+
+</mapper>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java
new file mode 100644
index 0000000..ce4ec6e
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java
@@ -0,0 +1,54 @@
+package org.jeecg.modules.system.model;
+
+import java.io.Serializable;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+
+/**
+ * @Description: 用户通告阅读标记表
+ * @Author: jeecg-boot
+ * @Date: 2019-02-21
+ * @Version: V1.0
+ */
+@Data
+@TableName("sys_announcement_send")
+public class AnnouncementSendModel implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**id*/
+ @TableId(type = IdType.UUID)
+ private java.lang.String id;
+ /**通告id*/
+ private java.lang.String anntId;
+ /**用户id*/
+ private java.lang.String userId;
+ /**标题*/
+ private java.lang.String titile;
+ /**内容*/
+ private java.lang.String msgContent;
+ /**发布人*/
+ private java.lang.String sender;
+ /**优先级（L低，M中，H高）*/
+ private java.lang.String priority;
+ /**阅读状态*/
+ private java.lang.String readFlag;
+ /**发布时间*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private java.util.Date sendTime;
+ /**页数*/
+ private java.lang.Integer pageNo;
+ /**大小*/
+ private java.lang.Integer pageSize;
+ /**
+ * 消息类型1:通知公告2:系统消息
+ */
+ private java.lang.String msgCategory;
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java
index 3834426..572f2d0 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java
@@ -11,7 +11,7 @@ import org.jeecg.modules.system.entity.SysDepart;
* 部门表 封装树结构的部门的名称的实体类
* <p>
*
- * @author Steve
+ * @Author Steve
* @Since 2019-01-22
*
*/
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java
index 126acd1..c00dd97 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java
@@ -8,9 +8,9 @@ import lombok.Data;
/**
* @Title: DuplicateCheckVo
* @Description: 重复校验VO
- * @author 张代浩
- * @date 2019-03-25
- * @version V1.0
+ * @Author 张代浩
+ * @Date 2019-03-25
+ * @Version V1.0
*/
@Data
@ApiModel(value="重复校验数据模型",description="重复校验数据模型")
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
index 9caeda6..4f90d6d 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
@@ -13,7 +13,7 @@ import java.util.Objects;
* 部门表 存储树结构数据的实体类
* <p>
*
- * @author Steve
+ * @Author Steve
* @Since 2019-01-22
*/
public class SysDepartTreeModel implements Serializable{
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDictTree.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDictTree.java
new file mode 100644
index 0000000..9400282
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDictTree.java
@@ -0,0 +1,96 @@
+package org.jeecg.modules.system.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import org.jeecg.modules.system.entity.SysDict;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 字典表
+ * </p>
+ *
+ * @Author zhangweijian
+ * @since 2018-12-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysDictTree implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String key;
+
+ private String title;
+
+ /**
+ * id
+ */
+ @TableId(type = IdType.UUID)
+ private String id;
+ /**
+ * 字典类型,0 string,1 number类型,2 boolean
+ * 前端js对stirng类型和number类型 boolean 类型敏感，需要区分。在select 标签匹配的时候会用到
+ * 默认为string类型
+ */
+ private Integer type;
+
+ /**
+ * 字典名称
+ */
+ private String dictName;
+
+ /**
+ * 字典编码
+ */
+ private String dictCode;
+
+ /**
+ * 描述
+ */
+ private String description;
+
+ /**
+ * 删除状态
+ */
+ private Integer delFlag;
+
+ /**
+ * 创建人
+ */
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新人
+ */
+ private String updateBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+ public SysDictTree(SysDict node) {
+ this.id = node.getId();
+ this.key = node.getId();
+ this.title = node.getDictName();
+ this.dictCode = node.getDictCode();
+ this.description = node.getDescription();
+ this.delFlag = node.getDelFlag();
+ this.type = node.getType();
+ }
+
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysLoginModel.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysLoginModel.java
index afd3787..df21924 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysLoginModel.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysLoginModel.java
@@ -1,14 +1,21 @@
package org.jeecg.modules.system.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
/**
* 登录表单
*
- * @author scott
+ * @Author scott
* @since 2019-01-18
*/
+@ApiModel(value="登录对象", description="登录对象")
public class SysLoginModel {
+ @ApiModelProperty(value = "账号")
private String username;
+ @ApiModelProperty(value = "密码")
private String password;
- //验证码
+ @ApiModelProperty(value = "验证码")
private String captcha;
public String getUsername() {
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java
index 6e97c0f..0d38fd1 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java
@@ -32,6 +32,10 @@ public class SysPermissionTree implements Serializable {
* 菜单权限编码
*/
private String perms;
+ /**
+ * 权限策略1显示2禁用
+ */
+ private String permsType;
/**
* 菜单图标
@@ -107,6 +111,9 @@ public class SysPermissionTree implements Serializable {
private boolean alwaysShow;
/**是否隐藏路由菜单: 0否,1是（默认值0）*/
private boolean hidden;
+
+ /**按钮权限状态(0无效1有效)*/
+ private java.lang.String status;
public SysPermissionTree() {
@@ -116,6 +123,7 @@ public class SysPermissionTree implements Serializable {
this.key = permission.getId();
this.id = permission.getId();
this.perms = permission.getPerms();
+ this.permsType = permission.getPermsType();
this.component = permission.getComponent();
this.createBy = permission.getCreateBy();
this.createTime = permission.getCreateTime();
@@ -138,6 +146,7 @@ public class SysPermissionTree implements Serializable {
if (!permission.isLeaf()) {
this.children = new ArrayList<SysPermissionTree>();
}
+ this.status = permission.getStatus();
}
public String getTitle() {
@@ -325,4 +334,21 @@ public class SysPermissionTree implements Serializable {
this.isLeaf = isLeaf;
}
+ public String getPermsType() {
+ return permsType;
+ }
+
+ public void setPermsType(String permsType) {
+ this.permsType = permsType;
+ }
+
+ public java.lang.String getStatus() {
+ return status;
+ }
+
+ public void setStatus(java.lang.String status) {
+ this.status = status;
+ }
+
+
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysUserDepartsVO.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysUserDepartsVO.java
index 1588540..1588540 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysUserDepartsVO.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysUserDepartsVO.java
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/TreeModel.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/TreeModel.java
index b409455..b5c0b04 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/TreeModel.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/TreeModel.java
@@ -22,6 +22,8 @@ public class TreeModel implements Serializable {
private String icon;
+ private Integer ruleFlag;
+
private Map<String,String> scopedSlots;
public Map<String, String> getScopedSlots() {
@@ -92,10 +94,10 @@ public class TreeModel implements Serializable {
}
}
- public TreeModel(String key,String parentId,String slotTitle,String icon,boolean isLeaf) {
+ public TreeModel(String key,String parentId,String slotTitle,Integer ruleFlag,boolean isLeaf) {
this.key = key;
this.parentId = parentId;
- this.icon=icon;
+ this.ruleFlag=ruleFlag;
this.slotTitle = slotTitle;
Map<String,String> map = new HashMap<String,String>();
map.put("title", "hasDatarule");
@@ -157,6 +159,13 @@ public class TreeModel implements Serializable {
public void setSlotTitle(String slotTitle) {
this.slotTitle = slotTitle;
}
-
+
+ public Integer getRuleFlag() {
+ return ruleFlag;
+ }
+
+ public void setRuleFlag(Integer ruleFlag) {
+ this.ruleFlag = ruleFlag;
+ }
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/TreeSelectModel.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/TreeSelectModel.java
new file mode 100644
index 0000000..14e219a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/TreeSelectModel.java
@@ -0,0 +1,72 @@
+package org.jeecg.modules.system.model;
+
+import java.io.Serializable;
+
+public class TreeSelectModel implements Serializable {
+
+
+ private static final long serialVersionUID = 9016390975325574747L;
+
+ private String key;
+
+ private String title;
+
+ private boolean isLeaf;
+
+ private String icon;
+
+ private String parentId;
+
+ private String value;
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ public String getParentId() {
+ return parentId;
+ }
+
+ public void setParentId(String parentId) {
+ this.parentId = parentId;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public boolean isLeaf() {
+ return isLeaf;
+ }
+
+ public void setLeaf(boolean isLeaf) {
+ this.isLeaf = isLeaf;
+ }
+
+ public String getIcon() {
+ return icon;
+ }
+
+ public void setIcon(String icon) {
+ this.icon = icon;
+ }
+
+
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java
new file mode 100644
index 0000000..531718c
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java
@@ -0,0 +1,28 @@
+package org.jeecg.modules.system.service;
+
+import java.util.List;
+
+import org.jeecg.modules.system.entity.SysAnnouncementSend;
+import org.jeecg.modules.system.model.AnnouncementSendModel;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 用户通告阅读标记表
+ * @Author: jeecg-boot
+ * @Date: 2019-02-21
+ * @Version: V1.0
+ */
+public interface ISysAnnouncementSendService extends IService<SysAnnouncementSend> {
+
+ public List<String> queryByUserId(String userId);
+
+ /**
+ * @功能：获取我的消息
+ * @param announcementSendModel
+ * @return
+ */
+ public Page<AnnouncementSendModel> getMyAnnouncementSendPage(Page<AnnouncementSendModel> page,AnnouncementSendModel announcementSendModel);
+
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java
index 55c2b4a..38521d1 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java
@@ -1,14 +1,25 @@
package org.jeecg.modules.system.service;
import org.jeecg.modules.system.entity.SysAnnouncement;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 系统通告表
- * @author： jeecg-boot
- * @date： 2019-01-02
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: 2019-01-02
+ * @Version: V1.0
*/
public interface ISysAnnouncementService extends IService<SysAnnouncement> {
+ public void saveAnnouncement(SysAnnouncement sysAnnouncement);
+
+ public boolean upDateAnnouncement(SysAnnouncement sysAnnouncement);
+
+ public void saveSysAnnouncement(String title, String msgContent);
+
+ public Page<SysAnnouncement> querySysCementPageByUserId(Page<SysAnnouncement> page,String userId,String msgCategory);
+
+
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysDataLogService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDataLogService.java
index a18b8bf..a18b8bf 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysDataLogService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDataLogService.java
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java
new file mode 100644
index 0000000..d4f762a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java
@@ -0,0 +1,66 @@
+package org.jeecg.modules.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.system.entity.SysDepart;
+import org.jeecg.modules.system.model.SysDepartTreeModel;
+import java.util.List;
+
+/**
+ * <p>
+ * 部门表 服务实现类
+ * <p>
+ *
+ * @Author:Steve
+ * @Since： 2019-01-22
+ */
+public interface ISysDepartService extends IService<SysDepart>{
+
+
+ /**
+ * 查询所有部门信息,并分节点进行显示
+ * @return
+ */
+ List<SysDepartTreeModel> queryTreeList();
+
+ /**
+ * 保存部门数据
+ * @param sysDepart
+ */
+ void saveDepartData(SysDepart sysDepart,String username);
+
+ /**
+ * 更新depart数据
+ * @param sysDepart
+ * @return
+ */
+ Boolean updateDepartDataById(SysDepart sysDepart,String username);
+
+ /**
+ * 删除depart数据
+ * @param id
+ * @return
+ */
+ /* boolean removeDepartDataById(String id); */
+
+ /**
+ * 根据关键字搜索相关的部门数据
+ * @param keyWord
+ * @return
+ */
+ List<SysDepartTreeModel> searhBy(String keyWord);
+
+ /**
+ * 根据部门id删除并删除其可能存在的子级部门
+ * @param id
+ * @return
+ */
+ boolean delete(String id);
+
+ /**
+ * 查询SysDepart集合
+ * @param userId
+ * @return
+ */
+ public List<SysDepart> queryUserDeparts(String userId);
+
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.java
index b177820..19c02b2 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.java
@@ -10,7 +10,7 @@ import java.util.List;
* 服务类
* </p>
*
- * @author zhangweijian
+ * @Author zhangweijian
* @since 2018-12-28
*/
public interface ISysDictItemService extends IService<SysDictItem> {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDictService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDictService.java
new file mode 100644
index 0000000..44f29a5
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDictService.java
@@ -0,0 +1,54 @@
+package org.jeecg.modules.system.service;
+
+import java.util.List;
+import java.util.Map;
+
+import org.jeecg.common.system.vo.DictModel;
+import org.jeecg.modules.system.entity.SysDict;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.system.entity.SysDictItem;
+
+/**
+ * <p>
+ * 字典表 服务类
+ * </p>
+ *
+ * @Author zhangweijian
+ * @since 2018-12-28
+ */
+public interface ISysDictService extends IService<SysDict> {
+
+ public List<DictModel> queryDictItemsByCode(String code);
+
+ List<DictModel> queryTableDictItemsByCode(String table, String text, String code);
+
+ public String queryDictTextByKey(String code, String key);
+
+ String queryTableDictTextByKey(String table, String text, String code, String key);
+
+ /**
+ * 根据字典类型删除关联表中其对应的数据
+ *
+ * @param sysDict
+ * @return
+ */
+ boolean deleteByDictId(SysDict sysDict);
+
+ /**
+ * 添加一对多
+ */
+ public void saveMain(SysDict sysDict, List<SysDictItem> sysDictItemList);
+
+ /**
+ * 查询所有部门 作为字典信息 id -->value,departName -->text
+ * @return
+ */
+ public List<DictModel> queryAllDepartBackDictModel();
+
+ /**
+ * 查询所有用户 作为字典信息 username -->value,realname -->text
+ * @return
+ */
+ public List<DictModel> queryAllUserBackDictModel();
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysLogService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysLogService.java
new file mode 100644
index 0000000..60dbfab
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysLogService.java
@@ -0,0 +1,46 @@
+package org.jeecg.modules.system.service;
+
+import java.util.Date;
+
+import org.jeecg.modules.system.entity.SysLog;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 系统日志表 服务类
+ * </p>
+ *
+ * @Author zhangweijian
+ * @since 2018-12-26
+ */
+public interface ISysLogService extends IService<SysLog> {
+
+ /**
+ * @功能：清空所有日志记录
+ */
+ public void removeAll();
+
+ /**
+ * 获取系统总访问次数
+ *
+ * @return Long
+ */
+ Long findTotalVisitCount();
+
+ //update-begin--Author:zhangweijian Date:20190428 for：传入开始时间，结束时间参数
+ /**
+ * 获取系统今日访问次数
+ *
+ * @return Long
+ */
+ Long findTodayVisitCount(Date dayStart, Date dayEnd);
+
+ /**
+ * 获取系统今日访问 IP数
+ *
+ * @return Long
+ */
+ Long findTodayIp(Date dayStart, Date dayEnd);
+ //update-end--Author:zhangweijian Date:20190428 for：传入开始时间，结束时间参数
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java
new file mode 100644
index 0000000..1b32ec5
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java
@@ -0,0 +1,55 @@
+package org.jeecg.modules.system.service;
+
+import java.util.List;
+
+import org.jeecg.modules.system.entity.SysPermissionDataRule;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 菜单权限规则 服务类
+ * </p>
+ *
+ * @Author huangzhilin
+ * @since 2019-04-01
+ */
+public interface ISysPermissionDataRuleService extends IService<SysPermissionDataRule> {
+
+ /**
+ * 根据菜单id查询其对应的权限数据
+ *
+ * @param permRule
+ */
+ List<SysPermissionDataRule> getPermRuleListByPermId(String permissionId);
+
+ /**
+ * 根据页面传递的参数查询菜单权限数据
+ *
+ * @return
+ */
+ List<SysPermissionDataRule> queryPermissionRule(SysPermissionDataRule permRule);
+
+
+ /**
+ * 根据菜单ID和用户名查找数据权限配置信息
+ * @param permission
+ * @param username
+ * @return
+ */
+ List<SysPermissionDataRule> queryPermissionDataRules(String username,String permissionId);
+
+ /**
+ * 新增菜单权限配置 修改菜单rule_flag
+ * @param sysPermissionDataRule
+ */
+ public void savePermissionDataRule(SysPermissionDataRule sysPermissionDataRule);
+
+ /**
+ * 删除菜单权限配置 判断菜单还有无权限
+ * @param dataRuleId
+ */
+ public void deletePermissionDataRule(String dataRuleId);
+
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysPermissionService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysPermissionService.java
new file mode 100644
index 0000000..091ebce
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysPermissionService.java
@@ -0,0 +1,48 @@
+package org.jeecg.modules.system.service;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.modules.system.entity.SysPermission;
+import org.jeecg.modules.system.model.TreeModel;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 菜单权限表 服务类
+ * </p>
+ *
+ * @Author scott
+ * @since 2018-12-21
+ */
+public interface ISysPermissionService extends IService<SysPermission> {
+
+ public List<TreeModel> queryListByParentId(String parentId);
+
+ /**真实删除*/
+ public void deletePermission(String id) throws JeecgBootException;
+ /**逻辑删除*/
+ public void deletePermissionLogical(String id) throws JeecgBootException;
+
+ public void addPermission(SysPermission sysPermission) throws JeecgBootException;
+
+ public void editPermission(SysPermission sysPermission) throws JeecgBootException;
+
+ public List<SysPermission> queryByUser(String username);
+
+ /**
+ * 根据permissionId删除其关联的SysPermissionDataRule表中的数据
+ *
+ * @param id
+ * @return
+ */
+ public void deletePermRuleByPermId(String id);
+
+ /**
+ * 查询出带有特殊符号的菜单地址的集合
+ * @return
+ */
+ public List<String> queryPermissionUrlWithStar();
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysRolePermissionService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysRolePermissionService.java
new file mode 100644
index 0000000..80d91a0
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysRolePermissionService.java
@@ -0,0 +1,31 @@
+package org.jeecg.modules.system.service;
+
+import org.jeecg.modules.system.entity.SysRolePermission;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 角色权限表 服务类
+ * </p>
+ *
+ * @Author scott
+ * @since 2018-12-21
+ */
+public interface ISysRolePermissionService extends IService<SysRolePermission> {
+
+ /**
+ * 保存授权/先删后增
+ * @param roleId
+ * @param permissionIds
+ */
+ public void saveRolePermission(String roleId,String permissionIds);
+
+ /**
+ * 保存授权 将上次的权限和这次作比较 差异处理提高效率
+ * @param roleId
+ * @param permissionIds
+ * @param lastPermissionIds
+ */
+ public void saveRolePermission(String roleId,String permissionIds,String lastPermissionIds);
+
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysRoleService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysRoleService.java
index fd88297..3f9bf05 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysRoleService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysRoleService.java
@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* 角色表 服务类
* </p>
*
- * @author scott
+ * @Author scott
* @since 2018-12-19
*/
public interface ISysRoleService extends IService<SysRole> {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserAgentService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserAgentService.java
new file mode 100644
index 0000000..10e2e82
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserAgentService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.system.service;
+
+import org.jeecg.modules.system.entity.SysUserAgent;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 用户代理人设置
+ * @Author: jeecg-boot
+ * @Date: 2019-04-17
+ * @Version: V1.0
+ */
+public interface ISysUserAgentService extends IService<SysUserAgent> {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java
new file mode 100644
index 0000000..e4b4475
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java
@@ -0,0 +1,49 @@
+package org.jeecg.modules.system.service;
+
+
+import java.util.List;
+
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.entity.SysUserDepart;
+import org.jeecg.modules.system.model.DepartIdModel;
+import org.jeecg.modules.system.model.SysUserDepartsVO;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * SysUserDpeart用户组织机构service
+ * </p>
+ * @Author ZhiLin
+ *
+ */
+public interface ISysUserDepartService extends IService<SysUserDepart> {
+
+ /**
+ * 根据指定用户添加部门信息
+ * @param sysUserDepartsVO
+ * @return
+ */
+ boolean addSysUseWithrDepart(SysUserDepartsVO sysUserDepartsVO);
+
+ /**
+ * 根据指定用户id查询部门信息
+ * @param userId
+ * @return
+ */
+ List<DepartIdModel> queryDepartIdsOfUser(String userId);
+
+ /**
+ * 根据指定用户id编辑部门信息
+ * @param sysUserDepartsVO
+ * @return
+ */
+ boolean editSysUserWithDepart(SysUserDepartsVO sysUserDepartsVO);
+
+ /**
+ * 根据部门id查询用户信息
+ * @param depId
+ * @return
+ */
+ List<SysUser> queryUserByDepId(String depId);
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysUserRoleService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserRoleService.java
index 00ba14d..9539e7d 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysUserRoleService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserRoleService.java
@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* 用户角色表 服务类
* </p>
*
- * @author scott
+ * @Author scott
* @since 2018-12-21
*/
public interface ISysUserRoleService extends IService<SysUserRole> {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
new file mode 100644
index 0000000..d944ee1
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
@@ -0,0 +1,91 @@
+package org.jeecg.modules.system.service;
+
+import java.util.List;
+import java.util.Set;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import org.jeecg.common.system.vo.SysUserCacheInfo;
+import org.jeecg.modules.system.entity.SysUser;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户表 服务类
+ * </p>
+ *
+ * @Author scott
+ * @since 2018-12-20
+ */
+public interface ISysUserService extends IService<SysUser> {
+
+ public SysUser getUserByName(String username);
+
+ /**
+ * 添加用户和用户角色关系
+ * @param user
+ * @param roles
+ */
+ public void addUserWithRole(SysUser user,String roles);
+
+
+ /**
+ * 修改用户和用户角色关系
+ * @param user
+ * @param roles
+ */
+ public void editUserWithRole(SysUser user,String roles);
+
+ /**
+ * 获取用户的授权角色
+ * @param username
+ * @return
+ */
+ public List<String> getRole(String username);
+
+ /**
+ * 查询用户信息包括 部门信息
+ * @param username
+ * @return
+ */
+ public SysUserCacheInfo getCacheUser(String username);
+
+ /**
+ * 根据部门Id查询
+ * @param
+ * @return
+ */
+ public IPage<SysUser> getUserByDepId(Page<SysUser> page, String departId, String username);
+
+ /**
+ * 根据角色Id查询
+ * @param
+ * @return
+ */
+ public IPage<SysUser> getUserByRoleId(Page<SysUser> page,String roleId, String username);
+
+ /**
+ * 通过用户名获取用户角色集合
+ *
+ * @param username 用户名
+ * @return 角色集合
+ */
+ Set<String> getUserRolesSet(String username);
+
+ /**
+ * 通过用户名获取用户权限集合
+ *
+ * @param username 用户名
+ * @return 权限集合
+ */
+ Set<String> getUserPermissionsSet(String username);
+
+ /**
+ * 根据用户名设置部门ID
+ * @param username
+ * @param orgCode
+ */
+ void updateUserDepart(String username,String orgCode);
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/AutoPoiDictService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/AutoPoiDictService.java
new file mode 100644
index 0000000..9b090bb
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/AutoPoiDictService.java
@@ -0,0 +1,63 @@
+package org.jeecg.modules.system.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.jeecg.common.system.vo.DictModel;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.system.mapper.SysDictMapper;
+import org.jeecgframework.dict.service.AutoPoiDictServiceI;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 描述：AutoPoi Excel注解支持字典参数设置
+ * 举例： @Excel(name = "性别", width = 15, dicCode = "sex")
+ * 1、导出的时候会根据字典配置，把值1,2翻译成：男、女;
+ * 2、导入的时候，会把男、女翻译成1,2存进数据库;
+ *
+ * @Author:scott
+ * @since：2019-04-09
+ * @Version:1.0
+ */
+@Slf4j
+@Service
+public class AutoPoiDictService implements AutoPoiDictServiceI {
+ @Autowired
+ private SysDictMapper sysDictMapper;
+
+ /**
+ * 通过字典查询easypoi，所需字典文本
+ *
+ * @Author:scott
+ * @since：2019-04-09
+ * @return
+ */
+ @Override
+ public String[] queryDict(String dicTable, String dicCode, String dicText) {
+ List<String> dictReplaces = new ArrayList<String>();
+ List<DictModel> dictList = null;
+ // step.1 如果没有字典表则使用系统字典表
+ if (oConvertUtils.isEmpty(dicTable)) {
+ dictList = sysDictMapper.queryDictItemsByCode(dicCode);
+ } else {
+ try {
+ dicText = oConvertUtils.getString(dicText, dicCode);
+ dictList = sysDictMapper.queryTableDictItemsByCode(dicTable, dicText, dicCode);
+ } catch (Exception e) {
+ log.error(e.getMessage(),e);
+ }
+ }
+ for (DictModel t : dictList) {
+ dictReplaces.add(t.getText() + "_" + t.getValue());
+ }
+ if (dictReplaces != null && dictReplaces.size() != 0) {
+ log.info("---AutoPoi--Get_DB_Dict------"+ dictReplaces.toString());
+ return dictReplaces.toArray(new String[dictReplaces.size()]);
+ }
+ return null;
+ }
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementSendServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementSendServiceImpl.java
new file mode 100644
index 0000000..d930acb
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementSendServiceImpl.java
@@ -0,0 +1,39 @@
+package org.jeecg.modules.system.service.impl;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.jeecg.modules.system.entity.SysAnnouncementSend;
+import org.jeecg.modules.system.mapper.SysAnnouncementSendMapper;
+import org.jeecg.modules.system.model.AnnouncementSendModel;
+import org.jeecg.modules.system.service.ISysAnnouncementSendService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 用户通告阅读标记表
+ * @Author: jeecg-boot
+ * @Date: 2019-02-21
+ * @Version: V1.0
+ */
+@Service
+public class SysAnnouncementSendServiceImpl extends ServiceImpl<SysAnnouncementSendMapper, SysAnnouncementSend> implements ISysAnnouncementSendService {
+
+ @Resource
+ private SysAnnouncementSendMapper sysAnnouncementSendMapper;
+
+ @Override
+ public List<String> queryByUserId(String userId) {
+ return sysAnnouncementSendMapper.queryByUserId(userId);
+ }
+
+ @Override
+ public Page<AnnouncementSendModel> getMyAnnouncementSendPage(Page<AnnouncementSendModel> page,
+ AnnouncementSendModel announcementSendModel) {
+ return page.setRecords(sysAnnouncementSendMapper.getMyAnnouncementSendList(page, announcementSendModel));
+ }
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java
new file mode 100644
index 0000000..28e5aed
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java
@@ -0,0 +1,120 @@
+package org.jeecg.modules.system.service.impl;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.modules.system.entity.SysAnnouncement;
+import org.jeecg.modules.system.entity.SysAnnouncementSend;
+import org.jeecg.modules.system.mapper.SysAnnouncementMapper;
+import org.jeecg.modules.system.mapper.SysAnnouncementSendMapper;
+import org.jeecg.modules.system.service.ISysAnnouncementService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 系统通告表
+ * @Author: jeecg-boot
+ * @Date: 2019-01-02
+ * @Version: V1.0
+ */
+@Service
+public class SysAnnouncementServiceImpl extends ServiceImpl<SysAnnouncementMapper, SysAnnouncement> implements ISysAnnouncementService {
+
+ @Resource
+ private SysAnnouncementMapper sysAnnouncementMapper;
+
+ @Resource
+ private SysAnnouncementSendMapper sysAnnouncementSendMapper;
+
+ @Transactional
+ @Override
+ public void saveAnnouncement(SysAnnouncement sysAnnouncement) {
+ if(sysAnnouncement.getMsgType().equals(CommonConstant.MSG_TYPE_ALL)) {
+ sysAnnouncementMapper.insert(sysAnnouncement);
+ }else {
+ // 1.插入通告表记录
+ sysAnnouncementMapper.insert(sysAnnouncement);
+ // 2.插入用户通告阅读标记表记录
+ String userId = sysAnnouncement.getUserIds();
+ String[] userIds = userId.substring(0, (userId.length()-1)).split(",");
+ String anntId = sysAnnouncement.getId();
+ Date refDate = new Date();
+ for(int i=0;i<userIds.length;i++) {
+ SysAnnouncementSend announcementSend = new SysAnnouncementSend();
+ announcementSend.setAnntId(anntId);
+ announcementSend.setUserId(userIds[i]);
+ announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG);
+ announcementSend.setReadTime(refDate);
+ sysAnnouncementSendMapper.insert(announcementSend);
+ }
+ }
+ }
+
+ /**
+ * @功能：编辑消息信息
+ */
+ @Transactional
+ @Override
+ public boolean upDateAnnouncement(SysAnnouncement sysAnnouncement) {
+ // 1.更新系统信息表数据
+ sysAnnouncementMapper.updateById(sysAnnouncement);
+ if(sysAnnouncement.getMsgType().equals(CommonConstant.MSG_TYPE_UESR)) {
+ // 2.补充新的通知用户数据
+ String userId = sysAnnouncement.getUserIds();
+ String[] userIds = userId.substring(0, (userId.length()-1)).split(",");
+ String anntId = sysAnnouncement.getId();
+ Date refDate = new Date();
+ for(int i=0;i<userIds.length;i++) {
+ LambdaQueryWrapper<SysAnnouncementSend> queryWrapper = new LambdaQueryWrapper<SysAnnouncementSend>();
+ queryWrapper.eq(SysAnnouncementSend::getAnntId, anntId);
+ queryWrapper.eq(SysAnnouncementSend::getUserId, userIds[i]);
+ List<SysAnnouncementSend> announcementSends=sysAnnouncementSendMapper.selectList(queryWrapper);
+ if(announcementSends.size()<=0) {
+ SysAnnouncementSend announcementSend = new SysAnnouncementSend();
+ announcementSend.setAnntId(anntId);
+ announcementSend.setUserId(userIds[i]);
+ announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG);
+ announcementSend.setReadTime(refDate);
+ sysAnnouncementSendMapper.insert(announcementSend);
+ }
+ }
+ // 3. 删除多余通知用户数据
+ Collection<String> delUserIds = Arrays.asList(userIds);
+ LambdaQueryWrapper<SysAnnouncementSend> queryWrapper = new LambdaQueryWrapper<SysAnnouncementSend>();
+ queryWrapper.notIn(SysAnnouncementSend::getUserId, delUserIds);
+ queryWrapper.eq(SysAnnouncementSend::getAnntId, anntId);
+ sysAnnouncementSendMapper.delete(queryWrapper);
+ }
+ return true;
+ }
+
+ // @功能：流程执行完成保存消息通知
+ @Override
+ public void saveSysAnnouncement(String title, String msgContent) {
+ SysAnnouncement announcement = new SysAnnouncement();
+ announcement.setTitile(title);
+ announcement.setMsgContent(msgContent);
+ announcement.setSender("共享平台");
+ announcement.setPriority(CommonConstant.PRIORITY_L);
+ announcement.setMsgType(CommonConstant.MSG_TYPE_ALL);
+ announcement.setSendStatus(CommonConstant.HAS_SEND);
+ announcement.setSendTime(new Date());
+ announcement.setDelFlag(String.valueOf(CommonConstant.DEL_FLAG_0));
+ sysAnnouncementMapper.insert(announcement);
+ }
+
+ @Override
+ public Page<SysAnnouncement> querySysCementPageByUserId(Page<SysAnnouncement> page, String userId,String msgCategory) {
+ return page.setRecords(sysAnnouncementMapper.querySysCementListByUserId(page, userId, msgCategory));
+ }
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
new file mode 100644
index 0000000..bd9a800
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
@@ -0,0 +1,201 @@
+package org.jeecg.modules.system.service.impl;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.sql.DataSource;
+
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.api.ISysBaseAPI;
+import org.jeecg.common.system.vo.DictModel;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.IPUtils;
+import org.jeecg.common.util.SpringContextUtils;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.system.entity.SysAnnouncement;
+import org.jeecg.modules.system.entity.SysAnnouncementSend;
+import org.jeecg.modules.system.entity.SysLog;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.mapper.SysAnnouncementMapper;
+import org.jeecg.modules.system.mapper.SysAnnouncementSendMapper;
+import org.jeecg.modules.system.mapper.SysLogMapper;
+import org.jeecg.modules.system.mapper.SysUserMapper;
+import org.jeecg.modules.system.mapper.SysUserRoleMapper;
+import org.jeecg.modules.system.service.ISysDictService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @Description: 底层共通业务API，提供其他独立模块调用
+ * @Author: scott
+ * @Date:2019-4-20
+ * @Version:V1.0
+ */
+@Slf4j
+@Service
+public class SysBaseApiImpl implements ISysBaseAPI {
+ public static final String DB_TYPE_MYSQL="MYSQL";
+ public static final String DB_TYPE_ORACLE="ORACLE";
+ public static final String DB_TYPE_POSTGRESQL="POSTGRESQL";
+ public static final String DB_TYPE_SQLSERVER="SQLSERVER";
+ public static String DB_TYPE = "";
+
+ @Resource
+ private SysLogMapper sysLogMapper;
+ @Autowired
+ private SysUserMapper userMapper;
+ @Autowired
+ private SysUserRoleMapper sysUserRoleMapper;
+ @Autowired
+ private ISysDictService sysDictService;
+ @Resource
+ private SysAnnouncementMapper sysAnnouncementMapper;
+ @Resource
+ private SysAnnouncementSendMapper sysAnnouncementSendMapper;
+
+ @Override
+ public void addLog(String LogContent, Integer logType, Integer operatetype) {
+ SysLog sysLog = new SysLog();
+ //注解上的描述,操作日志内容
+ sysLog.setLogContent(LogContent);
+ sysLog.setLogType(logType);
+ sysLog.setOperateType(operatetype);
+
+ //请求的方法名
+ //请求的参数
+
+ try {
+ //获取request
+ HttpServletRequest request = SpringContextUtils.getHttpServletRequest();
+ //设置IP地址
+ sysLog.setIp(IPUtils.getIpAddr(request));
+ } catch (Exception e) {
+ sysLog.setIp("127.0.0.1");
+ }
+
+ //获取登录用户信息
+ LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+ if(sysUser!=null){
+ sysLog.setUserid(sysUser.getUsername());
+ sysLog.setUsername(sysUser.getRealname());
+
+ }
+ sysLog.setCreateTime(new Date());
+ //保存系统日志
+ sysLogMapper.insert(sysLog);
+ }
+
+ @Override
+ public LoginUser getUserByName(String username) {
+ if(oConvertUtils.isEmpty(username)) {
+ return null;
+ }
+ LoginUser loginUser = new LoginUser();
+ SysUser sysUser = userMapper.getUserByName(username);
+ if(sysUser==null) {
+ return null;
+ }
+ BeanUtils.copyProperties(sysUser, loginUser);
+ return loginUser;
+ }
+
+ @Override
+ public List<String> getRolesByUsername(String username) {
+ return sysUserRoleMapper.getRoleByUserName(username);
+ }
+
+ @Override
+ public String getDatabaseType() throws SQLException {
+ return getDatabaseType();
+ }
+
+ @Override
+ public List<DictModel> queryDictItemsByCode(String code) {
+ return sysDictService.queryDictItemsByCode(code);
+ }
+
+ @Override
+ public List<DictModel> queryTableDictItemsByCode(String table, String text, String code) {
+ return sysDictService.queryTableDictItemsByCode(table, text, code);
+ }
+
+ @Override
+ public List<DictModel> queryAllDepartBackDictModel() {
+ return sysDictService.queryAllDepartBackDictModel();
+ }
+
+ @Override
+ public void sendSysAnnouncement(String fromUser, String toUser, String title, String msgContent) {
+ SysAnnouncement announcement = new SysAnnouncement();
+ announcement.setTitile(title);
+ announcement.setMsgContent(msgContent);
+ announcement.setSender(fromUser);
+ announcement.setPriority(CommonConstant.PRIORITY_M);
+ announcement.setMsgType(CommonConstant.MSG_TYPE_UESR);
+ announcement.setSendStatus(CommonConstant.HAS_SEND);
+ announcement.setSendTime(new Date());
+ announcement.setMsgCategory("2");
+ announcement.setDelFlag(String.valueOf(CommonConstant.DEL_FLAG_0));
+ sysAnnouncementMapper.insert(announcement);
+ // 2.插入用户通告阅读标记表记录
+ String userId = toUser;
+ String[] userIds = userId.split(",");
+ String anntId = announcement.getId();
+ for(int i=0;i<userIds.length;i++) {
+ if(oConvertUtils.isNotEmpty(userIds[i])) {
+ SysUser sysUser = userMapper.getUserByName(userIds[i]);
+ if(sysUser==null) {
+ continue;
+ }
+ SysAnnouncementSend announcementSend = new SysAnnouncementSend();
+ announcementSend.setAnntId(anntId);
+ announcementSend.setUserId(sysUser.getId());
+ announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG);
+ sysAnnouncementSendMapper.insert(announcementSend);
+ }
+ }
+ }
+ /**
+ * 获取数据库类型
+ * @param dataSource
+ * @return
+ * @throws SQLException
+ * @throws DBException
+ */
+ private static String getDatabaseType(DataSource dataSource) throws SQLException{
+ if("".equals(DB_TYPE)) {
+ Connection connection = dataSource.getConnection();
+ try {
+ DatabaseMetaData md = connection.getMetaData();
+ String dbType = md.getDatabaseProductName().toLowerCase();
+ if(dbType.indexOf("mysql")>=0) {
+ DB_TYPE = DB_TYPE_MYSQL;
+ }else if(dbType.indexOf("oracle")>=0) {
+ DB_TYPE = DB_TYPE_ORACLE;
+ }else if(dbType.indexOf("sqlserver")>=0||dbType.indexOf("sql server")>=0) {
+ DB_TYPE = DB_TYPE_SQLSERVER;
+ }else if(dbType.indexOf("postgresql")>=0) {
+ DB_TYPE = DB_TYPE_POSTGRESQL;
+ }else {
+ throw new JeecgBootException("数据库类型:["+dbType+"]不识别!");
+ }
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }finally {
+ connection.close();
+ }
+ }
+ return DB_TYPE;
+
+ }
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDataLogServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDataLogServiceImpl.java
new file mode 100644
index 0000000..c805010
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDataLogServiceImpl.java
@@ -0,0 +1,33 @@
+package org.jeecg.modules.system.service.impl;
+
+import org.jeecg.modules.system.entity.SysDataLog;
+import org.jeecg.modules.system.mapper.SysDataLogMapper;
+import org.jeecg.modules.system.service.ISysDataLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+@Service
+public class SysDataLogServiceImpl extends ServiceImpl<SysDataLogMapper,SysDataLog> implements ISysDataLogService {
+ @Autowired
+ private SysDataLogMapper logMapper;
+
+ /**
+ * 添加数据日志
+ */
+ @Override
+ public void addDataLog(String tableName, String dataId, String dataContent) {
+ String versionNumber = "0";
+ String dataVersion = logMapper.queryMaxDataVer(tableName, dataId);
+ if(dataVersion != null ) {
+ versionNumber = String.valueOf(Integer.parseInt(dataVersion)+1);
+ }
+ SysDataLog log = new SysDataLog();
+ log.setDataTable(tableName);
+ log.setDataId(dataId);
+ log.setDataContent(dataContent);
+ log.setDataVersion(versionNumber);
+ this.save(log);
+ }
+
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
index a0dac2a..a483f2c 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
@@ -24,11 +24,11 @@ import io.netty.util.internal.StringUtil;
* 部门表 服务实现类
* <p>
*
- * @author Steve
+ * @Author Steve
* @Since 2019-01-22
*/
@Service
-public class SysDepartServiceImpl<T> extends ServiceImpl<SysDepartMapper, SysDepart> implements ISysDepartService {
+public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart> implements ISysDepartService {
/**
* queryTreeList 对应 queryTreeList 查询所有的部门数据,以树结构形式响应给前端
@@ -178,11 +178,16 @@ public class SysDepartServiceImpl<T> extends ServiceImpl<SysDepartMapper, SysDep
public List<SysDepartTreeModel> searhBy(String keyWord) {
LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>();
query.like(SysDepart::getDepartName, keyWord);
+ //update-begin--Author:huangzhilin Date:20140417 for：[bugfree号]组织机构搜索回显优化--------------------
+ SysDepartTreeModel model = new SysDepartTreeModel();
List<SysDepart> departList = this.list(query);
List<SysDepartTreeModel> newList = new ArrayList<>();
if(departList.size() > 0) {
for(SysDepart depart : departList) {
- newList.add(new SysDepartTreeModel(depart));
+ model = new SysDepartTreeModel(depart);
+ model.setChildren(null);
+ //update-end--Author:huangzhilin Date:20140417 for：[bugfree号]组织机构搜索功回显优化----------------------
+ newList.add(model);
}
return newList;
}
@@ -217,6 +222,11 @@ public class SysDepartServiceImpl<T> extends ServiceImpl<SysDepartMapper, SysDep
}
}
}
+
+ @Override
+ public List<SysDepart> queryUserDeparts(String userId) {
+ return baseMapper.queryUserDeparts(userId);
+ }
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictItemServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictItemServiceImpl.java
new file mode 100644
index 0000000..33184a9
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictItemServiceImpl.java
@@ -0,0 +1,30 @@
+package org.jeecg.modules.system.service.impl;
+
+import org.jeecg.modules.system.entity.SysDictItem;
+import org.jeecg.modules.system.mapper.SysDictItemMapper;
+import org.jeecg.modules.system.service.ISysDictItemService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @Author zhangweijian
+ * @since 2018-12-28
+ */
+@Service
+public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDictItem> implements ISysDictItemService {
+
+ @Autowired
+ private SysDictItemMapper sysDictItemMapper;
+
+ @Override
+ public List<SysDictItem> selectItemsByMainId(String mainId) {
+ return sysDictItemMapper.selectItemsByMainId(mainId);
+ }
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
new file mode 100644
index 0000000..309dd1d
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
@@ -0,0 +1,126 @@
+package org.jeecg.modules.system.service.impl;
+
+import java.util.List;
+
+import org.jeecg.common.system.vo.DictModel;
+import org.jeecg.modules.system.entity.SysDict;
+import org.jeecg.modules.system.entity.SysDictItem;
+import org.jeecg.modules.system.mapper.SysDictItemMapper;
+import org.jeecg.modules.system.mapper.SysDictMapper;
+import org.jeecg.modules.system.service.ISysDictService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * <p>
+ * 字典表 服务实现类
+ * </p>
+ *
+ * @Author zhangweijian
+ * @since 2018-12-28
+ */
+@Service
+@Slf4j
+public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> implements ISysDictService {
+
+ @Autowired
+ private SysDictMapper sysDictMapper;
+ @Autowired
+ private SysDictItemMapper sysDictItemMapper;
+
+ /**
+ * 通过查询指定code 获取字典
+ * @param code
+ * @return
+ */
+ @Override
+ @Cacheable(value = "dictCache",key = "#code")
+ public List<DictModel> queryDictItemsByCode(String code) {
+ log.info("无缓存dictCache的时候调用这里！");
+ return sysDictMapper.queryDictItemsByCode(code);
+ }
+
+ /**
+ * 通过查询指定code 获取字典值text
+ * @param code
+ * @param key
+ * @return
+ */
+
+ @Override
+ @Cacheable(value = "dictCache")
+ public String queryDictTextByKey(String code, String key) {
+ log.info("无缓存dictText的时候调用这里！");
+ return sysDictMapper.queryDictTextByKey(code, key);
+ }
+
+ /**
+ * 通过查询指定table的 text code 获取字典
+ * dictTableCache采用redis缓存有效期10分钟
+ * @param table
+ * @param text
+ * @param code
+ * @return
+ */
+ @Override
+ //@Cacheable(value = "dictTableCache")
+ public List<DictModel> queryTableDictItemsByCode(String table, String text, String code) {
+ log.info("无缓存dictTableList的时候调用这里！");
+ return sysDictMapper.queryTableDictItemsByCode(table,text,code);
+ }
+
+ /**
+ * 通过查询指定table的 text code 获取字典值text
+ * dictTableCache采用redis缓存有效期10分钟
+ * @param table
+ * @param text
+ * @param code
+ * @param key
+ * @return
+ */
+ @Override
+ @Cacheable(value = "dictTableCache")
+ public String queryTableDictTextByKey(String table,String text,String code, String key) {
+ log.info("无缓存dictTable的时候调用这里！");
+ return sysDictMapper.queryTableDictTextByKey(table,text,code,key);
+ }
+
+ /**
+ * 根据字典类型id删除关联表中其对应的数据
+ */
+ @Override
+ public boolean deleteByDictId(SysDict sysDict) {
+ sysDict.setDelFlag(2);
+ return this.updateById(sysDict);
+ }
+
+ @Override
+ @Transactional
+ public void saveMain(SysDict sysDict, List<SysDictItem> sysDictItemList) {
+
+ sysDictMapper.insert(sysDict);
+ if (sysDictItemList != null) {
+ for (SysDictItem entity : sysDictItemList) {
+ entity.setDictId(sysDict.getId());
+ sysDictItemMapper.insert(entity);
+ }
+ }
+ }
+
+ @Override
+ public List<DictModel> queryAllDepartBackDictModel() {
+ return baseMapper.queryAllDepartBackDictModel();
+ }
+
+ @Override
+ public List<DictModel> queryAllUserBackDictModel() {
+ return baseMapper.queryAllUserBackDictModel();
+ }
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java
new file mode 100644
index 0000000..643463a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java
@@ -0,0 +1,52 @@
+package org.jeecg.modules.system.service.impl;
+
+import java.util.Date;
+
+import javax.annotation.Resource;
+
+import org.jeecg.modules.system.entity.SysLog;
+import org.jeecg.modules.system.mapper.SysLogMapper;
+import org.jeecg.modules.system.service.ISysLogService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * <p>
+ * 系统日志表 服务实现类
+ * </p>
+ *
+ * @Author zhangweijian
+ * @since 2018-12-26
+ */
+@Service
+public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> implements ISysLogService {
+
+ @Resource
+ private SysLogMapper sysLogMapper;
+
+ /**
+ * @功能：清空所有日志记录
+ */
+ @Override
+ public void removeAll() {
+ sysLogMapper.removeAll();
+ }
+
+ @Override
+ public Long findTotalVisitCount() {
+ return sysLogMapper.findTotalVisitCount();
+ }
+
+ //update-begin--Author:zhangweijian Date:20190428 for：传入开始时间，结束时间参数
+ @Override
+ public Long findTodayVisitCount(Date dayStart, Date dayEnd) {
+ return sysLogMapper.findTodayVisitCount(dayStart,dayEnd);
+ }
+
+ @Override
+ public Long findTodayIp(Date dayStart, Date dayEnd) {
+ return sysLogMapper.findTodayIp(dayStart,dayEnd);
+ }
+ //update-end--Author:zhangweijian Date:20190428 for：传入开始时间，结束时间参数
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java
index 9eebc99..1fd4940 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java
@@ -4,13 +4,17 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import javax.annotation.Resource;
+
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.system.entity.SysPermission;
import org.jeecg.modules.system.entity.SysPermissionDataRule;
import org.jeecg.modules.system.mapper.SysPermissionDataRuleMapper;
+import org.jeecg.modules.system.mapper.SysPermissionMapper;
import org.jeecg.modules.system.service.ISysPermissionDataRuleService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -21,15 +25,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
* 菜单权限规则 服务实现类
* </p>
*
- * @author huangzhilin
+ * @Author huangzhilin
* @since 2019-04-01
*/
@Service
public class SysPermissionDataRuleImpl extends ServiceImpl<SysPermissionDataRuleMapper, SysPermissionDataRule>
implements ISysPermissionDataRuleService {
- @Autowired
- private ISysPermissionDataRuleService permRuleService;
+ @Resource
+ private SysPermissionMapper sysPermissionMapper;
/**
* 根据菜单id查询其对应的权限数据
@@ -39,7 +43,7 @@ public class SysPermissionDataRuleImpl extends ServiceImpl<SysPermissionDataRule
LambdaQueryWrapper<SysPermissionDataRule> query = new LambdaQueryWrapper<SysPermissionDataRule>();
query.eq(SysPermissionDataRule::getPermissionId, permissionId);
query.orderByDesc(SysPermissionDataRule::getCreateTime);
- List<SysPermissionDataRule> permRuleList = permRuleService.list(query);
+ List<SysPermissionDataRule> permRuleList = this.list(query);
return permRuleList;
}
@@ -49,13 +53,13 @@ public class SysPermissionDataRuleImpl extends ServiceImpl<SysPermissionDataRule
@Override
public List<SysPermissionDataRule> queryPermissionRule(SysPermissionDataRule permRule) {
QueryWrapper<SysPermissionDataRule> queryWrapper = QueryGenerator.initQueryWrapper(permRule, null);
- return permRuleService.list(queryWrapper);
+ return this.list(queryWrapper);
}
@Override
public List<SysPermissionDataRule> queryPermissionDataRules(String username,String permissionId) {
List<String> idsList = this.baseMapper.queryDataRuleIds(username, permissionId);
- if(idsList==null || idsList.size()==0) {
+ if(idsList==null || idsList.size()==0 || idsList.get(0)==null ) {
return null;
}
Set<String> set = new HashSet<String>();
@@ -70,7 +74,40 @@ public class SysPermissionDataRuleImpl extends ServiceImpl<SysPermissionDataRule
}
}
}
- return this.baseMapper.selectList(new QueryWrapper<SysPermissionDataRule>().in("id", set));
+ if(set.size()==0) {
+ return null;
+ }
+ return this.baseMapper.selectList(new QueryWrapper<SysPermissionDataRule>().in("id", set).eq("status","1"));
+ }
+
+ @Override
+ @Transactional
+ public void savePermissionDataRule(SysPermissionDataRule sysPermissionDataRule) {
+ this.save(sysPermissionDataRule);
+ SysPermission permission = sysPermissionMapper.selectById(sysPermissionDataRule.getPermissionId());
+ if(permission!=null && (permission.getRuleFlag()==null || permission.getRuleFlag()==0)) {
+ permission.setRuleFlag(1);
+ sysPermissionMapper.updateById(permission);
+ }
+ }
+
+ @Override
+ @Transactional
+ public void deletePermissionDataRule(String dataRuleId) {
+ SysPermissionDataRule dataRule = this.baseMapper.selectById(dataRuleId);
+ if(dataRule!=null) {
+ this.removeById(dataRuleId);
+ Integer count = this.baseMapper.selectCount(new LambdaQueryWrapper<SysPermissionDataRule>().eq(SysPermissionDataRule::getPermissionId, dataRule.getPermissionId()));
+ //注:同一个事务中删除后再查询是会认为数据已被删除的 若事务回滚上述删除无效
+ if(count==null || count==0) {
+ SysPermission permission = sysPermissionMapper.selectById(dataRule.getPermissionId());
+ if(permission!=null && permission.getRuleFlag()==1) {
+ permission.setRuleFlag(0);
+ sysPermissionMapper.updateById(permission);
+ }
+ }
+ }
+
}
}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java
index f597559..6dcd11c 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java
@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
* 菜单权限表 服务实现类
* </p>
*
- * @author scott
+ * @Author scott
* @since 2018-12-21
*/
@Service
@@ -100,6 +100,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
*/
@Override
@CacheEvict(value = "permission",allEntries=true)
+ //@CacheEvict(value = "permission",allEntries=true,condition="#sysPermission.menuType==2")
public void deletePermissionLogical(String id) throws JeecgBootException {
SysPermission sysPermission = this.getById(id);
if(sysPermission==null) {
@@ -116,7 +117,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
}
@Override
- @CacheEvict(value = "permission",allEntries=true,condition="#sysPermission.menuType=2")
+ @CacheEvict(value = "permission",allEntries=true)
public void addPermission(SysPermission sysPermission) throws JeecgBootException {
//----------------------------------------------------------------------
//判断是否是一级菜单，是的话清空父菜单
@@ -136,7 +137,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
}
@Override
- @CacheEvict(value = "permission",allEntries=true,condition="#sysPermission.menuType=2")
+ @CacheEvict(value = "permission",allEntries=true)
public void editPermission(SysPermission sysPermission) throws JeecgBootException {
SysPermission p = this.getById(sysPermission.getId());
//TODO 该节点判断是否还有子节点
@@ -191,6 +192,9 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
}
}
+ /**
+ * 获取模糊匹配规则的数据权限URL
+ */
@Override
@Cacheable(value = "permission")
public List<String> queryPermissionUrlWithStar() {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java
new file mode 100644
index 0000000..e25760d
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java
@@ -0,0 +1,100 @@
+package org.jeecg.modules.system.service.impl;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.system.entity.SysRolePermission;
+import org.jeecg.modules.system.mapper.SysRolePermissionMapper;
+import org.jeecg.modules.system.service.ISysRolePermissionService;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 角色权限表 服务实现类
+ * </p>
+ *
+ * @Author scott
+ * @since 2018-12-21
+ */
+@Service
+public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionMapper, SysRolePermission> implements ISysRolePermissionService {
+
+ @Override
+ @CacheEvict(value="loginUser_cacheRules", allEntries=true)
+ public void saveRolePermission(String roleId, String permissionIds) {
+ LambdaQueryWrapper<SysRolePermission> query = new QueryWrapper<SysRolePermission>().lambda().eq(SysRolePermission::getRoleId, roleId);
+ this.remove(query);
+ List<SysRolePermission> list = new ArrayList<SysRolePermission>();
+ String arr[] = permissionIds.split(",");
+ for (String p : arr) {
+ if(oConvertUtils.isNotEmpty(p)) {
+ SysRolePermission rolepms = new SysRolePermission(roleId, p);
+ list.add(rolepms);
+ }
+ }
+ this.saveBatch(list);
+ }
+
+ @Override
+ @CacheEvict(value="loginUser_cacheRules", allEntries=true)
+ public void saveRolePermission(String roleId, String permissionIds, String lastPermissionIds) {
+ List<String> add = getDiff(lastPermissionIds,permissionIds);
+ if(add!=null && add.size()>0) {
+ List<SysRolePermission> list = new ArrayList<SysRolePermission>();
+ for (String p : add) {
+ if(oConvertUtils.isNotEmpty(p)) {
+ SysRolePermission rolepms = new SysRolePermission(roleId, p);
+ list.add(rolepms);
+ }
+ }
+ this.saveBatch(list);
+ }
+
+ List<String> delete = getDiff(permissionIds,lastPermissionIds);
+ if(delete!=null && delete.size()>0) {
+ for (String permissionId : delete) {
+ this.remove(new QueryWrapper<SysRolePermission>().lambda().eq(SysRolePermission::getRoleId, roleId).eq(SysRolePermission::getPermissionId, permissionId));
+ }
+ }
+ }
+
+ /**
+ * 从diff中找出main中没有的元素
+ * @param main
+ * @param diff
+ * @return
+ */
+ private List<String> getDiff(String main,String diff){
+ if(oConvertUtils.isEmpty(diff)) {
+ return null;
+ }
+ if(oConvertUtils.isEmpty(main)) {
+ return Arrays.asList(diff.split(","));
+ }
+
+ String[] mainArr = main.split(",");
+ String[] diffArr = diff.split(",");
+ Map<String, Integer> map = new HashMap<>();
+ for (String string : mainArr) {
+ map.put(string, 1);
+ }
+ List<String> res = new ArrayList<String>();
+ for (String key : diffArr) {
+ if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) {
+ res.add(key);
+ }
+ }
+ return res;
+ }
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java
new file mode 100644
index 0000000..730ee63
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java
@@ -0,0 +1,27 @@
+package org.jeecg.modules.system.service.impl;
+
+import org.jeecg.modules.system.entity.SysRole;
+import org.jeecg.modules.system.mapper.SysRoleMapper;
+import org.jeecg.modules.system.service.ISysRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * <p>
+ * 角色表 服务实现类
+ * </p>
+ *
+ * @Author scott
+ * @since 2018-12-19
+ */
+@Service
+public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
+
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserAgentServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserAgentServiceImpl.java
new file mode 100644
index 0000000..d46c057
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserAgentServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.system.service.impl;
+
+import org.jeecg.modules.system.entity.SysUserAgent;
+import org.jeecg.modules.system.mapper.SysUserAgentMapper;
+import org.jeecg.modules.system.service.ISysUserAgentService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 用户代理人设置
+ * @Author: jeecg-boot
+ * @Date: 2019-04-17
+ * @Version: V1.0
+ */
+@Service
+public class SysUserAgentServiceImpl extends ServiceImpl<SysUserAgentMapper, SysUserAgent> implements ISysUserAgentService {
+
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java
index 5be1f4c..851a686 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java
@@ -22,19 +22,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
* <P>
* 用户部门表实现类
* <p/>
- * @author ZhiLin
+ * @Author ZhiLin
*@since 2019-02-22
*/
@Service
public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, SysUserDepart> implements ISysUserDepartService {
-
- @Autowired
- private ISysUserDepartService userDepartService;
@Autowired
private ISysDepartService sysDepartService;
@Autowired
private ISysUserService sysUserService;
-
+
/**
*根据用户id添加部门信息
*/
@@ -48,9 +45,9 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
for(String depId : departIdList) {
query.eq(SysUserDepart::getDepId, depId);
query.eq(SysUserDepart::getUserId, userId);
- List<SysUserDepart> uDepList = userDepartService.list(query);
+ List<SysUserDepart> uDepList = this.list(query);
if(uDepList == null || uDepList.size() == 0) {
- userDepartService.save(new SysUserDepart("",userId,depId));
+ this.save(new SysUserDepart("",userId,depId));
}
}
}
@@ -72,7 +69,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
queryUDep.eq(SysUserDepart::getUserId, userId);
List<String> depIdList = new ArrayList<>();
List<DepartIdModel> depIdModelList = new ArrayList<>();
- List<SysUserDepart> userDepList = userDepartService.list(queryUDep);
+ List<SysUserDepart> userDepList = this.list(queryUDep);
if(userDepList != null && userDepList.size() > 0) {
for(SysUserDepart userDepart : userDepList) {
depIdList.add(userDepart.getDepId());
@@ -103,16 +100,16 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
List<String> depIdList = sysUserDepartsVO.getDepartIdList();
if(depIdList != null && depIdList.size() > 0) {
queryDep.eq(SysUserDepart::getUserId, sysUserDepartsVO.getUserId());
- boolean ok = userDepartService.remove(queryDep);
+ boolean ok = this.remove(queryDep);
if(ok) {
for(String str : depIdList) {
- userDepartService.save(new SysUserDepart("", sysUserDepartsVO.getUserId(), str));
+ this.save(new SysUserDepart("", sysUserDepartsVO.getUserId(), str));
}
return ok;
}
}
queryDep.eq(SysUserDepart::getUserId, sysUserDepartsVO.getUserId());
- boolean ok = userDepartService.remove(queryDep);
+ boolean ok = this.remove(queryDep);
return ok;
}
@@ -130,6 +127,12 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
userIdList.add(uDep.getUserId());
}
List<SysUser> userList = (List<SysUser>) sysUserService.listByIds(userIdList);
+ //update-begin-author:taoyan date:201905047 for:接口调用查询返回结果不能返回密码相关信息
+ for (SysUser sysUser : userList) {
+ sysUser.setSalt("");
+ sysUser.setPassword("");
+ }
+ //update-end-author:taoyan date:201905047 for:接口调用查询返回结果不能返回密码相关信息
return userList;
}
return new ArrayList<SysUser>();
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java
new file mode 100644
index 0000000..91b6717
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java
@@ -0,0 +1,79 @@
+package org.jeecg.modules.system.service.impl;
+
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jeecg.modules.system.entity.SysRole;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.entity.SysUserRole;
+import org.jeecg.modules.system.mapper.SysUserRoleMapper;
+import org.jeecg.modules.system.service.ISysRoleService;
+import org.jeecg.modules.system.service.ISysUserRoleService;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * <p>
+ * 用户角色表 服务实现类
+ * </p>
+ *
+ * @Author scott
+ * @since 2018-12-21
+ */
+@Service
+public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUserRole> implements ISysUserRoleService {
+
+ @Autowired
+ private ISysUserService userService;
+ @Autowired
+ private ISysRoleService roleService;
+
+ /**
+ * 查询所有用户对应的角色信息
+ */
+ @Override
+ public Map<String,String> queryUserRole() {
+ List<SysUserRole> uRoleList = this.list();
+ List<SysUser> userList = userService.list();
+ List<SysRole> roleList = roleService.list();
+ Map<String,String> map = new IdentityHashMap<>();
+ String userId = "";
+ String roleId = "";
+ String roleName = "";
+ if(uRoleList != null && uRoleList.size() > 0) {
+ for(SysUserRole uRole : uRoleList) {
+ roleId = uRole.getRoleId();
+ for(SysUser user : userList) {
+ userId = user.getId();
+ if(uRole.getUserId().equals(userId)) {
+ roleName = this.searchByRoleId(roleList,roleId);
+ map.put(userId, roleName);
+ }
+ }
+ }
+ return map;
+ }
+ return map;
+ }
+
+ /**
+ * queryUserRole调用的方法
+ * @param roleList
+ * @param roleId
+ * @return
+ */
+ private String searchByRoleId(List<SysRole> roleList, String roleId) {
+ while(true) {
+ for(SysRole role : roleList) {
+ if(roleId.equals(role.getId())) {
+ return role.getRoleName();
+ }
+ }
+ }
+ }
+
+}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
index 3cc4458..ed2ff87 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
@@ -1,39 +1,56 @@
package org.jeecg.modules.system.service.impl;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
-import java.util.UUID;
+import java.util.Set;
+
+import org.jeecg.common.system.api.ISysBaseAPI;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.system.vo.SysUserCacheInfo;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.system.entity.SysDepart;
+import org.jeecg.modules.system.entity.SysPermission;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.entity.SysUserRole;
import org.jeecg.modules.system.mapper.SysDepartMapper;
+import org.jeecg.modules.system.mapper.SysPermissionMapper;
import org.jeecg.modules.system.mapper.SysUserMapper;
import org.jeecg.modules.system.mapper.SysUserRoleMapper;
-import org.jeecg.modules.system.model.SysUserCacheInfo;
import org.jeecg.modules.system.service.ISysUserService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import lombok.extern.slf4j.Slf4j;
/**
* <p>
* 用户表 服务实现类
* </p>
*
- * @author scott
- * @since 2018-12-20
+ * @Author: scott
+ * @Date: 2018-12-20
*/
@Service
+@Slf4j
public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
@Autowired
private SysUserMapper userMapper;
-
+ @Autowired
+ private SysPermissionMapper sysPermissionMapper;
@Autowired
private SysUserRoleMapper sysUserRoleMapper;
-
+ @Autowired
+ private ISysBaseAPI sysBaseAPI;
@Autowired
private SysDepartMapper sysDepartMapper;
@@ -44,6 +61,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override
+ @Transactional
public void addUserWithRole(SysUser user, String roles) {
this.save(user);
if(oConvertUtils.isNotEmpty(roles)) {
@@ -56,6 +74,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
}
@Override
+ @CacheEvict(value="loginUser_cacheRules", allEntries=true)
+ @Transactional
public void editUserWithRole(SysUser user, String roles) {
this.updateById(user);
//先删后加
@@ -74,32 +94,97 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public List<String> getRole(String username) {
return sysUserRoleMapper.getRoleByUserName(username);
}
+
+ /**
+ * 通过用户名获取用户角色集合
+ * @param username 用户名
+ * @return 角色集合
+ */
+ @Override
+ @Cacheable(value = "loginUser_cacheRules",key = "'Roles_'+#username")
+ public Set<String> getUserRolesSet(String username) {
+ // 查询用户拥有的角色集合
+ List<String> roles = sysUserRoleMapper.getRoleByUserName(username);
+ log.info("-------通过数据库读取用户拥有的角色Rules------username： " + username + ",Roles size: " + (roles == null ? 0 : roles.size()));
+ return new HashSet<>(roles);
+ }
+ /**
+ * 通过用户名获取用户权限集合
+ *
+ * @param username 用户名
+ * @return 权限集合
+ */
+ @Override
+ @Cacheable(value = "loginUser_cacheRules",key = "'Permissions_'+#username")
+ public Set<String> getUserPermissionsSet(String username) {
+ Set<String> permissionSet = new HashSet<>();
+ List<SysPermission> permissionList = sysPermissionMapper.queryByUser(username);
+ for (SysPermission po : permissionList) {
+// // TODO URL规则有问题？
+// if (oConvertUtils.isNotEmpty(po.getUrl())) {
+// permissionSet.add(po.getUrl());
+// }
+ if (oConvertUtils.isNotEmpty(po.getPerms())) {
+ permissionSet.add(po.getPerms());
+ }
+ }
+ log.info("-------通过数据库读取用户拥有的权限Perms------username： "+ username+",Perms size: "+ (permissionSet==null?0:permissionSet.size()) );
+ return permissionSet;
+ }
@Override
public SysUserCacheInfo getCacheUser(String username) {
SysUserCacheInfo info = new SysUserCacheInfo();
info.setOneDepart(true);
- SysUser user = userMapper.getUserByName(username);
- info.setSysUserCode(user.getUsername());
- info.setSysUserName(user.getRealname());
+// SysUser user = userMapper.getUserByName(username);
+// info.setSysUserCode(user.getUsername());
+// info.setSysUserName(user.getRealname());
+
+
+ LoginUser user = sysBaseAPI.getUserByName(username);
+ if(user!=null) {
+ info.setSysUserCode(user.getUsername());
+ info.setSysUserName(user.getRealname());
+ info.setSysOrgCode(user.getOrgCode());
+ }
+ //多部门支持in查询
List<SysDepart> list = sysDepartMapper.queryUserDeparts(user.getId());
- List<String> sysOrgCode = new ArrayList<String>();
+ List<String> sysMultiOrgCode = new ArrayList<String>();
if(list==null || list.size()==0) {
//当前用户无部门
- sysOrgCode.add("0");
+ //sysMultiOrgCode.add("0");
}else if(list.size()==1) {
- sysOrgCode.add(list.get(0).getOrgCode());
+ sysMultiOrgCode.add(list.get(0).getOrgCode());
}else {
info.setOneDepart(false);
for (SysDepart dpt : list) {
- sysOrgCode.add(dpt.getOrgCode());
+ sysMultiOrgCode.add(dpt.getOrgCode());
}
}
- info.setSysOrgCode(sysOrgCode);
- // TODO companycode 没有处理
+ info.setSysMultiOrgCode(sysMultiOrgCode);
+
return info;
}
+ // 根据部门Id查询
+ @Override
+ public IPage<SysUser> getUserByDepId(Page<SysUser> page, String departId,String username) {
+ return userMapper.getUserByDepId(page, departId,username);
+ }
+
+
+ // 根据角色Id查询
+ @Override
+ public IPage<SysUser> getUserByRoleId(Page<SysUser> page, String roleId, String username) {
+ return userMapper.getUserByRoleId(page,roleId,username);
+ }
+
+
+ @Override
+ public void updateUserDepart(String username,String orgCode) {
+ baseMapper.updateUserDepart(username, orgCode);
+ }
+
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java
new file mode 100644
index 0000000..a53a59a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java
@@ -0,0 +1,105 @@
+package org.jeecg.modules.system.util;
+
+import org.jeecg.modules.system.entity.SysDepart;
+import org.jeecg.modules.system.model.DepartIdModel;
+import org.jeecg.modules.system.model.SysDepartTreeModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <P>
+ * 对应部门的表,处理并查找树级数据
+ * <P>
+ *
+ * @Author: Steve
+ * @Date: 2019-01-22
+ */
+public class FindsDepartsChildrenUtil {
+
+
+ private static List<DepartIdModel> idList = new ArrayList<>(4);
+
+
+ /**
+ * queryTreeList的子方法 ====1=====
+ * 该方法是s将SysDepart类型的list集合转换成SysDepartTreeModel类型的集合
+ */
+ public static List<SysDepartTreeModel> wrapTreeDataToTreeList(List<SysDepart> recordList) {
+ // 在该方法每请求一次,都要对全局list集合进行一次清理
+ idList.clear();
+ List<SysDepartTreeModel> records = new ArrayList<>();
+ for (int i = 0; i < recordList.size(); i++) {
+ SysDepart depart = recordList.get(i);
+ records.add(new SysDepartTreeModel(recordList.get(i)));
+ }
+ List<SysDepartTreeModel> tree = findChildren(records, idList);
+ setEmptyChildrenAsNull(tree);
+ return tree;
+ }
+
+ public static List<DepartIdModel> wrapDepartIdModel() {
+ return idList;
+ }
+
+ /**
+ * queryTreeList的子方法 ====2=====
+ * 该方法是找到并封装顶级父类的节点到TreeList集合
+ */
+ private static List<SysDepartTreeModel> findChildren(List<SysDepartTreeModel> recordList,
+ List<DepartIdModel> idList) {
+
+ List<SysDepartTreeModel> treeList = new ArrayList<>();
+ for (int i = 0; i < recordList.size(); i++) {
+ SysDepartTreeModel branch = recordList.get(i);
+ if ("".equals(branch.getParentId())) {
+ treeList.add(branch);
+ DepartIdModel departIdModel = new DepartIdModel().convert(branch);
+ idList.add(departIdModel);
+ }
+ }
+ getGrandChildren(treeList,recordList,idList);
+ return treeList;
+ }
+
+ /**
+ * queryTreeList的子方法====3====
+ *该方法是找到顶级父类下的所有子节点集合并封装到TreeList集合
+ */
+ private static void getGrandChildren(List<SysDepartTreeModel> treeList,List<SysDepartTreeModel> recordList,List<DepartIdModel> idList) {
+
+ for (int i = 0; i < treeList.size(); i++) {
+ SysDepartTreeModel model = treeList.get(i);
+ DepartIdModel idModel = idList.get(i);
+ for (int i1 = 0; i1 < recordList.size(); i1++) {
+ SysDepartTreeModel m = recordList.get(i1);
+ if (m.getParentId().equals(model.getId())) {
+ model.getChildren().add(m);
+ DepartIdModel dim = new DepartIdModel().convert(m);
+ idModel.getChildren().add(dim);
+ }
+ }
+ getGrandChildren(treeList.get(i).getChildren(), recordList, idList.get(i).getChildren());
+ }
+
+ }
+
+
+ /**
+ * queryTreeList的子方法 ====4====
+ * 该方法是将子节点为空的List集合设置为Null值
+ */
+ private static void setEmptyChildrenAsNull(List<SysDepartTreeModel> treeList) {
+
+ for (int i = 0; i < treeList.size(); i++) {
+ SysDepartTreeModel model = treeList.get(i);
+ if (model.getChildren().size() == 0) {
+ model.setChildren(null);
+ model.setIsLeaf(true);
+ }else{
+ setEmptyChildrenAsNull(model.getChildren());
+ model.setIsLeaf(false);
+ }
+ }
+ }
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java
new file mode 100644
index 0000000..f9d1459
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java
@@ -0,0 +1,79 @@
+package org.jeecg.modules.system.util;
+
+import java.util.List;
+
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.system.entity.SysPermission;
+
+/**
+ * @Author: scott
+ * @Date: 2019-04-03
+ */
+public class PermissionDataUtil {
+
+ /**
+ * 智能处理错误数据，简化用户失误操作
+ *
+ * @param permission
+ */
+ public static SysPermission intelligentProcessData(SysPermission permission) {
+ if (permission == null) {
+ return null;
+ }
+
+ // 组件
+ if (oConvertUtils.isNotEmpty(permission.getComponent())) {
+ String component = permission.getComponent();
+ if (component.startsWith("/")) {
+ component = component.substring(1);
+ }
+ if (component.startsWith("views/")) {
+ component = component.replaceFirst("views/", "");
+ }
+ if (component.startsWith("src/views/")) {
+ component = component.replaceFirst("src/views/", "");
+ }
+ if (component.endsWith(".vue")) {
+ component = component.replace(".vue", "");
+ }
+ permission.setComponent(component);
+ }
+
+ // 请求URL
+ if (oConvertUtils.isNotEmpty(permission.getUrl())) {
+ String url = permission.getUrl();
+ if (url.endsWith(".vue")) {
+ url = url.replace(".vue", "");
+ }
+ if (!url.startsWith("http") && !url.startsWith("/")&&!url.trim().startsWith("{{")) {
+ url = "/" + url;
+ }
+ permission.setUrl(url);
+ }
+
+ // 一级菜单默认组件
+ if (0 == permission.getMenuType() && oConvertUtils.isEmpty(permission.getComponent())) {
+ // 一级菜单默认组件
+ permission.setComponent("layouts/RouteView");
+ }
+ return permission;
+ }
+
+ /**
+ * 如果没有index页面 需要new 一个放到list中
+ * @param metaList
+ */
+ public static void addIndexPage(List<SysPermission> metaList) {
+ boolean hasIndexMenu = false;
+ for (SysPermission sysPermission : metaList) {
+ if("首页".equals(sysPermission.getName())) {
+ hasIndexMenu = true;
+ break;
+ }
+ }
+ if(!hasIndexMenu) {
+ metaList.add(0,new SysPermission(true));
+ }
+ }
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysDepartUsersVO.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysDepartUsersVO.java
new file mode 100644
index 0000000..32a2df3
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysDepartUsersVO.java
@@ -0,0 +1,23 @@
+package org.jeecg.modules.system.vo;
+
+import java.io.Serializable;
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class SysDepartUsersVO implements Serializable{
+ private static final long serialVersionUID = 1L;
+
+ /**部门id*/
+ private String depId;
+ /**对应的用户id集合*/
+ private List<String> userIdList;
+ public SysDepartUsersVO(String depId, List<String> userIdList) {
+ super();
+ this.depId = depId;
+ this.userIdList = userIdList;
+ }
+
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java
new file mode 100644
index 0000000..bd06e8b
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java
@@ -0,0 +1,41 @@
+package org.jeecg.modules.system.vo;
+
+import lombok.Data;
+import org.jeecg.modules.system.entity.SysDictItem;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecgframework.poi.excel.annotation.ExcelCollection;
+
+import java.util.List;
+
+@Data
+public class SysDictPage {
+
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 字典名称
+ */
+ @Excel(name = "字典名称", width = 20)
+ private String dictName;
+
+ /**
+ * 字典编码
+ */
+ @Excel(name = "字典编码", width = 30)
+ private String dictCode;
+ /**
+ * 删除状态
+ */
+ private Integer delFlag;
+ /**
+ * 描述
+ */
+ @Excel(name = "描述", width = 30)
+ private String description;
+
+ @ExcelCollection(name = "字典列表")
+ private List<SysDictItem> sysDictItemList;
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysUserRoleVO.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysUserRoleVO.java
new file mode 100644
index 0000000..414a782
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysUserRoleVO.java
@@ -0,0 +1,23 @@
+package org.jeecg.modules.system.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class SysUserRoleVO implements Serializable{
+ private static final long serialVersionUID = 1L;
+
+ /**部门id*/
+ private String roleId;
+ /**对应的用户id集合*/
+ private List<String> userIdList;
+ public SysUserRoleVO(String roleId, List<String> userIdList) {
+ super();
+ this.roleId = roleId;
+ this.userIdList = userIdList;
+ }
+
+
+}
diff --git a/jeecg-boot/src/main/resources/application-dev.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml
index 9218183..59a0c36 100644
--- a/jeecg-boot/src/main/resources/application-dev.yml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml
@@ -43,6 +43,7 @@ spring:
charset: UTF-8
# 设置页面缓存
cache: false
+ prefer-file-system-access: false
# 设置ftl文件路径
template-loader-path:
- classpath:/templates
diff --git a/jeecg-boot/src/main/resources/application-prod.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml
index c336463..4345808 100644
--- a/jeecg-boot/src/main/resources/application-prod.yml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml
@@ -43,6 +43,7 @@ spring:
charset: UTF-8
# 设置页面缓存
cache: false
+ prefer-file-system-access: false
# 设置ftl文件路径
template-loader-path:
- classpath:/templates
diff --git a/jeecg-boot/src/main/resources/application-test.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml
index cc0b73a..bf85b6e 100644
--- a/jeecg-boot/src/main/resources/application-test.yml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml
@@ -43,6 +43,7 @@ spring:
charset: UTF-8
# 设置页面缓存
cache: false
+ prefer-file-system-access: false
# 设置ftl文件路径
template-loader-path:
- classpath:/templates
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application.yml
new file mode 100644
index 0000000..4b2ca41
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application.yml
@@ -0,0 +1,9 @@
+spring:
+ profiles:
+ active: dev
+swagger:
+ production: false
+ basic:
+ enable: true
+ username: jeecg
+ password: jeecg1314
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/banner.txt b/jeecg-boot/jeecg-boot-module-system/src/main/resources/banner.txt
index 5ac1b97..5ac1b97 100644
--- a/jeecg-boot/src/main/resources/banner.txt
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/banner.txt
diff --git a/jeecg-boot/src/main/resources/db/data-mysql.sql b/jeecg-boot/jeecg-boot-module-system/src/main/resources/db/data-mysql.sql
index a4ce630..a4ce630 100644
--- a/jeecg-boot/src/main/resources/db/data-mysql.sql
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/db/data-mysql.sql
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/db/schema-mysql.sql b/jeecg-boot/jeecg-boot-module-system/src/main/resources/db/schema-mysql.sql
new file mode 100644
index 0000000..2eea9ec
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/db/schema-mysql.sql
@@ -0,0 +1,11 @@
+DROP TABLE IF EXISTS demo;
+CREATE TABLE demo (
+ id BIGINT(20) NOT NULL auto_increment COMMENT '主键ID',
+ name varchar(30) default NULL COMMENT '姓名',
+ sex varchar(2) default NULL,
+ age int(11) default NULL COMMENT '年龄',
+ birthday date default NULL COMMENT '生日',
+ email varchar(50) default NULL COMMENT '邮箱',
+ content varchar(1000) default NULL COMMENT '个人简介',
+ PRIMARY KEY (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
index e99b1ef..04b907f 100644
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
@@ -10,10 +10,11 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.util.oConvertUtils;
import ${bussiPackage}.${entityPackage}.entity.${entityName};
import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
-
+import java.util.Date;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -31,17 +32,19 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
/**
- * @Title: Controller
* @Description: ${tableVo.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
*/
+@Slf4j
+@Api("${tableVo.ftlDescription}")
@RestController
@RequestMapping("/${entityPackage}/${entityName?uncap_first}")
-@Slf4j
public class ${entityName}Controller {
@Autowired
private I${entityName}Service ${entityName?uncap_first}Service;
@@ -54,6 +57,8 @@ public class ${entityName}Controller {
* @param req
* @return
*/
+ @AutoLog(value = "${tableVo.ftlDescription}-分页列表查询")
+ @ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<${entityName}>> queryPageList(${entityName} ${entityName?uncap_first},
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -73,6 +78,8 @@ public class ${entityName}Controller {
* @param ${entityName?uncap_first}
* @return
*/
+ @AutoLog(value = "${tableVo.ftlDescription}-添加")
+ @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加")
@PostMapping(value = "/add")
public Result<${entityName}> add(@RequestBody ${entityName} ${entityName?uncap_first}) {
Result<${entityName}> result = new Result<${entityName}>();
@@ -80,8 +87,7 @@ public class ${entityName}Controller {
${entityName?uncap_first}Service.save(${entityName?uncap_first});
result.success("添加成功！");
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.error(e.getMessage(),e);
result.error500("操作失败");
}
return result;
@@ -92,6 +98,8 @@ public class ${entityName}Controller {
* @param ${entityName?uncap_first}
* @return
*/
+ @AutoLog(value = "${tableVo.ftlDescription}-编辑")
+ @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑")
@PutMapping(value = "/edit")
public Result<${entityName}> edit(@RequestBody ${entityName} ${entityName?uncap_first}) {
Result<${entityName}> result = new Result<${entityName}>();
@@ -114,6 +122,8 @@ public class ${entityName}Controller {
* @param id
* @return
*/
+ @AutoLog(value = "${tableVo.ftlDescription}-通过id删除")
+ @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除")
@DeleteMapping(value = "/delete")
public Result<${entityName}> delete(@RequestParam(name="id",required=true) String id) {
Result<${entityName}> result = new Result<${entityName}>();
@@ -135,6 +145,8 @@ public class ${entityName}Controller {
* @param ids
* @return
*/
+ @AutoLog(value = "${tableVo.ftlDescription}-批量删除")
+ @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<${entityName}> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
Result<${entityName}> result = new Result<${entityName}>();
@@ -152,6 +164,8 @@ public class ${entityName}Controller {
* @param id
* @return
*/
+ @AutoLog(value = "${tableVo.ftlDescription}-通过id查询")
+ @ApiOperation(value="${tableVo.ftlDescription}-通过id查询", notes="${tableVo.ftlDescription}-通过id查询")
@GetMapping(value = "/queryById")
public Result<${entityName}> queryById(@RequestParam(name="id",required=true) String id) {
Result<${entityName}> result = new Result<${entityName}>();
@@ -219,10 +233,10 @@ public class ${entityName}Controller {
for (${entityName} ${entityName?uncap_first}Excel : list${entityName}s) {
${entityName?uncap_first}Service.save(${entityName?uncap_first}Excel);
}
- return Result.ok("文件导入成功！数据行数：" + list${entityName}s.size());
+ return Result.ok("文件导入成功！数据行数:" + list${entityName}s.size());
} catch (Exception e) {
- log.error(e.getMessage());
- return Result.error("文件导入失败！");
+ log.error(e.getMessage(),e);
+ return Result.error("文件导入失败:"+e.getMessage());
} finally {
try {
file.getInputStream().close();
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
new file mode 100644
index 0000000..09c18db
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
@@ -0,0 +1,53 @@
+package ${bussiPackage}.${entityPackage}.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @Description: ${tableVo.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+@Data
+@TableName("${tableName}")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}")
+public class ${entityName} {
+
+ <#list originalColumns as po>
+ /**${po.filedComment}*/
+ <#if po.fieldName == primaryKeyField>
+ @TableId(type = IdType.UUID)
+ <#else>
+ <#if po.fieldType =='java.util.Date'>
+ <#if po.fieldDbType =='date'>
+ @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ <#elseif po.fieldDbType =='datetime'>
+ @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ </#if>
+ <#else>
+ @Excel(name = "${po.filedComment}", width = 15)
+ </#if>
+ </#if>
+ @ApiModelProperty(value = "${po.filedComment}")
+ private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
+ </#list>
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai
new file mode 100644
index 0000000..c31b9bf
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai
@@ -0,0 +1,17 @@
+package ${bussiPackage}.${entityPackage}.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import ${bussiPackage}.${entityPackage}.entity.${entityName};
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: ${tableVo.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+public interface ${entityName}Mapper extends BaseMapper<${entityName}> {
+
+}
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml
index 16f3d65..16f3d65 100644
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
index 561b2ca..f00240a 100644
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: ${tableVo.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
*/
public interface I${entityName}Service extends IService<${entityName}> {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
new file mode 100644
index 0000000..6326220
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
@@ -0,0 +1,19 @@
+package ${bussiPackage}.${entityPackage}.service.impl;
+
+import ${bussiPackage}.${entityPackage}.entity.${entityName};
+import ${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper;
+import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: ${tableVo.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+@Service
+public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, ${entityName}> implements I${entityName}Service {
+
+}
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
index 0cf9b9d..9244ef3 100644
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
@@ -48,8 +48,8 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls">导出</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="download" @click="handleExportXls('${tableVo.ftlDescription}')">导出</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0">
@@ -164,22 +164,6 @@
}
}
</script>
-<style lang="less" scoped>
-/** Button按钮间距 */
- .ant-btn {
- margin-left: 3px
- }
- .ant-card-body .table-operator{
- margin-bottom: 18px;
- }
- .ant-table-tbody .ant-table-row td{
- padding-top:15px;
- padding-bottom:15px;
- }
- .anty-row-operator button{margin: 0 5px}
- .ant-btn-danger{background-color: #ffffff}
-
- .ant-modal-cust-warp{height: 100%}
- .ant-modal-cust-warp .ant-modal-body{height:calc(100% - 110px) !important;overflow-y: auto}
- .ant-modal-cust-warp .ant-modal-content{height:90% !important;overflow-y: hidden}
+<style scoped>
+ @import '~@assets/less/common.less'
</style>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
index 20a115a..dc56664 100644
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
@@ -150,6 +150,6 @@
}
</script>
-<style scoped>
+<style lang="less" scoped>
</style>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei
index 4446ba6..4446ba6 100644
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai
index 170e925..ba1021d 100644
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai
@@ -37,11 +37,10 @@ import lombok.extern.slf4j.Slf4j;
import com.alibaba.fastjson.JSON;
/**
- * @Title: Controller
* @Description: ${tableVo.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
*/
@RestController
@RequestMapping("/${entityPackage}/${entityName?uncap_first}")
@@ -84,8 +83,7 @@ public class ${entityName}Controller {
${entityName?uncap_first}Service.save(${entityName?uncap_first});
result.success("添加成功！");
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.error(e.getMessage(),e);
result.error500("操作失败");
}
return result;
@@ -223,10 +221,10 @@ public class ${entityName}Controller {
for (${entityName} ${entityName?uncap_first}Excel : list${entityName}s) {
${entityName?uncap_first}Service.save(${entityName?uncap_first}Excel);
}
- return Result.ok("文件导入成功！数据行数：" + list${entityName}s.size());
+ return Result.ok("文件导入成功！数据行数:" + list${entityName}s.size());
} catch (Exception e) {
- log.error(e.getMessage());
- return Result.error("文件导入失败！");
+ log.error(e.getMessage(),e);
+ return Result.error("文件导入失败:"+e.getMessage());
} finally {
try {
file.getInputStream().close();
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai
new file mode 100644
index 0000000..cfded45
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai
@@ -0,0 +1,45 @@
+package ${bussiPackage}.entity.${entityPackage};
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @Description: ${tableVo.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+@Data
+@TableName("${tableName}")
+public class ${entityName} implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ <#list originalColumns as po>
+ /**${po.filedComment}*/
+ <#if po.fieldName == primaryKeyField>
+ @TableId(type = IdType.UUID)
+ <#else>
+ <#if po.fieldType =='java.util.Date'>
+ <#if po.fieldDbType =='date'>
+ @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ <#elseif po.fieldDbType =='datetime'>
+ @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ </#if>
+ <#else>
+ @Excel(name = "${po.filedComment}", width = 15)
+ </#if>
+ </#if>
+ private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
+ </#list>
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/${entityName}Mapper.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/${entityName}Mapper.javai
new file mode 100644
index 0000000..4705b6c
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/${entityName}Mapper.javai
@@ -0,0 +1,17 @@
+package ${bussiPackage}.mapper.${entityPackage};
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import ${bussiPackage}.entity.${entityPackage}.${entityName};
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: ${tableVo.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+public interface ${entityName}Mapper extends BaseMapper<${entityName}> {
+
+}
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/xml/${entityName}Mapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/xml/${entityName}Mapper.xml
index fb6f712..fb6f712 100644
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/xml/${entityName}Mapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/xml/${entityName}Mapper.xml
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/service/${entityPackage}/I${entityName}Service.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/service/${entityPackage}/I${entityName}Service.javai
new file mode 100644
index 0000000..8fdad41
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/service/${entityPackage}/I${entityName}Service.javai
@@ -0,0 +1,14 @@
+package ${bussiPackage}.service.${entityPackage};
+
+import ${bussiPackage}.entity.${entityPackage}.${entityName};
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: ${tableVo.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+public interface I${entityName}Service extends IService<${entityName}> {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/service/${entityPackage}/impl/${entityName}ServiceImpl.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/service/${entityPackage}/impl/${entityName}ServiceImpl.javai
new file mode 100644
index 0000000..4b09157
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/service/${entityPackage}/impl/${entityName}ServiceImpl.javai
@@ -0,0 +1,19 @@
+package ${bussiPackage}.service.${entityPackage}.impl;
+
+import ${bussiPackage}.entity.${entityPackage}.${entityName};
+import ${bussiPackage}.mapper.${entityPackage}.${entityName}Mapper;
+import ${bussiPackage}.service.${entityPackage}.I${entityName}Service;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: ${tableVo.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+@Service
+public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, ${entityName}> implements I${entityName}Service {
+
+}
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/${entityName}List.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/${entityName}List.vuei
index 91c1391..6337482 100644
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/${entityName}List.vuei
@@ -48,8 +48,8 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls">导出</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="download" @click="handleExportXls('${tableVo.ftlDescription}')">导出</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0">
@@ -164,22 +164,6 @@
}
}
</script>
-<style lang="less" scoped>
-/** Button按钮间距 */
- .ant-btn {
- margin-left: 3px
- }
- .ant-card-body .table-operator{
- margin-bottom: 18px;
- }
- .ant-table-tbody .ant-table-row td{
- padding-top:15px;
- padding-bottom:15px;
- }
- .anty-row-operator button{margin: 0 5px}
- .ant-btn-danger{background-color: #ffffff}
-
- .ant-modal-cust-warp{height: 100%}
- .ant-modal-cust-warp .ant-modal-body{height:calc(100% - 110px) !important;overflow-y: auto}
- .ant-modal-cust-warp .ant-modal-content{height:90% !important;overflow-y: hidden}
+<style scoped>
+ @import '~@assets/less/common.less'
</style>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal.vuei
new file mode 100644
index 0000000..d7ea43d
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal.vuei
@@ -0,0 +1,155 @@
+<template>
+ <a-modal
+ :title="title"
+ :width="800"
+ :visible="visible"
+ :confirmLoading="confirmLoading"
+ @ok="handleOk"
+ @cancel="handleCancel"
+ cancelText="关闭">
+
+ <a-spin :spinning="confirmLoading">
+ <a-form :form="form">
+
+<#list columns as po><#rt/>
+<#if po.fieldName !='id'><#rt/>
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="${po.filedComment}">
+ <#if po.fieldType =='date'>
+ <a-date-picker v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
+ <#elseif po.fieldType =='datetime'>
+ <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
+ <#elseif "int,decimal,double,"?contains(po.fieldType)>
+ <a-input-number v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
+ <#else>
+ <a-input placeholder="请输入${po.filedComment}" v-decorator="['${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
+ </#if>
+ </a-form-item>
+</#if>
+</#list>
+
+ </a-form>
+ </a-spin>
+ </a-modal>
+</template>
+
+<script>
+ import { httpAction } from '@/api/manage'
+ import pick from 'lodash.pick'
+ import moment from "moment"
+
+ export default {
+ name: "${entityName}Modal",
+ data () {
+ return {
+ title:"操作",
+ visible: false,
+ model: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+
+ confirmLoading: false,
+ form: this.$form.createForm(this),
+ validatorRules:{
+ <#list columns as po>
+ <#if po.fieldName !='id'>
+ <#if po.nullable =='N'>
+ ${po.fieldName}:{rules: [{ required: true, message: '请输入${po.filedComment}!' }]},
+ </#if>
+ </#if>
+ </#list>
+ },
+ url: {
+ add: "/${entityPackage}/${entityName?uncap_first}/add",
+ edit: "/${entityPackage}/${entityName?uncap_first}/edit",
+ },
+ }
+ },
+ created () {
+ },
+ methods: {
+ add () {
+ this.edit({});
+ },
+ edit (record) {
+ this.form.resetFields();
+ this.model = Object.assign({}, record);
+ this.visible = true;
+ this.$nextTick(() => {
+ this.form.setFieldsValue(pick(this.model<#list columns as po><#if po.fieldName !='id' && po.fieldType?index_of("date")==-1>,'${po.fieldName}'</#if></#list>))
+ //时间格式化
+ <#list columns as po>
+ <#if po.fieldName !='id' && po.fieldType?index_of("date")!=-1>
+ this.form.setFieldsValue({${po.fieldName}:this.model.${po.fieldName}?moment(this.model.${po.fieldName}):null})
+ </#if>
+ </#list>
+ });
+
+ },
+ close () {
+ this.$emit('close');
+ this.visible = false;
+ },
+ handleOk () {
+ const that = this;
+ // 触发表单验证
+ this.form.validateFields((err, values) => {
+ if (!err) {
+ that.confirmLoading = true;
+ let httpurl = '';
+ let method = '';
+ if(!this.model.id){
+ httpurl+=this.url.add;
+ method = 'post';
+ }else{
+ httpurl+=this.url.edit;
+ method = 'put';
+ }
+ let formData = Object.assign(this.model, values);
+ //时间格式化
+ <#list columns as po>
+ <#if po.fieldName !='id' && po.fieldType =='date'>
+ formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format():null;
+ <#elseif po.fieldName !='id' && po.fieldType =='datetime'>
+ formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format('YYYY-MM-DD HH:mm:ss'):null;
+ </#if>
+ </#list>
+
+ console.log(formData)
+ httpAction(httpurl,formData,method).then((res)=>{
+ if(res.success){
+ that.$message.success(res.message);
+ that.$emit('ok');
+ }else{
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.close();
+ })
+
+
+
+ }
+ })
+ },
+ handleCancel () {
+ this.close()
+ },
+
+
+ }
+ }
+</script>
+
+<style lang="less" scoped>
+
+</style>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal__Style#Drawer.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal__Style#Drawer.vuei
new file mode 100644
index 0000000..4446ba6
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal__Style#Drawer.vuei
@@ -0,0 +1,162 @@
+<template>
+ <a-drawer
+ :title="title"
+ :width="800"
+ placement="right"
+ :closable="false"
+ @close="close"
+ :visible="visible"
+ >
+
+ <a-spin :spinning="confirmLoading">
+ <a-form :form="form">
+
+<#list columns as po><#rt/>
+<#if po.fieldName !='id'><#rt/>
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="${po.filedComment}">
+ <#if po.fieldType =='date'>
+ <a-date-picker v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
+ <#elseif po.fieldType =='datetime'>
+ <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
+ <#elseif "int,decimal,double,"?contains(po.fieldType)>
+ <a-input-number v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
+ <#else>
+ <a-input placeholder="请输入${po.filedComment}" v-decorator="['${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
+ </#if>
+ </a-form-item>
+</#if>
+</#list>
+
+ </a-form>
+ </a-spin>
+ <a-button type="primary" @click="handleOk">确定</a-button>
+ <a-button type="primary" @click="handleCancel">取消</a-button>
+ </a-drawer>
+</template>
+
+<script>
+ import { httpAction } from '@/api/manage'
+ import pick from 'lodash.pick'
+ import moment from "moment"
+
+ export default {
+ name: "${entityName}Modal",
+ data () {
+ return {
+ title:"操作",
+ visible: false,
+ model: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+
+ confirmLoading: false,
+ form: this.$form.createForm(this),
+ validatorRules:{
+ <#list columns as po>
+ <#if po.fieldName !='id'>
+ <#if po.nullable =='N'>
+ ${po.fieldName}:{rules: [{ required: true, message: '请输入${po.filedComment}!' }]},
+ </#if>
+ </#if>
+ </#list>
+ },
+ url: {
+ add: "/${entityPackage}/${entityName?uncap_first}/add",
+ edit: "/${entityPackage}/${entityName?uncap_first}/edit",
+ },
+ }
+ },
+ created () {
+ },
+ methods: {
+ add () {
+ this.edit({});
+ },
+ edit (record) {
+ this.form.resetFields();
+ this.model = Object.assign({}, record);
+ this.visible = true;
+ this.$nextTick(() => {
+ this.form.setFieldsValue(pick(this.model<#list columns as po><#if po.fieldName !='id' && po.fieldType?index_of("date")==-1>,'${po.fieldName}'</#if></#list>))
+ //时间格式化
+ <#list columns as po>
+ <#if po.fieldName !='id' && po.fieldType?index_of("date")!=-1>
+ this.form.setFieldsValue({${po.fieldName}:this.model.${po.fieldName}?moment(this.model.${po.fieldName}):null})
+ </#if>
+ </#list>
+ });
+
+ },
+ close () {
+ this.$emit('close');
+ this.visible = false;
+ },
+ handleOk () {
+ const that = this;
+ // 触发表单验证
+ this.form.validateFields((err, values) => {
+ if (!err) {
+ that.confirmLoading = true;
+ let httpurl = '';
+ let method = '';
+ if(!this.model.id){
+ httpurl+=this.url.add;
+ method = 'post';
+ }else{
+ httpurl+=this.url.edit;
+ method = 'put';
+ }
+ let formData = Object.assign(this.model, values);
+ //时间格式化
+ <#list columns as po>
+ <#if po.fieldName !='id' && po.fieldType =='date'>
+ formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format():null;
+ <#elseif po.fieldName !='id' && po.fieldType =='datetime'>
+ formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format('YYYY-MM-DD HH:mm:ss'):null;
+ </#if>
+ </#list>
+
+ console.log(formData)
+ httpAction(httpurl,formData,method).then((res)=>{
+ if(res.success){
+ that.$message.success(res.message);
+ that.$emit('ok');
+ }else{
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.close();
+ })
+
+
+
+ }
+ })
+ },
+ handleCancel () {
+ this.close()
+ },
+
+
+ }
+ }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+ .ant-btn {
+ margin-left: 30px;
+ margin-bottom: 30px;
+ float: right;
+ }
+</style>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
index 893c4c5..f4772f3 100644
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
@@ -42,11 +42,10 @@ import lombok.extern.slf4j.Slf4j;
import com.alibaba.fastjson.JSON;
/**
- * @Title: Controller
* @Description: ${tableVo.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
*/
@RestController
@RequestMapping("/${entityPackage}/${entityName?uncap_first}")
@@ -96,8 +95,7 @@ public class ${entityName}Controller {
${entityName?uncap_first}Service.saveMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,</#if></#list>);
result.success("添加成功！");
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.error(e.getMessage(),e);
result.error500("操作失败");
}
return result;
@@ -261,10 +259,10 @@ public class ${entityName}Controller {
BeanUtils.copyProperties(page, po);
${entityName?uncap_first}Service.saveMain(po, <#list subTables as sub>page.get${sub.entityName}List()<#if sub_has_next>,</#if></#list>);
}
- return Result.ok("文件导入成功！数据行数：" + list.size());
+ return Result.ok("文件导入成功！数据行数:" + list.size());
} catch (Exception e) {
- log.error(e.getMessage());
- return Result.error("文件导入失败！");
+ log.error(e.getMessage(),e);
+ return Result.error("文件导入失败:"+e.getMessage());
} finally {
try {
file.getInputStream().close();
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
new file mode 100644
index 0000000..2832ca0
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
@@ -0,0 +1,39 @@
+package ${bussiPackage}.${entityPackage}.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @Description: ${tableVo.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+@Data
+@TableName("${tableName}")
+public class ${entityName} implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ <#list originalColumns as po>
+ /**${po.filedComment}*/
+ <#if po.fieldName == primaryKeyField>
+ @TableId(type = IdType.UUID)
+ </#if>
+ <#if po.fieldType =='java.util.Date'>
+ <#if po.fieldDbType =='date'>
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ <#elseif po.fieldDbType =='datetime'>
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ </#if>
+ </#if>
+ private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
+ </#list>
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
new file mode 100644
index 0000000..8c9415c
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
@@ -0,0 +1,50 @@
+<#list subTables as subTab>
+#segment#${subTab.entityName}.java
+package ${bussiPackage}.${entityPackage}.entity;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import java.util.Date;
+
+/**
+ * @Description: ${subTab.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+@Data
+@TableName("${subTab.tableName}")
+public class ${subTab.entityName} implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ <#list subTab.originalColumns as po>
+ /**${po.filedComment}*/
+ <#if po.fieldName == primaryKeyField>
+ @TableId(type = IdType.UUID)
+ <#else>
+ <#if po.fieldType =='java.util.Date'>
+ <#if po.fieldDbType =='date'>
+ @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ <#elseif po.fieldDbType =='datetime'>
+ @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ </#if>
+ <#else>
+ <#if !subTab.foreignKeys?seq_contains(po.fieldName?cap_first)>
+ @Excel(name = "${po.filedComment}", width = 15)
+ </#if>
+ </#if>
+ </#if>
+ private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
+ </#list>
+}
+</#list>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai
new file mode 100644
index 0000000..c31b9bf
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai
@@ -0,0 +1,17 @@
+package ${bussiPackage}.${entityPackage}.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import ${bussiPackage}.${entityPackage}.entity.${entityName};
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: ${tableVo.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+public interface ${entityName}Mapper extends BaseMapper<${entityName}> {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai
new file mode 100644
index 0000000..9585548
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai
@@ -0,0 +1,21 @@
+<#list subTables as subTab>
+#segment#${subTab.entityName}Mapper.java
+package ${bussiPackage}.${entityPackage}.mapper;
+
+import java.util.List;
+import ${bussiPackage}.${entityPackage}.entity.${subTab.entityName};
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: ${subTab.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+public interface ${subTab.entityName}Mapper extends BaseMapper<${subTab.entityName}> {
+
+ public boolean deleteByMainId(String mainId);
+
+ public List<${subTab.entityName}> selectByMainId(String mainId);
+}
+</#list>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml
index 16f3d65..16f3d65 100644
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml
new file mode 100644
index 0000000..708ae0b
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml
@@ -0,0 +1,36 @@
+<#list subTables as subTab>
+<#assign originalForeignKeys = subTab.originalForeignKeys>
+#segment#${subTab.entityName}Mapper.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="${bussiPackage}.${entityPackage}.mapper.${subTab.entityName}Mapper">
+
+ <delete id="deleteByMainId" parameterType="java.lang.String">
+ DELETE
+ FROM ${subTab.tableName}
+ WHERE
+ <#list originalForeignKeys as key>
+ <#if key?lower_case?index_of("${primaryKeyField}")!=-1>
+ ${key} = ${r'#'}{${primaryKeyField}} <#rt/>
+ <#else>
+ ${key} = ${r'#'}{${key}} <#rt/>
+ </#if>
+ <#if key_has_next>AND</#if>
+ </#list>
+ </delete>
+
+ <select id="selectByMainId" parameterType="java.lang.String" resultType="${bussiPackage}.${entityPackage}.entity.${subTab.entityName}">
+ SELECT *
+ FROM ${subTab.tableName}
+ WHERE
+ <#list originalForeignKeys as key>
+ <#if key?lower_case?index_of("${primaryKeyField}")!=-1>
+ ${key} = ${r'#'}{${primaryKeyField}} <#rt/>
+ <#else>
+ ${key} = ${r'#'}{${key}} <#rt/>
+ </#if>
+ <#if key_has_next>AND</#if>
+ </#list>
+ </select>
+</mapper>
+</#list>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
new file mode 100644
index 0000000..e7d9914
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
@@ -0,0 +1,42 @@
+package ${bussiPackage}.${entityPackage}.service;
+
+<#list subTables as sub>
+import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
+</#list>
+import ${bussiPackage}.${entityPackage}.entity.${entityName};
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @Description: ${tableVo.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+public interface I${entityName}Service extends IService<${entityName}> {
+
+ /**
+ * 添加一对多
+ *
+ */
+ public void saveMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) ;
+
+ /**
+ * 修改一对多
+ *
+ */
+ public void updateMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>);
+
+ /**
+ * 删除一对多
+ */
+ public void delMain (String id);
+
+ /**
+ * 批量删除一对多
+ */
+ public void delBatchMain (Collection<? extends Serializable> idList);
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai
new file mode 100644
index 0000000..0f85cb3
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai
@@ -0,0 +1,19 @@
+<#list subTables as subTab>
+#segment#I${subTab.entityName}Service.java
+package ${bussiPackage}.${entityPackage}.service;
+
+import ${bussiPackage}.${entityPackage}.entity.${subTab.entityName};
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: ${subTab.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+public interface I${subTab.entityName}Service extends IService<${subTab.entityName}> {
+
+ public List<${subTab.entityName}> selectByMainId(String mainId);
+}
+</#list>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
new file mode 100644
index 0000000..fa8d61b
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
@@ -0,0 +1,101 @@
+package ${bussiPackage}.${entityPackage}.service.impl;
+
+import ${bussiPackage}.${entityPackage}.entity.${entityName};
+<#list subTables as sub>
+import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
+</#list>
+<#list subTables as sub>
+import ${bussiPackage}.${entityPackage}.mapper.${sub.entityName}Mapper;
+</#list>
+import ${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper;
+import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Collection;
+
+/**
+ * @Description: ${tableVo.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+@Service
+public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, ${entityName}> implements I${entityName}Service {
+
+ @Autowired
+ private ${entityName}Mapper ${entityName?uncap_first}Mapper;
+ <#list subTables as sub>
+ @Autowired
+ private ${sub.entityName}Mapper ${sub.entityName?uncap_first}Mapper;
+ </#list>
+
+ @Override
+ @Transactional
+ public void saveMain(${entityName} ${entityName?uncap_first}, <#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
+ ${entityName?uncap_first}Mapper.insert(${entityName?uncap_first});
+ <#list subTables as sub>
+ for(${sub.entityName} entity:${sub.entityName?uncap_first}List) {
+ <#list sub.foreignKeys as key>
+ //外键设置
+ <#if key?lower_case?index_of("${primaryKeyField}")!=-1>
+ entity.set${key?cap_first}(${entityName?uncap_first}.get${primaryKeyField?cap_first}());
+ <#else>
+ entity.set${key?cap_first}(${entityName?uncap_first}.get${key}());
+ </#if>
+ </#list>
+ ${sub.entityName?uncap_first}Mapper.insert(entity);
+ }
+ </#list>
+ }
+
+ @Override
+ @Transactional
+ public void updateMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
+ ${entityName?uncap_first}Mapper.updateById(${entityName?uncap_first});
+
+ //1.先删除子表数据
+ <#list subTables as sub>
+ ${sub.entityName?uncap_first}Mapper.deleteByMainId(${entityName?uncap_first}.getId());
+ </#list>
+
+ //2.子表数据重新插入
+ <#list subTables as sub>
+ for(${sub.entityName} entity:${sub.entityName?uncap_first}List) {
+ <#list sub.foreignKeys as key>
+ //外键设置
+ <#if key?lower_case?index_of("${primaryKeyField}")!=-1>
+ entity.set${key?cap_first}(${entityName?uncap_first}.get${primaryKeyField?cap_first}());
+ <#else>
+ entity.set${key?cap_first}(${entityName?uncap_first}.get${key}());
+ </#if>
+ </#list>
+ ${sub.entityName?uncap_first}Mapper.insert(entity);
+ }
+ </#list>
+ }
+
+ @Override
+ @Transactional
+ public void delMain(String id) {
+ <#list subTables as sub>
+ ${sub.entityName?uncap_first}Mapper.deleteByMainId(id);
+ </#list>
+ ${entityName?uncap_first}Mapper.deleteById(id);
+ }
+
+ @Override
+ @Transactional
+ public void delBatchMain(Collection<? extends Serializable> idList) {
+ for(Serializable id:idList) {
+ <#list subTables as sub>
+ ${sub.entityName?uncap_first}Mapper.deleteByMainId(id.toString());
+ </#list>
+ ${entityName?uncap_first}Mapper.deleteById(id);
+ }
+ }
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai
new file mode 100644
index 0000000..0ce41d3
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai
@@ -0,0 +1,30 @@
+<#list subTables as subTab>
+#segment#${subTab.entityName}ServiceImpl.java
+package ${bussiPackage}.${entityPackage}.service.impl;
+
+import ${bussiPackage}.${entityPackage}.entity.${subTab.entityName};
+import ${bussiPackage}.${entityPackage}.mapper.${subTab.entityName}Mapper;
+import ${bussiPackage}.${entityPackage}.service.I${subTab.entityName}Service;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @Description: ${subTab.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+@Service
+public class ${subTab.entityName}ServiceImpl extends ServiceImpl<${subTab.entityName}Mapper, ${subTab.entityName}> implements I${subTab.entityName}Service {
+
+ @Autowired
+ private ${subTab.entityName}Mapper ${subTab.entityName?uncap_first}Mapper;
+
+ @Override
+ public List<${subTab.entityName}> selectByMainId(String mainId) {
+ return ${subTab.entityName?uncap_first}Mapper.selectByMainId(mainId);
+ }
+}
+</#list>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
new file mode 100644
index 0000000..ab6d3ca
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
@@ -0,0 +1,50 @@
+package ${bussiPackage}.${entityPackage}.vo;
+
+import java.util.List;
+import ${bussiPackage}.${entityPackage}.entity.${entityName};
+<#list subTables as sub>
+import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
+</#list>
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecgframework.poi.excel.annotation.ExcelCollection;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
+
+/**
+ * @Description: ${tableVo.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+@Data
+public class ${entityName}Page {
+
+ <#list originalColumns as po>
+ /**${po.filedComment}*/
+ <#if po.fieldName == primaryKeyField>
+ <#else>
+ <#if po.fieldType =='java.util.Date'>
+ <#if po.fieldDbType =='date'>
+ @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ <#elseif po.fieldDbType =='datetime'>
+ @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ </#if>
+ <#else>
+ @Excel(name = "${po.filedComment}", width = 15)
+ </#if>
+ </#if>
+ private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
+ </#list>
+
+ <#list subTables as sub>
+ @ExcelCollection(name="${sub.ftlDescription}")
+ private List<${sub.entityName}> ${sub.entityName?uncap_first}List;
+ </#list>
+
+}
diff --git a/ant-design-jeecg-vue/src/views/modules/online/cgreport/OnlCgreportHeadList.vue b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
index 30cca51..dcf7b84 100644
--- a/ant-design-jeecg-vue/src/views/modules/online/cgreport/OnlCgreportHeadList.vue
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
@@ -5,19 +5,16 @@
<div class="table-page-search-wrapper">
<a-form layout="inline">
<a-row :gutter="24">
-
+<#list columns as po><#rt/>
+<#if po.fieldName !='id' && po_index<= tableVo.searchFieldNum>
<a-col :span="6">
- <a-form-item label="报表编码">
- <a-input placeholder="请输入报表编码" v-model="queryParam.code"></a-input>
+ <a-form-item label="${po.filedComment}">
+ <a-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></a-input>
</a-form-item>
</a-col>
- <a-col :span="6">
- <a-form-item label="报表名字">
- <a-input placeholder="请输入报表名字" v-model="queryParam.name"></a-input>
- </a-form-item>
- </a-col>
-
- <a-col :span="8">
+</#if>
+</#list>
+ <a-col :span="8" >
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
@@ -30,18 +27,16 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
- <a-button @click="handleAdd" type="primary" icon="plus">录入</a-button>
-
+ <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+ <a-button type="primary" icon="download" @click="handleExportXls('${tableVo.ftlDescription}')">导出</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="import">导入</a-button>
+ </a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
- <a-menu-item key="1" @click="batchDel">
- <a-icon type="delete"/>
- 删除
- </a-menu-item>
+ <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
</a-menu>
- <a-button style="margin-left: 8px"> 批量操作
- <a-icon type="down"/>
- </a-button>
+ <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown>
</div>
@@ -49,11 +44,11 @@
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i>
- 已选择
+ <span>已选择</span>
<a style="font-weight: 600">
{{ selectedRowKeys.length }}
</a>
- 项
+ <span>项</span>
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div>
@@ -72,16 +67,10 @@
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
- <a-divider type="vertical"/>
+ <a-divider type="vertical" />
<a-dropdown>
- <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
+ <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
- <a-menu-item @click="popReportURL(record.id)">
- 配置地址
- </a-menu-item>
- <a-menu-item>
- <a @click="goPageOnline(record.id)">功能测试</a>
- </a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
@@ -96,123 +85,78 @@
<!-- table区域-end -->
<!-- 表单区域 -->
- <onlCgreportHead-modal ref="modalForm" @ok="modalFormOk"></onlCgreportHead-modal>
-
- <!-- 提示online报表链接 -->
- <a-modal
- title="报表访问链接"
- :visible="visible"
- @cancel="handleCancel">
- <p>{{ reportUrlText }}</p>
- </a-modal>
+ <${entityName?uncap_first}-modal ref="modalForm" @ok="modalFormOk"/>
+
</a-card>
</template>
<script>
- import OnlCgreportHeadModal from './modules/OnlCgreportHeadModal'
- import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import ${entityName}Modal from './modules/${entityName}Modal'
export default {
- name: 'OnlCgreportHeadList',
+ name: "${entityName}List",
mixins: [JeecgListMixin],
components: {
- OnlCgreportHeadModal
+ ${entityName}Modal
},
- data() {
+ data () {
return {
- description: '在线报表配置管理页面',
- visible:false,
- reportUrlText:'',
+ description: '${tableVo.ftlDescription}管理页面',
// 表头
columns: [
{
- title: '报表名称',
- align: 'center',
- dataIndex: 'name'
- },
- {
- title: '编码',
- align: 'center',
- dataIndex: 'code'
- },
- {
- title: '查询SQL',
- align: 'center',
- dataIndex: 'cgrSql'
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ align: "center",
+ customRender:function (t, r, index) {
+ return parseInt(index)+1;
+ }
},
+<#list columns as po><#rt/>
+ <#if po.fieldName !='id'>
{
- title: '数据源',
- align: 'center',
- dataIndex: 'dbSource'
- },
- {
- title: '创建时间',
- align: 'center',
- dataIndex: 'createTime'
- },
- {
- title: '描述',
- align: 'center',
- dataIndex: 'content'
+ title: '${po.filedComment}',
+ align:"center",
+ dataIndex: '${po.fieldName}'
},
+ </#if>
+</#list>
{
title: '操作',
dataIndex: 'action',
- align: 'center',
- scopedSlots: { customRender: 'action' }
+ align:"center",
+ scopedSlots: { customRender: 'action' },
}
],
- url: {
- list: '/online/cgreport/head/list',
- delete: '/online/cgreport/head/delete',
- deleteBatch: '/online/cgreport/head/deleteBatch'
+ // 请求参数
+ url: {
+ list: "/${entityPackage}/${entityName?uncap_first}/list",
+ delete: "/${entityPackage}/${entityName?uncap_first}/delete",
+ deleteBatch: "/${entityPackage}/${entityName?uncap_first}/deleteBatch",
+ exportXlsUrl: "${entityPackage}/${entityName?uncap_first}/exportXls",
+ importExcelUrl: "${entityPackage}/${entityName?uncap_first}/importExcel",
+ },
}
- }
- },
- methods: {
- goPageOnline(id){
- this.$router.push({path: '/online/cgreport/'+id})
},
- popReportURL(id){
- this.visible = true;
- this.reportUrlText = `/online/cgreport/${id}`;
+ computed: {
+ importExcelUrl: function(){
+ <#noparse>return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;</#noparse>
+ }
},
- handleCancel(){
- this.visible = false
- this.reportUrlText = null;
- }
- }
- }
-</script>
-<style lang="less" scoped>
- .ant-card-body .table-operator {
- margin-bottom: 18px;
- }
- .ant-table-tbody .ant-table-row td {
- padding-top: 15px;
- padding-bottom: 15px;
- }
- .anty-row-operator button {
- margin: 0 5px
- }
-
- .ant-btn-danger {
- background-color: #ffffff
- }
-
- .ant-modal-cust-warp {
- height: 100%
- }
+ methods: {
- .ant-modal-cust-warp .ant-modal-body {
- height: calc(100% - 110px) !important;
- overflow-y: auto
- }
+ initDictConfig() {
+ }
- .ant-modal-cust-warp .ant-modal-content {
- height: 90% !important;
- overflow-y: hidden
+ }
}
+</script>
+<style scoped>
+ @import '~@assets/less/common.less'
</style>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
index e6c6807..94c5aec 100644
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
@@ -74,11 +74,11 @@
import moment from 'moment'
import pick from 'lodash.pick'
import { FormTypes } from '@/utils/JEditableTableUtil'
- import { JEditableTableOneToManyMixin } from '@/mixins/JEditableTableOneToManyMixin'
+ import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
export default {
name: '${entityName}Modal',
- mixins: [JEditableTableOneToManyMixin],
+ mixins: [JEditableTableMixin],
data() {
return {
// 新增时子表默认添加几行空数据
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
index c53a5b0..c0fd40c 100644
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
@@ -42,11 +42,10 @@ import lombok.extern.slf4j.Slf4j;
import com.alibaba.fastjson.JSON;
/**
- * @Title: Controller
* @Description: ${tableVo.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
*/
@RestController
@RequestMapping("/${entityPackage}/${entityName?uncap_first}")
@@ -96,8 +95,7 @@ public class ${entityName}Controller {
${entityName?uncap_first}Service.save(${entityName?uncap_first});
result.success("添加成功！");
} catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
+ log.error(e.getMessage(),e);
result.error500("操作失败");
}
return result;
@@ -362,10 +360,10 @@ public class ${entityName}Controller {
BeanUtils.copyProperties(page, po);
${entityName?uncap_first}Service.saveMain(po, <#list subTables as sub>page.get${sub.entityName}List()<#if sub_has_next>,</#if></#list>);
}
- return Result.ok("文件导入成功！数据行数：" + list.size());
+ return Result.ok("文件导入成功！数据行数:" + list.size());
} catch (Exception e) {
- log.error(e.getMessage());
- return Result.error("文件导入失败！");
+ log.error(e.getMessage(),e);
+ return Result.error("文件导入失败:"+e.getMessage());
} finally {
try {
file.getInputStream().close();
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
new file mode 100644
index 0000000..2832ca0
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
@@ -0,0 +1,39 @@
+package ${bussiPackage}.${entityPackage}.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @Description: ${tableVo.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+@Data
+@TableName("${tableName}")
+public class ${entityName} implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ <#list originalColumns as po>
+ /**${po.filedComment}*/
+ <#if po.fieldName == primaryKeyField>
+ @TableId(type = IdType.UUID)
+ </#if>
+ <#if po.fieldType =='java.util.Date'>
+ <#if po.fieldDbType =='date'>
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ <#elseif po.fieldDbType =='datetime'>
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ </#if>
+ </#if>
+ private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
+ </#list>
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
new file mode 100644
index 0000000..e906abf
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
@@ -0,0 +1,49 @@
+<#list subTables as subTab>
+#segment#${subTab.entityName}.java
+package ${bussiPackage}.${entityPackage}.entity;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @Description: ${subTab.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+@Data
+@TableName("${subTab.tableName}")
+public class ${subTab.entityName} implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ <#list subTab.originalColumns as po>
+ /**${po.filedComment}*/
+ <#if po.fieldName == primaryKeyField>
+ @TableId(type = IdType.UUID)
+ <#else>
+ <#if po.fieldType =='java.util.Date'>
+ <#if po.fieldDbType =='date'>
+ @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ <#elseif po.fieldDbType =='datetime'>
+ @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ </#if>
+ <#else>
+ <#if !subTab.foreignKeys?seq_contains(po.fieldName?cap_first)>
+ @Excel(name = "${po.filedComment}", width = 15)
+ </#if>
+ </#if>
+ </#if>
+ private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
+ </#list>
+}
+</#list>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai
new file mode 100644
index 0000000..c31b9bf
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai
@@ -0,0 +1,17 @@
+package ${bussiPackage}.${entityPackage}.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import ${bussiPackage}.${entityPackage}.entity.${entityName};
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: ${tableVo.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+public interface ${entityName}Mapper extends BaseMapper<${entityName}> {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai
new file mode 100644
index 0000000..9585548
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai
@@ -0,0 +1,21 @@
+<#list subTables as subTab>
+#segment#${subTab.entityName}Mapper.java
+package ${bussiPackage}.${entityPackage}.mapper;
+
+import java.util.List;
+import ${bussiPackage}.${entityPackage}.entity.${subTab.entityName};
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: ${subTab.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+public interface ${subTab.entityName}Mapper extends BaseMapper<${subTab.entityName}> {
+
+ public boolean deleteByMainId(String mainId);
+
+ public List<${subTab.entityName}> selectByMainId(String mainId);
+}
+</#list>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml
index 16f3d65..16f3d65 100644
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml
new file mode 100644
index 0000000..708ae0b
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml
@@ -0,0 +1,36 @@
+<#list subTables as subTab>
+<#assign originalForeignKeys = subTab.originalForeignKeys>
+#segment#${subTab.entityName}Mapper.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="${bussiPackage}.${entityPackage}.mapper.${subTab.entityName}Mapper">
+
+ <delete id="deleteByMainId" parameterType="java.lang.String">
+ DELETE
+ FROM ${subTab.tableName}
+ WHERE
+ <#list originalForeignKeys as key>
+ <#if key?lower_case?index_of("${primaryKeyField}")!=-1>
+ ${key} = ${r'#'}{${primaryKeyField}} <#rt/>
+ <#else>
+ ${key} = ${r'#'}{${key}} <#rt/>
+ </#if>
+ <#if key_has_next>AND</#if>
+ </#list>
+ </delete>
+
+ <select id="selectByMainId" parameterType="java.lang.String" resultType="${bussiPackage}.${entityPackage}.entity.${subTab.entityName}">
+ SELECT *
+ FROM ${subTab.tableName}
+ WHERE
+ <#list originalForeignKeys as key>
+ <#if key?lower_case?index_of("${primaryKeyField}")!=-1>
+ ${key} = ${r'#'}{${primaryKeyField}} <#rt/>
+ <#else>
+ ${key} = ${r'#'}{${key}} <#rt/>
+ </#if>
+ <#if key_has_next>AND</#if>
+ </#list>
+ </select>
+</mapper>
+</#list>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
new file mode 100644
index 0000000..e7d9914
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
@@ -0,0 +1,42 @@
+package ${bussiPackage}.${entityPackage}.service;
+
+<#list subTables as sub>
+import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
+</#list>
+import ${bussiPackage}.${entityPackage}.entity.${entityName};
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @Description: ${tableVo.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+public interface I${entityName}Service extends IService<${entityName}> {
+
+ /**
+ * 添加一对多
+ *
+ */
+ public void saveMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) ;
+
+ /**
+ * 修改一对多
+ *
+ */
+ public void updateMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>);
+
+ /**
+ * 删除一对多
+ */
+ public void delMain (String id);
+
+ /**
+ * 批量删除一对多
+ */
+ public void delBatchMain (Collection<? extends Serializable> idList);
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai
new file mode 100644
index 0000000..0f85cb3
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai
@@ -0,0 +1,19 @@
+<#list subTables as subTab>
+#segment#I${subTab.entityName}Service.java
+package ${bussiPackage}.${entityPackage}.service;
+
+import ${bussiPackage}.${entityPackage}.entity.${subTab.entityName};
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: ${subTab.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+public interface I${subTab.entityName}Service extends IService<${subTab.entityName}> {
+
+ public List<${subTab.entityName}> selectByMainId(String mainId);
+}
+</#list>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
new file mode 100644
index 0000000..fa8d61b
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
@@ -0,0 +1,101 @@
+package ${bussiPackage}.${entityPackage}.service.impl;
+
+import ${bussiPackage}.${entityPackage}.entity.${entityName};
+<#list subTables as sub>
+import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
+</#list>
+<#list subTables as sub>
+import ${bussiPackage}.${entityPackage}.mapper.${sub.entityName}Mapper;
+</#list>
+import ${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper;
+import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Collection;
+
+/**
+ * @Description: ${tableVo.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+@Service
+public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, ${entityName}> implements I${entityName}Service {
+
+ @Autowired
+ private ${entityName}Mapper ${entityName?uncap_first}Mapper;
+ <#list subTables as sub>
+ @Autowired
+ private ${sub.entityName}Mapper ${sub.entityName?uncap_first}Mapper;
+ </#list>
+
+ @Override
+ @Transactional
+ public void saveMain(${entityName} ${entityName?uncap_first}, <#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
+ ${entityName?uncap_first}Mapper.insert(${entityName?uncap_first});
+ <#list subTables as sub>
+ for(${sub.entityName} entity:${sub.entityName?uncap_first}List) {
+ <#list sub.foreignKeys as key>
+ //外键设置
+ <#if key?lower_case?index_of("${primaryKeyField}")!=-1>
+ entity.set${key?cap_first}(${entityName?uncap_first}.get${primaryKeyField?cap_first}());
+ <#else>
+ entity.set${key?cap_first}(${entityName?uncap_first}.get${key}());
+ </#if>
+ </#list>
+ ${sub.entityName?uncap_first}Mapper.insert(entity);
+ }
+ </#list>
+ }
+
+ @Override
+ @Transactional
+ public void updateMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
+ ${entityName?uncap_first}Mapper.updateById(${entityName?uncap_first});
+
+ //1.先删除子表数据
+ <#list subTables as sub>
+ ${sub.entityName?uncap_first}Mapper.deleteByMainId(${entityName?uncap_first}.getId());
+ </#list>
+
+ //2.子表数据重新插入
+ <#list subTables as sub>
+ for(${sub.entityName} entity:${sub.entityName?uncap_first}List) {
+ <#list sub.foreignKeys as key>
+ //外键设置
+ <#if key?lower_case?index_of("${primaryKeyField}")!=-1>
+ entity.set${key?cap_first}(${entityName?uncap_first}.get${primaryKeyField?cap_first}());
+ <#else>
+ entity.set${key?cap_first}(${entityName?uncap_first}.get${key}());
+ </#if>
+ </#list>
+ ${sub.entityName?uncap_first}Mapper.insert(entity);
+ }
+ </#list>
+ }
+
+ @Override
+ @Transactional
+ public void delMain(String id) {
+ <#list subTables as sub>
+ ${sub.entityName?uncap_first}Mapper.deleteByMainId(id);
+ </#list>
+ ${entityName?uncap_first}Mapper.deleteById(id);
+ }
+
+ @Override
+ @Transactional
+ public void delBatchMain(Collection<? extends Serializable> idList) {
+ for(Serializable id:idList) {
+ <#list subTables as sub>
+ ${sub.entityName?uncap_first}Mapper.deleteByMainId(id.toString());
+ </#list>
+ ${entityName?uncap_first}Mapper.deleteById(id);
+ }
+ }
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai
new file mode 100644
index 0000000..0ce41d3
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai
@@ -0,0 +1,30 @@
+<#list subTables as subTab>
+#segment#${subTab.entityName}ServiceImpl.java
+package ${bussiPackage}.${entityPackage}.service.impl;
+
+import ${bussiPackage}.${entityPackage}.entity.${subTab.entityName};
+import ${bussiPackage}.${entityPackage}.mapper.${subTab.entityName}Mapper;
+import ${bussiPackage}.${entityPackage}.service.I${subTab.entityName}Service;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @Description: ${subTab.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+@Service
+public class ${subTab.entityName}ServiceImpl extends ServiceImpl<${subTab.entityName}Mapper, ${subTab.entityName}> implements I${subTab.entityName}Service {
+
+ @Autowired
+ private ${subTab.entityName}Mapper ${subTab.entityName?uncap_first}Mapper;
+
+ @Override
+ public List<${subTab.entityName}> selectByMainId(String mainId) {
+ return ${subTab.entityName?uncap_first}Mapper.selectByMainId(mainId);
+ }
+}
+</#list>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
new file mode 100644
index 0000000..b17417f
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
@@ -0,0 +1,49 @@
+package ${bussiPackage}.${entityPackage}.vo;
+
+import java.util.List;
+import ${bussiPackage}.${entityPackage}.entity.${entityName};
+<#list subTables as sub>
+import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
+</#list>
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecgframework.poi.excel.annotation.ExcelCollection;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @Description: ${tableVo.ftlDescription}
+ * @Author: jeecg-boot
+ * @Date: ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+@Data
+public class ${entityName}Page {
+
+ <#list originalColumns as po>
+ /**${po.filedComment}*/
+ <#if po.fieldName == primaryKeyField>
+ <#else>
+ <#if po.fieldType =='java.util.Date'>
+ <#if po.fieldDbType =='date'>
+ @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ <#elseif po.fieldDbType =='datetime'>
+ @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ </#if>
+ <#else>
+ @Excel(name = "${po.filedComment}", width = 15)
+ </#if>
+ </#if>
+ private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
+ </#list>
+
+ <#list subTables as sub>
+ @ExcelCollection(name="${sub.ftlDescription}")
+ private List<${sub.entityName}> ${sub.entityName?uncap_first}List;
+ </#list>
+
+}
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
index c0f196e..172fb66 100644
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
@@ -28,8 +28,8 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls">导出</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="download" @click="handleExportXls('${tableVo.ftlDescription}')">导出</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0">
@@ -221,38 +221,5 @@
}
</script>
<style scoped>
-/** Button按钮间距 */
- .ant-btn {
- margin-left: 3px
- }
- .ant-card-body .table-operator {
- margin-bottom: 18px;
- }
-
- .ant-table-tbody .ant-table-row td {
- padding-top: 15px;
- padding-bottom: 15px;
- }
-
- .anty-row-operator button {
- margin: 0 5px
- }
-
- .ant-btn-danger {
- background-color: #ffffff
- }
-
- .ant-modal-cust-warp {
- height: 100%
- }
-
- .ant-modal-cust-warp .ant-modal-body {
- height: calc(100% - 110px) !important;
- overflow-y: auto
- }
-
- .ant-modal-cust-warp .ant-modal-content {
- height: 90% !important;
- overflow-y: hidden
- }
+ @import '~@assets/less/common.less'
</style>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei
new file mode 100644
index 0000000..fb3601f
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei
@@ -0,0 +1,140 @@
+<#list subTables as subTab>
+#segment#${subTab.entityName}List.vue
+<template>
+ <a-card :bordered="false">
+
+ <!-- 操作按钮区域 -->
+ <div class="table-operator" :md="24" :sm="24" style="margin: 0px 0px 20px 0px">
+ <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+
+ <a-dropdown v-if="selectedRowKeys.length > 0">
+ <a-menu slot="overlay">
+ <a-menu-item key="1" @click="batchDel">
+ <a-icon type="delete"/>删除
+ </a-menu-item>
+ </a-menu>
+ <a-button style="margin-left: 8px"> 批量操作
+ <a-icon type="down"/>
+ </a-button>
+ </a-dropdown>
+ </div>
+
+ <!-- table区域-begin -->
+ <div>
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+ <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+ </div>
+
+ <a-table
+ ref="table"
+ size="middle"
+ bordered
+ rowKey="id"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ @change="handleTableChange">
+
+ <span slot="action" slot-scope="text, record">
+ <a @click="handleEdit(record)">编辑</a>
+ <a-divider type="vertical"/>
+ <a-dropdown>
+ <a class="ant-dropdown-link">
+ 更多 <a-icon type="down"/>
+ </a>
+ <a-menu slot="overlay">
+ <a-menu-item>
+ <a href="javascript:;" @click="handleDetail(record)">详情</a>
+ </a-menu-item>
+ <a-menu-item>
+ <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+ <a>删除</a>
+ </a-popconfirm>
+ </a-menu-item>
+ </a-menu>
+ </a-dropdown>
+ </span>
+
+ </a-table>
+ </div>
+ <!-- table区域-end -->
+
+ <!-- 表单区域 -->
+ <${subTab.entityName}-modal ref="modalForm" @ok="modalFormOk"/>
+ </a-card>
+</template>
+
+<script>
+ import ${subTab.entityName}Modal from './modules/${subTab.entityName}Modal'
+ import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+ import {getAction} from '@/api/manage'
+
+ export default {
+ name: "${subTab.entityName}List",
+ mixins: [JeecgListMixin],
+ components: {
+ ${subTab.entityName}Modal,
+ },
+ data() {
+ return {
+ description: '信息',
+ // 表头
+ columns: [
+ <#list subTab.colums as po><#rt/>
+ <#if po.fieldName !='id' && subTab.foreignKeys[0]?uncap_first != po.fieldName>
+ {
+ title: '${po.filedComment}',
+ align:"center",
+ dataIndex: '${po.fieldName}'
+ },
+ </#if>
+</#list>
+ {
+ title: '操作',
+ key: 'operation',
+ align: "center",
+ width: 130,
+ scopedSlots: {customRender: 'action'},
+ }],
+ url: {
+ list: "/${entityPackage}/${entityName?uncap_first}/list${subTab.entityName}ByMainId",
+ delete: "/${entityPackage}/${entityName?uncap_first}/delete${subTab.entityName}",
+ deleteBatch: "/${entityPackage}/${entityName?uncap_first}/deleteBatch${subTab.entityName}",
+ }
+ }
+ },
+ methods: {
+ loadData(arg) {
+ if (arg === 1) {
+ this.ipagination.current = 1;
+ }
+ var params = this.getQueryParams();
+ getAction(this.url.list, {mainId: params.mainId}).then((res) => {
+ if (res.success) {
+ this.dataSource = res.result;
+ } else {
+ this.dataSource = null;
+ }
+ })
+ },
+ getMain(mainId) {
+ this.queryParam.mainId = mainId;
+ this.loadData(1);
+ },
+ handleAdd: function () {
+ this.$refs.modalForm.add(this.queryParam.mainId);
+ this.$refs.modalForm.title = "添加${subTab.ftlDescription}";
+ },
+ }
+ }
+</script>
+<style scoped>
+ .ant-card {
+ margin-left: -30px;
+ margin-right: -30px;
+ }
+</style>
+</#list>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
index d7ea43d..02c97c2 100644
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
@@ -1,18 +1,16 @@
<template>
<a-modal
:title="title"
- :width="800"
+ :width="1000"
:visible="visible"
:confirmLoading="confirmLoading"
@ok="handleOk"
- @cancel="handleCancel"
- cancelText="关闭">
-
+ @cancel="handleCancel">
<a-spin :spinning="confirmLoading">
+ <!-- 主表单区域 -->
<a-form :form="form">
-
-<#list columns as po><#rt/>
-<#if po.fieldName !='id'><#rt/>
+ <#list columns as po><#rt/>
+ <#if po.fieldName !='id'><#rt/>
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -20,85 +18,89 @@
<#if po.fieldType =='date'>
<a-date-picker v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
<#elseif po.fieldType =='datetime'>
- <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
+ <a-date-picker showTime format="YYYY-MM-DD HH:mm:ss" v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
<#elseif "int,decimal,double,"?contains(po.fieldType)>
<a-input-number v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
<#else>
<a-input placeholder="请输入${po.filedComment}" v-decorator="['${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
</#if>
</a-form-item>
-</#if>
-</#list>
-
+ </#if>
+ </#list>
</a-form>
</a-spin>
</a-modal>
</template>
<script>
- import { httpAction } from '@/api/manage'
+ import {httpAction} from '@/api/manage'
+ import JDate from '@/components/jeecg/JDate'
import pick from 'lodash.pick'
import moment from "moment"
export default {
- name: "${entityName}Modal",
- data () {
+ name: '${entityName}Modal',
+ components: {
+ JDate
+ },
+ data() {
return {
- title:"操作",
+ title: "操作",
visible: false,
model: {},
labelCol: {
- xs: { span: 24 },
- sm: { span: 5 },
+ xs: {span: 24},
+ sm: {span: 5},
},
wrapperCol: {
- xs: { span: 24 },
- sm: { span: 16 },
+ xs: {span: 24},
+ sm: {span: 16},
},
-
confirmLoading: false,
form: this.$form.createForm(this),
- validatorRules:{
- <#list columns as po>
- <#if po.fieldName !='id'>
- <#if po.nullable =='N'>
- ${po.fieldName}:{rules: [{ required: true, message: '请输入${po.filedComment}!' }]},
- </#if>
- </#if>
- </#list>
+ validatorRules: {
+<#list columns as po>
+ <#if po.fieldName !='id'>
+ <#if po.nullable =='N'>
+ ${po.fieldName}: { rules: [{ required: true, message: '请输入${po.filedComment}!' }] },
+ </#if>
+ </#if>
+</#list>
},
url: {
add: "/${entityPackage}/${entityName?uncap_first}/add",
edit: "/${entityPackage}/${entityName?uncap_first}/edit",
- },
+<#list subTables as sub><#rt/>
+ ${sub.entityName?uncap_first}List: '/${entityPackage}/${entityName?uncap_first}/query${sub.entityName}ByMainId',
+</#list>
+ }
}
},
- created () {
- },
methods: {
- add () {
+ add() {
this.edit({});
},
- edit (record) {
+ edit(record) {
this.form.resetFields();
this.model = Object.assign({}, record);
+ //初始化明细表数据
+ console.log(this.model.id)
this.visible = true;
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model<#list columns as po><#if po.fieldName !='id' && po.fieldType?index_of("date")==-1>,'${po.fieldName}'</#if></#list>))
- //时间格式化
- <#list columns as po>
- <#if po.fieldName !='id' && po.fieldType?index_of("date")!=-1>
- this.form.setFieldsValue({${po.fieldName}:this.model.${po.fieldName}?moment(this.model.${po.fieldName}):null})
- </#if>
- </#list>
+ this.form.setFieldsValue(pick(this.model, <#list columns as col>'${col.fieldName}', </#list>))
+ // 时间格式化
+<#list columns as col><#rt/>
+ <#if col.fieldName !='id' && (col.fieldType =='date' || col.fieldType =='datetime')>
+ this.form.setFieldsValue({ ${col.fieldName}: this.model.${col.fieldName} ? moment(this.model.${col.fieldName}) : null })
+ </#if>
+</#list>
});
-
},
- close () {
+ close() {
this.$emit('close');
this.visible = false;
},
- handleOk () {
+ handleOk() {
const that = this;
// 触发表单验证
this.form.validateFields((err, values) => {
@@ -106,12 +108,12 @@
that.confirmLoading = true;
let httpurl = '';
let method = '';
- if(!this.model.id){
- httpurl+=this.url.add;
+ if (!this.model.id) {
+ httpurl += this.url.add;
method = 'post';
- }else{
- httpurl+=this.url.edit;
- method = 'put';
+ } else {
+ httpurl += this.url.edit;
+ method = 'put';
}
let formData = Object.assign(this.model, values);
//时间格式化
@@ -122,34 +124,44 @@
formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format('YYYY-MM-DD HH:mm:ss'):null;
</#if>
</#list>
-
- console.log(formData)
- httpAction(httpurl,formData,method).then((res)=>{
- if(res.success){
- that.$message.success(res.message);
- that.$emit('ok');
- }else{
- that.$message.warning(res.message);
- }
- }).finally(() => {
- that.confirmLoading = false;
- that.close();
- })
-
-
-
- }
+ httpAction(httpurl, formData, method).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message);
+ that.$emit('ok');
+ } else {
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.close();
+ })
+ }
})
},
- handleCancel () {
+ handleCancel() {
this.close()
- },
-
-
+ }
}
}
</script>
-<style lang="less" scoped>
+<style scoped>
+ .ant-btn {
+ padding: 0 10px;
+ margin-left: 3px;
+ }
+
+ .ant-form-item-control {
+ line-height: 0px;
+ }
+ /** 主表单行间距 */
+ .ant-form .ant-form-item {
+ margin-bottom: 10px;
+ }
+
+ /** Tab页面行间距 */
+ .ant-tabs-content .ant-form-item {
+ margin-bottom: 0px;
+ }
</style>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei
new file mode 100644
index 0000000..ee0c9b0
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei
@@ -0,0 +1,183 @@
+<#list subTables as subTab>
+#segment#${subTab.entityName}Modal.vue
+<template>
+ <a-modal
+ :title="title"
+ :width="800"
+ :visible="visible"
+ :okButtonProps="{ props: {disabled: disableSubmit} }"
+ :confirmLoading="confirmLoading"
+ @ok="handleOk"
+ @cancel="handleCancel"
+ cancelText="关闭">
+ <a-spin :spinning="confirmLoading">
+ <a-form :form="form">
+<#list subTab.colums as po><#rt/>
+
+<#if po.fieldName !='id'><#rt/>
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="${po.filedComment}"
+ <#if subTab.foreignKeys[0]?uncap_first == po.fieldName>
+ :hidden="hiding"
+ </#if>
+ hasFeedback>
+ <#if po.fieldType =='date'>
+ <a-date-picker v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
+ <#elseif po.fieldType =='datetime'>
+ <a-date-picker showTime format="YYYY-MM-DD HH:mm:ss" v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
+ <#elseif "int,decimal,double,"?contains(po.fieldType)>
+ <a-input-number v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
+ <#else>
+ <#if subTab.foreignKeys[0]?uncap_first == po.fieldName>
+ <a-input placeholder="请输入${po.filedComment}" v-decorator="['${po.fieldName}', {'initialValue':this.mainId}]" />
+ <#else>
+ <a-input placeholder="请输入${po.filedComment}" v-decorator="['${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
+ </#if>
+ </#if>
+ </a-form-item>
+</#if>
+</#list>
+ </a-form>
+ </a-spin>
+ </a-modal>
+</template>
+
+<script>
+ import {httpAction} from '@/api/manage'
+ import pick from 'lodash.pick'
+ import moment from 'moment'
+ import JDate from '@/components/jeecg/JDate'
+
+ export default {
+ components: {
+ JDate
+ },
+ name: '${subTab.entityName}Modal',
+ data() {
+ return {
+ title: '操作',
+ visible: false,
+ model: {},
+ labelCol: {
+ xs: {span: 24},
+ sm: {span: 5}
+ },
+ wrapperCol: {
+ xs: {span: 24},
+ sm: {span: 16}
+ },
+ moment,
+ format: 'YYYY-MM-DD HH:mm:ss',
+ disableSubmit: false,
+ mainId: '',
+ hiding: false,
+ confirmLoading: false,
+ form: this.$form.createForm(this),
+ validatorRules: {
+ <#list subTab.colums as po>
+ <#if po.fieldName !='id' && subTab.foreignKeys[0]?uncap_first != po.fieldName>
+ <#if po.nullable =='N'>
+ ${po.fieldName}: { rules: [{ required: true, message: '请输入${po.filedComment}!' }] },
+ </#if>
+ </#if>
+</#list>
+ },
+ url: {
+ add: '/${entityPackage}/${entityName?uncap_first}/add${subTab.entityName}',
+ edit: '/${entityPackage}/${entityName?uncap_first}/edit${subTab.entityName}'
+ }
+ }
+ },
+ created() {
+ },
+ methods: {
+ add(mainId) {
+ if (mainId) {
+ this.edit({mainId}, '')
+ } else {
+ this.$message.warning('请选择一条数据')
+ }
+ },
+ detail(record) {
+ this.edit(record, 'd')
+ },
+ edit(record, v) {
+ if (v == 'e') {
+ this.hiding = false;
+ this.disableSubmit = false;
+ } else if (v == 'd') {
+ this.hiding = false;
+ this.disableSubmit = true;
+ } else {
+ this.hiding = true;
+ this.disableSubmit = false;
+ }
+ this.form.resetFields();
+ this.mainId = record.mainId;
+ this.model = Object.assign({}, record);
+ this.visible = true;
+ this.$nextTick(() => {
+ this.form.setFieldsValue(pick(this.model, <#list subTab.colums as col>'${col.fieldName}', </#list>))
+ // 时间格式化
+<#list subTab.colums as col><#rt/>
+ <#if col.fieldName !='id' && (col.fieldType =='date' || col.fieldType =='datetime')>
+ this.form.setFieldsValue({ ${col.fieldName}: this.model.${col.fieldName} ? moment(this.model.${col.fieldName}) : null })
+ </#if>
+</#list>
+ })
+ },
+ close() {
+ this.$emit('close');
+ this.visible = false;
+ },
+ handleOk() {
+ const that = this;
+ // 触发表单验证
+ this.form.validateFields((err, values) => {
+ if (!err) {
+ that.confirmLoading = true;
+ let httpurl = '';
+ let method = '';
+ if (!this.model.id) {
+ httpurl += this.url.add;
+ method = 'post';
+ } else {
+ httpurl += this.url.edit;
+ method = 'put';
+ }
+ let formData = Object.assign(this.model, values);
+ //时间格式化
+ <#list subTab.colums as po>
+ <#if po.fieldName !='id' && po.fieldType =='date'>
+ formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format():null;
+ <#elseif po.fieldName !='id' && po.fieldType =='datetime'>
+ formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format('YYYY-MM-DD HH:mm:ss'):null;
+ </#if>
+ </#list>
+ httpAction(httpurl, formData, method).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message);
+ that.$emit('ok');
+ } else {
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.close();
+ })
+ }
+ })
+ },
+ handleCancel() {
+ this.close();
+ }
+ }
+ }
+</script>
+
+<style scoped>
+
+</style>
+</#list>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/jeecg_config.properties b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/jeecg_config.properties
new file mode 100644
index 0000000..cecf6a1
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/jeecg_config.properties
@@ -0,0 +1,30 @@
+#code_generate_project_path
+project_path=E:\\eclipse2018-workspace\\jeecg-boot
+#bussi_package[User defined]
+bussi_package=org.jeecg.modules.demo
+
+
+#default code path
+#source_root_package=src
+#webroot_package=WebRoot
+
+#maven code path
+source_root_package=src.main.java
+webroot_package=src.main.webapp
+
+#ftl resource url
+templatepath=/jeecg/code-template
+system_encoding=utf-8
+
+#db Table id [User defined]
+db_table_id=id
+
+#db convert flag[true/false]
+db_filed_convert=true
+
+#page Search Field num [User defined]
+page_search_filed_num=1
+#page_filter_fields
+page_filter_fields=create_time,create_by,update_time,update_by
+
+
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/jeecg_database.properties b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/jeecg_database.properties
new file mode 100644
index 0000000..67ad5ab
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/jeecg_database.properties
@@ -0,0 +1,27 @@
+#mysql
+diver_name=com.mysql.jdbc.Driver
+url=jdbc:mysql://localhost:3306/jeecg-boot?useUnicode=true&characterEncoding=UTF-8
+username=root
+password=root
+database_name=jeecg-boot
+
+#oracle
+#diver_name=oracle.jdbc.driver.OracleDriver
+#url=jdbc:oracle:thin:@192.168.1.200:1521:ORCL
+#username=scott
+#password=tiger
+#database_name=ORCL
+
+#postgre
+#diver_name=org.postgresql.Driver
+#url=jdbc:postgresql://localhost:5432/jeecg
+#username=postgres
+#password=postgres
+#database_name=jeecg
+
+#SQLServer2005\u4ee5\u4e0a
+#diver_name=org.hibernate.dialect.SQLServerDialect
+#url=jdbc:sqlserver://192.168.1.200:1433;DatabaseName=jeecg
+#username=sa
+#password=SA
+#database_name=jeecg
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/logback-spring.xml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..beb0634
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/logback-spring.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+ <!--定义日志文件的存储地址 -->
+ <property name="LOG_HOME" value="../logs" />
+
+ <property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />
+ <!-- 控制台输出 -->
+ <appender name="STDOUT"
+ class="ch.qos.logback.core.ConsoleAppender">
+ <encoder
+ class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <!-- 按照每天生成日志文件 -->
+ <appender name="FILE"
+ class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <rollingPolicy
+ class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!--日志文件输出的文件名 -->
+ <FileNamePattern>${LOG_HOME}/jeecgboot.%d{yyyy-MM-dd}.log
+ </FileNamePattern>
+ <!--日志文件保留天数 -->
+ <MaxHistory>30</MaxHistory>
+ </rollingPolicy>
+ <encoder
+ class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
+ </encoder>
+ <!--日志文件最大的大小 -->
+ <triggeringPolicy
+ class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+ <MaxFileSize>10MB</MaxFileSize>
+ </triggeringPolicy>
+ </appender>
+
+ <!-- 生成html格式日志开始 -->
+ <appender name="HTML" class="ch.qos.logback.core.FileAppender">
+ <!-- 过滤器，只记录WARN级别的日志 -->
+ <!-- <filter class="ch.qos.logback.classic.filter.LevelFilter"> <level>info</level>
+ <onMatch>ACCEPT</onMatch> <onMismatch>DENY</onMismatch> </filter> -->
+
+ <encoder
+ class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+ <layout class="ch.qos.logback.classic.html.HTMLLayout">
+ <pattern>%p%d%msg%M%F{32}%L</pattern>
+ </layout>
+ </encoder>
+ <file>${LOG_HOME}/error-log.html</file>
+ </appender>
+ <!-- 生成html格式日志结束 -->
+
+ <!-- 每天生成一个html格式的日志开始 -->
+ <appender name="FILE_HTML"
+ class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <rollingPolicy
+ class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!--日志文件输出的文件名 -->
+ <FileNamePattern>${LOG_HOME}/jeecgboot.%d{yyyy-MM-dd}.html
+ </FileNamePattern>
+ <!--日志文件保留天数 -->
+ <MaxHistory>30</MaxHistory>
+ </rollingPolicy>
+ <encoder
+ class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+ <layout class="ch.qos.logback.classic.html.HTMLLayout">
+ <pattern>%p%d%msg%M%F{32}%L</pattern>
+ </layout>
+ </encoder>
+ <!--日志文件最大的大小 -->
+ <triggeringPolicy
+ class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+ <MaxFileSize>10MB</MaxFileSize>
+ </triggeringPolicy>
+ </appender>
+ <!-- 每天生成一个html格式的日志结束 -->
+
+ <!--myibatis log configure -->
+ <logger name="com.apache.ibatis" level="TRACE" />
+ <logger name="java.sql.Connection" level="DEBUG" />
+ <logger name="java.sql.Statement" level="DEBUG" />
+ <logger name="java.sql.PreparedStatement" level="DEBUG" />
+
+ <!-- 日志输出级别 -->
+ <root level="INFO">
+ <appender-ref ref="STDOUT" />
+ <appender-ref ref="FILE" />
+ <appender-ref ref="HTML" />
+ <appender-ref ref="FILE_HTML" />
+ </root>
+
+</configuration>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/static/demo1.html b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/demo1.html
index f984869..f984869 100644
--- a/jeecg-boot/src/main/resources/static/demo1.html
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/demo1.html
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/LICENSE b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/LICENSE
new file mode 100644
index 0000000..f433b1a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/LICENSE
@@ -0,0 +1,177 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/build/pdf.js b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/build/pdf.js
new file mode 100644
index 0000000..42fafd3
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/build/pdf.js
@@ -0,0 +1,8021 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+/* Copyright 2012 Mozilla Foundation
+ *
+ * Licensed 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.
+ */
+/*jshint globalstrict: false */
+/* globals PDFJS */
+
+// Initializing PDFJS global object (if still undefined)
+if (typeof PDFJS === 'undefined') {
+ (typeof window !== 'undefined' ? window : this).PDFJS = {};
+}
+
+PDFJS.version = '1.1.159';
+PDFJS.build = '82536f8';
+
+(function pdfjsWrapper() {
+ // Use strict in our context only - users might not want it
+ 'use strict';
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+/* Copyright 2012 Mozilla Foundation
+ *
+ * Licensed 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.
+ */
+/* globals Cmd, ColorSpace, Dict, MozBlobBuilder, Name, PDFJS, Ref, URL,
+ Promise */
+
+'use strict';
+
+var globalScope = (typeof window === 'undefined') ? this : window;
+
+var isWorker = (typeof window === 'undefined');
+
+var FONT_IDENTITY_MATRIX = [0.001, 0, 0, 0.001, 0, 0];
+
+var TextRenderingMode = {
+ FILL: 0,
+ STROKE: 1,
+ FILL_STROKE: 2,
+ INVISIBLE: 3,
+ FILL_ADD_TO_PATH: 4,
+ STROKE_ADD_TO_PATH: 5,
+ FILL_STROKE_ADD_TO_PATH: 6,
+ ADD_TO_PATH: 7,
+ FILL_STROKE_MASK: 3,
+ ADD_TO_PATH_FLAG: 4
+};
+
+var ImageKind = {
+ GRAYSCALE_1BPP: 1,
+ RGB_24BPP: 2,
+ RGBA_32BPP: 3
+};
+
+var AnnotationType = {
+ WIDGET: 1,
+ TEXT: 2,
+ LINK: 3
+};
+
+var StreamType = {
+ UNKNOWN: 0,
+ FLATE: 1,
+ LZW: 2,
+ DCT: 3,
+ JPX: 4,
+ JBIG: 5,
+ A85: 6,
+ AHX: 7,
+ CCF: 8,
+ RL: 9
+};
+
+var FontType = {
+ UNKNOWN: 0,
+ TYPE1: 1,
+ TYPE1C: 2,
+ CIDFONTTYPE0: 3,
+ CIDFONTTYPE0C: 4,
+ TRUETYPE: 5,
+ CIDFONTTYPE2: 6,
+ TYPE3: 7,
+ OPENTYPE: 8,
+ TYPE0: 9,
+ MMTYPE1: 10
+};
+
+// The global PDFJS object exposes the API
+// In production, it will be declared outside a global wrapper
+// In development, it will be declared here
+if (!globalScope.PDFJS) {
+ globalScope.PDFJS = {};
+}
+
+globalScope.PDFJS.pdfBug = false;
+
+PDFJS.VERBOSITY_LEVELS = {
+ errors: 0,
+ warnings: 1,
+ infos: 5
+};
+
+// All the possible operations for an operator list.
+var OPS = PDFJS.OPS = {
+ // Intentionally start from 1 so it is easy to spot bad operators that will be
+ // 0's.
+ dependency: 1,
+ setLineWidth: 2,
+ setLineCap: 3,
+ setLineJoin: 4,
+ setMiterLimit: 5,
+ setDash: 6,
+ setRenderingIntent: 7,
+ setFlatness: 8,
+ setGState: 9,
+ save: 10,
+ restore: 11,
+ transform: 12,
+ moveTo: 13,
+ lineTo: 14,
+ curveTo: 15,
+ curveTo2: 16,
+ curveTo3: 17,
+ closePath: 18,
+ rectangle: 19,
+ stroke: 20,
+ closeStroke: 21,
+ fill: 22,
+ eoFill: 23,
+ fillStroke: 24,
+ eoFillStroke: 25,
+ closeFillStroke: 26,
+ closeEOFillStroke: 27,
+ endPath: 28,
+ clip: 29,
+ eoClip: 30,
+ beginText: 31,
+ endText: 32,
+ setCharSpacing: 33,
+ setWordSpacing: 34,
+ setHScale: 35,
+ setLeading: 36,
+ setFont: 37,
+ setTextRenderingMode: 38,
+ setTextRise: 39,
+ moveText: 40,
+ setLeadingMoveText: 41,
+ setTextMatrix: 42,
+ nextLine: 43,
+ showText: 44,
+ showSpacedText: 45,
+ nextLineShowText: 46,
+ nextLineSetSpacingShowText: 47,
+ setCharWidth: 48,
+ setCharWidthAndBounds: 49,
+ setStrokeColorSpace: 50,
+ setFillColorSpace: 51,
+ setStrokeColor: 52,
+ setStrokeColorN: 53,
+ setFillColor: 54,
+ setFillColorN: 55,
+ setStrokeGray: 56,
+ setFillGray: 57,
+ setStrokeRGBColor: 58,
+ setFillRGBColor: 59,
+ setStrokeCMYKColor: 60,
+ setFillCMYKColor: 61,
+ shadingFill: 62,
+ beginInlineImage: 63,
+ beginImageData: 64,
+ endInlineImage: 65,
+ paintXObject: 66,
+ markPoint: 67,
+ markPointProps: 68,
+ beginMarkedContent: 69,
+ beginMarkedContentProps: 70,
+ endMarkedContent: 71,
+ beginCompat: 72,
+ endCompat: 73,
+ paintFormXObjectBegin: 74,
+ paintFormXObjectEnd: 75,
+ beginGroup: 76,
+ endGroup: 77,
+ beginAnnotations: 78,
+ endAnnotations: 79,
+ beginAnnotation: 80,
+ endAnnotation: 81,
+ paintJpegXObject: 82,
+ paintImageMaskXObject: 83,
+ paintImageMaskXObjectGroup: 84,
+ paintImageXObject: 85,
+ paintInlineImageXObject: 86,
+ paintInlineImageXObjectGroup: 87,
+ paintImageXObjectRepeat: 88,
+ paintImageMaskXObjectRepeat: 89,
+ paintSolidColorImageMask: 90,
+ constructPath: 91
+};
+
+// A notice for devs. These are good for things that are helpful to devs, such
+// as warning that Workers were disabled, which is important to devs but not
+// end users.
+function info(msg) {
+ if (PDFJS.verbosity >= PDFJS.VERBOSITY_LEVELS.infos) {
+ console.log('Info: ' + msg);
+ }
+}
+
+// Non-fatal warnings.
+function warn(msg) {
+ if (PDFJS.verbosity >= PDFJS.VERBOSITY_LEVELS.warnings) {
+ console.log('Warning: ' + msg);
+ }
+}
+
+// Fatal errors that should trigger the fallback UI and halt execution by
+// throwing an exception.
+function error(msg) {
+ if (PDFJS.verbosity >= PDFJS.VERBOSITY_LEVELS.errors) {
+ console.log('Error: ' + msg);
+ console.log(backtrace());
+ }
+ UnsupportedManager.notify(UNSUPPORTED_FEATURES.unknown);
+ throw new Error(msg);
+}
+
+function backtrace() {
+ try {
+ throw new Error();
+ } catch (e) {
+ return e.stack ? e.stack.split('\n').slice(2).join('\n') : '';
+ }
+}
+
+function assert(cond, msg) {
+ if (!cond) {
+ error(msg);
+ }
+}
+
+var UNSUPPORTED_FEATURES = PDFJS.UNSUPPORTED_FEATURES = {
+ unknown: 'unknown',
+ forms: 'forms',
+ javaScript: 'javaScript',
+ smask: 'smask',
+ shadingPattern: 'shadingPattern',
+ font: 'font'
+};
+
+var UnsupportedManager = PDFJS.UnsupportedManager =
+ (function UnsupportedManagerClosure() {
+ var listeners = [];
+ return {
+ listen: function (cb) {
+ listeners.push(cb);
+ },
+ notify: function (featureId) {
+ warn('Unsupported feature "' + featureId + '"');
+ for (var i = 0, ii = listeners.length; i < ii; i++) {
+ listeners[i](featureId);
+ }
+ }
+ };
+})();
+
+// Combines two URLs. The baseUrl shall be absolute URL. If the url is an
+// absolute URL, it will be returned as is.
+function combineUrl(baseUrl, url) {
+ if (!url) {
+ return baseUrl;
+ }
+ if (/^[a-z][a-z0-9+\-.]*:/i.test(url)) {
+ return url;
+ }
+ var i;
+ if (url.charAt(0) === '/') {
+ // absolute path
+ i = baseUrl.indexOf('://');
+ if (url.charAt(1) === '/') {
+ ++i;
+ } else {
+ i = baseUrl.indexOf('/', i + 3);
+ }
+ return baseUrl.substring(0, i) + url;
+ } else {
+ // relative path
+ var pathLength = baseUrl.length;
+ i = baseUrl.lastIndexOf('#');
+ pathLength = i >= 0 ? i : pathLength;
+ i = baseUrl.lastIndexOf('?', pathLength);
+ pathLength = i >= 0 ? i : pathLength;
+ var prefixLength = baseUrl.lastIndexOf('/', pathLength);
+ return baseUrl.substring(0, prefixLength + 1) + url;
+ }
+}
+
+// Validates if URL is safe and allowed, e.g. to avoid XSS.
+function isValidUrl(url, allowRelative) {
+ if (!url) {
+ return false;
+ }
+ // RFC 3986 (http://tools.ietf.org/html/rfc3986#section-3.1)
+ // scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
+ var protocol = /^[a-z][a-z0-9+\-.]*(?=:)/i.exec(url);
+ if (!protocol) {
+ return allowRelative;
+ }
+ protocol = protocol[0].toLowerCase();
+ switch (protocol) {
+ case 'http':
+ case 'https':
+ case 'ftp':
+ case 'mailto':
+ case 'tel':
+ return true;
+ default:
+ return false;
+ }
+}
+PDFJS.isValidUrl = isValidUrl;
+
+function shadow(obj, prop, value) {
+ Object.defineProperty(obj, prop, { value: value,
+ enumerable: true,
+ configurable: true,
+ writable: false });
+ return value;
+}
+PDFJS.shadow = shadow;
+
+var PasswordResponses = PDFJS.PasswordResponses = {
+ NEED_PASSWORD: 1,
+ INCORRECT_PASSWORD: 2
+};
+
+var PasswordException = (function PasswordExceptionClosure() {
+ function PasswordException(msg, code) {
+ this.name = 'PasswordException';
+ this.message = msg;
+ this.code = code;
+ }
+
+ PasswordException.prototype = new Error();
+ PasswordException.constructor = PasswordException;
+
+ return PasswordException;
+})();
+PDFJS.PasswordException = PasswordException;
+
+var UnknownErrorException = (function UnknownErrorExceptionClosure() {
+ function UnknownErrorException(msg, details) {
+ this.name = 'UnknownErrorException';
+ this.message = msg;
+ this.details = details;
+ }
+
+ UnknownErrorException.prototype = new Error();
+ UnknownErrorException.constructor = UnknownErrorException;
+
+ return UnknownErrorException;
+})();
+PDFJS.UnknownErrorException = UnknownErrorException;
+
+var InvalidPDFException = (function InvalidPDFExceptionClosure() {
+ function InvalidPDFException(msg) {
+ this.name = 'InvalidPDFException';
+ this.message = msg;
+ }
+
+ InvalidPDFException.prototype = new Error();
+ InvalidPDFException.constructor = InvalidPDFException;
+
+ return InvalidPDFException;
+})();
+PDFJS.InvalidPDFException = InvalidPDFException;
+
+var MissingPDFException = (function MissingPDFExceptionClosure() {
+ function MissingPDFException(msg) {
+ this.name = 'MissingPDFException';
+ this.message = msg;
+ }
+
+ MissingPDFException.prototype = new Error();
+ MissingPDFException.constructor = MissingPDFException;
+
+ return MissingPDFException;
+})();
+PDFJS.MissingPDFException = MissingPDFException;
+
+var UnexpectedResponseException =
+ (function UnexpectedResponseExceptionClosure() {
+ function UnexpectedResponseException(msg, status) {
+ this.name = 'UnexpectedResponseException';
+ this.message = msg;
+ this.status = status;
+ }
+
+ UnexpectedResponseException.prototype = new Error();
+ UnexpectedResponseException.constructor = UnexpectedResponseException;
+
+ return UnexpectedResponseException;
+})();
+PDFJS.UnexpectedResponseException = UnexpectedResponseException;
+
+var NotImplementedException = (function NotImplementedExceptionClosure() {
+ function NotImplementedException(msg) {
+ this.message = msg;
+ }
+
+ NotImplementedException.prototype = new Error();
+ NotImplementedException.prototype.name = 'NotImplementedException';
+ NotImplementedException.constructor = NotImplementedException;
+
+ return NotImplementedException;
+})();
+
+var MissingDataException = (function MissingDataExceptionClosure() {
+ function MissingDataException(begin, end) {
+ this.begin = begin;
+ this.end = end;
+ this.message = 'Missing data [' + begin + ', ' + end + ')';
+ }
+
+ MissingDataException.prototype = new Error();
+ MissingDataException.prototype.name = 'MissingDataException';
+ MissingDataException.constructor = MissingDataException;
+
+ return MissingDataException;
+})();
+
+var XRefParseException = (function XRefParseExceptionClosure() {
+ function XRefParseException(msg) {
+ this.message = msg;
+ }
+
+ XRefParseException.prototype = new Error();
+ XRefParseException.prototype.name = 'XRefParseException';
+ XRefParseException.constructor = XRefParseException;
+
+ return XRefParseException;
+})();
+
+
+function bytesToString(bytes) {
+ assert(bytes !== null && typeof bytes === 'object' &&
+ bytes.length !== undefined, 'Invalid argument for bytesToString');
+ var length = bytes.length;
+ var MAX_ARGUMENT_COUNT = 8192;
+ if (length < MAX_ARGUMENT_COUNT) {
+ return String.fromCharCode.apply(null, bytes);
+ }
+ var strBuf = [];
+ for (var i = 0; i < length; i += MAX_ARGUMENT_COUNT) {
+ var chunkEnd = Math.min(i + MAX_ARGUMENT_COUNT, length);
+ var chunk = bytes.subarray(i, chunkEnd);
+ strBuf.push(String.fromCharCode.apply(null, chunk));
+ }
+ return strBuf.join('');
+}
+
+function stringToBytes(str) {
+ assert(typeof str === 'string', 'Invalid argument for stringToBytes');
+ var length = str.length;
+ var bytes = new Uint8Array(length);
+ for (var i = 0; i < length; ++i) {
+ bytes[i] = str.charCodeAt(i) & 0xFF;
+ }
+ return bytes;
+}
+
+function string32(value) {
+ return String.fromCharCode((value >> 24) & 0xff, (value >> 16) & 0xff,
+ (value >> 8) & 0xff, value & 0xff);
+}
+
+function log2(x) {
+ var n = 1, i = 0;
+ while (x > n) {
+ n <<= 1;
+ i++;
+ }
+ return i;
+}
+
+function readInt8(data, start) {
+ return (data[start] << 24) >> 24;
+}
+
+function readUint16(data, offset) {
+ return (data[offset] << 8) | data[offset + 1];
+}
+
+function readUint32(data, offset) {
+ return ((data[offset] << 24) | (data[offset + 1] << 16) |
+ (data[offset + 2] << 8) | data[offset + 3]) >>> 0;
+}
+
+// Lazy test the endianness of the platform
+// NOTE: This will be 'true' for simulated TypedArrays
+function isLittleEndian() {
+ var buffer8 = new Uint8Array(2);
+ buffer8[0] = 1;
+ var buffer16 = new Uint16Array(buffer8.buffer);
+ return (buffer16[0] === 1);
+}
+
+Object.defineProperty(PDFJS, 'isLittleEndian', {
+ configurable: true,
+ get: function PDFJS_isLittleEndian() {
+ return shadow(PDFJS, 'isLittleEndian', isLittleEndian());
+ }
+});
+
+ // Lazy test if the userAgant support CanvasTypedArrays
+function hasCanvasTypedArrays() {
+ var canvas = document.createElement('canvas');
+ canvas.width = canvas.height = 1;
+ var ctx = canvas.getContext('2d');
+ var imageData = ctx.createImageData(1, 1);
+ return (typeof imageData.data.buffer !== 'undefined');
+}
+
+Object.defineProperty(PDFJS, 'hasCanvasTypedArrays', {
+ configurable: true,
+ get: function PDFJS_hasCanvasTypedArrays() {
+ return shadow(PDFJS, 'hasCanvasTypedArrays', hasCanvasTypedArrays());
+ }
+});
+
+var Uint32ArrayView = (function Uint32ArrayViewClosure() {
+
+ function Uint32ArrayView(buffer, length) {
+ this.buffer = buffer;
+ this.byteLength = buffer.length;
+ this.length = length === undefined ? (this.byteLength >> 2) : length;
+ ensureUint32ArrayViewProps(this.length);
+ }
+ Uint32ArrayView.prototype = Object.create(null);
+
+ var uint32ArrayViewSetters = 0;
+ function createUint32ArrayProp(index) {
+ return {
+ get: function () {
+ var buffer = this.buffer, offset = index << 2;
+ return (buffer[offset] | (buffer[offset + 1] << 8) |
+ (buffer[offset + 2] << 16) | (buffer[offset + 3] << 24)) >>> 0;
+ },
+ set: function (value) {
+ var buffer = this.buffer, offset = index << 2;
+ buffer[offset] = value & 255;
+ buffer[offset + 1] = (value >> 8) & 255;
+ buffer[offset + 2] = (value >> 16) & 255;
+ buffer[offset + 3] = (value >>> 24) & 255;
+ }
+ };
+ }
+
+ function ensureUint32ArrayViewProps(length) {
+ while (uint32ArrayViewSetters < length) {
+ Object.defineProperty(Uint32ArrayView.prototype,
+ uint32ArrayViewSetters,
+ createUint32ArrayProp(uint32ArrayViewSetters));
+ uint32ArrayViewSetters++;
+ }
+ }
+
+ return Uint32ArrayView;
+})();
+
+var IDENTITY_MATRIX = [1, 0, 0, 1, 0, 0];
+
+var Util = PDFJS.Util = (function UtilClosure() {
+ function Util() {}
+
+ var rgbBuf = ['rgb(', 0, ',', 0, ',', 0, ')'];
+
+ // makeCssRgb() can be called thousands of times. Using |rgbBuf| avoids
+ // creating many intermediate strings.
+ Util.makeCssRgb = function Util_makeCssRgb(r, g, b) {
+ rgbBuf[1] = r;
+ rgbBuf[3] = g;
+ rgbBuf[5] = b;
+ return rgbBuf.join('');
+ };
+
+ // Concatenates two transformation matrices together and returns the result.
+ Util.transform = function Util_transform(m1, m2) {
+ return [
+ m1[0] * m2[0] + m1[2] * m2[1],
+ m1[1] * m2[0] + m1[3] * m2[1],
+ m1[0] * m2[2] + m1[2] * m2[3],
+ m1[1] * m2[2] + m1[3] * m2[3],
+ m1[0] * m2[4] + m1[2] * m2[5] + m1[4],
+ m1[1] * m2[4] + m1[3] * m2[5] + m1[5]
+ ];
+ };
+
+ // For 2d affine transforms
+ Util.applyTransform = function Util_applyTransform(p, m) {
+ var xt = p[0] * m[0] + p[1] * m[2] + m[4];
+ var yt = p[0] * m[1] + p[1] * m[3] + m[5];
+ return [xt, yt];
+ };
+
+ Util.applyInverseTransform = function Util_applyInverseTransform(p, m) {
+ var d = m[0] * m[3] - m[1] * m[2];
+ var xt = (p[0] * m[3] - p[1] * m[2] + m[2] * m[5] - m[4] * m[3]) / d;
+ var yt = (-p[0] * m[1] + p[1] * m[0] + m[4] * m[1] - m[5] * m[0]) / d;
+ return [xt, yt];
+ };
+
+ // Applies the transform to the rectangle and finds the minimum axially
+ // aligned bounding box.
+ Util.getAxialAlignedBoundingBox =
+ function Util_getAxialAlignedBoundingBox(r, m) {
+
+ var p1 = Util.applyTransform(r, m);
+ var p2 = Util.applyTransform(r.slice(2, 4), m);
+ var p3 = Util.applyTransform([r[0], r[3]], m);
+ var p4 = Util.applyTransform([r[2], r[1]], m);
+ return [
+ Math.min(p1[0], p2[0], p3[0], p4[0]),
+ Math.min(p1[1], p2[1], p3[1], p4[1]),
+ Math.max(p1[0], p2[0], p3[0], p4[0]),
+ Math.max(p1[1], p2[1], p3[1], p4[1])
+ ];
+ };
+
+ Util.inverseTransform = function Util_inverseTransform(m) {
+ var d = m[0] * m[3] - m[1] * m[2];
+ return [m[3] / d, -m[1] / d, -m[2] / d, m[0] / d,
+ (m[2] * m[5] - m[4] * m[3]) / d, (m[4] * m[1] - m[5] * m[0]) / d];
+ };
+
+ // Apply a generic 3d matrix M on a 3-vector v:
+ // | a b c | | X |
+ // | d e f | x | Y |
+ // | g h i | | Z |
+ // M is assumed to be serialized as [a,b,c,d,e,f,g,h,i],
+ // with v as [X,Y,Z]
+ Util.apply3dTransform = function Util_apply3dTransform(m, v) {
+ return [
+ m[0] * v[0] + m[1] * v[1] + m[2] * v[2],
+ m[3] * v[0] + m[4] * v[1] + m[5] * v[2],
+ m[6] * v[0] + m[7] * v[1] + m[8] * v[2]
+ ];
+ };
+
+ // This calculation uses Singular Value Decomposition.
+ // The SVD can be represented with formula A = USV. We are interested in the
+ // matrix S here because it represents the scale values.
+ Util.singularValueDecompose2dScale =
+ function Util_singularValueDecompose2dScale(m) {
+
+ var transpose = [m[0], m[2], m[1], m[3]];
+
+ // Multiply matrix m with its transpose.
+ var a = m[0] * transpose[0] + m[1] * transpose[2];
+ var b = m[0] * transpose[1] + m[1] * transpose[3];
+ var c = m[2] * transpose[0] + m[3] * transpose[2];
+ var d = m[2] * transpose[1] + m[3] * transpose[3];
+
+ // Solve the second degree polynomial to get roots.
+ var first = (a + d) / 2;
+ var second = Math.sqrt((a + d) * (a + d) - 4 * (a * d - c * b)) / 2;
+ var sx = first + second || 1;
+ var sy = first - second || 1;
+
+ // Scale values are the square roots of the eigenvalues.
+ return [Math.sqrt(sx), Math.sqrt(sy)];
+ };
+
+ // Normalize rectangle rect=[x1, y1, x2, y2] so that (x1,y1) < (x2,y2)
+ // For coordinate systems whose origin lies in the bottom-left, this
+ // means normalization to (BL,TR) ordering. For systems with origin in the
+ // top-left, this means (TL,BR) ordering.
+ Util.normalizeRect = function Util_normalizeRect(rect) {
+ var r = rect.slice(0); // clone rect
+ if (rect[0] > rect[2]) {
+ r[0] = rect[2];
+ r[2] = rect[0];
+ }
+ if (rect[1] > rect[3]) {
+ r[1] = rect[3];
+ r[3] = rect[1];
+ }
+ return r;
+ };
+
+ // Returns a rectangle [x1, y1, x2, y2] corresponding to the
+ // intersection of rect1 and rect2. If no intersection, returns 'false'
+ // The rectangle coordinates of rect1, rect2 should be [x1, y1, x2, y2]
+ Util.intersect = function Util_intersect(rect1, rect2) {
+ function compare(a, b) {
+ return a - b;
+ }
+
+ // Order points along the axes
+ var orderedX = [rect1[0], rect1[2], rect2[0], rect2[2]].sort(compare),
+ orderedY = [rect1[1], rect1[3], rect2[1], rect2[3]].sort(compare),
+ result = [];
+
+ rect1 = Util.normalizeRect(rect1);
+ rect2 = Util.normalizeRect(rect2);
+
+ // X: first and second points belong to different rectangles?
+ if ((orderedX[0] === rect1[0] && orderedX[1] === rect2[0]) ||
+ (orderedX[0] === rect2[0] && orderedX[1] === rect1[0])) {
+ // Intersection must be between second and third points
+ result[0] = orderedX[1];
+ result[2] = orderedX[2];
+ } else {
+ return false;
+ }
+
+ // Y: first and second points belong to different rectangles?
+ if ((orderedY[0] === rect1[1] && orderedY[1] === rect2[1]) ||
+ (orderedY[0] === rect2[1] && orderedY[1] === rect1[1])) {
+ // Intersection must be between second and third points
+ result[1] = orderedY[1];
+ result[3] = orderedY[2];
+ } else {
+ return false;
+ }
+
+ return result;
+ };
+
+ Util.sign = function Util_sign(num) {
+ return num < 0 ? -1 : 1;
+ };
+
+ Util.appendToArray = function Util_appendToArray(arr1, arr2) {
+ Array.prototype.push.apply(arr1, arr2);
+ };
+
+ Util.prependToArray = function Util_prependToArray(arr1, arr2) {
+ Array.prototype.unshift.apply(arr1, arr2);
+ };
+
+ Util.extendObj = function extendObj(obj1, obj2) {
+ for (var key in obj2) {
+ obj1[key] = obj2[key];
+ }
+ };
+
+ Util.getInheritableProperty = function Util_getInheritableProperty(dict,
+ name) {
+ while (dict && !dict.has(name)) {
+ dict = dict.get('Parent');
+ }
+ if (!dict) {
+ return null;
+ }
+ return dict.get(name);
+ };
+
+ Util.inherit = function Util_inherit(sub, base, prototype) {
+ sub.prototype = Object.create(base.prototype);
+ sub.prototype.constructor = sub;
+ for (var prop in prototype) {
+ sub.prototype[prop] = prototype[prop];
+ }
+ };
+
+ Util.loadScript = function Util_loadScript(src, callback) {
+ var script = document.createElement('script');
+ var loaded = false;
+ script.setAttribute('src', src);
+ if (callback) {
+ script.onload = function() {
+ if (!loaded) {
+ callback();
+ }
+ loaded = true;
+ };
+ }
+ document.getElementsByTagName('head')[0].appendChild(script);
+ };
+
+ return Util;
+})();
+
+/**
+ * PDF page viewport created based on scale, rotation and offset.
+ * @class
+ * @alias PDFJS.PageViewport
+ */
+var PageViewport = PDFJS.PageViewport = (function PageViewportClosure() {
+ /**
+ * @constructor
+ * @private
+ * @param viewBox {Array} xMin, yMin, xMax and yMax coordinates.
+ * @param scale {number} scale of the viewport.
+ * @param rotation {number} rotations of the viewport in degrees.
+ * @param offsetX {number} offset X
+ * @param offsetY {number} offset Y
+ * @param dontFlip {boolean} if true, axis Y will not be flipped.
+ */
+ function PageViewport(viewBox, scale, rotation, offsetX, offsetY, dontFlip) {
+ this.viewBox = viewBox;
+ this.scale = scale;
+ this.rotation = rotation;
+ this.offsetX = offsetX;
+ this.offsetY = offsetY;
+
+ // creating transform to convert pdf coordinate system to the normal
+ // canvas like coordinates taking in account scale and rotation
+ var centerX = (viewBox[2] + viewBox[0]) / 2;
+ var centerY = (viewBox[3] + viewBox[1]) / 2;
+ var rotateA, rotateB, rotateC, rotateD;
+ rotation = rotation % 360;
+ rotation = rotation < 0 ? rotation + 360 : rotation;
+ switch (rotation) {
+ case 180:
+ rotateA = -1; rotateB = 0; rotateC = 0; rotateD = 1;
+ break;
+ case 90:
+ rotateA = 0; rotateB = 1; rotateC = 1; rotateD = 0;
+ break;
+ case 270:
+ rotateA = 0; rotateB = -1; rotateC = -1; rotateD = 0;
+ break;
+ //case 0:
+ default:
+ rotateA = 1; rotateB = 0; rotateC = 0; rotateD = -1;
+ break;
+ }
+
+ if (dontFlip) {
+ rotateC = -rotateC; rotateD = -rotateD;
+ }
+
+ var offsetCanvasX, offsetCanvasY;
+ var width, height;
+ if (rotateA === 0) {
+ offsetCanvasX = Math.abs(centerY - viewBox[1]) * scale + offsetX;
+ offsetCanvasY = Math.abs(centerX - viewBox[0]) * scale + offsetY;
+ width = Math.abs(viewBox[3] - viewBox[1]) * scale;
+ height = Math.abs(viewBox[2] - viewBox[0]) * scale;
+ } else {
+ offsetCanvasX = Math.abs(centerX - viewBox[0]) * scale + offsetX;
+ offsetCanvasY = Math.abs(centerY - viewBox[1]) * scale + offsetY;
+ width = Math.abs(viewBox[2] - viewBox[0]) * scale;
+ height = Math.abs(viewBox[3] - viewBox[1]) * scale;
+ }
+ // creating transform for the following operations:
+ // translate(-centerX, -centerY), rotate and flip vertically,
+ // scale, and translate(offsetCanvasX, offsetCanvasY)
+ this.transform = [
+ rotateA * scale,
+ rotateB * scale,
+ rotateC * scale,
+ rotateD * scale,
+ offsetCanvasX - rotateA * scale * centerX - rotateC * scale * centerY,
+ offsetCanvasY - rotateB * scale * centerX - rotateD * scale * centerY
+ ];
+
+ this.width = width;
+ this.height = height;
+ this.fontScale = scale;
+ }
+ PageViewport.prototype = /** @lends PDFJS.PageViewport.prototype */ {
+ /**
+ * Clones viewport with additional properties.
+ * @param args {Object} (optional) If specified, may contain the 'scale' or
+ * 'rotation' properties to override the corresponding properties in
+ * the cloned viewport.
+ * @returns {PDFJS.PageViewport} Cloned viewport.
+ */
+ clone: function PageViewPort_clone(args) {
+ args = args || {};
+ var scale = 'scale' in args ? args.scale : this.scale;
+ var rotation = 'rotation' in args ? args.rotation : this.rotation;
+ return new PageViewport(this.viewBox.slice(), scale, rotation,
+ this.offsetX, this.offsetY, args.dontFlip);
+ },
+ /**
+ * Converts PDF point to the viewport coordinates. For examples, useful for
+ * converting PDF location into canvas pixel coordinates.
+ * @param x {number} X coordinate.
+ * @param y {number} Y coordinate.
+ * @returns {Object} Object that contains 'x' and 'y' properties of the
+ * point in the viewport coordinate space.
+ * @see {@link convertToPdfPoint}
+ * @see {@link convertToViewportRectangle}
+ */
+ convertToViewportPoint: function PageViewport_convertToViewportPoint(x, y) {
+ return Util.applyTransform([x, y], this.transform);
+ },
+ /**
+ * Converts PDF rectangle to the viewport coordinates.
+ * @param rect {Array} xMin, yMin, xMax and yMax coordinates.
+ * @returns {Array} Contains corresponding coordinates of the rectangle
+ * in the viewport coordinate space.
+ * @see {@link convertToViewportPoint}
+ */
+ convertToViewportRectangle:
+ function PageViewport_convertToViewportRectangle(rect) {
+ var tl = Util.applyTransform([rect[0], rect[1]], this.transform);
+ var br = Util.applyTransform([rect[2], rect[3]], this.transform);
+ return [tl[0], tl[1], br[0], br[1]];
+ },
+ /**
+ * Converts viewport coordinates to the PDF location. For examples, useful
+ * for converting canvas pixel location into PDF one.
+ * @param x {number} X coordinate.
+ * @param y {number} Y coordinate.
+ * @returns {Object} Object that contains 'x' and 'y' properties of the
+ * point in the PDF coordinate space.
+ * @see {@link convertToViewportPoint}
+ */
+ convertToPdfPoint: function PageViewport_convertToPdfPoint(x, y) {
+ return Util.applyInverseTransform([x, y], this.transform);
+ }
+ };
+ return PageViewport;
+})();
+
+var PDFStringTranslateTable = [
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0x2D8, 0x2C7, 0x2C6, 0x2D9, 0x2DD, 0x2DB, 0x2DA, 0x2DC, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2022, 0x2020, 0x2021, 0x2026, 0x2014,
+ 0x2013, 0x192, 0x2044, 0x2039, 0x203A, 0x2212, 0x2030, 0x201E, 0x201C,
+ 0x201D, 0x2018, 0x2019, 0x201A, 0x2122, 0xFB01, 0xFB02, 0x141, 0x152, 0x160,
+ 0x178, 0x17D, 0x131, 0x142, 0x153, 0x161, 0x17E, 0, 0x20AC
+];
+
+function stringToPDFString(str) {
+ var i, n = str.length, strBuf = [];
+ if (str[0] === '\xFE' && str[1] === '\xFF') {
+ // UTF16BE BOM
+ for (i = 2; i < n; i += 2) {
+ strBuf.push(String.fromCharCode(
+ (str.charCodeAt(i) << 8) | str.charCodeAt(i + 1)));
+ }
+ } else {
+ for (i = 0; i < n; ++i) {
+ var code = PDFStringTranslateTable[str.charCodeAt(i)];
+ strBuf.push(code ? String.fromCharCode(code) : str.charAt(i));
+ }
+ }
+ return strBuf.join('');
+}
+
+function stringToUTF8String(str) {
+ return decodeURIComponent(escape(str));
+}
+
+function utf8StringToString(str) {
+ return unescape(encodeURIComponent(str));
+}
+
+function isEmptyObj(obj) {
+ for (var key in obj) {
+ return false;
+ }
+ return true;
+}
+
+function isBool(v) {
+ return typeof v === 'boolean';
+}
+
+function isInt(v) {
+ return typeof v === 'number' && ((v | 0) === v);
+}
+
+function isNum(v) {
+ return typeof v === 'number';
+}
+
+function isString(v) {
+ return typeof v === 'string';
+}
+
+function isName(v) {
+ return v instanceof Name;
+}
+
+function isCmd(v, cmd) {
+ return v instanceof Cmd && (cmd === undefined || v.cmd === cmd);
+}
+
+function isDict(v, type) {
+ if (!(v instanceof Dict)) {
+ return false;
+ }
+ if (!type) {
+ return true;
+ }
+ var dictType = v.get('Type');
+ return isName(dictType) && dictType.name === type;
+}
+
+function isArray(v) {
+ return v instanceof Array;
+}
+
+function isStream(v) {
+ return typeof v === 'object' && v !== null && v.getBytes !== undefined;
+}
+
+function isArrayBuffer(v) {
+ return typeof v === 'object' && v !== null && v.byteLength !== undefined;
+}
+
+function isRef(v) {
+ return v instanceof Ref;
+}
+
+/**
+ * Promise Capability object.
+ *
+ * @typedef {Object} PromiseCapability
+ * @property {Promise} promise - A promise object.
+ * @property {function} resolve - Fullfills the promise.
+ * @property {function} reject - Rejects the promise.
+ */
+
+/**
+ * Creates a promise capability object.
+ * @alias PDFJS.createPromiseCapability
+ *
+ * @return {PromiseCapability} A capability object contains:
+ * - a Promise, resolve and reject methods.
+ */
+function createPromiseCapability() {
+ var capability = {};
+ capability.promise = new Promise(function (resolve, reject) {
+ capability.resolve = resolve;
+ capability.reject = reject;
+ });
+ return capability;
+}
+
+PDFJS.createPromiseCapability = createPromiseCapability;
+
+/**
+ * Polyfill for Promises:
+ * The following promise implementation tries to generally implement the
+ * Promise/A+ spec. Some notable differences from other promise libaries are:
+ * - There currently isn't a seperate deferred and promise object.
+ * - Unhandled rejections eventually show an error if they aren't handled.
+ *
+ * Based off of the work in:
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=810490
+ */
+(function PromiseClosure() {
+ if (globalScope.Promise) {
+ // Promises existing in the DOM/Worker, checking presence of all/resolve
+ if (typeof globalScope.Promise.all !== 'function') {
+ globalScope.Promise.all = function (iterable) {
+ var count = 0, results = [], resolve, reject;
+ var promise = new globalScope.Promise(function (resolve_, reject_) {
+ resolve = resolve_;
+ reject = reject_;
+ });
+ iterable.forEach(function (p, i) {
+ count++;
+ p.then(function (result) {
+ results[i] = result;
+ count--;
+ if (count === 0) {
+ resolve(results);
+ }
+ }, reject);
+ });
+ if (count === 0) {
+ resolve(results);
+ }
+ return promise;
+ };
+ }
+ if (typeof globalScope.Promise.resolve !== 'function') {
+ globalScope.Promise.resolve = function (value) {
+ return new globalScope.Promise(function (resolve) { resolve(value); });
+ };
+ }
+ if (typeof globalScope.Promise.reject !== 'function') {
+ globalScope.Promise.reject = function (reason) {
+ return new globalScope.Promise(function (resolve, reject) {
+ reject(reason);
+ });
+ };
+ }
+ if (typeof globalScope.Promise.prototype.catch !== 'function') {
+ globalScope.Promise.prototype.catch = function (onReject) {
+ return globalScope.Promise.prototype.then(undefined, onReject);
+ };
+ }
+ return;
+ }
+ var STATUS_PENDING = 0;
+ var STATUS_RESOLVED = 1;
+ var STATUS_REJECTED = 2;
+
+ // In an attempt to avoid silent exceptions, unhandled rejections are
+ // tracked and if they aren't handled in a certain amount of time an
+ // error is logged.
+ var REJECTION_TIMEOUT = 500;
+
+ var HandlerManager = {
+ handlers: [],
+ running: false,
+ unhandledRejections: [],
+ pendingRejectionCheck: false,
+
+ scheduleHandlers: function scheduleHandlers(promise) {
+ if (promise._status === STATUS_PENDING) {
+ return;
+ }
+
+ this.handlers = this.handlers.concat(promise._handlers);
+ promise._handlers = [];
+
+ if (this.running) {
+ return;
+ }
+ this.running = true;
+
+ setTimeout(this.runHandlers.bind(this), 0);
+ },
+
+ runHandlers: function runHandlers() {
+ var RUN_TIMEOUT = 1; // ms
+ var timeoutAt = Date.now() + RUN_TIMEOUT;
+ while (this.handlers.length > 0) {
+ var handler = this.handlers.shift();
+
+ var nextStatus = handler.thisPromise._status;
+ var nextValue = handler.thisPromise._value;
+
+ try {
+ if (nextStatus === STATUS_RESOLVED) {
+ if (typeof handler.onResolve === 'function') {
+ nextValue = handler.onResolve(nextValue);
+ }
+ } else if (typeof handler.onReject === 'function') {
+ nextValue = handler.onReject(nextValue);
+ nextStatus = STATUS_RESOLVED;
+
+ if (handler.thisPromise._unhandledRejection) {
+ this.removeUnhandeledRejection(handler.thisPromise);
+ }
+ }
+ } catch (ex) {
+ nextStatus = STATUS_REJECTED;
+ nextValue = ex;
+ }
+
+ handler.nextPromise._updateStatus(nextStatus, nextValue);
+ if (Date.now() >= timeoutAt) {
+ break;
+ }
+ }
+
+ if (this.handlers.length > 0) {
+ setTimeout(this.runHandlers.bind(this), 0);
+ return;
+ }
+
+ this.running = false;
+ },
+
+ addUnhandledRejection: function addUnhandledRejection(promise) {
+ this.unhandledRejections.push({
+ promise: promise,
+ time: Date.now()
+ });
+ this.scheduleRejectionCheck();
+ },
+
+ removeUnhandeledRejection: function removeUnhandeledRejection(promise) {
+ promise._unhandledRejection = false;
+ for (var i = 0; i < this.unhandledRejections.length; i++) {
+ if (this.unhandledRejections[i].promise === promise) {
+ this.unhandledRejections.splice(i);
+ i--;
+ }
+ }
+ },
+
+ scheduleRejectionCheck: function scheduleRejectionCheck() {
+ if (this.pendingRejectionCheck) {
+ return;
+ }
+ this.pendingRejectionCheck = true;
+ setTimeout(function rejectionCheck() {
+ this.pendingRejectionCheck = false;
+ var now = Date.now();
+ for (var i = 0; i < this.unhandledRejections.length; i++) {
+ if (now - this.unhandledRejections[i].time > REJECTION_TIMEOUT) {
+ var unhandled = this.unhandledRejections[i].promise._value;
+ var msg = 'Unhandled rejection: ' + unhandled;
+ if (unhandled.stack) {
+ msg += '\n' + unhandled.stack;
+ }
+ warn(msg);
+ this.unhandledRejections.splice(i);
+ i--;
+ }
+ }
+ if (this.unhandledRejections.length) {
+ this.scheduleRejectionCheck();
+ }
+ }.bind(this), REJECTION_TIMEOUT);
+ }
+ };
+
+ function Promise(resolver) {
+ this._status = STATUS_PENDING;
+ this._handlers = [];
+ try {
+ resolver.call(this, this._resolve.bind(this), this._reject.bind(this));
+ } catch (e) {
+ this._reject(e);
+ }
+ }
+ /**
+ * Builds a promise that is resolved when all the passed in promises are
+ * resolved.
+ * @param {array} array of data and/or promises to wait for.
+ * @return {Promise} New dependant promise.
+ */
+ Promise.all = function Promise_all(promises) {
+ var resolveAll, rejectAll;
+ var deferred = new Promise(function (resolve, reject) {
+ resolveAll = resolve;
+ rejectAll = reject;
+ });
+ var unresolved = promises.length;
+ var results = [];
+ if (unresolved === 0) {
+ resolveAll(results);
+ return deferred;
+ }
+ function reject(reason) {
+ if (deferred._status === STATUS_REJECTED) {
+ return;
+ }
+ results = [];
+ rejectAll(reason);
+ }
+ for (var i = 0, ii = promises.length; i < ii; ++i) {
+ var promise = promises[i];
+ var resolve = (function(i) {
+ return function(value) {
+ if (deferred._status === STATUS_REJECTED) {
+ return;
+ }
+ results[i] = value;
+ unresolved--;
+ if (unresolved === 0) {
+ resolveAll(results);
+ }
+ };
+ })(i);
+ if (Promise.isPromise(promise)) {
+ promise.then(resolve, reject);
+ } else {
+ resolve(promise);
+ }
+ }
+ return deferred;
+ };
+
+ /**
+ * Checks if the value is likely a promise (has a 'then' function).
+ * @return {boolean} true if value is thenable
+ */
+ Promise.isPromise = function Promise_isPromise(value) {
+ return value && typeof value.then === 'function';
+ };
+
+ /**
+ * Creates resolved promise
+ * @param value resolve value
+ * @returns {Promise}
+ */
+ Promise.resolve = function Promise_resolve(value) {
+ return new Promise(function (resolve) { resolve(value); });
+ };
+
+ /**
+ * Creates rejected promise
+ * @param reason rejection value
+ * @returns {Promise}
+ */
+ Promise.reject = function Promise_reject(reason) {
+ return new Promise(function (resolve, reject) { reject(reason); });
+ };
+
+ Promise.prototype = {
+ _status: null,
+ _value: null,
+ _handlers: null,
+ _unhandledRejection: null,
+
+ _updateStatus: function Promise__updateStatus(status, value) {
+ if (this._status === STATUS_RESOLVED ||
+ this._status === STATUS_REJECTED) {
+ return;
+ }
+
+ if (status === STATUS_RESOLVED &&
+ Promise.isPromise(value)) {
+ value.then(this._updateStatus.bind(this, STATUS_RESOLVED),
+ this._updateStatus.bind(this, STATUS_REJECTED));
+ return;
+ }
+
+ this._status = status;
+ this._value = value;
+
+ if (status === STATUS_REJECTED && this._handlers.length === 0) {
+ this._unhandledRejection = true;
+ HandlerManager.addUnhandledRejection(this);
+ }
+
+ HandlerManager.scheduleHandlers(this);
+ },
+
+ _resolve: function Promise_resolve(value) {
+ this._updateStatus(STATUS_RESOLVED, value);
+ },
+
+ _reject: function Promise_reject(reason) {
+ this._updateStatus(STATUS_REJECTED, reason);
+ },
+
+ then: function Promise_then(onResolve, onReject) {
+ var nextPromise = new Promise(function (resolve, reject) {
+ this.resolve = resolve;
+ this.reject = reject;
+ });
+ this._handlers.push({
+ thisPromise: this,
+ onResolve: onResolve,
+ onReject: onReject,
+ nextPromise: nextPromise
+ });
+ HandlerManager.scheduleHandlers(this);
+ return nextPromise;
+ },
+
+ catch: function Promise_catch(onReject) {
+ return this.then(undefined, onReject);
+ }
+ };
+
+ globalScope.Promise = Promise;
+})();
+
+var StatTimer = (function StatTimerClosure() {
+ function rpad(str, pad, length) {
+ while (str.length < length) {
+ str += pad;
+ }
+ return str;
+ }
+ function StatTimer() {
+ this.started = {};
+ this.times = [];
+ this.enabled = true;
+ }
+ StatTimer.prototype = {
+ time: function StatTimer_time(name) {
+ if (!this.enabled) {
+ return;
+ }
+ if (name in this.started) {
+ warn('Timer is already running for ' + name);
+ }
+ this.started[name] = Date.now();
+ },
+ timeEnd: function StatTimer_timeEnd(name) {
+ if (!this.enabled) {
+ return;
+ }
+ if (!(name in this.started)) {
+ warn('Timer has not been started for ' + name);
+ }
+ this.times.push({
+ 'name': name,
+ 'start': this.started[name],
+ 'end': Date.now()
+ });
+ // Remove timer from started so it can be called again.
+ delete this.started[name];
+ },
+ toString: function StatTimer_toString() {
+ var i, ii;
+ var times = this.times;
+ var out = '';
+ // Find the longest name for padding purposes.
+ var longest = 0;
+ for (i = 0, ii = times.length; i < ii; ++i) {
+ var name = times[i]['name'];
+ if (name.length > longest) {
+ longest = name.length;
+ }
+ }
+ for (i = 0, ii = times.length; i < ii; ++i) {
+ var span = times[i];
+ var duration = span.end - span.start;
+ out += rpad(span['name'], ' ', longest) + ' ' + duration + 'ms\n';
+ }
+ return out;
+ }
+ };
+ return StatTimer;
+})();
+
+PDFJS.createBlob = function createBlob(data, contentType) {
+ if (typeof Blob !== 'undefined') {
+ return new Blob([data], { type: contentType });
+ }
+ // Blob builder is deprecated in FF14 and removed in FF18.
+ var bb = new MozBlobBuilder();
+ bb.append(data);
+ return bb.getBlob(contentType);
+};
+
+PDFJS.createObjectURL = (function createObjectURLClosure() {
+ // Blob/createObjectURL is not available, falling back to data schema.
+ var digits =
+ 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+
+ return function createObjectURL(data, contentType) {
+ if (!PDFJS.disableCreateObjectURL &&
+ typeof URL !== 'undefined' && URL.createObjectURL) {
+ var blob = PDFJS.createBlob(data, contentType);
+ return URL.createObjectURL(blob);
+ }
+
+ var buffer = 'data:' + contentType + ';base64,';
+ for (var i = 0, ii = data.length; i < ii; i += 3) {
+ var b1 = data[i] & 0xFF;
+ var b2 = data[i + 1] & 0xFF;
+ var b3 = data[i + 2] & 0xFF;
+ var d1 = b1 >> 2, d2 = ((b1 & 3) << 4) | (b2 >> 4);
+ var d3 = i + 1 < ii ? ((b2 & 0xF) << 2) | (b3 >> 6) : 64;
+ var d4 = i + 2 < ii ? (b3 & 0x3F) : 64;
+ buffer += digits[d1] + digits[d2] + digits[d3] + digits[d4];
+ }
+ return buffer;
+ };
+})();
+
+function MessageHandler(name, comObj) {
+ this.name = name;
+ this.comObj = comObj;
+ this.callbackIndex = 1;
+ this.postMessageTransfers = true;
+ var callbacksCapabilities = this.callbacksCapabilities = {};
+ var ah = this.actionHandler = {};
+
+ ah['console_log'] = [function ahConsoleLog(data) {
+ console.log.apply(console, data);
+ }];
+ ah['console_error'] = [function ahConsoleError(data) {
+ console.error.apply(console, data);
+ }];
+ ah['_unsupported_feature'] = [function ah_unsupportedFeature(data) {
+ UnsupportedManager.notify(data);
+ }];
+
+ comObj.onmessage = function messageHandlerComObjOnMessage(event) {
+ var data = event.data;
+ if (data.isReply) {
+ var callbackId = data.callbackId;
+ if (data.callbackId in callbacksCapabilities) {
+ var callback = callbacksCapabilities[callbackId];
+ delete callbacksCapabilities[callbackId];
+ if ('error' in data) {
+ callback.reject(data.error);
+ } else {
+ callback.resolve(data.data);
+ }
+ } else {
+ error('Cannot resolve callback ' + callbackId);
+ }
+ } else if (data.action in ah) {
+ var action = ah[data.action];
+ if (data.callbackId) {
+ Promise.resolve().then(function () {
+ return action[0].call(action[1], data.data);
+ }).then(function (result) {
+ comObj.postMessage({
+ isReply: true,
+ callbackId: data.callbackId,
+ data: result
+ });
+ }, function (reason) {
+ comObj.postMessage({
+ isReply: true,
+ callbackId: data.callbackId,
+ error: reason
+ });
+ });
+ } else {
+ action[0].call(action[1], data.data);
+ }
+ } else {
+ error('Unknown action from worker: ' + data.action);
+ }
+ };
+}
+
+MessageHandler.prototype = {
+ on: function messageHandlerOn(actionName, handler, scope) {
+ var ah = this.actionHandler;
+ if (ah[actionName]) {
+ error('There is already an actionName called "' + actionName + '"');
+ }
+ ah[actionName] = [handler, scope];
+ },
+ /**
+ * Sends a message to the comObj to invoke the action with the supplied data.
+ * @param {String} actionName Action to call.
+ * @param {JSON} data JSON data to send.
+ * @param {Array} [transfers] Optional list of transfers/ArrayBuffers
+ */
+ send: function messageHandlerSend(actionName, data, transfers) {
+ var message = {
+ action: actionName,
+ data: data
+ };
+ this.postMessage(message, transfers);
+ },
+ /**
+ * Sends a message to the comObj to invoke the action with the supplied data.
+ * Expects that other side will callback with the response.
+ * @param {String} actionName Action to call.
+ * @param {JSON} data JSON data to send.
+ * @param {Array} [transfers] Optional list of transfers/ArrayBuffers.
+ * @returns {Promise} Promise to be resolved with response data.
+ */
+ sendWithPromise:
+ function messageHandlerSendWithPromise(actionName, data, transfers) {
+ var callbackId = this.callbackIndex++;
+ var message = {
+ action: actionName,
+ data: data,
+ callbackId: callbackId
+ };
+ var capability = createPromiseCapability();
+ this.callbacksCapabilities[callbackId] = capability;
+ try {
+ this.postMessage(message, transfers);
+ } catch (e) {
+ capability.reject(e);
+ }
+ return capability.promise;
+ },
+ /**
+ * Sends raw message to the comObj.
+ * @private
+ * @param message {Object} Raw message.
+ * @param transfers List of transfers/ArrayBuffers, or undefined.
+ */
+ postMessage: function (message, transfers) {
+ if (transfers && this.postMessageTransfers) {
+ this.comObj.postMessage(message, transfers);
+ } else {
+ this.comObj.postMessage(message);
+ }
+ }
+};
+
+function loadJpegStream(id, imageUrl, objs) {
+ var img = new Image();
+ img.onload = (function loadJpegStream_onloadClosure() {
+ objs.resolve(id, img);
+ });
+ img.onerror = (function loadJpegStream_onerrorClosure() {
+ objs.resolve(id, null);
+ warn('Error during JPEG image loading');
+ });
+ img.src = imageUrl;
+}
+
+
+/**
+ * The maximum allowed image size in total pixels e.g. width * height. Images
+ * above this value will not be drawn. Use -1 for no limit.
+ * @var {number}
+ */
+PDFJS.maxImageSize = (PDFJS.maxImageSize === undefined ?
+ -1 : PDFJS.maxImageSize);
+
+/**
+ * The url of where the predefined Adobe CMaps are located. Include trailing
+ * slash.
+ * @var {string}
+ */
+PDFJS.cMapUrl = (PDFJS.cMapUrl === undefined ? null : PDFJS.cMapUrl);
+
+/**
+ * Specifies if CMaps are binary packed.
+ * @var {boolean}
+ */
+PDFJS.cMapPacked = PDFJS.cMapPacked === undefined ? false : PDFJS.cMapPacked;
+
+/**
+ * By default fonts are converted to OpenType fonts and loaded via font face
+ * rules. If disabled, the font will be rendered using a built in font renderer
+ * that constructs the glyphs with primitive path commands.
+ * @var {boolean}
+ */
+PDFJS.disableFontFace = (PDFJS.disableFontFace === undefined ?
+ false : PDFJS.disableFontFace);
+
+/**
+ * Path for image resources, mainly for annotation icons. Include trailing
+ * slash.
+ * @var {string}
+ */
+PDFJS.imageResourcesPath = (PDFJS.imageResourcesPath === undefined ?
+ '' : PDFJS.imageResourcesPath);
+
+/**
+ * Disable the web worker and run all code on the main thread. This will happen
+ * automatically if the browser doesn't support workers or sending typed arrays
+ * to workers.
+ * @var {boolean}
+ */
+PDFJS.disableWorker = (PDFJS.disableWorker === undefined ?
+ false : PDFJS.disableWorker);
+
+/**
+ * Path and filename of the worker file. Required when the worker is enabled in
+ * development mode. If unspecified in the production build, the worker will be
+ * loaded based on the location of the pdf.js file.
+ * @var {string}
+ */
+PDFJS.workerSrc = (PDFJS.workerSrc === undefined ? null : PDFJS.workerSrc);
+
+/**
+ * Disable range request loading of PDF files. When enabled and if the server
+ * supports partial content requests then the PDF will be fetched in chunks.
+ * Enabled (false) by default.
+ * @var {boolean}
+ */
+PDFJS.disableRange = (PDFJS.disableRange === undefined ?
+ false : PDFJS.disableRange);
+
+/**
+ * Disable streaming of PDF file data. By default PDF.js attempts to load PDF
+ * in chunks. This default behavior can be disabled.
+ * @var {boolean}
+ */
+PDFJS.disableStream = (PDFJS.disableStream === undefined ?
+ false : PDFJS.disableStream);
+
+/**
+ * Disable pre-fetching of PDF file data. When range requests are enabled PDF.js
+ * will automatically keep fetching more data even if it isn't needed to display
+ * the current page. This default behavior can be disabled.
+ *
+ * NOTE: It is also necessary to disable streaming, see above,
+ * in order for disabling of pre-fetching to work correctly.
+ * @var {boolean}
+ */
+PDFJS.disableAutoFetch = (PDFJS.disableAutoFetch === undefined ?
+ false : PDFJS.disableAutoFetch);
+
+/**
+ * Enables special hooks for debugging PDF.js.
+ * @var {boolean}
+ */
+PDFJS.pdfBug = (PDFJS.pdfBug === undefined ? false : PDFJS.pdfBug);
+
+/**
+ * Enables transfer usage in postMessage for ArrayBuffers.
+ * @var {boolean}
+ */
+PDFJS.postMessageTransfers = (PDFJS.postMessageTransfers === undefined ?
+ true : PDFJS.postMessageTransfers);
+
+/**
+ * Disables URL.createObjectURL usage.
+ * @var {boolean}
+ */
+PDFJS.disableCreateObjectURL = (PDFJS.disableCreateObjectURL === undefined ?
+ false : PDFJS.disableCreateObjectURL);
+
+/**
+ * Disables WebGL usage.
+ * @var {boolean}
+ */
+PDFJS.disableWebGL = (PDFJS.disableWebGL === undefined ?
+ true : PDFJS.disableWebGL);
+
+/**
+ * Disables fullscreen support, and by extension Presentation Mode,
+ * in browsers which support the fullscreen API.
+ * @var {boolean}
+ */
+PDFJS.disableFullscreen = (PDFJS.disableFullscreen === undefined ?
+ false : PDFJS.disableFullscreen);
+
+/**
+ * Enables CSS only zooming.
+ * @var {boolean}
+ */
+PDFJS.useOnlyCssZoom = (PDFJS.useOnlyCssZoom === undefined ?
+ false : PDFJS.useOnlyCssZoom);
+
+/**
+ * Controls the logging level.
+ * The constants from PDFJS.VERBOSITY_LEVELS should be used:
+ * - errors
+ * - warnings [default]
+ * - infos
+ * @var {number}
+ */
+PDFJS.verbosity = (PDFJS.verbosity === undefined ?
+ PDFJS.VERBOSITY_LEVELS.warnings : PDFJS.verbosity);
+
+/**
+ * The maximum supported canvas size in total pixels e.g. width * height.
+ * The default value is 4096 * 4096. Use -1 for no limit.
+ * @var {number}
+ */
+PDFJS.maxCanvasPixels = (PDFJS.maxCanvasPixels === undefined ?
+ 16777216 : PDFJS.maxCanvasPixels);
+
+/**
+ * Opens external links in a new window if enabled. The default behavior opens
+ * external links in the PDF.js window.
+ * @var {boolean}
+ */
+PDFJS.openExternalLinksInNewWindow = (
+ PDFJS.openExternalLinksInNewWindow === undefined ?
+ false : PDFJS.openExternalLinksInNewWindow);
+
+/**
+ * Document initialization / loading parameters object.
+ *
+ * @typedef {Object} DocumentInitParameters
+ * @property {string} url - The URL of the PDF.
+ * @property {TypedArray|Array|string} data - Binary PDF data. Use typed arrays
+ * (Uint8Array) to improve the memory usage. If PDF data is BASE64-encoded,
+ * use atob() to convert it to a binary string first.
+ * @property {Object} httpHeaders - Basic authentication headers.
+ * @property {boolean} withCredentials - Indicates whether or not cross-site
+ * Access-Control requests should be made using credentials such as cookies
+ * or authorization headers. The default is false.
+ * @property {string} password - For decrypting password-protected PDFs.
+ * @property {TypedArray} initialData - A typed array with the first portion or
+ * all of the pdf data. Used by the extension since some data is already
+ * loaded before the switch to range requests.
+ * @property {number} length - The PDF file length. It's used for progress
+ * reports and range requests operations.
+ * @property {PDFDataRangeTransport} range
+ */
+
+/**
+ * @typedef {Object} PDFDocumentStats
+ * @property {Array} streamTypes - Used stream types in the document (an item
+ * is set to true if specific stream ID was used in the document).
+ * @property {Array} fontTypes - Used font type in the document (an item is set
+ * to true if specific font ID was used in the document).
+ */
+
+/**
+ * This is the main entry point for loading a PDF and interacting with it.
+ * NOTE: If a URL is used to fetch the PDF data a standard XMLHttpRequest(XHR)
+ * is used, which means it must follow the same origin rules that any XHR does
+ * e.g. No cross domain requests without CORS.
+ *
+ * @param {string|TypedArray|DocumentInitParameters|PDFDataRangeTransport} src
+ * Can be a url to where a PDF is located, a typed array (Uint8Array)
+ * already populated with data or parameter object.
+ *
+ * @param {PDFDataRangeTransport} pdfDataRangeTransport (deprecated) It is used
+ * if you want to manually serve range requests for data in the PDF.
+ *
+ * @param {function} passwordCallback (deprecated) It is used to request a
+ * password if wrong or no password was provided. The callback receives two
+ * parameters: function that needs to be called with new password and reason
+ * (see {PasswordResponses}).
+ *
+ * @param {function} progressCallback (deprecated) It is used to be able to
+ * monitor the loading progress of the PDF file (necessary to implement e.g.
+ * a loading bar). The callback receives an {Object} with the properties:
+ * {number} loaded and {number} total.
+ *
+ * @return {PDFDocumentLoadingTask}
+ */
+PDFJS.getDocument = function getDocument(src,
+ pdfDataRangeTransport,
+ passwordCallback,
+ progressCallback) {
+ var task = new PDFDocumentLoadingTask();
+
+ // Support of the obsolete arguments (for compatibility with API v1.0)
+ if (pdfDataRangeTransport) {
+ if (!(pdfDataRangeTransport instanceof PDFDataRangeTransport)) {
+ // Not a PDFDataRangeTransport instance, trying to add missing properties.
+ pdfDataRangeTransport = Object.create(pdfDataRangeTransport);
+ pdfDataRangeTransport.length = src.length;
+ pdfDataRangeTransport.initialData = src.initialData;
+ }
+ src = Object.create(src);
+ src.range = pdfDataRangeTransport;
+ }
+ task.onPassword = passwordCallback || null;
+ task.onProgress = progressCallback || null;
+
+ var workerInitializedCapability, transport;
+ var source;
+ if (typeof src === 'string') {
+ source = { url: src };
+ } else if (isArrayBuffer(src)) {
+ source = { data: src };
+ } else if (src instanceof PDFDataRangeTransport) {
+ source = { range: src };
+ } else {
+ if (typeof src !== 'object') {
+ error('Invalid parameter in getDocument, need either Uint8Array, ' +
+ 'string or a parameter object');
+ }
+ if (!src.url && !src.data && !src.range) {
+ error('Invalid parameter object: need either .data, .range or .url');
+ }
+
+ source = src;
+ }
+
+ var params = {};
+ for (var key in source) {
+ if (key === 'url' && typeof window !== 'undefined') {
+ // The full path is required in the 'url' field.
+ params[key] = combineUrl(window.location.href, source[key]);
+ continue;
+ } else if (key === 'range') {
+ continue;
+ } else if (key === 'data' && !(source[key] instanceof Uint8Array)) {
+ // Converting string or array-like data to Uint8Array.
+ var pdfBytes = source[key];
+ if (typeof pdfBytes === 'string') {
+ params[key] = stringToBytes(pdfBytes);
+ } else if (typeof pdfBytes === 'object' && pdfBytes !== null &&
+ !isNaN(pdfBytes.length)) {
+ params[key] = new Uint8Array(pdfBytes);
+ } else {
+ error('Invalid PDF binary data: either typed array, string or ' +
+ 'array-like object is expected in the data property.');
+ }
+ continue;
+ }
+ params[key] = source[key];
+ }
+
+ workerInitializedCapability = createPromiseCapability();
+ transport = new WorkerTransport(workerInitializedCapability, source.range);
+ workerInitializedCapability.promise.then(function transportInitialized() {
+ transport.fetchDocument(task, params);
+ });
+
+ return task;
+};
+
+/**
+ * PDF document loading operation.
+ * @class
+ */
+var PDFDocumentLoadingTask = (function PDFDocumentLoadingTaskClosure() {
+ /** @constructs PDFDocumentLoadingTask */
+ function PDFDocumentLoadingTask() {
+ this._capability = createPromiseCapability();
+
+ /**
+ * Callback to request a password if wrong or no password was provided.
+ * The callback receives two parameters: function that needs to be called
+ * with new password and reason (see {PasswordResponses}).
+ */
+ this.onPassword = null;
+
+ /**
+ * Callback to be able to monitor the loading progress of the PDF file
+ * (necessary to implement e.g. a loading bar). The callback receives
+ * an {Object} with the properties: {number} loaded and {number} total.
+ */
+ this.onProgress = null;
+ }
+
+ PDFDocumentLoadingTask.prototype =
+ /** @lends PDFDocumentLoadingTask.prototype */ {
+ /**
+ * @return {Promise}
+ */
+ get promise() {
+ return this._capability.promise;
+ },
+
+ // TODO add cancel or abort method
+
+ /**
+ * Registers callbacks to indicate the document loading completion.
+ *
+ * @param {function} onFulfilled The callback for the loading completion.
+ * @param {function} onRejected The callback for the loading failure.
+ * @return {Promise} A promise that is resolved after the onFulfilled or
+ * onRejected callback.
+ */
+ then: function PDFDocumentLoadingTask_then(onFulfilled, onRejected) {
+ return this.promise.then.apply(this.promise, arguments);
+ }
+ };
+
+ return PDFDocumentLoadingTask;
+})();
+
+/**
+ * Abstract class to support range requests file loading.
+ * @class
+ */
+var PDFDataRangeTransport = (function pdfDataRangeTransportClosure() {
+ /**
+ * @constructs PDFDataRangeTransport
+ * @param {number} length
+ * @param {Uint8Array} initialData
+ */
+ function PDFDataRangeTransport(length, initialData) {
+ this.length = length;
+ this.initialData = initialData;
+
+ this._rangeListeners = [];
+ this._progressListeners = [];
+ this._progressiveReadListeners = [];
+ this._readyCapability = createPromiseCapability();
+ }
+ PDFDataRangeTransport.prototype =
+ /** @lends PDFDataRangeTransport.prototype */ {
+ addRangeListener:
+ function PDFDataRangeTransport_addRangeListener(listener) {
+ this._rangeListeners.push(listener);
+ },
+
+ addProgressListener:
+ function PDFDataRangeTransport_addProgressListener(listener) {
+ this._progressListeners.push(listener);
+ },
+
+ addProgressiveReadListener:
+ function PDFDataRangeTransport_addProgressiveReadListener(listener) {
+ this._progressiveReadListeners.push(listener);
+ },
+
+ onDataRange: function PDFDataRangeTransport_onDataRange(begin, chunk) {
+ var listeners = this._rangeListeners;
+ for (var i = 0, n = listeners.length; i < n; ++i) {
+ listeners[i](begin, chunk);
+ }
+ },
+
+ onDataProgress: function PDFDataRangeTransport_onDataProgress(loaded) {
+ this._readyCapability.promise.then(function () {
+ var listeners = this._progressListeners;
+ for (var i = 0, n = listeners.length; i < n; ++i) {
+ listeners[i](loaded);
+ }
+ }.bind(this));
+ },
+
+ onDataProgressiveRead:
+ function PDFDataRangeTransport_onDataProgress(chunk) {
+ this._readyCapability.promise.then(function () {
+ var listeners = this._progressiveReadListeners;
+ for (var i = 0, n = listeners.length; i < n; ++i) {
+ listeners[i](chunk);
+ }
+ }.bind(this));
+ },
+
+ transportReady: function PDFDataRangeTransport_transportReady() {
+ this._readyCapability.resolve();
+ },
+
+ requestDataRange:
+ function PDFDataRangeTransport_requestDataRange(begin, end) {
+ throw new Error('Abstract method PDFDataRangeTransport.requestDataRange');
+ }
+ };
+ return PDFDataRangeTransport;
+})();
+
+PDFJS.PDFDataRangeTransport = PDFDataRangeTransport;
+
+/**
+ * Proxy to a PDFDocument in the worker thread. Also, contains commonly used
+ * properties that can be read synchronously.
+ * @class
+ */
+var PDFDocumentProxy = (function PDFDocumentProxyClosure() {
+ function PDFDocumentProxy(pdfInfo, transport) {
+ this.pdfInfo = pdfInfo;
+ this.transport = transport;
+ }
+ PDFDocumentProxy.prototype = /** @lends PDFDocumentProxy.prototype */ {
+ /**
+ * @return {number} Total number of pages the PDF contains.
+ */
+ get numPages() {
+ return this.pdfInfo.numPages;
+ },
+ /**
+ * @return {string} A unique ID to identify a PDF. Not guaranteed to be
+ * unique.
+ */
+ get fingerprint() {
+ return this.pdfInfo.fingerprint;
+ },
+ /**
+ * @param {number} pageNumber The page number to get. The first page is 1.
+ * @return {Promise} A promise that is resolved with a {@link PDFPageProxy}
+ * object.
+ */
+ getPage: function PDFDocumentProxy_getPage(pageNumber) {
+ return this.transport.getPage(pageNumber);
+ },
+ /**
+ * @param {{num: number, gen: number}} ref The page reference. Must have
+ * the 'num' and 'gen' properties.
+ * @return {Promise} A promise that is resolved with the page index that is
+ * associated with the reference.
+ */
+ getPageIndex: function PDFDocumentProxy_getPageIndex(ref) {
+ return this.transport.getPageIndex(ref);
+ },
+ /**
+ * @return {Promise} A promise that is resolved with a lookup table for
+ * mapping named destinations to reference numbers.
+ *
+ * This can be slow for large documents: use getDestination instead
+ */
+ getDestinations: function PDFDocumentProxy_getDestinations() {
+ return this.transport.getDestinations();
+ },
+ /**
+ * @param {string} id The named destination to get.
+ * @return {Promise} A promise that is resolved with all information
+ * of the given named destination.
+ */
+ getDestination: function PDFDocumentProxy_getDestination(id) {
+ return this.transport.getDestination(id);
+ },
+ /**
+ * @return {Promise} A promise that is resolved with a lookup table for
+ * mapping named attachments to their content.
+ */
+ getAttachments: function PDFDocumentProxy_getAttachments() {
+ return this.transport.getAttachments();
+ },
+ /**
+ * @return {Promise} A promise that is resolved with an array of all the
+ * JavaScript strings in the name tree.
+ */
+ getJavaScript: function PDFDocumentProxy_getJavaScript() {
+ return this.transport.getJavaScript();
+ },
+ /**
+ * @return {Promise} A promise that is resolved with an {Array} that is a
+ * tree outline (if it has one) of the PDF. The tree is in the format of:
+ * [
+ * {
+ * title: string,
+ * bold: boolean,
+ * italic: boolean,
+ * color: rgb array,
+ * dest: dest obj,
+ * items: array of more items like this
+ * },
+ * ...
+ * ].
+ */
+ getOutline: function PDFDocumentProxy_getOutline() {
+ return this.transport.getOutline();
+ },
+ /**
+ * @return {Promise} A promise that is resolved with an {Object} that has
+ * info and metadata properties. Info is an {Object} filled with anything
+ * available in the information dictionary and similarly metadata is a
+ * {Metadata} object with information from the metadata section of the PDF.
+ */
+ getMetadata: function PDFDocumentProxy_getMetadata() {
+ return this.transport.getMetadata();
+ },
+ /**
+ * @return {Promise} A promise that is resolved with a TypedArray that has
+ * the raw data from the PDF.
+ */
+ getData: function PDFDocumentProxy_getData() {
+ return this.transport.getData();
+ },
+ /**
+ * @return {Promise} A promise that is resolved when the document's data
+ * is loaded. It is resolved with an {Object} that contains the length
+ * property that indicates size of the PDF data in bytes.
+ */
+ getDownloadInfo: function PDFDocumentProxy_getDownloadInfo() {
+ return this.transport.downloadInfoCapability.promise;
+ },
+ /**
+ * @return {Promise} A promise this is resolved with current stats about
+ * document structures (see {@link PDFDocumentStats}).
+ */
+ getStats: function PDFDocumentProxy_getStats() {
+ return this.transport.getStats();
+ },
+ /**
+ * Cleans up resources allocated by the document, e.g. created @font-face.
+ */
+ cleanup: function PDFDocumentProxy_cleanup() {
+ this.transport.startCleanup();
+ },
+ /**
+ * Destroys current document instance and terminates worker.
+ */
+ destroy: function PDFDocumentProxy_destroy() {
+ this.transport.destroy();
+ }
+ };
+ return PDFDocumentProxy;
+})();
+
+/**
+ * Page text content.
+ *
+ * @typedef {Object} TextContent
+ * @property {array} items - array of {@link TextItem}
+ * @property {Object} styles - {@link TextStyles} objects, indexed by font
+ * name.
+ */
+
+/**
+ * Page text content part.
+ *
+ * @typedef {Object} TextItem
+ * @property {string} str - text content.
+ * @property {string} dir - text direction: 'ttb', 'ltr' or 'rtl'.
+ * @property {array} transform - transformation matrix.
+ * @property {number} width - width in device space.
+ * @property {number} height - height in device space.
+ * @property {string} fontName - font name used by pdf.js for converted font.
+ */
+
+/**
+ * Text style.
+ *
+ * @typedef {Object} TextStyle
+ * @property {number} ascent - font ascent.
+ * @property {number} descent - font descent.
+ * @property {boolean} vertical - text is in vertical mode.
+ * @property {string} fontFamily - possible font family
+ */
+
+/**
+ * Page render parameters.
+ *
+ * @typedef {Object} RenderParameters
+ * @property {Object} canvasContext - A 2D context of a DOM Canvas object.
+ * @property {PDFJS.PageViewport} viewport - Rendering viewport obtained by
+ * calling of PDFPage.getViewport method.
+ * @property {string} intent - Rendering intent, can be 'display' or 'print'
+ * (default value is 'display').
+ * @property {Object} imageLayer - (optional) An object that has beginLayout,
+ * endLayout and appendImage functions.
+ * @property {function} continueCallback - (deprecated) A function that will be
+ * called each time the rendering is paused. To continue
+ * rendering call the function that is the first argument
+ * to the callback.
+ */
+
+/**
+ * PDF page operator list.
+ *
+ * @typedef {Object} PDFOperatorList
+ * @property {Array} fnArray - Array containing the operator functions.
+ * @property {Array} argsArray - Array containing the arguments of the
+ * functions.
+ */
+
+/**
+ * Proxy to a PDFPage in the worker thread.
+ * @class
+ */
+var PDFPageProxy = (function PDFPageProxyClosure() {
+ function PDFPageProxy(pageIndex, pageInfo, transport) {
+ this.pageIndex = pageIndex;
+ this.pageInfo = pageInfo;
+ this.transport = transport;
+ this.stats = new StatTimer();
+ this.stats.enabled = !!globalScope.PDFJS.enableStats;
+ this.commonObjs = transport.commonObjs;
+ this.objs = new PDFObjects();
+ this.cleanupAfterRender = false;
+ this.pendingDestroy = false;
+ this.intentStates = {};
+ }
+ PDFPageProxy.prototype = /** @lends PDFPageProxy.prototype */ {
+ /**
+ * @return {number} Page number of the page. First page is 1.
+ */
+ get pageNumber() {
+ return this.pageIndex + 1;
+ },
+ /**
+ * @return {number} The number of degrees the page is rotated clockwise.
+ */
+ get rotate() {
+ return this.pageInfo.rotate;
+ },
+ /**
+ * @return {Object} The reference that points to this page. It has 'num' and
+ * 'gen' properties.
+ */
+ get ref() {
+ return this.pageInfo.ref;
+ },
+ /**
+ * @return {Array} An array of the visible portion of the PDF page in the
+ * user space units - [x1, y1, x2, y2].
+ */
+ get view() {
+ return this.pageInfo.view;
+ },
+ /**
+ * @param {number} scale The desired scale of the viewport.
+ * @param {number} rotate Degrees to rotate the viewport. If omitted this
+ * defaults to the page rotation.
+ * @return {PDFJS.PageViewport} Contains 'width' and 'height' properties
+ * along with transforms required for rendering.
+ */
+ getViewport: function PDFPageProxy_getViewport(scale, rotate) {
+ if (arguments.length < 2) {
+ rotate = this.rotate;
+ }
+ return new PDFJS.PageViewport(this.view, scale, rotate, 0, 0);
+ },
+ /**
+ * @return {Promise} A promise that is resolved with an {Array} of the
+ * annotation objects.
+ */
+ getAnnotations: function PDFPageProxy_getAnnotations() {
+ if (this.annotationsPromise) {
+ return this.annotationsPromise;
+ }
+
+ var promise = this.transport.getAnnotations(this.pageIndex);
+ this.annotationsPromise = promise;
+ return promise;
+ },
+ /**
+ * Begins the process of rendering a page to the desired context.
+ * @param {RenderParameters} params Page render parameters.
+ * @return {RenderTask} An object that contains the promise, which
+ * is resolved when the page finishes rendering.
+ */
+ render: function PDFPageProxy_render(params) {
+ var stats = this.stats;
+ stats.time('Overall');
+
+ // If there was a pending destroy cancel it so no cleanup happens during
+ // this call to render.
+ this.pendingDestroy = false;
+
+ var renderingIntent = (params.intent === 'print' ? 'print' : 'display');
+
+ if (!this.intentStates[renderingIntent]) {
+ this.intentStates[renderingIntent] = {};
+ }
+ var intentState = this.intentStates[renderingIntent];
+
+ // If there's no displayReadyCapability yet, then the operatorList
+ // was never requested before. Make the request and create the promise.
+ if (!intentState.displayReadyCapability) {
+ intentState.receivingOperatorList = true;
+ intentState.displayReadyCapability = createPromiseCapability();
+ intentState.operatorList = {
+ fnArray: [],
+ argsArray: [],
+ lastChunk: false
+ };
+
+ this.stats.time('Page Request');
+ this.transport.messageHandler.send('RenderPageRequest', {
+ pageIndex: this.pageNumber - 1,
+ intent: renderingIntent
+ });
+ }
+
+ var internalRenderTask = new InternalRenderTask(complete, params,
+ this.objs,
+ this.commonObjs,
+ intentState.operatorList,
+ this.pageNumber);
+ internalRenderTask.useRequestAnimationFrame = renderingIntent !== 'print';
+ if (!intentState.renderTasks) {
+ intentState.renderTasks = [];
+ }
+ intentState.renderTasks.push(internalRenderTask);
+ var renderTask = internalRenderTask.task;
+
+ // Obsolete parameter support
+ if (params.continueCallback) {
+ renderTask.onContinue = params.continueCallback;
+ }
+
+ var self = this;
+ intentState.displayReadyCapability.promise.then(
+ function pageDisplayReadyPromise(transparency) {
+ if (self.pendingDestroy) {
+ complete();
+ return;
+ }
+ stats.time('Rendering');
+ internalRenderTask.initalizeGraphics(transparency);
+ internalRenderTask.operatorListChanged();
+ },
+ function pageDisplayReadPromiseError(reason) {
+ complete(reason);
+ }
+ );
+
+ function complete(error) {
+ var i = intentState.renderTasks.indexOf(internalRenderTask);
+ if (i >= 0) {
+ intentState.renderTasks.splice(i, 1);
+ }
+
+ if (self.cleanupAfterRender) {
+ self.pendingDestroy = true;
+ }
+ self._tryDestroy();
+
+ if (error) {
+ internalRenderTask.capability.reject(error);
+ } else {
+ internalRenderTask.capability.resolve();
+ }
+ stats.timeEnd('Rendering');
+ stats.timeEnd('Overall');
+ }
+
+ return renderTask;
+ },
+
+ /**
+ * @return {Promise} A promise resolved with an {@link PDFOperatorList}
+ * object that represents page's operator list.
+ */
+ getOperatorList: function PDFPageProxy_getOperatorList() {
+ function operatorListChanged() {
+ if (intentState.operatorList.lastChunk) {
+ intentState.opListReadCapability.resolve(intentState.operatorList);
+ }
+ }
+
+ var renderingIntent = 'oplist';
+ if (!this.intentStates[renderingIntent]) {
+ this.intentStates[renderingIntent] = {};
+ }
+ var intentState = this.intentStates[renderingIntent];
+
+ if (!intentState.opListReadCapability) {
+ var opListTask = {};
+ opListTask.operatorListChanged = operatorListChanged;
+ intentState.receivingOperatorList = true;
+ intentState.opListReadCapability = createPromiseCapability();
+ intentState.renderTasks = [];
+ intentState.renderTasks.push(opListTask);
+ intentState.operatorList = {
+ fnArray: [],
+ argsArray: [],
+ lastChunk: false
+ };
+
+ this.transport.messageHandler.send('RenderPageRequest', {
+ pageIndex: this.pageIndex,
+ intent: renderingIntent
+ });
+ }
+ return intentState.opListReadCapability.promise;
+ },
+
+ /**
+ * @return {Promise} That is resolved a {@link TextContent}
+ * object that represent the page text content.
+ */
+ getTextContent: function PDFPageProxy_getTextContent() {
+ return this.transport.messageHandler.sendWithPromise('GetTextContent', {
+ pageIndex: this.pageNumber - 1
+ });
+ },
+ /**
+ * Destroys resources allocated by the page.
+ */
+ destroy: function PDFPageProxy_destroy() {
+ this.pendingDestroy = true;
+ this._tryDestroy();
+ },
+ /**
+ * For internal use only. Attempts to clean up if rendering is in a state
+ * where that's possible.
+ * @ignore
+ */
+ _tryDestroy: function PDFPageProxy__destroy() {
+ if (!this.pendingDestroy ||
+ Object.keys(this.intentStates).some(function(intent) {
+ var intentState = this.intentStates[intent];
+ return (intentState.renderTasks.length !== 0 ||
+ intentState.receivingOperatorList);
+ }, this)) {
+ return;
+ }
+
+ Object.keys(this.intentStates).forEach(function(intent) {
+ delete this.intentStates[intent];
+ }, this);
+ this.objs.clear();
+ this.annotationsPromise = null;
+ this.pendingDestroy = false;
+ },
+ /**
+ * For internal use only.
+ * @ignore
+ */
+ _startRenderPage: function PDFPageProxy_startRenderPage(transparency,
+ intent) {
+ var intentState = this.intentStates[intent];
+ // TODO Refactor RenderPageRequest to separate rendering
+ // and operator list logic
+ if (intentState.displayReadyCapability) {
+ intentState.displayReadyCapability.resolve(transparency);
+ }
+ },
+ /**
+ * For internal use only.
+ * @ignore
+ */
+ _renderPageChunk: function PDFPageProxy_renderPageChunk(operatorListChunk,
+ intent) {
+ var intentState = this.intentStates[intent];
+ var i, ii;
+ // Add the new chunk to the current operator list.
+ for (i = 0, ii = operatorListChunk.length; i < ii; i++) {
+ intentState.operatorList.fnArray.push(operatorListChunk.fnArray[i]);
+ intentState.operatorList.argsArray.push(
+ operatorListChunk.argsArray[i]);
+ }
+ intentState.operatorList.lastChunk = operatorListChunk.lastChunk;
+
+ // Notify all the rendering tasks there are more operators to be consumed.
+ for (i = 0; i < intentState.renderTasks.length; i++) {
+ intentState.renderTasks[i].operatorListChanged();
+ }
+
+ if (operatorListChunk.lastChunk) {
+ intentState.receivingOperatorList = false;
+ this._tryDestroy();
+ }
+ }
+ };
+ return PDFPageProxy;
+})();
+
+/**
+ * For internal use only.
+ * @ignore
+ */
+var WorkerTransport = (function WorkerTransportClosure() {
+ function WorkerTransport(workerInitializedCapability, pdfDataRangeTransport) {
+ this.pdfDataRangeTransport = pdfDataRangeTransport;
+ this.workerInitializedCapability = workerInitializedCapability;
+ this.commonObjs = new PDFObjects();
+
+ this.loadingTask = null;
+
+ this.pageCache = [];
+ this.pagePromises = [];
+ this.downloadInfoCapability = createPromiseCapability();
+
+ // If worker support isn't disabled explicit and the browser has worker
+ // support, create a new web worker and test if it/the browser fullfills
+ // all requirements to run parts of pdf.js in a web worker.
+ // Right now, the requirement is, that an Uint8Array is still an Uint8Array
+ // as it arrives on the worker. Chrome added this with version 15.
+ if (!globalScope.PDFJS.disableWorker && typeof Worker !== 'undefined') {
+ var workerSrc = PDFJS.workerSrc;
+ if (!workerSrc) {
+ error('No PDFJS.workerSrc specified');
+ }
+
+ try {
+ // Some versions of FF can't create a worker on localhost, see:
+ // https://bugzilla.mozilla.org/show_bug.cgi?id=683280
+ var worker = new Worker(workerSrc);
+ var messageHandler = new MessageHandler('main', worker);
+ this.messageHandler = messageHandler;
+
+ messageHandler.on('test', function transportTest(data) {
+ var supportTypedArray = data && data.supportTypedArray;
+ if (supportTypedArray) {
+ this.worker = worker;
+ if (!data.supportTransfers) {
+ PDFJS.postMessageTransfers = false;
+ }
+ this.setupMessageHandler(messageHandler);
+ workerInitializedCapability.resolve();
+ } else {
+ this.setupFakeWorker();
+ }
+ }.bind(this));
+
+ var testObj = new Uint8Array([PDFJS.postMessageTransfers ? 255 : 0]);
+ // Some versions of Opera throw a DATA_CLONE_ERR on serializing the
+ // typed array. Also, checking if we can use transfers.
+ try {
+ messageHandler.send('test', testObj, [testObj.buffer]);
+ } catch (ex) {
+ info('Cannot use postMessage transfers');
+ testObj[0] = 0;
+ messageHandler.send('test', testObj);
+ }
+ return;
+ } catch (e) {
+ info('The worker has been disabled.');
+ }
+ }
+ // Either workers are disabled, not supported or have thrown an exception.
+ // Thus, we fallback to a faked worker.
+ this.setupFakeWorker();
+ }
+ WorkerTransport.prototype = {
+ destroy: function WorkerTransport_destroy() {
+ this.pageCache = [];
+ this.pagePromises = [];
+ var self = this;
+ this.messageHandler.sendWithPromise('Terminate', null).then(function () {
+ FontLoader.clear();
+ if (self.worker) {
+ self.worker.terminate();
+ }
+ });
+ },
+
+ setupFakeWorker: function WorkerTransport_setupFakeWorker() {
+ globalScope.PDFJS.disableWorker = true;
+
+ if (!PDFJS.fakeWorkerFilesLoadedCapability) {
+ PDFJS.fakeWorkerFilesLoadedCapability = createPromiseCapability();
+ // In the developer build load worker_loader which in turn loads all the
+ // other files and resolves the promise. In production only the
+ // pdf.worker.js file is needed.
+ Util.loadScript(PDFJS.workerSrc, function() {
+ PDFJS.fakeWorkerFilesLoadedCapability.resolve();
+ });
+ }
+ PDFJS.fakeWorkerFilesLoadedCapability.promise.then(function () {
+ warn('Setting up fake worker.');
+ // If we don't use a worker, just post/sendMessage to the main thread.
+ var fakeWorker = {
+ postMessage: function WorkerTransport_postMessage(obj) {
+ fakeWorker.onmessage({data: obj});
+ },
+ terminate: function WorkerTransport_terminate() {}
+ };
+
+ var messageHandler = new MessageHandler('main', fakeWorker);
+ this.setupMessageHandler(messageHandler);
+
+ // If the main thread is our worker, setup the handling for the messages
+ // the main thread sends to it self.
+ PDFJS.WorkerMessageHandler.setup(messageHandler);
+
+ this.workerInitializedCapability.resolve();
+ }.bind(this));
+ },
+
+ setupMessageHandler:
+ function WorkerTransport_setupMessageHandler(messageHandler) {
+ this.messageHandler = messageHandler;
+
+ function updatePassword(password) {
+ messageHandler.send('UpdatePassword', password);
+ }
+
+ var pdfDataRangeTransport = this.pdfDataRangeTransport;
+ if (pdfDataRangeTransport) {
+ pdfDataRangeTransport.addRangeListener(function(begin, chunk) {
+ messageHandler.send('OnDataRange', {
+ begin: begin,
+ chunk: chunk
+ });
+ });
+
+ pdfDataRangeTransport.addProgressListener(function(loaded) {
+ messageHandler.send('OnDataProgress', {
+ loaded: loaded
+ });
+ });
+
+ pdfDataRangeTransport.addProgressiveReadListener(function(chunk) {
+ messageHandler.send('OnDataRange', {
+ chunk: chunk
+ });
+ });
+
+ messageHandler.on('RequestDataRange',
+ function transportDataRange(data) {
+ pdfDataRangeTransport.requestDataRange(data.begin, data.end);
+ }, this);
+ }
+
+ messageHandler.on('GetDoc', function transportDoc(data) {
+ var pdfInfo = data.pdfInfo;
+ this.numPages = data.pdfInfo.numPages;
+ var pdfDocument = new PDFDocumentProxy(pdfInfo, this);
+ this.pdfDocument = pdfDocument;
+ this.loadingTask._capability.resolve(pdfDocument);
+ }, this);
+
+ messageHandler.on('NeedPassword',
+ function transportNeedPassword(exception) {
+ var loadingTask = this.loadingTask;
+ if (loadingTask.onPassword) {
+ return loadingTask.onPassword(updatePassword,
+ PasswordResponses.NEED_PASSWORD);
+ }
+ loadingTask._capability.reject(
+ new PasswordException(exception.message, exception.code));
+ }, this);
+
+ messageHandler.on('IncorrectPassword',
+ function transportIncorrectPassword(exception) {
+ var loadingTask = this.loadingTask;
+ if (loadingTask.onPassword) {
+ return loadingTask.onPassword(updatePassword,
+ PasswordResponses.INCORRECT_PASSWORD);
+ }
+ loadingTask._capability.reject(
+ new PasswordException(exception.message, exception.code));
+ }, this);
+
+ messageHandler.on('InvalidPDF', function transportInvalidPDF(exception) {
+ this.loadingTask._capability.reject(
+ new InvalidPDFException(exception.message));
+ }, this);
+
+ messageHandler.on('MissingPDF', function transportMissingPDF(exception) {
+ this.loadingTask._capability.reject(
+ new MissingPDFException(exception.message));
+ }, this);
+
+ messageHandler.on('UnexpectedResponse',
+ function transportUnexpectedResponse(exception) {
+ this.loadingTask._capability.reject(
+ new UnexpectedResponseException(exception.message, exception.status));
+ }, this);
+
+ messageHandler.on('UnknownError',
+ function transportUnknownError(exception) {
+ this.loadingTask._capability.reject(
+ new UnknownErrorException(exception.message, exception.details));
+ }, this);
+
+ messageHandler.on('DataLoaded', function transportPage(data) {
+ this.downloadInfoCapability.resolve(data);
+ }, this);
+
+ messageHandler.on('PDFManagerReady', function transportPage(data) {
+ if (this.pdfDataRangeTransport) {
+ this.pdfDataRangeTransport.transportReady();
+ }
+ }, this);
+
+ messageHandler.on('StartRenderPage', function transportRender(data) {
+ var page = this.pageCache[data.pageIndex];
+
+ page.stats.timeEnd('Page Request');
+ page._startRenderPage(data.transparency, data.intent);
+ }, this);
+
+ messageHandler.on('RenderPageChunk', function transportRender(data) {
+ var page = this.pageCache[data.pageIndex];
+
+ page._renderPageChunk(data.operatorList, data.intent);
+ }, this);
+
+ messageHandler.on('commonobj', function transportObj(data) {
+ var id = data[0];
+ var type = data[1];
+ if (this.commonObjs.hasData(id)) {
+ return;
+ }
+
+ switch (type) {
+ case 'Font':
+ var exportedData = data[2];
+
+ var font;
+ if ('error' in exportedData) {
+ var error = exportedData.error;
+ warn('Error during font loading: ' + error);
+ this.commonObjs.resolve(id, error);
+ break;
+ } else {
+ font = new FontFaceObject(exportedData);
+ }
+
+ FontLoader.bind(
+ [font],
+ function fontReady(fontObjs) {
+ this.commonObjs.resolve(id, font);
+ }.bind(this)
+ );
+ break;
+ case 'FontPath':
+ this.commonObjs.resolve(id, data[2]);
+ break;
+ default:
+ error('Got unknown common object type ' + type);
+ }
+ }, this);
+
+ messageHandler.on('obj', function transportObj(data) {
+ var id = data[0];
+ var pageIndex = data[1];
+ var type = data[2];
+ var pageProxy = this.pageCache[pageIndex];
+ var imageData;
+ if (pageProxy.objs.hasData(id)) {
+ return;
+ }
+
+ switch (type) {
+ case 'JpegStream':
+ imageData = data[3];
+ loadJpegStream(id, imageData, pageProxy.objs);
+ break;
+ case 'Image':
+ imageData = data[3];
+ pageProxy.objs.resolve(id, imageData);
+
+ // heuristics that will allow not to store large data
+ var MAX_IMAGE_SIZE_TO_STORE = 8000000;
+ if (imageData && 'data' in imageData &&
+ imageData.data.length > MAX_IMAGE_SIZE_TO_STORE) {
+ pageProxy.cleanupAfterRender = true;
+ }
+ break;
+ default:
+ error('Got unknown object type ' + type);
+ }
+ }, this);
+
+ messageHandler.on('DocProgress', function transportDocProgress(data) {
+ var loadingTask = this.loadingTask;
+ if (loadingTask.onProgress) {
+ loadingTask.onProgress({
+ loaded: data.loaded,
+ total: data.total
+ });
+ }
+ }, this);
+
+ messageHandler.on('PageError', function transportError(data) {
+ var page = this.pageCache[data.pageNum - 1];
+ var intentState = page.intentStates[data.intent];
+ if (intentState.displayReadyCapability) {
+ intentState.displayReadyCapability.reject(data.error);
+ } else {
+ error(data.error);
+ }
+ }, this);
+
+ messageHandler.on('JpegDecode', function(data) {
+ var imageUrl = data[0];
+ var components = data[1];
+ if (components !== 3 && components !== 1) {
+ return Promise.reject(
+ new Error('Only 3 components or 1 component can be returned'));
+ }
+
+ return new Promise(function (resolve, reject) {
+ var img = new Image();
+ img.onload = function () {
+ var width = img.width;
+ var height = img.height;
+ var size = width * height;
+ var rgbaLength = size * 4;
+ var buf = new Uint8Array(size * components);
+ var tmpCanvas = createScratchCanvas(width, height);
+ var tmpCtx = tmpCanvas.getContext('2d');
+ tmpCtx.drawImage(img, 0, 0);
+ var data = tmpCtx.getImageData(0, 0, width, height).data;
+ var i, j;
+
+ if (components === 3) {
+ for (i = 0, j = 0; i < rgbaLength; i += 4, j += 3) {
+ buf[j] = data[i];
+ buf[j + 1] = data[i + 1];
+ buf[j + 2] = data[i + 2];
+ }
+ } else if (components === 1) {
+ for (i = 0, j = 0; i < rgbaLength; i += 4, j++) {
+ buf[j] = data[i];
+ }
+ }
+ resolve({ data: buf, width: width, height: height});
+ };
+ img.onerror = function () {
+ reject(new Error('JpegDecode failed to load image'));
+ };
+ img.src = imageUrl;
+ });
+ });
+ },
+
+ fetchDocument: function WorkerTransport_fetchDocument(loadingTask, source) {
+ this.loadingTask = loadingTask;
+
+ source.disableAutoFetch = PDFJS.disableAutoFetch;
+ source.disableStream = PDFJS.disableStream;
+ source.chunkedViewerLoading = !!this.pdfDataRangeTransport;
+ if (this.pdfDataRangeTransport) {
+ source.length = this.pdfDataRangeTransport.length;
+ source.initialData = this.pdfDataRangeTransport.initialData;
+ }
+ this.messageHandler.send('GetDocRequest', {
+ source: source,
+ disableRange: PDFJS.disableRange,
+ maxImageSize: PDFJS.maxImageSize,
+ cMapUrl: PDFJS.cMapUrl,
+ cMapPacked: PDFJS.cMapPacked,
+ disableFontFace: PDFJS.disableFontFace,
+ disableCreateObjectURL: PDFJS.disableCreateObjectURL,
+ verbosity: PDFJS.verbosity
+ });
+ },
+
+ getData: function WorkerTransport_getData() {
+ return this.messageHandler.sendWithPromise('GetData', null);
+ },
+
+ getPage: function WorkerTransport_getPage(pageNumber, capability) {
+ if (pageNumber <= 0 || pageNumber > this.numPages ||
+ (pageNumber|0) !== pageNumber) {
+ return Promise.reject(new Error('Invalid page request'));
+ }
+
+ var pageIndex = pageNumber - 1;
+ if (pageIndex in this.pagePromises) {
+ return this.pagePromises[pageIndex];
+ }
+ var promise = this.messageHandler.sendWithPromise('GetPage', {
+ pageIndex: pageIndex
+ }).then(function (pageInfo) {
+ var page = new PDFPageProxy(pageIndex, pageInfo, this);
+ this.pageCache[pageIndex] = page;
+ return page;
+ }.bind(this));
+ this.pagePromises[pageIndex] = promise;
+ return promise;
+ },
+
+ getPageIndex: function WorkerTransport_getPageIndexByRef(ref) {
+ return this.messageHandler.sendWithPromise('GetPageIndex', { ref: ref });
+ },
+
+ getAnnotations: function WorkerTransport_getAnnotations(pageIndex) {
+ return this.messageHandler.sendWithPromise('GetAnnotations',
+ { pageIndex: pageIndex });
+ },
+
+ getDestinations: function WorkerTransport_getDestinations() {
+ return this.messageHandler.sendWithPromise('GetDestinations', null);
+ },
+
+ getDestination: function WorkerTransport_getDestination(id) {
+ return this.messageHandler.sendWithPromise('GetDestination', { id: id } );
+ },
+
+ getAttachments: function WorkerTransport_getAttachments() {
+ return this.messageHandler.sendWithPromise('GetAttachments', null);
+ },
+
+ getJavaScript: function WorkerTransport_getJavaScript() {
+ return this.messageHandler.sendWithPromise('GetJavaScript', null);
+ },
+
+ getOutline: function WorkerTransport_getOutline() {
+ return this.messageHandler.sendWithPromise('GetOutline', null);
+ },
+
+ getMetadata: function WorkerTransport_getMetadata() {
+ return this.messageHandler.sendWithPromise('GetMetadata', null).
+ then(function transportMetadata(results) {
+ return {
+ info: results[0],
+ metadata: (results[1] ? new PDFJS.Metadata(results[1]) : null)
+ };
+ });
+ },
+
+ getStats: function WorkerTransport_getStats() {
+ return this.messageHandler.sendWithPromise('GetStats', null);
+ },
+
+ startCleanup: function WorkerTransport_startCleanup() {
+ this.messageHandler.sendWithPromise('Cleanup', null).
+ then(function endCleanup() {
+ for (var i = 0, ii = this.pageCache.length; i < ii; i++) {
+ var page = this.pageCache[i];
+ if (page) {
+ page.destroy();
+ }
+ }
+ this.commonObjs.clear();
+ FontLoader.clear();
+ }.bind(this));
+ }
+ };
+ return WorkerTransport;
+
+})();
+
+/**
+ * A PDF document and page is built of many objects. E.g. there are objects
+ * for fonts, images, rendering code and such. These objects might get processed
+ * inside of a worker. The `PDFObjects` implements some basic functions to
+ * manage these objects.
+ * @ignore
+ */
+var PDFObjects = (function PDFObjectsClosure() {
+ function PDFObjects() {
+ this.objs = {};
+ }
+
+ PDFObjects.prototype = {
+ /**
+ * Internal function.
+ * Ensures there is an object defined for `objId`.
+ */
+ ensureObj: function PDFObjects_ensureObj(objId) {
+ if (this.objs[objId]) {
+ return this.objs[objId];
+ }
+
+ var obj = {
+ capability: createPromiseCapability(),
+ data: null,
+ resolved: false
+ };
+ this.objs[objId] = obj;
+
+ return obj;
+ },
+
+ /**
+ * If called *without* callback, this returns the data of `objId` but the
+ * object needs to be resolved. If it isn't, this function throws.
+ *
+ * If called *with* a callback, the callback is called with the data of the
+ * object once the object is resolved. That means, if you call this
+ * function and the object is already resolved, the callback gets called
+ * right away.
+ */
+ get: function PDFObjects_get(objId, callback) {
+ // If there is a callback, then the get can be async and the object is
+ // not required to be resolved right now
+ if (callback) {
+ this.ensureObj(objId).capability.promise.then(callback);
+ return null;
+ }
+
+ // If there isn't a callback, the user expects to get the resolved data
+ // directly.
+ var obj = this.objs[objId];
+
+ // If there isn't an object yet or the object isn't resolved, then the
+ // data isn't ready yet!
+ if (!obj || !obj.resolved) {
+ error('Requesting object that isn\'t resolved yet ' + objId);
+ }
+
+ return obj.data;
+ },
+
+ /**
+ * Resolves the object `objId` with optional `data`.
+ */
+ resolve: function PDFObjects_resolve(objId, data) {
+ var obj = this.ensureObj(objId);
+
+ obj.resolved = true;
+ obj.data = data;
+ obj.capability.resolve(data);
+ },
+
+ isResolved: function PDFObjects_isResolved(objId) {
+ var objs = this.objs;
+
+ if (!objs[objId]) {
+ return false;
+ } else {
+ return objs[objId].resolved;
+ }
+ },
+
+ hasData: function PDFObjects_hasData(objId) {
+ return this.isResolved(objId);
+ },
+
+ /**
+ * Returns the data of `objId` if object exists, null otherwise.
+ */
+ getData: function PDFObjects_getData(objId) {
+ var objs = this.objs;
+ if (!objs[objId] || !objs[objId].resolved) {
+ return null;
+ } else {
+ return objs[objId].data;
+ }
+ },
+
+ clear: function PDFObjects_clear() {
+ this.objs = {};
+ }
+ };
+ return PDFObjects;
+})();
+
+/**
+ * Allows controlling of the rendering tasks.
+ * @class
+ */
+var RenderTask = (function RenderTaskClosure() {
+ function RenderTask(internalRenderTask) {
+ this._internalRenderTask = internalRenderTask;
+
+ /**
+ * Callback for incremental rendering -- a function that will be called
+ * each time the rendering is paused. To continue rendering call the
+ * function that is the first argument to the callback.
+ * @type {function}
+ */
+ this.onContinue = null;
+ }
+
+ RenderTask.prototype = /** @lends RenderTask.prototype */ {
+ /**
+ * Promise for rendering task completion.
+ * @return {Promise}
+ */
+ get promise() {
+ return this._internalRenderTask.capability.promise;
+ },
+
+ /**
+ * Cancels the rendering task. If the task is currently rendering it will
+ * not be cancelled until graphics pauses with a timeout. The promise that
+ * this object extends will resolved when cancelled.
+ */
+ cancel: function RenderTask_cancel() {
+ this._internalRenderTask.cancel();
+ },
+
+ /**
+ * Registers callbacks to indicate the rendering task completion.
+ *
+ * @param {function} onFulfilled The callback for the rendering completion.
+ * @param {function} onRejected The callback for the rendering failure.
+ * @return {Promise} A promise that is resolved after the onFulfilled or
+ * onRejected callback.
+ */
+ then: function RenderTask_then(onFulfilled, onRejected) {
+ return this.promise.then.apply(this.promise, arguments);
+ }
+ };
+
+ return RenderTask;
+})();
+
+/**
+ * For internal use only.
+ * @ignore
+ */
+var InternalRenderTask = (function InternalRenderTaskClosure() {
+
+ function InternalRenderTask(callback, params, objs, commonObjs, operatorList,
+ pageNumber) {
+ this.callback = callback;
+ this.params = params;
+ this.objs = objs;
+ this.commonObjs = commonObjs;
+ this.operatorListIdx = null;
+ this.operatorList = operatorList;
+ this.pageNumber = pageNumber;
+ this.running = false;
+ this.graphicsReadyCallback = null;
+ this.graphicsReady = false;
+ this.useRequestAnimationFrame = false;
+ this.cancelled = false;
+ this.capability = createPromiseCapability();
+ this.task = new RenderTask(this);
+ // caching this-bound methods
+ this._continueBound = this._continue.bind(this);
+ this._scheduleNextBound = this._scheduleNext.bind(this);
+ this._nextBound = this._next.bind(this);
+ }
+
+ InternalRenderTask.prototype = {
+
+ initalizeGraphics:
+ function InternalRenderTask_initalizeGraphics(transparency) {
+
+ if (this.cancelled) {
+ return;
+ }
+ if (PDFJS.pdfBug && 'StepperManager' in globalScope &&
+ globalScope.StepperManager.enabled) {
+ this.stepper = globalScope.StepperManager.create(this.pageNumber - 1);
+ this.stepper.init(this.operatorList);
+ this.stepper.nextBreakPoint = this.stepper.getNextBreakPoint();
+ }
+
+ var params = this.params;
+ this.gfx = new CanvasGraphics(params.canvasContext, this.commonObjs,
+ this.objs, params.imageLayer);
+
+ this.gfx.beginDrawing(params.viewport, transparency);
+ this.operatorListIdx = 0;
+ this.graphicsReady = true;
+ if (this.graphicsReadyCallback) {
+ this.graphicsReadyCallback();
+ }
+ },
+
+ cancel: function InternalRenderTask_cancel() {
+ this.running = false;
+ this.cancelled = true;
+ this.callback('cancelled');
+ },
+
+ operatorListChanged: function InternalRenderTask_operatorListChanged() {
+ if (!this.graphicsReady) {
+ if (!this.graphicsReadyCallback) {
+ this.graphicsReadyCallback = this._continueBound;
+ }
+ return;
+ }
+
+ if (this.stepper) {
+ this.stepper.updateOperatorList(this.operatorList);
+ }
+
+ if (this.running) {
+ return;
+ }
+ this._continue();
+ },
+
+ _continue: function InternalRenderTask__continue() {
+ this.running = true;
+ if (this.cancelled) {
+ return;
+ }
+ if (this.task.onContinue) {
+ this.task.onContinue.call(this.task, this._scheduleNextBound);
+ } else {
+ this._scheduleNext();
+ }
+ },
+
+ _scheduleNext: function InternalRenderTask__scheduleNext() {
+ if (this.useRequestAnimationFrame) {
+ window.requestAnimationFrame(this._nextBound);
+ } else {
+ Promise.resolve(undefined).then(this._nextBound);
+ }
+ },
+
+ _next: function InternalRenderTask__next() {
+ if (this.cancelled) {
+ return;
+ }
+ this.operatorListIdx = this.gfx.executeOperatorList(this.operatorList,
+ this.operatorListIdx,
+ this._continueBound,
+ this.stepper);
+ if (this.operatorListIdx === this.operatorList.argsArray.length) {
+ this.running = false;
+ if (this.operatorList.lastChunk) {
+ this.gfx.endDrawing();
+ this.callback();
+ }
+ }
+ }
+
+ };
+
+ return InternalRenderTask;
+})();
+
+
+var Metadata = PDFJS.Metadata = (function MetadataClosure() {
+ function fixMetadata(meta) {
+ return meta.replace(/>\\376\\377([^<]+)/g, function(all, codes) {
+ var bytes = codes.replace(/\\([0-3])([0-7])([0-7])/g,
+ function(code, d1, d2, d3) {
+ return String.fromCharCode(d1 * 64 + d2 * 8 + d3 * 1);
+ });
+ var chars = '';
+ for (var i = 0; i < bytes.length; i += 2) {
+ var code = bytes.charCodeAt(i) * 256 + bytes.charCodeAt(i + 1);
+ chars += code >= 32 && code < 127 && code !== 60 && code !== 62 &&
+ code !== 38 && false ? String.fromCharCode(code) :
+ '&#x' + (0x10000 + code).toString(16).substring(1) + ';';
+ }
+ return '>' + chars;
+ });
+ }
+
+ function Metadata(meta) {
+ if (typeof meta === 'string') {
+ // Ghostscript produces invalid metadata
+ meta = fixMetadata(meta);
+
+ var parser = new DOMParser();
+ meta = parser.parseFromString(meta, 'application/xml');
+ } else if (!(meta instanceof Document)) {
+ error('Metadata: Invalid metadata object');
+ }
+
+ this.metaDocument = meta;
+ this.metadata = {};
+ this.parse();
+ }
+
+ Metadata.prototype = {
+ parse: function Metadata_parse() {
+ var doc = this.metaDocument;
+ var rdf = doc.documentElement;
+
+ if (rdf.nodeName.toLowerCase() !== 'rdf:rdf') { // Wrapped in <xmpmeta>
+ rdf = rdf.firstChild;
+ while (rdf && rdf.nodeName.toLowerCase() !== 'rdf:rdf') {
+ rdf = rdf.nextSibling;
+ }
+ }
+
+ var nodeName = (rdf) ? rdf.nodeName.toLowerCase() : null;
+ if (!rdf || nodeName !== 'rdf:rdf' || !rdf.hasChildNodes()) {
+ return;
+ }
+
+ var children = rdf.childNodes, desc, entry, name, i, ii, length, iLength;
+ for (i = 0, length = children.length; i < length; i++) {
+ desc = children[i];
+ if (desc.nodeName.toLowerCase() !== 'rdf:description') {
+ continue;
+ }
+
+ for (ii = 0, iLength = desc.childNodes.length; ii < iLength; ii++) {
+ if (desc.childNodes[ii].nodeName.toLowerCase() !== '#text') {
+ entry = desc.childNodes[ii];
+ name = entry.nodeName.toLowerCase();
+ this.metadata[name] = entry.textContent.trim();
+ }
+ }
+ }
+ },
+
+ get: function Metadata_get(name) {
+ return this.metadata[name] || null;
+ },
+
+ has: function Metadata_has(name) {
+ return typeof this.metadata[name] !== 'undefined';
+ }
+ };
+
+ return Metadata;
+})();
+
+
+// <canvas> contexts store most of the state we need natively.
+// However, PDF needs a bit more state, which we store here.
+
+// Minimal font size that would be used during canvas fillText operations.
+var MIN_FONT_SIZE = 16;
+// Maximum font size that would be used during canvas fillText operations.
+var MAX_FONT_SIZE = 100;
+var MAX_GROUP_SIZE = 4096;
+
+// Heuristic value used when enforcing minimum line widths.
+var MIN_WIDTH_FACTOR = 0.65;
+
+var COMPILE_TYPE3_GLYPHS = true;
+var MAX_SIZE_TO_COMPILE = 1000;
+
+var FULL_CHUNK_HEIGHT = 16;
+
+function createScratchCanvas(width, height) {
+ var canvas = document.createElement('canvas');
+ canvas.width = width;
+ canvas.height = height;
+ return canvas;
+}
+
+function addContextCurrentTransform(ctx) {
+ // If the context doesn't expose a `mozCurrentTransform`, add a JS based one.
+ if (!ctx.mozCurrentTransform) {
+ ctx._originalSave = ctx.save;
+ ctx._originalRestore = ctx.restore;
+ ctx._originalRotate = ctx.rotate;
+ ctx._originalScale = ctx.scale;
+ ctx._originalTranslate = ctx.translate;
+ ctx._originalTransform = ctx.transform;
+ ctx._originalSetTransform = ctx.setTransform;
+
+ ctx._transformMatrix = ctx._transformMatrix || [1, 0, 0, 1, 0, 0];
+ ctx._transformStack = [];
+
+ Object.defineProperty(ctx, 'mozCurrentTransform', {
+ get: function getCurrentTransform() {
+ return this._transformMatrix;
+ }
+ });
+
+ Object.defineProperty(ctx, 'mozCurrentTransformInverse', {
+ get: function getCurrentTransformInverse() {
+ // Calculation done using WolframAlpha:
+ // http://www.wolframalpha.com/input/?
+ // i=Inverse+{{a%2C+c%2C+e}%2C+{b%2C+d%2C+f}%2C+{0%2C+0%2C+1}}
+
+ var m = this._transformMatrix;
+ var a = m[0], b = m[1], c = m[2], d = m[3], e = m[4], f = m[5];
+
+ var ad_bc = a * d - b * c;
+ var bc_ad = b * c - a * d;
+
+ return [
+ d / ad_bc,
+ b / bc_ad,
+ c / bc_ad,
+ a / ad_bc,
+ (d * e - c * f) / bc_ad,
+ (b * e - a * f) / ad_bc
+ ];
+ }
+ });
+
+ ctx.save = function ctxSave() {
+ var old = this._transformMatrix;
+ this._transformStack.push(old);
+ this._transformMatrix = old.slice(0, 6);
+
+ this._originalSave();
+ };
+
+ ctx.restore = function ctxRestore() {
+ var prev = this._transformStack.pop();
+ if (prev) {
+ this._transformMatrix = prev;
+ this._originalRestore();
+ }
+ };
+
+ ctx.translate = function ctxTranslate(x, y) {
+ var m = this._transformMatrix;
+ m[4] = m[0] * x + m[2] * y + m[4];
+ m[5] = m[1] * x + m[3] * y + m[5];
+
+ this._originalTranslate(x, y);
+ };
+
+ ctx.scale = function ctxScale(x, y) {
+ var m = this._transformMatrix;
+ m[0] = m[0] * x;
+ m[1] = m[1] * x;
+ m[2] = m[2] * y;
+ m[3] = m[3] * y;
+
+ this._originalScale(x, y);
+ };
+
+ ctx.transform = function ctxTransform(a, b, c, d, e, f) {
+ var m = this._transformMatrix;
+ this._transformMatrix = [
+ m[0] * a + m[2] * b,
+ m[1] * a + m[3] * b,
+ m[0] * c + m[2] * d,
+ m[1] * c + m[3] * d,
+ m[0] * e + m[2] * f + m[4],
+ m[1] * e + m[3] * f + m[5]
+ ];
+
+ ctx._originalTransform(a, b, c, d, e, f);
+ };
+
+ ctx.setTransform = function ctxSetTransform(a, b, c, d, e, f) {
+ this._transformMatrix = [a, b, c, d, e, f];
+
+ ctx._originalSetTransform(a, b, c, d, e, f);
+ };
+
+ ctx.rotate = function ctxRotate(angle) {
+ var cosValue = Math.cos(angle);
+ var sinValue = Math.sin(angle);
+
+ var m = this._transformMatrix;
+ this._transformMatrix = [
+ m[0] * cosValue + m[2] * sinValue,
+ m[1] * cosValue + m[3] * sinValue,
+ m[0] * (-sinValue) + m[2] * cosValue,
+ m[1] * (-sinValue) + m[3] * cosValue,
+ m[4],
+ m[5]
+ ];
+
+ this._originalRotate(angle);
+ };
+ }
+}
+
+var CachedCanvases = (function CachedCanvasesClosure() {
+ var cache = {};
+ return {
+ getCanvas: function CachedCanvases_getCanvas(id, width, height,
+ trackTransform) {
+ var canvasEntry;
+ if (cache[id] !== undefined) {
+ canvasEntry = cache[id];
+ canvasEntry.canvas.width = width;
+ canvasEntry.canvas.height = height;
+ // reset canvas transform for emulated mozCurrentTransform, if needed
+ canvasEntry.context.setTransform(1, 0, 0, 1, 0, 0);
+ } else {
+ var canvas = createScratchCanvas(width, height);
+ var ctx = canvas.getContext('2d');
+ if (trackTransform) {
+ addContextCurrentTransform(ctx);
+ }
+ cache[id] = canvasEntry = {canvas: canvas, context: ctx};
+ }
+ return canvasEntry;
+ },
+ clear: function () {
+ for (var id in cache) {
+ var canvasEntry = cache[id];
+ // Zeroing the width and height causes Firefox to release graphics
+ // resources immediately, which can greatly reduce memory consumption.
+ canvasEntry.canvas.width = 0;
+ canvasEntry.canvas.height = 0;
+ delete cache[id];
+ }
+ }
+ };
+})();
+
+function compileType3Glyph(imgData) {
+ var POINT_TO_PROCESS_LIMIT = 1000;
+
+ var width = imgData.width, height = imgData.height;
+ var i, j, j0, width1 = width + 1;
+ var points = new Uint8Array(width1 * (height + 1));
+ var POINT_TYPES =
+ new Uint8Array([0, 2, 4, 0, 1, 0, 5, 4, 8, 10, 0, 8, 0, 2, 1, 0]);
+
+ // decodes bit-packed mask data
+ var lineSize = (width + 7) & ~7, data0 = imgData.data;
+ var data = new Uint8Array(lineSize * height), pos = 0, ii;
+ for (i = 0, ii = data0.length; i < ii; i++) {
+ var mask = 128, elem = data0[i];
+ while (mask > 0) {
+ data[pos++] = (elem & mask) ? 0 : 255;
+ mask >>= 1;
+ }
+ }
+
+ // finding iteresting points: every point is located between mask pixels,
+ // so there will be points of the (width + 1)x(height + 1) grid. Every point
+ // will have flags assigned based on neighboring mask pixels:
+ // 4 | 8
+ // --P--
+ // 2 | 1
+ // We are interested only in points with the flags:
+ // - outside corners: 1, 2, 4, 8;
+ // - inside corners: 7, 11, 13, 14;
+ // - and, intersections: 5, 10.
+ var count = 0;
+ pos = 0;
+ if (data[pos] !== 0) {
+ points[0] = 1;
+ ++count;
+ }
+ for (j = 1; j < width; j++) {
+ if (data[pos] !== data[pos + 1]) {
+ points[j] = data[pos] ? 2 : 1;
+ ++count;
+ }
+ pos++;
+ }
+ if (data[pos] !== 0) {
+ points[j] = 2;
+ ++count;
+ }
+ for (i = 1; i < height; i++) {
+ pos = i * lineSize;
+ j0 = i * width1;
+ if (data[pos - lineSize] !== data[pos]) {
+ points[j0] = data[pos] ? 1 : 8;
+ ++count;
+ }
+ // 'sum' is the position of the current pixel configuration in the 'TYPES'
+ // array (in order 8-1-2-4, so we can use '>>2' to shift the column).
+ var sum = (data[pos] ? 4 : 0) + (data[pos - lineSize] ? 8 : 0);
+ for (j = 1; j < width; j++) {
+ sum = (sum >> 2) + (data[pos + 1] ? 4 : 0) +
+ (data[pos - lineSize + 1] ? 8 : 0);
+ if (POINT_TYPES[sum]) {
+ points[j0 + j] = POINT_TYPES[sum];
+ ++count;
+ }
+ pos++;
+ }
+ if (data[pos - lineSize] !== data[pos]) {
+ points[j0 + j] = data[pos] ? 2 : 4;
+ ++count;
+ }
+
+ if (count > POINT_TO_PROCESS_LIMIT) {
+ return null;
+ }
+ }
+
+ pos = lineSize * (height - 1);
+ j0 = i * width1;
+ if (data[pos] !== 0) {
+ points[j0] = 8;
+ ++count;
+ }
+ for (j = 1; j < width; j++) {
+ if (data[pos] !== data[pos + 1]) {
+ points[j0 + j] = data[pos] ? 4 : 8;
+ ++count;
+ }
+ pos++;
+ }
+ if (data[pos] !== 0) {
+ points[j0 + j] = 4;
+ ++count;
+ }
+ if (count > POINT_TO_PROCESS_LIMIT) {
+ return null;
+ }
+
+ // building outlines
+ var steps = new Int32Array([0, width1, -1, 0, -width1, 0, 0, 0, 1]);
+ var outlines = [];
+ for (i = 0; count && i <= height; i++) {
+ var p = i * width1;
+ var end = p + width;
+ while (p < end && !points[p]) {
+ p++;
+ }
+ if (p === end) {
+ continue;
+ }
+ var coords = [p % width1, i];
+
+ var type = points[p], p0 = p, pp;
+ do {
+ var step = steps[type];
+ do {
+ p += step;
+ } while (!points[p]);
+
+ pp = points[p];
+ if (pp !== 5 && pp !== 10) {
+ // set new direction
+ type = pp;
+ // delete mark
+ points[p] = 0;
+ } else { // type is 5 or 10, ie, a crossing
+ // set new direction
+ type = pp & ((0x33 * type) >> 4);
+ // set new type for "future hit"
+ points[p] &= (type >> 2 | type << 2);
+ }
+
+ coords.push(p % width1);
+ coords.push((p / width1) | 0);
+ --count;
+ } while (p0 !== p);
+ outlines.push(coords);
+ --i;
+ }
+
+ var drawOutline = function(c) {
+ c.save();
+ // the path shall be painted in [0..1]x[0..1] space
+ c.scale(1 / width, -1 / height);
+ c.translate(0, -height);
+ c.beginPath();
+ for (var i = 0, ii = outlines.length; i < ii; i++) {
+ var o = outlines[i];
+ c.moveTo(o[0], o[1]);
+ for (var j = 2, jj = o.length; j < jj; j += 2) {
+ c.lineTo(o[j], o[j+1]);
+ }
+ }
+ c.fill();
+ c.beginPath();
+ c.restore();
+ };
+
+ return drawOutline;
+}
+
+var CanvasExtraState = (function CanvasExtraStateClosure() {
+ function CanvasExtraState(old) {
+ // Are soft masks and alpha values shapes or opacities?
+ this.alphaIsShape = false;
+ this.fontSize = 0;
+ this.fontSizeScale = 1;
+ this.textMatrix = IDENTITY_MATRIX;
+ this.textMatrixScale = 1;
+ this.fontMatrix = FONT_IDENTITY_MATRIX;
+ this.leading = 0;
+ // Current point (in user coordinates)
+ this.x = 0;
+ this.y = 0;
+ // Start of text line (in text coordinates)
+ this.lineX = 0;
+ this.lineY = 0;
+ // Character and word spacing
+ this.charSpacing = 0;
+ this.wordSpacing = 0;
+ this.textHScale = 1;
+ this.textRenderingMode = TextRenderingMode.FILL;
+ this.textRise = 0;
+ // Default fore and background colors
+ this.fillColor = '#000000';
+ this.strokeColor = '#000000';
+ this.patternFill = false;
+ // Note: fill alpha applies to all non-stroking operations
+ this.fillAlpha = 1;
+ this.strokeAlpha = 1;
+ this.lineWidth = 1;
+ this.activeSMask = null; // nonclonable field (see the save method below)
+
+ this.old = old;
+ }
+
+ CanvasExtraState.prototype = {
+ clone: function CanvasExtraState_clone() {
+ return Object.create(this);
+ },
+ setCurrentPoint: function CanvasExtraState_setCurrentPoint(x, y) {
+ this.x = x;
+ this.y = y;
+ }
+ };
+ return CanvasExtraState;
+})();
+
+var CanvasGraphics = (function CanvasGraphicsClosure() {
+ // Defines the time the executeOperatorList is going to be executing
+ // before it stops and shedules a continue of execution.
+ var EXECUTION_TIME = 15;
+ // Defines the number of steps before checking the execution time
+ var EXECUTION_STEPS = 10;
+
+ function CanvasGraphics(canvasCtx, commonObjs, objs, imageLayer) {
+ this.ctx = canvasCtx;
+ this.current = new CanvasExtraState();
+ this.stateStack = [];
+ this.pendingClip = null;
+ this.pendingEOFill = false;
+ this.res = null;
+ this.xobjs = null;
+ this.commonObjs = commonObjs;
+ this.objs = objs;
+ this.imageLayer = imageLayer;
+ this.groupStack = [];
+ this.processingType3 = null;
+ // Patterns are painted relative to the initial page/form transform, see pdf
+ // spec 8.7.2 NOTE 1.
+ this.baseTransform = null;
+ this.baseTransformStack = [];
+ this.groupLevel = 0;
+ this.smaskStack = [];
+ this.smaskCounter = 0;
+ this.tempSMask = null;
+ if (canvasCtx) {
+ // NOTE: if mozCurrentTransform is polyfilled, then the current state of
+ // the transformation must already be set in canvasCtx._transformMatrix.
+ addContextCurrentTransform(canvasCtx);
+ }
+ this.cachedGetSinglePixelWidth = null;
+ }
+
+ function putBinaryImageData(ctx, imgData) {
+ if (typeof ImageData !== 'undefined' && imgData instanceof ImageData) {
+ ctx.putImageData(imgData, 0, 0);
+ return;
+ }
+
+ // Put the image data to the canvas in chunks, rather than putting the
+ // whole image at once. This saves JS memory, because the ImageData object
+ // is smaller. It also possibly saves C++ memory within the implementation
+ // of putImageData(). (E.g. in Firefox we make two short-lived copies of
+ // the data passed to putImageData()). |n| shouldn't be too small, however,
+ // because too many putImageData() calls will slow things down.
+ //
+ // Note: as written, if the last chunk is partial, the putImageData() call
+ // will (conceptually) put pixels past the bounds of the canvas. But
+ // that's ok; any such pixels are ignored.
+
+ var height = imgData.height, width = imgData.width;
+ var partialChunkHeight = height % FULL_CHUNK_HEIGHT;
+ var fullChunks = (height - partialChunkHeight) / FULL_CHUNK_HEIGHT;
+ var totalChunks = partialChunkHeight === 0 ? fullChunks : fullChunks + 1;
+
+ var chunkImgData = ctx.createImageData(width, FULL_CHUNK_HEIGHT);
+ var srcPos = 0, destPos;
+ var src = imgData.data;
+ var dest = chunkImgData.data;
+ var i, j, thisChunkHeight, elemsInThisChunk;
+
+ // There are multiple forms in which the pixel data can be passed, and
+ // imgData.kind tells us which one this is.
+ if (imgData.kind === ImageKind.GRAYSCALE_1BPP) {
+ // Grayscale, 1 bit per pixel (i.e. black-and-white).
+ var srcLength = src.byteLength;
+ var dest32 = PDFJS.hasCanvasTypedArrays ? new Uint32Array(dest.buffer) :
+ new Uint32ArrayView(dest);
+ var dest32DataLength = dest32.length;
+ var fullSrcDiff = (width + 7) >> 3;
+ var white = 0xFFFFFFFF;
+ var black = (PDFJS.isLittleEndian || !PDFJS.hasCanvasTypedArrays) ?
+ 0xFF000000 : 0x000000FF;
+ for (i = 0; i < totalChunks; i++) {
+ thisChunkHeight =
+ (i < fullChunks) ? FULL_CHUNK_HEIGHT : partialChunkHeight;
+ destPos = 0;
+ for (j = 0; j < thisChunkHeight; j++) {
+ var srcDiff = srcLength - srcPos;
+ var k = 0;
+ var kEnd = (srcDiff > fullSrcDiff) ? width : srcDiff * 8 - 7;
+ var kEndUnrolled = kEnd & ~7;
+ var mask = 0;
+ var srcByte = 0;
+ for (; k < kEndUnrolled; k += 8) {
+ srcByte = src[srcPos++];
+ dest32[destPos++] = (srcByte & 128) ? white : black;
+ dest32[destPos++] = (srcByte & 64) ? white : black;
+ dest32[destPos++] = (srcByte & 32) ? white : black;
+ dest32[destPos++] = (srcByte & 16) ? white : black;
+ dest32[destPos++] = (srcByte & 8) ? white : black;
+ dest32[destPos++] = (srcByte & 4) ? white : black;
+ dest32[destPos++] = (srcByte & 2) ? white : black;
+ dest32[destPos++] = (srcByte & 1) ? white : black;
+ }
+ for (; k < kEnd; k++) {
+ if (mask === 0) {
+ srcByte = src[srcPos++];
+ mask = 128;
+ }
+
+ dest32[destPos++] = (srcByte & mask) ? white : black;
+ mask >>= 1;
+ }
+ }
+ // We ran out of input. Make all remaining pixels transparent.
+ while (destPos < dest32DataLength) {
+ dest32[destPos++] = 0;
+ }
+
+ ctx.putImageData(chunkImgData, 0, i * FULL_CHUNK_HEIGHT);
+ }
+ } else if (imgData.kind === ImageKind.RGBA_32BPP) {
+ // RGBA, 32-bits per pixel.
+
+ j = 0;
+ elemsInThisChunk = width * FULL_CHUNK_HEIGHT * 4;
+ for (i = 0; i < fullChunks; i++) {
+ dest.set(src.subarray(srcPos, srcPos + elemsInThisChunk));
+ srcPos += elemsInThisChunk;
+
+ ctx.putImageData(chunkImgData, 0, j);
+ j += FULL_CHUNK_HEIGHT;
+ }
+ if (i < totalChunks) {
+ elemsInThisChunk = width * partialChunkHeight * 4;
+ dest.set(src.subarray(srcPos, srcPos + elemsInThisChunk));
+ ctx.putImageData(chunkImgData, 0, j);
+ }
+
+ } else if (imgData.kind === ImageKind.RGB_24BPP) {
+ // RGB, 24-bits per pixel.
+ thisChunkHeight = FULL_CHUNK_HEIGHT;
+ elemsInThisChunk = width * thisChunkHeight;
+ for (i = 0; i < totalChunks; i++) {
+ if (i >= fullChunks) {
+ thisChunkHeight = partialChunkHeight;
+ elemsInThisChunk = width * thisChunkHeight;
+ }
+
+ destPos = 0;
+ for (j = elemsInThisChunk; j--;) {
+ dest[destPos++] = src[srcPos++];
+ dest[destPos++] = src[srcPos++];
+ dest[destPos++] = src[srcPos++];
+ dest[destPos++] = 255;
+ }
+ ctx.putImageData(chunkImgData, 0, i * FULL_CHUNK_HEIGHT);
+ }
+ } else {
+ error('bad image kind: ' + imgData.kind);
+ }
+ }
+
+ function putBinaryImageMask(ctx, imgData) {
+ var height = imgData.height, width = imgData.width;
+ var partialChunkHeight = height % FULL_CHUNK_HEIGHT;
+ var fullChunks = (height - partialChunkHeight) / FULL_CHUNK_HEIGHT;
+ var totalChunks = partialChunkHeight === 0 ? fullChunks : fullChunks + 1;
+
+ var chunkImgData = ctx.createImageData(width, FULL_CHUNK_HEIGHT);
+ var srcPos = 0;
+ var src = imgData.data;
+ var dest = chunkImgData.data;
+
+ for (var i = 0; i < totalChunks; i++) {
+ var thisChunkHeight =
+ (i < fullChunks) ? FULL_CHUNK_HEIGHT : partialChunkHeight;
+
+ // Expand the mask so it can be used by the canvas. Any required
+ // inversion has already been handled.
+ var destPos = 3; // alpha component offset
+ for (var j = 0; j < thisChunkHeight; j++) {
+ var mask = 0;
+ for (var k = 0; k < width; k++) {
+ if (!mask) {
+ var elem = src[srcPos++];
+ mask = 128;
+ }
+ dest[destPos] = (elem & mask) ? 0 : 255;
+ destPos += 4;
+ mask >>= 1;
+ }
+ }
+ ctx.putImageData(chunkImgData, 0, i * FULL_CHUNK_HEIGHT);
+ }
+ }
+
+ function copyCtxState(sourceCtx, destCtx) {
+ var properties = ['strokeStyle', 'fillStyle', 'fillRule', 'globalAlpha',
+ 'lineWidth', 'lineCap', 'lineJoin', 'miterLimit',
+ 'globalCompositeOperation', 'font'];
+ for (var i = 0, ii = properties.length; i < ii; i++) {
+ var property = properties[i];
+ if (sourceCtx[property] !== undefined) {
+ destCtx[property] = sourceCtx[property];
+ }
+ }
+ if (sourceCtx.setLineDash !== undefined) {
+ destCtx.setLineDash(sourceCtx.getLineDash());
+ destCtx.lineDashOffset = sourceCtx.lineDashOffset;
+ } else if (sourceCtx.mozDashOffset !== undefined) {
+ destCtx.mozDash = sourceCtx.mozDash;
+ destCtx.mozDashOffset = sourceCtx.mozDashOffset;
+ }
+ }
+
+ function composeSMaskBackdrop(bytes, r0, g0, b0) {
+ var length = bytes.length;
+ for (var i = 3; i < length; i += 4) {
+ var alpha = bytes[i];
+ if (alpha === 0) {
+ bytes[i - 3] = r0;
+ bytes[i - 2] = g0;
+ bytes[i - 1] = b0;
+ } else if (alpha < 255) {
+ var alpha_ = 255 - alpha;
+ bytes[i - 3] = (bytes[i - 3] * alpha + r0 * alpha_) >> 8;
+ bytes[i - 2] = (bytes[i - 2] * alpha + g0 * alpha_) >> 8;
+ bytes[i - 1] = (bytes[i - 1] * alpha + b0 * alpha_) >> 8;
+ }
+ }
+ }
+
+ function composeSMaskAlpha(maskData, layerData) {
+ var length = maskData.length;
+ var scale = 1 / 255;
+ for (var i = 3; i < length; i += 4) {
+ var alpha = maskData[i];
+ layerData[i] = (layerData[i] * alpha * scale) | 0;
+ }
+ }
+
+ function composeSMaskLuminosity(maskData, layerData) {
+ var length = maskData.length;
+ for (var i = 3; i < length; i += 4) {
+ var y = (maskData[i - 3] * 77) + // * 0.3 / 255 * 0x10000
+ (maskData[i - 2] * 152) + // * 0.59 ....
+ (maskData[i - 1] * 28); // * 0.11 ....
+ layerData[i] = (layerData[i] * y) >> 16;
+ }
+ }
+
+ function genericComposeSMask(maskCtx, layerCtx, width, height,
+ subtype, backdrop) {
+ var hasBackdrop = !!backdrop;
+ var r0 = hasBackdrop ? backdrop[0] : 0;
+ var g0 = hasBackdrop ? backdrop[1] : 0;
+ var b0 = hasBackdrop ? backdrop[2] : 0;
+
+ var composeFn;
+ if (subtype === 'Luminosity') {
+ composeFn = composeSMaskLuminosity;
+ } else {
+ composeFn = composeSMaskAlpha;
+ }
+
+ // processing image in chunks to save memory
+ var PIXELS_TO_PROCESS = 1048576;
+ var chunkSize = Math.min(height, Math.ceil(PIXELS_TO_PROCESS / width));
+ for (var row = 0; row < height; row += chunkSize) {
+ var chunkHeight = Math.min(chunkSize, height - row);
+ var maskData = maskCtx.getImageData(0, row, width, chunkHeight);
+ var layerData = layerCtx.getImageData(0, row, width, chunkHeight);
+
+ if (hasBackdrop) {
+ composeSMaskBackdrop(maskData.data, r0, g0, b0);
+ }
+ composeFn(maskData.data, layerData.data);
+
+ maskCtx.putImageData(layerData, 0, row);
+ }
+ }
+
+ function composeSMask(ctx, smask, layerCtx) {
+ var mask = smask.canvas;
+ var maskCtx = smask.context;
+
+ ctx.setTransform(smask.scaleX, 0, 0, smask.scaleY,
+ smask.offsetX, smask.offsetY);
+
+ var backdrop = smask.backdrop || null;
+ if (WebGLUtils.isEnabled) {
+ var composed = WebGLUtils.composeSMask(layerCtx.canvas, mask,
+ {subtype: smask.subtype, backdrop: backdrop});
+ ctx.setTransform(1, 0, 0, 1, 0, 0);
+ ctx.drawImage(composed, smask.offsetX, smask.offsetY);
+ return;
+ }
+ genericComposeSMask(maskCtx, layerCtx, mask.width, mask.height,
+ smask.subtype, backdrop);
+ ctx.drawImage(mask, 0, 0);
+ }
+
+ var LINE_CAP_STYLES = ['butt', 'round', 'square'];
+ var LINE_JOIN_STYLES = ['miter', 'round', 'bevel'];
+ var NORMAL_CLIP = {};
+ var EO_CLIP = {};
+
+ CanvasGraphics.prototype = {
+
+ beginDrawing: function CanvasGraphics_beginDrawing(viewport, transparency) {
+ // For pdfs that use blend modes we have to clear the canvas else certain
+ // blend modes can look wrong since we'd be blending with a white
+ // backdrop. The problem with a transparent backdrop though is we then
+ // don't get sub pixel anti aliasing on text, so we fill with white if
+ // we can.
+ var width = this.ctx.canvas.width;
+ var height = this.ctx.canvas.height;
+ if (transparency) {
+ this.ctx.clearRect(0, 0, width, height);
+ } else {
+ this.ctx.mozOpaque = true;
+ this.ctx.save();
+ this.ctx.fillStyle = 'rgb(255, 255, 255)';
+ this.ctx.fillRect(0, 0, width, height);
+ this.ctx.restore();
+ }
+
+ var transform = viewport.transform;
+
+ this.ctx.save();
+ this.ctx.transform.apply(this.ctx, transform);
+
+ this.baseTransform = this.ctx.mozCurrentTransform.slice();
+
+ if (this.imageLayer) {
+ this.imageLayer.beginLayout();
+ }
+ },
+
+ executeOperatorList: function CanvasGraphics_executeOperatorList(
+ operatorList,
+ executionStartIdx, continueCallback,
+ stepper) {
+ var argsArray = operatorList.argsArray;
+ var fnArray = operatorList.fnArray;
+ var i = executionStartIdx || 0;
+ var argsArrayLen = argsArray.length;
+
+ // Sometimes the OperatorList to execute is empty.
+ if (argsArrayLen === i) {
+ return i;
+ }
+
+ var chunkOperations = (argsArrayLen - i > EXECUTION_STEPS &&
+ typeof continueCallback === 'function');
+ var endTime = chunkOperations ? Date.now() + EXECUTION_TIME : 0;
+ var steps = 0;
+
+ var commonObjs = this.commonObjs;
+ var objs = this.objs;
+ var fnId;
+
+ while (true) {
+ if (stepper !== undefined && i === stepper.nextBreakPoint) {
+ stepper.breakIt(i, continueCallback);
+ return i;
+ }
+
+ fnId = fnArray[i];
+
+ if (fnId !== OPS.dependency) {
+ this[fnId].apply(this, argsArray[i]);
+ } else {
+ var deps = argsArray[i];
+ for (var n = 0, nn = deps.length; n < nn; n++) {
+ var depObjId = deps[n];
+ var common = depObjId[0] === 'g' && depObjId[1] === '_';
+ var objsPool = common ? commonObjs : objs;
+
+ // If the promise isn't resolved yet, add the continueCallback
+ // to the promise and bail out.
+ if (!objsPool.isResolved(depObjId)) {
+ objsPool.get(depObjId, continueCallback);
+ return i;
+ }
+ }
+ }
+
+ i++;
+
+ // If the entire operatorList was executed, stop as were done.
+ if (i === argsArrayLen) {
+ return i;
+ }
+
+ // If the execution took longer then a certain amount of time and
+ // `continueCallback` is specified, interrupt the execution.
+ if (chunkOperations && ++steps > EXECUTION_STEPS) {
+ if (Date.now() > endTime) {
+ continueCallback();
+ return i;
+ }
+ steps = 0;
+ }
+
+ // If the operatorList isn't executed completely yet OR the execution
+ // time was short enough, do another execution round.
+ }
+ },
+
+ endDrawing: function CanvasGraphics_endDrawing() {
+ this.ctx.restore();
+ CachedCanvases.clear();
+ WebGLUtils.clear();
+
+ if (this.imageLayer) {
+ this.imageLayer.endLayout();
+ }
+ },
+
+ // Graphics state
+ setLineWidth: function CanvasGraphics_setLineWidth(width) {
+ this.current.lineWidth = width;
+ this.ctx.lineWidth = width;
+ },
+ setLineCap: function CanvasGraphics_setLineCap(style) {
+ this.ctx.lineCap = LINE_CAP_STYLES[style];
+ },
+ setLineJoin: function CanvasGraphics_setLineJoin(style) {
+ this.ctx.lineJoin = LINE_JOIN_STYLES[style];
+ },
+ setMiterLimit: function CanvasGraphics_setMiterLimit(limit) {
+ this.ctx.miterLimit = limit;
+ },
+ setDash: function CanvasGraphics_setDash(dashArray, dashPhase) {
+ var ctx = this.ctx;
+ if (ctx.setLineDash !== undefined) {
+ ctx.setLineDash(dashArray);
+ ctx.lineDashOffset = dashPhase;
+ } else {
+ ctx.mozDash = dashArray;
+ ctx.mozDashOffset = dashPhase;
+ }
+ },
+ setRenderingIntent: function CanvasGraphics_setRenderingIntent(intent) {
+ // Maybe if we one day fully support color spaces this will be important
+ // for now we can ignore.
+ // TODO set rendering intent?
+ },
+ setFlatness: function CanvasGraphics_setFlatness(flatness) {
+ // There's no way to control this with canvas, but we can safely ignore.
+ // TODO set flatness?
+ },
+ setGState: function CanvasGraphics_setGState(states) {
+ for (var i = 0, ii = states.length; i < ii; i++) {
+ var state = states[i];
+ var key = state[0];
+ var value = state[1];
+
+ switch (key) {
+ case 'LW':
+ this.setLineWidth(value);
+ break;
+ case 'LC':
+ this.setLineCap(value);
+ break;
+ case 'LJ':
+ this.setLineJoin(value);
+ break;
+ case 'ML':
+ this.setMiterLimit(value);
+ break;
+ case 'D':
+ this.setDash(value[0], value[1]);
+ break;
+ case 'RI':
+ this.setRenderingIntent(value);
+ break;
+ case 'FL':
+ this.setFlatness(value);
+ break;
+ case 'Font':
+ this.setFont(value[0], value[1]);
+ break;
+ case 'CA':
+ this.current.strokeAlpha = state[1];
+ break;
+ case 'ca':
+ this.current.fillAlpha = state[1];
+ this.ctx.globalAlpha = state[1];
+ break;
+ case 'BM':
+ if (value && value.name && (value.name !== 'Normal')) {
+ var mode = value.name.replace(/([A-Z])/g,
+ function(c) {
+ return '-' + c.toLowerCase();
+ }
+ ).substring(1);
+ this.ctx.globalCompositeOperation = mode;
+ if (this.ctx.globalCompositeOperation !== mode) {
+ warn('globalCompositeOperation "' + mode +
+ '" is not supported');
+ }
+ } else {
+ this.ctx.globalCompositeOperation = 'source-over';
+ }
+ break;
+ case 'SMask':
+ if (this.current.activeSMask) {
+ this.endSMaskGroup();
+ }
+ this.current.activeSMask = value ? this.tempSMask : null;
+ if (this.current.activeSMask) {
+ this.beginSMaskGroup();
+ }
+ this.tempSMask = null;
+ break;
+ }
+ }
+ },
+ beginSMaskGroup: function CanvasGraphics_beginSMaskGroup() {
+
+ var activeSMask = this.current.activeSMask;
+ var drawnWidth = activeSMask.canvas.width;
+ var drawnHeight = activeSMask.canvas.height;
+ var cacheId = 'smaskGroupAt' + this.groupLevel;
+ var scratchCanvas = CachedCanvases.getCanvas(
+ cacheId, drawnWidth, drawnHeight, true);
+
+ var currentCtx = this.ctx;
+ var currentTransform = currentCtx.mozCurrentTransform;
+ this.ctx.save();
+
+ var groupCtx = scratchCanvas.context;
+ groupCtx.scale(1 / activeSMask.scaleX, 1 / activeSMask.scaleY);
+ groupCtx.translate(-activeSMask.offsetX, -activeSMask.offsetY);
+ groupCtx.transform.apply(groupCtx, currentTransform);
+
+ copyCtxState(currentCtx, groupCtx);
+ this.ctx = groupCtx;
+ this.setGState([
+ ['BM', 'Normal'],
+ ['ca', 1],
+ ['CA', 1]
+ ]);
+ this.groupStack.push(currentCtx);
+ this.groupLevel++;
+ },
+ endSMaskGroup: function CanvasGraphics_endSMaskGroup() {
+ var groupCtx = this.ctx;
+ this.groupLevel--;
+ this.ctx = this.groupStack.pop();
+
+ composeSMask(this.ctx, this.current.activeSMask, groupCtx);
+ this.ctx.restore();
+ },
+ save: function CanvasGraphics_save() {
+ this.ctx.save();
+ var old = this.current;
+ this.stateStack.push(old);
+ this.current = old.clone();
+ this.current.activeSMask = null;
+ },
+ restore: function CanvasGraphics_restore() {
+ if (this.stateStack.length !== 0) {
+ if (this.current.activeSMask !== null) {
+ this.endSMaskGroup();
+ }
+
+ this.current = this.stateStack.pop();
+ this.ctx.restore();
+
+ this.cachedGetSinglePixelWidth = null;
+ }
+ },
+ transform: function CanvasGraphics_transform(a, b, c, d, e, f) {
+ this.ctx.transform(a, b, c, d, e, f);
+
+ this.cachedGetSinglePixelWidth = null;
+ },
+
+ // Path
+ constructPath: function CanvasGraphics_constructPath(ops, args) {
+ var ctx = this.ctx;
+ var current = this.current;
+ var x = current.x, y = current.y;
+ for (var i = 0, j = 0, ii = ops.length; i < ii; i++) {
+ switch (ops[i] | 0) {
+ case OPS.rectangle:
+ x = args[j++];
+ y = args[j++];
+ var width = args[j++];
+ var height = args[j++];
+ if (width === 0) {
+ width = this.getSinglePixelWidth();
+ }
+ if (height === 0) {
+ height = this.getSinglePixelWidth();
+ }
+ var xw = x + width;
+ var yh = y + height;
+ this.ctx.moveTo(x, y);
+ this.ctx.lineTo(xw, y);
+ this.ctx.lineTo(xw, yh);
+ this.ctx.lineTo(x, yh);
+ this.ctx.lineTo(x, y);
+ this.ctx.closePath();
+ break;
+ case OPS.moveTo:
+ x = args[j++];
+ y = args[j++];
+ ctx.moveTo(x, y);
+ break;
+ case OPS.lineTo:
+ x = args[j++];
+ y = args[j++];
+ ctx.lineTo(x, y);
+ break;
+ case OPS.curveTo:
+ x = args[j + 4];
+ y = args[j + 5];
+ ctx.bezierCurveTo(args[j], args[j + 1], args[j + 2], args[j + 3],
+ x, y);
+ j += 6;
+ break;
+ case OPS.curveTo2:
+ ctx.bezierCurveTo(x, y, args[j], args[j + 1],
+ args[j + 2], args[j + 3]);
+ x = args[j + 2];
+ y = args[j + 3];
+ j += 4;
+ break;
+ case OPS.curveTo3:
+ x = args[j + 2];
+ y = args[j + 3];
+ ctx.bezierCurveTo(args[j], args[j + 1], x, y, x, y);
+ j += 4;
+ break;
+ case OPS.closePath:
+ ctx.closePath();
+ break;
+ }
+ }
+ current.setCurrentPoint(x, y);
+ },
+ closePath: function CanvasGraphics_closePath() {
+ this.ctx.closePath();
+ },
+ stroke: function CanvasGraphics_stroke(consumePath) {
+ consumePath = typeof consumePath !== 'undefined' ? consumePath : true;
+ var ctx = this.ctx;
+ var strokeColor = this.current.strokeColor;
+ // Prevent drawing too thin lines by enforcing a minimum line width.
+ ctx.lineWidth = Math.max(this.getSinglePixelWidth() * MIN_WIDTH_FACTOR,
+ this.current.lineWidth);
+ // For stroke we want to temporarily change the global alpha to the
+ // stroking alpha.
+ ctx.globalAlpha = this.current.strokeAlpha;
+ if (strokeColor && strokeColor.hasOwnProperty('type') &&
+ strokeColor.type === 'Pattern') {
+ // for patterns, we transform to pattern space, calculate
+ // the pattern, call stroke, and restore to user space
+ ctx.save();
+ ctx.strokeStyle = strokeColor.getPattern(ctx, this);
+ ctx.stroke();
+ ctx.restore();
+ } else {
+ ctx.stroke();
+ }
+ if (consumePath) {
+ this.consumePath();
+ }
+ // Restore the global alpha to the fill alpha
+ ctx.globalAlpha = this.current.fillAlpha;
+ },
+ closeStroke: function CanvasGraphics_closeStroke() {
+ this.closePath();
+ this.stroke();
+ },
+ fill: function CanvasGraphics_fill(consumePath) {
+ consumePath = typeof consumePath !== 'undefined' ? consumePath : true;
+ var ctx = this.ctx;
+ var fillColor = this.current.fillColor;
+ var isPatternFill = this.current.patternFill;
+ var needRestore = false;
+
+ if (isPatternFill) {
+ ctx.save();
+ ctx.fillStyle = fillColor.getPattern(ctx, this);
+ needRestore = true;
+ }
+
+ if (this.pendingEOFill) {
+ if (ctx.mozFillRule !== undefined) {
+ ctx.mozFillRule = 'evenodd';
+ ctx.fill();
+ ctx.mozFillRule = 'nonzero';
+ } else {
+ try {
+ ctx.fill('evenodd');
+ } catch (ex) {
+ // shouldn't really happen, but browsers might think differently
+ ctx.fill();
+ }
+ }
+ this.pendingEOFill = false;
+ } else {
+ ctx.fill();
+ }
+
+ if (needRestore) {
+ ctx.restore();
+ }
+ if (consumePath) {
+ this.consumePath();
+ }
+ },
+ eoFill: function CanvasGraphics_eoFill() {
+ this.pendingEOFill = true;
+ this.fill();
+ },
+ fillStroke: function CanvasGraphics_fillStroke() {
+ this.fill(false);
+ this.stroke(false);
+
+ this.consumePath();
+ },
+ eoFillStroke: function CanvasGraphics_eoFillStroke() {
+ this.pendingEOFill = true;
+ this.fillStroke();
+ },
+ closeFillStroke: function CanvasGraphics_closeFillStroke() {
+ this.closePath();
+ this.fillStroke();
+ },
+ closeEOFillStroke: function CanvasGraphics_closeEOFillStroke() {
+ this.pendingEOFill = true;
+ this.closePath();
+ this.fillStroke();
+ },
+ endPath: function CanvasGraphics_endPath() {
+ this.consumePath();
+ },
+
+ // Clipping
+ clip: function CanvasGraphics_clip() {
+ this.pendingClip = NORMAL_CLIP;
+ },
+ eoClip: function CanvasGraphics_eoClip() {
+ this.pendingClip = EO_CLIP;
+ },
+
+ // Text
+ beginText: function CanvasGraphics_beginText() {
+ this.current.textMatrix = IDENTITY_MATRIX;
+ this.current.textMatrixScale = 1;
+ this.current.x = this.current.lineX = 0;
+ this.current.y = this.current.lineY = 0;
+ },
+ endText: function CanvasGraphics_endText() {
+ var paths = this.pendingTextPaths;
+ var ctx = this.ctx;
+ if (paths === undefined) {
+ ctx.beginPath();
+ return;
+ }
+
+ ctx.save();
+ ctx.beginPath();
+ for (var i = 0; i < paths.length; i++) {
+ var path = paths[i];
+ ctx.setTransform.apply(ctx, path.transform);
+ ctx.translate(path.x, path.y);
+ path.addToPath(ctx, path.fontSize);
+ }
+ ctx.restore();
+ ctx.clip();
+ ctx.beginPath();
+ delete this.pendingTextPaths;
+ },
+ setCharSpacing: function CanvasGraphics_setCharSpacing(spacing) {
+ this.current.charSpacing = spacing;
+ },
+ setWordSpacing: function CanvasGraphics_setWordSpacing(spacing) {
+ this.current.wordSpacing = spacing;
+ },
+ setHScale: function CanvasGraphics_setHScale(scale) {
+ this.current.textHScale = scale / 100;
+ },
+ setLeading: function CanvasGraphics_setLeading(leading) {
+ this.current.leading = -leading;
+ },
+ setFont: function CanvasGraphics_setFont(fontRefName, size) {
+ var fontObj = this.commonObjs.get(fontRefName);
+ var current = this.current;
+
+ if (!fontObj) {
+ error('Can\'t find font for ' + fontRefName);
+ }
+
+ current.fontMatrix = (fontObj.fontMatrix ?
+ fontObj.fontMatrix : FONT_IDENTITY_MATRIX);
+
+ // A valid matrix needs all main diagonal elements to be non-zero
+ // This also ensures we bypass FF bugzilla bug #719844.
+ if (current.fontMatrix[0] === 0 ||
+ current.fontMatrix[3] === 0) {
+ warn('Invalid font matrix for font ' + fontRefName);
+ }
+
+ // The spec for Tf (setFont) says that 'size' specifies the font 'scale',
+ // and in some docs this can be negative (inverted x-y axes).
+ if (size < 0) {
+ size = -size;
+ current.fontDirection = -1;
+ } else {
+ current.fontDirection = 1;
+ }
+
+ this.current.font = fontObj;
+ this.current.fontSize = size;
+
+ if (fontObj.isType3Font) {
+ return; // we don't need ctx.font for Type3 fonts
+ }
+
+ var name = fontObj.loadedName || 'sans-serif';
+ var bold = fontObj.black ? (fontObj.bold ? 'bolder' : 'bold') :
+ (fontObj.bold ? 'bold' : 'normal');
+
+ var italic = fontObj.italic ? 'italic' : 'normal';
+ var typeface = '"' + name + '", ' + fontObj.fallbackName;
+
+ // Some font backends cannot handle fonts below certain size.
+ // Keeping the font at minimal size and using the fontSizeScale to change
+ // the current transformation matrix before the fillText/strokeText.
+ // See https://bugzilla.mozilla.org/show_bug.cgi?id=726227
+ var browserFontSize = size < MIN_FONT_SIZE ? MIN_FONT_SIZE :
+ size > MAX_FONT_SIZE ? MAX_FONT_SIZE : size;
+ this.current.fontSizeScale = size / browserFontSize;
+
+ var rule = italic + ' ' + bold + ' ' + browserFontSize + 'px ' + typeface;
+ this.ctx.font = rule;
+ },
+ setTextRenderingMode: function CanvasGraphics_setTextRenderingMode(mode) {
+ this.current.textRenderingMode = mode;
+ },
+ setTextRise: function CanvasGraphics_setTextRise(rise) {
+ this.current.textRise = rise;
+ },
+ moveText: function CanvasGraphics_moveText(x, y) {
+ this.current.x = this.current.lineX += x;
+ this.current.y = this.current.lineY += y;
+ },
+ setLeadingMoveText: function CanvasGraphics_setLeadingMoveText(x, y) {
+ this.setLeading(-y);
+ this.moveText(x, y);
+ },
+ setTextMatrix: function CanvasGraphics_setTextMatrix(a, b, c, d, e, f) {
+ this.current.textMatrix = [a, b, c, d, e, f];
+ this.current.textMatrixScale = Math.sqrt(a * a + b * b);
+
+ this.current.x = this.current.lineX = 0;
+ this.current.y = this.current.lineY = 0;
+ },
+ nextLine: function CanvasGraphics_nextLine() {
+ this.moveText(0, this.current.leading);
+ },
+
+ paintChar: function CanvasGraphics_paintChar(character, x, y) {
+ var ctx = this.ctx;
+ var current = this.current;
+ var font = current.font;
+ var textRenderingMode = current.textRenderingMode;
+ var fontSize = current.fontSize / current.fontSizeScale;
+ var fillStrokeMode = textRenderingMode &
+ TextRenderingMode.FILL_STROKE_MASK;
+ var isAddToPathSet = !!(textRenderingMode &
+ TextRenderingMode.ADD_TO_PATH_FLAG);
+
+ var addToPath;
+ if (font.disableFontFace || isAddToPathSet) {
+ addToPath = font.getPathGenerator(this.commonObjs, character);
+ }
+
+ if (font.disableFontFace) {
+ ctx.save();
+ ctx.translate(x, y);
+ ctx.beginPath();
+ addToPath(ctx, fontSize);
+ if (fillStrokeMode === TextRenderingMode.FILL ||
+ fillStrokeMode === TextRenderingMode.FILL_STROKE) {
+ ctx.fill();
+ }
+ if (fillStrokeMode === TextRenderingMode.STROKE ||
+ fillStrokeMode === TextRenderingMode.FILL_STROKE) {
+ ctx.stroke();
+ }
+ ctx.restore();
+ } else {
+ if (fillStrokeMode === TextRenderingMode.FILL ||
+ fillStrokeMode === TextRenderingMode.FILL_STROKE) {
+ ctx.fillText(character, x, y);
+ }
+ if (fillStrokeMode === TextRenderingMode.STROKE ||
+ fillStrokeMode === TextRenderingMode.FILL_STROKE) {
+ ctx.strokeText(character, x, y);
+ }
+ }
+
+ if (isAddToPathSet) {
+ var paths = this.pendingTextPaths || (this.pendingTextPaths = []);
+ paths.push({
+ transform: ctx.mozCurrentTransform,
+ x: x,
+ y: y,
+ fontSize: fontSize,
+ addToPath: addToPath
+ });
+ }
+ },
+
+ get isFontSubpixelAAEnabled() {
+ // Checks if anti-aliasing is enabled when scaled text is painted.
+ // On Windows GDI scaled fonts looks bad.
+ var ctx = document.createElement('canvas').getContext('2d');
+ ctx.scale(1.5, 1);
+ ctx.fillText('I', 0, 10);
+ var data = ctx.getImageData(0, 0, 10, 10).data;
+ var enabled = false;
+ for (var i = 3; i < data.length; i += 4) {
+ if (data[i] > 0 && data[i] < 255) {
+ enabled = true;
+ break;
+ }
+ }
+ return shadow(this, 'isFontSubpixelAAEnabled', enabled);
+ },
+
+ showText: function CanvasGraphics_showText(glyphs) {
+ var current = this.current;
+ var font = current.font;
+ if (font.isType3Font) {
+ return this.showType3Text(glyphs);
+ }
+
+ var fontSize = current.fontSize;
+ if (fontSize === 0) {
+ return;
+ }
+
+ var ctx = this.ctx;
+ var fontSizeScale = current.fontSizeScale;
+ var charSpacing = current.charSpacing;
+ var wordSpacing = current.wordSpacing;
+ var fontDirection = current.fontDirection;
+ var textHScale = current.textHScale * fontDirection;
+ var glyphsLength = glyphs.length;
+ var vertical = font.vertical;
+ var defaultVMetrics = font.defaultVMetrics;
+ var widthAdvanceScale = fontSize * current.fontMatrix[0];
+
+ var simpleFillText =
+ current.textRenderingMode === TextRenderingMode.FILL &&
+ !font.disableFontFace;
+
+ ctx.save();
+ ctx.transform.apply(ctx, current.textMatrix);
+ ctx.translate(current.x, current.y + current.textRise);
+
+ if (fontDirection > 0) {
+ ctx.scale(textHScale, -1);
+ } else {
+ ctx.scale(textHScale, 1);
+ }
+
+ var lineWidth = current.lineWidth;
+ var scale = current.textMatrixScale;
+ if (scale === 0 || lineWidth === 0) {
+ var fillStrokeMode = current.textRenderingMode &
+ TextRenderingMode.FILL_STROKE_MASK;
+ if (fillStrokeMode === TextRenderingMode.STROKE ||
+ fillStrokeMode === TextRenderingMode.FILL_STROKE) {
+ this.cachedGetSinglePixelWidth = null;
+ lineWidth = this.getSinglePixelWidth() * MIN_WIDTH_FACTOR;
+ }
+ } else {
+ lineWidth /= scale;
+ }
+
+ if (fontSizeScale !== 1.0) {
+ ctx.scale(fontSizeScale, fontSizeScale);
+ lineWidth /= fontSizeScale;
+ }
+
+ ctx.lineWidth = lineWidth;
+
+ var x = 0, i;
+ for (i = 0; i < glyphsLength; ++i) {
+ var glyph = glyphs[i];
+ if (glyph === null) {
+ // word break
+ x += fontDirection * wordSpacing;
+ continue;
+ } else if (isNum(glyph)) {
+ x += -glyph * fontSize * 0.001;
+ continue;
+ }
+
+ var restoreNeeded = false;
+ var character = glyph.fontChar;
+ var accent = glyph.accent;
+ var scaledX, scaledY, scaledAccentX, scaledAccentY;
+ var width = glyph.width;
+ if (vertical) {
+ var vmetric, vx, vy;
+ vmetric = glyph.vmetric || defaultVMetrics;
+ vx = glyph.vmetric ? vmetric[1] : width * 0.5;
+ vx = -vx * widthAdvanceScale;
+ vy = vmetric[2] * widthAdvanceScale;
+
+ width = vmetric ? -vmetric[0] : width;
+ scaledX = vx / fontSizeScale;
+ scaledY = (x + vy) / fontSizeScale;
+ } else {
+ scaledX = x / fontSizeScale;
+ scaledY = 0;
+ }
+
+ if (font.remeasure && width > 0 && this.isFontSubpixelAAEnabled) {
+ // some standard fonts may not have the exact width, trying to
+ // rescale per character
+ var measuredWidth = ctx.measureText(character).width * 1000 /
+ fontSize * fontSizeScale;
+ var characterScaleX = width / measuredWidth;
+ restoreNeeded = true;
+ ctx.save();
+ ctx.scale(characterScaleX, 1);
+ scaledX /= characterScaleX;
+ }
+
+ if (simpleFillText && !accent) {
+ // common case
+ ctx.fillText(character, scaledX, scaledY);
+ } else {
+ this.paintChar(character, scaledX, scaledY);
+ if (accent) {
+ scaledAccentX = scaledX + accent.offset.x / fontSizeScale;
+ scaledAccentY = scaledY - accent.offset.y / fontSizeScale;
+ this.paintChar(accent.fontChar, scaledAccentX, scaledAccentY);
+ }
+ }
+
+ var charWidth = width * widthAdvanceScale + charSpacing * fontDirection;
+ x += charWidth;
+
+ if (restoreNeeded) {
+ ctx.restore();
+ }
+ }
+ if (vertical) {
+ current.y -= x * textHScale;
+ } else {
+ current.x += x * textHScale;
+ }
+ ctx.restore();
+ },
+
+ showType3Text: function CanvasGraphics_showType3Text(glyphs) {
+ // Type3 fonts - each glyph is a "mini-PDF"
+ var ctx = this.ctx;
+ var current = this.current;
+ var font = current.font;
+ var fontSize = current.fontSize;
+ var fontDirection = current.fontDirection;
+ var charSpacing = current.charSpacing;
+ var wordSpacing = current.wordSpacing;
+ var textHScale = current.textHScale * fontDirection;
+ var fontMatrix = current.fontMatrix || FONT_IDENTITY_MATRIX;
+ var glyphsLength = glyphs.length;
+ var isTextInvisible =
+ current.textRenderingMode === TextRenderingMode.INVISIBLE;
+ var i, glyph, width;
+
+ if (isTextInvisible || fontSize === 0) {
+ return;
+ }
+
+ ctx.save();
+ ctx.transform.apply(ctx, current.textMatrix);
+ ctx.translate(current.x, current.y);
+
+ ctx.scale(textHScale, fontDirection);
+
+ for (i = 0; i < glyphsLength; ++i) {
+ glyph = glyphs[i];
+ if (glyph === null) {
+ // word break
+ this.ctx.translate(wordSpacing, 0);
+ current.x += wordSpacing * textHScale;
+ continue;
+ } else if (isNum(glyph)) {
+ var spacingLength = -glyph * 0.001 * fontSize;
+ this.ctx.translate(spacingLength, 0);
+ current.x += spacingLength * textHScale;
+ continue;
+ }
+
+ var operatorList = font.charProcOperatorList[glyph.operatorListId];
+ if (!operatorList) {
+ warn('Type3 character \"' + glyph.operatorListId +
+ '\" is not available');
+ continue;
+ }
+ this.processingType3 = glyph;
+ this.save();
+ ctx.scale(fontSize, fontSize);
+ ctx.transform.apply(ctx, fontMatrix);
+ this.executeOperatorList(operatorList);
+ this.restore();
+
+ var transformed = Util.applyTransform([glyph.width, 0], fontMatrix);
+ width = transformed[0] * fontSize + charSpacing;
+
+ ctx.translate(width, 0);
+ current.x += width * textHScale;
+ }
+ ctx.restore();
+ this.processingType3 = null;
+ },
+
+ // Type3 fonts
+ setCharWidth: function CanvasGraphics_setCharWidth(xWidth, yWidth) {
+ // We can safely ignore this since the width should be the same
+ // as the width in the Widths array.
+ },
+ setCharWidthAndBounds: function CanvasGraphics_setCharWidthAndBounds(xWidth,
+ yWidth,
+ llx,
+ lly,
+ urx,
+ ury) {
+ // TODO According to the spec we're also suppose to ignore any operators
+ // that set color or include images while processing this type3 font.
+ this.ctx.rect(llx, lly, urx - llx, ury - lly);
+ this.clip();
+ this.endPath();
+ },
+
+ // Color
+ getColorN_Pattern: function CanvasGraphics_getColorN_Pattern(IR) {
+ var pattern;
+ if (IR[0] === 'TilingPattern') {
+ var color = IR[1];
+ pattern = new TilingPattern(IR, color, this.ctx, this.objs,
+ this.commonObjs, this.baseTransform);
+ } else {
+ pattern = getShadingPatternFromIR(IR);
+ }
+ return pattern;
+ },
+ setStrokeColorN: function CanvasGraphics_setStrokeColorN(/*...*/) {
+ this.current.strokeColor = this.getColorN_Pattern(arguments);
+ },
+ setFillColorN: function CanvasGraphics_setFillColorN(/*...*/) {
+ this.current.fillColor = this.getColorN_Pattern(arguments);
+ this.current.patternFill = true;
+ },
+ setStrokeRGBColor: function CanvasGraphics_setStrokeRGBColor(r, g, b) {
+ var color = Util.makeCssRgb(r, g, b);
+ this.ctx.strokeStyle = color;
+ this.current.strokeColor = color;
+ },
+ setFillRGBColor: function CanvasGraphics_setFillRGBColor(r, g, b) {
+ var color = Util.makeCssRgb(r, g, b);
+ this.ctx.fillStyle = color;
+ this.current.fillColor = color;
+ this.current.patternFill = false;
+ },
+
+ shadingFill: function CanvasGraphics_shadingFill(patternIR) {
+ var ctx = this.ctx;
+
+ this.save();
+ var pattern = getShadingPatternFromIR(patternIR);
+ ctx.fillStyle = pattern.getPattern(ctx, this, true);
+
+ var inv = ctx.mozCurrentTransformInverse;
+ if (inv) {
+ var canvas = ctx.canvas;
+ var width = canvas.width;
+ var height = canvas.height;
+
+ var bl = Util.applyTransform([0, 0], inv);
+ var br = Util.applyTransform([0, height], inv);
+ var ul = Util.applyTransform([width, 0], inv);
+ var ur = Util.applyTransform([width, height], inv);
+
+ var x0 = Math.min(bl[0], br[0], ul[0], ur[0]);
+ var y0 = Math.min(bl[1], br[1], ul[1], ur[1]);
+ var x1 = Math.max(bl[0], br[0], ul[0], ur[0]);
+ var y1 = Math.max(bl[1], br[1], ul[1], ur[1]);
+
+ this.ctx.fillRect(x0, y0, x1 - x0, y1 - y0);
+ } else {
+ // HACK to draw the gradient onto an infinite rectangle.
+ // PDF gradients are drawn across the entire image while
+ // Canvas only allows gradients to be drawn in a rectangle
+ // The following bug should allow us to remove this.
+ // https://bugzilla.mozilla.org/show_bug.cgi?id=664884
+
+ this.ctx.fillRect(-1e10, -1e10, 2e10, 2e10);
+ }
+
+ this.restore();
+ },
+
+ // Images
+ beginInlineImage: function CanvasGraphics_beginInlineImage() {
+ error('Should not call beginInlineImage');
+ },
+ beginImageData: function CanvasGraphics_beginImageData() {
+ error('Should not call beginImageData');
+ },
+
+ paintFormXObjectBegin: function CanvasGraphics_paintFormXObjectBegin(matrix,
+ bbox) {
+ this.save();
+ this.baseTransformStack.push(this.baseTransform);
+
+ if (isArray(matrix) && 6 === matrix.length) {
+ this.transform.apply(this, matrix);
+ }
+
+ this.baseTransform = this.ctx.mozCurrentTransform;
+
+ if (isArray(bbox) && 4 === bbox.length) {
+ var width = bbox[2] - bbox[0];
+ var height = bbox[3] - bbox[1];
+ this.ctx.rect(bbox[0], bbox[1], width, height);
+ this.clip();
+ this.endPath();
+ }
+ },
+
+ paintFormXObjectEnd: function CanvasGraphics_paintFormXObjectEnd() {
+ this.restore();
+ this.baseTransform = this.baseTransformStack.pop();
+ },
+
+ beginGroup: function CanvasGraphics_beginGroup(group) {
+ this.save();
+ var currentCtx = this.ctx;
+ // TODO non-isolated groups - according to Rik at adobe non-isolated
+ // group results aren't usually that different and they even have tools
+ // that ignore this setting. Notes from Rik on implmenting:
+ // - When you encounter an transparency group, create a new canvas with
+ // the dimensions of the bbox
+ // - copy the content from the previous canvas to the new canvas
+ // - draw as usual
+ // - remove the backdrop alpha:
+ // alphaNew = 1 - (1 - alpha)/(1 - alphaBackdrop) with 'alpha' the alpha
+ // value of your transparency group and 'alphaBackdrop' the alpha of the
+ // backdrop
+ // - remove background color:
+ // colorNew = color - alphaNew *colorBackdrop /(1 - alphaNew)
+ if (!group.isolated) {
+ info('TODO: Support non-isolated groups.');
+ }
+
+ // TODO knockout - supposedly possible with the clever use of compositing
+ // modes.
+ if (group.knockout) {
+ warn('Knockout groups not supported.');
+ }
+
+ var currentTransform = currentCtx.mozCurrentTransform;
+ if (group.matrix) {
+ currentCtx.transform.apply(currentCtx, group.matrix);
+ }
+ assert(group.bbox, 'Bounding box is required.');
+
+ // Based on the current transform figure out how big the bounding box
+ // will actually be.
+ var bounds = Util.getAxialAlignedBoundingBox(
+ group.bbox,
+ currentCtx.mozCurrentTransform);
+ // Clip the bounding box to the current canvas.
+ var canvasBounds = [0,
+ 0,
+ currentCtx.canvas.width,
+ currentCtx.canvas.height];
+ bounds = Util.intersect(bounds, canvasBounds) || [0, 0, 0, 0];
+ // Use ceil in case we're between sizes so we don't create canvas that is
+ // too small and make the canvas at least 1x1 pixels.
+ var offsetX = Math.floor(bounds[0]);
+ var offsetY = Math.floor(bounds[1]);
+ var drawnWidth = Math.max(Math.ceil(bounds[2]) - offsetX, 1);
+ var drawnHeight = Math.max(Math.ceil(bounds[3]) - offsetY, 1);
+ var scaleX = 1, scaleY = 1;
+ if (drawnWidth > MAX_GROUP_SIZE) {
+ scaleX = drawnWidth / MAX_GROUP_SIZE;
+ drawnWidth = MAX_GROUP_SIZE;
+ }
+ if (drawnHeight > MAX_GROUP_SIZE) {
+ scaleY = drawnHeight / MAX_GROUP_SIZE;
+ drawnHeight = MAX_GROUP_SIZE;
+ }
+
+ var cacheId = 'groupAt' + this.groupLevel;
+ if (group.smask) {
+ // Using two cache entries is case if masks are used one after another.
+ cacheId += '_smask_' + ((this.smaskCounter++) % 2);
+ }
+ var scratchCanvas = CachedCanvases.getCanvas(
+ cacheId, drawnWidth, drawnHeight, true);
+ var groupCtx = scratchCanvas.context;
+
+ // Since we created a new canvas that is just the size of the bounding box
+ // we have to translate the group ctx.
+ groupCtx.scale(1 / scaleX, 1 / scaleY);
+ groupCtx.translate(-offsetX, -offsetY);
+ groupCtx.transform.apply(groupCtx, currentTransform);
+
+ if (group.smask) {
+ // Saving state and cached mask to be used in setGState.
+ this.smaskStack.push({
+ canvas: scratchCanvas.canvas,
+ context: groupCtx,
+ offsetX: offsetX,
+ offsetY: offsetY,
+ scaleX: scaleX,
+ scaleY: scaleY,
+ subtype: group.smask.subtype,
+ backdrop: group.smask.backdrop
+ });
+ } else {
+ // Setup the current ctx so when the group is popped we draw it at the
+ // right location.
+ currentCtx.setTransform(1, 0, 0, 1, 0, 0);
+ currentCtx.translate(offsetX, offsetY);
+ currentCtx.scale(scaleX, scaleY);
+ }
+ // The transparency group inherits all off the current graphics state
+ // except the blend mode, soft mask, and alpha constants.
+ copyCtxState(currentCtx, groupCtx);
+ this.ctx = groupCtx;
+ this.setGState([
+ ['BM', 'Normal'],
+ ['ca', 1],
+ ['CA', 1]
+ ]);
+ this.groupStack.push(currentCtx);
+ this.groupLevel++;
+ },
+
+ endGroup: function CanvasGraphics_endGroup(group) {
+ this.groupLevel--;
+ var groupCtx = this.ctx;
+ this.ctx = this.groupStack.pop();
+ // Turn off image smoothing to avoid sub pixel interpolation which can
+ // look kind of blurry for some pdfs.
+ if (this.ctx.imageSmoothingEnabled !== undefined) {
+ this.ctx.imageSmoothingEnabled = false;
+ } else {
+ this.ctx.mozImageSmoothingEnabled = false;
+ }
+ if (group.smask) {
+ this.tempSMask = this.smaskStack.pop();
+ } else {
+ this.ctx.drawImage(groupCtx.canvas, 0, 0);
+ }
+ this.restore();
+ },
+
+ beginAnnotations: function CanvasGraphics_beginAnnotations() {
+ this.save();
+ this.current = new CanvasExtraState();
+ },
+
+ endAnnotations: function CanvasGraphics_endAnnotations() {
+ this.restore();
+ },
+
+ beginAnnotation: function CanvasGraphics_beginAnnotation(rect, transform,
+ matrix) {
+ this.save();
+
+ if (isArray(rect) && 4 === rect.length) {
+ var width = rect[2] - rect[0];
+ var height = rect[3] - rect[1];
+ this.ctx.rect(rect[0], rect[1], width, height);
+ this.clip();
+ this.endPath();
+ }
+
+ this.transform.apply(this, transform);
+ this.transform.apply(this, matrix);
+ },
+
+ endAnnotation: function CanvasGraphics_endAnnotation() {
+ this.restore();
+ },
+
+ paintJpegXObject: function CanvasGraphics_paintJpegXObject(objId, w, h) {
+ var domImage = this.objs.get(objId);
+ if (!domImage) {
+ warn('Dependent image isn\'t ready yet');
+ return;
+ }
+
+ this.save();
+
+ var ctx = this.ctx;
+ // scale the image to the unit square
+ ctx.scale(1 / w, -1 / h);
+
+ ctx.drawImage(domImage, 0, 0, domImage.width, domImage.height,
+ 0, -h, w, h);
+ if (this.imageLayer) {
+ var currentTransform = ctx.mozCurrentTransformInverse;
+ var position = this.getCanvasPosition(0, 0);
+ this.imageLayer.appendImage({
+ objId: objId,
+ left: position[0],
+ top: position[1],
+ width: w / currentTransform[0],
+ height: h / currentTransform[3]
+ });
+ }
+ this.restore();
+ },
+
+ paintImageMaskXObject: function CanvasGraphics_paintImageMaskXObject(img) {
+ var ctx = this.ctx;
+ var width = img.width, height = img.height;
+ var fillColor = this.current.fillColor;
+ var isPatternFill = this.current.patternFill;
+
+ var glyph = this.processingType3;
+
+ if (COMPILE_TYPE3_GLYPHS && glyph && glyph.compiled === undefined) {
+ if (width <= MAX_SIZE_TO_COMPILE && height <= MAX_SIZE_TO_COMPILE) {
+ glyph.compiled =
+ compileType3Glyph({data: img.data, width: width, height: height});
+ } else {
+ glyph.compiled = null;
+ }
+ }
+
+ if (glyph && glyph.compiled) {
+ glyph.compiled(ctx);
+ return;
+ }
+
+ var maskCanvas = CachedCanvases.getCanvas('maskCanvas', width, height);
+ var maskCtx = maskCanvas.context;
+ maskCtx.save();
+
+ putBinaryImageMask(maskCtx, img);
+
+ maskCtx.globalCompositeOperation = 'source-in';
+
+ maskCtx.fillStyle = isPatternFill ?
+ fillColor.getPattern(maskCtx, this) : fillColor;
+ maskCtx.fillRect(0, 0, width, height);
+
+ maskCtx.restore();
+
+ this.paintInlineImageXObject(maskCanvas.canvas);
+ },
+
+ paintImageMaskXObjectRepeat:
+ function CanvasGraphics_paintImageMaskXObjectRepeat(imgData, scaleX,
+ scaleY, positions) {
+ var width = imgData.width;
+ var height = imgData.height;
+ var fillColor = this.current.fillColor;
+ var isPatternFill = this.current.patternFill;
+
+ var maskCanvas = CachedCanvases.getCanvas('maskCanvas', width, height);
+ var maskCtx = maskCanvas.context;
+ maskCtx.save();
+
+ putBinaryImageMask(maskCtx, imgData);
+
+ maskCtx.globalCompositeOperation = 'source-in';
+
+ maskCtx.fillStyle = isPatternFill ?
+ fillColor.getPattern(maskCtx, this) : fillColor;
+ maskCtx.fillRect(0, 0, width, height);
+
+ maskCtx.restore();
+
+ var ctx = this.ctx;
+ for (var i = 0, ii = positions.length; i < ii; i += 2) {
+ ctx.save();
+ ctx.transform(scaleX, 0, 0, scaleY, positions[i], positions[i + 1]);
+ ctx.scale(1, -1);
+ ctx.drawImage(maskCanvas.canvas, 0, 0, width, height,
+ 0, -1, 1, 1);
+ ctx.restore();
+ }
+ },
+
+ paintImageMaskXObjectGroup:
+ function CanvasGraphics_paintImageMaskXObjectGroup(images) {
+ var ctx = this.ctx;
+
+ var fillColor = this.current.fillColor;
+ var isPatternFill = this.current.patternFill;
+ for (var i = 0, ii = images.length; i < ii; i++) {
+ var image = images[i];
+ var width = image.width, height = image.height;
+
+ var maskCanvas = CachedCanvases.getCanvas('maskCanvas', width, height);
+ var maskCtx = maskCanvas.context;
+ maskCtx.save();
+
+ putBinaryImageMask(maskCtx, image);
+
+ maskCtx.globalCompositeOperation = 'source-in';
+
+ maskCtx.fillStyle = isPatternFill ?
+ fillColor.getPattern(maskCtx, this) : fillColor;
+ maskCtx.fillRect(0, 0, width, height);
+
+ maskCtx.restore();
+
+ ctx.save();
+ ctx.transform.apply(ctx, image.transform);
+ ctx.scale(1, -1);
+ ctx.drawImage(maskCanvas.canvas, 0, 0, width, height,
+ 0, -1, 1, 1);
+ ctx.restore();
+ }
+ },
+
+ paintImageXObject: function CanvasGraphics_paintImageXObject(objId) {
+ var imgData = this.objs.get(objId);
+ if (!imgData) {
+ warn('Dependent image isn\'t ready yet');
+ return;
+ }
+
+ this.paintInlineImageXObject(imgData);
+ },
+
+ paintImageXObjectRepeat:
+ function CanvasGraphics_paintImageXObjectRepeat(objId, scaleX, scaleY,
+ positions) {
+ var imgData = this.objs.get(objId);
+ if (!imgData) {
+ warn('Dependent image isn\'t ready yet');
+ return;
+ }
+
+ var width = imgData.width;
+ var height = imgData.height;
+ var map = [];
+ for (var i = 0, ii = positions.length; i < ii; i += 2) {
+ map.push({transform: [scaleX, 0, 0, scaleY, positions[i],
+ positions[i + 1]], x: 0, y: 0, w: width, h: height});
+ }
+ this.paintInlineImageXObjectGroup(imgData, map);
+ },
+
+ paintInlineImageXObject:
+ function CanvasGraphics_paintInlineImageXObject(imgData) {
+ var width = imgData.width;
+ var height = imgData.height;
+ var ctx = this.ctx;
+
+ this.save();
+ // scale the image to the unit square
+ ctx.scale(1 / width, -1 / height);
+
+ var currentTransform = ctx.mozCurrentTransformInverse;
+ var a = currentTransform[0], b = currentTransform[1];
+ var widthScale = Math.max(Math.sqrt(a * a + b * b), 1);
+ var c = currentTransform[2], d = currentTransform[3];
+ var heightScale = Math.max(Math.sqrt(c * c + d * d), 1);
+
+ var imgToPaint, tmpCanvas;
+ // instanceof HTMLElement does not work in jsdom node.js module
+ if (imgData instanceof HTMLElement || !imgData.data) {
+ imgToPaint = imgData;
+ } else {
+ tmpCanvas = CachedCanvases.getCanvas('inlineImage', width, height);
+ var tmpCtx = tmpCanvas.context;
+ putBinaryImageData(tmpCtx, imgData);
+ imgToPaint = tmpCanvas.canvas;
+ }
+
+ var paintWidth = width, paintHeight = height;
+ var tmpCanvasId = 'prescale1';
+ // Vertial or horizontal scaling shall not be more than 2 to not loose the
+ // pixels during drawImage operation, painting on the temporary canvas(es)
+ // that are twice smaller in size
+ while ((widthScale > 2 && paintWidth > 1) ||
+ (heightScale > 2 && paintHeight > 1)) {
+ var newWidth = paintWidth, newHeight = paintHeight;
+ if (widthScale > 2 && paintWidth > 1) {
+ newWidth = Math.ceil(paintWidth / 2);
+ widthScale /= paintWidth / newWidth;
+ }
+ if (heightScale > 2 && paintHeight > 1) {
+ newHeight = Math.ceil(paintHeight / 2);
+ heightScale /= paintHeight / newHeight;
+ }
+ tmpCanvas = CachedCanvases.getCanvas(tmpCanvasId, newWidth, newHeight);
+ tmpCtx = tmpCanvas.context;
+ tmpCtx.clearRect(0, 0, newWidth, newHeight);
+ tmpCtx.drawImage(imgToPaint, 0, 0, paintWidth, paintHeight,
+ 0, 0, newWidth, newHeight);
+ imgToPaint = tmpCanvas.canvas;
+ paintWidth = newWidth;
+ paintHeight = newHeight;
+ tmpCanvasId = tmpCanvasId === 'prescale1' ? 'prescale2' : 'prescale1';
+ }
+ ctx.drawImage(imgToPaint, 0, 0, paintWidth, paintHeight,
+ 0, -height, width, height);
+
+ if (this.imageLayer) {
+ var position = this.getCanvasPosition(0, -height);
+ this.imageLayer.appendImage({
+ imgData: imgData,
+ left: position[0],
+ top: position[1],
+ width: width / currentTransform[0],
+ height: height / currentTransform[3]
+ });
+ }
+ this.restore();
+ },
+
+ paintInlineImageXObjectGroup:
+ function CanvasGraphics_paintInlineImageXObjectGroup(imgData, map) {
+ var ctx = this.ctx;
+ var w = imgData.width;
+ var h = imgData.height;
+
+ var tmpCanvas = CachedCanvases.getCanvas('inlineImage', w, h);
+ var tmpCtx = tmpCanvas.context;
+ putBinaryImageData(tmpCtx, imgData);
+
+ for (var i = 0, ii = map.length; i < ii; i++) {
+ var entry = map[i];
+ ctx.save();
+ ctx.transform.apply(ctx, entry.transform);
+ ctx.scale(1, -1);
+ ctx.drawImage(tmpCanvas.canvas, entry.x, entry.y, entry.w, entry.h,
+ 0, -1, 1, 1);
+ if (this.imageLayer) {
+ var position = this.getCanvasPosition(entry.x, entry.y);
+ this.imageLayer.appendImage({
+ imgData: imgData,
+ left: position[0],
+ top: position[1],
+ width: w,
+ height: h
+ });
+ }
+ ctx.restore();
+ }
+ },
+
+ paintSolidColorImageMask:
+ function CanvasGraphics_paintSolidColorImageMask() {
+ this.ctx.fillRect(0, 0, 1, 1);
+ },
+
+ // Marked content
+
+ markPoint: function CanvasGraphics_markPoint(tag) {
+ // TODO Marked content.
+ },
+ markPointProps: function CanvasGraphics_markPointProps(tag, properties) {
+ // TODO Marked content.
+ },
+ beginMarkedContent: function CanvasGraphics_beginMarkedContent(tag) {
+ // TODO Marked content.
+ },
+ beginMarkedContentProps: function CanvasGraphics_beginMarkedContentProps(
+ tag, properties) {
+ // TODO Marked content.
+ },
+ endMarkedContent: function CanvasGraphics_endMarkedContent() {
+ // TODO Marked content.
+ },
+
+ // Compatibility
+
+ beginCompat: function CanvasGraphics_beginCompat() {
+ // TODO ignore undefined operators (should we do that anyway?)
+ },
+ endCompat: function CanvasGraphics_endCompat() {
+ // TODO stop ignoring undefined operators
+ },
+
+ // Helper functions
+
+ consumePath: function CanvasGraphics_consumePath() {
+ var ctx = this.ctx;
+ if (this.pendingClip) {
+ if (this.pendingClip === EO_CLIP) {
+ if (ctx.mozFillRule !== undefined) {
+ ctx.mozFillRule = 'evenodd';
+ ctx.clip();
+ ctx.mozFillRule = 'nonzero';
+ } else {
+ try {
+ ctx.clip('evenodd');
+ } catch (ex) {
+ // shouldn't really happen, but browsers might think differently
+ ctx.clip();
+ }
+ }
+ } else {
+ ctx.clip();
+ }
+ this.pendingClip = null;
+ }
+ ctx.beginPath();
+ },
+ getSinglePixelWidth: function CanvasGraphics_getSinglePixelWidth(scale) {
+ if (this.cachedGetSinglePixelWidth === null) {
+ var inverse = this.ctx.mozCurrentTransformInverse;
+ // max of the current horizontal and vertical scale
+ this.cachedGetSinglePixelWidth = Math.sqrt(Math.max(
+ (inverse[0] * inverse[0] + inverse[1] * inverse[1]),
+ (inverse[2] * inverse[2] + inverse[3] * inverse[3])));
+ }
+ return this.cachedGetSinglePixelWidth;
+ },
+ getCanvasPosition: function CanvasGraphics_getCanvasPosition(x, y) {
+ var transform = this.ctx.mozCurrentTransform;
+ return [
+ transform[0] * x + transform[2] * y + transform[4],
+ transform[1] * x + transform[3] * y + transform[5]
+ ];
+ }
+ };
+
+ for (var op in OPS) {
+ CanvasGraphics.prototype[OPS[op]] = CanvasGraphics.prototype[op];
+ }
+
+ return CanvasGraphics;
+})();
+
+
+var WebGLUtils = (function WebGLUtilsClosure() {
+ function loadShader(gl, code, shaderType) {
+ var shader = gl.createShader(shaderType);
+ gl.shaderSource(shader, code);
+ gl.compileShader(shader);
+ var compiled = gl.getShaderParameter(shader, gl.COMPILE_STATUS);
+ if (!compiled) {
+ var errorMsg = gl.getShaderInfoLog(shader);
+ throw new Error('Error during shader compilation: ' + errorMsg);
+ }
+ return shader;
+ }
+ function createVertexShader(gl, code) {
+ return loadShader(gl, code, gl.VERTEX_SHADER);
+ }
+ function createFragmentShader(gl, code) {
+ return loadShader(gl, code, gl.FRAGMENT_SHADER);
+ }
+ function createProgram(gl, shaders) {
+ var program = gl.createProgram();
+ for (var i = 0, ii = shaders.length; i < ii; ++i) {
+ gl.attachShader(program, shaders[i]);
+ }
+ gl.linkProgram(program);
+ var linked = gl.getProgramParameter(program, gl.LINK_STATUS);
+ if (!linked) {
+ var errorMsg = gl.getProgramInfoLog(program);
+ throw new Error('Error during program linking: ' + errorMsg);
+ }
+ return program;
+ }
+ function createTexture(gl, image, textureId) {
+ gl.activeTexture(textureId);
+ var texture = gl.createTexture();
+ gl.bindTexture(gl.TEXTURE_2D, texture);
+
+ // Set the parameters so we can render any size image.
+ gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
+ gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
+ gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
+ gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
+
+ // Upload the image into the texture.
+ gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, image);
+ return texture;
+ }
+
+ var currentGL, currentCanvas;
+ function generateGL() {
+ if (currentGL) {
+ return;
+ }
+ currentCanvas = document.createElement('canvas');
+ currentGL = currentCanvas.getContext('webgl',
+ { premultipliedalpha: false });
+ }
+
+ var smaskVertexShaderCode = '\
+ attribute vec2 a_position; \
+ attribute vec2 a_texCoord; \
+ \
+ uniform vec2 u_resolution; \
+ \
+ varying vec2 v_texCoord; \
+ \
+ void main() { \
+ vec2 clipSpace = (a_position / u_resolution) * 2.0 - 1.0; \
+ gl_Position = vec4(clipSpace * vec2(1, -1), 0, 1); \
+ \
+ v_texCoord = a_texCoord; \
+ } ';
+
+ var smaskFragmentShaderCode = '\
+ precision mediump float; \
+ \
+ uniform vec4 u_backdrop; \
+ uniform int u_subtype; \
+ uniform sampler2D u_image; \
+ uniform sampler2D u_mask; \
+ \
+ varying vec2 v_texCoord; \
+ \
+ void main() { \
+ vec4 imageColor = texture2D(u_image, v_texCoord); \
+ vec4 maskColor = texture2D(u_mask, v_texCoord); \
+ if (u_backdrop.a > 0.0) { \
+ maskColor.rgb = maskColor.rgb * maskColor.a + \
+ u_backdrop.rgb * (1.0 - maskColor.a); \
+ } \
+ float lum; \
+ if (u_subtype == 0) { \
+ lum = maskColor.a; \
+ } else { \
+ lum = maskColor.r * 0.3 + maskColor.g * 0.59 + \
+ maskColor.b * 0.11; \
+ } \
+ imageColor.a *= lum; \
+ imageColor.rgb *= imageColor.a; \
+ gl_FragColor = imageColor; \
+ } ';
+
+ var smaskCache = null;
+
+ function initSmaskGL() {
+ var canvas, gl;
+
+ generateGL();
+ canvas = currentCanvas;
+ currentCanvas = null;
+ gl = currentGL;
+ currentGL = null;
+
+ // setup a GLSL program
+ var vertexShader = createVertexShader(gl, smaskVertexShaderCode);
+ var fragmentShader = createFragmentShader(gl, smaskFragmentShaderCode);
+ var program = createProgram(gl, [vertexShader, fragmentShader]);
+ gl.useProgram(program);
+
+ var cache = {};
+ cache.gl = gl;
+ cache.canvas = canvas;
+ cache.resolutionLocation = gl.getUniformLocation(program, 'u_resolution');
+ cache.positionLocation = gl.getAttribLocation(program, 'a_position');
+ cache.backdropLocation = gl.getUniformLocation(program, 'u_backdrop');
+ cache.subtypeLocation = gl.getUniformLocation(program, 'u_subtype');
+
+ var texCoordLocation = gl.getAttribLocation(program, 'a_texCoord');
+ var texLayerLocation = gl.getUniformLocation(program, 'u_image');
+ var texMaskLocation = gl.getUniformLocation(program, 'u_mask');
+
+ // provide texture coordinates for the rectangle.
+ var texCoordBuffer = gl.createBuffer();
+ gl.bindBuffer(gl.ARRAY_BUFFER, texCoordBuffer);
+ gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([
+ 0.0, 0.0,
+ 1.0, 0.0,
+ 0.0, 1.0,
+ 0.0, 1.0,
+ 1.0, 0.0,
+ 1.0, 1.0]), gl.STATIC_DRAW);
+ gl.enableVertexAttribArray(texCoordLocation);
+ gl.vertexAttribPointer(texCoordLocation, 2, gl.FLOAT, false, 0, 0);
+
+ gl.uniform1i(texLayerLocation, 0);
+ gl.uniform1i(texMaskLocation, 1);
+
+ smaskCache = cache;
+ }
+
+ function composeSMask(layer, mask, properties) {
+ var width = layer.width, height = layer.height;
+
+ if (!smaskCache) {
+ initSmaskGL();
+ }
+ var cache = smaskCache,canvas = cache.canvas, gl = cache.gl;
+ canvas.width = width;
+ canvas.height = height;
+ gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight);
+ gl.uniform2f(cache.resolutionLocation, width, height);
+
+ if (properties.backdrop) {
+ gl.uniform4f(cache.resolutionLocation, properties.backdrop[0],
+ properties.backdrop[1], properties.backdrop[2], 1);
+ } else {
+ gl.uniform4f(cache.resolutionLocation, 0, 0, 0, 0);
+ }
+ gl.uniform1i(cache.subtypeLocation,
+ properties.subtype === 'Luminosity' ? 1 : 0);
+
+ // Create a textures
+ var texture = createTexture(gl, layer, gl.TEXTURE0);
+ var maskTexture = createTexture(gl, mask, gl.TEXTURE1);
+
+
+ // Create a buffer and put a single clipspace rectangle in
+ // it (2 triangles)
+ var buffer = gl.createBuffer();
+ gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+ gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([
+ 0, 0,
+ width, 0,
+ 0, height,
+ 0, height,
+ width, 0,
+ width, height]), gl.STATIC_DRAW);
+ gl.enableVertexAttribArray(cache.positionLocation);
+ gl.vertexAttribPointer(cache.positionLocation, 2, gl.FLOAT, false, 0, 0);
+
+ // draw
+ gl.clearColor(0, 0, 0, 0);
+ gl.enable(gl.BLEND);
+ gl.blendFunc(gl.ONE, gl.ONE_MINUS_SRC_ALPHA);
+ gl.clear(gl.COLOR_BUFFER_BIT);
+
+ gl.drawArrays(gl.TRIANGLES, 0, 6);
+
+ gl.flush();
+
+ gl.deleteTexture(texture);
+ gl.deleteTexture(maskTexture);
+ gl.deleteBuffer(buffer);
+
+ return canvas;
+ }
+
+ var figuresVertexShaderCode = '\
+ attribute vec2 a_position; \
+ attribute vec3 a_color; \
+ \
+ uniform vec2 u_resolution; \
+ uniform vec2 u_scale; \
+ uniform vec2 u_offset; \
+ \
+ varying vec4 v_color; \
+ \
+ void main() { \
+ vec2 position = (a_position + u_offset) * u_scale; \
+ vec2 clipSpace = (position / u_resolution) * 2.0 - 1.0; \
+ gl_Position = vec4(clipSpace * vec2(1, -1), 0, 1); \
+ \
+ v_color = vec4(a_color / 255.0, 1.0); \
+ } ';
+
+ var figuresFragmentShaderCode = '\
+ precision mediump float; \
+ \
+ varying vec4 v_color; \
+ \
+ void main() { \
+ gl_FragColor = v_color; \
+ } ';
+
+ var figuresCache = null;
+
+ function initFiguresGL() {
+ var canvas, gl;
+
+ generateGL();
+ canvas = currentCanvas;
+ currentCanvas = null;
+ gl = currentGL;
+ currentGL = null;
+
+ // setup a GLSL program
+ var vertexShader = createVertexShader(gl, figuresVertexShaderCode);
+ var fragmentShader = createFragmentShader(gl, figuresFragmentShaderCode);
+ var program = createProgram(gl, [vertexShader, fragmentShader]);
+ gl.useProgram(program);
+
+ var cache = {};
+ cache.gl = gl;
+ cache.canvas = canvas;
+ cache.resolutionLocation = gl.getUniformLocation(program, 'u_resolution');
+ cache.scaleLocation = gl.getUniformLocation(program, 'u_scale');
+ cache.offsetLocation = gl.getUniformLocation(program, 'u_offset');
+ cache.positionLocation = gl.getAttribLocation(program, 'a_position');
+ cache.colorLocation = gl.getAttribLocation(program, 'a_color');
+
+ figuresCache = cache;
+ }
+
+ function drawFigures(width, height, backgroundColor, figures, context) {
+ if (!figuresCache) {
+ initFiguresGL();
+ }
+ var cache = figuresCache, canvas = cache.canvas, gl = cache.gl;
+
+ canvas.width = width;
+ canvas.height = height;
+ gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight);
+ gl.uniform2f(cache.resolutionLocation, width, height);
+
+ // count triangle points
+ var count = 0;
+ var i, ii, rows;
+ for (i = 0, ii = figures.length; i < ii; i++) {
+ switch (figures[i].type) {
+ case 'lattice':
+ rows = (figures[i].coords.length / figures[i].verticesPerRow) | 0;
+ count += (rows - 1) * (figures[i].verticesPerRow - 1) * 6;
+ break;
+ case 'triangles':
+ count += figures[i].coords.length;
+ break;
+ }
+ }
+ // transfer data
+ var coords = new Float32Array(count * 2);
+ var colors = new Uint8Array(count * 3);
+ var coordsMap = context.coords, colorsMap = context.colors;
+ var pIndex = 0, cIndex = 0;
+ for (i = 0, ii = figures.length; i < ii; i++) {
+ var figure = figures[i], ps = figure.coords, cs = figure.colors;
+ switch (figure.type) {
+ case 'lattice':
+ var cols = figure.verticesPerRow;
+ rows = (ps.length / cols) | 0;
+ for (var row = 1; row < rows; row++) {
+ var offset = row * cols + 1;
+ for (var col = 1; col < cols; col++, offset++) {
+ coords[pIndex] = coordsMap[ps[offset - cols - 1]];
+ coords[pIndex + 1] = coordsMap[ps[offset - cols - 1] + 1];
+ coords[pIndex + 2] = coordsMap[ps[offset - cols]];
+ coords[pIndex + 3] = coordsMap[ps[offset - cols] + 1];
+ coords[pIndex + 4] = coordsMap[ps[offset - 1]];
+ coords[pIndex + 5] = coordsMap[ps[offset - 1] + 1];
+ colors[cIndex] = colorsMap[cs[offset - cols - 1]];
+ colors[cIndex + 1] = colorsMap[cs[offset - cols - 1] + 1];
+ colors[cIndex + 2] = colorsMap[cs[offset - cols - 1] + 2];
+ colors[cIndex + 3] = colorsMap[cs[offset - cols]];
+ colors[cIndex + 4] = colorsMap[cs[offset - cols] + 1];
+ colors[cIndex + 5] = colorsMap[cs[offset - cols] + 2];
+ colors[cIndex + 6] = colorsMap[cs[offset - 1]];
+ colors[cIndex + 7] = colorsMap[cs[offset - 1] + 1];
+ colors[cIndex + 8] = colorsMap[cs[offset - 1] + 2];
+
+ coords[pIndex + 6] = coords[pIndex + 2];
+ coords[pIndex + 7] = coords[pIndex + 3];
+ coords[pIndex + 8] = coords[pIndex + 4];
+ coords[pIndex + 9] = coords[pIndex + 5];
+ coords[pIndex + 10] = coordsMap[ps[offset]];
+ coords[pIndex + 11] = coordsMap[ps[offset] + 1];
+ colors[cIndex + 9] = colors[cIndex + 3];
+ colors[cIndex + 10] = colors[cIndex + 4];
+ colors[cIndex + 11] = colors[cIndex + 5];
+ colors[cIndex + 12] = colors[cIndex + 6];
+ colors[cIndex + 13] = colors[cIndex + 7];
+ colors[cIndex + 14] = colors[cIndex + 8];
+ colors[cIndex + 15] = colorsMap[cs[offset]];
+ colors[cIndex + 16] = colorsMap[cs[offset] + 1];
+ colors[cIndex + 17] = colorsMap[cs[offset] + 2];
+ pIndex += 12;
+ cIndex += 18;
+ }
+ }
+ break;
+ case 'triangles':
+ for (var j = 0, jj = ps.length; j < jj; j++) {
+ coords[pIndex] = coordsMap[ps[j]];
+ coords[pIndex + 1] = coordsMap[ps[j] + 1];
+ colors[cIndex] = colorsMap[cs[i]];
+ colors[cIndex + 1] = colorsMap[cs[j] + 1];
+ colors[cIndex + 2] = colorsMap[cs[j] + 2];
+ pIndex += 2;
+ cIndex += 3;
+ }
+ break;
+ }
+ }
+
+ // draw
+ if (backgroundColor) {
+ gl.clearColor(backgroundColor[0] / 255, backgroundColor[1] / 255,
+ backgroundColor[2] / 255, 1.0);
+ } else {
+ gl.clearColor(0, 0, 0, 0);
+ }
+ gl.clear(gl.COLOR_BUFFER_BIT);
+
+ var coordsBuffer = gl.createBuffer();
+ gl.bindBuffer(gl.ARRAY_BUFFER, coordsBuffer);
+ gl.bufferData(gl.ARRAY_BUFFER, coords, gl.STATIC_DRAW);
+ gl.enableVertexAttribArray(cache.positionLocation);
+ gl.vertexAttribPointer(cache.positionLocation, 2, gl.FLOAT, false, 0, 0);
+
+ var colorsBuffer = gl.createBuffer();
+ gl.bindBuffer(gl.ARRAY_BUFFER, colorsBuffer);
+ gl.bufferData(gl.ARRAY_BUFFER, colors, gl.STATIC_DRAW);
+ gl.enableVertexAttribArray(cache.colorLocation);
+ gl.vertexAttribPointer(cache.colorLocation, 3, gl.UNSIGNED_BYTE, false,
+ 0, 0);
+
+ gl.uniform2f(cache.scaleLocation, context.scaleX, context.scaleY);
+ gl.uniform2f(cache.offsetLocation, context.offsetX, context.offsetY);
+
+ gl.drawArrays(gl.TRIANGLES, 0, count);
+
+ gl.flush();
+
+ gl.deleteBuffer(coordsBuffer);
+ gl.deleteBuffer(colorsBuffer);
+
+ return canvas;
+ }
+
+ function cleanup() {
+ if (smaskCache && smaskCache.canvas) {
+ smaskCache.canvas.width = 0;
+ smaskCache.canvas.height = 0;
+ }
+ if (figuresCache && figuresCache.canvas) {
+ figuresCache.canvas.width = 0;
+ figuresCache.canvas.height = 0;
+ }
+ smaskCache = null;
+ figuresCache = null;
+ }
+
+ return {
+ get isEnabled() {
+ if (PDFJS.disableWebGL) {
+ return false;
+ }
+ var enabled = false;
+ try {
+ generateGL();
+ enabled = !!currentGL;
+ } catch (e) { }
+ return shadow(this, 'isEnabled', enabled);
+ },
+ composeSMask: composeSMask,
+ drawFigures: drawFigures,
+ clear: cleanup
+ };
+})();
+
+
+var ShadingIRs = {};
+
+ShadingIRs.RadialAxial = {
+ fromIR: function RadialAxial_fromIR(raw) {
+ var type = raw[1];
+ var colorStops = raw[2];
+ var p0 = raw[3];
+ var p1 = raw[4];
+ var r0 = raw[5];
+ var r1 = raw[6];
+ return {
+ type: 'Pattern',
+ getPattern: function RadialAxial_getPattern(ctx) {
+ var grad;
+ if (type === 'axial') {
+ grad = ctx.createLinearGradient(p0[0], p0[1], p1[0], p1[1]);
+ } else if (type === 'radial') {
+ grad = ctx.createRadialGradient(p0[0], p0[1], r0, p1[0], p1[1], r1);
+ }
+
+ for (var i = 0, ii = colorStops.length; i < ii; ++i) {
+ var c = colorStops[i];
+ grad.addColorStop(c[0], c[1]);
+ }
+ return grad;
+ }
+ };
+ }
+};
+
+var createMeshCanvas = (function createMeshCanvasClosure() {
+ function drawTriangle(data, context, p1, p2, p3, c1, c2, c3) {
+ // Very basic Gouraud-shaded triangle rasterization algorithm.
+ var coords = context.coords, colors = context.colors;
+ var bytes = data.data, rowSize = data.width * 4;
+ var tmp;
+ if (coords[p1 + 1] > coords[p2 + 1]) {
+ tmp = p1; p1 = p2; p2 = tmp; tmp = c1; c1 = c2; c2 = tmp;
+ }
+ if (coords[p2 + 1] > coords[p3 + 1]) {
+ tmp = p2; p2 = p3; p3 = tmp; tmp = c2; c2 = c3; c3 = tmp;
+ }
+ if (coords[p1 + 1] > coords[p2 + 1]) {
+ tmp = p1; p1 = p2; p2 = tmp; tmp = c1; c1 = c2; c2 = tmp;
+ }
+ var x1 = (coords[p1] + context.offsetX) * context.scaleX;
+ var y1 = (coords[p1 + 1] + context.offsetY) * context.scaleY;
+ var x2 = (coords[p2] + context.offsetX) * context.scaleX;
+ var y2 = (coords[p2 + 1] + context.offsetY) * context.scaleY;
+ var x3 = (coords[p3] + context.offsetX) * context.scaleX;
+ var y3 = (coords[p3 + 1] + context.offsetY) * context.scaleY;
+ if (y1 >= y3) {
+ return;
+ }
+ var c1r = colors[c1], c1g = colors[c1 + 1], c1b = colors[c1 + 2];
+ var c2r = colors[c2], c2g = colors[c2 + 1], c2b = colors[c2 + 2];
+ var c3r = colors[c3], c3g = colors[c3 + 1], c3b = colors[c3 + 2];
+
+ var minY = Math.round(y1), maxY = Math.round(y3);
+ var xa, car, cag, cab;
+ var xb, cbr, cbg, cbb;
+ var k;
+ for (var y = minY; y <= maxY; y++) {
+ if (y < y2) {
+ k = y < y1 ? 0 : y1 === y2 ? 1 : (y1 - y) / (y1 - y2);
+ xa = x1 - (x1 - x2) * k;
+ car = c1r - (c1r - c2r) * k;
+ cag = c1g - (c1g - c2g) * k;
+ cab = c1b - (c1b - c2b) * k;
+ } else {
+ k = y > y3 ? 1 : y2 === y3 ? 0 : (y2 - y) / (y2 - y3);
+ xa = x2 - (x2 - x3) * k;
+ car = c2r - (c2r - c3r) * k;
+ cag = c2g - (c2g - c3g) * k;
+ cab = c2b - (c2b - c3b) * k;
+ }
+ k = y < y1 ? 0 : y > y3 ? 1 : (y1 - y) / (y1 - y3);
+ xb = x1 - (x1 - x3) * k;
+ cbr = c1r - (c1r - c3r) * k;
+ cbg = c1g - (c1g - c3g) * k;
+ cbb = c1b - (c1b - c3b) * k;
+ var x1_ = Math.round(Math.min(xa, xb));
+ var x2_ = Math.round(Math.max(xa, xb));
+ var j = rowSize * y + x1_ * 4;
+ for (var x = x1_; x <= x2_; x++) {
+ k = (xa - x) / (xa - xb);
+ k = k < 0 ? 0 : k > 1 ? 1 : k;
+ bytes[j++] = (car - (car - cbr) * k) | 0;
+ bytes[j++] = (cag - (cag - cbg) * k) | 0;
+ bytes[j++] = (cab - (cab - cbb) * k) | 0;
+ bytes[j++] = 255;
+ }
+ }
+ }
+
+ function drawFigure(data, figure, context) {
+ var ps = figure.coords;
+ var cs = figure.colors;
+ var i, ii;
+ switch (figure.type) {
+ case 'lattice':
+ var verticesPerRow = figure.verticesPerRow;
+ var rows = Math.floor(ps.length / verticesPerRow) - 1;
+ var cols = verticesPerRow - 1;
+ for (i = 0; i < rows; i++) {
+ var q = i * verticesPerRow;
+ for (var j = 0; j < cols; j++, q++) {
+ drawTriangle(data, context,
+ ps[q], ps[q + 1], ps[q + verticesPerRow],
+ cs[q], cs[q + 1], cs[q + verticesPerRow]);
+ drawTriangle(data, context,
+ ps[q + verticesPerRow + 1], ps[q + 1], ps[q + verticesPerRow],
+ cs[q + verticesPerRow + 1], cs[q + 1], cs[q + verticesPerRow]);
+ }
+ }
+ break;
+ case 'triangles':
+ for (i = 0, ii = ps.length; i < ii; i += 3) {
+ drawTriangle(data, context,
+ ps[i], ps[i + 1], ps[i + 2],
+ cs[i], cs[i + 1], cs[i + 2]);
+ }
+ break;
+ default:
+ error('illigal figure');
+ break;
+ }
+ }
+
+ function createMeshCanvas(bounds, combinesScale, coords, colors, figures,
+ backgroundColor) {
+ // we will increase scale on some weird factor to let antialiasing take
+ // care of "rough" edges
+ var EXPECTED_SCALE = 1.1;
+ // MAX_PATTERN_SIZE is used to avoid OOM situation.
+ var MAX_PATTERN_SIZE = 3000; // 10in @ 300dpi shall be enough
+
+ var offsetX = Math.floor(bounds[0]);
+ var offsetY = Math.floor(bounds[1]);
+ var boundsWidth = Math.ceil(bounds[2]) - offsetX;
+ var boundsHeight = Math.ceil(bounds[3]) - offsetY;
+
+ var width = Math.min(Math.ceil(Math.abs(boundsWidth * combinesScale[0] *
+ EXPECTED_SCALE)), MAX_PATTERN_SIZE);
+ var height = Math.min(Math.ceil(Math.abs(boundsHeight * combinesScale[1] *
+ EXPECTED_SCALE)), MAX_PATTERN_SIZE);
+ var scaleX = boundsWidth / width;
+ var scaleY = boundsHeight / height;
+
+ var context = {
+ coords: coords,
+ colors: colors,
+ offsetX: -offsetX,
+ offsetY: -offsetY,
+ scaleX: 1 / scaleX,
+ scaleY: 1 / scaleY
+ };
+
+ var canvas, tmpCanvas, i, ii;
+ if (WebGLUtils.isEnabled) {
+ canvas = WebGLUtils.drawFigures(width, height, backgroundColor,
+ figures, context);
+
+ // https://bugzilla.mozilla.org/show_bug.cgi?id=972126
+ tmpCanvas = CachedCanvases.getCanvas('mesh', width, height, false);
+ tmpCanvas.context.drawImage(canvas, 0, 0);
+ canvas = tmpCanvas.canvas;
+ } else {
+ tmpCanvas = CachedCanvases.getCanvas('mesh', width, height, false);
+ var tmpCtx = tmpCanvas.context;
+
+ var data = tmpCtx.createImageData(width, height);
+ if (backgroundColor) {
+ var bytes = data.data;
+ for (i = 0, ii = bytes.length; i < ii; i += 4) {
+ bytes[i] = backgroundColor[0];
+ bytes[i + 1] = backgroundColor[1];
+ bytes[i + 2] = backgroundColor[2];
+ bytes[i + 3] = 255;
+ }
+ }
+ for (i = 0; i < figures.length; i++) {
+ drawFigure(data, figures[i], context);
+ }
+ tmpCtx.putImageData(data, 0, 0);
+ canvas = tmpCanvas.canvas;
+ }
+
+ return {canvas: canvas, offsetX: offsetX, offsetY: offsetY,
+ scaleX: scaleX, scaleY: scaleY};
+ }
+ return createMeshCanvas;
+})();
+
+ShadingIRs.Mesh = {
+ fromIR: function Mesh_fromIR(raw) {
+ //var type = raw[1];
+ var coords = raw[2];
+ var colors = raw[3];
+ var figures = raw[4];
+ var bounds = raw[5];
+ var matrix = raw[6];
+ //var bbox = raw[7];
+ var background = raw[8];
+ return {
+ type: 'Pattern',
+ getPattern: function Mesh_getPattern(ctx, owner, shadingFill) {
+ var scale;
+ if (shadingFill) {
+ scale = Util.singularValueDecompose2dScale(ctx.mozCurrentTransform);
+ } else {
+ // Obtain scale from matrix and current transformation matrix.
+ scale = Util.singularValueDecompose2dScale(owner.baseTransform);
+ if (matrix) {
+ var matrixScale = Util.singularValueDecompose2dScale(matrix);
+ scale = [scale[0] * matrixScale[0],
+ scale[1] * matrixScale[1]];
+ }
+ }
+
+
+ // Rasterizing on the main thread since sending/queue large canvases
+ // might cause OOM.
+ var temporaryPatternCanvas = createMeshCanvas(bounds, scale, coords,
+ colors, figures, shadingFill ? null : background);
+
+ if (!shadingFill) {
+ ctx.setTransform.apply(ctx, owner.baseTransform);
+ if (matrix) {
+ ctx.transform.apply(ctx, matrix);
+ }
+ }
+
+ ctx.translate(temporaryPatternCanvas.offsetX,
+ temporaryPatternCanvas.offsetY);
+ ctx.scale(temporaryPatternCanvas.scaleX,
+ temporaryPatternCanvas.scaleY);
+
+ return ctx.createPattern(temporaryPatternCanvas.canvas, 'no-repeat');
+ }
+ };
+ }
+};
+
+ShadingIRs.Dummy = {
+ fromIR: function Dummy_fromIR() {
+ return {
+ type: 'Pattern',
+ getPattern: function Dummy_fromIR_getPattern() {
+ return 'hotpink';
+ }
+ };
+ }
+};
+
+function getShadingPatternFromIR(raw) {
+ var shadingIR = ShadingIRs[raw[0]];
+ if (!shadingIR) {
+ error('Unknown IR type: ' + raw[0]);
+ }
+ return shadingIR.fromIR(raw);
+}
+
+var TilingPattern = (function TilingPatternClosure() {
+ var PaintType = {
+ COLORED: 1,
+ UNCOLORED: 2
+ };
+
+ var MAX_PATTERN_SIZE = 3000; // 10in @ 300dpi shall be enough
+
+ function TilingPattern(IR, color, ctx, objs, commonObjs, baseTransform) {
+ this.operatorList = IR[2];
+ this.matrix = IR[3] || [1, 0, 0, 1, 0, 0];
+ this.bbox = IR[4];
+ this.xstep = IR[5];
+ this.ystep = IR[6];
+ this.paintType = IR[7];
+ this.tilingType = IR[8];
+ this.color = color;
+ this.objs = objs;
+ this.commonObjs = commonObjs;
+ this.baseTransform = baseTransform;
+ this.type = 'Pattern';
+ this.ctx = ctx;
+ }
+
+ TilingPattern.prototype = {
+ createPatternCanvas: function TilinPattern_createPatternCanvas(owner) {
+ var operatorList = this.operatorList;
+ var bbox = this.bbox;
+ var xstep = this.xstep;
+ var ystep = this.ystep;
+ var paintType = this.paintType;
+ var tilingType = this.tilingType;
+ var color = this.color;
+ var objs = this.objs;
+ var commonObjs = this.commonObjs;
+
+ info('TilingType: ' + tilingType);
+
+ var x0 = bbox[0], y0 = bbox[1], x1 = bbox[2], y1 = bbox[3];
+
+ var topLeft = [x0, y0];
+ // we want the canvas to be as large as the step size
+ var botRight = [x0 + xstep, y0 + ystep];
+
+ var width = botRight[0] - topLeft[0];
+ var height = botRight[1] - topLeft[1];
+
+ // Obtain scale from matrix and current transformation matrix.
+ var matrixScale = Util.singularValueDecompose2dScale(this.matrix);
+ var curMatrixScale = Util.singularValueDecompose2dScale(
+ this.baseTransform);
+ var combinedScale = [matrixScale[0] * curMatrixScale[0],
+ matrixScale[1] * curMatrixScale[1]];
+
+ // MAX_PATTERN_SIZE is used to avoid OOM situation.
+ // Use width and height values that are as close as possible to the end
+ // result when the pattern is used. Too low value makes the pattern look
+ // blurry. Too large value makes it look too crispy.
+ width = Math.min(Math.ceil(Math.abs(width * combinedScale[0])),
+ MAX_PATTERN_SIZE);
+
+ height = Math.min(Math.ceil(Math.abs(height * combinedScale[1])),
+ MAX_PATTERN_SIZE);
+
+ var tmpCanvas = CachedCanvases.getCanvas('pattern', width, height, true);
+ var tmpCtx = tmpCanvas.context;
+ var graphics = new CanvasGraphics(tmpCtx, commonObjs, objs);
+ graphics.groupLevel = owner.groupLevel;
+
+ this.setFillAndStrokeStyleToContext(tmpCtx, paintType, color);
+
+ this.setScale(width, height, xstep, ystep);
+ this.transformToScale(graphics);
+
+ // transform coordinates to pattern space
+ var tmpTranslate = [1, 0, 0, 1, -topLeft[0], -topLeft[1]];
+ graphics.transform.apply(graphics, tmpTranslate);
+
+ this.clipBbox(graphics, bbox, x0, y0, x1, y1);
+
+ graphics.executeOperatorList(operatorList);
+ return tmpCanvas.canvas;
+ },
+
+ setScale: function TilingPattern_setScale(width, height, xstep, ystep) {
+ this.scale = [width / xstep, height / ystep];
+ },
+
+ transformToScale: function TilingPattern_transformToScale(graphics) {
+ var scale = this.scale;
+ var tmpScale = [scale[0], 0, 0, scale[1], 0, 0];
+ graphics.transform.apply(graphics, tmpScale);
+ },
+
+ scaleToContext: function TilingPattern_scaleToContext() {
+ var scale = this.scale;
+ this.ctx.scale(1 / scale[0], 1 / scale[1]);
+ },
+
+ clipBbox: function clipBbox(graphics, bbox, x0, y0, x1, y1) {
+ if (bbox && isArray(bbox) && bbox.length === 4) {
+ var bboxWidth = x1 - x0;
+ var bboxHeight = y1 - y0;
+ graphics.ctx.rect(x0, y0, bboxWidth, bboxHeight);
+ graphics.clip();
+ graphics.endPath();
+ }
+ },
+
+ setFillAndStrokeStyleToContext:
+ function setFillAndStrokeStyleToContext(context, paintType, color) {
+ switch (paintType) {
+ case PaintType.COLORED:
+ var ctx = this.ctx;
+ context.fillStyle = ctx.fillStyle;
+ context.strokeStyle = ctx.strokeStyle;
+ break;
+ case PaintType.UNCOLORED:
+ var cssColor = Util.makeCssRgb(color[0], color[1], color[2]);
+ context.fillStyle = cssColor;
+ context.strokeStyle = cssColor;
+ break;
+ default:
+ error('Unsupported paint type: ' + paintType);
+ }
+ },
+
+ getPattern: function TilingPattern_getPattern(ctx, owner) {
+ var temporaryPatternCanvas = this.createPatternCanvas(owner);
+
+ ctx = this.ctx;
+ ctx.setTransform.apply(ctx, this.baseTransform);
+ ctx.transform.apply(ctx, this.matrix);
+ this.scaleToContext();
+
+ return ctx.createPattern(temporaryPatternCanvas, 'repeat');
+ }
+ };
+
+ return TilingPattern;
+})();
+
+
+PDFJS.disableFontFace = false;
+
+var FontLoader = {
+ insertRule: function fontLoaderInsertRule(rule) {
+ var styleElement = document.getElementById('PDFJS_FONT_STYLE_TAG');
+ if (!styleElement) {
+ styleElement = document.createElement('style');
+ styleElement.id = 'PDFJS_FONT_STYLE_TAG';
+ document.documentElement.getElementsByTagName('head')[0].appendChild(
+ styleElement);
+ }
+
+ var styleSheet = styleElement.sheet;
+ styleSheet.insertRule(rule, styleSheet.cssRules.length);
+ },
+
+ clear: function fontLoaderClear() {
+ var styleElement = document.getElementById('PDFJS_FONT_STYLE_TAG');
+ if (styleElement) {
+ styleElement.parentNode.removeChild(styleElement);
+ }
+ this.nativeFontFaces.forEach(function(nativeFontFace) {
+ document.fonts.delete(nativeFontFace);
+ });
+ this.nativeFontFaces.length = 0;
+ },
+ get loadTestFont() {
+ // This is a CFF font with 1 glyph for '.' that fills its entire width and
+ // height.
+ return shadow(this, 'loadTestFont', atob(
+ 'T1RUTwALAIAAAwAwQ0ZGIDHtZg4AAAOYAAAAgUZGVE1lkzZwAAAEHAAAABxHREVGABQAFQ' +
+ 'AABDgAAAAeT1MvMlYNYwkAAAEgAAAAYGNtYXABDQLUAAACNAAAAUJoZWFk/xVFDQAAALwA' +
+ 'AAA2aGhlYQdkA+oAAAD0AAAAJGhtdHgD6AAAAAAEWAAAAAZtYXhwAAJQAAAAARgAAAAGbm' +
+ 'FtZVjmdH4AAAGAAAAAsXBvc3T/hgAzAAADeAAAACAAAQAAAAEAALZRFsRfDzz1AAsD6AAA' +
+ 'AADOBOTLAAAAAM4KHDwAAAAAA+gDIQAAAAgAAgAAAAAAAAABAAADIQAAAFoD6AAAAAAD6A' +
+ 'ABAAAAAAAAAAAAAAAAAAAAAQAAUAAAAgAAAAQD6AH0AAUAAAKKArwAAACMAooCvAAAAeAA' +
+ 'MQECAAACAAYJAAAAAAAAAAAAAQAAAAAAAAAAAAAAAFBmRWQAwAAuAC4DIP84AFoDIQAAAA' +
+ 'AAAQAAAAAAAAAAACAAIAABAAAADgCuAAEAAAAAAAAAAQAAAAEAAAAAAAEAAQAAAAEAAAAA' +
+ 'AAIAAQAAAAEAAAAAAAMAAQAAAAEAAAAAAAQAAQAAAAEAAAAAAAUAAQAAAAEAAAAAAAYAAQ' +
+ 'AAAAMAAQQJAAAAAgABAAMAAQQJAAEAAgABAAMAAQQJAAIAAgABAAMAAQQJAAMAAgABAAMA' +
+ 'AQQJAAQAAgABAAMAAQQJAAUAAgABAAMAAQQJAAYAAgABWABYAAAAAAAAAwAAAAMAAAAcAA' +
+ 'EAAAAAADwAAwABAAAAHAAEACAAAAAEAAQAAQAAAC7//wAAAC7////TAAEAAAAAAAABBgAA' +
+ 'AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAA' +
+ 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' +
+ 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' +
+ 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' +
+ 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAA' +
+ 'AAAAD/gwAyAAAAAQAAAAAAAAAAAAAAAAAAAAABAAQEAAEBAQJYAAEBASH4DwD4GwHEAvgc' +
+ 'A/gXBIwMAYuL+nz5tQXkD5j3CBLnEQACAQEBIVhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWF' +
+ 'hYWFhYWFhYAAABAQAADwACAQEEE/t3Dov6fAH6fAT+fPp8+nwHDosMCvm1Cvm1DAz6fBQA' +
+ 'AAAAAAABAAAAAMmJbzEAAAAAzgTjFQAAAADOBOQpAAEAAAAAAAAADAAUAAQAAAABAAAAAg' +
+ 'ABAAAAAAAAAAAD6AAAAAAAAA=='
+ ));
+ },
+
+ loadTestFontId: 0,
+
+ loadingContext: {
+ requests: [],
+ nextRequestId: 0
+ },
+
+ isSyncFontLoadingSupported: (function detectSyncFontLoadingSupport() {
+ if (isWorker) {
+ return false;
+ }
+
+ // User agent string sniffing is bad, but there is no reliable way to tell
+ // if font is fully loaded and ready to be used with canvas.
+ var userAgent = window.navigator.userAgent;
+ var m = /Mozilla\/5.0.*?rv:(\d+).*? Gecko/.exec(userAgent);
+ if (m && m[1] >= 14) {
+ return true;
+ }
+ // TODO other browsers
+ if (userAgent === 'node') {
+ return true;
+ }
+ return false;
+ })(),
+
+ nativeFontFaces: [],
+
+ isFontLoadingAPISupported: (!isWorker && typeof document !== 'undefined' &&
+ !!document.fonts),
+
+ addNativeFontFace: function fontLoader_addNativeFontFace(nativeFontFace) {
+ this.nativeFontFaces.push(nativeFontFace);
+ document.fonts.add(nativeFontFace);
+ },
+
+ bind: function fontLoaderBind(fonts, callback) {
+ assert(!isWorker, 'bind() shall be called from main thread');
+
+ var rules = [];
+ var fontsToLoad = [];
+ var fontLoadPromises = [];
+ for (var i = 0, ii = fonts.length; i < ii; i++) {
+ var font = fonts[i];
+
+ // Add the font to the DOM only once or skip if the font
+ // is already loaded.
+ if (font.attached || font.loading === false) {
+ continue;
+ }
+ font.attached = true;
+
+ if (this.isFontLoadingAPISupported) {
+ var nativeFontFace = font.createNativeFontFace();
+ if (nativeFontFace) {
+ fontLoadPromises.push(nativeFontFace.loaded);
+ }
+ } else {
+ var rule = font.bindDOM();
+ if (rule) {
+ rules.push(rule);
+ fontsToLoad.push(font);
+ }
+ }
+ }
+
+ var request = FontLoader.queueLoadingCallback(callback);
+ if (this.isFontLoadingAPISupported) {
+ Promise.all(fontsToLoad).then(function() {
+ request.complete();
+ });
+ } else if (rules.length > 0 && !this.isSyncFontLoadingSupported) {
+ FontLoader.prepareFontLoadEvent(rules, fontsToLoad, request);
+ } else {
+ request.complete();
+ }
+ },
+
+ queueLoadingCallback: function FontLoader_queueLoadingCallback(callback) {
+ function LoadLoader_completeRequest() {
+ assert(!request.end, 'completeRequest() cannot be called twice');
+ request.end = Date.now();
+
+ // sending all completed requests in order how they were queued
+ while (context.requests.length > 0 && context.requests[0].end) {
+ var otherRequest = context.requests.shift();
+ setTimeout(otherRequest.callback, 0);
+ }
+ }
+
+ var context = FontLoader.loadingContext;
+ var requestId = 'pdfjs-font-loading-' + (context.nextRequestId++);
+ var request = {
+ id: requestId,
+ complete: LoadLoader_completeRequest,
+ callback: callback,
+ started: Date.now()
+ };
+ context.requests.push(request);
+ return request;
+ },
+
+ prepareFontLoadEvent: function fontLoaderPrepareFontLoadEvent(rules,
+ fonts,
+ request) {
+ /** Hack begin */
+ // There's currently no event when a font has finished downloading so the
+ // following code is a dirty hack to 'guess' when a font is
+ // ready. It's assumed fonts are loaded in order, so add a known test
+ // font after the desired fonts and then test for the loading of that
+ // test font.
+
+ function int32(data, offset) {
+ return (data.charCodeAt(offset) << 24) |
+ (data.charCodeAt(offset + 1) << 16) |
+ (data.charCodeAt(offset + 2) << 8) |
+ (data.charCodeAt(offset + 3) & 0xff);
+ }
+
+ function spliceString(s, offset, remove, insert) {
+ var chunk1 = s.substr(0, offset);
+ var chunk2 = s.substr(offset + remove);
+ return chunk1 + insert + chunk2;
+ }
+
+ var i, ii;
+
+ var canvas = document.createElement('canvas');
+ canvas.width = 1;
+ canvas.height = 1;
+ var ctx = canvas.getContext('2d');
+
+ var called = 0;
+ function isFontReady(name, callback) {
+ called++;
+ // With setTimeout clamping this gives the font ~100ms to load.
+ if(called > 30) {
+ warn('Load test font never loaded.');
+ callback();
+ return;
+ }
+ ctx.font = '30px ' + name;
+ ctx.fillText('.', 0, 20);
+ var imageData = ctx.getImageData(0, 0, 1, 1);
+ if (imageData.data[3] > 0) {
+ callback();
+ return;
+ }
+ setTimeout(isFontReady.bind(null, name, callback));
+ }
+
+ var loadTestFontId = 'lt' + Date.now() + this.loadTestFontId++;
+ // Chromium seems to cache fonts based on a hash of the actual font data,
+ // so the font must be modified for each load test else it will appear to
+ // be loaded already.
+ // TODO: This could maybe be made faster by avoiding the btoa of the full
+ // font by splitting it in chunks before hand and padding the font id.
+ var data = this.loadTestFont;
+ var COMMENT_OFFSET = 976; // has to be on 4 byte boundary (for checksum)
+ data = spliceString(data, COMMENT_OFFSET, loadTestFontId.length,
+ loadTestFontId);
+ // CFF checksum is important for IE, adjusting it
+ var CFF_CHECKSUM_OFFSET = 16;
+ var XXXX_VALUE = 0x58585858; // the "comment" filled with 'X'
+ var checksum = int32(data, CFF_CHECKSUM_OFFSET);
+ for (i = 0, ii = loadTestFontId.length - 3; i < ii; i += 4) {
+ checksum = (checksum - XXXX_VALUE + int32(loadTestFontId, i)) | 0;
+ }
+ if (i < loadTestFontId.length) { // align to 4 bytes boundary
+ checksum = (checksum - XXXX_VALUE +
+ int32(loadTestFontId + 'XXX', i)) | 0;
+ }
+ data = spliceString(data, CFF_CHECKSUM_OFFSET, 4, string32(checksum));
+
+ var url = 'url(data:font/opentype;base64,' + btoa(data) + ');';
+ var rule = '@font-face { font-family:"' + loadTestFontId + '";src:' +
+ url + '}';
+ FontLoader.insertRule(rule);
+
+ var names = [];
+ for (i = 0, ii = fonts.length; i < ii; i++) {
+ names.push(fonts[i].loadedName);
+ }
+ names.push(loadTestFontId);
+
+ var div = document.createElement('div');
+ div.setAttribute('style',
+ 'visibility: hidden;' +
+ 'width: 10px; height: 10px;' +
+ 'position: absolute; top: 0px; left: 0px;');
+ for (i = 0, ii = names.length; i < ii; ++i) {
+ var span = document.createElement('span');
+ span.textContent = 'Hi';
+ span.style.fontFamily = names[i];
+ div.appendChild(span);
+ }
+ document.body.appendChild(div);
+
+ isFontReady(loadTestFontId, function() {
+ document.body.removeChild(div);
+ request.complete();
+ });
+ /** Hack end */
+ }
+};
+
+var FontFaceObject = (function FontFaceObjectClosure() {
+ function FontFaceObject(name, file, properties) {
+ this.compiledGlyphs = {};
+ if (arguments.length === 1) {
+ // importing translated data
+ var data = arguments[0];
+ for (var i in data) {
+ this[i] = data[i];
+ }
+ return;
+ }
+ }
+ FontFaceObject.prototype = {
+ createNativeFontFace: function FontFaceObject_createNativeFontFace() {
+ if (!this.data) {
+ return null;
+ }
+
+ if (PDFJS.disableFontFace) {
+ this.disableFontFace = true;
+ return null;
+ }
+
+ var nativeFontFace = new FontFace(this.loadedName, this.data, {});
+
+ FontLoader.addNativeFontFace(nativeFontFace);
+
+ if (PDFJS.pdfBug && 'FontInspector' in globalScope &&
+ globalScope['FontInspector'].enabled) {
+ globalScope['FontInspector'].fontAdded(this);
+ }
+ return nativeFontFace;
+ },
+
+ bindDOM: function FontFaceObject_bindDOM() {
+ if (!this.data) {
+ return null;
+ }
+
+ if (PDFJS.disableFontFace) {
+ this.disableFontFace = true;
+ return null;
+ }
+
+ var data = bytesToString(new Uint8Array(this.data));
+ var fontName = this.loadedName;
+
+ // Add the font-face rule to the document
+ var url = ('url(data:' + this.mimetype + ';base64,' +
+ window.btoa(data) + ');');
+ var rule = '@font-face { font-family:"' + fontName + '";src:' + url + '}';
+ FontLoader.insertRule(rule);
+
+ if (PDFJS.pdfBug && 'FontInspector' in globalScope &&
+ globalScope['FontInspector'].enabled) {
+ globalScope['FontInspector'].fontAdded(this, url);
+ }
+
+ return rule;
+ },
+
+ getPathGenerator: function FontLoader_getPathGenerator(objs, character) {
+ if (!(character in this.compiledGlyphs)) {
+ var js = objs.get(this.loadedName + '_path_' + character);
+ /*jshint -W054 */
+ this.compiledGlyphs[character] = new Function('c', 'size', js);
+ }
+ return this.compiledGlyphs[character];
+ }
+ };
+ return FontFaceObject;
+})();
+
+
+var ANNOT_MIN_SIZE = 10; // px
+
+var AnnotationUtils = (function AnnotationUtilsClosure() {
+ // TODO(mack): This dupes some of the logic in CanvasGraphics.setFont()
+ function setTextStyles(element, item, fontObj) {
+
+ var style = element.style;
+ style.fontSize = item.fontSize + 'px';
+ style.direction = item.fontDirection < 0 ? 'rtl': 'ltr';
+
+ if (!fontObj) {
+ return;
+ }
+
+ style.fontWeight = fontObj.black ?
+ (fontObj.bold ? 'bolder' : 'bold') :
+ (fontObj.bold ? 'bold' : 'normal');
+ style.fontStyle = fontObj.italic ? 'italic' : 'normal';
+
+ var fontName = fontObj.loadedName;
+ var fontFamily = fontName ? '"' + fontName + '", ' : '';
+ // Use a reasonable default font if the font doesn't specify a fallback
+ var fallbackName = fontObj.fallbackName || 'Helvetica, sans-serif';
+ style.fontFamily = fontFamily + fallbackName;
+ }
+
+ function initContainer(item, drawBorder) {
+ var container = document.createElement('section');
+ var cstyle = container.style;
+ var width = item.rect[2] - item.rect[0];
+ var height = item.rect[3] - item.rect[1];
+
+ var bWidth = item.borderWidth || 0;
+ if (bWidth) {
+ width = width - 2 * bWidth;
+ height = height - 2 * bWidth;
+ cstyle.borderWidth = bWidth + 'px';
+ var color = item.color;
+ if (drawBorder && color) {
+ cstyle.borderStyle = 'solid';
+ cstyle.borderColor = Util.makeCssRgb(Math.round(color[0] * 255),
+ Math.round(color[1] * 255),
+ Math.round(color[2] * 255));
+ }
+ }
+ cstyle.width = width + 'px';
+ cstyle.height = height + 'px';
+ return container;
+ }
+
+ function getHtmlElementForTextWidgetAnnotation(item, commonObjs) {
+ var element = document.createElement('div');
+ var width = item.rect[2] - item.rect[0];
+ var height = item.rect[3] - item.rect[1];
+ element.style.width = width + 'px';
+ element.style.height = height + 'px';
+ element.style.display = 'table';
+
+ var content = document.createElement('div');
+ content.textContent = item.fieldValue;
+ var textAlignment = item.textAlignment;
+ content.style.textAlign = ['left', 'center', 'right'][textAlignment];
+ content.style.verticalAlign = 'middle';
+ content.style.display = 'table-cell';
+
+ var fontObj = item.fontRefName ?
+ commonObjs.getData(item.fontRefName) : null;
+ setTextStyles(content, item, fontObj);
+
+ element.appendChild(content);
+
+ return element;
+ }
+
+ function getHtmlElementForTextAnnotation(item) {
+ var rect = item.rect;
+
+ // sanity check because of OOo-generated PDFs
+ if ((rect[3] - rect[1]) < ANNOT_MIN_SIZE) {
+ rect[3] = rect[1] + ANNOT_MIN_SIZE;
+ }
+ if ((rect[2] - rect[0]) < ANNOT_MIN_SIZE) {
+ rect[2] = rect[0] + (rect[3] - rect[1]); // make it square
+ }
+
+ var container = initContainer(item, false);
+ container.className = 'annotText';
+
+ var image = document.createElement('img');
+ image.style.height = container.style.height;
+ image.style.width = container.style.width;
+ var iconName = item.name;
+ image.src = PDFJS.imageResourcesPath + 'annotation-' +
+ iconName.toLowerCase() + '.svg';
+ image.alt = '[{{type}} Annotation]';
+ image.dataset.l10nId = 'text_annotation_type';
+ image.dataset.l10nArgs = JSON.stringify({type: iconName});
+
+ var contentWrapper = document.createElement('div');
+ contentWrapper.className = 'annotTextContentWrapper';
+ contentWrapper.style.left = Math.floor(rect[2] - rect[0] + 5) + 'px';
+ contentWrapper.style.top = '-10px';
+
+ var content = document.createElement('div');
+ content.className = 'annotTextContent';
+ content.setAttribute('hidden', true);
+
+ var i, ii;
+ if (item.hasBgColor) {
+ var color = item.color;
+
+ // Enlighten the color (70%)
+ var BACKGROUND_ENLIGHT = 0.7;
+ var r = BACKGROUND_ENLIGHT * (1.0 - color[0]) + color[0];
+ var g = BACKGROUND_ENLIGHT * (1.0 - color[1]) + color[1];
+ var b = BACKGROUND_ENLIGHT * (1.0 - color[2]) + color[2];
+ content.style.backgroundColor = Util.makeCssRgb((r * 255) | 0,
+ (g * 255) | 0,
+ (b * 255) | 0);
+ }
+
+ var title = document.createElement('h1');
+ var text = document.createElement('p');
+ title.textContent = item.title;
+
+ if (!item.content && !item.title) {
+ content.setAttribute('hidden', true);
+ } else {
+ var e = document.createElement('span');
+ var lines = item.content.split(/(?:\r\n?|\n)/);
+ for (i = 0, ii = lines.length; i < ii; ++i) {
+ var line = lines[i];
+ e.appendChild(document.createTextNode(line));
+ if (i < (ii - 1)) {
+ e.appendChild(document.createElement('br'));
+ }
+ }
+ text.appendChild(e);
+
+ var pinned = false;
+
+ var showAnnotation = function showAnnotation(pin) {
+ if (pin) {
+ pinned = true;
+ }
+ if (content.hasAttribute('hidden')) {
+ container.style.zIndex += 1;
+ content.removeAttribute('hidden');
+ }
+ };
+
+ var hideAnnotation = function hideAnnotation(unpin) {
+ if (unpin) {
+ pinned = false;
+ }
+ if (!content.hasAttribute('hidden') && !pinned) {
+ container.style.zIndex -= 1;
+ content.setAttribute('hidden', true);
+ }
+ };
+
+ var toggleAnnotation = function toggleAnnotation() {
+ if (pinned) {
+ hideAnnotation(true);
+ } else {
+ showAnnotation(true);
+ }
+ };
+
+ image.addEventListener('click', function image_clickHandler() {
+ toggleAnnotation();
+ }, false);
+ image.addEventListener('mouseover', function image_mouseOverHandler() {
+ showAnnotation();
+ }, false);
+ image.addEventListener('mouseout', function image_mouseOutHandler() {
+ hideAnnotation();
+ }, false);
+
+ content.addEventListener('click', function content_clickHandler() {
+ hideAnnotation(true);
+ }, false);
+ }
+
+ content.appendChild(title);
+ content.appendChild(text);
+ contentWrapper.appendChild(content);
+ container.appendChild(image);
+ container.appendChild(contentWrapper);
+
+ return container;
+ }
+
+ function getHtmlElementForLinkAnnotation(item) {
+ var container = initContainer(item, true);
+ container.className = 'annotLink';
+
+ var link = document.createElement('a');
+ link.href = link.title = item.url || '';
+ if (item.url && PDFJS.openExternalLinksInNewWindow) {
+ link.target = '_blank';
+ }
+
+ container.appendChild(link);
+
+ return container;
+ }
+
+ function getHtmlElement(data, objs) {
+ switch (data.annotationType) {
+ case AnnotationType.WIDGET:
+ return getHtmlElementForTextWidgetAnnotation(data, objs);
+ case AnnotationType.TEXT:
+ return getHtmlElementForTextAnnotation(data);
+ case AnnotationType.LINK:
+ return getHtmlElementForLinkAnnotation(data);
+ default:
+ throw new Error('Unsupported annotationType: ' + data.annotationType);
+ }
+ }
+
+ return {
+ getHtmlElement: getHtmlElement
+ };
+})();
+PDFJS.AnnotationUtils = AnnotationUtils;
+
+
+var SVG_DEFAULTS = {
+ fontStyle: 'normal',
+ fontWeight: 'normal',
+ fillColor: '#000000'
+};
+
+var convertImgDataToPng = (function convertImgDataToPngClosure() {
+ var PNG_HEADER =
+ new Uint8Array([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
+
+ var CHUNK_WRAPPER_SIZE = 12;
+
+ var crcTable = new Int32Array(256);
+ for (var i = 0; i < 256; i++) {
+ var c = i;
+ for (var h = 0; h < 8; h++) {
+ if (c & 1) {
+ c = 0xedB88320 ^ ((c >> 1) & 0x7fffffff);
+ } else {
+ c = (c >> 1) & 0x7fffffff;
+ }
+ }
+ crcTable[i] = c;
+ }
+
+ function crc32(data, start, end) {
+ var crc = -1;
+ for (var i = start; i < end; i++) {
+ var a = (crc ^ data[i]) & 0xff;
+ var b = crcTable[a];
+ crc = (crc >>> 8) ^ b;
+ }
+ return crc ^ -1;
+ }
+
+ function writePngChunk(type, body, data, offset) {
+ var p = offset;
+ var len = body.length;
+
+ data[p] = len >> 24 & 0xff;
+ data[p + 1] = len >> 16 & 0xff;
+ data[p + 2] = len >> 8 & 0xff;
+ data[p + 3] = len & 0xff;
+ p += 4;
+
+ data[p] = type.charCodeAt(0) & 0xff;
+ data[p + 1] = type.charCodeAt(1) & 0xff;
+ data[p + 2] = type.charCodeAt(2) & 0xff;
+ data[p + 3] = type.charCodeAt(3) & 0xff;
+ p += 4;
+
+ data.set(body, p);
+ p += body.length;
+
+ var crc = crc32(data, offset + 4, p);
+
+ data[p] = crc >> 24 & 0xff;
+ data[p + 1] = crc >> 16 & 0xff;
+ data[p + 2] = crc >> 8 & 0xff;
+ data[p + 3] = crc & 0xff;
+ }
+
+ function adler32(data, start, end) {
+ var a = 1;
+ var b = 0;
+ for (var i = start; i < end; ++i) {
+ a = (a + (data[i] & 0xff)) % 65521;
+ b = (b + a) % 65521;
+ }
+ return (b << 16) | a;
+ }
+
+ function encode(imgData, kind) {
+ var width = imgData.width;
+ var height = imgData.height;
+ var bitDepth, colorType, lineSize;
+ var bytes = imgData.data;
+
+ switch (kind) {
+ case ImageKind.GRAYSCALE_1BPP:
+ colorType = 0;
+ bitDepth = 1;
+ lineSize = (width + 7) >> 3;
+ break;
+ case ImageKind.RGB_24BPP:
+ colorType = 2;
+ bitDepth = 8;
+ lineSize = width * 3;
+ break;
+ case ImageKind.RGBA_32BPP:
+ colorType = 6;
+ bitDepth = 8;
+ lineSize = width * 4;
+ break;
+ default:
+ throw new Error('invalid format');
+ }
+
+ // prefix every row with predictor 0
+ var literals = new Uint8Array((1 + lineSize) * height);
+ var offsetLiterals = 0, offsetBytes = 0;
+ var y, i;
+ for (y = 0; y < height; ++y) {
+ literals[offsetLiterals++] = 0; // no prediction
+ literals.set(bytes.subarray(offsetBytes, offsetBytes + lineSize),
+ offsetLiterals);
+ offsetBytes += lineSize;
+ offsetLiterals += lineSize;
+ }
+
+ if (kind === ImageKind.GRAYSCALE_1BPP) {
+ // inverting for B/W
+ offsetLiterals = 0;
+ for (y = 0; y < height; y++) {
+ offsetLiterals++; // skipping predictor
+ for (i = 0; i < lineSize; i++) {
+ literals[offsetLiterals++] ^= 0xFF;
+ }
+ }
+ }
+
+ var ihdr = new Uint8Array([
+ width >> 24 & 0xff,
+ width >> 16 & 0xff,
+ width >> 8 & 0xff,
+ width & 0xff,
+ height >> 24 & 0xff,
+ height >> 16 & 0xff,
+ height >> 8 & 0xff,
+ height & 0xff,
+ bitDepth, // bit depth
+ colorType, // color type
+ 0x00, // compression method
+ 0x00, // filter method
+ 0x00 // interlace method
+ ]);
+
+ var len = literals.length;
+ var maxBlockLength = 0xFFFF;
+
+ var deflateBlocks = Math.ceil(len / maxBlockLength);
+ var idat = new Uint8Array(2 + len + deflateBlocks * 5 + 4);
+ var pi = 0;
+ idat[pi++] = 0x78; // compression method and flags
+ idat[pi++] = 0x9c; // flags
+
+ var pos = 0;
+ while (len > maxBlockLength) {
+ // writing non-final DEFLATE blocks type 0 and length of 65535
+ idat[pi++] = 0x00;
+ idat[pi++] = 0xff;
+ idat[pi++] = 0xff;
+ idat[pi++] = 0x00;
+ idat[pi++] = 0x00;
+ idat.set(literals.subarray(pos, pos + maxBlockLength), pi);
+ pi += maxBlockLength;
+ pos += maxBlockLength;
+ len -= maxBlockLength;
+ }
+
+ // writing non-final DEFLATE blocks type 0
+ idat[pi++] = 0x01;
+ idat[pi++] = len & 0xff;
+ idat[pi++] = len >> 8 & 0xff;
+ idat[pi++] = (~len & 0xffff) & 0xff;
+ idat[pi++] = (~len & 0xffff) >> 8 & 0xff;
+ idat.set(literals.subarray(pos), pi);
+ pi += literals.length - pos;
+
+ var adler = adler32(literals, 0, literals.length); // checksum
+ idat[pi++] = adler >> 24 & 0xff;
+ idat[pi++] = adler >> 16 & 0xff;
+ idat[pi++] = adler >> 8 & 0xff;
+ idat[pi++] = adler & 0xff;
+
+ // PNG will consists: header, IHDR+data, IDAT+data, and IEND.
+ var pngLength = PNG_HEADER.length + (CHUNK_WRAPPER_SIZE * 3) +
+ ihdr.length + idat.length;
+ var data = new Uint8Array(pngLength);
+ var offset = 0;
+ data.set(PNG_HEADER, offset);
+ offset += PNG_HEADER.length;
+ writePngChunk('IHDR', ihdr, data, offset);
+ offset += CHUNK_WRAPPER_SIZE + ihdr.length;
+ writePngChunk('IDATA', idat, data, offset);
+ offset += CHUNK_WRAPPER_SIZE + idat.length;
+ writePngChunk('IEND', new Uint8Array(0), data, offset);
+
+ return PDFJS.createObjectURL(data, 'image/png');
+ }
+
+ return function convertImgDataToPng(imgData) {
+ var kind = (imgData.kind === undefined ?
+ ImageKind.GRAYSCALE_1BPP : imgData.kind);
+ return encode(imgData, kind);
+ };
+})();
+
+var SVGExtraState = (function SVGExtraStateClosure() {
+ function SVGExtraState() {
+ this.fontSizeScale = 1;
+ this.fontWeight = SVG_DEFAULTS.fontWeight;
+ this.fontSize = 0;
+
+ this.textMatrix = IDENTITY_MATRIX;
+ this.fontMatrix = FONT_IDENTITY_MATRIX;
+ this.leading = 0;
+
+ // Current point (in user coordinates)
+ this.x = 0;
+ this.y = 0;
+
+ // Start of text line (in text coordinates)
+ this.lineX = 0;
+ this.lineY = 0;
+
+ // Character and word spacing
+ this.charSpacing = 0;
+ this.wordSpacing = 0;
+ this.textHScale = 1;
+ this.textRise = 0;
+
+ // Default foreground and background colors
+ this.fillColor = SVG_DEFAULTS.fillColor;
+ this.strokeColor = '#000000';
+
+ this.fillAlpha = 1;
+ this.strokeAlpha = 1;
+ this.lineWidth = 1;
+ this.lineJoin = '';
+ this.lineCap = '';
+ this.miterLimit = 0;
+
+ this.dashArray = [];
+ this.dashPhase = 0;
+
+ this.dependencies = [];
+
+ // Clipping
+ this.clipId = '';
+ this.pendingClip = false;
+
+ this.maskId = '';
+ }
+
+ SVGExtraState.prototype = {
+ clone: function SVGExtraState_clone() {
+ return Object.create(this);
+ },
+ setCurrentPoint: function SVGExtraState_setCurrentPoint(x, y) {
+ this.x = x;
+ this.y = y;
+ }
+ };
+ return SVGExtraState;
+})();
+
+var SVGGraphics = (function SVGGraphicsClosure() {
+ function createScratchSVG(width, height) {
+ var NS = 'http://www.w3.org/2000/svg';
+ var svg = document.createElementNS(NS, 'svg:svg');
+ svg.setAttributeNS(null, 'version', '1.1');
+ svg.setAttributeNS(null, 'width', width + 'px');
+ svg.setAttributeNS(null, 'height', height + 'px');
+ svg.setAttributeNS(null, 'viewBox', '0 0 ' + width + ' ' + height);
+ return svg;
+ }
+
+ function opListToTree(opList) {
+ var opTree = [];
+ var tmp = [];
+ var opListLen = opList.length;
+
+ for (var x = 0; x < opListLen; x++) {
+ if (opList[x].fn === 'save') {
+ opTree.push({'fnId': 92, 'fn': 'group', 'items': []});
+ tmp.push(opTree);
+ opTree = opTree[opTree.length - 1].items;
+ continue;
+ }
+
+ if(opList[x].fn === 'restore') {
+ opTree = tmp.pop();
+ } else {
+ opTree.push(opList[x]);
+ }
+ }
+ return opTree;
+ }
+
+ /**
+ * Formats float number.
+ * @param value {number} number to format.
+ * @returns {string}
+ */
+ function pf(value) {
+ if (value === (value | 0)) { // integer number
+ return value.toString();
+ }
+ var s = value.toFixed(10);
+ var i = s.length - 1;
+ if (s[i] !== '0') {
+ return s;
+ }
+ // removing trailing zeros
+ do {
+ i--;
+ } while (s[i] === '0');
+ return s.substr(0, s[i] === '.' ? i : i + 1);
+ }
+
+ /**
+ * Formats transform matrix. The standard rotation, scale and translate
+ * matrices are replaced by their shorter forms, and for identity matrix
+ * returns empty string to save the memory.
+ * @param m {Array} matrix to format.
+ * @returns {string}
+ */
+ function pm(m) {
+ if (m[4] === 0 && m[5] === 0) {
+ if (m[1] === 0 && m[2] === 0) {
+ if (m[0] === 1 && m[3] === 1) {
+ return '';
+ }
+ return 'scale(' + pf(m[0]) + ' ' + pf(m[3]) + ')';
+ }
+ if (m[0] === m[3] && m[1] === -m[2]) {
+ var a = Math.acos(m[0]) * 180 / Math.PI;
+ return 'rotate(' + pf(a) + ')';
+ }
+ } else {
+ if (m[0] === 1 && m[1] === 0 && m[2] === 0 && m[3] === 1) {
+ return 'translate(' + pf(m[4]) + ' ' + pf(m[5]) + ')';
+ }
+ }
+ return 'matrix(' + pf(m[0]) + ' ' + pf(m[1]) + ' ' + pf(m[2]) + ' ' +
+ pf(m[3]) + ' ' + pf(m[4]) + ' ' + pf(m[5]) + ')';
+ }
+
+ function SVGGraphics(commonObjs, objs) {
+ this.current = new SVGExtraState();
+ this.transformMatrix = IDENTITY_MATRIX; // Graphics state matrix
+ this.transformStack = [];
+ this.extraStack = [];
+ this.commonObjs = commonObjs;
+ this.objs = objs;
+ this.pendingEOFill = false;
+
+ this.embedFonts = false;
+ this.embeddedFonts = {};
+ this.cssStyle = null;
+ }
+
+ var NS = 'http://www.w3.org/2000/svg';
+ var XML_NS = 'http://www.w3.org/XML/1998/namespace';
+ var XLINK_NS = 'http://www.w3.org/1999/xlink';
+ var LINE_CAP_STYLES = ['butt', 'round', 'square'];
+ var LINE_JOIN_STYLES = ['miter', 'round', 'bevel'];
+ var clipCount = 0;
+ var maskCount = 0;
+
+ SVGGraphics.prototype = {
+ save: function SVGGraphics_save() {
+ this.transformStack.push(this.transformMatrix);
+ var old = this.current;
+ this.extraStack.push(old);
+ this.current = old.clone();
+ },
+
+ restore: function SVGGraphics_restore() {
+ this.transformMatrix = this.transformStack.pop();
+ this.current = this.extraStack.pop();
+
+ this.tgrp = document.createElementNS(NS, 'svg:g');
+ this.tgrp.setAttributeNS(null, 'transform', pm(this.transformMatrix));
+ this.pgrp.appendChild(this.tgrp);
+ },
+
+ group: function SVGGraphics_group(items) {
+ this.save();
+ this.executeOpTree(items);
+ this.restore();
+ },
+
+ loadDependencies: function SVGGraphics_loadDependencies(operatorList) {
+ var fnArray = operatorList.fnArray;
+ var fnArrayLen = fnArray.length;
+ var argsArray = operatorList.argsArray;
+
+ var self = this;
+ for (var i = 0; i < fnArrayLen; i++) {
+ if (OPS.dependency === fnArray[i]) {
+ var deps = argsArray[i];
+ for (var n = 0, nn = deps.length; n < nn; n++) {
+ var obj = deps[n];
+ var common = obj.substring(0, 2) === 'g_';
+ var promise;
+ if (common) {
+ promise = new Promise(function(resolve) {
+ self.commonObjs.get(obj, resolve);
+ });
+ } else {
+ promise = new Promise(function(resolve) {
+ self.objs.get(obj, resolve);
+ });
+ }
+ this.current.dependencies.push(promise);
+ }
+ }
+ }
+ return Promise.all(this.current.dependencies);
+ },
+
+ transform: function SVGGraphics_transform(a, b, c, d, e, f) {
+ var transformMatrix = [a, b, c, d, e, f];
+ this.transformMatrix = PDFJS.Util.transform(this.transformMatrix,
+ transformMatrix);
+
+ this.tgrp = document.createElementNS(NS, 'svg:g');
+ this.tgrp.setAttributeNS(null, 'transform', pm(this.transformMatrix));
+ },
+
+ getSVG: function SVGGraphics_getSVG(operatorList, viewport) {
+ this.svg = createScratchSVG(viewport.width, viewport.height);
+ this.viewport = viewport;
+
+ return this.loadDependencies(operatorList).then(function () {
+ this.transformMatrix = IDENTITY_MATRIX;
+ this.pgrp = document.createElementNS(NS, 'svg:g'); // Parent group
+ this.pgrp.setAttributeNS(null, 'transform', pm(viewport.transform));
+ this.tgrp = document.createElementNS(NS, 'svg:g'); // Transform group
+ this.tgrp.setAttributeNS(null, 'transform', pm(this.transformMatrix));
+ this.defs = document.createElementNS(NS, 'svg:defs');
+ this.pgrp.appendChild(this.defs);
+ this.pgrp.appendChild(this.tgrp);
+ this.svg.appendChild(this.pgrp);
+ var opTree = this.convertOpList(operatorList);
+ this.executeOpTree(opTree);
+ return this.svg;
+ }.bind(this));
+ },
+
+ convertOpList: function SVGGraphics_convertOpList(operatorList) {
+ var argsArray = operatorList.argsArray;
+ var fnArray = operatorList.fnArray;
+ var fnArrayLen = fnArray.length;
+ var REVOPS = [];
+ var opList = [];
+
+ for (var op in OPS) {
+ REVOPS[OPS[op]] = op;
+ }
+
+ for (var x = 0; x < fnArrayLen; x++) {
+ var fnId = fnArray[x];
+ opList.push({'fnId' : fnId, 'fn': REVOPS[fnId], 'args': argsArray[x]});
+ }
+ return opListToTree(opList);
+ },
+
+ executeOpTree: function SVGGraphics_executeOpTree(opTree) {
+ var opTreeLen = opTree.length;
+ for(var x = 0; x < opTreeLen; x++) {
+ var fn = opTree[x].fn;
+ var fnId = opTree[x].fnId;
+ var args = opTree[x].args;
+
+ switch (fnId | 0) {
+ case OPS.beginText:
+ this.beginText();
+ break;
+ case OPS.setLeading:
+ this.setLeading(args);
+ break;
+ case OPS.setLeadingMoveText:
+ this.setLeadingMoveText(args[0], args[1]);
+ break;
+ case OPS.setFont:
+ this.setFont(args);
+ break;
+ case OPS.showText:
+ this.showText(args[0]);
+ break;
+ case OPS.showSpacedText:
+ this.showText(args[0]);
+ break;
+ case OPS.endText:
+ this.endText();
+ break;
+ case OPS.moveText:
+ this.moveText(args[0], args[1]);
+ break;
+ case OPS.setCharSpacing:
+ this.setCharSpacing(args[0]);
+ break;
+ case OPS.setWordSpacing:
+ this.setWordSpacing(args[0]);
+ break;
+ case OPS.setHScale:
+ this.setHScale(args[0]);
+ break;
+ case OPS.setTextMatrix:
+ this.setTextMatrix(args[0], args[1], args[2],
+ args[3], args[4], args[5]);
+ break;
+ case OPS.setLineWidth:
+ this.setLineWidth(args[0]);
+ break;
+ case OPS.setLineJoin:
+ this.setLineJoin(args[0]);
+ break;
+ case OPS.setLineCap:
+ this.setLineCap(args[0]);
+ break;
+ case OPS.setMiterLimit:
+ this.setMiterLimit(args[0]);
+ break;
+ case OPS.setFillRGBColor:
+ this.setFillRGBColor(args[0], args[1], args[2]);
+ break;
+ case OPS.setStrokeRGBColor:
+ this.setStrokeRGBColor(args[0], args[1], args[2]);
+ break;
+ case OPS.setDash:
+ this.setDash(args[0], args[1]);
+ break;
+ case OPS.setGState:
+ this.setGState(args[0]);
+ break;
+ case OPS.fill:
+ this.fill();
+ break;
+ case OPS.eoFill:
+ this.eoFill();
+ break;
+ case OPS.stroke:
+ this.stroke();
+ break;
+ case OPS.fillStroke:
+ this.fillStroke();
+ break;
+ case OPS.eoFillStroke:
+ this.eoFillStroke();
+ break;
+ case OPS.clip:
+ this.clip('nonzero');
+ break;
+ case OPS.eoClip:
+ this.clip('evenodd');
+ break;
+ case OPS.paintSolidColorImageMask:
+ this.paintSolidColorImageMask();
+ break;
+ case OPS.paintJpegXObject:
+ this.paintJpegXObject(args[0], args[1], args[2]);
+ break;
+ case OPS.paintImageXObject:
+ this.paintImageXObject(args[0]);
+ break;
+ case OPS.paintInlineImageXObject:
+ this.paintInlineImageXObject(args[0]);
+ break;
+ case OPS.paintImageMaskXObject:
+ this.paintImageMaskXObject(args[0]);
+ break;
+ case OPS.paintFormXObjectBegin:
+ this.paintFormXObjectBegin(args[0], args[1]);
+ break;
+ case OPS.paintFormXObjectEnd:
+ this.paintFormXObjectEnd();
+ break;
+ case OPS.closePath:
+ this.closePath();
+ break;
+ case OPS.closeStroke:
+ this.closeStroke();
+ break;
+ case OPS.closeFillStroke:
+ this.closeFillStroke();
+ break;
+ case OPS.nextLine:
+ this.nextLine();
+ break;
+ case OPS.transform:
+ this.transform(args[0], args[1], args[2], args[3],
+ args[4], args[5]);
+ break;
+ case OPS.constructPath:
+ this.constructPath(args[0], args[1]);
+ break;
+ case OPS.endPath:
+ this.endPath();
+ break;
+ case 92:
+ this.group(opTree[x].items);
+ break;
+ default:
+ warn('Unimplemented method '+ fn);
+ break;
+ }
+ }
+ },
+
+ setWordSpacing: function SVGGraphics_setWordSpacing(wordSpacing) {
+ this.current.wordSpacing = wordSpacing;
+ },
+
+ setCharSpacing: function SVGGraphics_setCharSpacing(charSpacing) {
+ this.current.charSpacing = charSpacing;
+ },
+
+ nextLine: function SVGGraphics_nextLine() {
+ this.moveText(0, this.current.leading);
+ },
+
+ setTextMatrix: function SVGGraphics_setTextMatrix(a, b, c, d, e, f) {
+ var current = this.current;
+ this.current.textMatrix = this.current.lineMatrix = [a, b, c, d, e, f];
+
+ this.current.x = this.current.lineX = 0;
+ this.current.y = this.current.lineY = 0;
+
+ current.xcoords = [];
+ current.tspan = document.createElementNS(NS, 'svg:tspan');
+ current.tspan.setAttributeNS(null, 'font-family', current.fontFamily);
+ current.tspan.setAttributeNS(null, 'font-size',
+ pf(current.fontSize) + 'px');
+ current.tspan.setAttributeNS(null, 'y', pf(-current.y));
+
+ current.txtElement = document.createElementNS(NS, 'svg:text');
+ current.txtElement.appendChild(current.tspan);
+ },
+
+ beginText: function SVGGraphics_beginText() {
+ this.current.x = this.current.lineX = 0;
+ this.current.y = this.current.lineY = 0;
+ this.current.textMatrix = IDENTITY_MATRIX;
+ this.current.lineMatrix = IDENTITY_MATRIX;
+ this.current.tspan = document.createElementNS(NS, 'svg:tspan');
+ this.current.txtElement = document.createElementNS(NS, 'svg:text');
+ this.current.txtgrp = document.createElementNS(NS, 'svg:g');
+ this.current.xcoords = [];
+ },
+
+ moveText: function SVGGraphics_moveText(x, y) {
+ var current = this.current;
+ this.current.x = this.current.lineX += x;
+ this.current.y = this.current.lineY += y;
+
+ current.xcoords = [];
+ current.tspan = document.createElementNS(NS, 'svg:tspan');
+ current.tspan.setAttributeNS(null, 'font-family', current.fontFamily);
+ current.tspan.setAttributeNS(null, 'font-size',
+ pf(current.fontSize) + 'px');
+ current.tspan.setAttributeNS(null, 'y', pf(-current.y));
+ },
+
+ showText: function SVGGraphics_showText(glyphs) {
+ var current = this.current;
+ var font = current.font;
+ var fontSize = current.fontSize;
+
+ if (fontSize === 0) {
+ return;
+ }
+
+ var charSpacing = current.charSpacing;
+ var wordSpacing = current.wordSpacing;
+ var fontDirection = current.fontDirection;
+ var textHScale = current.textHScale * fontDirection;
+ var glyphsLength = glyphs.length;
+ var vertical = font.vertical;
+ var widthAdvanceScale = fontSize * current.fontMatrix[0];
+
+ var x = 0, i;
+ for (i = 0; i < glyphsLength; ++i) {
+ var glyph = glyphs[i];
+ if (glyph === null) {
+ // word break
+ x += fontDirection * wordSpacing;
+ continue;
+ } else if (isNum(glyph)) {
+ x += -glyph * fontSize * 0.001;
+ continue;
+ }
+ current.xcoords.push(current.x + x * textHScale);
+
+ var width = glyph.width;
+ var character = glyph.fontChar;
+ var charWidth = width * widthAdvanceScale + charSpacing * fontDirection;
+ x += charWidth;
+
+ current.tspan.textContent += character;
+ }
+ if (vertical) {
+ current.y -= x * textHScale;
+ } else {
+ current.x += x * textHScale;
+ }
+
+ current.tspan.setAttributeNS(null, 'x',
+ current.xcoords.map(pf).join(' '));
+ current.tspan.setAttributeNS(null, 'y', pf(-current.y));
+ current.tspan.setAttributeNS(null, 'font-family', current.fontFamily);
+ current.tspan.setAttributeNS(null, 'font-size',
+ pf(current.fontSize) + 'px');
+ if (current.fontStyle !== SVG_DEFAULTS.fontStyle) {
+ current.tspan.setAttributeNS(null, 'font-style', current.fontStyle);
+ }
+ if (current.fontWeight !== SVG_DEFAULTS.fontWeight) {
+ current.tspan.setAttributeNS(null, 'font-weight', current.fontWeight);
+ }
+ if (current.fillColor !== SVG_DEFAULTS.fillColor) {
+ current.tspan.setAttributeNS(null, 'fill', current.fillColor);
+ }
+
+ current.txtElement.setAttributeNS(null, 'transform',
+ pm(current.textMatrix) +
+ ' scale(1, -1)' );
+ current.txtElement.setAttributeNS(XML_NS, 'xml:space', 'preserve');
+ current.txtElement.appendChild(current.tspan);
+ current.txtgrp.appendChild(current.txtElement);
+
+ this.tgrp.appendChild(current.txtElement);
+
+ },
+
+ setLeadingMoveText: function SVGGraphics_setLeadingMoveText(x, y) {
+ this.setLeading(-y);
+ this.moveText(x, y);
+ },
+
+ addFontStyle: function SVGGraphics_addFontStyle(fontObj) {
+ if (!this.cssStyle) {
+ this.cssStyle = document.createElementNS(NS, 'svg:style');
+ this.cssStyle.setAttributeNS(null, 'type', 'text/css');
+ this.defs.appendChild(this.cssStyle);
+ }
+
+ var url = PDFJS.createObjectURL(fontObj.data, fontObj.mimetype);
+ this.cssStyle.textContent +=
+ '@font-face { font-family: "' + fontObj.loadedName + '";' +
+ ' src: url(' + url + '); }\n';
+ },
+
+ setFont: function SVGGraphics_setFont(details) {
+ var current = this.current;
+ var fontObj = this.commonObjs.get(details[0]);
+ var size = details[1];
+ this.current.font = fontObj;
+
+ if (this.embedFonts && fontObj.data &&
+ !this.embeddedFonts[fontObj.loadedName]) {
+ this.addFontStyle(fontObj);
+ this.embeddedFonts[fontObj.loadedName] = fontObj;
+ }
+
+ current.fontMatrix = (fontObj.fontMatrix ?
+ fontObj.fontMatrix : FONT_IDENTITY_MATRIX);
+
+ var bold = fontObj.black ? (fontObj.bold ? 'bolder' : 'bold') :
+ (fontObj.bold ? 'bold' : 'normal');
+ var italic = fontObj.italic ? 'italic' : 'normal';
+
+ if (size < 0) {
+ size = -size;
+ current.fontDirection = -1;
+ } else {
+ current.fontDirection = 1;
+ }
+ current.fontSize = size;
+ current.fontFamily = fontObj.loadedName;
+ current.fontWeight = bold;
+ current.fontStyle = italic;
+
+ current.tspan = document.createElementNS(NS, 'svg:tspan');
+ current.tspan.setAttributeNS(null, 'y', pf(-current.y));
+ current.xcoords = [];
+ },
+
+ endText: function SVGGraphics_endText() {
+ if (this.current.pendingClip) {
+ this.cgrp.appendChild(this.tgrp);
+ this.pgrp.appendChild(this.cgrp);
+ } else {
+ this.pgrp.appendChild(this.tgrp);
+ }
+ this.tgrp = document.createElementNS(NS, 'svg:g');
+ this.tgrp.setAttributeNS(null, 'transform', pm(this.transformMatrix));
+ },
+
+ // Path properties
+ setLineWidth: function SVGGraphics_setLineWidth(width) {
+ this.current.lineWidth = width;
+ },
+ setLineCap: function SVGGraphics_setLineCap(style) {
+ this.current.lineCap = LINE_CAP_STYLES[style];
+ },
+ setLineJoin: function SVGGraphics_setLineJoin(style) {
+ this.current.lineJoin = LINE_JOIN_STYLES[style];
+ },
+ setMiterLimit: function SVGGraphics_setMiterLimit(limit) {
+ this.current.miterLimit = limit;
+ },
+ setStrokeRGBColor: function SVGGraphics_setStrokeRGBColor(r, g, b) {
+ var color = Util.makeCssRgb(r, g, b);
+ this.current.strokeColor = color;
+ },
+ setFillRGBColor: function SVGGraphics_setFillRGBColor(r, g, b) {
+ var color = Util.makeCssRgb(r, g, b);
+ this.current.fillColor = color;
+ this.current.tspan = document.createElementNS(NS, 'svg:tspan');
+ this.current.xcoords = [];
+ },
+ setDash: function SVGGraphics_setDash(dashArray, dashPhase) {
+ this.current.dashArray = dashArray;
+ this.current.dashPhase = dashPhase;
+ },
+
+ constructPath: function SVGGraphics_constructPath(ops, args) {
+ var current = this.current;
+ var x = current.x, y = current.y;
+ current.path = document.createElementNS(NS, 'svg:path');
+ var d = [];
+ var opLength = ops.length;
+
+ for (var i = 0, j = 0; i < opLength; i++) {
+ switch (ops[i] | 0) {
+ case OPS.rectangle:
+ x = args[j++];
+ y = args[j++];
+ var width = args[j++];
+ var height = args[j++];
+ var xw = x + width;
+ var yh = y + height;
+ d.push('M', pf(x), pf(y), 'L', pf(xw) , pf(y), 'L', pf(xw), pf(yh),
+ 'L', pf(x), pf(yh), 'Z');
+ break;
+ case OPS.moveTo:
+ x = args[j++];
+ y = args[j++];
+ d.push('M', pf(x), pf(y));
+ break;
+ case OPS.lineTo:
+ x = args[j++];
+ y = args[j++];
+ d.push('L', pf(x) , pf(y));
+ break;
+ case OPS.curveTo:
+ x = args[j + 4];
+ y = args[j + 5];
+ d.push('C', pf(args[j]), pf(args[j + 1]), pf(args[j + 2]),
+ pf(args[j + 3]), pf(x), pf(y));
+ j += 6;
+ break;
+ case OPS.curveTo2:
+ x = args[j + 2];
+ y = args[j + 3];
+ d.push('C', pf(x), pf(y), pf(args[j]), pf(args[j + 1]),
+ pf(args[j + 2]), pf(args[j + 3]));
+ j += 4;
+ break;
+ case OPS.curveTo3:
+ x = args[j + 2];
+ y = args[j + 3];
+ d.push('C', pf(args[j]), pf(args[j + 1]), pf(x), pf(y),
+ pf(x), pf(y));
+ j += 4;
+ break;
+ case OPS.closePath:
+ d.push('Z');
+ break;
+ }
+ }
+ current.path.setAttributeNS(null, 'd', d.join(' '));
+ current.path.setAttributeNS(null, 'stroke-miterlimit',
+ pf(current.miterLimit));
+ current.path.setAttributeNS(null, 'stroke-linecap', current.lineCap);
+ current.path.setAttributeNS(null, 'stroke-linejoin', current.lineJoin);
+ current.path.setAttributeNS(null, 'stroke-width',
+ pf(current.lineWidth) + 'px');
+ current.path.setAttributeNS(null, 'stroke-dasharray',
+ current.dashArray.map(pf).join(' '));
+ current.path.setAttributeNS(null, 'stroke-dashoffset',
+ pf(current.dashPhase) + 'px');
+ current.path.setAttributeNS(null, 'fill', 'none');
+
+ this.tgrp.appendChild(current.path);
+ if (current.pendingClip) {
+ this.cgrp.appendChild(this.tgrp);
+ this.pgrp.appendChild(this.cgrp);
+ } else {
+ this.pgrp.appendChild(this.tgrp);
+ }
+ // Saving a reference in current.element so that it can be addressed
+ // in 'fill' and 'stroke'
+ current.element = current.path;
+ current.setCurrentPoint(x, y);
+ },
+
+ endPath: function SVGGraphics_endPath() {
+ var current = this.current;
+ if (current.pendingClip) {
+ this.cgrp.appendChild(this.tgrp);
+ this.pgrp.appendChild(this.cgrp);
+ } else {
+ this.pgrp.appendChild(this.tgrp);
+ }
+ this.tgrp = document.createElementNS(NS, 'svg:g');
+ this.tgrp.setAttributeNS(null, 'transform', pm(this.transformMatrix));
+ },
+
+ clip: function SVGGraphics_clip(type) {
+ var current = this.current;
+ // Add current path to clipping path
+ current.clipId = 'clippath' + clipCount;
+ clipCount++;
+ this.clippath = document.createElementNS(NS, 'svg:clipPath');
+ this.clippath.setAttributeNS(null, 'id', current.clipId);
+ var clipElement = current.element.cloneNode();
+ if (type === 'evenodd') {
+ clipElement.setAttributeNS(null, 'clip-rule', 'evenodd');
+ } else {
+ clipElement.setAttributeNS(null, 'clip-rule', 'nonzero');
+ }
+ this.clippath.setAttributeNS(null, 'transform', pm(this.transformMatrix));
+ this.clippath.appendChild(clipElement);
+ this.defs.appendChild(this.clippath);
+
+ // Create a new group with that attribute
+ current.pendingClip = true;
+ this.cgrp = document.createElementNS(NS, 'svg:g');
+ this.cgrp.setAttributeNS(null, 'clip-path',
+ 'url(#' + current.clipId + ')');
+ this.pgrp.appendChild(this.cgrp);
+ },
+
+ closePath: function SVGGraphics_closePath() {
+ var current = this.current;
+ var d = current.path.getAttributeNS(null, 'd');
+ d += 'Z';
+ current.path.setAttributeNS(null, 'd', d);
+ },
+
+ setLeading: function SVGGraphics_setLeading(leading) {
+ this.current.leading = -leading;
+ },
+
+ setTextRise: function SVGGraphics_setTextRise(textRise) {
+ this.current.textRise = textRise;
+ },
+
+ setHScale: function SVGGraphics_setHScale(scale) {
+ this.current.textHScale = scale / 100;
+ },
+
+ setGState: function SVGGraphics_setGState(states) {
+ for (var i = 0, ii = states.length; i < ii; i++) {
+ var state = states[i];
+ var key = state[0];
+ var value = state[1];
+
+ switch (key) {
+ case 'LW':
+ this.setLineWidth(value);
+ break;
+ case 'LC':
+ this.setLineCap(value);
+ break;
+ case 'LJ':
+ this.setLineJoin(value);
+ break;
+ case 'ML':
+ this.setMiterLimit(value);
+ break;
+ case 'D':
+ this.setDash(value[0], value[1]);
+ break;
+ case 'RI':
+ break;
+ case 'FL':
+ break;
+ case 'Font':
+ this.setFont(value);
+ break;
+ case 'CA':
+ break;
+ case 'ca':
+ break;
+ case 'BM':
+ break;
+ case 'SMask':
+ break;
+ }
+ }
+ },
+
+ fill: function SVGGraphics_fill() {
+ var current = this.current;
+ current.element.setAttributeNS(null, 'fill', current.fillColor);
+ },
+
+ stroke: function SVGGraphics_stroke() {
+ var current = this.current;
+ current.element.setAttributeNS(null, 'stroke', current.strokeColor);
+ current.element.setAttributeNS(null, 'fill', 'none');
+ },
+
+ eoFill: function SVGGraphics_eoFill() {
+ var current = this.current;
+ current.element.setAttributeNS(null, 'fill', current.fillColor);
+ current.element.setAttributeNS(null, 'fill-rule', 'evenodd');
+ },
+
+ fillStroke: function SVGGraphics_fillStroke() {
+ // Order is important since stroke wants fill to be none.
+ // First stroke, then if fill needed, it will be overwritten.
+ this.stroke();
+ this.fill();
+ },
+
+ eoFillStroke: function SVGGraphics_eoFillStroke() {
+ this.current.element.setAttributeNS(null, 'fill-rule', 'evenodd');
+ this.fillStroke();
+ },
+
+ closeStroke: function SVGGraphics_closeStroke() {
+ this.closePath();
+ this.stroke();
+ },
+
+ closeFillStroke: function SVGGraphics_closeFillStroke() {
+ this.closePath();
+ this.fillStroke();
+ },
+
+ paintSolidColorImageMask:
+ function SVGGraphics_paintSolidColorImageMask() {
+ var current = this.current;
+ var rect = document.createElementNS(NS, 'svg:rect');
+ rect.setAttributeNS(null, 'x', '0');
+ rect.setAttributeNS(null, 'y', '0');
+ rect.setAttributeNS(null, 'width', '1px');
+ rect.setAttributeNS(null, 'height', '1px');
+ rect.setAttributeNS(null, 'fill', current.fillColor);
+ this.tgrp.appendChild(rect);
+ },
+
+ paintJpegXObject: function SVGGraphics_paintJpegXObject(objId, w, h) {
+ var current = this.current;
+ var imgObj = this.objs.get(objId);
+ var imgEl = document.createElementNS(NS, 'svg:image');
+ imgEl.setAttributeNS(XLINK_NS, 'xlink:href', imgObj.src);
+ imgEl.setAttributeNS(null, 'width', imgObj.width + 'px');
+ imgEl.setAttributeNS(null, 'height', imgObj.height + 'px');
+ imgEl.setAttributeNS(null, 'x', '0');
+ imgEl.setAttributeNS(null, 'y', pf(-h));
+ imgEl.setAttributeNS(null, 'transform',
+ 'scale(' + pf(1 / w) + ' ' + pf(-1 / h) + ')');
+
+ this.tgrp.appendChild(imgEl);
+ if (current.pendingClip) {
+ this.cgrp.appendChild(this.tgrp);
+ this.pgrp.appendChild(this.cgrp);
+ } else {
+ this.pgrp.appendChild(this.tgrp);
+ }
+ },
+
+ paintImageXObject: function SVGGraphics_paintImageXObject(objId) {
+ var imgData = this.objs.get(objId);
+ if (!imgData) {
+ warn('Dependent image isn\'t ready yet');
+ return;
+ }
+ this.paintInlineImageXObject(imgData);
+ },
+
+ paintInlineImageXObject:
+ function SVGGraphics_paintInlineImageXObject(imgData, mask) {
+ var current = this.current;
+ var width = imgData.width;
+ var height = imgData.height;
+
+ var imgSrc = convertImgDataToPng(imgData);
+ var cliprect = document.createElementNS(NS, 'svg:rect');
+ cliprect.setAttributeNS(null, 'x', '0');
+ cliprect.setAttributeNS(null, 'y', '0');
+ cliprect.setAttributeNS(null, 'width', pf(width));
+ cliprect.setAttributeNS(null, 'height', pf(height));
+ current.element = cliprect;
+ this.clip('nonzero');
+ var imgEl = document.createElementNS(NS, 'svg:image');
+ imgEl.setAttributeNS(XLINK_NS, 'xlink:href', imgSrc);
+ imgEl.setAttributeNS(null, 'x', '0');
+ imgEl.setAttributeNS(null, 'y', pf(-height));
+ imgEl.setAttributeNS(null, 'width', pf(width) + 'px');
+ imgEl.setAttributeNS(null, 'height', pf(height) + 'px');
+ imgEl.setAttributeNS(null, 'transform',
+ 'scale(' + pf(1 / width) + ' ' +
+ pf(-1 / height) + ')');
+ if (mask) {
+ mask.appendChild(imgEl);
+ } else {
+ this.tgrp.appendChild(imgEl);
+ }
+ if (current.pendingClip) {
+ this.cgrp.appendChild(this.tgrp);
+ this.pgrp.appendChild(this.cgrp);
+ } else {
+ this.pgrp.appendChild(this.tgrp);
+ }
+ },
+
+ paintImageMaskXObject:
+ function SVGGraphics_paintImageMaskXObject(imgData) {
+ var current = this.current;
+ var width = imgData.width;
+ var height = imgData.height;
+ var fillColor = current.fillColor;
+
+ current.maskId = 'mask' + maskCount++;
+ var mask = document.createElementNS(NS, 'svg:mask');
+ mask.setAttributeNS(null, 'id', current.maskId);
+
+ var rect = document.createElementNS(NS, 'svg:rect');
+ rect.setAttributeNS(null, 'x', '0');
+ rect.setAttributeNS(null, 'y', '0');
+ rect.setAttributeNS(null, 'width', pf(width));
+ rect.setAttributeNS(null, 'height', pf(height));
+ rect.setAttributeNS(null, 'fill', fillColor);
+ rect.setAttributeNS(null, 'mask', 'url(#' + current.maskId +')');
+ this.defs.appendChild(mask);
+ this.tgrp.appendChild(rect);
+
+ this.paintInlineImageXObject(imgData, mask);
+ },
+
+ paintFormXObjectBegin:
+ function SVGGraphics_paintFormXObjectBegin(matrix, bbox) {
+ this.save();
+
+ if (isArray(matrix) && matrix.length === 6) {
+ this.transform(matrix[0], matrix[1], matrix[2],
+ matrix[3], matrix[4], matrix[5]);
+ }
+
+ if (isArray(bbox) && bbox.length === 4) {
+ var width = bbox[2] - bbox[0];
+ var height = bbox[3] - bbox[1];
+
+ var cliprect = document.createElementNS(NS, 'svg:rect');
+ cliprect.setAttributeNS(null, 'x', bbox[0]);
+ cliprect.setAttributeNS(null, 'y', bbox[1]);
+ cliprect.setAttributeNS(null, 'width', pf(width));
+ cliprect.setAttributeNS(null, 'height', pf(height));
+ this.current.element = cliprect;
+ this.clip('nonzero');
+ this.endPath();
+ }
+ },
+
+ paintFormXObjectEnd:
+ function SVGGraphics_paintFormXObjectEnd() {
+ this.restore();
+ }
+ };
+ return SVGGraphics;
+})();
+
+PDFJS.SVGGraphics = SVGGraphics;
+
+
+}).call((typeof window === 'undefined') ? this : window);
+
+if (!PDFJS.workerSrc && typeof document !== 'undefined') {
+ // workerSrc is not set -- using last script url to define default location
+ PDFJS.workerSrc = (function () {
+ 'use strict';
+ var scriptTagContainer = document.body ||
+ document.getElementsByTagName('head')[0];
+ var pdfjsSrc = scriptTagContainer.lastChild.src;
+ return pdfjsSrc && pdfjsSrc.replace(/\.js$/i, '.worker.js');
+ })();
+}
+
+
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/build/pdf.worker.js b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/build/pdf.worker.js
new file mode 100644
index 0000000..c025c14
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/build/pdf.worker.js
@@ -0,0 +1,39372 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+/* Copyright 2012 Mozilla Foundation
+ *
+ * Licensed 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.
+ */
+/*jshint globalstrict: false */
+/* globals PDFJS */
+
+// Initializing PDFJS global object (if still undefined)
+if (typeof PDFJS === 'undefined') {
+ (typeof window !== 'undefined' ? window : this).PDFJS = {};
+}
+
+PDFJS.version = '1.1.159';
+PDFJS.build = '82536f8';
+
+(function pdfjsWrapper() {
+ // Use strict in our context only - users might not want it
+ 'use strict';
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+/* Copyright 2012 Mozilla Foundation
+ *
+ * Licensed 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.
+ */
+/* globals Cmd, ColorSpace, Dict, MozBlobBuilder, Name, PDFJS, Ref, URL,
+ Promise */
+
+'use strict';
+
+var globalScope = (typeof window === 'undefined') ? this : window;
+
+var isWorker = (typeof window === 'undefined');
+
+var FONT_IDENTITY_MATRIX = [0.001, 0, 0, 0.001, 0, 0];
+
+var TextRenderingMode = {
+ FILL: 0,
+ STROKE: 1,
+ FILL_STROKE: 2,
+ INVISIBLE: 3,
+ FILL_ADD_TO_PATH: 4,
+ STROKE_ADD_TO_PATH: 5,
+ FILL_STROKE_ADD_TO_PATH: 6,
+ ADD_TO_PATH: 7,
+ FILL_STROKE_MASK: 3,
+ ADD_TO_PATH_FLAG: 4
+};
+
+var ImageKind = {
+ GRAYSCALE_1BPP: 1,
+ RGB_24BPP: 2,
+ RGBA_32BPP: 3
+};
+
+var AnnotationType = {
+ WIDGET: 1,
+ TEXT: 2,
+ LINK: 3
+};
+
+var StreamType = {
+ UNKNOWN: 0,
+ FLATE: 1,
+ LZW: 2,
+ DCT: 3,
+ JPX: 4,
+ JBIG: 5,
+ A85: 6,
+ AHX: 7,
+ CCF: 8,
+ RL: 9
+};
+
+var FontType = {
+ UNKNOWN: 0,
+ TYPE1: 1,
+ TYPE1C: 2,
+ CIDFONTTYPE0: 3,
+ CIDFONTTYPE0C: 4,
+ TRUETYPE: 5,
+ CIDFONTTYPE2: 6,
+ TYPE3: 7,
+ OPENTYPE: 8,
+ TYPE0: 9,
+ MMTYPE1: 10
+};
+
+// The global PDFJS object exposes the API
+// In production, it will be declared outside a global wrapper
+// In development, it will be declared here
+if (!globalScope.PDFJS) {
+ globalScope.PDFJS = {};
+}
+
+globalScope.PDFJS.pdfBug = false;
+
+PDFJS.VERBOSITY_LEVELS = {
+ errors: 0,
+ warnings: 1,
+ infos: 5
+};
+
+// All the possible operations for an operator list.
+var OPS = PDFJS.OPS = {
+ // Intentionally start from 1 so it is easy to spot bad operators that will be
+ // 0's.
+ dependency: 1,
+ setLineWidth: 2,
+ setLineCap: 3,
+ setLineJoin: 4,
+ setMiterLimit: 5,
+ setDash: 6,
+ setRenderingIntent: 7,
+ setFlatness: 8,
+ setGState: 9,
+ save: 10,
+ restore: 11,
+ transform: 12,
+ moveTo: 13,
+ lineTo: 14,
+ curveTo: 15,
+ curveTo2: 16,
+ curveTo3: 17,
+ closePath: 18,
+ rectangle: 19,
+ stroke: 20,
+ closeStroke: 21,
+ fill: 22,
+ eoFill: 23,
+ fillStroke: 24,
+ eoFillStroke: 25,
+ closeFillStroke: 26,
+ closeEOFillStroke: 27,
+ endPath: 28,
+ clip: 29,
+ eoClip: 30,
+ beginText: 31,
+ endText: 32,
+ setCharSpacing: 33,
+ setWordSpacing: 34,
+ setHScale: 35,
+ setLeading: 36,
+ setFont: 37,
+ setTextRenderingMode: 38,
+ setTextRise: 39,
+ moveText: 40,
+ setLeadingMoveText: 41,
+ setTextMatrix: 42,
+ nextLine: 43,
+ showText: 44,
+ showSpacedText: 45,
+ nextLineShowText: 46,
+ nextLineSetSpacingShowText: 47,
+ setCharWidth: 48,
+ setCharWidthAndBounds: 49,
+ setStrokeColorSpace: 50,
+ setFillColorSpace: 51,
+ setStrokeColor: 52,
+ setStrokeColorN: 53,
+ setFillColor: 54,
+ setFillColorN: 55,
+ setStrokeGray: 56,
+ setFillGray: 57,
+ setStrokeRGBColor: 58,
+ setFillRGBColor: 59,
+ setStrokeCMYKColor: 60,
+ setFillCMYKColor: 61,
+ shadingFill: 62,
+ beginInlineImage: 63,
+ beginImageData: 64,
+ endInlineImage: 65,
+ paintXObject: 66,
+ markPoint: 67,
+ markPointProps: 68,
+ beginMarkedContent: 69,
+ beginMarkedContentProps: 70,
+ endMarkedContent: 71,
+ beginCompat: 72,
+ endCompat: 73,
+ paintFormXObjectBegin: 74,
+ paintFormXObjectEnd: 75,
+ beginGroup: 76,
+ endGroup: 77,
+ beginAnnotations: 78,
+ endAnnotations: 79,
+ beginAnnotation: 80,
+ endAnnotation: 81,
+ paintJpegXObject: 82,
+ paintImageMaskXObject: 83,
+ paintImageMaskXObjectGroup: 84,
+ paintImageXObject: 85,
+ paintInlineImageXObject: 86,
+ paintInlineImageXObjectGroup: 87,
+ paintImageXObjectRepeat: 88,
+ paintImageMaskXObjectRepeat: 89,
+ paintSolidColorImageMask: 90,
+ constructPath: 91
+};
+
+// A notice for devs. These are good for things that are helpful to devs, such
+// as warning that Workers were disabled, which is important to devs but not
+// end users.
+function info(msg) {
+ if (PDFJS.verbosity >= PDFJS.VERBOSITY_LEVELS.infos) {
+ console.log('Info: ' + msg);
+ }
+}
+
+// Non-fatal warnings.
+function warn(msg) {
+ if (PDFJS.verbosity >= PDFJS.VERBOSITY_LEVELS.warnings) {
+ console.log('Warning: ' + msg);
+ }
+}
+
+// Fatal errors that should trigger the fallback UI and halt execution by
+// throwing an exception.
+function error(msg) {
+ if (PDFJS.verbosity >= PDFJS.VERBOSITY_LEVELS.errors) {
+ console.log('Error: ' + msg);
+ console.log(backtrace());
+ }
+ UnsupportedManager.notify(UNSUPPORTED_FEATURES.unknown);
+ throw new Error(msg);
+}
+
+function backtrace() {
+ try {
+ throw new Error();
+ } catch (e) {
+ return e.stack ? e.stack.split('\n').slice(2).join('\n') : '';
+ }
+}
+
+function assert(cond, msg) {
+ if (!cond) {
+ error(msg);
+ }
+}
+
+var UNSUPPORTED_FEATURES = PDFJS.UNSUPPORTED_FEATURES = {
+ unknown: 'unknown',
+ forms: 'forms',
+ javaScript: 'javaScript',
+ smask: 'smask',
+ shadingPattern: 'shadingPattern',
+ font: 'font'
+};
+
+var UnsupportedManager = PDFJS.UnsupportedManager =
+ (function UnsupportedManagerClosure() {
+ var listeners = [];
+ return {
+ listen: function (cb) {
+ listeners.push(cb);
+ },
+ notify: function (featureId) {
+ warn('Unsupported feature "' + featureId + '"');
+ for (var i = 0, ii = listeners.length; i < ii; i++) {
+ listeners[i](featureId);
+ }
+ }
+ };
+})();
+
+// Combines two URLs. The baseUrl shall be absolute URL. If the url is an
+// absolute URL, it will be returned as is.
+function combineUrl(baseUrl, url) {
+ if (!url) {
+ return baseUrl;
+ }
+ if (/^[a-z][a-z0-9+\-.]*:/i.test(url)) {
+ return url;
+ }
+ var i;
+ if (url.charAt(0) === '/') {
+ // absolute path
+ i = baseUrl.indexOf('://');
+ if (url.charAt(1) === '/') {
+ ++i;
+ } else {
+ i = baseUrl.indexOf('/', i + 3);
+ }
+ return baseUrl.substring(0, i) + url;
+ } else {
+ // relative path
+ var pathLength = baseUrl.length;
+ i = baseUrl.lastIndexOf('#');
+ pathLength = i >= 0 ? i : pathLength;
+ i = baseUrl.lastIndexOf('?', pathLength);
+ pathLength = i >= 0 ? i : pathLength;
+ var prefixLength = baseUrl.lastIndexOf('/', pathLength);
+ return baseUrl.substring(0, prefixLength + 1) + url;
+ }
+}
+
+// Validates if URL is safe and allowed, e.g. to avoid XSS.
+function isValidUrl(url, allowRelative) {
+ if (!url) {
+ return false;
+ }
+ // RFC 3986 (http://tools.ietf.org/html/rfc3986#section-3.1)
+ // scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
+ var protocol = /^[a-z][a-z0-9+\-.]*(?=:)/i.exec(url);
+ if (!protocol) {
+ return allowRelative;
+ }
+ protocol = protocol[0].toLowerCase();
+ switch (protocol) {
+ case 'http':
+ case 'https':
+ case 'ftp':
+ case 'mailto':
+ case 'tel':
+ return true;
+ default:
+ return false;
+ }
+}
+PDFJS.isValidUrl = isValidUrl;
+
+function shadow(obj, prop, value) {
+ Object.defineProperty(obj, prop, { value: value,
+ enumerable: true,
+ configurable: true,
+ writable: false });
+ return value;
+}
+PDFJS.shadow = shadow;
+
+var PasswordResponses = PDFJS.PasswordResponses = {
+ NEED_PASSWORD: 1,
+ INCORRECT_PASSWORD: 2
+};
+
+var PasswordException = (function PasswordExceptionClosure() {
+ function PasswordException(msg, code) {
+ this.name = 'PasswordException';
+ this.message = msg;
+ this.code = code;
+ }
+
+ PasswordException.prototype = new Error();
+ PasswordException.constructor = PasswordException;
+
+ return PasswordException;
+})();
+PDFJS.PasswordException = PasswordException;
+
+var UnknownErrorException = (function UnknownErrorExceptionClosure() {
+ function UnknownErrorException(msg, details) {
+ this.name = 'UnknownErrorException';
+ this.message = msg;
+ this.details = details;
+ }
+
+ UnknownErrorException.prototype = new Error();
+ UnknownErrorException.constructor = UnknownErrorException;
+
+ return UnknownErrorException;
+})();
+PDFJS.UnknownErrorException = UnknownErrorException;
+
+var InvalidPDFException = (function InvalidPDFExceptionClosure() {
+ function InvalidPDFException(msg) {
+ this.name = 'InvalidPDFException';
+ this.message = msg;
+ }
+
+ InvalidPDFException.prototype = new Error();
+ InvalidPDFException.constructor = InvalidPDFException;
+
+ return InvalidPDFException;
+})();
+PDFJS.InvalidPDFException = InvalidPDFException;
+
+var MissingPDFException = (function MissingPDFExceptionClosure() {
+ function MissingPDFException(msg) {
+ this.name = 'MissingPDFException';
+ this.message = msg;
+ }
+
+ MissingPDFException.prototype = new Error();
+ MissingPDFException.constructor = MissingPDFException;
+
+ return MissingPDFException;
+})();
+PDFJS.MissingPDFException = MissingPDFException;
+
+var UnexpectedResponseException =
+ (function UnexpectedResponseExceptionClosure() {
+ function UnexpectedResponseException(msg, status) {
+ this.name = 'UnexpectedResponseException';
+ this.message = msg;
+ this.status = status;
+ }
+
+ UnexpectedResponseException.prototype = new Error();
+ UnexpectedResponseException.constructor = UnexpectedResponseException;
+
+ return UnexpectedResponseException;
+})();
+PDFJS.UnexpectedResponseException = UnexpectedResponseException;
+
+var NotImplementedException = (function NotImplementedExceptionClosure() {
+ function NotImplementedException(msg) {
+ this.message = msg;
+ }
+
+ NotImplementedException.prototype = new Error();
+ NotImplementedException.prototype.name = 'NotImplementedException';
+ NotImplementedException.constructor = NotImplementedException;
+
+ return NotImplementedException;
+})();
+
+var MissingDataException = (function MissingDataExceptionClosure() {
+ function MissingDataException(begin, end) {
+ this.begin = begin;
+ this.end = end;
+ this.message = 'Missing data [' + begin + ', ' + end + ')';
+ }
+
+ MissingDataException.prototype = new Error();
+ MissingDataException.prototype.name = 'MissingDataException';
+ MissingDataException.constructor = MissingDataException;
+
+ return MissingDataException;
+})();
+
+var XRefParseException = (function XRefParseExceptionClosure() {
+ function XRefParseException(msg) {
+ this.message = msg;
+ }
+
+ XRefParseException.prototype = new Error();
+ XRefParseException.prototype.name = 'XRefParseException';
+ XRefParseException.constructor = XRefParseException;
+
+ return XRefParseException;
+})();
+
+
+function bytesToString(bytes) {
+ assert(bytes !== null && typeof bytes === 'object' &&
+ bytes.length !== undefined, 'Invalid argument for bytesToString');
+ var length = bytes.length;
+ var MAX_ARGUMENT_COUNT = 8192;
+ if (length < MAX_ARGUMENT_COUNT) {
+ return String.fromCharCode.apply(null, bytes);
+ }
+ var strBuf = [];
+ for (var i = 0; i < length; i += MAX_ARGUMENT_COUNT) {
+ var chunkEnd = Math.min(i + MAX_ARGUMENT_COUNT, length);
+ var chunk = bytes.subarray(i, chunkEnd);
+ strBuf.push(String.fromCharCode.apply(null, chunk));
+ }
+ return strBuf.join('');
+}
+
+function stringToBytes(str) {
+ assert(typeof str === 'string', 'Invalid argument for stringToBytes');
+ var length = str.length;
+ var bytes = new Uint8Array(length);
+ for (var i = 0; i < length; ++i) {
+ bytes[i] = str.charCodeAt(i) & 0xFF;
+ }
+ return bytes;
+}
+
+function string32(value) {
+ return String.fromCharCode((value >> 24) & 0xff, (value >> 16) & 0xff,
+ (value >> 8) & 0xff, value & 0xff);
+}
+
+function log2(x) {
+ var n = 1, i = 0;
+ while (x > n) {
+ n <<= 1;
+ i++;
+ }
+ return i;
+}
+
+function readInt8(data, start) {
+ return (data[start] << 24) >> 24;
+}
+
+function readUint16(data, offset) {
+ return (data[offset] << 8) | data[offset + 1];
+}
+
+function readUint32(data, offset) {
+ return ((data[offset] << 24) | (data[offset + 1] << 16) |
+ (data[offset + 2] << 8) | data[offset + 3]) >>> 0;
+}
+
+// Lazy test the endianness of the platform
+// NOTE: This will be 'true' for simulated TypedArrays
+function isLittleEndian() {
+ var buffer8 = new Uint8Array(2);
+ buffer8[0] = 1;
+ var buffer16 = new Uint16Array(buffer8.buffer);
+ return (buffer16[0] === 1);
+}
+
+Object.defineProperty(PDFJS, 'isLittleEndian', {
+ configurable: true,
+ get: function PDFJS_isLittleEndian() {
+ return shadow(PDFJS, 'isLittleEndian', isLittleEndian());
+ }
+});
+
+ // Lazy test if the userAgant support CanvasTypedArrays
+function hasCanvasTypedArrays() {
+ var canvas = document.createElement('canvas');
+ canvas.width = canvas.height = 1;
+ var ctx = canvas.getContext('2d');
+ var imageData = ctx.createImageData(1, 1);
+ return (typeof imageData.data.buffer !== 'undefined');
+}
+
+Object.defineProperty(PDFJS, 'hasCanvasTypedArrays', {
+ configurable: true,
+ get: function PDFJS_hasCanvasTypedArrays() {
+ return shadow(PDFJS, 'hasCanvasTypedArrays', hasCanvasTypedArrays());
+ }
+});
+
+var Uint32ArrayView = (function Uint32ArrayViewClosure() {
+
+ function Uint32ArrayView(buffer, length) {
+ this.buffer = buffer;
+ this.byteLength = buffer.length;
+ this.length = length === undefined ? (this.byteLength >> 2) : length;
+ ensureUint32ArrayViewProps(this.length);
+ }
+ Uint32ArrayView.prototype = Object.create(null);
+
+ var uint32ArrayViewSetters = 0;
+ function createUint32ArrayProp(index) {
+ return {
+ get: function () {
+ var buffer = this.buffer, offset = index << 2;
+ return (buffer[offset] | (buffer[offset + 1] << 8) |
+ (buffer[offset + 2] << 16) | (buffer[offset + 3] << 24)) >>> 0;
+ },
+ set: function (value) {
+ var buffer = this.buffer, offset = index << 2;
+ buffer[offset] = value & 255;
+ buffer[offset + 1] = (value >> 8) & 255;
+ buffer[offset + 2] = (value >> 16) & 255;
+ buffer[offset + 3] = (value >>> 24) & 255;
+ }
+ };
+ }
+
+ function ensureUint32ArrayViewProps(length) {
+ while (uint32ArrayViewSetters < length) {
+ Object.defineProperty(Uint32ArrayView.prototype,
+ uint32ArrayViewSetters,
+ createUint32ArrayProp(uint32ArrayViewSetters));
+ uint32ArrayViewSetters++;
+ }
+ }
+
+ return Uint32ArrayView;
+})();
+
+var IDENTITY_MATRIX = [1, 0, 0, 1, 0, 0];
+
+var Util = PDFJS.Util = (function UtilClosure() {
+ function Util() {}
+
+ var rgbBuf = ['rgb(', 0, ',', 0, ',', 0, ')'];
+
+ // makeCssRgb() can be called thousands of times. Using |rgbBuf| avoids
+ // creating many intermediate strings.
+ Util.makeCssRgb = function Util_makeCssRgb(r, g, b) {
+ rgbBuf[1] = r;
+ rgbBuf[3] = g;
+ rgbBuf[5] = b;
+ return rgbBuf.join('');
+ };
+
+ // Concatenates two transformation matrices together and returns the result.
+ Util.transform = function Util_transform(m1, m2) {
+ return [
+ m1[0] * m2[0] + m1[2] * m2[1],
+ m1[1] * m2[0] + m1[3] * m2[1],
+ m1[0] * m2[2] + m1[2] * m2[3],
+ m1[1] * m2[2] + m1[3] * m2[3],
+ m1[0] * m2[4] + m1[2] * m2[5] + m1[4],
+ m1[1] * m2[4] + m1[3] * m2[5] + m1[5]
+ ];
+ };
+
+ // For 2d affine transforms
+ Util.applyTransform = function Util_applyTransform(p, m) {
+ var xt = p[0] * m[0] + p[1] * m[2] + m[4];
+ var yt = p[0] * m[1] + p[1] * m[3] + m[5];
+ return [xt, yt];
+ };
+
+ Util.applyInverseTransform = function Util_applyInverseTransform(p, m) {
+ var d = m[0] * m[3] - m[1] * m[2];
+ var xt = (p[0] * m[3] - p[1] * m[2] + m[2] * m[5] - m[4] * m[3]) / d;
+ var yt = (-p[0] * m[1] + p[1] * m[0] + m[4] * m[1] - m[5] * m[0]) / d;
+ return [xt, yt];
+ };
+
+ // Applies the transform to the rectangle and finds the minimum axially
+ // aligned bounding box.
+ Util.getAxialAlignedBoundingBox =
+ function Util_getAxialAlignedBoundingBox(r, m) {
+
+ var p1 = Util.applyTransform(r, m);
+ var p2 = Util.applyTransform(r.slice(2, 4), m);
+ var p3 = Util.applyTransform([r[0], r[3]], m);
+ var p4 = Util.applyTransform([r[2], r[1]], m);
+ return [
+ Math.min(p1[0], p2[0], p3[0], p4[0]),
+ Math.min(p1[1], p2[1], p3[1], p4[1]),
+ Math.max(p1[0], p2[0], p3[0], p4[0]),
+ Math.max(p1[1], p2[1], p3[1], p4[1])
+ ];
+ };
+
+ Util.inverseTransform = function Util_inverseTransform(m) {
+ var d = m[0] * m[3] - m[1] * m[2];
+ return [m[3] / d, -m[1] / d, -m[2] / d, m[0] / d,
+ (m[2] * m[5] - m[4] * m[3]) / d, (m[4] * m[1] - m[5] * m[0]) / d];
+ };
+
+ // Apply a generic 3d matrix M on a 3-vector v:
+ // | a b c | | X |
+ // | d e f | x | Y |
+ // | g h i | | Z |
+ // M is assumed to be serialized as [a,b,c,d,e,f,g,h,i],
+ // with v as [X,Y,Z]
+ Util.apply3dTransform = function Util_apply3dTransform(m, v) {
+ return [
+ m[0] * v[0] + m[1] * v[1] + m[2] * v[2],
+ m[3] * v[0] + m[4] * v[1] + m[5] * v[2],
+ m[6] * v[0] + m[7] * v[1] + m[8] * v[2]
+ ];
+ };
+
+ // This calculation uses Singular Value Decomposition.
+ // The SVD can be represented with formula A = USV. We are interested in the
+ // matrix S here because it represents the scale values.
+ Util.singularValueDecompose2dScale =
+ function Util_singularValueDecompose2dScale(m) {
+
+ var transpose = [m[0], m[2], m[1], m[3]];
+
+ // Multiply matrix m with its transpose.
+ var a = m[0] * transpose[0] + m[1] * transpose[2];
+ var b = m[0] * transpose[1] + m[1] * transpose[3];
+ var c = m[2] * transpose[0] + m[3] * transpose[2];
+ var d = m[2] * transpose[1] + m[3] * transpose[3];
+
+ // Solve the second degree polynomial to get roots.
+ var first = (a + d) / 2;
+ var second = Math.sqrt((a + d) * (a + d) - 4 * (a * d - c * b)) / 2;
+ var sx = first + second || 1;
+ var sy = first - second || 1;
+
+ // Scale values are the square roots of the eigenvalues.
+ return [Math.sqrt(sx), Math.sqrt(sy)];
+ };
+
+ // Normalize rectangle rect=[x1, y1, x2, y2] so that (x1,y1) < (x2,y2)
+ // For coordinate systems whose origin lies in the bottom-left, this
+ // means normalization to (BL,TR) ordering. For systems with origin in the
+ // top-left, this means (TL,BR) ordering.
+ Util.normalizeRect = function Util_normalizeRect(rect) {
+ var r = rect.slice(0); // clone rect
+ if (rect[0] > rect[2]) {
+ r[0] = rect[2];
+ r[2] = rect[0];
+ }
+ if (rect[1] > rect[3]) {
+ r[1] = rect[3];
+ r[3] = rect[1];
+ }
+ return r;
+ };
+
+ // Returns a rectangle [x1, y1, x2, y2] corresponding to the
+ // intersection of rect1 and rect2. If no intersection, returns 'false'
+ // The rectangle coordinates of rect1, rect2 should be [x1, y1, x2, y2]
+ Util.intersect = function Util_intersect(rect1, rect2) {
+ function compare(a, b) {
+ return a - b;
+ }
+
+ // Order points along the axes
+ var orderedX = [rect1[0], rect1[2], rect2[0], rect2[2]].sort(compare),
+ orderedY = [rect1[1], rect1[3], rect2[1], rect2[3]].sort(compare),
+ result = [];
+
+ rect1 = Util.normalizeRect(rect1);
+ rect2 = Util.normalizeRect(rect2);
+
+ // X: first and second points belong to different rectangles?
+ if ((orderedX[0] === rect1[0] && orderedX[1] === rect2[0]) ||
+ (orderedX[0] === rect2[0] && orderedX[1] === rect1[0])) {
+ // Intersection must be between second and third points
+ result[0] = orderedX[1];
+ result[2] = orderedX[2];
+ } else {
+ return false;
+ }
+
+ // Y: first and second points belong to different rectangles?
+ if ((orderedY[0] === rect1[1] && orderedY[1] === rect2[1]) ||
+ (orderedY[0] === rect2[1] && orderedY[1] === rect1[1])) {
+ // Intersection must be between second and third points
+ result[1] = orderedY[1];
+ result[3] = orderedY[2];
+ } else {
+ return false;
+ }
+
+ return result;
+ };
+
+ Util.sign = function Util_sign(num) {
+ return num < 0 ? -1 : 1;
+ };
+
+ Util.appendToArray = function Util_appendToArray(arr1, arr2) {
+ Array.prototype.push.apply(arr1, arr2);
+ };
+
+ Util.prependToArray = function Util_prependToArray(arr1, arr2) {
+ Array.prototype.unshift.apply(arr1, arr2);
+ };
+
+ Util.extendObj = function extendObj(obj1, obj2) {
+ for (var key in obj2) {
+ obj1[key] = obj2[key];
+ }
+ };
+
+ Util.getInheritableProperty = function Util_getInheritableProperty(dict,
+ name) {
+ while (dict && !dict.has(name)) {
+ dict = dict.get('Parent');
+ }
+ if (!dict) {
+ return null;
+ }
+ return dict.get(name);
+ };
+
+ Util.inherit = function Util_inherit(sub, base, prototype) {
+ sub.prototype = Object.create(base.prototype);
+ sub.prototype.constructor = sub;
+ for (var prop in prototype) {
+ sub.prototype[prop] = prototype[prop];
+ }
+ };
+
+ Util.loadScript = function Util_loadScript(src, callback) {
+ var script = document.createElement('script');
+ var loaded = false;
+ script.setAttribute('src', src);
+ if (callback) {
+ script.onload = function() {
+ if (!loaded) {
+ callback();
+ }
+ loaded = true;
+ };
+ }
+ document.getElementsByTagName('head')[0].appendChild(script);
+ };
+
+ return Util;
+})();
+
+/**
+ * PDF page viewport created based on scale, rotation and offset.
+ * @class
+ * @alias PDFJS.PageViewport
+ */
+var PageViewport = PDFJS.PageViewport = (function PageViewportClosure() {
+ /**
+ * @constructor
+ * @private
+ * @param viewBox {Array} xMin, yMin, xMax and yMax coordinates.
+ * @param scale {number} scale of the viewport.
+ * @param rotation {number} rotations of the viewport in degrees.
+ * @param offsetX {number} offset X
+ * @param offsetY {number} offset Y
+ * @param dontFlip {boolean} if true, axis Y will not be flipped.
+ */
+ function PageViewport(viewBox, scale, rotation, offsetX, offsetY, dontFlip) {
+ this.viewBox = viewBox;
+ this.scale = scale;
+ this.rotation = rotation;
+ this.offsetX = offsetX;
+ this.offsetY = offsetY;
+
+ // creating transform to convert pdf coordinate system to the normal
+ // canvas like coordinates taking in account scale and rotation
+ var centerX = (viewBox[2] + viewBox[0]) / 2;
+ var centerY = (viewBox[3] + viewBox[1]) / 2;
+ var rotateA, rotateB, rotateC, rotateD;
+ rotation = rotation % 360;
+ rotation = rotation < 0 ? rotation + 360 : rotation;
+ switch (rotation) {
+ case 180:
+ rotateA = -1; rotateB = 0; rotateC = 0; rotateD = 1;
+ break;
+ case 90:
+ rotateA = 0; rotateB = 1; rotateC = 1; rotateD = 0;
+ break;
+ case 270:
+ rotateA = 0; rotateB = -1; rotateC = -1; rotateD = 0;
+ break;
+ //case 0:
+ default:
+ rotateA = 1; rotateB = 0; rotateC = 0; rotateD = -1;
+ break;
+ }
+
+ if (dontFlip) {
+ rotateC = -rotateC; rotateD = -rotateD;
+ }
+
+ var offsetCanvasX, offsetCanvasY;
+ var width, height;
+ if (rotateA === 0) {
+ offsetCanvasX = Math.abs(centerY - viewBox[1]) * scale + offsetX;
+ offsetCanvasY = Math.abs(centerX - viewBox[0]) * scale + offsetY;
+ width = Math.abs(viewBox[3] - viewBox[1]) * scale;
+ height = Math.abs(viewBox[2] - viewBox[0]) * scale;
+ } else {
+ offsetCanvasX = Math.abs(centerX - viewBox[0]) * scale + offsetX;
+ offsetCanvasY = Math.abs(centerY - viewBox[1]) * scale + offsetY;
+ width = Math.abs(viewBox[2] - viewBox[0]) * scale;
+ height = Math.abs(viewBox[3] - viewBox[1]) * scale;
+ }
+ // creating transform for the following operations:
+ // translate(-centerX, -centerY), rotate and flip vertically,
+ // scale, and translate(offsetCanvasX, offsetCanvasY)
+ this.transform = [
+ rotateA * scale,
+ rotateB * scale,
+ rotateC * scale,
+ rotateD * scale,
+ offsetCanvasX - rotateA * scale * centerX - rotateC * scale * centerY,
+ offsetCanvasY - rotateB * scale * centerX - rotateD * scale * centerY
+ ];
+
+ this.width = width;
+ this.height = height;
+ this.fontScale = scale;
+ }
+ PageViewport.prototype = /** @lends PDFJS.PageViewport.prototype */ {
+ /**
+ * Clones viewport with additional properties.
+ * @param args {Object} (optional) If specified, may contain the 'scale' or
+ * 'rotation' properties to override the corresponding properties in
+ * the cloned viewport.
+ * @returns {PDFJS.PageViewport} Cloned viewport.
+ */
+ clone: function PageViewPort_clone(args) {
+ args = args || {};
+ var scale = 'scale' in args ? args.scale : this.scale;
+ var rotation = 'rotation' in args ? args.rotation : this.rotation;
+ return new PageViewport(this.viewBox.slice(), scale, rotation,
+ this.offsetX, this.offsetY, args.dontFlip);
+ },
+ /**
+ * Converts PDF point to the viewport coordinates. For examples, useful for
+ * converting PDF location into canvas pixel coordinates.
+ * @param x {number} X coordinate.
+ * @param y {number} Y coordinate.
+ * @returns {Object} Object that contains 'x' and 'y' properties of the
+ * point in the viewport coordinate space.
+ * @see {@link convertToPdfPoint}
+ * @see {@link convertToViewportRectangle}
+ */
+ convertToViewportPoint: function PageViewport_convertToViewportPoint(x, y) {
+ return Util.applyTransform([x, y], this.transform);
+ },
+ /**
+ * Converts PDF rectangle to the viewport coordinates.
+ * @param rect {Array} xMin, yMin, xMax and yMax coordinates.
+ * @returns {Array} Contains corresponding coordinates of the rectangle
+ * in the viewport coordinate space.
+ * @see {@link convertToViewportPoint}
+ */
+ convertToViewportRectangle:
+ function PageViewport_convertToViewportRectangle(rect) {
+ var tl = Util.applyTransform([rect[0], rect[1]], this.transform);
+ var br = Util.applyTransform([rect[2], rect[3]], this.transform);
+ return [tl[0], tl[1], br[0], br[1]];
+ },
+ /**
+ * Converts viewport coordinates to the PDF location. For examples, useful
+ * for converting canvas pixel location into PDF one.
+ * @param x {number} X coordinate.
+ * @param y {number} Y coordinate.
+ * @returns {Object} Object that contains 'x' and 'y' properties of the
+ * point in the PDF coordinate space.
+ * @see {@link convertToViewportPoint}
+ */
+ convertToPdfPoint: function PageViewport_convertToPdfPoint(x, y) {
+ return Util.applyInverseTransform([x, y], this.transform);
+ }
+ };
+ return PageViewport;
+})();
+
+var PDFStringTranslateTable = [
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0x2D8, 0x2C7, 0x2C6, 0x2D9, 0x2DD, 0x2DB, 0x2DA, 0x2DC, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2022, 0x2020, 0x2021, 0x2026, 0x2014,
+ 0x2013, 0x192, 0x2044, 0x2039, 0x203A, 0x2212, 0x2030, 0x201E, 0x201C,
+ 0x201D, 0x2018, 0x2019, 0x201A, 0x2122, 0xFB01, 0xFB02, 0x141, 0x152, 0x160,
+ 0x178, 0x17D, 0x131, 0x142, 0x153, 0x161, 0x17E, 0, 0x20AC
+];
+
+function stringToPDFString(str) {
+ var i, n = str.length, strBuf = [];
+ if (str[0] === '\xFE' && str[1] === '\xFF') {
+ // UTF16BE BOM
+ for (i = 2; i < n; i += 2) {
+ strBuf.push(String.fromCharCode(
+ (str.charCodeAt(i) << 8) | str.charCodeAt(i + 1)));
+ }
+ } else {
+ for (i = 0; i < n; ++i) {
+ var code = PDFStringTranslateTable[str.charCodeAt(i)];
+ strBuf.push(code ? String.fromCharCode(code) : str.charAt(i));
+ }
+ }
+ return strBuf.join('');
+}
+
+function stringToUTF8String(str) {
+ return decodeURIComponent(escape(str));
+}
+
+function utf8StringToString(str) {
+ return unescape(encodeURIComponent(str));
+}
+
+function isEmptyObj(obj) {
+ for (var key in obj) {
+ return false;
+ }
+ return true;
+}
+
+function isBool(v) {
+ return typeof v === 'boolean';
+}
+
+function isInt(v) {
+ return typeof v === 'number' && ((v | 0) === v);
+}
+
+function isNum(v) {
+ return typeof v === 'number';
+}
+
+function isString(v) {
+ return typeof v === 'string';
+}
+
+function isName(v) {
+ return v instanceof Name;
+}
+
+function isCmd(v, cmd) {
+ return v instanceof Cmd && (cmd === undefined || v.cmd === cmd);
+}
+
+function isDict(v, type) {
+ if (!(v instanceof Dict)) {
+ return false;
+ }
+ if (!type) {
+ return true;
+ }
+ var dictType = v.get('Type');
+ return isName(dictType) && dictType.name === type;
+}
+
+function isArray(v) {
+ return v instanceof Array;
+}
+
+function isStream(v) {
+ return typeof v === 'object' && v !== null && v.getBytes !== undefined;
+}
+
+function isArrayBuffer(v) {
+ return typeof v === 'object' && v !== null && v.byteLength !== undefined;
+}
+
+function isRef(v) {
+ return v instanceof Ref;
+}
+
+/**
+ * Promise Capability object.
+ *
+ * @typedef {Object} PromiseCapability
+ * @property {Promise} promise - A promise object.
+ * @property {function} resolve - Fullfills the promise.
+ * @property {function} reject - Rejects the promise.
+ */
+
+/**
+ * Creates a promise capability object.
+ * @alias PDFJS.createPromiseCapability
+ *
+ * @return {PromiseCapability} A capability object contains:
+ * - a Promise, resolve and reject methods.
+ */
+function createPromiseCapability() {
+ var capability = {};
+ capability.promise = new Promise(function (resolve, reject) {
+ capability.resolve = resolve;
+ capability.reject = reject;
+ });
+ return capability;
+}
+
+PDFJS.createPromiseCapability = createPromiseCapability;
+
+/**
+ * Polyfill for Promises:
+ * The following promise implementation tries to generally implement the
+ * Promise/A+ spec. Some notable differences from other promise libaries are:
+ * - There currently isn't a seperate deferred and promise object.
+ * - Unhandled rejections eventually show an error if they aren't handled.
+ *
+ * Based off of the work in:
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=810490
+ */
+(function PromiseClosure() {
+ if (globalScope.Promise) {
+ // Promises existing in the DOM/Worker, checking presence of all/resolve
+ if (typeof globalScope.Promise.all !== 'function') {
+ globalScope.Promise.all = function (iterable) {
+ var count = 0, results = [], resolve, reject;
+ var promise = new globalScope.Promise(function (resolve_, reject_) {
+ resolve = resolve_;
+ reject = reject_;
+ });
+ iterable.forEach(function (p, i) {
+ count++;
+ p.then(function (result) {
+ results[i] = result;
+ count--;
+ if (count === 0) {
+ resolve(results);
+ }
+ }, reject);
+ });
+ if (count === 0) {
+ resolve(results);
+ }
+ return promise;
+ };
+ }
+ if (typeof globalScope.Promise.resolve !== 'function') {
+ globalScope.Promise.resolve = function (value) {
+ return new globalScope.Promise(function (resolve) { resolve(value); });
+ };
+ }
+ if (typeof globalScope.Promise.reject !== 'function') {
+ globalScope.Promise.reject = function (reason) {
+ return new globalScope.Promise(function (resolve, reject) {
+ reject(reason);
+ });
+ };
+ }
+ if (typeof globalScope.Promise.prototype.catch !== 'function') {
+ globalScope.Promise.prototype.catch = function (onReject) {
+ return globalScope.Promise.prototype.then(undefined, onReject);
+ };
+ }
+ return;
+ }
+ var STATUS_PENDING = 0;
+ var STATUS_RESOLVED = 1;
+ var STATUS_REJECTED = 2;
+
+ // In an attempt to avoid silent exceptions, unhandled rejections are
+ // tracked and if they aren't handled in a certain amount of time an
+ // error is logged.
+ var REJECTION_TIMEOUT = 500;
+
+ var HandlerManager = {
+ handlers: [],
+ running: false,
+ unhandledRejections: [],
+ pendingRejectionCheck: false,
+
+ scheduleHandlers: function scheduleHandlers(promise) {
+ if (promise._status === STATUS_PENDING) {
+ return;
+ }
+
+ this.handlers = this.handlers.concat(promise._handlers);
+ promise._handlers = [];
+
+ if (this.running) {
+ return;
+ }
+ this.running = true;
+
+ setTimeout(this.runHandlers.bind(this), 0);
+ },
+
+ runHandlers: function runHandlers() {
+ var RUN_TIMEOUT = 1; // ms
+ var timeoutAt = Date.now() + RUN_TIMEOUT;
+ while (this.handlers.length > 0) {
+ var handler = this.handlers.shift();
+
+ var nextStatus = handler.thisPromise._status;
+ var nextValue = handler.thisPromise._value;
+
+ try {
+ if (nextStatus === STATUS_RESOLVED) {
+ if (typeof handler.onResolve === 'function') {
+ nextValue = handler.onResolve(nextValue);
+ }
+ } else if (typeof handler.onReject === 'function') {
+ nextValue = handler.onReject(nextValue);
+ nextStatus = STATUS_RESOLVED;
+
+ if (handler.thisPromise._unhandledRejection) {
+ this.removeUnhandeledRejection(handler.thisPromise);
+ }
+ }
+ } catch (ex) {
+ nextStatus = STATUS_REJECTED;
+ nextValue = ex;
+ }
+
+ handler.nextPromise._updateStatus(nextStatus, nextValue);
+ if (Date.now() >= timeoutAt) {
+ break;
+ }
+ }
+
+ if (this.handlers.length > 0) {
+ setTimeout(this.runHandlers.bind(this), 0);
+ return;
+ }
+
+ this.running = false;
+ },
+
+ addUnhandledRejection: function addUnhandledRejection(promise) {
+ this.unhandledRejections.push({
+ promise: promise,
+ time: Date.now()
+ });
+ this.scheduleRejectionCheck();
+ },
+
+ removeUnhandeledRejection: function removeUnhandeledRejection(promise) {
+ promise._unhandledRejection = false;
+ for (var i = 0; i < this.unhandledRejections.length; i++) {
+ if (this.unhandledRejections[i].promise === promise) {
+ this.unhandledRejections.splice(i);
+ i--;
+ }
+ }
+ },
+
+ scheduleRejectionCheck: function scheduleRejectionCheck() {
+ if (this.pendingRejectionCheck) {
+ return;
+ }
+ this.pendingRejectionCheck = true;
+ setTimeout(function rejectionCheck() {
+ this.pendingRejectionCheck = false;
+ var now = Date.now();
+ for (var i = 0; i < this.unhandledRejections.length; i++) {
+ if (now - this.unhandledRejections[i].time > REJECTION_TIMEOUT) {
+ var unhandled = this.unhandledRejections[i].promise._value;
+ var msg = 'Unhandled rejection: ' + unhandled;
+ if (unhandled.stack) {
+ msg += '\n' + unhandled.stack;
+ }
+ warn(msg);
+ this.unhandledRejections.splice(i);
+ i--;
+ }
+ }
+ if (this.unhandledRejections.length) {
+ this.scheduleRejectionCheck();
+ }
+ }.bind(this), REJECTION_TIMEOUT);
+ }
+ };
+
+ function Promise(resolver) {
+ this._status = STATUS_PENDING;
+ this._handlers = [];
+ try {
+ resolver.call(this, this._resolve.bind(this), this._reject.bind(this));
+ } catch (e) {
+ this._reject(e);
+ }
+ }
+ /**
+ * Builds a promise that is resolved when all the passed in promises are
+ * resolved.
+ * @param {array} array of data and/or promises to wait for.
+ * @return {Promise} New dependant promise.
+ */
+ Promise.all = function Promise_all(promises) {
+ var resolveAll, rejectAll;
+ var deferred = new Promise(function (resolve, reject) {
+ resolveAll = resolve;
+ rejectAll = reject;
+ });
+ var unresolved = promises.length;
+ var results = [];
+ if (unresolved === 0) {
+ resolveAll(results);
+ return deferred;
+ }
+ function reject(reason) {
+ if (deferred._status === STATUS_REJECTED) {
+ return;
+ }
+ results = [];
+ rejectAll(reason);
+ }
+ for (var i = 0, ii = promises.length; i < ii; ++i) {
+ var promise = promises[i];
+ var resolve = (function(i) {
+ return function(value) {
+ if (deferred._status === STATUS_REJECTED) {
+ return;
+ }
+ results[i] = value;
+ unresolved--;
+ if (unresolved === 0) {
+ resolveAll(results);
+ }
+ };
+ })(i);
+ if (Promise.isPromise(promise)) {
+ promise.then(resolve, reject);
+ } else {
+ resolve(promise);
+ }
+ }
+ return deferred;
+ };
+
+ /**
+ * Checks if the value is likely a promise (has a 'then' function).
+ * @return {boolean} true if value is thenable
+ */
+ Promise.isPromise = function Promise_isPromise(value) {
+ return value && typeof value.then === 'function';
+ };
+
+ /**
+ * Creates resolved promise
+ * @param value resolve value
+ * @returns {Promise}
+ */
+ Promise.resolve = function Promise_resolve(value) {
+ return new Promise(function (resolve) { resolve(value); });
+ };
+
+ /**
+ * Creates rejected promise
+ * @param reason rejection value
+ * @returns {Promise}
+ */
+ Promise.reject = function Promise_reject(reason) {
+ return new Promise(function (resolve, reject) { reject(reason); });
+ };
+
+ Promise.prototype = {
+ _status: null,
+ _value: null,
+ _handlers: null,
+ _unhandledRejection: null,
+
+ _updateStatus: function Promise__updateStatus(status, value) {
+ if (this._status === STATUS_RESOLVED ||
+ this._status === STATUS_REJECTED) {
+ return;
+ }
+
+ if (status === STATUS_RESOLVED &&
+ Promise.isPromise(value)) {
+ value.then(this._updateStatus.bind(this, STATUS_RESOLVED),
+ this._updateStatus.bind(this, STATUS_REJECTED));
+ return;
+ }
+
+ this._status = status;
+ this._value = value;
+
+ if (status === STATUS_REJECTED && this._handlers.length === 0) {
+ this._unhandledRejection = true;
+ HandlerManager.addUnhandledRejection(this);
+ }
+
+ HandlerManager.scheduleHandlers(this);
+ },
+
+ _resolve: function Promise_resolve(value) {
+ this._updateStatus(STATUS_RESOLVED, value);
+ },
+
+ _reject: function Promise_reject(reason) {
+ this._updateStatus(STATUS_REJECTED, reason);
+ },
+
+ then: function Promise_then(onResolve, onReject) {
+ var nextPromise = new Promise(function (resolve, reject) {
+ this.resolve = resolve;
+ this.reject = reject;
+ });
+ this._handlers.push({
+ thisPromise: this,
+ onResolve: onResolve,
+ onReject: onReject,
+ nextPromise: nextPromise
+ });
+ HandlerManager.scheduleHandlers(this);
+ return nextPromise;
+ },
+
+ catch: function Promise_catch(onReject) {
+ return this.then(undefined, onReject);
+ }
+ };
+
+ globalScope.Promise = Promise;
+})();
+
+var StatTimer = (function StatTimerClosure() {
+ function rpad(str, pad, length) {
+ while (str.length < length) {
+ str += pad;
+ }
+ return str;
+ }
+ function StatTimer() {
+ this.started = {};
+ this.times = [];
+ this.enabled = true;
+ }
+ StatTimer.prototype = {
+ time: function StatTimer_time(name) {
+ if (!this.enabled) {
+ return;
+ }
+ if (name in this.started) {
+ warn('Timer is already running for ' + name);
+ }
+ this.started[name] = Date.now();
+ },
+ timeEnd: function StatTimer_timeEnd(name) {
+ if (!this.enabled) {
+ return;
+ }
+ if (!(name in this.started)) {
+ warn('Timer has not been started for ' + name);
+ }
+ this.times.push({
+ 'name': name,
+ 'start': this.started[name],
+ 'end': Date.now()
+ });
+ // Remove timer from started so it can be called again.
+ delete this.started[name];
+ },
+ toString: function StatTimer_toString() {
+ var i, ii;
+ var times = this.times;
+ var out = '';
+ // Find the longest name for padding purposes.
+ var longest = 0;
+ for (i = 0, ii = times.length; i < ii; ++i) {
+ var name = times[i]['name'];
+ if (name.length > longest) {
+ longest = name.length;
+ }
+ }
+ for (i = 0, ii = times.length; i < ii; ++i) {
+ var span = times[i];
+ var duration = span.end - span.start;
+ out += rpad(span['name'], ' ', longest) + ' ' + duration + 'ms\n';
+ }
+ return out;
+ }
+ };
+ return StatTimer;
+})();
+
+PDFJS.createBlob = function createBlob(data, contentType) {
+ if (typeof Blob !== 'undefined') {
+ return new Blob([data], { type: contentType });
+ }
+ // Blob builder is deprecated in FF14 and removed in FF18.
+ var bb = new MozBlobBuilder();
+ bb.append(data);
+ return bb.getBlob(contentType);
+};
+
+PDFJS.createObjectURL = (function createObjectURLClosure() {
+ // Blob/createObjectURL is not available, falling back to data schema.
+ var digits =
+ 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+
+ return function createObjectURL(data, contentType) {
+ if (!PDFJS.disableCreateObjectURL &&
+ typeof URL !== 'undefined' && URL.createObjectURL) {
+ var blob = PDFJS.createBlob(data, contentType);
+ return URL.createObjectURL(blob);
+ }
+
+ var buffer = 'data:' + contentType + ';base64,';
+ for (var i = 0, ii = data.length; i < ii; i += 3) {
+ var b1 = data[i] & 0xFF;
+ var b2 = data[i + 1] & 0xFF;
+ var b3 = data[i + 2] & 0xFF;
+ var d1 = b1 >> 2, d2 = ((b1 & 3) << 4) | (b2 >> 4);
+ var d3 = i + 1 < ii ? ((b2 & 0xF) << 2) | (b3 >> 6) : 64;
+ var d4 = i + 2 < ii ? (b3 & 0x3F) : 64;
+ buffer += digits[d1] + digits[d2] + digits[d3] + digits[d4];
+ }
+ return buffer;
+ };
+})();
+
+function MessageHandler(name, comObj) {
+ this.name = name;
+ this.comObj = comObj;
+ this.callbackIndex = 1;
+ this.postMessageTransfers = true;
+ var callbacksCapabilities = this.callbacksCapabilities = {};
+ var ah = this.actionHandler = {};
+
+ ah['console_log'] = [function ahConsoleLog(data) {
+ console.log.apply(console, data);
+ }];
+ ah['console_error'] = [function ahConsoleError(data) {
+ console.error.apply(console, data);
+ }];
+ ah['_unsupported_feature'] = [function ah_unsupportedFeature(data) {
+ UnsupportedManager.notify(data);
+ }];
+
+ comObj.onmessage = function messageHandlerComObjOnMessage(event) {
+ var data = event.data;
+ if (data.isReply) {
+ var callbackId = data.callbackId;
+ if (data.callbackId in callbacksCapabilities) {
+ var callback = callbacksCapabilities[callbackId];
+ delete callbacksCapabilities[callbackId];
+ if ('error' in data) {
+ callback.reject(data.error);
+ } else {
+ callback.resolve(data.data);
+ }
+ } else {
+ error('Cannot resolve callback ' + callbackId);
+ }
+ } else if (data.action in ah) {
+ var action = ah[data.action];
+ if (data.callbackId) {
+ Promise.resolve().then(function () {
+ return action[0].call(action[1], data.data);
+ }).then(function (result) {
+ comObj.postMessage({
+ isReply: true,
+ callbackId: data.callbackId,
+ data: result
+ });
+ }, function (reason) {
+ comObj.postMessage({
+ isReply: true,
+ callbackId: data.callbackId,
+ error: reason
+ });
+ });
+ } else {
+ action[0].call(action[1], data.data);
+ }
+ } else {
+ error('Unknown action from worker: ' + data.action);
+ }
+ };
+}
+
+MessageHandler.prototype = {
+ on: function messageHandlerOn(actionName, handler, scope) {
+ var ah = this.actionHandler;
+ if (ah[actionName]) {
+ error('There is already an actionName called "' + actionName + '"');
+ }
+ ah[actionName] = [handler, scope];
+ },
+ /**
+ * Sends a message to the comObj to invoke the action with the supplied data.
+ * @param {String} actionName Action to call.
+ * @param {JSON} data JSON data to send.
+ * @param {Array} [transfers] Optional list of transfers/ArrayBuffers
+ */
+ send: function messageHandlerSend(actionName, data, transfers) {
+ var message = {
+ action: actionName,
+ data: data
+ };
+ this.postMessage(message, transfers);
+ },
+ /**
+ * Sends a message to the comObj to invoke the action with the supplied data.
+ * Expects that other side will callback with the response.
+ * @param {String} actionName Action to call.
+ * @param {JSON} data JSON data to send.
+ * @param {Array} [transfers] Optional list of transfers/ArrayBuffers.
+ * @returns {Promise} Promise to be resolved with response data.
+ */
+ sendWithPromise:
+ function messageHandlerSendWithPromise(actionName, data, transfers) {
+ var callbackId = this.callbackIndex++;
+ var message = {
+ action: actionName,
+ data: data,
+ callbackId: callbackId
+ };
+ var capability = createPromiseCapability();
+ this.callbacksCapabilities[callbackId] = capability;
+ try {
+ this.postMessage(message, transfers);
+ } catch (e) {
+ capability.reject(e);
+ }
+ return capability.promise;
+ },
+ /**
+ * Sends raw message to the comObj.
+ * @private
+ * @param message {Object} Raw message.
+ * @param transfers List of transfers/ArrayBuffers, or undefined.
+ */
+ postMessage: function (message, transfers) {
+ if (transfers && this.postMessageTransfers) {
+ this.comObj.postMessage(message, transfers);
+ } else {
+ this.comObj.postMessage(message);
+ }
+ }
+};
+
+function loadJpegStream(id, imageUrl, objs) {
+ var img = new Image();
+ img.onload = (function loadJpegStream_onloadClosure() {
+ objs.resolve(id, img);
+ });
+ img.onerror = (function loadJpegStream_onerrorClosure() {
+ objs.resolve(id, null);
+ warn('Error during JPEG image loading');
+ });
+ img.src = imageUrl;
+}
+
+
+
+
+var NetworkManager = (function NetworkManagerClosure() {
+
+ var OK_RESPONSE = 200;
+ var PARTIAL_CONTENT_RESPONSE = 206;
+
+ function NetworkManager(url, args) {
+ this.url = url;
+ args = args || {};
+ this.isHttp = /^https?:/i.test(url);
+ this.httpHeaders = (this.isHttp && args.httpHeaders) || {};
+ this.withCredentials = args.withCredentials || false;
+ this.getXhr = args.getXhr ||
+ function NetworkManager_getXhr() {
+ return new XMLHttpRequest();
+ };
+
+ this.currXhrId = 0;
+ this.pendingRequests = {};
+ this.loadedRequests = {};
+ }
+
+ function getArrayBuffer(xhr) {
+ var data = xhr.response;
+ if (typeof data !== 'string') {
+ return data;
+ }
+ var length = data.length;
+ var array = new Uint8Array(length);
+ for (var i = 0; i < length; i++) {
+ array[i] = data.charCodeAt(i) & 0xFF;
+ }
+ return array.buffer;
+ }
+
+ NetworkManager.prototype = {
+ requestRange: function NetworkManager_requestRange(begin, end, listeners) {
+ var args = {
+ begin: begin,
+ end: end
+ };
+ for (var prop in listeners) {
+ args[prop] = listeners[prop];
+ }
+ return this.request(args);
+ },
+
+ requestFull: function NetworkManager_requestFull(listeners) {
+ return this.request(listeners);
+ },
+
+ request: function NetworkManager_request(args) {
+ var xhr = this.getXhr();
+ var xhrId = this.currXhrId++;
+ var pendingRequest = this.pendingRequests[xhrId] = {
+ xhr: xhr
+ };
+
+ xhr.open('GET', this.url);
+ xhr.withCredentials = this.withCredentials;
+ for (var property in this.httpHeaders) {
+ var value = this.httpHeaders[property];
+ if (typeof value === 'undefined') {
+ continue;
+ }
+ xhr.setRequestHeader(property, value);
+ }
+ if (this.isHttp && 'begin' in args && 'end' in args) {
+ var rangeStr = args.begin + '-' + (args.end - 1);
+ xhr.setRequestHeader('Range', 'bytes=' + rangeStr);
+ pendingRequest.expectedStatus = 206;
+ } else {
+ pendingRequest.expectedStatus = 200;
+ }
+
+ if (args.onProgressiveData) {
+ // Some legacy browsers might throw an exception.
+ try {
+ xhr.responseType = 'moz-chunked-arraybuffer';
+ } catch(e) {}
+ if (xhr.responseType === 'moz-chunked-arraybuffer') {
+ pendingRequest.onProgressiveData = args.onProgressiveData;
+ pendingRequest.mozChunked = true;
+ } else {
+ xhr.responseType = 'arraybuffer';
+ }
+ } else {
+ xhr.responseType = 'arraybuffer';
+ }
+
+ if (args.onError) {
+ xhr.onerror = function(evt) {
+ args.onError(xhr.status);
+ };
+ }
+ xhr.onreadystatechange = this.onStateChange.bind(this, xhrId);
+ xhr.onprogress = this.onProgress.bind(this, xhrId);
+
+ pendingRequest.onHeadersReceived = args.onHeadersReceived;
+ pendingRequest.onDone = args.onDone;
+ pendingRequest.onError = args.onError;
+ pendingRequest.onProgress = args.onProgress;
+
+ xhr.send(null);
+
+ return xhrId;
+ },
+
+ onProgress: function NetworkManager_onProgress(xhrId, evt) {
+ var pendingRequest = this.pendingRequests[xhrId];
+ if (!pendingRequest) {
+ // Maybe abortRequest was called...
+ return;
+ }
+
+ if (pendingRequest.mozChunked) {
+ var chunk = getArrayBuffer(pendingRequest.xhr);
+ pendingRequest.onProgressiveData(chunk);
+ }
+
+ var onProgress = pendingRequest.onProgress;
+ if (onProgress) {
+ onProgress(evt);
+ }
+ },
+
+ onStateChange: function NetworkManager_onStateChange(xhrId, evt) {
+ var pendingRequest = this.pendingRequests[xhrId];
+ if (!pendingRequest) {
+ // Maybe abortRequest was called...
+ return;
+ }
+
+ var xhr = pendingRequest.xhr;
+ if (xhr.readyState >= 2 && pendingRequest.onHeadersReceived) {
+ pendingRequest.onHeadersReceived();
+ delete pendingRequest.onHeadersReceived;
+ }
+
+ if (xhr.readyState !== 4) {
+ return;
+ }
+
+ if (!(xhrId in this.pendingRequests)) {
+ // The XHR request might have been aborted in onHeadersReceived()
+ // callback, in which case we should abort request
+ return;
+ }
+
+ delete this.pendingRequests[xhrId];
+
+ // success status == 0 can be on ftp, file and other protocols
+ if (xhr.status === 0 && this.isHttp) {
+ if (pendingRequest.onError) {
+ pendingRequest.onError(xhr.status);
+ }
+ return;
+ }
+ var xhrStatus = xhr.status || OK_RESPONSE;
+
+ // From http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35.2:
+ // "A server MAY ignore the Range header". This means it's possible to
+ // get a 200 rather than a 206 response from a range request.
+ var ok_response_on_range_request =
+ xhrStatus === OK_RESPONSE &&
+ pendingRequest.expectedStatus === PARTIAL_CONTENT_RESPONSE;
+
+ if (!ok_response_on_range_request &&
+ xhrStatus !== pendingRequest.expectedStatus) {
+ if (pendingRequest.onError) {
+ pendingRequest.onError(xhr.status);
+ }
+ return;
+ }
+
+ this.loadedRequests[xhrId] = true;
+
+ var chunk = getArrayBuffer(xhr);
+ if (xhrStatus === PARTIAL_CONTENT_RESPONSE) {
+ var rangeHeader = xhr.getResponseHeader('Content-Range');
+ var matches = /bytes (\d+)-(\d+)\/(\d+)/.exec(rangeHeader);
+ var begin = parseInt(matches[1], 10);
+ pendingRequest.onDone({
+ begin: begin,
+ chunk: chunk
+ });
+ } else if (pendingRequest.onProgressiveData) {
+ pendingRequest.onDone(null);
+ } else {
+ pendingRequest.onDone({
+ begin: 0,
+ chunk: chunk
+ });
+ }
+ },
+
+ hasPendingRequests: function NetworkManager_hasPendingRequests() {
+ for (var xhrId in this.pendingRequests) {
+ return true;
+ }
+ return false;
+ },
+
+ getRequestXhr: function NetworkManager_getXhr(xhrId) {
+ return this.pendingRequests[xhrId].xhr;
+ },
+
+ isStreamingRequest: function NetworkManager_isStreamingRequest(xhrId) {
+ return !!(this.pendingRequests[xhrId].onProgressiveData);
+ },
+
+ isPendingRequest: function NetworkManager_isPendingRequest(xhrId) {
+ return xhrId in this.pendingRequests;
+ },
+
+ isLoadedRequest: function NetworkManager_isLoadedRequest(xhrId) {
+ return xhrId in this.loadedRequests;
+ },
+
+ abortAllRequests: function NetworkManager_abortAllRequests() {
+ for (var xhrId in this.pendingRequests) {
+ this.abortRequest(xhrId | 0);
+ }
+ },
+
+ abortRequest: function NetworkManager_abortRequest(xhrId) {
+ var xhr = this.pendingRequests[xhrId].xhr;
+ delete this.pendingRequests[xhrId];
+ xhr.abort();
+ }
+ };
+
+ return NetworkManager;
+})();
+
+
+var ChunkedStream = (function ChunkedStreamClosure() {
+ function ChunkedStream(length, chunkSize, manager) {
+ this.bytes = new Uint8Array(length);
+ this.start = 0;
+ this.pos = 0;
+ this.end = length;
+ this.chunkSize = chunkSize;
+ this.loadedChunks = [];
+ this.numChunksLoaded = 0;
+ this.numChunks = Math.ceil(length / chunkSize);
+ this.manager = manager;
+ this.progressiveDataLength = 0;
+ this.lastSuccessfulEnsureByteChunk = -1; // a single-entry cache
+ }
+
+ // required methods for a stream. if a particular stream does not
+ // implement these, an error should be thrown
+ ChunkedStream.prototype = {
+
+ getMissingChunks: function ChunkedStream_getMissingChunks() {
+ var chunks = [];
+ for (var chunk = 0, n = this.numChunks; chunk < n; ++chunk) {
+ if (!this.loadedChunks[chunk]) {
+ chunks.push(chunk);
+ }
+ }
+ return chunks;
+ },
+
+ getBaseStreams: function ChunkedStream_getBaseStreams() {
+ return [this];
+ },
+
+ allChunksLoaded: function ChunkedStream_allChunksLoaded() {
+ return this.numChunksLoaded === this.numChunks;
+ },
+
+ onReceiveData: function ChunkedStream_onReceiveData(begin, chunk) {
+ var end = begin + chunk.byteLength;
+
+ assert(begin % this.chunkSize === 0, 'Bad begin offset: ' + begin);
+ // Using this.length is inaccurate here since this.start can be moved
+ // See ChunkedStream.moveStart()
+ var length = this.bytes.length;
+ assert(end % this.chunkSize === 0 || end === length,
+ 'Bad end offset: ' + end);
+
+ this.bytes.set(new Uint8Array(chunk), begin);
+ var chunkSize = this.chunkSize;
+ var beginChunk = Math.floor(begin / chunkSize);
+ var endChunk = Math.floor((end - 1) / chunkSize) + 1;
+ var curChunk;
+
+ for (curChunk = beginChunk; curChunk < endChunk; ++curChunk) {
+ if (!this.loadedChunks[curChunk]) {
+ this.loadedChunks[curChunk] = true;
+ ++this.numChunksLoaded;
+ }
+ }
+ },
+
+ onReceiveProgressiveData:
+ function ChunkedStream_onReceiveProgressiveData(data) {
+ var position = this.progressiveDataLength;
+ var beginChunk = Math.floor(position / this.chunkSize);
+
+ this.bytes.set(new Uint8Array(data), position);
+ position += data.byteLength;
+ this.progressiveDataLength = position;
+ var endChunk = position >= this.end ? this.numChunks :
+ Math.floor(position / this.chunkSize);
+ var curChunk;
+ for (curChunk = beginChunk; curChunk < endChunk; ++curChunk) {
+ if (!this.loadedChunks[curChunk]) {
+ this.loadedChunks[curChunk] = true;
+ ++this.numChunksLoaded;
+ }
+ }
+ },
+
+ ensureByte: function ChunkedStream_ensureByte(pos) {
+ var chunk = Math.floor(pos / this.chunkSize);
+ if (chunk === this.lastSuccessfulEnsureByteChunk) {
+ return;
+ }
+
+ if (!this.loadedChunks[chunk]) {
+ throw new MissingDataException(pos, pos + 1);
+ }
+ this.lastSuccessfulEnsureByteChunk = chunk;
+ },
+
+ ensureRange: function ChunkedStream_ensureRange(begin, end) {
+ if (begin >= end) {
+ return;
+ }
+
+ if (end <= this.progressiveDataLength) {
+ return;
+ }
+
+ var chunkSize = this.chunkSize;
+ var beginChunk = Math.floor(begin / chunkSize);
+ var endChunk = Math.floor((end - 1) / chunkSize) + 1;
+ for (var chunk = beginChunk; chunk < endChunk; ++chunk) {
+ if (!this.loadedChunks[chunk]) {
+ throw new MissingDataException(begin, end);
+ }
+ }
+ },
+
+ nextEmptyChunk: function ChunkedStream_nextEmptyChunk(beginChunk) {
+ var chunk, n;
+ for (chunk = beginChunk, n = this.numChunks; chunk < n; ++chunk) {
+ if (!this.loadedChunks[chunk]) {
+ return chunk;
+ }
+ }
+ // Wrap around to beginning
+ for (chunk = 0; chunk < beginChunk; ++chunk) {
+ if (!this.loadedChunks[chunk]) {
+ return chunk;
+ }
+ }
+ return null;
+ },
+
+ hasChunk: function ChunkedStream_hasChunk(chunk) {
+ return !!this.loadedChunks[chunk];
+ },
+
+ get length() {
+ return this.end - this.start;
+ },
+
+ get isEmpty() {
+ return this.length === 0;
+ },
+
+ getByte: function ChunkedStream_getByte() {
+ var pos = this.pos;
+ if (pos >= this.end) {
+ return -1;
+ }
+ this.ensureByte(pos);
+ return this.bytes[this.pos++];
+ },
+
+ getUint16: function ChunkedStream_getUint16() {
+ var b0 = this.getByte();
+ var b1 = this.getByte();
+ if (b0 === -1 || b1 === -1) {
+ return -1;
+ }
+ return (b0 << 8) + b1;
+ },
+
+ getInt32: function ChunkedStream_getInt32() {
+ var b0 = this.getByte();
+ var b1 = this.getByte();
+ var b2 = this.getByte();
+ var b3 = this.getByte();
+ return (b0 << 24) + (b1 << 16) + (b2 << 8) + b3;
+ },
+
+ // returns subarray of original buffer
+ // should only be read
+ getBytes: function ChunkedStream_getBytes(length) {
+ var bytes = this.bytes;
+ var pos = this.pos;
+ var strEnd = this.end;
+
+ if (!length) {
+ this.ensureRange(pos, strEnd);
+ return bytes.subarray(pos, strEnd);
+ }
+
+ var end = pos + length;
+ if (end > strEnd) {
+ end = strEnd;
+ }
+ this.ensureRange(pos, end);
+
+ this.pos = end;
+ return bytes.subarray(pos, end);
+ },
+
+ peekByte: function ChunkedStream_peekByte() {
+ var peekedByte = this.getByte();
+ this.pos--;
+ return peekedByte;
+ },
+
+ peekBytes: function ChunkedStream_peekBytes(length) {
+ var bytes = this.getBytes(length);
+ this.pos -= bytes.length;
+ return bytes;
+ },
+
+ getByteRange: function ChunkedStream_getBytes(begin, end) {
+ this.ensureRange(begin, end);
+ return this.bytes.subarray(begin, end);
+ },
+
+ skip: function ChunkedStream_skip(n) {
+ if (!n) {
+ n = 1;
+ }
+ this.pos += n;
+ },
+
+ reset: function ChunkedStream_reset() {
+ this.pos = this.start;
+ },
+
+ moveStart: function ChunkedStream_moveStart() {
+ this.start = this.pos;
+ },
+
+ makeSubStream: function ChunkedStream_makeSubStream(start, length, dict) {
+ this.ensureRange(start, start + length);
+
+ function ChunkedStreamSubstream() {}
+ ChunkedStreamSubstream.prototype = Object.create(this);
+ ChunkedStreamSubstream.prototype.getMissingChunks = function() {
+ var chunkSize = this.chunkSize;
+ var beginChunk = Math.floor(this.start / chunkSize);
+ var endChunk = Math.floor((this.end - 1) / chunkSize) + 1;
+ var missingChunks = [];
+ for (var chunk = beginChunk; chunk < endChunk; ++chunk) {
+ if (!this.loadedChunks[chunk]) {
+ missingChunks.push(chunk);
+ }
+ }
+ return missingChunks;
+ };
+ var subStream = new ChunkedStreamSubstream();
+ subStream.pos = subStream.start = start;
+ subStream.end = start + length || this.end;
+ subStream.dict = dict;
+ return subStream;
+ },
+
+ isStream: true
+ };
+
+ return ChunkedStream;
+})();
+
+var ChunkedStreamManager = (function ChunkedStreamManagerClosure() {
+
+ function ChunkedStreamManager(length, chunkSize, url, args) {
+ this.stream = new ChunkedStream(length, chunkSize, this);
+ this.length = length;
+ this.chunkSize = chunkSize;
+ this.url = url;
+ this.disableAutoFetch = args.disableAutoFetch;
+ var msgHandler = this.msgHandler = args.msgHandler;
+
+ if (args.chunkedViewerLoading) {
+ msgHandler.on('OnDataRange', this.onReceiveData.bind(this));
+ msgHandler.on('OnDataProgress', this.onProgress.bind(this));
+ this.sendRequest = function ChunkedStreamManager_sendRequest(begin, end) {
+ msgHandler.send('RequestDataRange', { begin: begin, end: end });
+ };
+ } else {
+
+ var getXhr = function getXhr() {
+ return new XMLHttpRequest();
+ };
+ this.networkManager = new NetworkManager(this.url, {
+ getXhr: getXhr,
+ httpHeaders: args.httpHeaders,
+ withCredentials: args.withCredentials
+ });
+ this.sendRequest = function ChunkedStreamManager_sendRequest(begin, end) {
+ this.networkManager.requestRange(begin, end, {
+ onDone: this.onReceiveData.bind(this),
+ onProgress: this.onProgress.bind(this)
+ });
+ };
+ }
+
+ this.currRequestId = 0;
+
+ this.chunksNeededByRequest = {};
+ this.requestsByChunk = {};
+ this.callbacksByRequest = {};
+ this.progressiveDataLength = 0;
+
+ this._loadedStreamCapability = createPromiseCapability();
+
+ if (args.initialData) {
+ this.onReceiveData({chunk: args.initialData});
+ }
+ }
+
+ ChunkedStreamManager.prototype = {
+ onLoadedStream: function ChunkedStreamManager_getLoadedStream() {
+ return this._loadedStreamCapability.promise;
+ },
+
+ // Get all the chunks that are not yet loaded and groups them into
+ // contiguous ranges to load in as few requests as possible
+ requestAllChunks: function ChunkedStreamManager_requestAllChunks() {
+ var missingChunks = this.stream.getMissingChunks();
+ this.requestChunks(missingChunks);
+ return this._loadedStreamCapability.promise;
+ },
+
+ requestChunks: function ChunkedStreamManager_requestChunks(chunks,
+ callback) {
+ var requestId = this.currRequestId++;
+
+ var chunksNeeded;
+ var i, ii;
+ this.chunksNeededByRequest[requestId] = chunksNeeded = {};
+ for (i = 0, ii = chunks.length; i < ii; i++) {
+ if (!this.stream.hasChunk(chunks[i])) {
+ chunksNeeded[chunks[i]] = true;
+ }
+ }
+
+ if (isEmptyObj(chunksNeeded)) {
+ if (callback) {
+ callback();
+ }
+ return;
+ }
+
+ this.callbacksByRequest[requestId] = callback;
+
+ var chunksToRequest = [];
+ for (var chunk in chunksNeeded) {
+ chunk = chunk | 0;
+ if (!(chunk in this.requestsByChunk)) {
+ this.requestsByChunk[chunk] = [];
+ chunksToRequest.push(chunk);
+ }
+ this.requestsByChunk[chunk].push(requestId);
+ }
+
+ if (!chunksToRequest.length) {
+ return;
+ }
+
+ var groupedChunksToRequest = this.groupChunks(chunksToRequest);
+
+ for (i = 0; i < groupedChunksToRequest.length; ++i) {
+ var groupedChunk = groupedChunksToRequest[i];
+ var begin = groupedChunk.beginChunk * this.chunkSize;
+ var end = Math.min(groupedChunk.endChunk * this.chunkSize, this.length);
+ this.sendRequest(begin, end);
+ }
+ },
+
+ getStream: function ChunkedStreamManager_getStream() {
+ return this.stream;
+ },
+
+ // Loads any chunks in the requested range that are not yet loaded
+ requestRange: function ChunkedStreamManager_requestRange(
+ begin, end, callback) {
+
+ end = Math.min(end, this.length);
+
+ var beginChunk = this.getBeginChunk(begin);
+ var endChunk = this.getEndChunk(end);
+
+ var chunks = [];
+ for (var chunk = beginChunk; chunk < endChunk; ++chunk) {
+ chunks.push(chunk);
+ }
+
+ this.requestChunks(chunks, callback);
+ },
+
+ requestRanges: function ChunkedStreamManager_requestRanges(ranges,
+ callback) {
+ ranges = ranges || [];
+ var chunksToRequest = [];
+
+ for (var i = 0; i < ranges.length; i++) {
+ var beginChunk = this.getBeginChunk(ranges[i].begin);
+ var endChunk = this.getEndChunk(ranges[i].end);
+ for (var chunk = beginChunk; chunk < endChunk; ++chunk) {
+ if (chunksToRequest.indexOf(chunk) < 0) {
+ chunksToRequest.push(chunk);
+ }
+ }
+ }
+
+ chunksToRequest.sort(function(a, b) { return a - b; });
+ this.requestChunks(chunksToRequest, callback);
+ },
+
+ // Groups a sorted array of chunks into as few continguous larger
+ // chunks as possible
+ groupChunks: function ChunkedStreamManager_groupChunks(chunks) {
+ var groupedChunks = [];
+ var beginChunk = -1;
+ var prevChunk = -1;
+ for (var i = 0; i < chunks.length; ++i) {
+ var chunk = chunks[i];
+
+ if (beginChunk < 0) {
+ beginChunk = chunk;
+ }
+
+ if (prevChunk >= 0 && prevChunk + 1 !== chunk) {
+ groupedChunks.push({ beginChunk: beginChunk,
+ endChunk: prevChunk + 1 });
+ beginChunk = chunk;
+ }
+ if (i + 1 === chunks.length) {
+ groupedChunks.push({ beginChunk: beginChunk,
+ endChunk: chunk + 1 });
+ }
+
+ prevChunk = chunk;
+ }
+ return groupedChunks;
+ },
+
+ onProgress: function ChunkedStreamManager_onProgress(args) {
+ var bytesLoaded = (this.stream.numChunksLoaded * this.chunkSize +
+ args.loaded);
+ this.msgHandler.send('DocProgress', {
+ loaded: bytesLoaded,
+ total: this.length
+ });
+ },
+
+ onReceiveData: function ChunkedStreamManager_onReceiveData(args) {
+ var chunk = args.chunk;
+ var isProgressive = args.begin === undefined;
+ var begin = isProgressive ? this.progressiveDataLength : args.begin;
+ var end = begin + chunk.byteLength;
+
+ var beginChunk = Math.floor(begin / this.chunkSize);
+ var endChunk = end < this.length ? Math.floor(end / this.chunkSize) :
+ Math.ceil(end / this.chunkSize);
+
+ if (isProgressive) {
+ this.stream.onReceiveProgressiveData(chunk);
+ this.progressiveDataLength = end;
+ } else {
+ this.stream.onReceiveData(begin, chunk);
+ }
+
+ if (this.stream.allChunksLoaded()) {
+ this._loadedStreamCapability.resolve(this.stream);
+ }
+
+ var loadedRequests = [];
+ var i, requestId;
+ for (chunk = beginChunk; chunk < endChunk; ++chunk) {
+ // The server might return more chunks than requested
+ var requestIds = this.requestsByChunk[chunk] || [];
+ delete this.requestsByChunk[chunk];
+
+ for (i = 0; i < requestIds.length; ++i) {
+ requestId = requestIds[i];
+ var chunksNeeded = this.chunksNeededByRequest[requestId];
+ if (chunk in chunksNeeded) {
+ delete chunksNeeded[chunk];
+ }
+
+ if (!isEmptyObj(chunksNeeded)) {
+ continue;
+ }
+
+ loadedRequests.push(requestId);
+ }
+ }
+
+ // If there are no pending requests, automatically fetch the next
+ // unfetched chunk of the PDF
+ if (!this.disableAutoFetch && isEmptyObj(this.requestsByChunk)) {
+ var nextEmptyChunk;
+ if (this.stream.numChunksLoaded === 1) {
+ // This is a special optimization so that after fetching the first
+ // chunk, rather than fetching the second chunk, we fetch the last
+ // chunk.
+ var lastChunk = this.stream.numChunks - 1;
+ if (!this.stream.hasChunk(lastChunk)) {
+ nextEmptyChunk = lastChunk;
+ }
+ } else {
+ nextEmptyChunk = this.stream.nextEmptyChunk(endChunk);
+ }
+ if (isInt(nextEmptyChunk)) {
+ this.requestChunks([nextEmptyChunk]);
+ }
+ }
+
+ for (i = 0; i < loadedRequests.length; ++i) {
+ requestId = loadedRequests[i];
+ var callback = this.callbacksByRequest[requestId];
+ delete this.callbacksByRequest[requestId];
+ if (callback) {
+ callback();
+ }
+ }
+
+ this.msgHandler.send('DocProgress', {
+ loaded: this.stream.numChunksLoaded * this.chunkSize,
+ total: this.length
+ });
+ },
+
+ onError: function ChunkedStreamManager_onError(err) {
+ this._loadedStreamCapability.reject(err);
+ },
+
+ getBeginChunk: function ChunkedStreamManager_getBeginChunk(begin) {
+ var chunk = Math.floor(begin / this.chunkSize);
+ return chunk;
+ },
+
+ getEndChunk: function ChunkedStreamManager_getEndChunk(end) {
+ if (end % this.chunkSize === 0) {
+ return end / this.chunkSize;
+ }
+
+ // 0 -> 0
+ // 1 -> 1
+ // 99 -> 1
+ // 100 -> 1
+ // 101 -> 2
+ var chunk = Math.floor((end - 1) / this.chunkSize) + 1;
+ return chunk;
+ }
+ };
+
+ return ChunkedStreamManager;
+})();
+
+
+// The maximum number of bytes fetched per range request
+var RANGE_CHUNK_SIZE = 65536;
+
+// TODO(mack): Make use of PDFJS.Util.inherit() when it becomes available
+var BasePdfManager = (function BasePdfManagerClosure() {
+ function BasePdfManager() {
+ throw new Error('Cannot initialize BaseManagerManager');
+ }
+
+ BasePdfManager.prototype = {
+ onLoadedStream: function BasePdfManager_onLoadedStream() {
+ throw new NotImplementedException();
+ },
+
+ ensureDoc: function BasePdfManager_ensureDoc(prop, args) {
+ return this.ensure(this.pdfDocument, prop, args);
+ },
+
+ ensureXRef: function BasePdfManager_ensureXRef(prop, args) {
+ return this.ensure(this.pdfDocument.xref, prop, args);
+ },
+
+ ensureCatalog: function BasePdfManager_ensureCatalog(prop, args) {
+ return this.ensure(this.pdfDocument.catalog, prop, args);
+ },
+
+ getPage: function BasePdfManager_pagePage(pageIndex) {
+ return this.pdfDocument.getPage(pageIndex);
+ },
+
+ cleanup: function BasePdfManager_cleanup() {
+ return this.pdfDocument.cleanup();
+ },
+
+ ensure: function BasePdfManager_ensure(obj, prop, args) {
+ return new NotImplementedException();
+ },
+
+ requestRange: function BasePdfManager_ensure(begin, end) {
+ return new NotImplementedException();
+ },
+
+ requestLoadedStream: function BasePdfManager_requestLoadedStream() {
+ return new NotImplementedException();
+ },
+
+ sendProgressiveData: function BasePdfManager_sendProgressiveData(chunk) {
+ return new NotImplementedException();
+ },
+
+ updatePassword: function BasePdfManager_updatePassword(password) {
+ this.pdfDocument.xref.password = this.password = password;
+ if (this._passwordChangedCapability) {
+ this._passwordChangedCapability.resolve();
+ }
+ },
+
+ passwordChanged: function BasePdfManager_passwordChanged() {
+ this._passwordChangedCapability = createPromiseCapability();
+ return this._passwordChangedCapability.promise;
+ },
+
+ terminate: function BasePdfManager_terminate() {
+ return new NotImplementedException();
+ }
+ };
+
+ return BasePdfManager;
+})();
+
+var LocalPdfManager = (function LocalPdfManagerClosure() {
+ function LocalPdfManager(data, password) {
+ var stream = new Stream(data);
+ this.pdfDocument = new PDFDocument(this, stream, password);
+ this._loadedStreamCapability = createPromiseCapability();
+ this._loadedStreamCapability.resolve(stream);
+ }
+
+ LocalPdfManager.prototype = Object.create(BasePdfManager.prototype);
+ LocalPdfManager.prototype.constructor = LocalPdfManager;
+
+ LocalPdfManager.prototype.ensure =
+ function LocalPdfManager_ensure(obj, prop, args) {
+ return new Promise(function (resolve, reject) {
+ try {
+ var value = obj[prop];
+ var result;
+ if (typeof value === 'function') {
+ result = value.apply(obj, args);
+ } else {
+ result = value;
+ }
+ resolve(result);
+ } catch (e) {
+ reject(e);
+ }
+ });
+ };
+
+ LocalPdfManager.prototype.requestRange =
+ function LocalPdfManager_requestRange(begin, end) {
+ return Promise.resolve();
+ };
+
+ LocalPdfManager.prototype.requestLoadedStream =
+ function LocalPdfManager_requestLoadedStream() {
+ };
+
+ LocalPdfManager.prototype.onLoadedStream =
+ function LocalPdfManager_getLoadedStream() {
+ return this._loadedStreamCapability.promise;
+ };
+
+ LocalPdfManager.prototype.terminate =
+ function LocalPdfManager_terminate() {
+ return;
+ };
+
+ return LocalPdfManager;
+})();
+
+var NetworkPdfManager = (function NetworkPdfManagerClosure() {
+ function NetworkPdfManager(args, msgHandler) {
+
+ this.msgHandler = msgHandler;
+
+ var params = {
+ msgHandler: msgHandler,
+ httpHeaders: args.httpHeaders,
+ withCredentials: args.withCredentials,
+ chunkedViewerLoading: args.chunkedViewerLoading,
+ disableAutoFetch: args.disableAutoFetch,
+ initialData: args.initialData
+ };
+ this.streamManager = new ChunkedStreamManager(args.length, RANGE_CHUNK_SIZE,
+ args.url, params);
+
+ this.pdfDocument = new PDFDocument(this, this.streamManager.getStream(),
+ args.password);
+ }
+
+ NetworkPdfManager.prototype = Object.create(BasePdfManager.prototype);
+ NetworkPdfManager.prototype.constructor = NetworkPdfManager;
+
+ NetworkPdfManager.prototype.ensure =
+ function NetworkPdfManager_ensure(obj, prop, args) {
+ var pdfManager = this;
+
+ return new Promise(function (resolve, reject) {
+ function ensureHelper() {
+ try {
+ var result;
+ var value = obj[prop];
+ if (typeof value === 'function') {
+ result = value.apply(obj, args);
+ } else {
+ result = value;
+ }
+ resolve(result);
+ } catch(e) {
+ if (!(e instanceof MissingDataException)) {
+ reject(e);
+ return;
+ }
+ pdfManager.streamManager.requestRange(e.begin, e.end, ensureHelper);
+ }
+ }
+
+ ensureHelper();
+ });
+ };
+
+ NetworkPdfManager.prototype.requestRange =
+ function NetworkPdfManager_requestRange(begin, end) {
+ return new Promise(function (resolve) {
+ this.streamManager.requestRange(begin, end, function() {
+ resolve();
+ });
+ }.bind(this));
+ };
+
+ NetworkPdfManager.prototype.requestLoadedStream =
+ function NetworkPdfManager_requestLoadedStream() {
+ this.streamManager.requestAllChunks();
+ };
+
+ NetworkPdfManager.prototype.sendProgressiveData =
+ function NetworkPdfManager_sendProgressiveData(chunk) {
+ this.streamManager.onReceiveData({ chunk: chunk });
+ };
+
+ NetworkPdfManager.prototype.onLoadedStream =
+ function NetworkPdfManager_getLoadedStream() {
+ return this.streamManager.onLoadedStream();
+ };
+
+ NetworkPdfManager.prototype.terminate =
+ function NetworkPdfManager_terminate() {
+ this.streamManager.networkManager.abortAllRequests();
+ };
+
+ return NetworkPdfManager;
+})();
+
+
+var Page = (function PageClosure() {
+
+ var LETTER_SIZE_MEDIABOX = [0, 0, 612, 792];
+
+ function Page(pdfManager, xref, pageIndex, pageDict, ref, fontCache) {
+ this.pdfManager = pdfManager;
+ this.pageIndex = pageIndex;
+ this.pageDict = pageDict;
+ this.xref = xref;
+ this.ref = ref;
+ this.fontCache = fontCache;
+ this.idCounters = {
+ obj: 0
+ };
+ this.resourcesPromise = null;
+ }
+
+ Page.prototype = {
+ getPageProp: function Page_getPageProp(key) {
+ return this.pageDict.get(key);
+ },
+
+ getInheritedPageProp: function Page_inheritPageProp(key) {
+ var dict = this.pageDict;
+ var value = dict.get(key);
+ while (value === undefined) {
+ dict = dict.get('Parent');
+ if (!dict) {
+ break;
+ }
+ value = dict.get(key);
+ }
+ return value;
+ },
+
+ get content() {
+ return this.getPageProp('Contents');
+ },
+
+ get resources() {
+ var value = this.getInheritedPageProp('Resources');
+ // For robustness: The spec states that a \Resources entry has to be
+ // present, but can be empty. Some document omit it still. In this case
+ // return an empty dictionary:
+ if (value === undefined) {
+ value = Dict.empty;
+ }
+ return shadow(this, 'resources', value);
+ },
+
+ get mediaBox() {
+ var obj = this.getInheritedPageProp('MediaBox');
+ // Reset invalid media box to letter size.
+ if (!isArray(obj) || obj.length !== 4) {
+ obj = LETTER_SIZE_MEDIABOX;
+ }
+ return shadow(this, 'mediaBox', obj);
+ },
+
+ get view() {
+ var mediaBox = this.mediaBox;
+ var cropBox = this.getInheritedPageProp('CropBox');
+ if (!isArray(cropBox) || cropBox.length !== 4) {
+ return shadow(this, 'view', mediaBox);
+ }
+
+ // From the spec, 6th ed., p.963:
+ // "The crop, bleed, trim, and art boxes should not ordinarily
+ // extend beyond the boundaries of the media box. If they do, they are
+ // effectively reduced to their intersection with the media box."
+ cropBox = Util.intersect(cropBox, mediaBox);
+ if (!cropBox) {
+ return shadow(this, 'view', mediaBox);
+ }
+ return shadow(this, 'view', cropBox);
+ },
+
+ get annotationRefs() {
+ return shadow(this, 'annotationRefs',
+ this.getInheritedPageProp('Annots'));
+ },
+
+ get rotate() {
+ var rotate = this.getInheritedPageProp('Rotate') || 0;
+ // Normalize rotation so it's a multiple of 90 and between 0 and 270
+ if (rotate % 90 !== 0) {
+ rotate = 0;
+ } else if (rotate >= 360) {
+ rotate = rotate % 360;
+ } else if (rotate < 0) {
+ // The spec doesn't cover negatives, assume its counterclockwise
+ // rotation. The following is the other implementation of modulo.
+ rotate = ((rotate % 360) + 360) % 360;
+ }
+ return shadow(this, 'rotate', rotate);
+ },
+
+ getContentStream: function Page_getContentStream() {
+ var content = this.content;
+ var stream;
+ if (isArray(content)) {
+ // fetching items
+ var xref = this.xref;
+ var i, n = content.length;
+ var streams = [];
+ for (i = 0; i < n; ++i) {
+ streams.push(xref.fetchIfRef(content[i]));
+ }
+ stream = new StreamsSequenceStream(streams);
+ } else if (isStream(content)) {
+ stream = content;
+ } else {
+ // replacing non-existent page content with empty one
+ stream = new NullStream();
+ }
+ return stream;
+ },
+
+ loadResources: function Page_loadResources(keys) {
+ if (!this.resourcesPromise) {
+ // TODO: add async getInheritedPageProp and remove this.
+ this.resourcesPromise = this.pdfManager.ensure(this, 'resources');
+ }
+ return this.resourcesPromise.then(function resourceSuccess() {
+ var objectLoader = new ObjectLoader(this.resources.map,
+ keys,
+ this.xref);
+ return objectLoader.load();
+ }.bind(this));
+ },
+
+ getOperatorList: function Page_getOperatorList(handler, intent) {
+ var self = this;
+
+ var pdfManager = this.pdfManager;
+ var contentStreamPromise = pdfManager.ensure(this, 'getContentStream',
+ []);
+ var resourcesPromise = this.loadResources([
+ 'ExtGState',
+ 'ColorSpace',
+ 'Pattern',
+ 'Shading',
+ 'XObject',
+ 'Font'
+ // ProcSet
+ // Properties
+ ]);
+
+ var partialEvaluator = new PartialEvaluator(pdfManager, this.xref,
+ handler, this.pageIndex,
+ 'p' + this.pageIndex + '_',
+ this.idCounters,
+ this.fontCache);
+
+ var dataPromises = Promise.all([contentStreamPromise, resourcesPromise]);
+ var pageListPromise = dataPromises.then(function(data) {
+ var contentStream = data[0];
+ var opList = new OperatorList(intent, handler, self.pageIndex);
+
+ handler.send('StartRenderPage', {
+ transparency: partialEvaluator.hasBlendModes(self.resources),
+ pageIndex: self.pageIndex,
+ intent: intent
+ });
+ return partialEvaluator.getOperatorList(contentStream, self.resources,
+ opList).then(function () {
+ return opList;
+ });
+ });
+
+ var annotationsPromise = pdfManager.ensure(this, 'annotations');
+ return Promise.all([pageListPromise, annotationsPromise]).then(
+ function(datas) {
+ var pageOpList = datas[0];
+ var annotations = datas[1];
+
+ if (annotations.length === 0) {
+ pageOpList.flush(true);
+ return pageOpList;
+ }
+
+ var annotationsReadyPromise = Annotation.appendToOperatorList(
+ annotations, pageOpList, pdfManager, partialEvaluator, intent);
+ return annotationsReadyPromise.then(function () {
+ pageOpList.flush(true);
+ return pageOpList;
+ });
+ });
+ },
+
+ extractTextContent: function Page_extractTextContent() {
+ var handler = {
+ on: function nullHandlerOn() {},
+ send: function nullHandlerSend() {}
+ };
+
+ var self = this;
+
+ var pdfManager = this.pdfManager;
+ var contentStreamPromise = pdfManager.ensure(this, 'getContentStream',
+ []);
+
+ var resourcesPromise = this.loadResources([
+ 'ExtGState',
+ 'XObject',
+ 'Font'
+ ]);
+
+ var dataPromises = Promise.all([contentStreamPromise,
+ resourcesPromise]);
+ return dataPromises.then(function(data) {
+ var contentStream = data[0];
+ var partialEvaluator = new PartialEvaluator(pdfManager, self.xref,
+ handler, self.pageIndex,
+ 'p' + self.pageIndex + '_',
+ self.idCounters,
+ self.fontCache);
+
+ return partialEvaluator.getTextContent(contentStream,
+ self.resources);
+ });
+ },
+
+ getAnnotationsData: function Page_getAnnotationsData() {
+ var annotations = this.annotations;
+ var annotationsData = [];
+ for (var i = 0, n = annotations.length; i < n; ++i) {
+ annotationsData.push(annotations[i].getData());
+ }
+ return annotationsData;
+ },
+
+ get annotations() {
+ var annotations = [];
+ var annotationRefs = (this.annotationRefs || []);
+ for (var i = 0, n = annotationRefs.length; i < n; ++i) {
+ var annotationRef = annotationRefs[i];
+ var annotation = Annotation.fromRef(this.xref, annotationRef);
+ if (annotation) {
+ annotations.push(annotation);
+ }
+ }
+ return shadow(this, 'annotations', annotations);
+ }
+ };
+
+ return Page;
+})();
+
+/**
+ * The `PDFDocument` holds all the data of the PDF file. Compared to the
+ * `PDFDoc`, this one doesn't have any job management code.
+ * Right now there exists one PDFDocument on the main thread + one object
+ * for each worker. If there is no worker support enabled, there are two
+ * `PDFDocument` objects on the main thread created.
+ */
+var PDFDocument = (function PDFDocumentClosure() {
+ var FINGERPRINT_FIRST_BYTES = 1024;
+ var EMPTY_FINGERPRINT = '\x00\x00\x00\x00\x00\x00\x00' +
+ '\x00\x00\x00\x00\x00\x00\x00\x00\x00';
+
+ function PDFDocument(pdfManager, arg, password) {
+ if (isStream(arg)) {
+ init.call(this, pdfManager, arg, password);
+ } else if (isArrayBuffer(arg)) {
+ init.call(this, pdfManager, new Stream(arg), password);
+ } else {
+ error('PDFDocument: Unknown argument type');
+ }
+ }
+
+ function init(pdfManager, stream, password) {
+ assert(stream.length > 0, 'stream must have data');
+ this.pdfManager = pdfManager;
+ this.stream = stream;
+ var xref = new XRef(this.stream, password, pdfManager);
+ this.xref = xref;
+ }
+
+ function find(stream, needle, limit, backwards) {
+ var pos = stream.pos;
+ var end = stream.end;
+ var strBuf = [];
+ if (pos + limit > end) {
+ limit = end - pos;
+ }
+ for (var n = 0; n < limit; ++n) {
+ strBuf.push(String.fromCharCode(stream.getByte()));
+ }
+ var str = strBuf.join('');
+ stream.pos = pos;
+ var index = backwards ? str.lastIndexOf(needle) : str.indexOf(needle);
+ if (index === -1) {
+ return false; /* not found */
+ }
+ stream.pos += index;
+ return true; /* found */
+ }
+
+ var DocumentInfoValidators = {
+ get entries() {
+ // Lazily build this since all the validation functions below are not
+ // defined until after this file loads.
+ return shadow(this, 'entries', {
+ Title: isString,
+ Author: isString,
+ Subject: isString,
+ Keywords: isString,
+ Creator: isString,
+ Producer: isString,
+ CreationDate: isString,
+ ModDate: isString,
+ Trapped: isName
+ });
+ }
+ };
+
+ PDFDocument.prototype = {
+ parse: function PDFDocument_parse(recoveryMode) {
+ this.setup(recoveryMode);
+ try {
+ // checking if AcroForm is present
+ this.acroForm = this.catalog.catDict.get('AcroForm');
+ if (this.acroForm) {
+ this.xfa = this.acroForm.get('XFA');
+ var fields = this.acroForm.get('Fields');
+ if ((!fields || !isArray(fields) || fields.length === 0) &&
+ !this.xfa) {
+ // no fields and no XFA -- not a form (?)
+ this.acroForm = null;
+ }
+ }
+ } catch (ex) {
+ info('Something wrong with AcroForm entry');
+ this.acroForm = null;
+ }
+ },
+
+ get linearization() {
+ var linearization = null;
+ if (this.stream.length) {
+ try {
+ linearization = Linearization.create(this.stream);
+ } catch (err) {
+ if (err instanceof MissingDataException) {
+ throw err;
+ }
+ info(err);
+ }
+ }
+ // shadow the prototype getter with a data property
+ return shadow(this, 'linearization', linearization);
+ },
+ get startXRef() {
+ var stream = this.stream;
+ var startXRef = 0;
+ var linearization = this.linearization;
+ if (linearization) {
+ // Find end of first obj.
+ stream.reset();
+ if (find(stream, 'endobj', 1024)) {
+ startXRef = stream.pos + 6;
+ }
+ } else {
+ // Find startxref by jumping backward from the end of the file.
+ var step = 1024;
+ var found = false, pos = stream.end;
+ while (!found && pos > 0) {
+ pos -= step - 'startxref'.length;
+ if (pos < 0) {
+ pos = 0;
+ }
+ stream.pos = pos;
+ found = find(stream, 'startxref', step, true);
+ }
+ if (found) {
+ stream.skip(9);
+ var ch;
+ do {
+ ch = stream.getByte();
+ } while (Lexer.isSpace(ch));
+ var str = '';
+ while (ch >= 0x20 && ch <= 0x39) { // < '9'
+ str += String.fromCharCode(ch);
+ ch = stream.getByte();
+ }
+ startXRef = parseInt(str, 10);
+ if (isNaN(startXRef)) {
+ startXRef = 0;
+ }
+ }
+ }
+ // shadow the prototype getter with a data property
+ return shadow(this, 'startXRef', startXRef);
+ },
+ get mainXRefEntriesOffset() {
+ var mainXRefEntriesOffset = 0;
+ var linearization = this.linearization;
+ if (linearization) {
+ mainXRefEntriesOffset = linearization.mainXRefEntriesOffset;
+ }
+ // shadow the prototype getter with a data property
+ return shadow(this, 'mainXRefEntriesOffset', mainXRefEntriesOffset);
+ },
+ // Find the header, remove leading garbage and setup the stream
+ // starting from the header.
+ checkHeader: function PDFDocument_checkHeader() {
+ var stream = this.stream;
+ stream.reset();
+ if (find(stream, '%PDF-', 1024)) {
+ // Found the header, trim off any garbage before it.
+ stream.moveStart();
+ // Reading file format version
+ var MAX_VERSION_LENGTH = 12;
+ var version = '', ch;
+ while ((ch = stream.getByte()) > 0x20) { // SPACE
+ if (version.length >= MAX_VERSION_LENGTH) {
+ break;
+ }
+ version += String.fromCharCode(ch);
+ }
+ // removing "%PDF-"-prefix
+ this.pdfFormatVersion = version.substring(5);
+ return;
+ }
+ // May not be a PDF file, continue anyway.
+ },
+ parseStartXRef: function PDFDocument_parseStartXRef() {
+ var startXRef = this.startXRef;
+ this.xref.setStartXRef(startXRef);
+ },
+ setup: function PDFDocument_setup(recoveryMode) {
+ this.xref.parse(recoveryMode);
+ this.catalog = new Catalog(this.pdfManager, this.xref);
+ },
+ get numPages() {
+ var linearization = this.linearization;
+ var num = linearization ? linearization.numPages : this.catalog.numPages;
+ // shadow the prototype getter
+ return shadow(this, 'numPages', num);
+ },
+ get documentInfo() {
+ var docInfo = {
+ PDFFormatVersion: this.pdfFormatVersion,
+ IsAcroFormPresent: !!this.acroForm,
+ IsXFAPresent: !!this.xfa
+ };
+ var infoDict;
+ try {
+ infoDict = this.xref.trailer.get('Info');
+ } catch (err) {
+ info('The document information dictionary is invalid.');
+ }
+ if (infoDict) {
+ var validEntries = DocumentInfoValidators.entries;
+ // Only fill the document info with valid entries from the spec.
+ for (var key in validEntries) {
+ if (infoDict.has(key)) {
+ var value = infoDict.get(key);
+ // Make sure the value conforms to the spec.
+ if (validEntries[key](value)) {
+ docInfo[key] = (typeof value !== 'string' ?
+ value : stringToPDFString(value));
+ } else {
+ info('Bad value in document info for "' + key + '"');
+ }
+ }
+ }
+ }
+ return shadow(this, 'documentInfo', docInfo);
+ },
+ get fingerprint() {
+ var xref = this.xref, idArray, hash, fileID = '';
+
+ if (xref.trailer.has('ID')) {
+ idArray = xref.trailer.get('ID');
+ }
+ if (idArray && isArray(idArray) && idArray[0] !== EMPTY_FINGERPRINT) {
+ hash = stringToBytes(idArray[0]);
+ } else {
+ if (this.stream.ensureRange) {
+ this.stream.ensureRange(0,
+ Math.min(FINGERPRINT_FIRST_BYTES, this.stream.end));
+ }
+ hash = calculateMD5(this.stream.bytes.subarray(0,
+ FINGERPRINT_FIRST_BYTES), 0, FINGERPRINT_FIRST_BYTES);
+ }
+
+ for (var i = 0, n = hash.length; i < n; i++) {
+ var hex = hash[i].toString(16);
+ fileID += hex.length === 1 ? '0' + hex : hex;
+ }
+
+ return shadow(this, 'fingerprint', fileID);
+ },
+
+ getPage: function PDFDocument_getPage(pageIndex) {
+ return this.catalog.getPage(pageIndex);
+ },
+
+ cleanup: function PDFDocument_cleanup() {
+ return this.catalog.cleanup();
+ }
+ };
+
+ return PDFDocument;
+})();
+
+
+var Name = (function NameClosure() {
+ function Name(name) {
+ this.name = name;
+ }
+
+ Name.prototype = {};
+
+ var nameCache = {};
+
+ Name.get = function Name_get(name) {
+ var nameValue = nameCache[name];
+ return (nameValue ? nameValue : (nameCache[name] = new Name(name)));
+ };
+
+ return Name;
+})();
+
+var Cmd = (function CmdClosure() {
+ function Cmd(cmd) {
+ this.cmd = cmd;
+ }
+
+ Cmd.prototype = {};
+
+ var cmdCache = {};
+
+ Cmd.get = function Cmd_get(cmd) {
+ var cmdValue = cmdCache[cmd];
+ return (cmdValue ? cmdValue : (cmdCache[cmd] = new Cmd(cmd)));
+ };
+
+ return Cmd;
+})();
+
+var Dict = (function DictClosure() {
+ var nonSerializable = function nonSerializableClosure() {
+ return nonSerializable; // creating closure on some variable
+ };
+
+ var GETALL_DICTIONARY_TYPES_WHITELIST = {
+ 'Background': true,
+ 'ExtGState': true,
+ 'Halftone': true,
+ 'Layout': true,
+ 'Mask': true,
+ 'Pagination': true,
+ 'Printing': true
+ };
+
+ function isRecursionAllowedFor(dict) {
+ if (!isName(dict.Type)) {
+ return true;
+ }
+ var dictType = dict.Type.name;
+ return GETALL_DICTIONARY_TYPES_WHITELIST[dictType] === true;
+ }
+
+ // xref is optional
+ function Dict(xref) {
+ // Map should only be used internally, use functions below to access.
+ this.map = Object.create(null);
+ this.xref = xref;
+ this.objId = null;
+ this.__nonSerializable__ = nonSerializable; // disable cloning of the Dict
+ }
+
+ Dict.prototype = {
+ assignXref: function Dict_assignXref(newXref) {
+ this.xref = newXref;
+ },
+
+ // automatically dereferences Ref objects
+ get: function Dict_get(key1, key2, key3) {
+ var value;
+ var xref = this.xref;
+ if (typeof (value = this.map[key1]) !== 'undefined' || key1 in this.map ||
+ typeof key2 === 'undefined') {
+ return xref ? xref.fetchIfRef(value) : value;
+ }
+ if (typeof (value = this.map[key2]) !== 'undefined' || key2 in this.map ||
+ typeof key3 === 'undefined') {
+ return xref ? xref.fetchIfRef(value) : value;
+ }
+ value = this.map[key3] || null;
+ return xref ? xref.fetchIfRef(value) : value;
+ },
+
+ // Same as get(), but returns a promise and uses fetchIfRefAsync().
+ getAsync: function Dict_getAsync(key1, key2, key3) {
+ var value;
+ var xref = this.xref;
+ if (typeof (value = this.map[key1]) !== 'undefined' || key1 in this.map ||
+ typeof key2 === 'undefined') {
+ if (xref) {
+ return xref.fetchIfRefAsync(value);
+ }
+ return Promise.resolve(value);
+ }
+ if (typeof (value = this.map[key2]) !== 'undefined' || key2 in this.map ||
+ typeof key3 === 'undefined') {
+ if (xref) {
+ return xref.fetchIfRefAsync(value);
+ }
+ return Promise.resolve(value);
+ }
+ value = this.map[key3] || null;
+ if (xref) {
+ return xref.fetchIfRefAsync(value);
+ }
+ return Promise.resolve(value);
+ },
+
+ // no dereferencing
+ getRaw: function Dict_getRaw(key) {
+ return this.map[key];
+ },
+
+ // creates new map and dereferences all Refs
+ getAll: function Dict_getAll() {
+ var all = Object.create(null);
+ var queue = null;
+ var key, obj;
+ for (key in this.map) {
+ obj = this.get(key);
+ if (obj instanceof Dict) {
+ if (isRecursionAllowedFor(obj)) {
+ (queue || (queue = [])).push({target: all, key: key, obj: obj});
+ } else {
+ all[key] = this.getRaw(key);
+ }
+ } else {
+ all[key] = obj;
+ }
+ }
+ if (!queue) {
+ return all;
+ }
+
+ // trying to take cyclic references into the account
+ var processed = Object.create(null);
+ while (queue.length > 0) {
+ var item = queue.shift();
+ var itemObj = item.obj;
+ var objId = itemObj.objId;
+ if (objId && objId in processed) {
+ item.target[item.key] = processed[objId];
+ continue;
+ }
+ var dereferenced = Object.create(null);
+ for (key in itemObj.map) {
+ obj = itemObj.get(key);
+ if (obj instanceof Dict) {
+ if (isRecursionAllowedFor(obj)) {
+ queue.push({target: dereferenced, key: key, obj: obj});
+ } else {
+ dereferenced[key] = itemObj.getRaw(key);
+ }
+ } else {
+ dereferenced[key] = obj;
+ }
+ }
+ if (objId) {
+ processed[objId] = dereferenced;
+ }
+ item.target[item.key] = dereferenced;
+ }
+ return all;
+ },
+
+ getKeys: function Dict_getKeys() {
+ return Object.keys(this.map);
+ },
+
+ set: function Dict_set(key, value) {
+ this.map[key] = value;
+ },
+
+ has: function Dict_has(key) {
+ return key in this.map;
+ },
+
+ forEach: function Dict_forEach(callback) {
+ for (var key in this.map) {
+ callback(key, this.get(key));
+ }
+ }
+ };
+
+ Dict.empty = new Dict(null);
+
+ return Dict;
+})();
+
+var Ref = (function RefClosure() {
+ function Ref(num, gen) {
+ this.num = num;
+ this.gen = gen;
+ }
+
+ Ref.prototype = {
+ toString: function Ref_toString() {
+ // This function is hot, so we make the string as compact as possible.
+ // |this.gen| is almost always zero, so we treat that case specially.
+ var str = this.num + 'R';
+ if (this.gen !== 0) {
+ str += this.gen;
+ }
+ return str;
+ }
+ };
+
+ return Ref;
+})();
+
+// The reference is identified by number and generation.
+// This structure stores only one instance of the reference.
+var RefSet = (function RefSetClosure() {
+ function RefSet() {
+ this.dict = {};
+ }
+
+ RefSet.prototype = {
+ has: function RefSet_has(ref) {
+ return ref.toString() in this.dict;
+ },
+
+ put: function RefSet_put(ref) {
+ this.dict[ref.toString()] = true;
+ },
+
+ remove: function RefSet_remove(ref) {
+ delete this.dict[ref.toString()];
+ }
+ };
+
+ return RefSet;
+})();
+
+var RefSetCache = (function RefSetCacheClosure() {
+ function RefSetCache() {
+ this.dict = Object.create(null);
+ }
+
+ RefSetCache.prototype = {
+ get: function RefSetCache_get(ref) {
+ return this.dict[ref.toString()];
+ },
+
+ has: function RefSetCache_has(ref) {
+ return ref.toString() in this.dict;
+ },
+
+ put: function RefSetCache_put(ref, obj) {
+ this.dict[ref.toString()] = obj;
+ },
+
+ putAlias: function RefSetCache_putAlias(ref, aliasRef) {
+ this.dict[ref.toString()] = this.get(aliasRef);
+ },
+
+ forEach: function RefSetCache_forEach(fn, thisArg) {
+ for (var i in this.dict) {
+ fn.call(thisArg, this.dict[i]);
+ }
+ },
+
+ clear: function RefSetCache_clear() {
+ this.dict = Object.create(null);
+ }
+ };
+
+ return RefSetCache;
+})();
+
+var Catalog = (function CatalogClosure() {
+ function Catalog(pdfManager, xref) {
+ this.pdfManager = pdfManager;
+ this.xref = xref;
+ this.catDict = xref.getCatalogObj();
+ this.fontCache = new RefSetCache();
+ assert(isDict(this.catDict),
+ 'catalog object is not a dictionary');
+
+ this.pagePromises = [];
+ }
+
+ Catalog.prototype = {
+ get metadata() {
+ var streamRef = this.catDict.getRaw('Metadata');
+ if (!isRef(streamRef)) {
+ return shadow(this, 'metadata', null);
+ }
+
+ var encryptMetadata = (!this.xref.encrypt ? false :
+ this.xref.encrypt.encryptMetadata);
+
+ var stream = this.xref.fetch(streamRef, !encryptMetadata);
+ var metadata;
+ if (stream && isDict(stream.dict)) {
+ var type = stream.dict.get('Type');
+ var subtype = stream.dict.get('Subtype');
+
+ if (isName(type) && isName(subtype) &&
+ type.name === 'Metadata' && subtype.name === 'XML') {
+ // XXX: This should examine the charset the XML document defines,
+ // however since there are currently no real means to decode
+ // arbitrary charsets, let's just hope that the author of the PDF
+ // was reasonable enough to stick with the XML default charset,
+ // which is UTF-8.
+ try {
+ metadata = stringToUTF8String(bytesToString(stream.getBytes()));
+ } catch (e) {
+ info('Skipping invalid metadata.');
+ }
+ }
+ }
+
+ return shadow(this, 'metadata', metadata);
+ },
+ get toplevelPagesDict() {
+ var pagesObj = this.catDict.get('Pages');
+ assert(isDict(pagesObj), 'invalid top-level pages dictionary');
+ // shadow the prototype getter
+ return shadow(this, 'toplevelPagesDict', pagesObj);
+ },
+ get documentOutline() {
+ var obj = null;
+ try {
+ obj = this.readDocumentOutline();
+ } catch (ex) {
+ if (ex instanceof MissingDataException) {
+ throw ex;
+ }
+ warn('Unable to read document outline');
+ }
+ return shadow(this, 'documentOutline', obj);
+ },
+ readDocumentOutline: function Catalog_readDocumentOutline() {
+ var xref = this.xref;
+ var obj = this.catDict.get('Outlines');
+ var root = { items: [] };
+ if (isDict(obj)) {
+ obj = obj.getRaw('First');
+ var processed = new RefSet();
+ if (isRef(obj)) {
+ var queue = [{obj: obj, parent: root}];
+ // to avoid recursion keeping track of the items
+ // in the processed dictionary
+ processed.put(obj);
+ while (queue.length > 0) {
+ var i = queue.shift();
+ var outlineDict = xref.fetchIfRef(i.obj);
+ if (outlineDict === null) {
+ continue;
+ }
+ if (!outlineDict.has('Title')) {
+ error('Invalid outline item');
+ }
+ var dest = outlineDict.get('A');
+ if (dest) {
+ dest = dest.get('D');
+ } else if (outlineDict.has('Dest')) {
+ dest = outlineDict.getRaw('Dest');
+ if (isName(dest)) {
+ dest = dest.name;
+ }
+ }
+ var title = outlineDict.get('Title');
+ var outlineItem = {
+ dest: dest,
+ title: stringToPDFString(title),
+ color: outlineDict.get('C') || [0, 0, 0],
+ count: outlineDict.get('Count'),
+ bold: !!(outlineDict.get('F') & 2),
+ italic: !!(outlineDict.get('F') & 1),
+ items: []
+ };
+ i.parent.items.push(outlineItem);
+ obj = outlineDict.getRaw('First');
+ if (isRef(obj) && !processed.has(obj)) {
+ queue.push({obj: obj, parent: outlineItem});
+ processed.put(obj);
+ }
+ obj = outlineDict.getRaw('Next');
+ if (isRef(obj) && !processed.has(obj)) {
+ queue.push({obj: obj, parent: i.parent});
+ processed.put(obj);
+ }
+ }
+ }
+ }
+ return (root.items.length > 0 ? root.items : null);
+ },
+ get numPages() {
+ var obj = this.toplevelPagesDict.get('Count');
+ assert(
+ isInt(obj),
+ 'page count in top level pages object is not an integer'
+ );
+ // shadow the prototype getter
+ return shadow(this, 'num', obj);
+ },
+ get destinations() {
+ function fetchDestination(dest) {
+ return isDict(dest) ? dest.get('D') : dest;
+ }
+
+ var xref = this.xref;
+ var dests = {}, nameTreeRef, nameDictionaryRef;
+ var obj = this.catDict.get('Names');
+ if (obj && obj.has('Dests')) {
+ nameTreeRef = obj.getRaw('Dests');
+ } else if (this.catDict.has('Dests')) {
+ nameDictionaryRef = this.catDict.get('Dests');
+ }
+
+ if (nameDictionaryRef) {
+ // reading simple destination dictionary
+ obj = nameDictionaryRef;
+ obj.forEach(function catalogForEach(key, value) {
+ if (!value) {
+ return;
+ }
+ dests[key] = fetchDestination(value);
+ });
+ }
+ if (nameTreeRef) {
+ var nameTree = new NameTree(nameTreeRef, xref);
+ var names = nameTree.getAll();
+ for (var name in names) {
+ if (!names.hasOwnProperty(name)) {
+ continue;
+ }
+ dests[name] = fetchDestination(names[name]);
+ }
+ }
+ return shadow(this, 'destinations', dests);
+ },
+ getDestination: function Catalog_getDestination(destinationId) {
+ function fetchDestination(dest) {
+ return isDict(dest) ? dest.get('D') : dest;
+ }
+
+ var xref = this.xref;
+ var dest, nameTreeRef, nameDictionaryRef;
+ var obj = this.catDict.get('Names');
+ if (obj && obj.has('Dests')) {
+ nameTreeRef = obj.getRaw('Dests');
+ } else if (this.catDict.has('Dests')) {
+ nameDictionaryRef = this.catDict.get('Dests');
+ }
+
+ if (nameDictionaryRef) {
+ // reading simple destination dictionary
+ obj = nameDictionaryRef;
+ obj.forEach(function catalogForEach(key, value) {
+ if (!value) {
+ return;
+ }
+ if (key === destinationId) {
+ dest = fetchDestination(value);
+ }
+ });
+ }
+ if (nameTreeRef) {
+ var nameTree = new NameTree(nameTreeRef, xref);
+ dest = fetchDestination(nameTree.get(destinationId));
+ }
+ return dest;
+ },
+ get attachments() {
+ var xref = this.xref;
+ var attachments = null, nameTreeRef;
+ var obj = this.catDict.get('Names');
+ if (obj) {
+ nameTreeRef = obj.getRaw('EmbeddedFiles');
+ }
+
+ if (nameTreeRef) {
+ var nameTree = new NameTree(nameTreeRef, xref);
+ var names = nameTree.getAll();
+ for (var name in names) {
+ if (!names.hasOwnProperty(name)) {
+ continue;
+ }
+ var fs = new FileSpec(names[name], xref);
+ if (!attachments) {
+ attachments = {};
+ }
+ attachments[stringToPDFString(name)] = fs.serializable;
+ }
+ }
+ return shadow(this, 'attachments', attachments);
+ },
+ get javaScript() {
+ var xref = this.xref;
+ var obj = this.catDict.get('Names');
+
+ var javaScript = [];
+ if (obj && obj.has('JavaScript')) {
+ var nameTree = new NameTree(obj.getRaw('JavaScript'), xref);
+ var names = nameTree.getAll();
+ for (var name in names) {
+ if (!names.hasOwnProperty(name)) {
+ continue;
+ }
+ // We don't really use the JavaScript right now. This code is
+ // defensive so we don't cause errors on document load.
+ var jsDict = names[name];
+ if (!isDict(jsDict)) {
+ continue;
+ }
+ var type = jsDict.get('S');
+ if (!isName(type) || type.name !== 'JavaScript') {
+ continue;
+ }
+ var js = jsDict.get('JS');
+ if (!isString(js) && !isStream(js)) {
+ continue;
+ }
+ if (isStream(js)) {
+ js = bytesToString(js.getBytes());
+ }
+ javaScript.push(stringToPDFString(js));
+ }
+ }
+
+ // Append OpenAction actions to javaScript array
+ var openactionDict = this.catDict.get('OpenAction');
+ if (isDict(openactionDict)) {
+ var objType = openactionDict.get('Type');
+ var actionType = openactionDict.get('S');
+ var action = openactionDict.get('N');
+ var isPrintAction = (isName(objType) && objType.name === 'Action' &&
+ isName(actionType) && actionType.name === 'Named' &&
+ isName(action) && action.name === 'Print');
+
+ if (isPrintAction) {
+ javaScript.push('print(true);');
+ }
+ }
+
+ return shadow(this, 'javaScript', javaScript);
+ },
+
+ cleanup: function Catalog_cleanup() {
+ var promises = [];
+ this.fontCache.forEach(function (promise) {
+ promises.push(promise);
+ });
+ return Promise.all(promises).then(function (translatedFonts) {
+ for (var i = 0, ii = translatedFonts.length; i < ii; i++) {
+ var font = translatedFonts[i].dict;
+ delete font.translated;
+ }
+ this.fontCache.clear();
+ }.bind(this));
+ },
+
+ getPage: function Catalog_getPage(pageIndex) {
+ if (!(pageIndex in this.pagePromises)) {
+ this.pagePromises[pageIndex] = this.getPageDict(pageIndex).then(
+ function (a) {
+ var dict = a[0];
+ var ref = a[1];
+ return new Page(this.pdfManager, this.xref, pageIndex, dict, ref,
+ this.fontCache);
+ }.bind(this)
+ );
+ }
+ return this.pagePromises[pageIndex];
+ },
+
+ getPageDict: function Catalog_getPageDict(pageIndex) {
+ var capability = createPromiseCapability();
+ var nodesToVisit = [this.catDict.getRaw('Pages')];
+ var currentPageIndex = 0;
+ var xref = this.xref;
+ var checkAllKids = false;
+
+ function next() {
+ while (nodesToVisit.length) {
+ var currentNode = nodesToVisit.pop();
+
+ if (isRef(currentNode)) {
+ xref.fetchAsync(currentNode).then(function (obj) {
+ if (isDict(obj, 'Page') || (isDict(obj) && !obj.has('Kids'))) {
+ if (pageIndex === currentPageIndex) {
+ capability.resolve([obj, currentNode]);
+ } else {
+ currentPageIndex++;
+ next();
+ }
+ return;
+ }
+ nodesToVisit.push(obj);
+ next();
+ }, capability.reject);
+ return;
+ }
+
+ // Must be a child page dictionary.
+ assert(
+ isDict(currentNode),
+ 'page dictionary kid reference points to wrong type of object'
+ );
+ var count = currentNode.get('Count');
+ // If the current node doesn't have any children, avoid getting stuck
+ // in an empty node further down in the tree (see issue5644.pdf).
+ if (count === 0) {
+ checkAllKids = true;
+ }
+ // Skip nodes where the page can't be.
+ if (currentPageIndex + count <= pageIndex) {
+ currentPageIndex += count;
+ continue;
+ }
+
+ var kids = currentNode.get('Kids');
+ assert(isArray(kids), 'page dictionary kids object is not an array');
+ if (!checkAllKids && count === kids.length) {
+ // Nodes that don't have the page have been skipped and this is the
+ // bottom of the tree which means the page requested must be a
+ // descendant of this pages node. Ideally we would just resolve the
+ // promise with the page ref here, but there is the case where more
+ // pages nodes could link to single a page (see issue 3666 pdf). To
+ // handle this push it back on the queue so if it is a pages node it
+ // will be descended into.
+ nodesToVisit = [kids[pageIndex - currentPageIndex]];
+ currentPageIndex = pageIndex;
+ continue;
+ } else {
+ for (var last = kids.length - 1; last >= 0; last--) {
+ nodesToVisit.push(kids[last]);
+ }
+ }
+ }
+ capability.reject('Page index ' + pageIndex + ' not found.');
+ }
+ next();
+ return capability.promise;
+ },
+
+ getPageIndex: function Catalog_getPageIndex(ref) {
+ // The page tree nodes have the count of all the leaves below them. To get
+ // how many pages are before we just have to walk up the tree and keep
+ // adding the count of siblings to the left of the node.
+ var xref = this.xref;
+ function pagesBeforeRef(kidRef) {
+ var total = 0;
+ var parentRef;
+ return xref.fetchAsync(kidRef).then(function (node) {
+ if (!node) {
+ return null;
+ }
+ parentRef = node.getRaw('Parent');
+ return node.getAsync('Parent');
+ }).then(function (parent) {
+ if (!parent) {
+ return null;
+ }
+ return parent.getAsync('Kids');
+ }).then(function (kids) {
+ if (!kids) {
+ return null;
+ }
+ var kidPromises = [];
+ var found = false;
+ for (var i = 0; i < kids.length; i++) {
+ var kid = kids[i];
+ assert(isRef(kid), 'kids must be a ref');
+ if (kid.num === kidRef.num) {
+ found = true;
+ break;
+ }
+ kidPromises.push(xref.fetchAsync(kid).then(function (kid) {
+ if (kid.has('Count')) {
+ var count = kid.get('Count');
+ total += count;
+ } else { // page leaf node
+ total++;
+ }
+ }));
+ }
+ if (!found) {
+ error('kid ref not found in parents kids');
+ }
+ return Promise.all(kidPromises).then(function () {
+ return [total, parentRef];
+ });
+ });
+ }
+
+ var total = 0;
+ function next(ref) {
+ return pagesBeforeRef(ref).then(function (args) {
+ if (!args) {
+ return total;
+ }
+ var count = args[0];
+ var parentRef = args[1];
+ total += count;
+ return next(parentRef);
+ });
+ }
+
+ return next(ref);
+ }
+ };
+
+ return Catalog;
+})();
+
+var XRef = (function XRefClosure() {
+ function XRef(stream, password) {
+ this.stream = stream;
+ this.entries = [];
+ this.xrefstms = {};
+ // prepare the XRef cache
+ this.cache = [];
+ this.password = password;
+ this.stats = {
+ streamTypes: [],
+ fontTypes: []
+ };
+ }
+
+ XRef.prototype = {
+ setStartXRef: function XRef_setStartXRef(startXRef) {
+ // Store the starting positions of xref tables as we process them
+ // so we can recover from missing data errors
+ this.startXRefQueue = [startXRef];
+ },
+
+ parse: function XRef_parse(recoveryMode) {
+ var trailerDict;
+ if (!recoveryMode) {
+ trailerDict = this.readXRef();
+ } else {
+ warn('Indexing all PDF objects');
+ trailerDict = this.indexObjects();
+ }
+ trailerDict.assignXref(this);
+ this.trailer = trailerDict;
+ var encrypt = trailerDict.get('Encrypt');
+ if (encrypt) {
+ var ids = trailerDict.get('ID');
+ var fileId = (ids && ids.length) ? ids[0] : '';
+ this.encrypt = new CipherTransformFactory(encrypt, fileId,
+ this.password);
+ }
+
+ // get the root dictionary (catalog) object
+ if (!(this.root = trailerDict.get('Root'))) {
+ error('Invalid root reference');
+ }
+ },
+
+ processXRefTable: function XRef_processXRefTable(parser) {
+ if (!('tableState' in this)) {
+ // Stores state of the table as we process it so we can resume
+ // from middle of table in case of missing data error
+ this.tableState = {
+ entryNum: 0,
+ streamPos: parser.lexer.stream.pos,
+ parserBuf1: parser.buf1,
+ parserBuf2: parser.buf2
+ };
+ }
+
+ var obj = this.readXRefTable(parser);
+
+ // Sanity check
+ if (!isCmd(obj, 'trailer')) {
+ error('Invalid XRef table: could not find trailer dictionary');
+ }
+ // Read trailer dictionary, e.g.
+ // trailer
+ // << /Size 22
+ // /Root 20R
+ // /Info 10R
+ // /ID [ <81b14aafa313db63dbd6f981e49f94f4> ]
+ // >>
+ // The parser goes through the entire stream << ... >> and provides
+ // a getter interface for the key-value table
+ var dict = parser.getObj();
+
+ // The pdflib PDF generator can generate a nested trailer dictionary
+ if (!isDict(dict) && dict.dict) {
+ dict = dict.dict;
+ }
+ if (!isDict(dict)) {
+ error('Invalid XRef table: could not parse trailer dictionary');
+ }
+ delete this.tableState;
+
+ return dict;
+ },
+
+ readXRefTable: function XRef_readXRefTable(parser) {
+ // Example of cross-reference table:
+ // xref
+ // 0 1 <-- subsection header (first obj #, obj count)
+ // 0000000000 65535 f <-- actual object (offset, generation #, f/n)
+ // 23 2 <-- subsection header ... and so on ...
+ // 0000025518 00002 n
+ // 0000025635 00000 n
+ // trailer
+ // ...
+
+ var stream = parser.lexer.stream;
+ var tableState = this.tableState;
+ stream.pos = tableState.streamPos;
+ parser.buf1 = tableState.parserBuf1;
+ parser.buf2 = tableState.parserBuf2;
+
+ // Outer loop is over subsection headers
+ var obj;
+
+ while (true) {
+ if (!('firstEntryNum' in tableState) || !('entryCount' in tableState)) {
+ if (isCmd(obj = parser.getObj(), 'trailer')) {
+ break;
+ }
+ tableState.firstEntryNum = obj;
+ tableState.entryCount = parser.getObj();
+ }
+
+ var first = tableState.firstEntryNum;
+ var count = tableState.entryCount;
+ if (!isInt(first) || !isInt(count)) {
+ error('Invalid XRef table: wrong types in subsection header');
+ }
+ // Inner loop is over objects themselves
+ for (var i = tableState.entryNum; i < count; i++) {
+ tableState.streamPos = stream.pos;
+ tableState.entryNum = i;
+ tableState.parserBuf1 = parser.buf1;
+ tableState.parserBuf2 = parser.buf2;
+
+ var entry = {};
+ entry.offset = parser.getObj();
+ entry.gen = parser.getObj();
+ var type = parser.getObj();
+
+ if (isCmd(type, 'f')) {
+ entry.free = true;
+ } else if (isCmd(type, 'n')) {
+ entry.uncompressed = true;
+ }
+
+ // Validate entry obj
+ if (!isInt(entry.offset) || !isInt(entry.gen) ||
+ !(entry.free || entry.uncompressed)) {
+ error('Invalid entry in XRef subsection: ' + first + ', ' + count);
+ }
+
+ if (!this.entries[i + first]) {
+ this.entries[i + first] = entry;
+ }
+ }
+
+ tableState.entryNum = 0;
+ tableState.streamPos = stream.pos;
+ tableState.parserBuf1 = parser.buf1;
+ tableState.parserBuf2 = parser.buf2;
+ delete tableState.firstEntryNum;
+ delete tableState.entryCount;
+ }
+
+ // Per issue 3248: hp scanners generate bad XRef
+ if (first === 1 && this.entries[1] && this.entries[1].free) {
+ // shifting the entries
+ this.entries.shift();
+ }
+
+ // Sanity check: as per spec, first object must be free
+ if (this.entries[0] && !this.entries[0].free) {
+ error('Invalid XRef table: unexpected first object');
+ }
+ return obj;
+ },
+
+ processXRefStream: function XRef_processXRefStream(stream) {
+ if (!('streamState' in this)) {
+ // Stores state of the stream as we process it so we can resume
+ // from middle of stream in case of missing data error
+ var streamParameters = stream.dict;
+ var byteWidths = streamParameters.get('W');
+ var range = streamParameters.get('Index');
+ if (!range) {
+ range = [0, streamParameters.get('Size')];
+ }
+
+ this.streamState = {
+ entryRanges: range,
+ byteWidths: byteWidths,
+ entryNum: 0,
+ streamPos: stream.pos
+ };
+ }
+ this.readXRefStream(stream);
+ delete this.streamState;
+
+ return stream.dict;
+ },
+
+ readXRefStream: function XRef_readXRefStream(stream) {
+ var i, j;
+ var streamState = this.streamState;
+ stream.pos = streamState.streamPos;
+
+ var byteWidths = streamState.byteWidths;
+ var typeFieldWidth = byteWidths[0];
+ var offsetFieldWidth = byteWidths[1];
+ var generationFieldWidth = byteWidths[2];
+
+ var entryRanges = streamState.entryRanges;
+ while (entryRanges.length > 0) {
+ var first = entryRanges[0];
+ var n = entryRanges[1];
+
+ if (!isInt(first) || !isInt(n)) {
+ error('Invalid XRef range fields: ' + first + ', ' + n);
+ }
+ if (!isInt(typeFieldWidth) || !isInt(offsetFieldWidth) ||
+ !isInt(generationFieldWidth)) {
+ error('Invalid XRef entry fields length: ' + first + ', ' + n);
+ }
+ for (i = streamState.entryNum; i < n; ++i) {
+ streamState.entryNum = i;
+ streamState.streamPos = stream.pos;
+
+ var type = 0, offset = 0, generation = 0;
+ for (j = 0; j < typeFieldWidth; ++j) {
+ type = (type << 8) | stream.getByte();
+ }
+ // if type field is absent, its default value is 1
+ if (typeFieldWidth === 0) {
+ type = 1;
+ }
+ for (j = 0; j < offsetFieldWidth; ++j) {
+ offset = (offset << 8) | stream.getByte();
+ }
+ for (j = 0; j < generationFieldWidth; ++j) {
+ generation = (generation << 8) | stream.getByte();
+ }
+ var entry = {};
+ entry.offset = offset;
+ entry.gen = generation;
+ switch (type) {
+ case 0:
+ entry.free = true;
+ break;
+ case 1:
+ entry.uncompressed = true;
+ break;
+ case 2:
+ break;
+ default:
+ error('Invalid XRef entry type: ' + type);
+ }
+ if (!this.entries[first + i]) {
+ this.entries[first + i] = entry;
+ }
+ }
+
+ streamState.entryNum = 0;
+ streamState.streamPos = stream.pos;
+ entryRanges.splice(0, 2);
+ }
+ },
+
+ indexObjects: function XRef_indexObjects() {
+ // Simple scan through the PDF content to find objects,
+ // trailers and XRef streams.
+ function readToken(data, offset) {
+ var token = '', ch = data[offset];
+ while (ch !== 13 && ch !== 10) {
+ if (++offset >= data.length) {
+ break;
+ }
+ token += String.fromCharCode(ch);
+ ch = data[offset];
+ }
+ return token;
+ }
+ function skipUntil(data, offset, what) {
+ var length = what.length, dataLength = data.length;
+ var skipped = 0;
+ // finding byte sequence
+ while (offset < dataLength) {
+ var i = 0;
+ while (i < length && data[offset + i] === what[i]) {
+ ++i;
+ }
+ if (i >= length) {
+ break; // sequence found
+ }
+ offset++;
+ skipped++;
+ }
+ return skipped;
+ }
+ var trailerBytes = new Uint8Array([116, 114, 97, 105, 108, 101, 114]);
+ var startxrefBytes = new Uint8Array([115, 116, 97, 114, 116, 120, 114,
+ 101, 102]);
+ var endobjBytes = new Uint8Array([101, 110, 100, 111, 98, 106]);
+ var xrefBytes = new Uint8Array([47, 88, 82, 101, 102]);
+
+ var stream = this.stream;
+ stream.pos = 0;
+ var buffer = stream.getBytes();
+ var position = stream.start, length = buffer.length;
+ var trailers = [], xrefStms = [];
+ while (position < length) {
+ var ch = buffer[position];
+ if (ch === 32 || ch === 9 || ch === 13 || ch === 10) {
+ ++position;
+ continue;
+ }
+ if (ch === 37) { // %-comment
+ do {
+ ++position;
+ if (position >= length) {
+ break;
+ }
+ ch = buffer[position];
+ } while (ch !== 13 && ch !== 10);
+ continue;
+ }
+ var token = readToken(buffer, position);
+ var m;
+ if (token === 'xref') {
+ position += skipUntil(buffer, position, trailerBytes);
+ trailers.push(position);
+ position += skipUntil(buffer, position, startxrefBytes);
+ } else if ((m = /^(\d+)\s+(\d+)\s+obj\b/.exec(token))) {
+ if (typeof this.entries[m[1]] === 'undefined') {
+ this.entries[m[1]] = {
+ offset: position,
+ gen: m[2] | 0,
+ uncompressed: true
+ };
+ }
+ var contentLength = skipUntil(buffer, position, endobjBytes) + 7;
+ var content = buffer.subarray(position, position + contentLength);
+
+ // checking XRef stream suspect
+ // (it shall have '/XRef' and next char is not a letter)
+ var xrefTagOffset = skipUntil(content, 0, xrefBytes);
+ if (xrefTagOffset < contentLength &&
+ content[xrefTagOffset + 5] < 64) {
+ xrefStms.push(position);
+ this.xrefstms[position] = 1; // don't read it recursively
+ }
+
+ position += contentLength;
+ } else {
+ position += token.length + 1;
+ }
+ }
+ // reading XRef streams
+ var i, ii;
+ for (i = 0, ii = xrefStms.length; i < ii; ++i) {
+ this.startXRefQueue.push(xrefStms[i]);
+ this.readXRef(/* recoveryMode */ true);
+ }
+ // finding main trailer
+ var dict;
+ for (i = 0, ii = trailers.length; i < ii; ++i) {
+ stream.pos = trailers[i];
+ var parser = new Parser(new Lexer(stream), true, this);
+ var obj = parser.getObj();
+ if (!isCmd(obj, 'trailer')) {
+ continue;
+ }
+ // read the trailer dictionary
+ if (!isDict(dict = parser.getObj())) {
+ continue;
+ }
+ // taking the first one with 'ID'
+ if (dict.has('ID')) {
+ return dict;
+ }
+ }
+ // no tailer with 'ID', taking last one (if exists)
+ if (dict) {
+ return dict;
+ }
+ // nothing helps
+ // calling error() would reject worker with an UnknownErrorException.
+ throw new InvalidPDFException('Invalid PDF structure');
+ },
+
+ readXRef: function XRef_readXRef(recoveryMode) {
+ var stream = this.stream;
+
+ try {
+ while (this.startXRefQueue.length) {
+ var startXRef = this.startXRefQueue[0];
+
+ stream.pos = startXRef + stream.start;
+
+ var parser = new Parser(new Lexer(stream), true, this);
+ var obj = parser.getObj();
+ var dict;
+
+ // Get dictionary
+ if (isCmd(obj, 'xref')) {
+ // Parse end-of-file XRef
+ dict = this.processXRefTable(parser);
+ if (!this.topDict) {
+ this.topDict = dict;
+ }
+
+ // Recursively get other XRefs 'XRefStm', if any
+ obj = dict.get('XRefStm');
+ if (isInt(obj)) {
+ var pos = obj;
+ // ignore previously loaded xref streams
+ // (possible infinite recursion)
+ if (!(pos in this.xrefstms)) {
+ this.xrefstms[pos] = 1;
+ this.startXRefQueue.push(pos);
+ }
+ }
+ } else if (isInt(obj)) {
+ // Parse in-stream XRef
+ if (!isInt(parser.getObj()) ||
+ !isCmd(parser.getObj(), 'obj') ||
+ !isStream(obj = parser.getObj())) {
+ error('Invalid XRef stream');
+ }
+ dict = this.processXRefStream(obj);
+ if (!this.topDict) {
+ this.topDict = dict;
+ }
+ if (!dict) {
+ error('Failed to read XRef stream');
+ }
+ } else {
+ error('Invalid XRef stream header');
+ }
+
+ // Recursively get previous dictionary, if any
+ obj = dict.get('Prev');
+ if (isInt(obj)) {
+ this.startXRefQueue.push(obj);
+ } else if (isRef(obj)) {
+ // The spec says Prev must not be a reference, i.e. "/Prev NNN"
+ // This is a fallback for non-compliant PDFs, i.e. "/Prev NNN 0 R"
+ this.startXRefQueue.push(obj.num);
+ }
+
+ this.startXRefQueue.shift();
+ }
+
+ return this.topDict;
+ } catch (e) {
+ if (e instanceof MissingDataException) {
+ throw e;
+ }
+ info('(while reading XRef): ' + e);
+ }
+
+ if (recoveryMode) {
+ return;
+ }
+ throw new XRefParseException();
+ },
+
+ getEntry: function XRef_getEntry(i) {
+ var xrefEntry = this.entries[i];
+ if (xrefEntry && !xrefEntry.free && xrefEntry.offset) {
+ return xrefEntry;
+ }
+ return null;
+ },
+
+ fetchIfRef: function XRef_fetchIfRef(obj) {
+ if (!isRef(obj)) {
+ return obj;
+ }
+ return this.fetch(obj);
+ },
+
+ fetch: function XRef_fetch(ref, suppressEncryption) {
+ assert(isRef(ref), 'ref object is not a reference');
+ var num = ref.num;
+ if (num in this.cache) {
+ var cacheEntry = this.cache[num];
+ return cacheEntry;
+ }
+
+ var xrefEntry = this.getEntry(num);
+
+ // the referenced entry can be free
+ if (xrefEntry === null) {
+ return (this.cache[num] = null);
+ }
+
+ if (xrefEntry.uncompressed) {
+ xrefEntry = this.fetchUncompressed(ref, xrefEntry, suppressEncryption);
+ } else {
+ xrefEntry = this.fetchCompressed(xrefEntry, suppressEncryption);
+ }
+ if (isDict(xrefEntry)){
+ xrefEntry.objId = ref.toString();
+ } else if (isStream(xrefEntry)) {
+ xrefEntry.dict.objId = ref.toString();
+ }
+ return xrefEntry;
+ },
+
+ fetchUncompressed: function XRef_fetchUncompressed(ref, xrefEntry,
+ suppressEncryption) {
+ var gen = ref.gen;
+ var num = ref.num;
+ if (xrefEntry.gen !== gen) {
+ error('inconsistent generation in XRef');
+ }
+ var stream = this.stream.makeSubStream(xrefEntry.offset +
+ this.stream.start);
+ var parser = new Parser(new Lexer(stream), true, this);
+ var obj1 = parser.getObj();
+ var obj2 = parser.getObj();
+ var obj3 = parser.getObj();
+ if (!isInt(obj1) || parseInt(obj1, 10) !== num ||
+ !isInt(obj2) || parseInt(obj2, 10) !== gen ||
+ !isCmd(obj3)) {
+ error('bad XRef entry');
+ }
+ if (!isCmd(obj3, 'obj')) {
+ // some bad PDFs use "obj1234" and really mean 1234
+ if (obj3.cmd.indexOf('obj') === 0) {
+ num = parseInt(obj3.cmd.substring(3), 10);
+ if (!isNaN(num)) {
+ return num;
+ }
+ }
+ error('bad XRef entry');
+ }
+ if (this.encrypt && !suppressEncryption) {
+ xrefEntry = parser.getObj(this.encrypt.createCipherTransform(num, gen));
+ } else {
+ xrefEntry = parser.getObj();
+ }
+ if (!isStream(xrefEntry)) {
+ this.cache[num] = xrefEntry;
+ }
+ return xrefEntry;
+ },
+
+ fetchCompressed: function XRef_fetchCompressed(xrefEntry,
+ suppressEncryption) {
+ var tableOffset = xrefEntry.offset;
+ var stream = this.fetch(new Ref(tableOffset, 0));
+ if (!isStream(stream)) {
+ error('bad ObjStm stream');
+ }
+ var first = stream.dict.get('First');
+ var n = stream.dict.get('N');
+ if (!isInt(first) || !isInt(n)) {
+ error('invalid first and n parameters for ObjStm stream');
+ }
+ var parser = new Parser(new Lexer(stream), false, this);
+ parser.allowStreams = true;
+ var i, entries = [], num, nums = [];
+ // read the object numbers to populate cache
+ for (i = 0; i < n; ++i) {
+ num = parser.getObj();
+ if (!isInt(num)) {
+ error('invalid object number in the ObjStm stream: ' + num);
+ }
+ nums.push(num);
+ var offset = parser.getObj();
+ if (!isInt(offset)) {
+ error('invalid object offset in the ObjStm stream: ' + offset);
+ }
+ }
+ // read stream objects for cache
+ for (i = 0; i < n; ++i) {
+ entries.push(parser.getObj());
+ num = nums[i];
+ var entry = this.entries[num];
+ if (entry && entry.offset === tableOffset && entry.gen === i) {
+ this.cache[num] = entries[i];
+ }
+ }
+ xrefEntry = entries[xrefEntry.gen];
+ if (xrefEntry === undefined) {
+ error('bad XRef entry for compressed object');
+ }
+ return xrefEntry;
+ },
+
+ fetchIfRefAsync: function XRef_fetchIfRefAsync(obj) {
+ if (!isRef(obj)) {
+ return Promise.resolve(obj);
+ }
+ return this.fetchAsync(obj);
+ },
+
+ fetchAsync: function XRef_fetchAsync(ref, suppressEncryption) {
+ var streamManager = this.stream.manager;
+ var xref = this;
+ return new Promise(function tryFetch(resolve, reject) {
+ try {
+ resolve(xref.fetch(ref, suppressEncryption));
+ } catch (e) {
+ if (e instanceof MissingDataException) {
+ streamManager.requestRange(e.begin, e.end, function () {
+ tryFetch(resolve, reject);
+ });
+ return;
+ }
+ reject(e);
+ }
+ });
+ },
+
+ getCatalogObj: function XRef_getCatalogObj() {
+ return this.root;
+ }
+ };
+
+ return XRef;
+})();
+
+/**
+ * A NameTree is like a Dict but has some advantageous properties, see the
+ * spec (7.9.6) for more details.
+ * TODO: implement all the Dict functions and make this more efficent.
+ */
+var NameTree = (function NameTreeClosure() {
+ function NameTree(root, xref) {
+ this.root = root;
+ this.xref = xref;
+ }
+
+ NameTree.prototype = {
+ getAll: function NameTree_getAll() {
+ var dict = {};
+ if (!this.root) {
+ return dict;
+ }
+ var xref = this.xref;
+ // reading name tree
+ var processed = new RefSet();
+ processed.put(this.root);
+ var queue = [this.root];
+ while (queue.length > 0) {
+ var i, n;
+ var obj = xref.fetchIfRef(queue.shift());
+ if (!isDict(obj)) {
+ continue;
+ }
+ if (obj.has('Kids')) {
+ var kids = obj.get('Kids');
+ for (i = 0, n = kids.length; i < n; i++) {
+ var kid = kids[i];
+ if (processed.has(kid)) {
+ error('invalid destinations');
+ }
+ queue.push(kid);
+ processed.put(kid);
+ }
+ continue;
+ }
+ var names = obj.get('Names');
+ if (names) {
+ for (i = 0, n = names.length; i < n; i += 2) {
+ dict[names[i]] = xref.fetchIfRef(names[i + 1]);
+ }
+ }
+ }
+ return dict;
+ },
+
+ get: function NameTree_get(destinationId) {
+ if (!this.root) {
+ return null;
+ }
+
+ var xref = this.xref;
+ var kidsOrNames = xref.fetchIfRef(this.root);
+ var loopCount = 0;
+ var MAX_NAMES_LEVELS = 10;
+ var l, r, m;
+
+ // Perform a binary search to quickly find the entry that
+ // contains the named destination we are looking for.
+ while (kidsOrNames.has('Kids')) {
+ loopCount++;
+ if (loopCount > MAX_NAMES_LEVELS) {
+ warn('Search depth limit for named destionations has been reached.');
+ return null;
+ }
+
+ var kids = kidsOrNames.get('Kids');
+ if (!isArray(kids)) {
+ return null;
+ }
+
+ l = 0;
+ r = kids.length - 1;
+ while (l <= r) {
+ m = (l + r) >> 1;
+ var kid = xref.fetchIfRef(kids[m]);
+ var limits = kid.get('Limits');
+
+ if (destinationId < limits[0]) {
+ r = m - 1;
+ } else if (destinationId > limits[1]) {
+ l = m + 1;
+ } else {
+ kidsOrNames = xref.fetchIfRef(kids[m]);
+ break;
+ }
+ }
+ if (l > r) {
+ return null;
+ }
+ }
+
+ // If we get here, then we have found the right entry. Now
+ // go through the named destinations in the Named dictionary
+ // until we find the exact destination we're looking for.
+ var names = kidsOrNames.get('Names');
+ if (isArray(names)) {
+ // Perform a binary search to reduce the lookup time.
+ l = 0;
+ r = names.length - 2;
+ while (l <= r) {
+ // Check only even indices (0, 2, 4, ...) because the
+ // odd indices contain the actual D array.
+ m = (l + r) & ~1;
+ if (destinationId < names[m]) {
+ r = m - 2;
+ } else if (destinationId > names[m]) {
+ l = m + 2;
+ } else {
+ return xref.fetchIfRef(names[m + 1]);
+ }
+ }
+ }
+ return null;
+ }
+ };
+ return NameTree;
+})();
+
+/**
+ * "A PDF file can refer to the contents of another file by using a File
+ * Specification (PDF 1.1)", see the spec (7.11) for more details.
+ * NOTE: Only embedded files are supported (as part of the attachments support)
+ * TODO: support the 'URL' file system (with caching if !/V), portable
+ * collections attributes and related files (/RF)
+ */
+var FileSpec = (function FileSpecClosure() {
+ function FileSpec(root, xref) {
+ if (!root || !isDict(root)) {
+ return;
+ }
+ this.xref = xref;
+ this.root = root;
+ if (root.has('FS')) {
+ this.fs = root.get('FS');
+ }
+ this.description = root.has('Desc') ?
+ stringToPDFString(root.get('Desc')) :
+ '';
+ if (root.has('RF')) {
+ warn('Related file specifications are not supported');
+ }
+ this.contentAvailable = true;
+ if (!root.has('EF')) {
+ this.contentAvailable = false;
+ warn('Non-embedded file specifications are not supported');
+ }
+ }
+
+ function pickPlatformItem(dict) {
+ // Look for the filename in this order:
+ // UF, F, Unix, Mac, DOS
+ if (dict.has('UF')) {
+ return dict.get('UF');
+ } else if (dict.has('F')) {
+ return dict.get('F');
+ } else if (dict.has('Unix')) {
+ return dict.get('Unix');
+ } else if (dict.has('Mac')) {
+ return dict.get('Mac');
+ } else if (dict.has('DOS')) {
+ return dict.get('DOS');
+ } else {
+ return null;
+ }
+ }
+
+ FileSpec.prototype = {
+ get filename() {
+ if (!this._filename && this.root) {
+ var filename = pickPlatformItem(this.root) || 'unnamed';
+ this._filename = stringToPDFString(filename).
+ replace(/\\\\/g, '\\').
+ replace(/\\\//g, '/').
+ replace(/\\/g, '/');
+ }
+ return this._filename;
+ },
+ get content() {
+ if (!this.contentAvailable) {
+ return null;
+ }
+ if (!this.contentRef && this.root) {
+ this.contentRef = pickPlatformItem(this.root.get('EF'));
+ }
+ var content = null;
+ if (this.contentRef) {
+ var xref = this.xref;
+ var fileObj = xref.fetchIfRef(this.contentRef);
+ if (fileObj && isStream(fileObj)) {
+ content = fileObj.getBytes();
+ } else {
+ warn('Embedded file specification points to non-existing/invalid ' +
+ 'content');
+ }
+ } else {
+ warn('Embedded file specification does not have a content');
+ }
+ return content;
+ },
+ get serializable() {
+ return {
+ filename: this.filename,
+ content: this.content
+ };
+ }
+ };
+ return FileSpec;
+})();
+
+/**
+ * A helper for loading missing data in object graphs. It traverses the graph
+ * depth first and queues up any objects that have missing data. Once it has
+ * has traversed as many objects that are available it attempts to bundle the
+ * missing data requests and then resume from the nodes that weren't ready.
+ *
+ * NOTE: It provides protection from circular references by keeping track of
+ * of loaded references. However, you must be careful not to load any graphs
+ * that have references to the catalog or other pages since that will cause the
+ * entire PDF document object graph to be traversed.
+ */
+var ObjectLoader = (function() {
+ function mayHaveChildren(value) {
+ return isRef(value) || isDict(value) || isArray(value) || isStream(value);
+ }
+
+ function addChildren(node, nodesToVisit) {
+ var value;
+ if (isDict(node) || isStream(node)) {
+ var map;
+ if (isDict(node)) {
+ map = node.map;
+ } else {
+ map = node.dict.map;
+ }
+ for (var key in map) {
+ value = map[key];
+ if (mayHaveChildren(value)) {
+ nodesToVisit.push(value);
+ }
+ }
+ } else if (isArray(node)) {
+ for (var i = 0, ii = node.length; i < ii; i++) {
+ value = node[i];
+ if (mayHaveChildren(value)) {
+ nodesToVisit.push(value);
+ }
+ }
+ }
+ }
+
+ function ObjectLoader(obj, keys, xref) {
+ this.obj = obj;
+ this.keys = keys;
+ this.xref = xref;
+ this.refSet = null;
+ }
+
+ ObjectLoader.prototype = {
+ load: function ObjectLoader_load() {
+ var keys = this.keys;
+ this.capability = createPromiseCapability();
+ // Don't walk the graph if all the data is already loaded.
+ if (!(this.xref.stream instanceof ChunkedStream) ||
+ this.xref.stream.getMissingChunks().length === 0) {
+ this.capability.resolve();
+ return this.capability.promise;
+ }
+
+ this.refSet = new RefSet();
+ // Setup the initial nodes to visit.
+ var nodesToVisit = [];
+ for (var i = 0; i < keys.length; i++) {
+ nodesToVisit.push(this.obj[keys[i]]);
+ }
+
+ this.walk(nodesToVisit);
+ return this.capability.promise;
+ },
+
+ walk: function ObjectLoader_walk(nodesToVisit) {
+ var nodesToRevisit = [];
+ var pendingRequests = [];
+ // DFS walk of the object graph.
+ while (nodesToVisit.length) {
+ var currentNode = nodesToVisit.pop();
+
+ // Only references or chunked streams can cause missing data exceptions.
+ if (isRef(currentNode)) {
+ // Skip nodes that have already been visited.
+ if (this.refSet.has(currentNode)) {
+ continue;
+ }
+ try {
+ var ref = currentNode;
+ this.refSet.put(ref);
+ currentNode = this.xref.fetch(currentNode);
+ } catch (e) {
+ if (!(e instanceof MissingDataException)) {
+ throw e;
+ }
+ nodesToRevisit.push(currentNode);
+ pendingRequests.push({ begin: e.begin, end: e.end });
+ }
+ }
+ if (currentNode && currentNode.getBaseStreams) {
+ var baseStreams = currentNode.getBaseStreams();
+ var foundMissingData = false;
+ for (var i = 0; i < baseStreams.length; i++) {
+ var stream = baseStreams[i];
+ if (stream.getMissingChunks && stream.getMissingChunks().length) {
+ foundMissingData = true;
+ pendingRequests.push({
+ begin: stream.start,
+ end: stream.end
+ });
+ }
+ }
+ if (foundMissingData) {
+ nodesToRevisit.push(currentNode);
+ }
+ }
+
+ addChildren(currentNode, nodesToVisit);
+ }
+
+ if (pendingRequests.length) {
+ this.xref.stream.manager.requestRanges(pendingRequests,
+ function pendingRequestCallback() {
+ nodesToVisit = nodesToRevisit;
+ for (var i = 0; i < nodesToRevisit.length; i++) {
+ var node = nodesToRevisit[i];
+ // Remove any reference nodes from the currrent refset so they
+ // aren't skipped when we revist them.
+ if (isRef(node)) {
+ this.refSet.remove(node);
+ }
+ }
+ this.walk(nodesToVisit);
+ }.bind(this));
+ return;
+ }
+ // Everything is loaded.
+ this.refSet = null;
+ this.capability.resolve();
+ }
+ };
+
+ return ObjectLoader;
+})();
+
+
+var ISOAdobeCharset = [
+ '.notdef', 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar',
+ 'percent', 'ampersand', 'quoteright', 'parenleft', 'parenright',
+ 'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash', 'zero',
+ 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight',
+ 'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question',
+ 'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+ 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+ 'bracketleft', 'backslash', 'bracketright', 'asciicircum', 'underscore',
+ 'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
+ 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+ 'braceleft', 'bar', 'braceright', 'asciitilde', 'exclamdown', 'cent',
+ 'sterling', 'fraction', 'yen', 'florin', 'section', 'currency',
+ 'quotesingle', 'quotedblleft', 'guillemotleft', 'guilsinglleft',
+ 'guilsinglright', 'fi', 'fl', 'endash', 'dagger', 'daggerdbl',
+ 'periodcentered', 'paragraph', 'bullet', 'quotesinglbase',
+ 'quotedblbase', 'quotedblright', 'guillemotright', 'ellipsis',
+ 'perthousand', 'questiondown', 'grave', 'acute', 'circumflex', 'tilde',
+ 'macron', 'breve', 'dotaccent', 'dieresis', 'ring', 'cedilla',
+ 'hungarumlaut', 'ogonek', 'caron', 'emdash', 'AE', 'ordfeminine',
+ 'Lslash', 'Oslash', 'OE', 'ordmasculine', 'ae', 'dotlessi', 'lslash',
+ 'oslash', 'oe', 'germandbls', 'onesuperior', 'logicalnot', 'mu',
+ 'trademark', 'Eth', 'onehalf', 'plusminus', 'Thorn', 'onequarter',
+ 'divide', 'brokenbar', 'degree', 'thorn', 'threequarters', 'twosuperior',
+ 'registered', 'minus', 'eth', 'multiply', 'threesuperior', 'copyright',
+ 'Aacute', 'Acircumflex', 'Adieresis', 'Agrave', 'Aring', 'Atilde',
+ 'Ccedilla', 'Eacute', 'Ecircumflex', 'Edieresis', 'Egrave', 'Iacute',
+ 'Icircumflex', 'Idieresis', 'Igrave', 'Ntilde', 'Oacute', 'Ocircumflex',
+ 'Odieresis', 'Ograve', 'Otilde', 'Scaron', 'Uacute', 'Ucircumflex',
+ 'Udieresis', 'Ugrave', 'Yacute', 'Ydieresis', 'Zcaron', 'aacute',
+ 'acircumflex', 'adieresis', 'agrave', 'aring', 'atilde', 'ccedilla',
+ 'eacute', 'ecircumflex', 'edieresis', 'egrave', 'iacute', 'icircumflex',
+ 'idieresis', 'igrave', 'ntilde', 'oacute', 'ocircumflex', 'odieresis',
+ 'ograve', 'otilde', 'scaron', 'uacute', 'ucircumflex', 'udieresis',
+ 'ugrave', 'yacute', 'ydieresis', 'zcaron'
+];
+
+var ExpertCharset = [
+ '.notdef', 'space', 'exclamsmall', 'Hungarumlautsmall', 'dollaroldstyle',
+ 'dollarsuperior', 'ampersandsmall', 'Acutesmall', 'parenleftsuperior',
+ 'parenrightsuperior', 'twodotenleader', 'onedotenleader', 'comma',
+ 'hyphen', 'period', 'fraction', 'zerooldstyle', 'oneoldstyle',
+ 'twooldstyle', 'threeoldstyle', 'fouroldstyle', 'fiveoldstyle',
+ 'sixoldstyle', 'sevenoldstyle', 'eightoldstyle', 'nineoldstyle',
+ 'colon', 'semicolon', 'commasuperior', 'threequartersemdash',
+ 'periodsuperior', 'questionsmall', 'asuperior', 'bsuperior',
+ 'centsuperior', 'dsuperior', 'esuperior', 'isuperior', 'lsuperior',
+ 'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior',
+ 'tsuperior', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior',
+ 'parenrightinferior', 'Circumflexsmall', 'hyphensuperior', 'Gravesmall',
+ 'Asmall', 'Bsmall', 'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall',
+ 'Hsmall', 'Ismall', 'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall',
+ 'Osmall', 'Psmall', 'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall',
+ 'Vsmall', 'Wsmall', 'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary',
+ 'onefitted', 'rupiah', 'Tildesmall', 'exclamdownsmall', 'centoldstyle',
+ 'Lslashsmall', 'Scaronsmall', 'Zcaronsmall', 'Dieresissmall',
+ 'Brevesmall', 'Caronsmall', 'Dotaccentsmall', 'Macronsmall',
+ 'figuredash', 'hypheninferior', 'Ogoneksmall', 'Ringsmall',
+ 'Cedillasmall', 'onequarter', 'onehalf', 'threequarters',
+ 'questiondownsmall', 'oneeighth', 'threeeighths', 'fiveeighths',
+ 'seveneighths', 'onethird', 'twothirds', 'zerosuperior', 'onesuperior',
+ 'twosuperior', 'threesuperior', 'foursuperior', 'fivesuperior',
+ 'sixsuperior', 'sevensuperior', 'eightsuperior', 'ninesuperior',
+ 'zeroinferior', 'oneinferior', 'twoinferior', 'threeinferior',
+ 'fourinferior', 'fiveinferior', 'sixinferior', 'seveninferior',
+ 'eightinferior', 'nineinferior', 'centinferior', 'dollarinferior',
+ 'periodinferior', 'commainferior', 'Agravesmall', 'Aacutesmall',
+ 'Acircumflexsmall', 'Atildesmall', 'Adieresissmall', 'Aringsmall',
+ 'AEsmall', 'Ccedillasmall', 'Egravesmall', 'Eacutesmall',
+ 'Ecircumflexsmall', 'Edieresissmall', 'Igravesmall', 'Iacutesmall',
+ 'Icircumflexsmall', 'Idieresissmall', 'Ethsmall', 'Ntildesmall',
+ 'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall', 'Otildesmall',
+ 'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall', 'Uacutesmall',
+ 'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall', 'Thornsmall',
+ 'Ydieresissmall'
+];
+
+var ExpertSubsetCharset = [
+ '.notdef', 'space', 'dollaroldstyle', 'dollarsuperior',
+ 'parenleftsuperior', 'parenrightsuperior', 'twodotenleader',
+ 'onedotenleader', 'comma', 'hyphen', 'period', 'fraction',
+ 'zerooldstyle', 'oneoldstyle', 'twooldstyle', 'threeoldstyle',
+ 'fouroldstyle', 'fiveoldstyle', 'sixoldstyle', 'sevenoldstyle',
+ 'eightoldstyle', 'nineoldstyle', 'colon', 'semicolon', 'commasuperior',
+ 'threequartersemdash', 'periodsuperior', 'asuperior', 'bsuperior',
+ 'centsuperior', 'dsuperior', 'esuperior', 'isuperior', 'lsuperior',
+ 'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior',
+ 'tsuperior', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior',
+ 'parenrightinferior', 'hyphensuperior', 'colonmonetary', 'onefitted',
+ 'rupiah', 'centoldstyle', 'figuredash', 'hypheninferior', 'onequarter',
+ 'onehalf', 'threequarters', 'oneeighth', 'threeeighths', 'fiveeighths',
+ 'seveneighths', 'onethird', 'twothirds', 'zerosuperior', 'onesuperior',
+ 'twosuperior', 'threesuperior', 'foursuperior', 'fivesuperior',
+ 'sixsuperior', 'sevensuperior', 'eightsuperior', 'ninesuperior',
+ 'zeroinferior', 'oneinferior', 'twoinferior', 'threeinferior',
+ 'fourinferior', 'fiveinferior', 'sixinferior', 'seveninferior',
+ 'eightinferior', 'nineinferior', 'centinferior', 'dollarinferior',
+ 'periodinferior', 'commainferior'
+];
+
+
+var DEFAULT_ICON_SIZE = 22; // px
+var SUPPORTED_TYPES = ['Link', 'Text', 'Widget'];
+
+var Annotation = (function AnnotationClosure() {
+ // 12.5.5: Algorithm: Appearance streams
+ function getTransformMatrix(rect, bbox, matrix) {
+ var bounds = Util.getAxialAlignedBoundingBox(bbox, matrix);
+ var minX = bounds[0];
+ var minY = bounds[1];
+ var maxX = bounds[2];
+ var maxY = bounds[3];
+
+ if (minX === maxX || minY === maxY) {
+ // From real-life file, bbox was [0, 0, 0, 0]. In this case,
+ // just apply the transform for rect
+ return [1, 0, 0, 1, rect[0], rect[1]];
+ }
+
+ var xRatio = (rect[2] - rect[0]) / (maxX - minX);
+ var yRatio = (rect[3] - rect[1]) / (maxY - minY);
+ return [
+ xRatio,
+ 0,
+ 0,
+ yRatio,
+ rect[0] - minX * xRatio,
+ rect[1] - minY * yRatio
+ ];
+ }
+
+ function getDefaultAppearance(dict) {
+ var appearanceState = dict.get('AP');
+ if (!isDict(appearanceState)) {
+ return;
+ }
+
+ var appearance;
+ var appearances = appearanceState.get('N');
+ if (isDict(appearances)) {
+ var as = dict.get('AS');
+ if (as && appearances.has(as.name)) {
+ appearance = appearances.get(as.name);
+ }
+ } else {
+ appearance = appearances;
+ }
+ return appearance;
+ }
+
+ function Annotation(params) {
+ var dict = params.dict;
+ var data = this.data = {};
+
+ data.subtype = dict.get('Subtype').name;
+ var rect = dict.get('Rect') || [0, 0, 0, 0];
+ data.rect = Util.normalizeRect(rect);
+ data.annotationFlags = dict.get('F');
+
+ var color = dict.get('C');
+ if (!color) {
+ // The PDF spec does not mention how a missing color array is interpreted.
+ // Adobe Reader seems to default to black in this case.
+ data.color = [0, 0, 0];
+ } else if (isArray(color)) {
+ switch (color.length) {
+ case 0:
+ // Empty array denotes transparent border.
+ data.color = null;
+ break;
+ case 1:
+ // TODO: implement DeviceGray
+ break;
+ case 3:
+ data.color = color;
+ break;
+ case 4:
+ // TODO: implement DeviceCMYK
+ break;
+ }
+ }
+
+ // Some types of annotations have border style dict which has more
+ // info than the border array
+ if (dict.has('BS')) {
+ var borderStyle = dict.get('BS');
+ data.borderWidth = borderStyle.has('W') ? borderStyle.get('W') : 1;
+ } else {
+ var borderArray = dict.get('Border') || [0, 0, 1];
+ data.borderWidth = borderArray[2] || 0;
+
+ // TODO: implement proper support for annotations with line dash patterns.
+ var dashArray = borderArray[3];
+ if (data.borderWidth > 0 && dashArray) {
+ if (!isArray(dashArray)) {
+ // Ignore the border if dashArray is not actually an array,
+ // this is consistent with the behaviour in Adobe Reader.
+ data.borderWidth = 0;
+ } else {
+ var dashArrayLength = dashArray.length;
+ if (dashArrayLength > 0) {
+ // According to the PDF specification: the elements in a dashArray
+ // shall be numbers that are nonnegative and not all equal to zero.
+ var isInvalid = false;
+ var numPositive = 0;
+ for (var i = 0; i < dashArrayLength; i++) {
+ var validNumber = (+dashArray[i] >= 0);
+ if (!validNumber) {
+ isInvalid = true;
+ break;
+ } else if (dashArray[i] > 0) {
+ numPositive++;
+ }
+ }
+ if (isInvalid || numPositive === 0) {
+ data.borderWidth = 0;
+ }
+ }
+ }
+ }
+ }
+
+ this.appearance = getDefaultAppearance(dict);
+ data.hasAppearance = !!this.appearance;
+ data.id = params.ref.num;
+ }
+
+ Annotation.prototype = {
+
+ getData: function Annotation_getData() {
+ return this.data;
+ },
+
+ isInvisible: function Annotation_isInvisible() {
+ var data = this.data;
+ if (data && SUPPORTED_TYPES.indexOf(data.subtype) !== -1) {
+ return false;
+ } else {
+ return !!(data &&
+ data.annotationFlags && // Default: not invisible
+ data.annotationFlags & 0x1); // Invisible
+ }
+ },
+
+ isViewable: function Annotation_isViewable() {
+ var data = this.data;
+ return !!(!this.isInvisible() &&
+ data &&
+ (!data.annotationFlags ||
+ !(data.annotationFlags & 0x22)) && // Hidden or NoView
+ data.rect); // rectangle is necessary
+ },
+
+ isPrintable: function Annotation_isPrintable() {
+ var data = this.data;
+ return !!(!this.isInvisible() &&
+ data &&
+ data.annotationFlags && // Default: not printable
+ data.annotationFlags & 0x4 && // Print
+ !(data.annotationFlags & 0x2) && // Hidden
+ data.rect); // rectangle is necessary
+ },
+
+ loadResources: function Annotation_loadResources(keys) {
+ return new Promise(function (resolve, reject) {
+ this.appearance.dict.getAsync('Resources').then(function (resources) {
+ if (!resources) {
+ resolve();
+ return;
+ }
+ var objectLoader = new ObjectLoader(resources.map,
+ keys,
+ resources.xref);
+ objectLoader.load().then(function() {
+ resolve(resources);
+ }, reject);
+ }, reject);
+ }.bind(this));
+ },
+
+ getOperatorList: function Annotation_getOperatorList(evaluator) {
+
+ if (!this.appearance) {
+ return Promise.resolve(new OperatorList());
+ }
+
+ var data = this.data;
+
+ var appearanceDict = this.appearance.dict;
+ var resourcesPromise = this.loadResources([
+ 'ExtGState',
+ 'ColorSpace',
+ 'Pattern',
+ 'Shading',
+ 'XObject',
+ 'Font'
+ // ProcSet
+ // Properties
+ ]);
+ var bbox = appearanceDict.get('BBox') || [0, 0, 1, 1];
+ var matrix = appearanceDict.get('Matrix') || [1, 0, 0, 1, 0 ,0];
+ var transform = getTransformMatrix(data.rect, bbox, matrix);
+ var self = this;
+
+ return resourcesPromise.then(function(resources) {
+ var opList = new OperatorList();
+ opList.addOp(OPS.beginAnnotation, [data.rect, transform, matrix]);
+ return evaluator.getOperatorList(self.appearance, resources, opList).
+ then(function () {
+ opList.addOp(OPS.endAnnotation, []);
+ self.appearance.reset();
+ return opList;
+ });
+ });
+ }
+ };
+
+ Annotation.getConstructor =
+ function Annotation_getConstructor(subtype, fieldType) {
+
+ if (!subtype) {
+ return;
+ }
+
+ // TODO(mack): Implement FreeText annotations
+ if (subtype === 'Link') {
+ return LinkAnnotation;
+ } else if (subtype === 'Text') {
+ return TextAnnotation;
+ } else if (subtype === 'Widget') {
+ if (!fieldType) {
+ return;
+ }
+
+ if (fieldType === 'Tx') {
+ return TextWidgetAnnotation;
+ } else {
+ return WidgetAnnotation;
+ }
+ } else {
+ return Annotation;
+ }
+ };
+
+ Annotation.fromRef = function Annotation_fromRef(xref, ref) {
+
+ var dict = xref.fetchIfRef(ref);
+ if (!isDict(dict)) {
+ return;
+ }
+
+ var subtype = dict.get('Subtype');
+ subtype = isName(subtype) ? subtype.name : '';
+ if (!subtype) {
+ return;
+ }
+
+ var fieldType = Util.getInheritableProperty(dict, 'FT');
+ fieldType = isName(fieldType) ? fieldType.name : '';
+
+ var Constructor = Annotation.getConstructor(subtype, fieldType);
+ if (!Constructor) {
+ return;
+ }
+
+ var params = {
+ dict: dict,
+ ref: ref,
+ };
+
+ var annotation = new Constructor(params);
+
+ if (annotation.isViewable() || annotation.isPrintable()) {
+ return annotation;
+ } else {
+ if (SUPPORTED_TYPES.indexOf(subtype) === -1) {
+ warn('unimplemented annotation type: ' + subtype);
+ }
+ }
+ };
+
+ Annotation.appendToOperatorList = function Annotation_appendToOperatorList(
+ annotations, opList, pdfManager, partialEvaluator, intent) {
+
+ function reject(e) {
+ annotationsReadyCapability.reject(e);
+ }
+
+ var annotationsReadyCapability = createPromiseCapability();
+
+ var annotationPromises = [];
+ for (var i = 0, n = annotations.length; i < n; ++i) {
+ if (intent === 'display' && annotations[i].isViewable() ||
+ intent === 'print' && annotations[i].isPrintable()) {
+ annotationPromises.push(
+ annotations[i].getOperatorList(partialEvaluator));
+ }
+ }
+ Promise.all(annotationPromises).then(function(datas) {
+ opList.addOp(OPS.beginAnnotations, []);
+ for (var i = 0, n = datas.length; i < n; ++i) {
+ var annotOpList = datas[i];
+ opList.addOpList(annotOpList);
+ }
+ opList.addOp(OPS.endAnnotations, []);
+ annotationsReadyCapability.resolve();
+ }, reject);
+
+ return annotationsReadyCapability.promise;
+ };
+
+ return Annotation;
+})();
+
+var WidgetAnnotation = (function WidgetAnnotationClosure() {
+
+ function WidgetAnnotation(params) {
+ Annotation.call(this, params);
+
+ var dict = params.dict;
+ var data = this.data;
+
+ data.fieldValue = stringToPDFString(
+ Util.getInheritableProperty(dict, 'V') || '');
+ data.alternativeText = stringToPDFString(dict.get('TU') || '');
+ data.defaultAppearance = Util.getInheritableProperty(dict, 'DA') || '';
+ var fieldType = Util.getInheritableProperty(dict, 'FT');
+ data.fieldType = isName(fieldType) ? fieldType.name : '';
+ data.fieldFlags = Util.getInheritableProperty(dict, 'Ff') || 0;
+ this.fieldResources = Util.getInheritableProperty(dict, 'DR') || Dict.empty;
+
+ // Building the full field name by collecting the field and
+ // its ancestors 'T' data and joining them using '.'.
+ var fieldName = [];
+ var namedItem = dict;
+ var ref = params.ref;
+ while (namedItem) {
+ var parent = namedItem.get('Parent');
+ var parentRef = namedItem.getRaw('Parent');
+ var name = namedItem.get('T');
+ if (name) {
+ fieldName.unshift(stringToPDFString(name));
+ } else if (parent && ref) {
+ // The field name is absent, that means more than one field
+ // with the same name may exist. Replacing the empty name
+ // with the '`' plus index in the parent's 'Kids' array.
+ // This is not in the PDF spec but necessary to id the
+ // the input controls.
+ var kids = parent.get('Kids');
+ var j, jj;
+ for (j = 0, jj = kids.length; j < jj; j++) {
+ var kidRef = kids[j];
+ if (kidRef.num === ref.num && kidRef.gen === ref.gen) {
+ break;
+ }
+ }
+ fieldName.unshift('`' + j);
+ }
+ namedItem = parent;
+ ref = parentRef;
+ }
+ data.fullName = fieldName.join('.');
+ }
+
+ var parent = Annotation.prototype;
+ Util.inherit(WidgetAnnotation, Annotation, {
+ isViewable: function WidgetAnnotation_isViewable() {
+ if (this.data.fieldType === 'Sig') {
+ warn('unimplemented annotation type: Widget signature');
+ return false;
+ }
+
+ return parent.isViewable.call(this);
+ }
+ });
+
+ return WidgetAnnotation;
+})();
+
+var TextWidgetAnnotation = (function TextWidgetAnnotationClosure() {
+ function TextWidgetAnnotation(params) {
+ WidgetAnnotation.call(this, params);
+
+ this.data.textAlignment = Util.getInheritableProperty(params.dict, 'Q');
+ this.data.annotationType = AnnotationType.WIDGET;
+ this.data.hasHtml = !this.data.hasAppearance && !!this.data.fieldValue;
+ }
+
+ Util.inherit(TextWidgetAnnotation, WidgetAnnotation, {
+ getOperatorList: function TextWidgetAnnotation_getOperatorList(evaluator) {
+ if (this.appearance) {
+ return Annotation.prototype.getOperatorList.call(this, evaluator);
+ }
+
+ var opList = new OperatorList();
+ var data = this.data;
+
+ // Even if there is an appearance stream, ignore it. This is the
+ // behaviour used by Adobe Reader.
+ if (!data.defaultAppearance) {
+ return Promise.resolve(opList);
+ }
+
+ var stream = new Stream(stringToBytes(data.defaultAppearance));
+ return evaluator.getOperatorList(stream, this.fieldResources, opList).
+ then(function () {
+ return opList;
+ });
+ }
+ });
+
+ return TextWidgetAnnotation;
+})();
+
+var InteractiveAnnotation = (function InteractiveAnnotationClosure() {
+ function InteractiveAnnotation(params) {
+ Annotation.call(this, params);
+
+ this.data.hasHtml = true;
+ }
+
+ Util.inherit(InteractiveAnnotation, Annotation, { });
+
+ return InteractiveAnnotation;
+})();
+
+var TextAnnotation = (function TextAnnotationClosure() {
+ function TextAnnotation(params) {
+ InteractiveAnnotation.call(this, params);
+
+ var dict = params.dict;
+ var data = this.data;
+
+ var content = dict.get('Contents');
+ var title = dict.get('T');
+ data.annotationType = AnnotationType.TEXT;
+ data.content = stringToPDFString(content || '');
+ data.title = stringToPDFString(title || '');
+
+ if (data.hasAppearance) {
+ data.name = 'NoIcon';
+ } else {
+ data.rect[1] = data.rect[3] - DEFAULT_ICON_SIZE;
+ data.rect[2] = data.rect[0] + DEFAULT_ICON_SIZE;
+ data.name = dict.has('Name') ? dict.get('Name').name : 'Note';
+ }
+
+ if (dict.has('C')) {
+ data.hasBgColor = true;
+ }
+ }
+
+ Util.inherit(TextAnnotation, InteractiveAnnotation, { });
+
+ return TextAnnotation;
+})();
+
+var LinkAnnotation = (function LinkAnnotationClosure() {
+ function LinkAnnotation(params) {
+ InteractiveAnnotation.call(this, params);
+
+ var dict = params.dict;
+ var data = this.data;
+ data.annotationType = AnnotationType.LINK;
+
+ var action = dict.get('A');
+ if (action && isDict(action)) {
+ var linkType = action.get('S').name;
+ if (linkType === 'URI') {
+ var url = action.get('URI');
+ if (isName(url)) {
+ // Some bad PDFs do not put parentheses around relative URLs.
+ url = '/' + url.name;
+ } else if (url) {
+ url = addDefaultProtocolToUrl(url);
+ }
+ // TODO: pdf spec mentions urls can be relative to a Base
+ // entry in the dictionary.
+ if (!isValidUrl(url, false)) {
+ url = '';
+ }
+ // According to ISO 32000-1:2008, section 12.6.4.7,
+ // URI should to be encoded in 7-bit ASCII.
+ // Some bad PDFs may have URIs in UTF-8 encoding, see Bugzilla 1122280.
+ try {
+ data.url = stringToUTF8String(url);
+ } catch (e) {
+ // Fall back to a simple copy.
+ data.url = url;
+ }
+ } else if (linkType === 'GoTo') {
+ data.dest = action.get('D');
+ } else if (linkType === 'GoToR') {
+ var urlDict = action.get('F');
+ if (isDict(urlDict)) {
+ // We assume that the 'url' is a Filspec dictionary
+ // and fetch the url without checking any further
+ url = urlDict.get('F') || '';
+ }
+
+ // TODO: pdf reference says that GoToR
+ // can also have 'NewWindow' attribute
+ if (!isValidUrl(url, false)) {
+ url = '';
+ }
+ data.url = url;
+ data.dest = action.get('D');
+ } else if (linkType === 'Named') {
+ data.action = action.get('N').name;
+ } else {
+ warn('unrecognized link type: ' + linkType);
+ }
+ } else if (dict.has('Dest')) {
+ // simple destination link
+ var dest = dict.get('Dest');
+ data.dest = isName(dest) ? dest.name : dest;
+ }
+ }
+
+ // Lets URLs beginning with 'www.' default to using the 'http://' protocol.
+ function addDefaultProtocolToUrl(url) {
+ if (url && url.indexOf('www.') === 0) {
+ return ('http://' + url);
+ }
+ return url;
+ }
+
+ Util.inherit(LinkAnnotation, InteractiveAnnotation, { });
+
+ return LinkAnnotation;
+})();
+
+
+var PDFFunction = (function PDFFunctionClosure() {
+ var CONSTRUCT_SAMPLED = 0;
+ var CONSTRUCT_INTERPOLATED = 2;
+ var CONSTRUCT_STICHED = 3;
+ var CONSTRUCT_POSTSCRIPT = 4;
+
+ return {
+ getSampleArray: function PDFFunction_getSampleArray(size, outputSize, bps,
+ str) {
+ var i, ii;
+ var length = 1;
+ for (i = 0, ii = size.length; i < ii; i++) {
+ length *= size[i];
+ }
+ length *= outputSize;
+
+ var array = new Array(length);
+ var codeSize = 0;
+ var codeBuf = 0;
+ // 32 is a valid bps so shifting won't work
+ var sampleMul = 1.0 / (Math.pow(2.0, bps) - 1);
+
+ var strBytes = str.getBytes((length * bps + 7) / 8);
+ var strIdx = 0;
+ for (i = 0; i < length; i++) {
+ while (codeSize < bps) {
+ codeBuf <<= 8;
+ codeBuf |= strBytes[strIdx++];
+ codeSize += 8;
+ }
+ codeSize -= bps;
+ array[i] = (codeBuf >> codeSize) * sampleMul;
+ codeBuf &= (1 << codeSize) - 1;
+ }
+ return array;
+ },
+
+ getIR: function PDFFunction_getIR(xref, fn) {
+ var dict = fn.dict;
+ if (!dict) {
+ dict = fn;
+ }
+
+ var types = [this.constructSampled,
+ null,
+ this.constructInterpolated,
+ this.constructStiched,
+ this.constructPostScript];
+
+ var typeNum = dict.get('FunctionType');
+ var typeFn = types[typeNum];
+ if (!typeFn) {
+ error('Unknown type of function');
+ }
+
+ return typeFn.call(this, fn, dict, xref);
+ },
+
+ fromIR: function PDFFunction_fromIR(IR) {
+ var type = IR[0];
+ switch (type) {
+ case CONSTRUCT_SAMPLED:
+ return this.constructSampledFromIR(IR);
+ case CONSTRUCT_INTERPOLATED:
+ return this.constructInterpolatedFromIR(IR);
+ case CONSTRUCT_STICHED:
+ return this.constructStichedFromIR(IR);
+ //case CONSTRUCT_POSTSCRIPT:
+ default:
+ return this.constructPostScriptFromIR(IR);
+ }
+ },
+
+ parse: function PDFFunction_parse(xref, fn) {
+ var IR = this.getIR(xref, fn);
+ return this.fromIR(IR);
+ },
+
+ parseArray: function PDFFunction_parseArray(xref, fnObj) {
+ if (!isArray(fnObj)) {
+ // not an array -- parsing as regular function
+ return this.parse(xref, fnObj);
+ }
+
+ var fnArray = [];
+ for (var j = 0, jj = fnObj.length; j < jj; j++) {
+ var obj = xref.fetchIfRef(fnObj[j]);
+ fnArray.push(PDFFunction.parse(xref, obj));
+ }
+ return function (src, srcOffset, dest, destOffset) {
+ for (var i = 0, ii = fnArray.length; i < ii; i++) {
+ fnArray[i](src, srcOffset, dest, destOffset + i);
+ }
+ };
+ },
+
+ constructSampled: function PDFFunction_constructSampled(str, dict) {
+ function toMultiArray(arr) {
+ var inputLength = arr.length;
+ var out = [];
+ var index = 0;
+ for (var i = 0; i < inputLength; i += 2) {
+ out[index] = [arr[i], arr[i + 1]];
+ ++index;
+ }
+ return out;
+ }
+ var domain = dict.get('Domain');
+ var range = dict.get('Range');
+
+ if (!domain || !range) {
+ error('No domain or range');
+ }
+
+ var inputSize = domain.length / 2;
+ var outputSize = range.length / 2;
+
+ domain = toMultiArray(domain);
+ range = toMultiArray(range);
+
+ var size = dict.get('Size');
+ var bps = dict.get('BitsPerSample');
+ var order = dict.get('Order') || 1;
+ if (order !== 1) {
+ // No description how cubic spline interpolation works in PDF32000:2008
+ // As in poppler, ignoring order, linear interpolation may work as good
+ info('No support for cubic spline interpolation: ' + order);
+ }
+
+ var encode = dict.get('Encode');
+ if (!encode) {
+ encode = [];
+ for (var i = 0; i < inputSize; ++i) {
+ encode.push(0);
+ encode.push(size[i] - 1);
+ }
+ }
+ encode = toMultiArray(encode);
+
+ var decode = dict.get('Decode');
+ if (!decode) {
+ decode = range;
+ } else {
+ decode = toMultiArray(decode);
+ }
+
+ var samples = this.getSampleArray(size, outputSize, bps, str);
+
+ return [
+ CONSTRUCT_SAMPLED, inputSize, domain, encode, decode, samples, size,
+ outputSize, Math.pow(2, bps) - 1, range
+ ];
+ },
+
+ constructSampledFromIR: function PDFFunction_constructSampledFromIR(IR) {
+ // See chapter 3, page 109 of the PDF reference
+ function interpolate(x, xmin, xmax, ymin, ymax) {
+ return ymin + ((x - xmin) * ((ymax - ymin) / (xmax - xmin)));
+ }
+
+ return function constructSampledFromIRResult(src, srcOffset,
+ dest, destOffset) {
+ // See chapter 3, page 110 of the PDF reference.
+ var m = IR[1];
+ var domain = IR[2];
+ var encode = IR[3];
+ var decode = IR[4];
+ var samples = IR[5];
+ var size = IR[6];
+ var n = IR[7];
+ //var mask = IR[8];
+ var range = IR[9];
+
+ // Building the cube vertices: its part and sample index
+ // http://rjwagner49.com/Mathematics/Interpolation.pdf
+ var cubeVertices = 1 << m;
+ var cubeN = new Float64Array(cubeVertices);
+ var cubeVertex = new Uint32Array(cubeVertices);
+ var i, j;
+ for (j = 0; j < cubeVertices; j++) {
+ cubeN[j] = 1;
+ }
+
+ var k = n, pos = 1;
+ // Map x_i to y_j for 0 <= i < m using the sampled function.
+ for (i = 0; i < m; ++i) {
+ // x_i' = min(max(x_i, Domain_2i), Domain_2i+1)
+ var domain_2i = domain[i][0];
+ var domain_2i_1 = domain[i][1];
+ var xi = Math.min(Math.max(src[srcOffset +i], domain_2i),
+ domain_2i_1);
+
+ // e_i = Interpolate(x_i', Domain_2i, Domain_2i+1,
+ // Encode_2i, Encode_2i+1)
+ var e = interpolate(xi, domain_2i, domain_2i_1,
+ encode[i][0], encode[i][1]);
+
+ // e_i' = min(max(e_i, 0), Size_i - 1)
+ var size_i = size[i];
+ e = Math.min(Math.max(e, 0), size_i - 1);
+
+ // Adjusting the cube: N and vertex sample index
+ var e0 = e < size_i - 1 ? Math.floor(e) : e - 1; // e1 = e0 + 1;
+ var n0 = e0 + 1 - e; // (e1 - e) / (e1 - e0);
+ var n1 = e - e0; // (e - e0) / (e1 - e0);
+ var offset0 = e0 * k;
+ var offset1 = offset0 + k; // e1 * k
+ for (j = 0; j < cubeVertices; j++) {
+ if (j & pos) {
+ cubeN[j] *= n1;
+ cubeVertex[j] += offset1;
+ } else {
+ cubeN[j] *= n0;
+ cubeVertex[j] += offset0;
+ }
+ }
+
+ k *= size_i;
+ pos <<= 1;
+ }
+
+ for (j = 0; j < n; ++j) {
+ // Sum all cube vertices' samples portions
+ var rj = 0;
+ for (i = 0; i < cubeVertices; i++) {
+ rj += samples[cubeVertex[i] + j] * cubeN[i];
+ }
+
+ // r_j' = Interpolate(r_j, 0, 2^BitsPerSample - 1,
+ // Decode_2j, Decode_2j+1)
+ rj = interpolate(rj, 0, 1, decode[j][0], decode[j][1]);
+
+ // y_j = min(max(r_j, range_2j), range_2j+1)
+ dest[destOffset + j] = Math.min(Math.max(rj, range[j][0]),
+ range[j][1]);
+ }
+ };
+ },
+
+ constructInterpolated: function PDFFunction_constructInterpolated(str,
+ dict) {
+ var c0 = dict.get('C0') || [0];
+ var c1 = dict.get('C1') || [1];
+ var n = dict.get('N');
+
+ if (!isArray(c0) || !isArray(c1)) {
+ error('Illegal dictionary for interpolated function');
+ }
+
+ var length = c0.length;
+ var diff = [];
+ for (var i = 0; i < length; ++i) {
+ diff.push(c1[i] - c0[i]);
+ }
+
+ return [CONSTRUCT_INTERPOLATED, c0, diff, n];
+ },
+
+ constructInterpolatedFromIR:
+ function PDFFunction_constructInterpolatedFromIR(IR) {
+ var c0 = IR[1];
+ var diff = IR[2];
+ var n = IR[3];
+
+ var length = diff.length;
+
+ return function constructInterpolatedFromIRResult(src, srcOffset,
+ dest, destOffset) {
+ var x = n === 1 ? src[srcOffset] : Math.pow(src[srcOffset], n);
+
+ for (var j = 0; j < length; ++j) {
+ dest[destOffset + j] = c0[j] + (x * diff[j]);
+ }
+ };
+ },
+
+ constructStiched: function PDFFunction_constructStiched(fn, dict, xref) {
+ var domain = dict.get('Domain');
+
+ if (!domain) {
+ error('No domain');
+ }
+
+ var inputSize = domain.length / 2;
+ if (inputSize !== 1) {
+ error('Bad domain for stiched function');
+ }
+
+ var fnRefs = dict.get('Functions');
+ var fns = [];
+ for (var i = 0, ii = fnRefs.length; i < ii; ++i) {
+ fns.push(PDFFunction.getIR(xref, xref.fetchIfRef(fnRefs[i])));
+ }
+
+ var bounds = dict.get('Bounds');
+ var encode = dict.get('Encode');
+
+ return [CONSTRUCT_STICHED, domain, bounds, encode, fns];
+ },
+
+ constructStichedFromIR: function PDFFunction_constructStichedFromIR(IR) {
+ var domain = IR[1];
+ var bounds = IR[2];
+ var encode = IR[3];
+ var fnsIR = IR[4];
+ var fns = [];
+ var tmpBuf = new Float32Array(1);
+
+ for (var i = 0, ii = fnsIR.length; i < ii; i++) {
+ fns.push(PDFFunction.fromIR(fnsIR[i]));
+ }
+
+ return function constructStichedFromIRResult(src, srcOffset,
+ dest, destOffset) {
+ var clip = function constructStichedFromIRClip(v, min, max) {
+ if (v > max) {
+ v = max;
+ } else if (v < min) {
+ v = min;
+ }
+ return v;
+ };
+
+ // clip to domain
+ var v = clip(src[srcOffset], domain[0], domain[1]);
+ // calulate which bound the value is in
+ for (var i = 0, ii = bounds.length; i < ii; ++i) {
+ if (v < bounds[i]) {
+ break;
+ }
+ }
+
+ // encode value into domain of function
+ var dmin = domain[0];
+ if (i > 0) {
+ dmin = bounds[i - 1];
+ }
+ var dmax = domain[1];
+ if (i < bounds.length) {
+ dmax = bounds[i];
+ }
+
+ var rmin = encode[2 * i];
+ var rmax = encode[2 * i + 1];
+
+ tmpBuf[0] = rmin + (v - dmin) * (rmax - rmin) / (dmax - dmin);
+
+ // call the appropriate function
+ fns[i](tmpBuf, 0, dest, destOffset);
+ };
+ },
+
+ constructPostScript: function PDFFunction_constructPostScript(fn, dict,
+ xref) {
+ var domain = dict.get('Domain');
+ var range = dict.get('Range');
+
+ if (!domain) {
+ error('No domain.');
+ }
+
+ if (!range) {
+ error('No range.');
+ }
+
+ var lexer = new PostScriptLexer(fn);
+ var parser = new PostScriptParser(lexer);
+ var code = parser.parse();
+
+ return [CONSTRUCT_POSTSCRIPT, domain, range, code];
+ },
+
+ constructPostScriptFromIR: function PDFFunction_constructPostScriptFromIR(
+ IR) {
+ var domain = IR[1];
+ var range = IR[2];
+ var code = IR[3];
+
+ var compiled = (new PostScriptCompiler()).compile(code, domain, range);
+ if (compiled) {
+ // Compiled function consists of simple expressions such as addition,
+ // subtraction, Math.max, and also contains 'var' and 'return'
+ // statements. See the generation in the PostScriptCompiler below.
+ /*jshint -W054 */
+ return new Function('src', 'srcOffset', 'dest', 'destOffset', compiled);
+ }
+
+ info('Unable to compile PS function');
+
+ var numOutputs = range.length >> 1;
+ var numInputs = domain.length >> 1;
+ var evaluator = new PostScriptEvaluator(code);
+ // Cache the values for a big speed up, the cache size is limited though
+ // since the number of possible values can be huge from a PS function.
+ var cache = {};
+ // The MAX_CACHE_SIZE is set to ~4x the maximum number of distinct values
+ // seen in our tests.
+ var MAX_CACHE_SIZE = 2048 * 4;
+ var cache_available = MAX_CACHE_SIZE;
+ var tmpBuf = new Float32Array(numInputs);
+
+ return function constructPostScriptFromIRResult(src, srcOffset,
+ dest, destOffset) {
+ var i, value;
+ var key = '';
+ var input = tmpBuf;
+ for (i = 0; i < numInputs; i++) {
+ value = src[srcOffset + i];
+ input[i] = value;
+ key += value + '_';
+ }
+
+ var cachedValue = cache[key];
+ if (cachedValue !== undefined) {
+ dest.set(cachedValue, destOffset);
+ return;
+ }
+
+ var output = new Float32Array(numOutputs);
+ var stack = evaluator.execute(input);
+ var stackIndex = stack.length - numOutputs;
+ for (i = 0; i < numOutputs; i++) {
+ value = stack[stackIndex + i];
+ var bound = range[i * 2];
+ if (value < bound) {
+ value = bound;
+ } else {
+ bound = range[i * 2 +1];
+ if (value > bound) {
+ value = bound;
+ }
+ }
+ output[i] = value;
+ }
+ if (cache_available > 0) {
+ cache_available--;
+ cache[key] = output;
+ }
+ dest.set(output, destOffset);
+ };
+ }
+ };
+})();
+
+function isPDFFunction(v) {
+ var fnDict;
+ if (typeof v !== 'object') {
+ return false;
+ } else if (isDict(v)) {
+ fnDict = v;
+ } else if (isStream(v)) {
+ fnDict = v.dict;
+ } else {
+ return false;
+ }
+ return fnDict.has('FunctionType');
+}
+
+var PostScriptStack = (function PostScriptStackClosure() {
+ var MAX_STACK_SIZE = 100;
+ function PostScriptStack(initialStack) {
+ this.stack = !initialStack ? [] :
+ Array.prototype.slice.call(initialStack, 0);
+ }
+
+ PostScriptStack.prototype = {
+ push: function PostScriptStack_push(value) {
+ if (this.stack.length >= MAX_STACK_SIZE) {
+ error('PostScript function stack overflow.');
+ }
+ this.stack.push(value);
+ },
+ pop: function PostScriptStack_pop() {
+ if (this.stack.length <= 0) {
+ error('PostScript function stack underflow.');
+ }
+ return this.stack.pop();
+ },
+ copy: function PostScriptStack_copy(n) {
+ if (this.stack.length + n >= MAX_STACK_SIZE) {
+ error('PostScript function stack overflow.');
+ }
+ var stack = this.stack;
+ for (var i = stack.length - n, j = n - 1; j >= 0; j--, i++) {
+ stack.push(stack[i]);
+ }
+ },
+ index: function PostScriptStack_index(n) {
+ this.push(this.stack[this.stack.length - n - 1]);
+ },
+ // rotate the last n stack elements p times
+ roll: function PostScriptStack_roll(n, p) {
+ var stack = this.stack;
+ var l = stack.length - n;
+ var r = stack.length - 1, c = l + (p - Math.floor(p / n) * n), i, j, t;
+ for (i = l, j = r; i < j; i++, j--) {
+ t = stack[i]; stack[i] = stack[j]; stack[j] = t;
+ }
+ for (i = l, j = c - 1; i < j; i++, j--) {
+ t = stack[i]; stack[i] = stack[j]; stack[j] = t;
+ }
+ for (i = c, j = r; i < j; i++, j--) {
+ t = stack[i]; stack[i] = stack[j]; stack[j] = t;
+ }
+ }
+ };
+ return PostScriptStack;
+})();
+var PostScriptEvaluator = (function PostScriptEvaluatorClosure() {
+ function PostScriptEvaluator(operators) {
+ this.operators = operators;
+ }
+ PostScriptEvaluator.prototype = {
+ execute: function PostScriptEvaluator_execute(initialStack) {
+ var stack = new PostScriptStack(initialStack);
+ var counter = 0;
+ var operators = this.operators;
+ var length = operators.length;
+ var operator, a, b;
+ while (counter < length) {
+ operator = operators[counter++];
+ if (typeof operator === 'number') {
+ // Operator is really an operand and should be pushed to the stack.
+ stack.push(operator);
+ continue;
+ }
+ switch (operator) {
+ // non standard ps operators
+ case 'jz': // jump if false
+ b = stack.pop();
+ a = stack.pop();
+ if (!a) {
+ counter = b;
+ }
+ break;
+ case 'j': // jump
+ a = stack.pop();
+ counter = a;
+ break;
+
+ // all ps operators in alphabetical order (excluding if/ifelse)
+ case 'abs':
+ a = stack.pop();
+ stack.push(Math.abs(a));
+ break;
+ case 'add':
+ b = stack.pop();
+ a = stack.pop();
+ stack.push(a + b);
+ break;
+ case 'and':
+ b = stack.pop();
+ a = stack.pop();
+ if (isBool(a) && isBool(b)) {
+ stack.push(a && b);
+ } else {
+ stack.push(a & b);
+ }
+ break;
+ case 'atan':
+ a = stack.pop();
+ stack.push(Math.atan(a));
+ break;
+ case 'bitshift':
+ b = stack.pop();
+ a = stack.pop();
+ if (a > 0) {
+ stack.push(a << b);
+ } else {
+ stack.push(a >> b);
+ }
+ break;
+ case 'ceiling':
+ a = stack.pop();
+ stack.push(Math.ceil(a));
+ break;
+ case 'copy':
+ a = stack.pop();
+ stack.copy(a);
+ break;
+ case 'cos':
+ a = stack.pop();
+ stack.push(Math.cos(a));
+ break;
+ case 'cvi':
+ a = stack.pop() | 0;
+ stack.push(a);
+ break;
+ case 'cvr':
+ // noop
+ break;
+ case 'div':
+ b = stack.pop();
+ a = stack.pop();
+ stack.push(a / b);
+ break;
+ case 'dup':
+ stack.copy(1);
+ break;
+ case 'eq':
+ b = stack.pop();
+ a = stack.pop();
+ stack.push(a === b);
+ break;
+ case 'exch':
+ stack.roll(2, 1);
+ break;
+ case 'exp':
+ b = stack.pop();
+ a = stack.pop();
+ stack.push(Math.pow(a, b));
+ break;
+ case 'false':
+ stack.push(false);
+ break;
+ case 'floor':
+ a = stack.pop();
+ stack.push(Math.floor(a));
+ break;
+ case 'ge':
+ b = stack.pop();
+ a = stack.pop();
+ stack.push(a >= b);
+ break;
+ case 'gt':
+ b = stack.pop();
+ a = stack.pop();
+ stack.push(a > b);
+ break;
+ case 'idiv':
+ b = stack.pop();
+ a = stack.pop();
+ stack.push((a / b) | 0);
+ break;
+ case 'index':
+ a = stack.pop();
+ stack.index(a);
+ break;
+ case 'le':
+ b = stack.pop();
+ a = stack.pop();
+ stack.push(a <= b);
+ break;
+ case 'ln':
+ a = stack.pop();
+ stack.push(Math.log(a));
+ break;
+ case 'log':
+ a = stack.pop();
+ stack.push(Math.log(a) / Math.LN10);
+ break;
+ case 'lt':
+ b = stack.pop();
+ a = stack.pop();
+ stack.push(a < b);
+ break;
+ case 'mod':
+ b = stack.pop();
+ a = stack.pop();
+ stack.push(a % b);
+ break;
+ case 'mul':
+ b = stack.pop();
+ a = stack.pop();
+ stack.push(a * b);
+ break;
+ case 'ne':
+ b = stack.pop();
+ a = stack.pop();
+ stack.push(a !== b);
+ break;
+ case 'neg':
+ a = stack.pop();
+ stack.push(-a);
+ break;
+ case 'not':
+ a = stack.pop();
+ if (isBool(a)) {
+ stack.push(!a);
+ } else {
+ stack.push(~a);
+ }
+ break;
+ case 'or':
+ b = stack.pop();
+ a = stack.pop();
+ if (isBool(a) && isBool(b)) {
+ stack.push(a || b);
+ } else {
+ stack.push(a | b);
+ }
+ break;
+ case 'pop':
+ stack.pop();
+ break;
+ case 'roll':
+ b = stack.pop();
+ a = stack.pop();
+ stack.roll(a, b);
+ break;
+ case 'round':
+ a = stack.pop();
+ stack.push(Math.round(a));
+ break;
+ case 'sin':
+ a = stack.pop();
+ stack.push(Math.sin(a));
+ break;
+ case 'sqrt':
+ a = stack.pop();
+ stack.push(Math.sqrt(a));
+ break;
+ case 'sub':
+ b = stack.pop();
+ a = stack.pop();
+ stack.push(a - b);
+ break;
+ case 'true':
+ stack.push(true);
+ break;
+ case 'truncate':
+ a = stack.pop();
+ a = a < 0 ? Math.ceil(a) : Math.floor(a);
+ stack.push(a);
+ break;
+ case 'xor':
+ b = stack.pop();
+ a = stack.pop();
+ if (isBool(a) && isBool(b)) {
+ stack.push(a !== b);
+ } else {
+ stack.push(a ^ b);
+ }
+ break;
+ default:
+ error('Unknown operator ' + operator);
+ break;
+ }
+ }
+ return stack.stack;
+ }
+ };
+ return PostScriptEvaluator;
+})();
+
+// Most of the PDFs functions consist of simple operations such as:
+// roll, exch, sub, cvr, pop, index, dup, mul, if, gt, add.
+//
+// We can compile most of such programs, and at the same moment, we can
+// optimize some expressions using basic math properties. Keeping track of
+// min/max values will allow us to avoid extra Math.min/Math.max calls.
+var PostScriptCompiler = (function PostScriptCompilerClosure() {
+ function AstNode(type) {
+ this.type = type;
+ }
+ AstNode.prototype.visit = function (visitor) {
+ throw new Error('abstract method');
+ };
+
+ function AstArgument(index, min, max) {
+ AstNode.call(this, 'args');
+ this.index = index;
+ this.min = min;
+ this.max = max;
+ }
+ AstArgument.prototype = Object.create(AstNode.prototype);
+ AstArgument.prototype.visit = function (visitor) {
+ visitor.visitArgument(this);
+ };
+
+ function AstLiteral(number) {
+ AstNode.call(this, 'literal');
+ this.number = number;
+ this.min = number;
+ this.max = number;
+ }
+ AstLiteral.prototype = Object.create(AstNode.prototype);
+ AstLiteral.prototype.visit = function (visitor) {
+ visitor.visitLiteral(this);
+ };
+
+ function AstBinaryOperation(op, arg1, arg2, min, max) {
+ AstNode.call(this, 'binary');
+ this.op = op;
+ this.arg1 = arg1;
+ this.arg2 = arg2;
+ this.min = min;
+ this.max = max;
+ }
+ AstBinaryOperation.prototype = Object.create(AstNode.prototype);
+ AstBinaryOperation.prototype.visit = function (visitor) {
+ visitor.visitBinaryOperation(this);
+ };
+
+ function AstMin(arg, max) {
+ AstNode.call(this, 'max');
+ this.arg = arg;
+ this.min = arg.min;
+ this.max = max;
+ }
+ AstMin.prototype = Object.create(AstNode.prototype);
+ AstMin.prototype.visit = function (visitor) {
+ visitor.visitMin(this);
+ };
+
+ function AstVariable(index, min, max) {
+ AstNode.call(this, 'var');
+ this.index = index;
+ this.min = min;
+ this.max = max;
+ }
+ AstVariable.prototype = Object.create(AstNode.prototype);
+ AstVariable.prototype.visit = function (visitor) {
+ visitor.visitVariable(this);
+ };
+
+ function AstVariableDefinition(variable, arg) {
+ AstNode.call(this, 'definition');
+ this.variable = variable;
+ this.arg = arg;
+ }
+ AstVariableDefinition.prototype = Object.create(AstNode.prototype);
+ AstVariableDefinition.prototype.visit = function (visitor) {
+ visitor.visitVariableDefinition(this);
+ };
+
+ function ExpressionBuilderVisitor() {
+ this.parts = [];
+ }
+ ExpressionBuilderVisitor.prototype = {
+ visitArgument: function (arg) {
+ this.parts.push('Math.max(', arg.min, ', Math.min(',
+ arg.max, ', src[srcOffset + ', arg.index, ']))');
+ },
+ visitVariable: function (variable) {
+ this.parts.push('v', variable.index);
+ },
+ visitLiteral: function (literal) {
+ this.parts.push(literal.number);
+ },
+ visitBinaryOperation: function (operation) {
+ this.parts.push('(');
+ operation.arg1.visit(this);
+ this.parts.push(' ', operation.op, ' ');
+ operation.arg2.visit(this);
+ this.parts.push(')');
+ },
+ visitVariableDefinition: function (definition) {
+ this.parts.push('var ');
+ definition.variable.visit(this);
+ this.parts.push(' = ');
+ definition.arg.visit(this);
+ this.parts.push(';');
+ },
+ visitMin: function (max) {
+ this.parts.push('Math.min(');
+ max.arg.visit(this);
+ this.parts.push(', ', max.max, ')');
+ },
+ toString: function () {
+ return this.parts.join('');
+ }
+ };
+
+ function buildAddOperation(num1, num2) {
+ if (num2.type === 'literal' && num2.number === 0) {
+ // optimization: second operand is 0
+ return num1;
+ }
+ if (num1.type === 'literal' && num1.number === 0) {
+ // optimization: first operand is 0
+ return num2;
+ }
+ if (num2.type === 'literal' && num1.type === 'literal') {
+ // optimization: operands operand are literals
+ return new AstLiteral(num1.number + num2.number);
+ }
+ return new AstBinaryOperation('+', num1, num2,
+ num1.min + num2.min, num1.max + num2.max);
+ }
+
+ function buildMulOperation(num1, num2) {
+ if (num2.type === 'literal') {
+ // optimization: second operands is a literal...
+ if (num2.number === 0) {
+ return new AstLiteral(0); // and it's 0
+ } else if (num2.number === 1) {
+ return num1; // and it's 1
+ } else if (num1.type === 'literal') {
+ // ... and first operands is a literal too
+ return new AstLiteral(num1.number * num2.number);
+ }
+ }
+ if (num1.type === 'literal') {
+ // optimization: first operands is a literal...
+ if (num1.number === 0) {
+ return new AstLiteral(0); // and it's 0
+ } else if (num1.number === 1) {
+ return num2; // and it's 1
+ }
+ }
+ var min = Math.min(num1.min * num2.min, num1.min * num2.max,
+ num1.max * num2.min, num1.max * num2.max);
+ var max = Math.max(num1.min * num2.min, num1.min * num2.max,
+ num1.max * num2.min, num1.max * num2.max);
+ return new AstBinaryOperation('*', num1, num2, min, max);
+ }
+
+ function buildSubOperation(num1, num2) {
+ if (num2.type === 'literal') {
+ // optimization: second operands is a literal...
+ if (num2.number === 0) {
+ return num1; // ... and it's 0
+ } else if (num1.type === 'literal') {
+ // ... and first operands is a literal too
+ return new AstLiteral(num1.number - num2.number);
+ }
+ }
+ if (num2.type === 'binary' && num2.op === '-' &&
+ num1.type === 'literal' && num1.number === 1 &&
+ num2.arg1.type === 'literal' && num2.arg1.number === 1) {
+ // optimization for case: 1 - (1 - x)
+ return num2.arg2;
+ }
+ return new AstBinaryOperation('-', num1, num2,
+ num1.min - num2.max, num1.max - num2.min);
+ }
+
+ function buildMinOperation(num1, max) {
+ if (num1.min >= max) {
+ // optimization: num1 min value is not less than required max
+ return new AstLiteral(max); // just returning max
+ } else if (num1.max <= max) {
+ // optimization: num1 max value is not greater than required max
+ return num1; // just returning an argument
+ }
+ return new AstMin(num1, max);
+ }
+
+ function PostScriptCompiler() {}
+ PostScriptCompiler.prototype = {
+ compile: function PostScriptCompiler_compile(code, domain, range) {
+ var stack = [];
+ var i, ii;
+ var instructions = [];
+ var inputSize = domain.length >> 1, outputSize = range.length >> 1;
+ var lastRegister = 0;
+ var n, j, min, max;
+ var num1, num2, ast1, ast2, tmpVar, item;
+ for (i = 0; i < inputSize; i++) {
+ stack.push(new AstArgument(i, domain[i * 2], domain[i * 2 + 1]));
+ }
+
+ for (i = 0, ii = code.length; i < ii; i++) {
+ item = code[i];
+ if (typeof item === 'number') {
+ stack.push(new AstLiteral(item));
+ continue;
+ }
+
+ switch (item) {
+ case 'add':
+ if (stack.length < 2) {
+ return null;
+ }
+ num2 = stack.pop();
+ num1 = stack.pop();
+ stack.push(buildAddOperation(num1, num2));
+ break;
+ case 'cvr':
+ if (stack.length < 1) {
+ return null;
+ }
+ break;
+ case 'mul':
+ if (stack.length < 2) {
+ return null;
+ }
+ num2 = stack.pop();
+ num1 = stack.pop();
+ stack.push(buildMulOperation(num1, num2));
+ break;
+ case 'sub':
+ if (stack.length < 2) {
+ return null;
+ }
+ num2 = stack.pop();
+ num1 = stack.pop();
+ stack.push(buildSubOperation(num1, num2));
+ break;
+ case 'exch':
+ if (stack.length < 2) {
+ return null;
+ }
+ ast1 = stack.pop(); ast2 = stack.pop();
+ stack.push(ast1, ast2);
+ break;
+ case 'pop':
+ if (stack.length < 1) {
+ return null;
+ }
+ stack.pop();
+ break;
+ case 'index':
+ if (stack.length < 1) {
+ return null;
+ }
+ num1 = stack.pop();
+ if (num1.type !== 'literal') {
+ return null;
+ }
+ n = num1.number;
+ if (n < 0 || (n|0) !== n || stack.length < n) {
+ return null;
+ }
+ ast1 = stack[stack.length - n - 1];
+ if (ast1.type === 'literal' || ast1.type === 'var') {
+ stack.push(ast1);
+ break;
+ }
+ tmpVar = new AstVariable(lastRegister++, ast1.min, ast1.max);
+ stack[stack.length - n - 1] = tmpVar;
+ stack.push(tmpVar);
+ instructions.push(new AstVariableDefinition(tmpVar, ast1));
+ break;
+ case 'dup':
+ if (stack.length < 1) {
+ return null;
+ }
+ if (typeof code[i + 1] === 'number' && code[i + 2] === 'gt' &&
+ code[i + 3] === i + 7 && code[i + 4] === 'jz' &&
+ code[i + 5] === 'pop' && code[i + 6] === code[i + 1]) {
+ // special case of the commands sequence for the min operation
+ num1 = stack.pop();
+ stack.push(buildMinOperation(num1, code[i + 1]));
+ i += 6;
+ break;
+ }
+ ast1 = stack[stack.length - 1];
+ if (ast1.type === 'literal' || ast1.type === 'var') {
+ // we don't have to save into intermediate variable a literal or
+ // variable.
+ stack.push(ast1);
+ break;
+ }
+ tmpVar = new AstVariable(lastRegister++, ast1.min, ast1.max);
+ stack[stack.length - 1] = tmpVar;
+ stack.push(tmpVar);
+ instructions.push(new AstVariableDefinition(tmpVar, ast1));
+ break;
+ case 'roll':
+ if (stack.length < 2) {
+ return null;
+ }
+ num2 = stack.pop();
+ num1 = stack.pop();
+ if (num2.type !== 'literal' || num1.type !== 'literal') {
+ // both roll operands must be numbers
+ return null;
+ }
+ j = num2.number;
+ n = num1.number;
+ if (n <= 0 || (n|0) !== n || (j|0) !== j || stack.length < n) {
+ // ... and integers
+ return null;
+ }
+ j = ((j % n) + n) % n;
+ if (j === 0) {
+ break; // just skipping -- there are nothing to rotate
+ }
+ Array.prototype.push.apply(stack,
+ stack.splice(stack.length - n, n - j));
+ break;
+ default:
+ return null; // unsupported operator
+ }
+ }
+
+ if (stack.length !== outputSize) {
+ return null;
+ }
+
+ var result = [];
+ instructions.forEach(function (instruction) {
+ var statementBuilder = new ExpressionBuilderVisitor();
+ instruction.visit(statementBuilder);
+ result.push(statementBuilder.toString());
+ });
+ stack.forEach(function (expr, i) {
+ var statementBuilder = new ExpressionBuilderVisitor();
+ expr.visit(statementBuilder);
+ var min = range[i * 2], max = range[i * 2 + 1];
+ var out = [statementBuilder.toString()];
+ if (min > expr.min) {
+ out.unshift('Math.max(', min, ', ');
+ out.push(')');
+ }
+ if (max < expr.max) {
+ out.unshift('Math.min(', max, ', ');
+ out.push(')');
+ }
+ out.unshift('dest[destOffset + ', i, '] = ');
+ out.push(';');
+ result.push(out.join(''));
+ });
+ return result.join('\n');
+ }
+ };
+
+ return PostScriptCompiler;
+})();
+
+
+var ColorSpace = (function ColorSpaceClosure() {
+ // Constructor should define this.numComps, this.defaultColor, this.name
+ function ColorSpace() {
+ error('should not call ColorSpace constructor');
+ }
+
+ ColorSpace.prototype = {
+ /**
+ * Converts the color value to the RGB color. The color components are
+ * located in the src array starting from the srcOffset. Returns the array
+ * of the rgb components, each value ranging from [0,255].
+ */
+ getRgb: function ColorSpace_getRgb(src, srcOffset) {
+ var rgb = new Uint8Array(3);
+ this.getRgbItem(src, srcOffset, rgb, 0);
+ return rgb;
+ },
+ /**
+ * Converts the color value to the RGB color, similar to the getRgb method.
+ * The result placed into the dest array starting from the destOffset.
+ */
+ getRgbItem: function ColorSpace_getRgbItem(src, srcOffset,
+ dest, destOffset) {
+ error('Should not call ColorSpace.getRgbItem');
+ },
+ /**
+ * Converts the specified number of the color values to the RGB colors.
+ * The colors are located in the src array starting from the srcOffset.
+ * The result is placed into the dest array starting from the destOffset.
+ * The src array items shall be in [0,2^bits) range, the dest array items
+ * will be in [0,255] range. alpha01 indicates how many alpha components
+ * there are in the dest array; it will be either 0 (RGB array) or 1 (RGBA
+ * array).
+ */
+ getRgbBuffer: function ColorSpace_getRgbBuffer(src, srcOffset, count,
+ dest, destOffset, bits,
+ alpha01) {
+ error('Should not call ColorSpace.getRgbBuffer');
+ },
+ /**
+ * Determines the number of bytes required to store the result of the
+ * conversion done by the getRgbBuffer method. As in getRgbBuffer,
+ * |alpha01| is either 0 (RGB output) or 1 (RGBA output).
+ */
+ getOutputLength: function ColorSpace_getOutputLength(inputLength,
+ alpha01) {
+ error('Should not call ColorSpace.getOutputLength');
+ },
+ /**
+ * Returns true if source data will be equal the result/output data.
+ */
+ isPassthrough: function ColorSpace_isPassthrough(bits) {
+ return false;
+ },
+ /**
+ * Fills in the RGB colors in the destination buffer. alpha01 indicates
+ * how many alpha components there are in the dest array; it will be either
+ * 0 (RGB array) or 1 (RGBA array).
+ */
+ fillRgb: function ColorSpace_fillRgb(dest, originalWidth,
+ originalHeight, width, height,
+ actualHeight, bpc, comps, alpha01) {
+ var count = originalWidth * originalHeight;
+ var rgbBuf = null;
+ var numComponentColors = 1 << bpc;
+ var needsResizing = originalHeight !== height || originalWidth !== width;
+ var i, ii;
+
+ if (this.isPassthrough(bpc)) {
+ rgbBuf = comps;
+ } else if (this.numComps === 1 && count > numComponentColors &&
+ this.name !== 'DeviceGray' && this.name !== 'DeviceRGB') {
+ // Optimization: create a color map when there is just one component and
+ // we are converting more colors than the size of the color map. We
+ // don't build the map if the colorspace is gray or rgb since those
+ // methods are faster than building a map. This mainly offers big speed
+ // ups for indexed and alternate colorspaces.
+ //
+ // TODO it may be worth while to cache the color map. While running
+ // testing I never hit a cache so I will leave that out for now (perhaps
+ // we are reparsing colorspaces too much?).
+ var allColors = bpc <= 8 ? new Uint8Array(numComponentColors) :
+ new Uint16Array(numComponentColors);
+ var key;
+ for (i = 0; i < numComponentColors; i++) {
+ allColors[i] = i;
+ }
+ var colorMap = new Uint8Array(numComponentColors * 3);
+ this.getRgbBuffer(allColors, 0, numComponentColors, colorMap, 0, bpc,
+ /* alpha01 = */ 0);
+
+ var destPos, rgbPos;
+ if (!needsResizing) {
+ // Fill in the RGB values directly into |dest|.
+ destPos = 0;
+ for (i = 0; i < count; ++i) {
+ key = comps[i] * 3;
+ dest[destPos++] = colorMap[key];
+ dest[destPos++] = colorMap[key + 1];
+ dest[destPos++] = colorMap[key + 2];
+ destPos += alpha01;
+ }
+ } else {
+ rgbBuf = new Uint8Array(count * 3);
+ rgbPos = 0;
+ for (i = 0; i < count; ++i) {
+ key = comps[i] * 3;
+ rgbBuf[rgbPos++] = colorMap[key];
+ rgbBuf[rgbPos++] = colorMap[key + 1];
+ rgbBuf[rgbPos++] = colorMap[key + 2];
+ }
+ }
+ } else {
+ if (!needsResizing) {
+ // Fill in the RGB values directly into |dest|.
+ this.getRgbBuffer(comps, 0, width * actualHeight, dest, 0, bpc,
+ alpha01);
+ } else {
+ rgbBuf = new Uint8Array(count * 3);
+ this.getRgbBuffer(comps, 0, count, rgbBuf, 0, bpc,
+ /* alpha01 = */ 0);
+ }
+ }
+
+ if (rgbBuf) {
+ if (needsResizing) {
+ PDFImage.resize(rgbBuf, bpc, 3, originalWidth, originalHeight, width,
+ height, dest, alpha01);
+ } else {
+ rgbPos = 0;
+ destPos = 0;
+ for (i = 0, ii = width * actualHeight; i < ii; i++) {
+ dest[destPos++] = rgbBuf[rgbPos++];
+ dest[destPos++] = rgbBuf[rgbPos++];
+ dest[destPos++] = rgbBuf[rgbPos++];
+ destPos += alpha01;
+ }
+ }
+ }
+ },
+ /**
+ * True if the colorspace has components in the default range of [0, 1].
+ * This should be true for all colorspaces except for lab color spaces
+ * which are [0,100], [-128, 127], [-128, 127].
+ */
+ usesZeroToOneRange: true
+ };
+
+ ColorSpace.parse = function ColorSpace_parse(cs, xref, res) {
+ var IR = ColorSpace.parseToIR(cs, xref, res);
+ if (IR instanceof AlternateCS) {
+ return IR;
+ }
+ return ColorSpace.fromIR(IR);
+ };
+
+ ColorSpace.fromIR = function ColorSpace_fromIR(IR) {
+ var name = isArray(IR) ? IR[0] : IR;
+ var whitePoint, blackPoint, gamma;
+
+ switch (name) {
+ case 'DeviceGrayCS':
+ return this.singletons.gray;
+ case 'DeviceRgbCS':
+ return this.singletons.rgb;
+ case 'DeviceCmykCS':
+ return this.singletons.cmyk;
+ case 'CalGrayCS':
+ whitePoint = IR[1].WhitePoint;
+ blackPoint = IR[1].BlackPoint;
+ gamma = IR[1].Gamma;
+ return new CalGrayCS(whitePoint, blackPoint, gamma);
+ case 'CalRGBCS':
+ whitePoint = IR[1].WhitePoint;
+ blackPoint = IR[1].BlackPoint;
+ gamma = IR[1].Gamma;
+ var matrix = IR[1].Matrix;
+ return new CalRGBCS(whitePoint, blackPoint, gamma, matrix);
+ case 'PatternCS':
+ var basePatternCS = IR[1];
+ if (basePatternCS) {
+ basePatternCS = ColorSpace.fromIR(basePatternCS);
+ }
+ return new PatternCS(basePatternCS);
+ case 'IndexedCS':
+ var baseIndexedCS = IR[1];
+ var hiVal = IR[2];
+ var lookup = IR[3];
+ return new IndexedCS(ColorSpace.fromIR(baseIndexedCS), hiVal, lookup);
+ case 'AlternateCS':
+ var numComps = IR[1];
+ var alt = IR[2];
+ var tintFnIR = IR[3];
+
+ return new AlternateCS(numComps, ColorSpace.fromIR(alt),
+ PDFFunction.fromIR(tintFnIR));
+ case 'LabCS':
+ whitePoint = IR[1].WhitePoint;
+ blackPoint = IR[1].BlackPoint;
+ var range = IR[1].Range;
+ return new LabCS(whitePoint, blackPoint, range);
+ default:
+ error('Unknown name ' + name);
+ }
+ return null;
+ };
+
+ ColorSpace.parseToIR = function ColorSpace_parseToIR(cs, xref, res) {
+ if (isName(cs)) {
+ var colorSpaces = res.get('ColorSpace');
+ if (isDict(colorSpaces)) {
+ var refcs = colorSpaces.get(cs.name);
+ if (refcs) {
+ cs = refcs;
+ }
+ }
+ }
+
+ cs = xref.fetchIfRef(cs);
+ var mode;
+
+ if (isName(cs)) {
+ mode = cs.name;
+ this.mode = mode;
+
+ switch (mode) {
+ case 'DeviceGray':
+ case 'G':
+ return 'DeviceGrayCS';
+ case 'DeviceRGB':
+ case 'RGB':
+ return 'DeviceRgbCS';
+ case 'DeviceCMYK':
+ case 'CMYK':
+ return 'DeviceCmykCS';
+ case 'Pattern':
+ return ['PatternCS', null];
+ default:
+ error('unrecognized colorspace ' + mode);
+ }
+ } else if (isArray(cs)) {
+ mode = cs[0].name;
+ this.mode = mode;
+ var numComps, params;
+
+ switch (mode) {
+ case 'DeviceGray':
+ case 'G':
+ return 'DeviceGrayCS';
+ case 'DeviceRGB':
+ case 'RGB':
+ return 'DeviceRgbCS';
+ case 'DeviceCMYK':
+ case 'CMYK':
+ return 'DeviceCmykCS';
+ case 'CalGray':
+ params = xref.fetchIfRef(cs[1]).getAll();
+ return ['CalGrayCS', params];
+ case 'CalRGB':
+ params = xref.fetchIfRef(cs[1]).getAll();
+ return ['CalRGBCS', params];
+ case 'ICCBased':
+ var stream = xref.fetchIfRef(cs[1]);
+ var dict = stream.dict;
+ numComps = dict.get('N');
+ if (numComps === 1) {
+ return 'DeviceGrayCS';
+ } else if (numComps === 3) {
+ return 'DeviceRgbCS';
+ } else if (numComps === 4) {
+ return 'DeviceCmykCS';
+ }
+ break;
+ case 'Pattern':
+ var basePatternCS = cs[1];
+ if (basePatternCS) {
+ basePatternCS = ColorSpace.parseToIR(basePatternCS, xref, res);
+ }
+ return ['PatternCS', basePatternCS];
+ case 'Indexed':
+ case 'I':
+ var baseIndexedCS = ColorSpace.parseToIR(cs[1], xref, res);
+ var hiVal = cs[2] + 1;
+ var lookup = xref.fetchIfRef(cs[3]);
+ if (isStream(lookup)) {
+ lookup = lookup.getBytes();
+ }
+ return ['IndexedCS', baseIndexedCS, hiVal, lookup];
+ case 'Separation':
+ case 'DeviceN':
+ var name = cs[1];
+ numComps = 1;
+ if (isName(name)) {
+ numComps = 1;
+ } else if (isArray(name)) {
+ numComps = name.length;
+ }
+ var alt = ColorSpace.parseToIR(cs[2], xref, res);
+ var tintFnIR = PDFFunction.getIR(xref, xref.fetchIfRef(cs[3]));
+ return ['AlternateCS', numComps, alt, tintFnIR];
+ case 'Lab':
+ params = cs[1].getAll();
+ return ['LabCS', params];
+ default:
+ error('unimplemented color space object "' + mode + '"');
+ }
+ } else {
+ error('unrecognized color space object: "' + cs + '"');
+ }
+ return null;
+ };
+ /**
+ * Checks if a decode map matches the default decode map for a color space.
+ * This handles the general decode maps where there are two values per
+ * component. e.g. [0, 1, 0, 1, 0, 1] for a RGB color.
+ * This does not handle Lab, Indexed, or Pattern decode maps since they are
+ * slightly different.
+ * @param {Array} decode Decode map (usually from an image).
+ * @param {Number} n Number of components the color space has.
+ */
+ ColorSpace.isDefaultDecode = function ColorSpace_isDefaultDecode(decode, n) {
+ if (!decode) {
+ return true;
+ }
+
+ if (n * 2 !== decode.length) {
+ warn('The decode map is not the correct length');
+ return true;
+ }
+ for (var i = 0, ii = decode.length; i < ii; i += 2) {
+ if (decode[i] !== 0 || decode[i + 1] !== 1) {
+ return false;
+ }
+ }
+ return true;
+ };
+
+ ColorSpace.singletons = {
+ get gray() {
+ return shadow(this, 'gray', new DeviceGrayCS());
+ },
+ get rgb() {
+ return shadow(this, 'rgb', new DeviceRgbCS());
+ },
+ get cmyk() {
+ return shadow(this, 'cmyk', new DeviceCmykCS());
+ }
+ };
+
+ return ColorSpace;
+})();
+
+/**
+ * Alternate color space handles both Separation and DeviceN color spaces. A
+ * Separation color space is actually just a DeviceN with one color component.
+ * Both color spaces use a tinting function to convert colors to a base color
+ * space.
+ */
+var AlternateCS = (function AlternateCSClosure() {
+ function AlternateCS(numComps, base, tintFn) {
+ this.name = 'Alternate';
+ this.numComps = numComps;
+ this.defaultColor = new Float32Array(numComps);
+ for (var i = 0; i < numComps; ++i) {
+ this.defaultColor[i] = 1;
+ }
+ this.base = base;
+ this.tintFn = tintFn;
+ this.tmpBuf = new Float32Array(base.numComps);
+ }
+
+ AlternateCS.prototype = {
+ getRgb: ColorSpace.prototype.getRgb,
+ getRgbItem: function AlternateCS_getRgbItem(src, srcOffset,
+ dest, destOffset) {
+ var tmpBuf = this.tmpBuf;
+ this.tintFn(src, srcOffset, tmpBuf, 0);
+ this.base.getRgbItem(tmpBuf, 0, dest, destOffset);
+ },
+ getRgbBuffer: function AlternateCS_getRgbBuffer(src, srcOffset, count,
+ dest, destOffset, bits,
+ alpha01) {
+ var tintFn = this.tintFn;
+ var base = this.base;
+ var scale = 1 / ((1 << bits) - 1);
+ var baseNumComps = base.numComps;
+ var usesZeroToOneRange = base.usesZeroToOneRange;
+ var isPassthrough = (base.isPassthrough(8) || !usesZeroToOneRange) &&
+ alpha01 === 0;
+ var pos = isPassthrough ? destOffset : 0;
+ var baseBuf = isPassthrough ? dest : new Uint8Array(baseNumComps * count);
+ var numComps = this.numComps;
+
+ var scaled = new Float32Array(numComps);
+ var tinted = new Float32Array(baseNumComps);
+ var i, j;
+ if (usesZeroToOneRange) {
+ for (i = 0; i < count; i++) {
+ for (j = 0; j < numComps; j++) {
+ scaled[j] = src[srcOffset++] * scale;
+ }
+ tintFn(scaled, 0, tinted, 0);
+ for (j = 0; j < baseNumComps; j++) {
+ baseBuf[pos++] = tinted[j] * 255;
+ }
+ }
+ } else {
+ for (i = 0; i < count; i++) {
+ for (j = 0; j < numComps; j++) {
+ scaled[j] = src[srcOffset++] * scale;
+ }
+ tintFn(scaled, 0, tinted, 0);
+ base.getRgbItem(tinted, 0, baseBuf, pos);
+ pos += baseNumComps;
+ }
+ }
+ if (!isPassthrough) {
+ base.getRgbBuffer(baseBuf, 0, count, dest, destOffset, 8, alpha01);
+ }
+ },
+ getOutputLength: function AlternateCS_getOutputLength(inputLength,
+ alpha01) {
+ return this.base.getOutputLength(inputLength *
+ this.base.numComps / this.numComps,
+ alpha01);
+ },
+ isPassthrough: ColorSpace.prototype.isPassthrough,
+ fillRgb: ColorSpace.prototype.fillRgb,
+ isDefaultDecode: function AlternateCS_isDefaultDecode(decodeMap) {
+ return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
+ },
+ usesZeroToOneRange: true
+ };
+
+ return AlternateCS;
+})();
+
+var PatternCS = (function PatternCSClosure() {
+ function PatternCS(baseCS) {
+ this.name = 'Pattern';
+ this.base = baseCS;
+ }
+ PatternCS.prototype = {};
+
+ return PatternCS;
+})();
+
+var IndexedCS = (function IndexedCSClosure() {
+ function IndexedCS(base, highVal, lookup) {
+ this.name = 'Indexed';
+ this.numComps = 1;
+ this.defaultColor = new Uint8Array([0]);
+ this.base = base;
+ this.highVal = highVal;
+
+ var baseNumComps = base.numComps;
+ var length = baseNumComps * highVal;
+ var lookupArray;
+
+ if (isStream(lookup)) {
+ lookupArray = new Uint8Array(length);
+ var bytes = lookup.getBytes(length);
+ lookupArray.set(bytes);
+ } else if (isString(lookup)) {
+ lookupArray = new Uint8Array(length);
+ for (var i = 0; i < length; ++i) {
+ lookupArray[i] = lookup.charCodeAt(i);
+ }
+ } else if (lookup instanceof Uint8Array || lookup instanceof Array) {
+ lookupArray = lookup;
+ } else {
+ error('Unrecognized lookup table: ' + lookup);
+ }
+ this.lookup = lookupArray;
+ }
+
+ IndexedCS.prototype = {
+ getRgb: ColorSpace.prototype.getRgb,
+ getRgbItem: function IndexedCS_getRgbItem(src, srcOffset,
+ dest, destOffset) {
+ var numComps = this.base.numComps;
+ var start = src[srcOffset] * numComps;
+ this.base.getRgbItem(this.lookup, start, dest, destOffset);
+ },
+ getRgbBuffer: function IndexedCS_getRgbBuffer(src, srcOffset, count,
+ dest, destOffset, bits,
+ alpha01) {
+ var base = this.base;
+ var numComps = base.numComps;
+ var outputDelta = base.getOutputLength(numComps, alpha01);
+ var lookup = this.lookup;
+
+ for (var i = 0; i < count; ++i) {
+ var lookupPos = src[srcOffset++] * numComps;
+ base.getRgbBuffer(lookup, lookupPos, 1, dest, destOffset, 8, alpha01);
+ destOffset += outputDelta;
+ }
+ },
+ getOutputLength: function IndexedCS_getOutputLength(inputLength, alpha01) {
+ return this.base.getOutputLength(inputLength * this.base.numComps,
+ alpha01);
+ },
+ isPassthrough: ColorSpace.prototype.isPassthrough,
+ fillRgb: ColorSpace.prototype.fillRgb,
+ isDefaultDecode: function IndexedCS_isDefaultDecode(decodeMap) {
+ // indexed color maps shouldn't be changed
+ return true;
+ },
+ usesZeroToOneRange: true
+ };
+ return IndexedCS;
+})();
+
+var DeviceGrayCS = (function DeviceGrayCSClosure() {
+ function DeviceGrayCS() {
+ this.name = 'DeviceGray';
+ this.numComps = 1;
+ this.defaultColor = new Float32Array([0]);
+ }
+
+ DeviceGrayCS.prototype = {
+ getRgb: ColorSpace.prototype.getRgb,
+ getRgbItem: function DeviceGrayCS_getRgbItem(src, srcOffset,
+ dest, destOffset) {
+ var c = (src[srcOffset] * 255) | 0;
+ c = c < 0 ? 0 : c > 255 ? 255 : c;
+ dest[destOffset] = dest[destOffset + 1] = dest[destOffset + 2] = c;
+ },
+ getRgbBuffer: function DeviceGrayCS_getRgbBuffer(src, srcOffset, count,
+ dest, destOffset, bits,
+ alpha01) {
+ var scale = 255 / ((1 << bits) - 1);
+ var j = srcOffset, q = destOffset;
+ for (var i = 0; i < count; ++i) {
+ var c = (scale * src[j++]) | 0;
+ dest[q++] = c;
+ dest[q++] = c;
+ dest[q++] = c;
+ q += alpha01;
+ }
+ },
+ getOutputLength: function DeviceGrayCS_getOutputLength(inputLength,
+ alpha01) {
+ return inputLength * (3 + alpha01);
+ },
+ isPassthrough: ColorSpace.prototype.isPassthrough,
+ fillRgb: ColorSpace.prototype.fillRgb,
+ isDefaultDecode: function DeviceGrayCS_isDefaultDecode(decodeMap) {
+ return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
+ },
+ usesZeroToOneRange: true
+ };
+ return DeviceGrayCS;
+})();
+
+var DeviceRgbCS = (function DeviceRgbCSClosure() {
+ function DeviceRgbCS() {
+ this.name = 'DeviceRGB';
+ this.numComps = 3;
+ this.defaultColor = new Float32Array([0, 0, 0]);
+ }
+ DeviceRgbCS.prototype = {
+ getRgb: ColorSpace.prototype.getRgb,
+ getRgbItem: function DeviceRgbCS_getRgbItem(src, srcOffset,
+ dest, destOffset) {
+ var r = (src[srcOffset] * 255) | 0;
+ var g = (src[srcOffset + 1] * 255) | 0;
+ var b = (src[srcOffset + 2] * 255) | 0;
+ dest[destOffset] = r < 0 ? 0 : r > 255 ? 255 : r;
+ dest[destOffset + 1] = g < 0 ? 0 : g > 255 ? 255 : g;
+ dest[destOffset + 2] = b < 0 ? 0 : b > 255 ? 255 : b;
+ },
+ getRgbBuffer: function DeviceRgbCS_getRgbBuffer(src, srcOffset, count,
+ dest, destOffset, bits,
+ alpha01) {
+ if (bits === 8 && alpha01 === 0) {
+ dest.set(src.subarray(srcOffset, srcOffset + count * 3), destOffset);
+ return;
+ }
+ var scale = 255 / ((1 << bits) - 1);
+ var j = srcOffset, q = destOffset;
+ for (var i = 0; i < count; ++i) {
+ dest[q++] = (scale * src[j++]) | 0;
+ dest[q++] = (scale * src[j++]) | 0;
+ dest[q++] = (scale * src[j++]) | 0;
+ q += alpha01;
+ }
+ },
+ getOutputLength: function DeviceRgbCS_getOutputLength(inputLength,
+ alpha01) {
+ return (inputLength * (3 + alpha01) / 3) | 0;
+ },
+ isPassthrough: function DeviceRgbCS_isPassthrough(bits) {
+ return bits === 8;
+ },
+ fillRgb: ColorSpace.prototype.fillRgb,
+ isDefaultDecode: function DeviceRgbCS_isDefaultDecode(decodeMap) {
+ return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
+ },
+ usesZeroToOneRange: true
+ };
+ return DeviceRgbCS;
+})();
+
+var DeviceCmykCS = (function DeviceCmykCSClosure() {
+ // The coefficients below was found using numerical analysis: the method of
+ // steepest descent for the sum((f_i - color_value_i)^2) for r/g/b colors,
+ // where color_value is the tabular value from the table of sampled RGB colors
+ // from CMYK US Web Coated (SWOP) colorspace, and f_i is the corresponding
+ // CMYK color conversion using the estimation below:
+ // f(A, B,.. N) = Acc+Bcm+Ccy+Dck+c+Fmm+Gmy+Hmk+Im+Jyy+Kyk+Ly+Mkk+Nk+255
+ function convertToRgb(src, srcOffset, srcScale, dest, destOffset) {
+ var c = src[srcOffset + 0] * srcScale;
+ var m = src[srcOffset + 1] * srcScale;
+ var y = src[srcOffset + 2] * srcScale;
+ var k = src[srcOffset + 3] * srcScale;
+
+ var r =
+ (c * (-4.387332384609988 * c + 54.48615194189176 * m +
+ 18.82290502165302 * y + 212.25662451639585 * k +
+ -285.2331026137004) +
+ m * (1.7149763477362134 * m - 5.6096736904047315 * y +
+ -17.873870861415444 * k - 5.497006427196366) +
+ y * (-2.5217340131683033 * y - 21.248923337353073 * k +
+ 17.5119270841813) +
+ k * (-21.86122147463605 * k - 189.48180835922747) + 255) | 0;
+ var g =
+ (c * (8.841041422036149 * c + 60.118027045597366 * m +
+ 6.871425592049007 * y + 31.159100130055922 * k +
+ -79.2970844816548) +
+ m * (-15.310361306967817 * m + 17.575251261109482 * y +
+ 131.35250912493976 * k - 190.9453302588951) +
+ y * (4.444339102852739 * y + 9.8632861493405 * k - 24.86741582555878) +
+ k * (-20.737325471181034 * k - 187.80453709719578) + 255) | 0;
+ var b =
+ (c * (0.8842522430003296 * c + 8.078677503112928 * m +
+ 30.89978309703729 * y - 0.23883238689178934 * k +
+ -14.183576799673286) +
+ m * (10.49593273432072 * m + 63.02378494754052 * y +
+ 50.606957656360734 * k - 112.23884253719248) +
+ y * (0.03296041114873217 * y + 115.60384449646641 * k +
+ -193.58209356861505) +
+ k * (-22.33816807309886 * k - 180.12613974708367) + 255) | 0;
+
+ dest[destOffset] = r > 255 ? 255 : r < 0 ? 0 : r;
+ dest[destOffset + 1] = g > 255 ? 255 : g < 0 ? 0 : g;
+ dest[destOffset + 2] = b > 255 ? 255 : b < 0 ? 0 : b;
+ }
+
+ function DeviceCmykCS() {
+ this.name = 'DeviceCMYK';
+ this.numComps = 4;
+ this.defaultColor = new Float32Array([0, 0, 0, 1]);
+ }
+ DeviceCmykCS.prototype = {
+ getRgb: ColorSpace.prototype.getRgb,
+ getRgbItem: function DeviceCmykCS_getRgbItem(src, srcOffset,
+ dest, destOffset) {
+ convertToRgb(src, srcOffset, 1, dest, destOffset);
+ },
+ getRgbBuffer: function DeviceCmykCS_getRgbBuffer(src, srcOffset, count,
+ dest, destOffset, bits,
+ alpha01) {
+ var scale = 1 / ((1 << bits) - 1);
+ for (var i = 0; i < count; i++) {
+ convertToRgb(src, srcOffset, scale, dest, destOffset);
+ srcOffset += 4;
+ destOffset += 3 + alpha01;
+ }
+ },
+ getOutputLength: function DeviceCmykCS_getOutputLength(inputLength,
+ alpha01) {
+ return (inputLength / 4 * (3 + alpha01)) | 0;
+ },
+ isPassthrough: ColorSpace.prototype.isPassthrough,
+ fillRgb: ColorSpace.prototype.fillRgb,
+ isDefaultDecode: function DeviceCmykCS_isDefaultDecode(decodeMap) {
+ return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
+ },
+ usesZeroToOneRange: true
+ };
+
+ return DeviceCmykCS;
+})();
+
+//
+// CalGrayCS: Based on "PDF Reference, Sixth Ed", p.245
+//
+var CalGrayCS = (function CalGrayCSClosure() {
+ function CalGrayCS(whitePoint, blackPoint, gamma) {
+ this.name = 'CalGray';
+ this.numComps = 1;
+ this.defaultColor = new Float32Array([0]);
+
+ if (!whitePoint) {
+ error('WhitePoint missing - required for color space CalGray');
+ }
+ blackPoint = blackPoint || [0, 0, 0];
+ gamma = gamma || 1;
+
+ // Translate arguments to spec variables.
+ this.XW = whitePoint[0];
+ this.YW = whitePoint[1];
+ this.ZW = whitePoint[2];
+
+ this.XB = blackPoint[0];
+ this.YB = blackPoint[1];
+ this.ZB = blackPoint[2];
+
+ this.G = gamma;
+
+ // Validate variables as per spec.
+ if (this.XW < 0 || this.ZW < 0 || this.YW !== 1) {
+ error('Invalid WhitePoint components for ' + this.name +
+ ', no fallback available');
+ }
+
+ if (this.XB < 0 || this.YB < 0 || this.ZB < 0) {
+ info('Invalid BlackPoint for ' + this.name + ', falling back to default');
+ this.XB = this.YB = this.ZB = 0;
+ }
+
+ if (this.XB !== 0 || this.YB !== 0 || this.ZB !== 0) {
+ warn(this.name + ', BlackPoint: XB: ' + this.XB + ', YB: ' + this.YB +
+ ', ZB: ' + this.ZB + ', only default values are supported.');
+ }
+
+ if (this.G < 1) {
+ info('Invalid Gamma: ' + this.G + ' for ' + this.name +
+ ', falling back to default');
+ this.G = 1;
+ }
+ }
+
+ function convertToRgb(cs, src, srcOffset, dest, destOffset, scale) {
+ // A represents a gray component of a calibrated gray space.
+ // A <---> AG in the spec
+ var A = src[srcOffset] * scale;
+ var AG = Math.pow(A, cs.G);
+
+ // Computes L as per spec. ( = cs.YW * AG )
+ // Except if other than default BlackPoint values are used.
+ var L = cs.YW * AG;
+ // http://www.poynton.com/notes/colour_and_gamma/ColorFAQ.html, Ch 4.
+ // Convert values to rgb range [0, 255].
+ var val = Math.max(295.8 * Math.pow(L, 0.333333333333333333) - 40.8, 0) | 0;
+ dest[destOffset] = val;
+ dest[destOffset + 1] = val;
+ dest[destOffset + 2] = val;
+ }
+
+ CalGrayCS.prototype = {
+ getRgb: ColorSpace.prototype.getRgb,
+ getRgbItem: function CalGrayCS_getRgbItem(src, srcOffset,
+ dest, destOffset) {
+ convertToRgb(this, src, srcOffset, dest, destOffset, 1);
+ },
+ getRgbBuffer: function CalGrayCS_getRgbBuffer(src, srcOffset, count,
+ dest, destOffset, bits,
+ alpha01) {
+ var scale = 1 / ((1 << bits) - 1);
+
+ for (var i = 0; i < count; ++i) {
+ convertToRgb(this, src, srcOffset, dest, destOffset, scale);
+ srcOffset += 1;
+ destOffset += 3 + alpha01;
+ }
+ },
+ getOutputLength: function CalGrayCS_getOutputLength(inputLength, alpha01) {
+ return inputLength * (3 + alpha01);
+ },
+ isPassthrough: ColorSpace.prototype.isPassthrough,
+ fillRgb: ColorSpace.prototype.fillRgb,
+ isDefaultDecode: function CalGrayCS_isDefaultDecode(decodeMap) {
+ return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
+ },
+ usesZeroToOneRange: true
+ };
+ return CalGrayCS;
+})();
+
+//
+// CalRGBCS: Based on "PDF Reference, Sixth Ed", p.247
+//
+var CalRGBCS = (function CalRGBCSClosure() {
+
+ // See http://www.brucelindbloom.com/index.html?Eqn_ChromAdapt.html for these
+ // matrices.
+ var BRADFORD_SCALE_MATRIX = new Float32Array([
+ 0.8951, 0.2664, -0.1614,
+ -0.7502, 1.7135, 0.0367,
+ 0.0389, -0.0685, 1.0296]);
+
+ var BRADFORD_SCALE_INVERSE_MATRIX = new Float32Array([
+ 0.9869929, -0.1470543, 0.1599627,
+ 0.4323053, 0.5183603, 0.0492912,
+ -0.0085287, 0.0400428, 0.9684867]);
+
+ // See http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html.
+ var SRGB_D65_XYZ_TO_RGB_MATRIX = new Float32Array([
+ 3.2404542, -1.5371385, -0.4985314,
+ -0.9692660, 1.8760108, 0.0415560,
+ 0.0556434, -0.2040259, 1.0572252]);
+
+ var FLAT_WHITEPOINT_MATRIX = new Float32Array([1, 1, 1]);
+
+ var tempNormalizeMatrix = new Float32Array(3);
+ var tempConvertMatrix1 = new Float32Array(3);
+ var tempConvertMatrix2 = new Float32Array(3);
+
+ var DECODE_L_CONSTANT = Math.pow(((8 + 16) / 116), 3) / 8.0;
+
+ function CalRGBCS(whitePoint, blackPoint, gamma, matrix) {
+ this.name = 'CalRGB';
+ this.numComps = 3;
+ this.defaultColor = new Float32Array(3);
+
+ if (!whitePoint) {
+ error('WhitePoint missing - required for color space CalRGB');
+ }
+ blackPoint = blackPoint || new Float32Array(3);
+ gamma = gamma || new Float32Array([1, 1, 1]);
+ matrix = matrix || new Float32Array([1, 0, 0, 0, 1, 0, 0, 0, 1]);
+
+ // Translate arguments to spec variables.
+ var XW = whitePoint[0];
+ var YW = whitePoint[1];
+ var ZW = whitePoint[2];
+ this.whitePoint = whitePoint;
+
+ var XB = blackPoint[0];
+ var YB = blackPoint[1];
+ var ZB = blackPoint[2];
+ this.blackPoint = blackPoint;
+
+ this.GR = gamma[0];
+ this.GG = gamma[1];
+ this.GB = gamma[2];
+
+ this.MXA = matrix[0];
+ this.MYA = matrix[1];
+ this.MZA = matrix[2];
+ this.MXB = matrix[3];
+ this.MYB = matrix[4];
+ this.MZB = matrix[5];
+ this.MXC = matrix[6];
+ this.MYC = matrix[7];
+ this.MZC = matrix[8];
+
+ // Validate variables as per spec.
+ if (XW < 0 || ZW < 0 || YW !== 1) {
+ error('Invalid WhitePoint components for ' + this.name +
+ ', no fallback available');
+ }
+
+ if (XB < 0 || YB < 0 || ZB < 0) {
+ info('Invalid BlackPoint for ' + this.name + ' [' + XB + ', ' + YB +
+ ', ' + ZB + '], falling back to default');
+ this.blackPoint = new Float32Array(3);
+ }
+
+ if (this.GR < 0 || this.GG < 0 || this.GB < 0) {
+ info('Invalid Gamma [' + this.GR + ', ' + this.GG + ', ' + this.GB +
+ '] for ' + this.name + ', falling back to default');
+ this.GR = this.GG = this.GB = 1;
+ }
+
+ if (this.MXA < 0 || this.MYA < 0 || this.MZA < 0 ||
+ this.MXB < 0 || this.MYB < 0 || this.MZB < 0 ||
+ this.MXC < 0 || this.MYC < 0 || this.MZC < 0) {
+ info('Invalid Matrix for ' + this.name + ' [' +
+ this.MXA + ', ' + this.MYA + ', ' + this.MZA +
+ this.MXB + ', ' + this.MYB + ', ' + this.MZB +
+ this.MXC + ', ' + this.MYC + ', ' + this.MZC +
+ '], falling back to default');
+ this.MXA = this.MYB = this.MZC = 1;
+ this.MXB = this.MYA = this.MZA = this.MXC = this.MYC = this.MZB = 0;
+ }
+ }
+
+ function matrixProduct(a, b, result) {
+ result[0] = a[0] * b[0] + a[1] * b[1] + a[2] * b[2];
+ result[1] = a[3] * b[0] + a[4] * b[1] + a[5] * b[2];
+ result[2] = a[6] * b[0] + a[7] * b[1] + a[8] * b[2];
+ }
+
+ function convertToFlat(sourceWhitePoint, LMS, result) {
+ result[0] = LMS[0] * 1 / sourceWhitePoint[0];
+ result[1] = LMS[1] * 1 / sourceWhitePoint[1];
+ result[2] = LMS[2] * 1 / sourceWhitePoint[2];
+ }
+
+ function convertToD65(sourceWhitePoint, LMS, result) {
+ var D65X = 0.95047;
+ var D65Y = 1;
+ var D65Z = 1.08883;
+
+ result[0] = LMS[0] * D65X / sourceWhitePoint[0];
+ result[1] = LMS[1] * D65Y / sourceWhitePoint[1];
+ result[2] = LMS[2] * D65Z / sourceWhitePoint[2];
+ }
+
+ function sRGBTransferFunction(color) {
+ // See http://en.wikipedia.org/wiki/SRGB.
+ if (color <= 0.0031308){
+ return adjustToRange(0, 1, 12.92 * color);
+ }
+
+ return adjustToRange(0, 1, (1 + 0.055) * Math.pow(color, 1 / 2.4) - 0.055);
+ }
+
+ function adjustToRange(min, max, value) {
+ return Math.max(min, Math.min(max, value));
+ }
+
+ function decodeL(L) {
+ if (L < 0) {
+ return -decodeL(-L);
+ }
+
+ if (L > 8.0) {
+ return Math.pow(((L + 16) / 116), 3);
+ }
+
+ return L * DECODE_L_CONSTANT;
+ }
+
+ function compensateBlackPoint(sourceBlackPoint, XYZ_Flat, result) {
+
+ // In case the blackPoint is already the default blackPoint then there is
+ // no need to do compensation.
+ if (sourceBlackPoint[0] === 0 &&
+ sourceBlackPoint[1] === 0 &&
+ sourceBlackPoint[2] === 0) {
+ result[0] = XYZ_Flat[0];
+ result[1] = XYZ_Flat[1];
+ result[2] = XYZ_Flat[2];
+ return;
+ }
+
+ // For the blackPoint calculation details, please see
+ // http://www.adobe.com/content/dam/Adobe/en/devnet/photoshop/sdk/
+ // AdobeBPC.pdf.
+ // The destination blackPoint is the default blackPoint [0, 0, 0].
+ var zeroDecodeL = decodeL(0);
+
+ var X_DST = zeroDecodeL;
+ var X_SRC = decodeL(sourceBlackPoint[0]);
+
+ var Y_DST = zeroDecodeL;
+ var Y_SRC = decodeL(sourceBlackPoint[1]);
+
+ var Z_DST = zeroDecodeL;
+ var Z_SRC = decodeL(sourceBlackPoint[2]);
+
+ var X_Scale = (1 - X_DST) / (1 - X_SRC);
+ var X_Offset = 1 - X_Scale;
+
+ var Y_Scale = (1 - Y_DST) / (1 - Y_SRC);
+ var Y_Offset = 1 - Y_Scale;
+
+ var Z_Scale = (1 - Z_DST) / (1 - Z_SRC);
+ var Z_Offset = 1 - Z_Scale;
+
+ result[0] = XYZ_Flat[0] * X_Scale + X_Offset;
+ result[1] = XYZ_Flat[1] * Y_Scale + Y_Offset;
+ result[2] = XYZ_Flat[2] * Z_Scale + Z_Offset;
+ }
+
+ function normalizeWhitePointToFlat(sourceWhitePoint, XYZ_In, result) {
+
+ // In case the whitePoint is already flat then there is no need to do
+ // normalization.
+ if (sourceWhitePoint[0] === 1 && sourceWhitePoint[2] === 1) {
+ result[0] = XYZ_In[0];
+ result[1] = XYZ_In[1];
+ result[2] = XYZ_In[2];
+ return;
+ }
+
+ var LMS = result;
+ matrixProduct(BRADFORD_SCALE_MATRIX, XYZ_In, LMS);
+
+ var LMS_Flat = tempNormalizeMatrix;
+ convertToFlat(sourceWhitePoint, LMS, LMS_Flat);
+
+ matrixProduct(BRADFORD_SCALE_INVERSE_MATRIX, LMS_Flat, result);
+ }
+
+ function normalizeWhitePointToD65(sourceWhitePoint, XYZ_In, result) {
+
+ var LMS = result;
+ matrixProduct(BRADFORD_SCALE_MATRIX, XYZ_In, LMS);
+
+ var LMS_D65 = tempNormalizeMatrix;
+ convertToD65(sourceWhitePoint, LMS, LMS_D65);
+
+ matrixProduct(BRADFORD_SCALE_INVERSE_MATRIX, LMS_D65, result);
+ }
+
+ function convertToRgb(cs, src, srcOffset, dest, destOffset, scale) {
+ // A, B and C represent a red, green and blue components of a calibrated
+ // rgb space.
+ var A = adjustToRange(0, 1, src[srcOffset] * scale);
+ var B = adjustToRange(0, 1, src[srcOffset + 1] * scale);
+ var C = adjustToRange(0, 1, src[srcOffset + 2] * scale);
+
+ // A <---> AGR in the spec
+ // B <---> BGG in the spec
+ // C <---> CGB in the spec
+ var AGR = Math.pow(A, cs.GR);
+ var BGG = Math.pow(B, cs.GG);
+ var CGB = Math.pow(C, cs.GB);
+
+ // Computes intermediate variables L, M, N as per spec.
+ // To decode X, Y, Z values map L, M, N directly to them.
+ var X = cs.MXA * AGR + cs.MXB * BGG + cs.MXC * CGB;
+ var Y = cs.MYA * AGR + cs.MYB * BGG + cs.MYC * CGB;
+ var Z = cs.MZA * AGR + cs.MZB * BGG + cs.MZC * CGB;
+
+ // The following calculations are based on this document:
+ // http://www.adobe.com/content/dam/Adobe/en/devnet/photoshop/sdk/
+ // AdobeBPC.pdf.
+ var XYZ = tempConvertMatrix1;
+ XYZ[0] = X;
+ XYZ[1] = Y;
+ XYZ[2] = Z;
+ var XYZ_Flat = tempConvertMatrix2;
+
+ normalizeWhitePointToFlat(cs.whitePoint, XYZ, XYZ_Flat);
+
+ var XYZ_Black = tempConvertMatrix1;
+ compensateBlackPoint(cs.blackPoint, XYZ_Flat, XYZ_Black);
+
+ var XYZ_D65 = tempConvertMatrix2;
+ normalizeWhitePointToD65(FLAT_WHITEPOINT_MATRIX, XYZ_Black, XYZ_D65);
+
+ var SRGB = tempConvertMatrix1;
+ matrixProduct(SRGB_D65_XYZ_TO_RGB_MATRIX, XYZ_D65, SRGB);
+
+ var sR = sRGBTransferFunction(SRGB[0]);
+ var sG = sRGBTransferFunction(SRGB[1]);
+ var sB = sRGBTransferFunction(SRGB[2]);
+
+ // Convert the values to rgb range [0, 255].
+ dest[destOffset] = Math.round(sR * 255);
+ dest[destOffset + 1] = Math.round(sG * 255);
+ dest[destOffset + 2] = Math.round(sB * 255);
+ }
+
+ CalRGBCS.prototype = {
+ getRgb: function CalRGBCS_getRgb(src, srcOffset) {
+ var rgb = new Uint8Array(3);
+ this.getRgbItem(src, srcOffset, rgb, 0);
+ return rgb;
+ },
+ getRgbItem: function CalRGBCS_getRgbItem(src, srcOffset,
+ dest, destOffset) {
+ convertToRgb(this, src, srcOffset, dest, destOffset, 1);
+ },
+ getRgbBuffer: function CalRGBCS_getRgbBuffer(src, srcOffset, count,
+ dest, destOffset, bits,
+ alpha01) {
+ var scale = 1 / ((1 << bits) - 1);
+
+ for (var i = 0; i < count; ++i) {
+ convertToRgb(this, src, srcOffset, dest, destOffset, scale);
+ srcOffset += 3;
+ destOffset += 3 + alpha01;
+ }
+ },
+ getOutputLength: function CalRGBCS_getOutputLength(inputLength, alpha01) {
+ return (inputLength * (3 + alpha01) / 3) | 0;
+ },
+ isPassthrough: ColorSpace.prototype.isPassthrough,
+ fillRgb: ColorSpace.prototype.fillRgb,
+ isDefaultDecode: function CalRGBCS_isDefaultDecode(decodeMap) {
+ return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
+ },
+ usesZeroToOneRange: true
+ };
+ return CalRGBCS;
+})();
+
+//
+// LabCS: Based on "PDF Reference, Sixth Ed", p.250
+//
+var LabCS = (function LabCSClosure() {
+ function LabCS(whitePoint, blackPoint, range) {
+ this.name = 'Lab';
+ this.numComps = 3;
+ this.defaultColor = new Float32Array([0, 0, 0]);
+
+ if (!whitePoint) {
+ error('WhitePoint missing - required for color space Lab');
+ }
+ blackPoint = blackPoint || [0, 0, 0];
+ range = range || [-100, 100, -100, 100];
+
+ // Translate args to spec variables
+ this.XW = whitePoint[0];
+ this.YW = whitePoint[1];
+ this.ZW = whitePoint[2];
+ this.amin = range[0];
+ this.amax = range[1];
+ this.bmin = range[2];
+ this.bmax = range[3];
+
+ // These are here just for completeness - the spec doesn't offer any
+ // formulas that use BlackPoint in Lab
+ this.XB = blackPoint[0];
+ this.YB = blackPoint[1];
+ this.ZB = blackPoint[2];
+
+ // Validate vars as per spec
+ if (this.XW < 0 || this.ZW < 0 || this.YW !== 1) {
+ error('Invalid WhitePoint components, no fallback available');
+ }
+
+ if (this.XB < 0 || this.YB < 0 || this.ZB < 0) {
+ info('Invalid BlackPoint, falling back to default');
+ this.XB = this.YB = this.ZB = 0;
+ }
+
+ if (this.amin > this.amax || this.bmin > this.bmax) {
+ info('Invalid Range, falling back to defaults');
+ this.amin = -100;
+ this.amax = 100;
+ this.bmin = -100;
+ this.bmax = 100;
+ }
+ }
+
+ // Function g(x) from spec
+ function fn_g(x) {
+ if (x >= 6 / 29) {
+ return x * x * x;
+ } else {
+ return (108 / 841) * (x - 4 / 29);
+ }
+ }
+
+ function decode(value, high1, low2, high2) {
+ return low2 + (value) * (high2 - low2) / (high1);
+ }
+
+ // If decoding is needed maxVal should be 2^bits per component - 1.
+ function convertToRgb(cs, src, srcOffset, maxVal, dest, destOffset) {
+ // XXX: Lab input is in the range of [0, 100], [amin, amax], [bmin, bmax]
+ // not the usual [0, 1]. If a command like setFillColor is used the src
+ // values will already be within the correct range. However, if we are
+ // converting an image we have to map the values to the correct range given
+ // above.
+ // Ls,as,bs <---> L*,a*,b* in the spec
+ var Ls = src[srcOffset];
+ var as = src[srcOffset + 1];
+ var bs = src[srcOffset + 2];
+ if (maxVal !== false) {
+ Ls = decode(Ls, maxVal, 0, 100);
+ as = decode(as, maxVal, cs.amin, cs.amax);
+ bs = decode(bs, maxVal, cs.bmin, cs.bmax);
+ }
+
+ // Adjust limits of 'as' and 'bs'
+ as = as > cs.amax ? cs.amax : as < cs.amin ? cs.amin : as;
+ bs = bs > cs.bmax ? cs.bmax : bs < cs.bmin ? cs.bmin : bs;
+
+ // Computes intermediate variables X,Y,Z as per spec
+ var M = (Ls + 16) / 116;
+ var L = M + (as / 500);
+ var N = M - (bs / 200);
+
+ var X = cs.XW * fn_g(L);
+ var Y = cs.YW * fn_g(M);
+ var Z = cs.ZW * fn_g(N);
+
+ var r, g, b;
+ // Using different conversions for D50 and D65 white points,
+ // per http://www.color.org/srgb.pdf
+ if (cs.ZW < 1) {
+ // Assuming D50 (X=0.9642, Y=1.00, Z=0.8249)
+ r = X * 3.1339 + Y * -1.6170 + Z * -0.4906;
+ g = X * -0.9785 + Y * 1.9160 + Z * 0.0333;
+ b = X * 0.0720 + Y * -0.2290 + Z * 1.4057;
+ } else {
+ // Assuming D65 (X=0.9505, Y=1.00, Z=1.0888)
+ r = X * 3.2406 + Y * -1.5372 + Z * -0.4986;
+ g = X * -0.9689 + Y * 1.8758 + Z * 0.0415;
+ b = X * 0.0557 + Y * -0.2040 + Z * 1.0570;
+ }
+ // clamp color values to [0,1] range then convert to [0,255] range.
+ dest[destOffset] = r <= 0 ? 0 : r >= 1 ? 255 : Math.sqrt(r) * 255 | 0;
+ dest[destOffset + 1] = g <= 0 ? 0 : g >= 1 ? 255 : Math.sqrt(g) * 255 | 0;
+ dest[destOffset + 2] = b <= 0 ? 0 : b >= 1 ? 255 : Math.sqrt(b) * 255 | 0;
+ }
+
+ LabCS.prototype = {
+ getRgb: ColorSpace.prototype.getRgb,
+ getRgbItem: function LabCS_getRgbItem(src, srcOffset, dest, destOffset) {
+ convertToRgb(this, src, srcOffset, false, dest, destOffset);
+ },
+ getRgbBuffer: function LabCS_getRgbBuffer(src, srcOffset, count,
+ dest, destOffset, bits,
+ alpha01) {
+ var maxVal = (1 << bits) - 1;
+ for (var i = 0; i < count; i++) {
+ convertToRgb(this, src, srcOffset, maxVal, dest, destOffset);
+ srcOffset += 3;
+ destOffset += 3 + alpha01;
+ }
+ },
+ getOutputLength: function LabCS_getOutputLength(inputLength, alpha01) {
+ return (inputLength * (3 + alpha01) / 3) | 0;
+ },
+ isPassthrough: ColorSpace.prototype.isPassthrough,
+ fillRgb: ColorSpace.prototype.fillRgb,
+ isDefaultDecode: function LabCS_isDefaultDecode(decodeMap) {
+ // XXX: Decoding is handled with the lab conversion because of the strange
+ // ranges that are used.
+ return true;
+ },
+ usesZeroToOneRange: false
+ };
+ return LabCS;
+})();
+
+
+var ARCFourCipher = (function ARCFourCipherClosure() {
+ function ARCFourCipher(key) {
+ this.a = 0;
+ this.b = 0;
+ var s = new Uint8Array(256);
+ var i, j = 0, tmp, keyLength = key.length;
+ for (i = 0; i < 256; ++i) {
+ s[i] = i;
+ }
+ for (i = 0; i < 256; ++i) {
+ tmp = s[i];
+ j = (j + tmp + key[i % keyLength]) & 0xFF;
+ s[i] = s[j];
+ s[j] = tmp;
+ }
+ this.s = s;
+ }
+
+ ARCFourCipher.prototype = {
+ encryptBlock: function ARCFourCipher_encryptBlock(data) {
+ var i, n = data.length, tmp, tmp2;
+ var a = this.a, b = this.b, s = this.s;
+ var output = new Uint8Array(n);
+ for (i = 0; i < n; ++i) {
+ a = (a + 1) & 0xFF;
+ tmp = s[a];
+ b = (b + tmp) & 0xFF;
+ tmp2 = s[b];
+ s[a] = tmp2;
+ s[b] = tmp;
+ output[i] = data[i] ^ s[(tmp + tmp2) & 0xFF];
+ }
+ this.a = a;
+ this.b = b;
+ return output;
+ }
+ };
+ ARCFourCipher.prototype.decryptBlock = ARCFourCipher.prototype.encryptBlock;
+
+ return ARCFourCipher;
+})();
+
+var calculateMD5 = (function calculateMD5Closure() {
+ var r = new Uint8Array([
+ 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22,
+ 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20,
+ 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23,
+ 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21]);
+
+ var k = new Int32Array([
+ -680876936, -389564586, 606105819, -1044525330, -176418897, 1200080426,
+ -1473231341, -45705983, 1770035416, -1958414417, -42063, -1990404162,
+ 1804603682, -40341101, -1502002290, 1236535329, -165796510, -1069501632,
+ 643717713, -373897302, -701558691, 38016083, -660478335, -405537848,
+ 568446438, -1019803690, -187363961, 1163531501, -1444681467, -51403784,
+ 1735328473, -1926607734, -378558, -2022574463, 1839030562, -35309556,
+ -1530992060, 1272893353, -155497632, -1094730640, 681279174, -358537222,
+ -722521979, 76029189, -640364487, -421815835, 530742520, -995338651,
+ -198630844, 1126891415, -1416354905, -57434055, 1700485571, -1894986606,
+ -1051523, -2054922799, 1873313359, -30611744, -1560198380, 1309151649,
+ -145523070, -1120210379, 718787259, -343485551]);
+
+ function hash(data, offset, length) {
+ var h0 = 1732584193, h1 = -271733879, h2 = -1732584194, h3 = 271733878;
+ // pre-processing
+ var paddedLength = (length + 72) & ~63; // data + 9 extra bytes
+ var padded = new Uint8Array(paddedLength);
+ var i, j, n;
+ for (i = 0; i < length; ++i) {
+ padded[i] = data[offset++];
+ }
+ padded[i++] = 0x80;
+ n = paddedLength - 8;
+ while (i < n) {
+ padded[i++] = 0;
+ }
+ padded[i++] = (length << 3) & 0xFF;
+ padded[i++] = (length >> 5) & 0xFF;
+ padded[i++] = (length >> 13) & 0xFF;
+ padded[i++] = (length >> 21) & 0xFF;
+ padded[i++] = (length >>> 29) & 0xFF;
+ padded[i++] = 0;
+ padded[i++] = 0;
+ padded[i++] = 0;
+ var w = new Int32Array(16);
+ for (i = 0; i < paddedLength;) {
+ for (j = 0; j < 16; ++j, i += 4) {
+ w[j] = (padded[i] | (padded[i + 1] << 8) |
+ (padded[i + 2] << 16) | (padded[i + 3] << 24));
+ }
+ var a = h0, b = h1, c = h2, d = h3, f, g;
+ for (j = 0; j < 64; ++j) {
+ if (j < 16) {
+ f = (b & c) | ((~b) & d);
+ g = j;
+ } else if (j < 32) {
+ f = (d & b) | ((~d) & c);
+ g = (5 * j + 1) & 15;
+ } else if (j < 48) {
+ f = b ^ c ^ d;
+ g = (3 * j + 5) & 15;
+ } else {
+ f = c ^ (b | (~d));
+ g = (7 * j) & 15;
+ }
+ var tmp = d, rotateArg = (a + f + k[j] + w[g]) | 0, rotate = r[j];
+ d = c;
+ c = b;
+ b = (b + ((rotateArg << rotate) | (rotateArg >>> (32 - rotate)))) | 0;
+ a = tmp;
+ }
+ h0 = (h0 + a) | 0;
+ h1 = (h1 + b) | 0;
+ h2 = (h2 + c) | 0;
+ h3 = (h3 + d) | 0;
+ }
+ return new Uint8Array([
+ h0 & 0xFF, (h0 >> 8) & 0xFF, (h0 >> 16) & 0xFF, (h0 >>> 24) & 0xFF,
+ h1 & 0xFF, (h1 >> 8) & 0xFF, (h1 >> 16) & 0xFF, (h1 >>> 24) & 0xFF,
+ h2 & 0xFF, (h2 >> 8) & 0xFF, (h2 >> 16) & 0xFF, (h2 >>> 24) & 0xFF,
+ h3 & 0xFF, (h3 >> 8) & 0xFF, (h3 >> 16) & 0xFF, (h3 >>> 24) & 0xFF
+ ]);
+ }
+
+ return hash;
+})();
+var Word64 = (function Word64Closure() {
+ function Word64(highInteger, lowInteger) {
+ this.high = highInteger | 0;
+ this.low = lowInteger | 0;
+ }
+ Word64.prototype = {
+ and: function Word64_and(word) {
+ this.high &= word.high;
+ this.low &= word.low;
+ },
+ xor: function Word64_xor(word) {
+ this.high ^= word.high;
+ this.low ^= word.low;
+ },
+
+ or: function Word64_or(word) {
+ this.high |= word.high;
+ this.low |= word.low;
+ },
+
+ shiftRight: function Word64_shiftRight(places) {
+ if (places >= 32) {
+ this.low = (this.high >>> (places - 32)) | 0;
+ this.high = 0;
+ } else {
+ this.low = (this.low >>> places) | (this.high << (32 - places));
+ this.high = (this.high >>> places) | 0;
+ }
+ },
+
+ shiftLeft: function Word64_shiftLeft(places) {
+ if (places >= 32) {
+ this.high = this.low << (places - 32);
+ this.low = 0;
+ } else {
+ this.high = (this.high << places) | (this.low >>> (32 - places));
+ this.low = this.low << places;
+ }
+ },
+
+ rotateRight: function Word64_rotateRight(places) {
+ var low, high;
+ if (places & 32) {
+ high = this.low;
+ low = this.high;
+ } else {
+ low = this.low;
+ high = this.high;
+ }
+ places &= 31;
+ this.low = (low >>> places) | (high << (32 - places));
+ this.high = (high >>> places) | (low << (32 - places));
+ },
+
+ not: function Word64_not() {
+ this.high = ~this.high;
+ this.low = ~this.low;
+ },
+
+ add: function Word64_add(word) {
+ var lowAdd = (this.low >>> 0) + (word.low >>> 0);
+ var highAdd = (this.high >>> 0) + (word.high >>> 0);
+ if (lowAdd > 0xFFFFFFFF) {
+ highAdd += 1;
+ }
+ this.low = lowAdd | 0;
+ this.high = highAdd | 0;
+ },
+
+ copyTo: function Word64_copyTo(bytes, offset) {
+ bytes[offset] = (this.high >>> 24) & 0xFF;
+ bytes[offset + 1] = (this.high >> 16) & 0xFF;
+ bytes[offset + 2] = (this.high >> 8) & 0xFF;
+ bytes[offset + 3] = this.high & 0xFF;
+ bytes[offset + 4] = (this.low >>> 24) & 0xFF;
+ bytes[offset + 5] = (this.low >> 16) & 0xFF;
+ bytes[offset + 6] = (this.low >> 8) & 0xFF;
+ bytes[offset + 7] = this.low & 0xFF;
+ },
+
+ assign: function Word64_assign(word) {
+ this.high = word.high;
+ this.low = word.low;
+ }
+ };
+ return Word64;
+})();
+
+var calculateSHA256 = (function calculateSHA256Closure() {
+ function rotr(x, n) {
+ return (x >>> n) | (x << 32 - n);
+ }
+
+ function ch(x, y, z) {
+ return (x & y) ^ (~x & z);
+ }
+
+ function maj(x, y, z) {
+ return (x & y) ^ (x & z) ^ (y & z);
+ }
+
+ function sigma(x) {
+ return rotr(x, 2) ^ rotr(x, 13) ^ rotr(x, 22);
+ }
+
+ function sigmaPrime(x) {
+ return rotr(x, 6) ^ rotr(x, 11) ^ rotr(x, 25);
+ }
+
+ function littleSigma(x) {
+ return rotr(x, 7) ^ rotr(x, 18) ^ x >>> 3;
+ }
+
+ function littleSigmaPrime(x) {
+ return rotr(x, 17) ^ rotr(x, 19) ^ x >>> 10;
+ }
+
+ var k = [0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5,
+ 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
+ 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
+ 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
+ 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc,
+ 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+ 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7,
+ 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
+ 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
+ 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+ 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3,
+ 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+ 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5,
+ 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+ 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
+ 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2];
+
+ function hash(data, offset, length) {
+ // initial hash values
+ var h0 = 0x6a09e667, h1 = 0xbb67ae85, h2 = 0x3c6ef372,
+ h3 = 0xa54ff53a, h4 = 0x510e527f, h5 = 0x9b05688c,
+ h6 = 0x1f83d9ab, h7 = 0x5be0cd19;
+ // pre-processing
+ var paddedLength = Math.ceil((length + 9) / 64) * 64;
+ var padded = new Uint8Array(paddedLength);
+ var i, j, n;
+ for (i = 0; i < length; ++i) {
+ padded[i] = data[offset++];
+ }
+ padded[i++] = 0x80;
+ n = paddedLength - 8;
+ while (i < n) {
+ padded[i++] = 0;
+ }
+ padded[i++] = 0;
+ padded[i++] = 0;
+ padded[i++] = 0;
+ padded[i++] = (length >>> 29) & 0xFF;
+ padded[i++] = (length >> 21) & 0xFF;
+ padded[i++] = (length >> 13) & 0xFF;
+ padded[i++] = (length >> 5) & 0xFF;
+ padded[i++] = (length << 3) & 0xFF;
+ var w = new Uint32Array(64);
+ // for each 512 bit block
+ for (i = 0; i < paddedLength;) {
+ for (j = 0; j < 16; ++j) {
+ w[j] = (padded[i] << 24 | (padded[i + 1] << 16) |
+ (padded[i + 2] << 8) | (padded[i + 3]));
+ i += 4;
+ }
+
+ for (j = 16; j < 64; ++j) {
+ w[j] = littleSigmaPrime(w[j - 2]) + w[j - 7] +
+ littleSigma(w[j - 15]) + w[j - 16] | 0;
+ }
+ var a = h0, b = h1, c = h2, d = h3, e = h4,
+ f = h5, g = h6, h = h7, t1, t2;
+ for (j = 0; j < 64; ++j) {
+ t1 = h + sigmaPrime(e) + ch(e, f, g) + k[j] + w[j];
+ t2 = sigma(a) + maj(a, b, c);
+ h = g;
+ g = f;
+ f = e;
+ e = (d + t1) | 0;
+ d = c;
+ c = b;
+ b = a;
+ a = (t1 + t2) | 0;
+ }
+ h0 = (h0 + a) | 0;
+ h1 = (h1 + b) | 0;
+ h2 = (h2 + c) | 0;
+ h3 = (h3 + d) | 0;
+ h4 = (h4 + e) | 0;
+ h5 = (h5 + f) | 0;
+ h6 = (h6 + g) | 0;
+ h7 = (h7 + h) | 0;
+ }
+ return new Uint8Array([
+ (h0 >> 24) & 0xFF, (h0 >> 16) & 0xFF, (h0 >> 8) & 0xFF, (h0) & 0xFF,
+ (h1 >> 24) & 0xFF, (h1 >> 16) & 0xFF, (h1 >> 8) & 0xFF, (h1) & 0xFF,
+ (h2 >> 24) & 0xFF, (h2 >> 16) & 0xFF, (h2 >> 8) & 0xFF, (h2) & 0xFF,
+ (h3 >> 24) & 0xFF, (h3 >> 16) & 0xFF, (h3 >> 8) & 0xFF, (h3) & 0xFF,
+ (h4 >> 24) & 0xFF, (h4 >> 16) & 0xFF, (h4 >> 8) & 0xFF, (h4) & 0xFF,
+ (h5 >> 24) & 0xFF, (h5 >> 16) & 0xFF, (h5 >> 8) & 0xFF, (h5) & 0xFF,
+ (h6 >> 24) & 0xFF, (h6 >> 16) & 0xFF, (h6 >> 8) & 0xFF, (h6) & 0xFF,
+ (h7 >> 24) & 0xFF, (h7 >> 16) & 0xFF, (h7 >> 8) & 0xFF, (h7) & 0xFF
+ ]);
+ }
+
+ return hash;
+})();
+
+var calculateSHA512 = (function calculateSHA512Closure() {
+ function ch(result, x, y, z, tmp) {
+ result.assign(x);
+ result.and(y);
+ tmp.assign(x);
+ tmp.not();
+ tmp.and(z);
+ result.xor(tmp);
+ }
+
+ function maj(result, x, y, z, tmp) {
+ result.assign(x);
+ result.and(y);
+ tmp.assign(x);
+ tmp.and(z);
+ result.xor(tmp);
+ tmp.assign(y);
+ tmp.and(z);
+ result.xor(tmp);
+ }
+
+ function sigma(result, x, tmp) {
+ result.assign(x);
+ result.rotateRight(28);
+ tmp.assign(x);
+ tmp.rotateRight(34);
+ result.xor(tmp);
+ tmp.assign(x);
+ tmp.rotateRight(39);
+ result.xor(tmp);
+ }
+
+ function sigmaPrime(result, x, tmp) {
+ result.assign(x);
+ result.rotateRight(14);
+ tmp.assign(x);
+ tmp.rotateRight(18);
+ result.xor(tmp);
+ tmp.assign(x);
+ tmp.rotateRight(41);
+ result.xor(tmp);
+ }
+
+ function littleSigma(result, x, tmp) {
+ result.assign(x);
+ result.rotateRight(1);
+ tmp.assign(x);
+ tmp.rotateRight(8);
+ result.xor(tmp);
+ tmp.assign(x);
+ tmp.shiftRight(7);
+ result.xor(tmp);
+ }
+
+ function littleSigmaPrime(result, x, tmp) {
+ result.assign(x);
+ result.rotateRight(19);
+ tmp.assign(x);
+ tmp.rotateRight(61);
+ result.xor(tmp);
+ tmp.assign(x);
+ tmp.shiftRight(6);
+ result.xor(tmp);
+ }
+
+ var k = [
+ new Word64(0x428a2f98, 0xd728ae22), new Word64(0x71374491, 0x23ef65cd),
+ new Word64(0xb5c0fbcf, 0xec4d3b2f), new Word64(0xe9b5dba5, 0x8189dbbc),
+ new Word64(0x3956c25b, 0xf348b538), new Word64(0x59f111f1, 0xb605d019),
+ new Word64(0x923f82a4, 0xaf194f9b), new Word64(0xab1c5ed5, 0xda6d8118),
+ new Word64(0xd807aa98, 0xa3030242), new Word64(0x12835b01, 0x45706fbe),
+ new Word64(0x243185be, 0x4ee4b28c), new Word64(0x550c7dc3, 0xd5ffb4e2),
+ new Word64(0x72be5d74, 0xf27b896f), new Word64(0x80deb1fe, 0x3b1696b1),
+ new Word64(0x9bdc06a7, 0x25c71235), new Word64(0xc19bf174, 0xcf692694),
+ new Word64(0xe49b69c1, 0x9ef14ad2), new Word64(0xefbe4786, 0x384f25e3),
+ new Word64(0x0fc19dc6, 0x8b8cd5b5), new Word64(0x240ca1cc, 0x77ac9c65),
+ new Word64(0x2de92c6f, 0x592b0275), new Word64(0x4a7484aa, 0x6ea6e483),
+ new Word64(0x5cb0a9dc, 0xbd41fbd4), new Word64(0x76f988da, 0x831153b5),
+ new Word64(0x983e5152, 0xee66dfab), new Word64(0xa831c66d, 0x2db43210),
+ new Word64(0xb00327c8, 0x98fb213f), new Word64(0xbf597fc7, 0xbeef0ee4),
+ new Word64(0xc6e00bf3, 0x3da88fc2), new Word64(0xd5a79147, 0x930aa725),
+ new Word64(0x06ca6351, 0xe003826f), new Word64(0x14292967, 0x0a0e6e70),
+ new Word64(0x27b70a85, 0x46d22ffc), new Word64(0x2e1b2138, 0x5c26c926),
+ new Word64(0x4d2c6dfc, 0x5ac42aed), new Word64(0x53380d13, 0x9d95b3df),
+ new Word64(0x650a7354, 0x8baf63de), new Word64(0x766a0abb, 0x3c77b2a8),
+ new Word64(0x81c2c92e, 0x47edaee6), new Word64(0x92722c85, 0x1482353b),
+ new Word64(0xa2bfe8a1, 0x4cf10364), new Word64(0xa81a664b, 0xbc423001),
+ new Word64(0xc24b8b70, 0xd0f89791), new Word64(0xc76c51a3, 0x0654be30),
+ new Word64(0xd192e819, 0xd6ef5218), new Word64(0xd6990624, 0x5565a910),
+ new Word64(0xf40e3585, 0x5771202a), new Word64(0x106aa070, 0x32bbd1b8),
+ new Word64(0x19a4c116, 0xb8d2d0c8), new Word64(0x1e376c08, 0x5141ab53),
+ new Word64(0x2748774c, 0xdf8eeb99), new Word64(0x34b0bcb5, 0xe19b48a8),
+ new Word64(0x391c0cb3, 0xc5c95a63), new Word64(0x4ed8aa4a, 0xe3418acb),
+ new Word64(0x5b9cca4f, 0x7763e373), new Word64(0x682e6ff3, 0xd6b2b8a3),
+ new Word64(0x748f82ee, 0x5defb2fc), new Word64(0x78a5636f, 0x43172f60),
+ new Word64(0x84c87814, 0xa1f0ab72), new Word64(0x8cc70208, 0x1a6439ec),
+ new Word64(0x90befffa, 0x23631e28), new Word64(0xa4506ceb, 0xde82bde9),
+ new Word64(0xbef9a3f7, 0xb2c67915), new Word64(0xc67178f2, 0xe372532b),
+ new Word64(0xca273ece, 0xea26619c), new Word64(0xd186b8c7, 0x21c0c207),
+ new Word64(0xeada7dd6, 0xcde0eb1e), new Word64(0xf57d4f7f, 0xee6ed178),
+ new Word64(0x06f067aa, 0x72176fba), new Word64(0x0a637dc5, 0xa2c898a6),
+ new Word64(0x113f9804, 0xbef90dae), new Word64(0x1b710b35, 0x131c471b),
+ new Word64(0x28db77f5, 0x23047d84), new Word64(0x32caab7b, 0x40c72493),
+ new Word64(0x3c9ebe0a, 0x15c9bebc), new Word64(0x431d67c4, 0x9c100d4c),
+ new Word64(0x4cc5d4be, 0xcb3e42b6), new Word64(0x597f299c, 0xfc657e2a),
+ new Word64(0x5fcb6fab, 0x3ad6faec), new Word64(0x6c44198c, 0x4a475817)];
+
+ function hash(data, offset, length, mode384) {
+ mode384 = !!mode384;
+ // initial hash values
+ var h0, h1, h2, h3, h4, h5, h6, h7;
+ if (!mode384) {
+ h0 = new Word64(0x6a09e667, 0xf3bcc908);
+ h1 = new Word64(0xbb67ae85, 0x84caa73b);
+ h2 = new Word64(0x3c6ef372, 0xfe94f82b);
+ h3 = new Word64(0xa54ff53a, 0x5f1d36f1);
+ h4 = new Word64(0x510e527f, 0xade682d1);
+ h5 = new Word64(0x9b05688c, 0x2b3e6c1f);
+ h6 = new Word64(0x1f83d9ab, 0xfb41bd6b);
+ h7 = new Word64(0x5be0cd19, 0x137e2179);
+ }
+ else {
+ // SHA384 is exactly the same
+ // except with different starting values and a trimmed result
+ h0 = new Word64(0xcbbb9d5d, 0xc1059ed8);
+ h1 = new Word64(0x629a292a, 0x367cd507);
+ h2 = new Word64(0x9159015a, 0x3070dd17);
+ h3 = new Word64(0x152fecd8, 0xf70e5939);
+ h4 = new Word64(0x67332667, 0xffc00b31);
+ h5 = new Word64(0x8eb44a87, 0x68581511);
+ h6 = new Word64(0xdb0c2e0d, 0x64f98fa7);
+ h7 = new Word64(0x47b5481d, 0xbefa4fa4);
+ }
+
+ // pre-processing
+ var paddedLength = Math.ceil((length + 17) / 128) * 128;
+ var padded = new Uint8Array(paddedLength);
+ var i, j, n;
+ for (i = 0; i < length; ++i) {
+ padded[i] = data[offset++];
+ }
+ padded[i++] = 0x80;
+ n = paddedLength - 16;
+ while (i < n) {
+ padded[i++] = 0;
+ }
+ padded[i++] = 0;
+ padded[i++] = 0;
+ padded[i++] = 0;
+ padded[i++] = 0;
+ padded[i++] = 0;
+ padded[i++] = 0;
+ padded[i++] = 0;
+ padded[i++] = 0;
+ padded[i++] = 0;
+ padded[i++] = 0;
+ padded[i++] = 0;
+ padded[i++] = (length >>> 29) & 0xFF;
+ padded[i++] = (length >> 21) & 0xFF;
+ padded[i++] = (length >> 13) & 0xFF;
+ padded[i++] = (length >> 5) & 0xFF;
+ padded[i++] = (length << 3) & 0xFF;
+
+ var w = new Array(80);
+ for (i = 0; i < 80; i++) {
+ w[i] = new Word64(0, 0);
+ }
+ var a = new Word64(0, 0), b = new Word64(0, 0), c = new Word64(0, 0);
+ var d = new Word64(0, 0), e = new Word64(0, 0), f = new Word64(0, 0);
+ var g = new Word64(0, 0), h = new Word64(0, 0);
+ var t1 = new Word64(0, 0), t2 = new Word64(0, 0);
+ var tmp1 = new Word64(0, 0), tmp2 = new Word64(0, 0), tmp3;
+
+ // for each 1024 bit block
+ for (i = 0; i < paddedLength;) {
+ for (j = 0; j < 16; ++j) {
+ w[j].high = (padded[i] << 24) | (padded[i + 1] << 16) |
+ (padded[i + 2] << 8) | (padded[i + 3]);
+ w[j].low = (padded[i + 4]) << 24 | (padded[i + 5]) << 16 |
+ (padded[i + 6]) << 8 | (padded[i + 7]);
+ i += 8;
+ }
+ for (j = 16; j < 80; ++j) {
+ tmp3 = w[j];
+ littleSigmaPrime(tmp3, w[j - 2], tmp2);
+ tmp3.add(w[j - 7]);
+ littleSigma(tmp1, w[j - 15], tmp2);
+ tmp3.add(tmp1);
+ tmp3.add(w[j - 16]);
+ }
+
+ a.assign(h0); b.assign(h1); c.assign(h2); d.assign(h3);
+ e.assign(h4); f.assign(h5); g.assign(h6); h.assign(h7);
+ for (j = 0; j < 80; ++j) {
+ t1.assign(h);
+ sigmaPrime(tmp1, e, tmp2);
+ t1.add(tmp1);
+ ch(tmp1, e, f, g, tmp2);
+ t1.add(tmp1);
+ t1.add(k[j]);
+ t1.add(w[j]);
+
+ sigma(t2, a, tmp2);
+ maj(tmp1, a, b, c, tmp2);
+ t2.add(tmp1);
+
+ tmp3 = h;
+ h = g;
+ g = f;
+ f = e;
+ d.add(t1);
+ e = d;
+ d = c;
+ c = b;
+ b = a;
+ tmp3.assign(t1);
+ tmp3.add(t2);
+ a = tmp3;
+ }
+ h0.add(a);
+ h1.add(b);
+ h2.add(c);
+ h3.add(d);
+ h4.add(e);
+ h5.add(f);
+ h6.add(g);
+ h7.add(h);
+ }
+
+ var result;
+ if (!mode384) {
+ result = new Uint8Array(64);
+ h0.copyTo(result,0);
+ h1.copyTo(result,8);
+ h2.copyTo(result,16);
+ h3.copyTo(result,24);
+ h4.copyTo(result,32);
+ h5.copyTo(result,40);
+ h6.copyTo(result,48);
+ h7.copyTo(result,56);
+ }
+ else {
+ result = new Uint8Array(48);
+ h0.copyTo(result,0);
+ h1.copyTo(result,8);
+ h2.copyTo(result,16);
+ h3.copyTo(result,24);
+ h4.copyTo(result,32);
+ h5.copyTo(result,40);
+ }
+ return result;
+ }
+
+ return hash;
+})();
+var calculateSHA384 = (function calculateSHA384Closure() {
+ function hash(data, offset, length) {
+ return calculateSHA512(data, offset, length, true);
+ }
+
+ return hash;
+})();
+var NullCipher = (function NullCipherClosure() {
+ function NullCipher() {
+ }
+
+ NullCipher.prototype = {
+ decryptBlock: function NullCipher_decryptBlock(data) {
+ return data;
+ }
+ };
+
+ return NullCipher;
+})();
+
+var AES128Cipher = (function AES128CipherClosure() {
+ var rcon = new Uint8Array([
+ 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c,
+ 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a,
+ 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd,
+ 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a,
+ 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,
+ 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6,
+ 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72,
+ 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc,
+ 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10,
+ 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e,
+ 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5,
+ 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94,
+ 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02,
+ 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d,
+ 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d,
+ 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f,
+ 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb,
+ 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c,
+ 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a,
+ 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd,
+ 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a,
+ 0x74, 0xe8, 0xcb, 0x8d]);
+
+ var s = new Uint8Array([
+ 0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b,
+ 0xfe, 0xd7, 0xab, 0x76, 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,
+ 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0, 0xb7, 0xfd, 0x93, 0x26,
+ 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
+ 0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2,
+ 0xeb, 0x27, 0xb2, 0x75, 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0,
+ 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84, 0x53, 0xd1, 0x00, 0xed,
+ 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
+ 0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f,
+ 0x50, 0x3c, 0x9f, 0xa8, 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,
+ 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2, 0xcd, 0x0c, 0x13, 0xec,
+ 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
+ 0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14,
+ 0xde, 0x5e, 0x0b, 0xdb, 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c,
+ 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, 0xe7, 0xc8, 0x37, 0x6d,
+ 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
+ 0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f,
+ 0x4b, 0xbd, 0x8b, 0x8a, 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e,
+ 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e, 0xe1, 0xf8, 0x98, 0x11,
+ 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
+ 0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f,
+ 0xb0, 0x54, 0xbb, 0x16]);
+
+ var inv_s = new Uint8Array([
+ 0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e,
+ 0x81, 0xf3, 0xd7, 0xfb, 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87,
+ 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb, 0x54, 0x7b, 0x94, 0x32,
+ 0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e,
+ 0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49,
+ 0x6d, 0x8b, 0xd1, 0x25, 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16,
+ 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92, 0x6c, 0x70, 0x48, 0x50,
+ 0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84,
+ 0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05,
+ 0xb8, 0xb3, 0x45, 0x06, 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02,
+ 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b, 0x3a, 0x91, 0x11, 0x41,
+ 0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73,
+ 0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8,
+ 0x1c, 0x75, 0xdf, 0x6e, 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89,
+ 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b, 0xfc, 0x56, 0x3e, 0x4b,
+ 0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4,
+ 0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59,
+ 0x27, 0x80, 0xec, 0x5f, 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d,
+ 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef, 0xa0, 0xe0, 0x3b, 0x4d,
+ 0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61,
+ 0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63,
+ 0x55, 0x21, 0x0c, 0x7d]);
+ var mixCol = new Uint8Array(256);
+ for (var i = 0; i < 256; i++) {
+ if (i < 128) {
+ mixCol[i] = i << 1;
+ } else {
+ mixCol[i] = (i << 1) ^ 0x1b;
+ }
+ }
+ var mix = new Uint32Array([
+ 0x00000000, 0x0e090d0b, 0x1c121a16, 0x121b171d, 0x3824342c, 0x362d3927,
+ 0x24362e3a, 0x2a3f2331, 0x70486858, 0x7e416553, 0x6c5a724e, 0x62537f45,
+ 0x486c5c74, 0x4665517f, 0x547e4662, 0x5a774b69, 0xe090d0b0, 0xee99ddbb,
+ 0xfc82caa6, 0xf28bc7ad, 0xd8b4e49c, 0xd6bde997, 0xc4a6fe8a, 0xcaaff381,
+ 0x90d8b8e8, 0x9ed1b5e3, 0x8ccaa2fe, 0x82c3aff5, 0xa8fc8cc4, 0xa6f581cf,
+ 0xb4ee96d2, 0xbae79bd9, 0xdb3bbb7b, 0xd532b670, 0xc729a16d, 0xc920ac66,
+ 0xe31f8f57, 0xed16825c, 0xff0d9541, 0xf104984a, 0xab73d323, 0xa57ade28,
+ 0xb761c935, 0xb968c43e, 0x9357e70f, 0x9d5eea04, 0x8f45fd19, 0x814cf012,
+ 0x3bab6bcb, 0x35a266c0, 0x27b971dd, 0x29b07cd6, 0x038f5fe7, 0x0d8652ec,
+ 0x1f9d45f1, 0x119448fa, 0x4be30393, 0x45ea0e98, 0x57f11985, 0x59f8148e,
+ 0x73c737bf, 0x7dce3ab4, 0x6fd52da9, 0x61dc20a2, 0xad766df6, 0xa37f60fd,
+ 0xb16477e0, 0xbf6d7aeb, 0x955259da, 0x9b5b54d1, 0x894043cc, 0x87494ec7,
+ 0xdd3e05ae, 0xd33708a5, 0xc12c1fb8, 0xcf2512b3, 0xe51a3182, 0xeb133c89,
+ 0xf9082b94, 0xf701269f, 0x4de6bd46, 0x43efb04d, 0x51f4a750, 0x5ffdaa5b,
+ 0x75c2896a, 0x7bcb8461, 0x69d0937c, 0x67d99e77, 0x3daed51e, 0x33a7d815,
+ 0x21bccf08, 0x2fb5c203, 0x058ae132, 0x0b83ec39, 0x1998fb24, 0x1791f62f,
+ 0x764dd68d, 0x7844db86, 0x6a5fcc9b, 0x6456c190, 0x4e69e2a1, 0x4060efaa,
+ 0x527bf8b7, 0x5c72f5bc, 0x0605bed5, 0x080cb3de, 0x1a17a4c3, 0x141ea9c8,
+ 0x3e218af9, 0x302887f2, 0x223390ef, 0x2c3a9de4, 0x96dd063d, 0x98d40b36,
+ 0x8acf1c2b, 0x84c61120, 0xaef93211, 0xa0f03f1a, 0xb2eb2807, 0xbce2250c,
+ 0xe6956e65, 0xe89c636e, 0xfa877473, 0xf48e7978, 0xdeb15a49, 0xd0b85742,
+ 0xc2a3405f, 0xccaa4d54, 0x41ecdaf7, 0x4fe5d7fc, 0x5dfec0e1, 0x53f7cdea,
+ 0x79c8eedb, 0x77c1e3d0, 0x65daf4cd, 0x6bd3f9c6, 0x31a4b2af, 0x3fadbfa4,
+ 0x2db6a8b9, 0x23bfa5b2, 0x09808683, 0x07898b88, 0x15929c95, 0x1b9b919e,
+ 0xa17c0a47, 0xaf75074c, 0xbd6e1051, 0xb3671d5a, 0x99583e6b, 0x97513360,
+ 0x854a247d, 0x8b432976, 0xd134621f, 0xdf3d6f14, 0xcd267809, 0xc32f7502,
+ 0xe9105633, 0xe7195b38, 0xf5024c25, 0xfb0b412e, 0x9ad7618c, 0x94de6c87,
+ 0x86c57b9a, 0x88cc7691, 0xa2f355a0, 0xacfa58ab, 0xbee14fb6, 0xb0e842bd,
+ 0xea9f09d4, 0xe49604df, 0xf68d13c2, 0xf8841ec9, 0xd2bb3df8, 0xdcb230f3,
+ 0xcea927ee, 0xc0a02ae5, 0x7a47b13c, 0x744ebc37, 0x6655ab2a, 0x685ca621,
+ 0x42638510, 0x4c6a881b, 0x5e719f06, 0x5078920d, 0x0a0fd964, 0x0406d46f,
+ 0x161dc372, 0x1814ce79, 0x322bed48, 0x3c22e043, 0x2e39f75e, 0x2030fa55,
+ 0xec9ab701, 0xe293ba0a, 0xf088ad17, 0xfe81a01c, 0xd4be832d, 0xdab78e26,
+ 0xc8ac993b, 0xc6a59430, 0x9cd2df59, 0x92dbd252, 0x80c0c54f, 0x8ec9c844,
+ 0xa4f6eb75, 0xaaffe67e, 0xb8e4f163, 0xb6edfc68, 0x0c0a67b1, 0x02036aba,
+ 0x10187da7, 0x1e1170ac, 0x342e539d, 0x3a275e96, 0x283c498b, 0x26354480,
+ 0x7c420fe9, 0x724b02e2, 0x605015ff, 0x6e5918f4, 0x44663bc5, 0x4a6f36ce,
+ 0x587421d3, 0x567d2cd8, 0x37a10c7a, 0x39a80171, 0x2bb3166c, 0x25ba1b67,
+ 0x0f853856, 0x018c355d, 0x13972240, 0x1d9e2f4b, 0x47e96422, 0x49e06929,
+ 0x5bfb7e34, 0x55f2733f, 0x7fcd500e, 0x71c45d05, 0x63df4a18, 0x6dd64713,
+ 0xd731dcca, 0xd938d1c1, 0xcb23c6dc, 0xc52acbd7, 0xef15e8e6, 0xe11ce5ed,
+ 0xf307f2f0, 0xfd0efffb, 0xa779b492, 0xa970b999, 0xbb6bae84, 0xb562a38f,
+ 0x9f5d80be, 0x91548db5, 0x834f9aa8, 0x8d4697a3]);
+
+ function expandKey128(cipherKey) {
+ var b = 176, result = new Uint8Array(b);
+ result.set(cipherKey);
+ for (var j = 16, i = 1; j < b; ++i) {
+ // RotWord
+ var t1 = result[j - 3], t2 = result[j - 2],
+ t3 = result[j - 1], t4 = result[j - 4];
+ // SubWord
+ t1 = s[t1];
+ t2 = s[t2];
+ t3 = s[t3];
+ t4 = s[t4];
+ // Rcon
+ t1 = t1 ^ rcon[i];
+ for (var n = 0; n < 4; ++n) {
+ result[j] = (t1 ^= result[j - 16]);
+ j++;
+ result[j] = (t2 ^= result[j - 16]);
+ j++;
+ result[j] = (t3 ^= result[j - 16]);
+ j++;
+ result[j] = (t4 ^= result[j - 16]);
+ j++;
+ }
+ }
+ return result;
+ }
+
+ function decrypt128(input, key) {
+ var state = new Uint8Array(16);
+ state.set(input);
+ var i, j, k;
+ var t, u, v;
+ // AddRoundKey
+ for (j = 0, k = 160; j < 16; ++j, ++k) {
+ state[j] ^= key[k];
+ }
+ for (i = 9; i >= 1; --i) {
+ // InvShiftRows
+ t = state[13];
+ state[13] = state[9];
+ state[9] = state[5];
+ state[5] = state[1];
+ state[1] = t;
+ t = state[14];
+ u = state[10];
+ state[14] = state[6];
+ state[10] = state[2];
+ state[6] = t;
+ state[2] = u;
+ t = state[15];
+ u = state[11];
+ v = state[7];
+ state[15] = state[3];
+ state[11] = t;
+ state[7] = u;
+ state[3] = v;
+ // InvSubBytes
+ for (j = 0; j < 16; ++j) {
+ state[j] = inv_s[state[j]];
+ }
+ // AddRoundKey
+ for (j = 0, k = i * 16; j < 16; ++j, ++k) {
+ state[j] ^= key[k];
+ }
+ // InvMixColumns
+ for (j = 0; j < 16; j += 4) {
+ var s0 = mix[state[j]], s1 = mix[state[j + 1]],
+ s2 = mix[state[j + 2]], s3 = mix[state[j + 3]];
+ t = (s0 ^ (s1 >>> 8) ^ (s1 << 24) ^ (s2 >>> 16) ^ (s2 << 16) ^
+ (s3 >>> 24) ^ (s3 << 8));
+ state[j] = (t >>> 24) & 0xFF;
+ state[j + 1] = (t >> 16) & 0xFF;
+ state[j + 2] = (t >> 8) & 0xFF;
+ state[j + 3] = t & 0xFF;
+ }
+ }
+ // InvShiftRows
+ t = state[13];
+ state[13] = state[9];
+ state[9] = state[5];
+ state[5] = state[1];
+ state[1] = t;
+ t = state[14];
+ u = state[10];
+ state[14] = state[6];
+ state[10] = state[2];
+ state[6] = t;
+ state[2] = u;
+ t = state[15];
+ u = state[11];
+ v = state[7];
+ state[15] = state[3];
+ state[11] = t;
+ state[7] = u;
+ state[3] = v;
+ for (j = 0; j < 16; ++j) {
+ // InvSubBytes
+ state[j] = inv_s[state[j]];
+ // AddRoundKey
+ state[j] ^= key[j];
+ }
+ return state;
+ }
+
+ function encrypt128(input, key) {
+ var t, u, v, k;
+ var state = new Uint8Array(16);
+ state.set(input);
+ for (j = 0; j < 16; ++j) {
+ // AddRoundKey
+ state[j] ^= key[j];
+ }
+
+ for (i = 1; i < 10; i++) {
+ //SubBytes
+ for (j = 0; j < 16; ++j) {
+ state[j] = s[state[j]];
+ }
+ //ShiftRows
+ v = state[1];
+ state[1] = state[5];
+ state[5] = state[9];
+ state[9] = state[13];
+ state[13] = v;
+ v = state[2];
+ u = state[6];
+ state[2] = state[10];
+ state[6] = state[14];
+ state[10] = v;
+ state[14] = u;
+ v = state[3];
+ u = state[7];
+ t = state[11];
+ state[3] = state[15];
+ state[7] = v;
+ state[11] = u;
+ state[15] = t;
+ //MixColumns
+ for (var j = 0; j < 16; j += 4) {
+ var s0 = state[j + 0], s1 = state[j + 1];
+ var s2 = state[j + 2], s3 = state[j + 3];
+ t = s0 ^ s1 ^ s2 ^ s3;
+ state[j + 0] ^= t ^ mixCol[s0 ^ s1];
+ state[j + 1] ^= t ^ mixCol[s1 ^ s2];
+ state[j + 2] ^= t ^ mixCol[s2 ^ s3];
+ state[j + 3] ^= t ^ mixCol[s3 ^ s0];
+ }
+ //AddRoundKey
+ for (j = 0, k = i * 16; j < 16; ++j, ++k) {
+ state[j] ^= key[k];
+ }
+ }
+
+ //SubBytes
+ for (j = 0; j < 16; ++j) {
+ state[j] = s[state[j]];
+ }
+ //ShiftRows
+ v = state[1];
+ state[1] = state[5];
+ state[5] = state[9];
+ state[9] = state[13];
+ state[13] = v;
+ v = state[2];
+ u = state[6];
+ state[2] = state[10];
+ state[6] = state[14];
+ state[10] = v;
+ state[14] = u;
+ v = state[3];
+ u = state[7];
+ t = state[11];
+ state[3] = state[15];
+ state[7] = v;
+ state[11] = u;
+ state[15] = t;
+ //AddRoundKey
+ for (j = 0, k = 160; j < 16; ++j, ++k) {
+ state[j] ^= key[k];
+ }
+ return state;
+ }
+
+ function AES128Cipher(key) {
+ this.key = expandKey128(key);
+ this.buffer = new Uint8Array(16);
+ this.bufferPosition = 0;
+ }
+
+ function decryptBlock2(data, finalize) {
+ var i, j, ii, sourceLength = data.length,
+ buffer = this.buffer, bufferLength = this.bufferPosition,
+ result = [], iv = this.iv;
+ for (i = 0; i < sourceLength; ++i) {
+ buffer[bufferLength] = data[i];
+ ++bufferLength;
+ if (bufferLength < 16) {
+ continue;
+ }
+ // buffer is full, decrypting
+ var plain = decrypt128(buffer, this.key);
+ // xor-ing the IV vector to get plain text
+ for (j = 0; j < 16; ++j) {
+ plain[j] ^= iv[j];
+ }
+ iv = buffer;
+ result.push(plain);
+ buffer = new Uint8Array(16);
+ bufferLength = 0;
+ }
+ // saving incomplete buffer
+ this.buffer = buffer;
+ this.bufferLength = bufferLength;
+ this.iv = iv;
+ if (result.length === 0) {
+ return new Uint8Array([]);
+ }
+ // combining plain text blocks into one
+ var outputLength = 16 * result.length;
+ if (finalize) {
+ // undo a padding that is described in RFC 2898
+ var lastBlock = result[result.length - 1];
+ var psLen = lastBlock[15];
+ if (psLen <= 16) {
+ for (i = 15, ii = 16 - psLen; i >= ii; --i) {
+ if (lastBlock[i] !== psLen) {
+ // Invalid padding, assume that the block has no padding.
+ psLen = 0;
+ break;
+ }
+ }
+ outputLength -= psLen;
+ result[result.length - 1] = lastBlock.subarray(0, 16 - psLen);
+ }
+ }
+ var output = new Uint8Array(outputLength);
+ for (i = 0, j = 0, ii = result.length; i < ii; ++i, j += 16) {
+ output.set(result[i], j);
+ }
+ return output;
+ }
+
+ AES128Cipher.prototype = {
+ decryptBlock: function AES128Cipher_decryptBlock(data, finalize) {
+ var i, sourceLength = data.length;
+ var buffer = this.buffer, bufferLength = this.bufferPosition;
+ // waiting for IV values -- they are at the start of the stream
+ for (i = 0; bufferLength < 16 && i < sourceLength; ++i, ++bufferLength) {
+ buffer[bufferLength] = data[i];
+ }
+ if (bufferLength < 16) {
+ // need more data
+ this.bufferLength = bufferLength;
+ return new Uint8Array([]);
+ }
+ this.iv = buffer;
+ this.buffer = new Uint8Array(16);
+ this.bufferLength = 0;
+ // starting decryption
+ this.decryptBlock = decryptBlock2;
+ return this.decryptBlock(data.subarray(16), finalize);
+ },
+ encrypt: function AES128Cipher_encrypt(data, iv) {
+ var i, j, ii, sourceLength = data.length,
+ buffer = this.buffer, bufferLength = this.bufferPosition,
+ result = [];
+ if (!iv) {
+ iv = new Uint8Array(16);
+ }
+ for (i = 0; i < sourceLength; ++i) {
+ buffer[bufferLength] = data[i];
+ ++bufferLength;
+ if (bufferLength < 16) {
+ continue;
+ }
+ for (j = 0; j < 16; ++j) {
+ buffer[j] ^= iv[j];
+ }
+
+ // buffer is full, encrypting
+ var cipher = encrypt128(buffer, this.key);
+ iv = cipher;
+ result.push(cipher);
+ buffer = new Uint8Array(16);
+ bufferLength = 0;
+ }
+ // saving incomplete buffer
+ this.buffer = buffer;
+ this.bufferLength = bufferLength;
+ this.iv = iv;
+ if (result.length === 0) {
+ return new Uint8Array([]);
+ }
+ // combining plain text blocks into one
+ var outputLength = 16 * result.length;
+ var output = new Uint8Array(outputLength);
+ for (i = 0, j = 0, ii = result.length; i < ii; ++i, j += 16) {
+ output.set(result[i], j);
+ }
+ return output;
+ }
+ };
+
+ return AES128Cipher;
+})();
+
+var AES256Cipher = (function AES256CipherClosure() {
+ var rcon = new Uint8Array([
+ 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c,
+ 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a,
+ 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd,
+ 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a,
+ 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,
+ 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6,
+ 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72,
+ 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc,
+ 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10,
+ 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e,
+ 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5,
+ 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94,
+ 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02,
+ 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d,
+ 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d,
+ 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f,
+ 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb,
+ 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c,
+ 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a,
+ 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd,
+ 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a,
+ 0x74, 0xe8, 0xcb, 0x8d]);
+
+ var s = new Uint8Array([
+ 0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b,
+ 0xfe, 0xd7, 0xab, 0x76, 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,
+ 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0, 0xb7, 0xfd, 0x93, 0x26,
+ 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
+ 0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2,
+ 0xeb, 0x27, 0xb2, 0x75, 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0,
+ 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84, 0x53, 0xd1, 0x00, 0xed,
+ 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
+ 0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f,
+ 0x50, 0x3c, 0x9f, 0xa8, 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,
+ 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2, 0xcd, 0x0c, 0x13, 0xec,
+ 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
+ 0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14,
+ 0xde, 0x5e, 0x0b, 0xdb, 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c,
+ 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, 0xe7, 0xc8, 0x37, 0x6d,
+ 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
+ 0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f,
+ 0x4b, 0xbd, 0x8b, 0x8a, 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e,
+ 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e, 0xe1, 0xf8, 0x98, 0x11,
+ 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
+ 0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f,
+ 0xb0, 0x54, 0xbb, 0x16]);
+
+ var inv_s = new Uint8Array([
+ 0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e,
+ 0x81, 0xf3, 0xd7, 0xfb, 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87,
+ 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb, 0x54, 0x7b, 0x94, 0x32,
+ 0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e,
+ 0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49,
+ 0x6d, 0x8b, 0xd1, 0x25, 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16,
+ 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92, 0x6c, 0x70, 0x48, 0x50,
+ 0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84,
+ 0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05,
+ 0xb8, 0xb3, 0x45, 0x06, 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02,
+ 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b, 0x3a, 0x91, 0x11, 0x41,
+ 0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73,
+ 0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8,
+ 0x1c, 0x75, 0xdf, 0x6e, 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89,
+ 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b, 0xfc, 0x56, 0x3e, 0x4b,
+ 0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4,
+ 0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59,
+ 0x27, 0x80, 0xec, 0x5f, 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d,
+ 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef, 0xa0, 0xe0, 0x3b, 0x4d,
+ 0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61,
+ 0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63,
+ 0x55, 0x21, 0x0c, 0x7d]);
+
+ var mixCol = new Uint8Array(256);
+ for (var i = 0; i < 256; i++) {
+ if (i < 128) {
+ mixCol[i] = i << 1;
+ } else {
+ mixCol[i] = (i << 1) ^ 0x1b;
+ }
+ }
+ var mix = new Uint32Array([
+ 0x00000000, 0x0e090d0b, 0x1c121a16, 0x121b171d, 0x3824342c, 0x362d3927,
+ 0x24362e3a, 0x2a3f2331, 0x70486858, 0x7e416553, 0x6c5a724e, 0x62537f45,
+ 0x486c5c74, 0x4665517f, 0x547e4662, 0x5a774b69, 0xe090d0b0, 0xee99ddbb,
+ 0xfc82caa6, 0xf28bc7ad, 0xd8b4e49c, 0xd6bde997, 0xc4a6fe8a, 0xcaaff381,
+ 0x90d8b8e8, 0x9ed1b5e3, 0x8ccaa2fe, 0x82c3aff5, 0xa8fc8cc4, 0xa6f581cf,
+ 0xb4ee96d2, 0xbae79bd9, 0xdb3bbb7b, 0xd532b670, 0xc729a16d, 0xc920ac66,
+ 0xe31f8f57, 0xed16825c, 0xff0d9541, 0xf104984a, 0xab73d323, 0xa57ade28,
+ 0xb761c935, 0xb968c43e, 0x9357e70f, 0x9d5eea04, 0x8f45fd19, 0x814cf012,
+ 0x3bab6bcb, 0x35a266c0, 0x27b971dd, 0x29b07cd6, 0x038f5fe7, 0x0d8652ec,
+ 0x1f9d45f1, 0x119448fa, 0x4be30393, 0x45ea0e98, 0x57f11985, 0x59f8148e,
+ 0x73c737bf, 0x7dce3ab4, 0x6fd52da9, 0x61dc20a2, 0xad766df6, 0xa37f60fd,
+ 0xb16477e0, 0xbf6d7aeb, 0x955259da, 0x9b5b54d1, 0x894043cc, 0x87494ec7,
+ 0xdd3e05ae, 0xd33708a5, 0xc12c1fb8, 0xcf2512b3, 0xe51a3182, 0xeb133c89,
+ 0xf9082b94, 0xf701269f, 0x4de6bd46, 0x43efb04d, 0x51f4a750, 0x5ffdaa5b,
+ 0x75c2896a, 0x7bcb8461, 0x69d0937c, 0x67d99e77, 0x3daed51e, 0x33a7d815,
+ 0x21bccf08, 0x2fb5c203, 0x058ae132, 0x0b83ec39, 0x1998fb24, 0x1791f62f,
+ 0x764dd68d, 0x7844db86, 0x6a5fcc9b, 0x6456c190, 0x4e69e2a1, 0x4060efaa,
+ 0x527bf8b7, 0x5c72f5bc, 0x0605bed5, 0x080cb3de, 0x1a17a4c3, 0x141ea9c8,
+ 0x3e218af9, 0x302887f2, 0x223390ef, 0x2c3a9de4, 0x96dd063d, 0x98d40b36,
+ 0x8acf1c2b, 0x84c61120, 0xaef93211, 0xa0f03f1a, 0xb2eb2807, 0xbce2250c,
+ 0xe6956e65, 0xe89c636e, 0xfa877473, 0xf48e7978, 0xdeb15a49, 0xd0b85742,
+ 0xc2a3405f, 0xccaa4d54, 0x41ecdaf7, 0x4fe5d7fc, 0x5dfec0e1, 0x53f7cdea,
+ 0x79c8eedb, 0x77c1e3d0, 0x65daf4cd, 0x6bd3f9c6, 0x31a4b2af, 0x3fadbfa4,
+ 0x2db6a8b9, 0x23bfa5b2, 0x09808683, 0x07898b88, 0x15929c95, 0x1b9b919e,
+ 0xa17c0a47, 0xaf75074c, 0xbd6e1051, 0xb3671d5a, 0x99583e6b, 0x97513360,
+ 0x854a247d, 0x8b432976, 0xd134621f, 0xdf3d6f14, 0xcd267809, 0xc32f7502,
+ 0xe9105633, 0xe7195b38, 0xf5024c25, 0xfb0b412e, 0x9ad7618c, 0x94de6c87,
+ 0x86c57b9a, 0x88cc7691, 0xa2f355a0, 0xacfa58ab, 0xbee14fb6, 0xb0e842bd,
+ 0xea9f09d4, 0xe49604df, 0xf68d13c2, 0xf8841ec9, 0xd2bb3df8, 0xdcb230f3,
+ 0xcea927ee, 0xc0a02ae5, 0x7a47b13c, 0x744ebc37, 0x6655ab2a, 0x685ca621,
+ 0x42638510, 0x4c6a881b, 0x5e719f06, 0x5078920d, 0x0a0fd964, 0x0406d46f,
+ 0x161dc372, 0x1814ce79, 0x322bed48, 0x3c22e043, 0x2e39f75e, 0x2030fa55,
+ 0xec9ab701, 0xe293ba0a, 0xf088ad17, 0xfe81a01c, 0xd4be832d, 0xdab78e26,
+ 0xc8ac993b, 0xc6a59430, 0x9cd2df59, 0x92dbd252, 0x80c0c54f, 0x8ec9c844,
+ 0xa4f6eb75, 0xaaffe67e, 0xb8e4f163, 0xb6edfc68, 0x0c0a67b1, 0x02036aba,
+ 0x10187da7, 0x1e1170ac, 0x342e539d, 0x3a275e96, 0x283c498b, 0x26354480,
+ 0x7c420fe9, 0x724b02e2, 0x605015ff, 0x6e5918f4, 0x44663bc5, 0x4a6f36ce,
+ 0x587421d3, 0x567d2cd8, 0x37a10c7a, 0x39a80171, 0x2bb3166c, 0x25ba1b67,
+ 0x0f853856, 0x018c355d, 0x13972240, 0x1d9e2f4b, 0x47e96422, 0x49e06929,
+ 0x5bfb7e34, 0x55f2733f, 0x7fcd500e, 0x71c45d05, 0x63df4a18, 0x6dd64713,
+ 0xd731dcca, 0xd938d1c1, 0xcb23c6dc, 0xc52acbd7, 0xef15e8e6, 0xe11ce5ed,
+ 0xf307f2f0, 0xfd0efffb, 0xa779b492, 0xa970b999, 0xbb6bae84, 0xb562a38f,
+ 0x9f5d80be, 0x91548db5, 0x834f9aa8, 0x8d4697a3]);
+
+ function expandKey256(cipherKey) {
+ var b = 240, result = new Uint8Array(b);
+ var r = 1;
+
+ result.set(cipherKey);
+ for (var j = 32, i = 1; j < b; ++i) {
+ if (j % 32 === 16) {
+ t1 = s[t1];
+ t2 = s[t2];
+ t3 = s[t3];
+ t4 = s[t4];
+ } else if (j % 32 === 0) {
+ // RotWord
+ var t1 = result[j - 3], t2 = result[j - 2],
+ t3 = result[j - 1], t4 = result[j - 4];
+ // SubWord
+ t1 = s[t1];
+ t2 = s[t2];
+ t3 = s[t3];
+ t4 = s[t4];
+ // Rcon
+ t1 = t1 ^ r;
+ if ((r <<= 1) >= 256) {
+ r = (r ^ 0x1b) & 0xFF;
+ }
+ }
+
+ for (var n = 0; n < 4; ++n) {
+ result[j] = (t1 ^= result[j - 32]);
+ j++;
+ result[j] = (t2 ^= result[j - 32]);
+ j++;
+ result[j] = (t3 ^= result[j - 32]);
+ j++;
+ result[j] = (t4 ^= result[j - 32]);
+ j++;
+ }
+ }
+ return result;
+ }
+
+ function decrypt256(input, key) {
+ var state = new Uint8Array(16);
+ state.set(input);
+ var i, j, k;
+ var t, u, v;
+ // AddRoundKey
+ for (j = 0, k = 224; j < 16; ++j, ++k) {
+ state[j] ^= key[k];
+ }
+ for (i = 13; i >= 1; --i) {
+ // InvShiftRows
+ t = state[13];
+ state[13] = state[9];
+ state[9] = state[5];
+ state[5] = state[1];
+ state[1] = t;
+ t = state[14];
+ u = state[10];
+ state[14] = state[6];
+ state[10] = state[2];
+ state[6] = t;
+ state[2] = u;
+ t = state[15];
+ u = state[11];
+ v = state[7];
+ state[15] = state[3];
+ state[11] = t;
+ state[7] = u;
+ state[3] = v;
+ // InvSubBytes
+ for (j = 0; j < 16; ++j) {
+ state[j] = inv_s[state[j]];
+ }
+ // AddRoundKey
+ for (j = 0, k = i * 16; j < 16; ++j, ++k) {
+ state[j] ^= key[k];
+ }
+ // InvMixColumns
+ for (j = 0; j < 16; j += 4) {
+ var s0 = mix[state[j]], s1 = mix[state[j + 1]],
+ s2 = mix[state[j + 2]], s3 = mix[state[j + 3]];
+ t = (s0 ^ (s1 >>> 8) ^ (s1 << 24) ^ (s2 >>> 16) ^ (s2 << 16) ^
+ (s3 >>> 24) ^ (s3 << 8));
+ state[j] = (t >>> 24) & 0xFF;
+ state[j + 1] = (t >> 16) & 0xFF;
+ state[j + 2] = (t >> 8) & 0xFF;
+ state[j + 3] = t & 0xFF;
+ }
+ }
+ // InvShiftRows
+ t = state[13];
+ state[13] = state[9];
+ state[9] = state[5];
+ state[5] = state[1];
+ state[1] = t;
+ t = state[14];
+ u = state[10];
+ state[14] = state[6];
+ state[10] = state[2];
+ state[6] = t;
+ state[2] = u;
+ t = state[15];
+ u = state[11];
+ v = state[7];
+ state[15] = state[3];
+ state[11] = t;
+ state[7] = u;
+ state[3] = v;
+ for (j = 0; j < 16; ++j) {
+ // InvSubBytes
+ state[j] = inv_s[state[j]];
+ // AddRoundKey
+ state[j] ^= key[j];
+ }
+ return state;
+ }
+
+ function encrypt256(input, key) {
+ var t, u, v, k;
+ var state = new Uint8Array(16);
+ state.set(input);
+ for (j = 0; j < 16; ++j) {
+ // AddRoundKey
+ state[j] ^= key[j];
+ }
+
+ for (i = 1; i < 14; i++) {
+ //SubBytes
+ for (j = 0; j < 16; ++j) {
+ state[j] = s[state[j]];
+ }
+ //ShiftRows
+ v = state[1];
+ state[1] = state[5];
+ state[5] = state[9];
+ state[9] = state[13];
+ state[13] = v;
+ v = state[2];
+ u = state[6];
+ state[2] = state[10];
+ state[6] = state[14];
+ state[10] = v;
+ state[14] = u;
+ v = state[3];
+ u = state[7];
+ t = state[11];
+ state[3] = state[15];
+ state[7] = v;
+ state[11] = u;
+ state[15] = t;
+ //MixColumns
+ for (var j = 0; j < 16; j += 4) {
+ var s0 = state[j + 0], s1 = state[j + 1];
+ var s2 = state[j + 2], s3 = state[j + 3];
+ t = s0 ^ s1 ^ s2 ^ s3;
+ state[j + 0] ^= t ^ mixCol[s0 ^ s1];
+ state[j + 1] ^= t ^ mixCol[s1 ^ s2];
+ state[j + 2] ^= t ^ mixCol[s2 ^ s3];
+ state[j + 3] ^= t ^ mixCol[s3 ^ s0];
+ }
+ //AddRoundKey
+ for (j = 0, k = i * 16; j < 16; ++j, ++k) {
+ state[j] ^= key[k];
+ }
+ }
+
+ //SubBytes
+ for (j = 0; j < 16; ++j) {
+ state[j] = s[state[j]];
+ }
+ //ShiftRows
+ v = state[1];
+ state[1] = state[5];
+ state[5] = state[9];
+ state[9] = state[13];
+ state[13] = v;
+ v = state[2];
+ u = state[6];
+ state[2] = state[10];
+ state[6] = state[14];
+ state[10] = v;
+ state[14] = u;
+ v = state[3];
+ u = state[7];
+ t = state[11];
+ state[3] = state[15];
+ state[7] = v;
+ state[11] = u;
+ state[15] = t;
+ //AddRoundKey
+ for (j = 0, k = 224; j < 16; ++j, ++k) {
+ state[j] ^= key[k];
+ }
+
+ return state;
+
+ }
+
+ function AES256Cipher(key) {
+ this.key = expandKey256(key);
+ this.buffer = new Uint8Array(16);
+ this.bufferPosition = 0;
+ }
+
+ function decryptBlock2(data, finalize) {
+ var i, j, ii, sourceLength = data.length,
+ buffer = this.buffer, bufferLength = this.bufferPosition,
+ result = [], iv = this.iv;
+
+ for (i = 0; i < sourceLength; ++i) {
+ buffer[bufferLength] = data[i];
+ ++bufferLength;
+ if (bufferLength < 16) {
+ continue;
+ }
+ // buffer is full, decrypting
+ var plain = decrypt256(buffer, this.key);
+ // xor-ing the IV vector to get plain text
+ for (j = 0; j < 16; ++j) {
+ plain[j] ^= iv[j];
+ }
+ iv = buffer;
+ result.push(plain);
+ buffer = new Uint8Array(16);
+ bufferLength = 0;
+ }
+ // saving incomplete buffer
+ this.buffer = buffer;
+ this.bufferLength = bufferLength;
+ this.iv = iv;
+ if (result.length === 0) {
+ return new Uint8Array([]);
+ }
+ // combining plain text blocks into one
+ var outputLength = 16 * result.length;
+ if (finalize) {
+ // undo a padding that is described in RFC 2898
+ var lastBlock = result[result.length - 1];
+ var psLen = lastBlock[15];
+ if (psLen <= 16) {
+ for (i = 15, ii = 16 - psLen; i >= ii; --i) {
+ if (lastBlock[i] !== psLen) {
+ // Invalid padding, assume that the block has no padding.
+ psLen = 0;
+ break;
+ }
+ }
+ outputLength -= psLen;
+ result[result.length - 1] = lastBlock.subarray(0, 16 - psLen);
+ }
+ }
+ var output = new Uint8Array(outputLength);
+ for (i = 0, j = 0, ii = result.length; i < ii; ++i, j += 16) {
+ output.set(result[i], j);
+ }
+ return output;
+
+ }
+
+ AES256Cipher.prototype = {
+ decryptBlock: function AES256Cipher_decryptBlock(data, finalize, iv) {
+ var i, sourceLength = data.length;
+ var buffer = this.buffer, bufferLength = this.bufferPosition;
+ // if not supplied an IV wait for IV values
+ // they are at the start of the stream
+ if (iv) {
+ this.iv = iv;
+ } else {
+ for (i = 0; bufferLength < 16 &&
+ i < sourceLength; ++i, ++bufferLength) {
+ buffer[bufferLength] = data[i];
+ }
+ if (bufferLength < 16) {
+ //need more data
+ this.bufferLength = bufferLength;
+ return new Uint8Array([]);
+ }
+ this.iv = buffer;
+ data = data.subarray(16);
+ }
+ this.buffer = new Uint8Array(16);
+ this.bufferLength = 0;
+ // starting decryption
+ this.decryptBlock = decryptBlock2;
+ return this.decryptBlock(data, finalize);
+ },
+ encrypt: function AES256Cipher_encrypt(data, iv) {
+ var i, j, ii, sourceLength = data.length,
+ buffer = this.buffer, bufferLength = this.bufferPosition,
+ result = [];
+ if (!iv) {
+ iv = new Uint8Array(16);
+ }
+ for (i = 0; i < sourceLength; ++i) {
+ buffer[bufferLength] = data[i];
+ ++bufferLength;
+ if (bufferLength < 16) {
+ continue;
+ }
+ for (j = 0; j < 16; ++j) {
+ buffer[j] ^= iv[j];
+ }
+
+ // buffer is full, encrypting
+ var cipher = encrypt256(buffer, this.key);
+ this.iv = cipher;
+ result.push(cipher);
+ buffer = new Uint8Array(16);
+ bufferLength = 0;
+ }
+ // saving incomplete buffer
+ this.buffer = buffer;
+ this.bufferLength = bufferLength;
+ this.iv = iv;
+ if (result.length === 0) {
+ return new Uint8Array([]);
+ }
+ // combining plain text blocks into one
+ var outputLength = 16 * result.length;
+ var output = new Uint8Array(outputLength);
+ for (i = 0, j = 0, ii = result.length; i < ii; ++i, j += 16) {
+ output.set(result[i], j);
+ }
+ return output;
+ }
+ };
+
+ return AES256Cipher;
+})();
+
+var PDF17 = (function PDF17Closure() {
+
+ function compareByteArrays(array1, array2) {
+ if (array1.length !== array2.length) {
+ return false;
+ }
+ for (var i = 0; i < array1.length; i++) {
+ if (array1[i] !== array2[i]) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ function PDF17() {
+ }
+
+ PDF17.prototype = {
+ checkOwnerPassword: function PDF17_checkOwnerPassword(password,
+ ownerValidationSalt,
+ userBytes,
+ ownerPassword) {
+ var hashData = new Uint8Array(password.length + 56);
+ hashData.set(password, 0);
+ hashData.set(ownerValidationSalt, password.length);
+ hashData.set(userBytes, password.length + ownerValidationSalt.length);
+ var result = calculateSHA256(hashData, 0, hashData.length);
+ return compareByteArrays(result, ownerPassword);
+ },
+ checkUserPassword: function PDF17_checkUserPassword(password,
+ userValidationSalt,
+ userPassword) {
+ var hashData = new Uint8Array(password.length + 8);
+ hashData.set(password, 0);
+ hashData.set(userValidationSalt, password.length);
+ var result = calculateSHA256(hashData, 0, hashData.length);
+ return compareByteArrays(result, userPassword);
+ },
+ getOwnerKey: function PDF17_getOwnerKey(password, ownerKeySalt, userBytes,
+ ownerEncryption) {
+ var hashData = new Uint8Array(password.length + 56);
+ hashData.set(password, 0);
+ hashData.set(ownerKeySalt, password.length);
+ hashData.set(userBytes, password.length + ownerKeySalt.length);
+ var key = calculateSHA256(hashData, 0, hashData.length);
+ var cipher = new AES256Cipher(key);
+ return cipher.decryptBlock(ownerEncryption,
+ false,
+ new Uint8Array(16));
+
+ },
+ getUserKey: function PDF17_getUserKey(password, userKeySalt,
+ userEncryption) {
+ var hashData = new Uint8Array(password.length + 8);
+ hashData.set(password, 0);
+ hashData.set(userKeySalt, password.length);
+ //key is the decryption key for the UE string
+ var key = calculateSHA256(hashData, 0, hashData.length);
+ var cipher = new AES256Cipher(key);
+ return cipher.decryptBlock(userEncryption,
+ false,
+ new Uint8Array(16));
+ }
+ };
+ return PDF17;
+})();
+
+var PDF20 = (function PDF20Closure() {
+
+ function concatArrays(array1, array2) {
+ var t = new Uint8Array(array1.length + array2.length);
+ t.set(array1, 0);
+ t.set(array2, array1.length);
+ return t;
+ }
+
+ function calculatePDF20Hash(password, input, userBytes) {
+ //This refers to Algorithm 2.B as defined in ISO 32000-2
+ var k = calculateSHA256(input, 0, input.length).subarray(0, 32);
+ var e = [0];
+ var i = 0;
+ while (i < 64 || e[e.length - 1] > i - 32) {
+ var arrayLength = password.length + k.length + userBytes.length;
+
+ var k1 = new Uint8Array(arrayLength * 64);
+ var array = concatArrays(password, k);
+ array = concatArrays(array, userBytes);
+ for (var j = 0, pos = 0; j < 64; j++, pos += arrayLength) {
+ k1.set(array, pos);
+ }
+ //AES128 CBC NO PADDING with
+ //first 16 bytes of k as the key and the second 16 as the iv.
+ var cipher = new AES128Cipher(k.subarray(0, 16));
+ e = cipher.encrypt(k1, k.subarray(16, 32));
+ //Now we have to take the first 16 bytes of an unsigned
+ //big endian integer... and compute the remainder
+ //modulo 3.... That is a fairly large number and
+ //JavaScript isn't going to handle that well...
+ //So we're using a trick that allows us to perform
+ //modulo math byte by byte
+ var remainder = 0;
+ for (var z = 0; z < 16; z++) {
+ remainder *= (256 % 3);
+ remainder %= 3;
+ remainder += ((e[z] >>> 0) % 3);
+ remainder %= 3;
+ }
+ if (remainder === 0) {
+ k = calculateSHA256(e, 0, e.length);
+ }
+ else if (remainder === 1) {
+ k = calculateSHA384(e, 0, e.length);
+ }
+ else if (remainder === 2) {
+ k = calculateSHA512(e, 0, e.length);
+ }
+ i++;
+ }
+ return k.subarray(0, 32);
+ }
+
+ function PDF20() {
+ }
+
+ function compareByteArrays(array1, array2) {
+ if (array1.length !== array2.length) {
+ return false;
+ }
+ for (var i = 0; i < array1.length; i++) {
+ if (array1[i] !== array2[i]) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ PDF20.prototype = {
+ hash: function PDF20_hash(password, concatBytes, userBytes) {
+ return calculatePDF20Hash(password, concatBytes, userBytes);
+ },
+ checkOwnerPassword: function PDF20_checkOwnerPassword(password,
+ ownerValidationSalt,
+ userBytes,
+ ownerPassword) {
+ var hashData = new Uint8Array(password.length + 56);
+ hashData.set(password, 0);
+ hashData.set(ownerValidationSalt, password.length);
+ hashData.set(userBytes, password.length + ownerValidationSalt.length);
+ var result = calculatePDF20Hash(password, hashData, userBytes);
+ return compareByteArrays(result, ownerPassword);
+ },
+ checkUserPassword: function PDF20_checkUserPassword(password,
+ userValidationSalt,
+ userPassword) {
+ var hashData = new Uint8Array(password.length + 8);
+ hashData.set(password, 0);
+ hashData.set(userValidationSalt, password.length);
+ var result = calculatePDF20Hash(password, hashData, []);
+ return compareByteArrays(result, userPassword);
+ },
+ getOwnerKey: function PDF20_getOwnerKey(password, ownerKeySalt, userBytes,
+ ownerEncryption) {
+ var hashData = new Uint8Array(password.length + 56);
+ hashData.set(password, 0);
+ hashData.set(ownerKeySalt, password.length);
+ hashData.set(userBytes, password.length + ownerKeySalt.length);
+ var key = calculatePDF20Hash(password, hashData, userBytes);
+ var cipher = new AES256Cipher(key);
+ return cipher.decryptBlock(ownerEncryption,
+ false,
+ new Uint8Array(16));
+
+ },
+ getUserKey: function PDF20_getUserKey(password, userKeySalt,
+ userEncryption) {
+ var hashData = new Uint8Array(password.length + 8);
+ hashData.set(password, 0);
+ hashData.set(userKeySalt, password.length);
+ //key is the decryption key for the UE string
+ var key = calculatePDF20Hash(password, hashData, []);
+ var cipher = new AES256Cipher(key);
+ return cipher.decryptBlock(userEncryption,
+ false,
+ new Uint8Array(16));
+ }
+ };
+ return PDF20;
+})();
+
+var CipherTransform = (function CipherTransformClosure() {
+ function CipherTransform(stringCipherConstructor, streamCipherConstructor) {
+ this.stringCipherConstructor = stringCipherConstructor;
+ this.streamCipherConstructor = streamCipherConstructor;
+ }
+
+ CipherTransform.prototype = {
+ createStream: function CipherTransform_createStream(stream, length) {
+ var cipher = new this.streamCipherConstructor();
+ return new DecryptStream(stream, length,
+ function cipherTransformDecryptStream(data, finalize) {
+ return cipher.decryptBlock(data, finalize);
+ }
+ );
+ },
+ decryptString: function CipherTransform_decryptString(s) {
+ var cipher = new this.stringCipherConstructor();
+ var data = stringToBytes(s);
+ data = cipher.decryptBlock(data, true);
+ return bytesToString(data);
+ }
+ };
+ return CipherTransform;
+})();
+
+var CipherTransformFactory = (function CipherTransformFactoryClosure() {
+ var defaultPasswordBytes = new Uint8Array([
+ 0x28, 0xBF, 0x4E, 0x5E, 0x4E, 0x75, 0x8A, 0x41,
+ 0x64, 0x00, 0x4E, 0x56, 0xFF, 0xFA, 0x01, 0x08,
+ 0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, 0x3E, 0x80,
+ 0x2F, 0x0C, 0xA9, 0xFE, 0x64, 0x53, 0x69, 0x7A]);
+
+ function createEncryptionKey20(revision, password, ownerPassword,
+ ownerValidationSalt, ownerKeySalt, uBytes,
+ userPassword, userValidationSalt, userKeySalt,
+ ownerEncryption, userEncryption, perms) {
+ if (password) {
+ var passwordLength = Math.min(127, password.length);
+ password = password.subarray(0, passwordLength);
+ } else {
+ password = [];
+ }
+ var pdfAlgorithm;
+ if (revision === 6) {
+ pdfAlgorithm = new PDF20();
+ } else {
+ pdfAlgorithm = new PDF17();
+ }
+
+ if (pdfAlgorithm) {
+ if (pdfAlgorithm.checkUserPassword(password, userValidationSalt,
+ userPassword)) {
+ return pdfAlgorithm.getUserKey(password, userKeySalt, userEncryption);
+ } else if (pdfAlgorithm.checkOwnerPassword(password, ownerValidationSalt,
+ uBytes,
+ ownerPassword)) {
+ return pdfAlgorithm.getOwnerKey(password, ownerKeySalt, uBytes,
+ ownerEncryption);
+ }
+ }
+
+ return null;
+ }
+
+ function prepareKeyData(fileId, password, ownerPassword, userPassword,
+ flags, revision, keyLength, encryptMetadata) {
+ var hashDataSize = 40 + ownerPassword.length + fileId.length;
+ var hashData = new Uint8Array(hashDataSize), i = 0, j, n;
+ if (password) {
+ n = Math.min(32, password.length);
+ for (; i < n; ++i) {
+ hashData[i] = password[i];
+ }
+ }
+ j = 0;
+ while (i < 32) {
+ hashData[i++] = defaultPasswordBytes[j++];
+ }
+ // as now the padded password in the hashData[0..i]
+ for (j = 0, n = ownerPassword.length; j < n; ++j) {
+ hashData[i++] = ownerPassword[j];
+ }
+ hashData[i++] = flags & 0xFF;
+ hashData[i++] = (flags >> 8) & 0xFF;
+ hashData[i++] = (flags >> 16) & 0xFF;
+ hashData[i++] = (flags >>> 24) & 0xFF;
+ for (j = 0, n = fileId.length; j < n; ++j) {
+ hashData[i++] = fileId[j];
+ }
+ if (revision >= 4 && !encryptMetadata) {
+ hashData[i++] = 0xFF;
+ hashData[i++] = 0xFF;
+ hashData[i++] = 0xFF;
+ hashData[i++] = 0xFF;
+ }
+ var hash = calculateMD5(hashData, 0, i);
+ var keyLengthInBytes = keyLength >> 3;
+ if (revision >= 3) {
+ for (j = 0; j < 50; ++j) {
+ hash = calculateMD5(hash, 0, keyLengthInBytes);
+ }
+ }
+ var encryptionKey = hash.subarray(0, keyLengthInBytes);
+ var cipher, checkData;
+
+ if (revision >= 3) {
+ for (i = 0; i < 32; ++i) {
+ hashData[i] = defaultPasswordBytes[i];
+ }
+ for (j = 0, n = fileId.length; j < n; ++j) {
+ hashData[i++] = fileId[j];
+ }
+ cipher = new ARCFourCipher(encryptionKey);
+ checkData = cipher.encryptBlock(calculateMD5(hashData, 0, i));
+ n = encryptionKey.length;
+ var derivedKey = new Uint8Array(n), k;
+ for (j = 1; j <= 19; ++j) {
+ for (k = 0; k < n; ++k) {
+ derivedKey[k] = encryptionKey[k] ^ j;
+ }
+ cipher = new ARCFourCipher(derivedKey);
+ checkData = cipher.encryptBlock(checkData);
+ }
+ for (j = 0, n = checkData.length; j < n; ++j) {
+ if (userPassword[j] !== checkData[j]) {
+ return null;
+ }
+ }
+ } else {
+ cipher = new ARCFourCipher(encryptionKey);
+ checkData = cipher.encryptBlock(defaultPasswordBytes);
+ for (j = 0, n = checkData.length; j < n; ++j) {
+ if (userPassword[j] !== checkData[j]) {
+ return null;
+ }
+ }
+ }
+ return encryptionKey;
+ }
+
+ function decodeUserPassword(password, ownerPassword, revision, keyLength) {
+ var hashData = new Uint8Array(32), i = 0, j, n;
+ n = Math.min(32, password.length);
+ for (; i < n; ++i) {
+ hashData[i] = password[i];
+ }
+ j = 0;
+ while (i < 32) {
+ hashData[i++] = defaultPasswordBytes[j++];
+ }
+ var hash = calculateMD5(hashData, 0, i);
+ var keyLengthInBytes = keyLength >> 3;
+ if (revision >= 3) {
+ for (j = 0; j < 50; ++j) {
+ hash = calculateMD5(hash, 0, hash.length);
+ }
+ }
+
+ var cipher, userPassword;
+ if (revision >= 3) {
+ userPassword = ownerPassword;
+ var derivedKey = new Uint8Array(keyLengthInBytes), k;
+ for (j = 19; j >= 0; j--) {
+ for (k = 0; k < keyLengthInBytes; ++k) {
+ derivedKey[k] = hash[k] ^ j;
+ }
+ cipher = new ARCFourCipher(derivedKey);
+ userPassword = cipher.encryptBlock(userPassword);
+ }
+ } else {
+ cipher = new ARCFourCipher(hash.subarray(0, keyLengthInBytes));
+ userPassword = cipher.encryptBlock(ownerPassword);
+ }
+ return userPassword;
+ }
+
+ var identityName = Name.get('Identity');
+
+ function CipherTransformFactory(dict, fileId, password) {
+ var filter = dict.get('Filter');
+ if (!isName(filter) || filter.name !== 'Standard') {
+ error('unknown encryption method');
+ }
+ this.dict = dict;
+ var algorithm = dict.get('V');
+ if (!isInt(algorithm) ||
+ (algorithm !== 1 && algorithm !== 2 && algorithm !== 4 &&
+ algorithm !== 5)) {
+ error('unsupported encryption algorithm');
+ }
+ this.algorithm = algorithm;
+ var keyLength = dict.get('Length') || 40;
+ if (!isInt(keyLength) ||
+ keyLength < 40 || (keyLength % 8) !== 0) {
+ error('invalid key length');
+ }
+
+ // prepare keys
+ var ownerPassword = stringToBytes(dict.get('O')).subarray(0, 32);
+ var userPassword = stringToBytes(dict.get('U')).subarray(0, 32);
+ var flags = dict.get('P');
+ var revision = dict.get('R');
+ // meaningful when V is 4 or 5
+ var encryptMetadata = ((algorithm === 4 || algorithm === 5) &&
+ dict.get('EncryptMetadata') !== false);
+ this.encryptMetadata = encryptMetadata;
+
+ var fileIdBytes = stringToBytes(fileId);
+ var passwordBytes;
+ if (password) {
+ if (revision === 6) {
+ try {
+ password = utf8StringToString(password);
+ } catch (ex) {
+ warn('CipherTransformFactory: ' +
+ 'Unable to convert UTF8 encoded password.');
+ }
+ }
+ passwordBytes = stringToBytes(password);
+ }
+
+ var encryptionKey;
+ if (algorithm !== 5) {
+ encryptionKey = prepareKeyData(fileIdBytes, passwordBytes,
+ ownerPassword, userPassword, flags,
+ revision, keyLength, encryptMetadata);
+ }
+ else {
+ var ownerValidationSalt = stringToBytes(dict.get('O')).subarray(32, 40);
+ var ownerKeySalt = stringToBytes(dict.get('O')).subarray(40, 48);
+ var uBytes = stringToBytes(dict.get('U')).subarray(0, 48);
+ var userValidationSalt = stringToBytes(dict.get('U')).subarray(32, 40);
+ var userKeySalt = stringToBytes(dict.get('U')).subarray(40, 48);
+ var ownerEncryption = stringToBytes(dict.get('OE'));
+ var userEncryption = stringToBytes(dict.get('UE'));
+ var perms = stringToBytes(dict.get('Perms'));
+ encryptionKey =
+ createEncryptionKey20(revision, passwordBytes,
+ ownerPassword, ownerValidationSalt,
+ ownerKeySalt, uBytes,
+ userPassword, userValidationSalt,
+ userKeySalt, ownerEncryption,
+ userEncryption, perms);
+ }
+ if (!encryptionKey && !password) {
+ throw new PasswordException('No password given',
+ PasswordResponses.NEED_PASSWORD);
+ } else if (!encryptionKey && password) {
+ // Attempting use the password as an owner password
+ var decodedPassword = decodeUserPassword(passwordBytes, ownerPassword,
+ revision, keyLength);
+ encryptionKey = prepareKeyData(fileIdBytes, decodedPassword,
+ ownerPassword, userPassword, flags,
+ revision, keyLength, encryptMetadata);
+ }
+
+ if (!encryptionKey) {
+ throw new PasswordException('Incorrect Password',
+ PasswordResponses.INCORRECT_PASSWORD);
+ }
+
+ this.encryptionKey = encryptionKey;
+
+ if (algorithm >= 4) {
+ this.cf = dict.get('CF');
+ this.stmf = dict.get('StmF') || identityName;
+ this.strf = dict.get('StrF') || identityName;
+ this.eff = dict.get('EFF') || this.stmf;
+ }
+ }
+
+ function buildObjectKey(num, gen, encryptionKey, isAes) {
+ var key = new Uint8Array(encryptionKey.length + 9), i, n;
+ for (i = 0, n = encryptionKey.length; i < n; ++i) {
+ key[i] = encryptionKey[i];
+ }
+ key[i++] = num & 0xFF;
+ key[i++] = (num >> 8) & 0xFF;
+ key[i++] = (num >> 16) & 0xFF;
+ key[i++] = gen & 0xFF;
+ key[i++] = (gen >> 8) & 0xFF;
+ if (isAes) {
+ key[i++] = 0x73;
+ key[i++] = 0x41;
+ key[i++] = 0x6C;
+ key[i++] = 0x54;
+ }
+ var hash = calculateMD5(key, 0, i);
+ return hash.subarray(0, Math.min(encryptionKey.length + 5, 16));
+ }
+
+ function buildCipherConstructor(cf, name, num, gen, key) {
+ var cryptFilter = cf.get(name.name);
+ var cfm;
+ if (cryptFilter !== null && cryptFilter !== undefined) {
+ cfm = cryptFilter.get('CFM');
+ }
+ if (!cfm || cfm.name === 'None') {
+ return function cipherTransformFactoryBuildCipherConstructorNone() {
+ return new NullCipher();
+ };
+ }
+ if ('V2' === cfm.name) {
+ return function cipherTransformFactoryBuildCipherConstructorV2() {
+ return new ARCFourCipher(buildObjectKey(num, gen, key, false));
+ };
+ }
+ if ('AESV2' === cfm.name) {
+ return function cipherTransformFactoryBuildCipherConstructorAESV2() {
+ return new AES128Cipher(buildObjectKey(num, gen, key, true));
+ };
+ }
+ if ('AESV3' === cfm.name) {
+ return function cipherTransformFactoryBuildCipherConstructorAESV3() {
+ return new AES256Cipher(key);
+ };
+ }
+ error('Unknown crypto method');
+ }
+
+ CipherTransformFactory.prototype = {
+ createCipherTransform:
+ function CipherTransformFactory_createCipherTransform(num, gen) {
+ if (this.algorithm === 4 || this.algorithm === 5) {
+ return new CipherTransform(
+ buildCipherConstructor(this.cf, this.stmf,
+ num, gen, this.encryptionKey),
+ buildCipherConstructor(this.cf, this.strf,
+ num, gen, this.encryptionKey));
+ }
+ // algorithms 1 and 2
+ var key = buildObjectKey(num, gen, this.encryptionKey, false);
+ var cipherConstructor = function buildCipherCipherConstructor() {
+ return new ARCFourCipher(key);
+ };
+ return new CipherTransform(cipherConstructor, cipherConstructor);
+ }
+ };
+
+ return CipherTransformFactory;
+})();
+
+
+var PatternType = {
+ FUNCTION_BASED: 1,
+ AXIAL: 2,
+ RADIAL: 3,
+ FREE_FORM_MESH: 4,
+ LATTICE_FORM_MESH: 5,
+ COONS_PATCH_MESH: 6,
+ TENSOR_PATCH_MESH: 7
+};
+
+var Pattern = (function PatternClosure() {
+ // Constructor should define this.getPattern
+ function Pattern() {
+ error('should not call Pattern constructor');
+ }
+
+ Pattern.prototype = {
+ // Input: current Canvas context
+ // Output: the appropriate fillStyle or strokeStyle
+ getPattern: function Pattern_getPattern(ctx) {
+ error('Should not call Pattern.getStyle: ' + ctx);
+ }
+ };
+
+ Pattern.parseShading = function Pattern_parseShading(shading, matrix, xref,
+ res) {
+
+ var dict = isStream(shading) ? shading.dict : shading;
+ var type = dict.get('ShadingType');
+
+ try {
+ switch (type) {
+ case PatternType.AXIAL:
+ case PatternType.RADIAL:
+ // Both radial and axial shadings are handled by RadialAxial shading.
+ return new Shadings.RadialAxial(dict, matrix, xref, res);
+ case PatternType.FREE_FORM_MESH:
+ case PatternType.LATTICE_FORM_MESH:
+ case PatternType.COONS_PATCH_MESH:
+ case PatternType.TENSOR_PATCH_MESH:
+ return new Shadings.Mesh(shading, matrix, xref, res);
+ default:
+ throw new Error('Unknown PatternType: ' + type);
+ }
+ } catch (ex) {
+ if (ex instanceof MissingDataException) {
+ throw ex;
+ }
+ UnsupportedManager.notify(UNSUPPORTED_FEATURES.shadingPattern);
+ warn(ex);
+ return new Shadings.Dummy();
+ }
+ };
+ return Pattern;
+})();
+
+var Shadings = {};
+
+// A small number to offset the first/last color stops so we can insert ones to
+// support extend. Number.MIN_VALUE appears to be too small and breaks the
+// extend. 1e-7 works in FF but chrome seems to use an even smaller sized number
+// internally so we have to go bigger.
+Shadings.SMALL_NUMBER = 1e-2;
+
+// Radial and axial shading have very similar implementations
+// If needed, the implementations can be broken into two classes
+Shadings.RadialAxial = (function RadialAxialClosure() {
+ function RadialAxial(dict, matrix, xref, res) {
+ this.matrix = matrix;
+ this.coordsArr = dict.get('Coords');
+ this.shadingType = dict.get('ShadingType');
+ this.type = 'Pattern';
+ var cs = dict.get('ColorSpace', 'CS');
+ cs = ColorSpace.parse(cs, xref, res);
+ this.cs = cs;
+
+ var t0 = 0.0, t1 = 1.0;
+ if (dict.has('Domain')) {
+ var domainArr = dict.get('Domain');
+ t0 = domainArr[0];
+ t1 = domainArr[1];
+ }
+
+ var extendStart = false, extendEnd = false;
+ if (dict.has('Extend')) {
+ var extendArr = dict.get('Extend');
+ extendStart = extendArr[0];
+ extendEnd = extendArr[1];
+ }
+
+ if (this.shadingType === PatternType.RADIAL &&
+ (!extendStart || !extendEnd)) {
+ // Radial gradient only currently works if either circle is fully within
+ // the other circle.
+ var x1 = this.coordsArr[0];
+ var y1 = this.coordsArr[1];
+ var r1 = this.coordsArr[2];
+ var x2 = this.coordsArr[3];
+ var y2 = this.coordsArr[4];
+ var r2 = this.coordsArr[5];
+ var distance = Math.sqrt((x1 - x2) * (x1 - x2) + (y1 - y2) * (y1 - y2));
+ if (r1 <= r2 + distance &&
+ r2 <= r1 + distance) {
+ warn('Unsupported radial gradient.');
+ }
+ }
+
+ this.extendStart = extendStart;
+ this.extendEnd = extendEnd;
+
+ var fnObj = dict.get('Function');
+ var fn = PDFFunction.parseArray(xref, fnObj);
+
+ // 10 samples seems good enough for now, but probably won't work
+ // if there are sharp color changes. Ideally, we would implement
+ // the spec faithfully and add lossless optimizations.
+ var diff = t1 - t0;
+ var step = diff / 10;
+
+ var colorStops = this.colorStops = [];
+
+ // Protect against bad domains so we don't end up in an infinte loop below.
+ if (t0 >= t1 || step <= 0) {
+ // Acrobat doesn't seem to handle these cases so we'll ignore for
+ // now.
+ info('Bad shading domain.');
+ return;
+ }
+
+ var color = new Float32Array(cs.numComps), ratio = new Float32Array(1);
+ var rgbColor;
+ for (var i = t0; i <= t1; i += step) {
+ ratio[0] = i;
+ fn(ratio, 0, color, 0);
+ rgbColor = cs.getRgb(color, 0);
+ var cssColor = Util.makeCssRgb(rgbColor[0], rgbColor[1], rgbColor[2]);
+ colorStops.push([(i - t0) / diff, cssColor]);
+ }
+
+ var background = 'transparent';
+ if (dict.has('Background')) {
+ rgbColor = cs.getRgb(dict.get('Background'), 0);
+ background = Util.makeCssRgb(rgbColor[0], rgbColor[1], rgbColor[2]);
+ }
+
+ if (!extendStart) {
+ // Insert a color stop at the front and offset the first real color stop
+ // so it doesn't conflict with the one we insert.
+ colorStops.unshift([0, background]);
+ colorStops[1][0] += Shadings.SMALL_NUMBER;
+ }
+ if (!extendEnd) {
+ // Same idea as above in extendStart but for the end.
+ colorStops[colorStops.length - 1][0] -= Shadings.SMALL_NUMBER;
+ colorStops.push([1, background]);
+ }
+
+ this.colorStops = colorStops;
+ }
+
+ RadialAxial.prototype = {
+ getIR: function RadialAxial_getIR() {
+ var coordsArr = this.coordsArr;
+ var shadingType = this.shadingType;
+ var type, p0, p1, r0, r1;
+ if (shadingType === PatternType.AXIAL) {
+ p0 = [coordsArr[0], coordsArr[1]];
+ p1 = [coordsArr[2], coordsArr[3]];
+ r0 = null;
+ r1 = null;
+ type = 'axial';
+ } else if (shadingType === PatternType.RADIAL) {
+ p0 = [coordsArr[0], coordsArr[1]];
+ p1 = [coordsArr[3], coordsArr[4]];
+ r0 = coordsArr[2];
+ r1 = coordsArr[5];
+ type = 'radial';
+ } else {
+ error('getPattern type unknown: ' + shadingType);
+ }
+
+ var matrix = this.matrix;
+ if (matrix) {
+ p0 = Util.applyTransform(p0, matrix);
+ p1 = Util.applyTransform(p1, matrix);
+ }
+
+ return ['RadialAxial', type, this.colorStops, p0, p1, r0, r1];
+ }
+ };
+
+ return RadialAxial;
+})();
+
+// All mesh shading. For now, they will be presented as set of the triangles
+// to be drawn on the canvas and rgb color for each vertex.
+Shadings.Mesh = (function MeshClosure() {
+ function MeshStreamReader(stream, context) {
+ this.stream = stream;
+ this.context = context;
+ this.buffer = 0;
+ this.bufferLength = 0;
+
+ var numComps = context.numComps;
+ this.tmpCompsBuf = new Float32Array(numComps);
+ var csNumComps = context.colorSpace;
+ this.tmpCsCompsBuf = context.colorFn ? new Float32Array(csNumComps) :
+ this.tmpCompsBuf;
+ }
+ MeshStreamReader.prototype = {
+ get hasData() {
+ if (this.stream.end) {
+ return this.stream.pos < this.stream.end;
+ }
+ if (this.bufferLength > 0) {
+ return true;
+ }
+ var nextByte = this.stream.getByte();
+ if (nextByte < 0) {
+ return false;
+ }
+ this.buffer = nextByte;
+ this.bufferLength = 8;
+ return true;
+ },
+ readBits: function MeshStreamReader_readBits(n) {
+ var buffer = this.buffer;
+ var bufferLength = this.bufferLength;
+ if (n === 32) {
+ if (bufferLength === 0) {
+ return ((this.stream.getByte() << 24) |
+ (this.stream.getByte() << 16) | (this.stream.getByte() << 8) |
+ this.stream.getByte()) >>> 0;
+ }
+ buffer = (buffer << 24) | (this.stream.getByte() << 16) |
+ (this.stream.getByte() << 8) | this.stream.getByte();
+ var nextByte = this.stream.getByte();
+ this.buffer = nextByte & ((1 << bufferLength) - 1);
+ return ((buffer << (8 - bufferLength)) |
+ ((nextByte & 0xFF) >> bufferLength)) >>> 0;
+ }
+ if (n === 8 && bufferLength === 0) {
+ return this.stream.getByte();
+ }
+ while (bufferLength < n) {
+ buffer = (buffer << 8) | this.stream.getByte();
+ bufferLength += 8;
+ }
+ bufferLength -= n;
+ this.bufferLength = bufferLength;
+ this.buffer = buffer & ((1 << bufferLength) - 1);
+ return buffer >> bufferLength;
+ },
+ align: function MeshStreamReader_align() {
+ this.buffer = 0;
+ this.bufferLength = 0;
+ },
+ readFlag: function MeshStreamReader_readFlag() {
+ return this.readBits(this.context.bitsPerFlag);
+ },
+ readCoordinate: function MeshStreamReader_readCoordinate() {
+ var bitsPerCoordinate = this.context.bitsPerCoordinate;
+ var xi = this.readBits(bitsPerCoordinate);
+ var yi = this.readBits(bitsPerCoordinate);
+ var decode = this.context.decode;
+ var scale = bitsPerCoordinate < 32 ? 1 / ((1 << bitsPerCoordinate) - 1) :
+ 2.3283064365386963e-10; // 2 ^ -32
+ return [
+ xi * scale * (decode[1] - decode[0]) + decode[0],
+ yi * scale * (decode[3] - decode[2]) + decode[2]
+ ];
+ },
+ readComponents: function MeshStreamReader_readComponents() {
+ var numComps = this.context.numComps;
+ var bitsPerComponent = this.context.bitsPerComponent;
+ var scale = bitsPerComponent < 32 ? 1 / ((1 << bitsPerComponent) - 1) :
+ 2.3283064365386963e-10; // 2 ^ -32
+ var decode = this.context.decode;
+ var components = this.tmpCompsBuf;
+ for (var i = 0, j = 4; i < numComps; i++, j += 2) {
+ var ci = this.readBits(bitsPerComponent);
+ components[i] = ci * scale * (decode[j + 1] - decode[j]) + decode[j];
+ }
+ var color = this.tmpCsCompsBuf;
+ if (this.context.colorFn) {
+ this.context.colorFn(components, 0, color, 0);
+ }
+ return this.context.colorSpace.getRgb(color, 0);
+ }
+ };
+
+ function decodeType4Shading(mesh, reader) {
+ var coords = mesh.coords;
+ var colors = mesh.colors;
+ var operators = [];
+ var ps = []; // not maintaining cs since that will match ps
+ var verticesLeft = 0; // assuming we have all data to start a new triangle
+ while (reader.hasData) {
+ var f = reader.readFlag();
+ var coord = reader.readCoordinate();
+ var color = reader.readComponents();
+ if (verticesLeft === 0) { // ignoring flags if we started a triangle
+ assert(0 <= f && f <= 2, 'Unknown type4 flag');
+ switch (f) {
+ case 0:
+ verticesLeft = 3;
+ break;
+ case 1:
+ ps.push(ps[ps.length - 2], ps[ps.length - 1]);
+ verticesLeft = 1;
+ break;
+ case 2:
+ ps.push(ps[ps.length - 3], ps[ps.length - 1]);
+ verticesLeft = 1;
+ break;
+ }
+ operators.push(f);
+ }
+ ps.push(coords.length);
+ coords.push(coord);
+ colors.push(color);
+ verticesLeft--;
+
+ reader.align();
+ }
+
+ var psPacked = new Int32Array(ps);
+
+ mesh.figures.push({
+ type: 'triangles',
+ coords: psPacked,
+ colors: psPacked
+ });
+ }
+
+ function decodeType5Shading(mesh, reader, verticesPerRow) {
+ var coords = mesh.coords;
+ var colors = mesh.colors;
+ var ps = []; // not maintaining cs since that will match ps
+ while (reader.hasData) {
+ var coord = reader.readCoordinate();
+ var color = reader.readComponents();
+ ps.push(coords.length);
+ coords.push(coord);
+ colors.push(color);
+ }
+
+ var psPacked = new Int32Array(ps);
+
+ mesh.figures.push({
+ type: 'lattice',
+ coords: psPacked,
+ colors: psPacked,
+ verticesPerRow: verticesPerRow
+ });
+ }
+
+ var MIN_SPLIT_PATCH_CHUNKS_AMOUNT = 3;
+ var MAX_SPLIT_PATCH_CHUNKS_AMOUNT = 20;
+
+ var TRIANGLE_DENSITY = 20; // count of triangles per entire mesh bounds
+
+ var getB = (function getBClosure() {
+ function buildB(count) {
+ var lut = [];
+ for (var i = 0; i <= count; i++) {
+ var t = i / count, t_ = 1 - t;
+ lut.push(new Float32Array([t_ * t_ * t_, 3 * t * t_ * t_,
+ 3 * t * t * t_, t * t * t]));
+ }
+ return lut;
+ }
+ var cache = [];
+ return function getB(count) {
+ if (!cache[count]) {
+ cache[count] = buildB(count);
+ }
+ return cache[count];
+ };
+ })();
+
+ function buildFigureFromPatch(mesh, index) {
+ var figure = mesh.figures[index];
+ assert(figure.type === 'patch', 'Unexpected patch mesh figure');
+
+ var coords = mesh.coords, colors = mesh.colors;
+ var pi = figure.coords;
+ var ci = figure.colors;
+
+ var figureMinX = Math.min(coords[pi[0]][0], coords[pi[3]][0],
+ coords[pi[12]][0], coords[pi[15]][0]);
+ var figureMinY = Math.min(coords[pi[0]][1], coords[pi[3]][1],
+ coords[pi[12]][1], coords[pi[15]][1]);
+ var figureMaxX = Math.max(coords[pi[0]][0], coords[pi[3]][0],
+ coords[pi[12]][0], coords[pi[15]][0]);
+ var figureMaxY = Math.max(coords[pi[0]][1], coords[pi[3]][1],
+ coords[pi[12]][1], coords[pi[15]][1]);
+ var splitXBy = Math.ceil((figureMaxX - figureMinX) * TRIANGLE_DENSITY /
+ (mesh.bounds[2] - mesh.bounds[0]));
+ splitXBy = Math.max(MIN_SPLIT_PATCH_CHUNKS_AMOUNT,
+ Math.min(MAX_SPLIT_PATCH_CHUNKS_AMOUNT, splitXBy));
+ var splitYBy = Math.ceil((figureMaxY - figureMinY) * TRIANGLE_DENSITY /
+ (mesh.bounds[3] - mesh.bounds[1]));
+ splitYBy = Math.max(MIN_SPLIT_PATCH_CHUNKS_AMOUNT,
+ Math.min(MAX_SPLIT_PATCH_CHUNKS_AMOUNT, splitYBy));
+
+ var verticesPerRow = splitXBy + 1;
+ var figureCoords = new Int32Array((splitYBy + 1) * verticesPerRow);
+ var figureColors = new Int32Array((splitYBy + 1) * verticesPerRow);
+ var k = 0;
+ var cl = new Uint8Array(3), cr = new Uint8Array(3);
+ var c0 = colors[ci[0]], c1 = colors[ci[1]],
+ c2 = colors[ci[2]], c3 = colors[ci[3]];
+ var bRow = getB(splitYBy), bCol = getB(splitXBy);
+ for (var row = 0; row <= splitYBy; row++) {
+ cl[0] = ((c0[0] * (splitYBy - row) + c2[0] * row) / splitYBy) | 0;
+ cl[1] = ((c0[1] * (splitYBy - row) + c2[1] * row) / splitYBy) | 0;
+ cl[2] = ((c0[2] * (splitYBy - row) + c2[2] * row) / splitYBy) | 0;
+
+ cr[0] = ((c1[0] * (splitYBy - row) + c3[0] * row) / splitYBy) | 0;
+ cr[1] = ((c1[1] * (splitYBy - row) + c3[1] * row) / splitYBy) | 0;
+ cr[2] = ((c1[2] * (splitYBy - row) + c3[2] * row) / splitYBy) | 0;
+
+ for (var col = 0; col <= splitXBy; col++, k++) {
+ if ((row === 0 || row === splitYBy) &&
+ (col === 0 || col === splitXBy)) {
+ continue;
+ }
+ var x = 0, y = 0;
+ var q = 0;
+ for (var i = 0; i <= 3; i++) {
+ for (var j = 0; j <= 3; j++, q++) {
+ var m = bRow[row][i] * bCol[col][j];
+ x += coords[pi[q]][0] * m;
+ y += coords[pi[q]][1] * m;
+ }
+ }
+ figureCoords[k] = coords.length;
+ coords.push([x, y]);
+ figureColors[k] = colors.length;
+ var newColor = new Uint8Array(3);
+ newColor[0] = ((cl[0] * (splitXBy - col) + cr[0] * col) / splitXBy) | 0;
+ newColor[1] = ((cl[1] * (splitXBy - col) + cr[1] * col) / splitXBy) | 0;
+ newColor[2] = ((cl[2] * (splitXBy - col) + cr[2] * col) / splitXBy) | 0;
+ colors.push(newColor);
+ }
+ }
+ figureCoords[0] = pi[0];
+ figureColors[0] = ci[0];
+ figureCoords[splitXBy] = pi[3];
+ figureColors[splitXBy] = ci[1];
+ figureCoords[verticesPerRow * splitYBy] = pi[12];
+ figureColors[verticesPerRow * splitYBy] = ci[2];
+ figureCoords[verticesPerRow * splitYBy + splitXBy] = pi[15];
+ figureColors[verticesPerRow * splitYBy + splitXBy] = ci[3];
+
+ mesh.figures[index] = {
+ type: 'lattice',
+ coords: figureCoords,
+ colors: figureColors,
+ verticesPerRow: verticesPerRow
+ };
+ }
+
+ function decodeType6Shading(mesh, reader) {
+ // A special case of Type 7. The p11, p12, p21, p22 automatically filled
+ var coords = mesh.coords;
+ var colors = mesh.colors;
+ var ps = new Int32Array(16); // p00, p10, ..., p30, p01, ..., p33
+ var cs = new Int32Array(4); // c00, c30, c03, c33
+ while (reader.hasData) {
+ var f = reader.readFlag();
+ assert(0 <= f && f <= 3, 'Unknown type6 flag');
+ var i, ii;
+ var pi = coords.length;
+ for (i = 0, ii = (f !== 0 ? 8 : 12); i < ii; i++) {
+ coords.push(reader.readCoordinate());
+ }
+ var ci = colors.length;
+ for (i = 0, ii = (f !== 0 ? 2 : 4); i < ii; i++) {
+ colors.push(reader.readComponents());
+ }
+ var tmp1, tmp2, tmp3, tmp4;
+ switch (f) {
+ case 0:
+ ps[12] = pi + 3; ps[13] = pi + 4; ps[14] = pi + 5; ps[15] = pi + 6;
+ ps[ 8] = pi + 2; /* values for 5, 6, 9, 10 are */ ps[11] = pi + 7;
+ ps[ 4] = pi + 1; /* calculated below */ ps[ 7] = pi + 8;
+ ps[ 0] = pi; ps[ 1] = pi + 11; ps[ 2] = pi + 10; ps[ 3] = pi + 9;
+ cs[2] = ci + 1; cs[3] = ci + 2;
+ cs[0] = ci; cs[1] = ci + 3;
+ break;
+ case 1:
+ tmp1 = ps[12]; tmp2 = ps[13]; tmp3 = ps[14]; tmp4 = ps[15];
+ ps[12] = pi + 5; ps[13] = pi + 4; ps[14] = pi + 3; ps[15] = pi + 2;
+ ps[ 8] = pi + 6; /* values for 5, 6, 9, 10 are */ ps[11] = pi + 1;
+ ps[ 4] = pi + 7; /* calculated below */ ps[ 7] = pi;
+ ps[ 0] = tmp1; ps[ 1] = tmp2; ps[ 2] = tmp3; ps[ 3] = tmp4;
+ tmp1 = cs[2]; tmp2 = cs[3];
+ cs[2] = ci + 1; cs[3] = ci;
+ cs[0] = tmp1; cs[1] = tmp2;
+ break;
+ case 2:
+ ps[12] = ps[15]; ps[13] = pi + 7; ps[14] = pi + 6; ps[15] = pi + 5;
+ ps[ 8] = ps[11]; /* values for 5, 6, 9, 10 are */ ps[11] = pi + 4;
+ ps[ 4] = ps[7]; /* calculated below */ ps[ 7] = pi + 3;
+ ps[ 0] = ps[3]; ps[ 1] = pi; ps[ 2] = pi + 1; ps[ 3] = pi + 2;
+ cs[2] = cs[3]; cs[3] = ci + 1;
+ cs[0] = cs[1]; cs[1] = ci;
+ break;
+ case 3:
+ ps[12] = ps[0]; ps[13] = ps[1]; ps[14] = ps[2]; ps[15] = ps[3];
+ ps[ 8] = pi; /* values for 5, 6, 9, 10 are */ ps[11] = pi + 7;
+ ps[ 4] = pi + 1; /* calculated below */ ps[ 7] = pi + 6;
+ ps[ 0] = pi + 2; ps[ 1] = pi + 3; ps[ 2] = pi + 4; ps[ 3] = pi + 5;
+ cs[2] = cs[0]; cs[3] = cs[1];
+ cs[0] = ci; cs[1] = ci + 1;
+ break;
+ }
+ // set p11, p12, p21, p22
+ ps[5] = coords.length;
+ coords.push([
+ (-4 * coords[ps[0]][0] - coords[ps[15]][0] +
+ 6 * (coords[ps[4]][0] + coords[ps[1]][0]) -
+ 2 * (coords[ps[12]][0] + coords[ps[3]][0]) +
+ 3 * (coords[ps[13]][0] + coords[ps[7]][0])) / 9,
+ (-4 * coords[ps[0]][1] - coords[ps[15]][1] +
+ 6 * (coords[ps[4]][1] + coords[ps[1]][1]) -
+ 2 * (coords[ps[12]][1] + coords[ps[3]][1]) +
+ 3 * (coords[ps[13]][1] + coords[ps[7]][1])) / 9
+ ]);
+ ps[6] = coords.length;
+ coords.push([
+ (-4 * coords[ps[3]][0] - coords[ps[12]][0] +
+ 6 * (coords[ps[2]][0] + coords[ps[7]][0]) -
+ 2 * (coords[ps[0]][0] + coords[ps[15]][0]) +
+ 3 * (coords[ps[4]][0] + coords[ps[14]][0])) / 9,
+ (-4 * coords[ps[3]][1] - coords[ps[12]][1] +
+ 6 * (coords[ps[2]][1] + coords[ps[7]][1]) -
+ 2 * (coords[ps[0]][1] + coords[ps[15]][1]) +
+ 3 * (coords[ps[4]][1] + coords[ps[14]][1])) / 9
+ ]);
+ ps[9] = coords.length;
+ coords.push([
+ (-4 * coords[ps[12]][0] - coords[ps[3]][0] +
+ 6 * (coords[ps[8]][0] + coords[ps[13]][0]) -
+ 2 * (coords[ps[0]][0] + coords[ps[15]][0]) +
+ 3 * (coords[ps[11]][0] + coords[ps[1]][0])) / 9,
+ (-4 * coords[ps[12]][1] - coords[ps[3]][1] +
+ 6 * (coords[ps[8]][1] + coords[ps[13]][1]) -
+ 2 * (coords[ps[0]][1] + coords[ps[15]][1]) +
+ 3 * (coords[ps[11]][1] + coords[ps[1]][1])) / 9
+ ]);
+ ps[10] = coords.length;
+ coords.push([
+ (-4 * coords[ps[15]][0] - coords[ps[0]][0] +
+ 6 * (coords[ps[11]][0] + coords[ps[14]][0]) -
+ 2 * (coords[ps[12]][0] + coords[ps[3]][0]) +
+ 3 * (coords[ps[2]][0] + coords[ps[8]][0])) / 9,
+ (-4 * coords[ps[15]][1] - coords[ps[0]][1] +
+ 6 * (coords[ps[11]][1] + coords[ps[14]][1]) -
+ 2 * (coords[ps[12]][1] + coords[ps[3]][1]) +
+ 3 * (coords[ps[2]][1] + coords[ps[8]][1])) / 9
+ ]);
+ mesh.figures.push({
+ type: 'patch',
+ coords: new Int32Array(ps), // making copies of ps and cs
+ colors: new Int32Array(cs)
+ });
+ }
+ }
+
+ function decodeType7Shading(mesh, reader) {
+ var coords = mesh.coords;
+ var colors = mesh.colors;
+ var ps = new Int32Array(16); // p00, p10, ..., p30, p01, ..., p33
+ var cs = new Int32Array(4); // c00, c30, c03, c33
+ while (reader.hasData) {
+ var f = reader.readFlag();
+ assert(0 <= f && f <= 3, 'Unknown type7 flag');
+ var i, ii;
+ var pi = coords.length;
+ for (i = 0, ii = (f !== 0 ? 12 : 16); i < ii; i++) {
+ coords.push(reader.readCoordinate());
+ }
+ var ci = colors.length;
+ for (i = 0, ii = (f !== 0 ? 2 : 4); i < ii; i++) {
+ colors.push(reader.readComponents());
+ }
+ var tmp1, tmp2, tmp3, tmp4;
+ switch (f) {
+ case 0:
+ ps[12] = pi + 3; ps[13] = pi + 4; ps[14] = pi + 5; ps[15] = pi + 6;
+ ps[ 8] = pi + 2; ps[ 9] = pi + 13; ps[10] = pi + 14; ps[11] = pi + 7;
+ ps[ 4] = pi + 1; ps[ 5] = pi + 12; ps[ 6] = pi + 15; ps[ 7] = pi + 8;
+ ps[ 0] = pi; ps[ 1] = pi + 11; ps[ 2] = pi + 10; ps[ 3] = pi + 9;
+ cs[2] = ci + 1; cs[3] = ci + 2;
+ cs[0] = ci; cs[1] = ci + 3;
+ break;
+ case 1:
+ tmp1 = ps[12]; tmp2 = ps[13]; tmp3 = ps[14]; tmp4 = ps[15];
+ ps[12] = pi + 5; ps[13] = pi + 4; ps[14] = pi + 3; ps[15] = pi + 2;
+ ps[ 8] = pi + 6; ps[ 9] = pi + 11; ps[10] = pi + 10; ps[11] = pi + 1;
+ ps[ 4] = pi + 7; ps[ 5] = pi + 8; ps[ 6] = pi + 9; ps[ 7] = pi;
+ ps[ 0] = tmp1; ps[ 1] = tmp2; ps[ 2] = tmp3; ps[ 3] = tmp4;
+ tmp1 = cs[2]; tmp2 = cs[3];
+ cs[2] = ci + 1; cs[3] = ci;
+ cs[0] = tmp1; cs[1] = tmp2;
+ break;
+ case 2:
+ ps[12] = ps[15]; ps[13] = pi + 7; ps[14] = pi + 6; ps[15] = pi + 5;
+ ps[ 8] = ps[11]; ps[ 9] = pi + 8; ps[10] = pi + 11; ps[11] = pi + 4;
+ ps[ 4] = ps[7]; ps[ 5] = pi + 9; ps[ 6] = pi + 10; ps[ 7] = pi + 3;
+ ps[ 0] = ps[3]; ps[ 1] = pi; ps[ 2] = pi + 1; ps[ 3] = pi + 2;
+ cs[2] = cs[3]; cs[3] = ci + 1;
+ cs[0] = cs[1]; cs[1] = ci;
+ break;
+ case 3:
+ ps[12] = ps[0]; ps[13] = ps[1]; ps[14] = ps[2]; ps[15] = ps[3];
+ ps[ 8] = pi; ps[ 9] = pi + 9; ps[10] = pi + 8; ps[11] = pi + 7;
+ ps[ 4] = pi + 1; ps[ 5] = pi + 10; ps[ 6] = pi + 11; ps[ 7] = pi + 6;
+ ps[ 0] = pi + 2; ps[ 1] = pi + 3; ps[ 2] = pi + 4; ps[ 3] = pi + 5;
+ cs[2] = cs[0]; cs[3] = cs[1];
+ cs[0] = ci; cs[1] = ci + 1;
+ break;
+ }
+ mesh.figures.push({
+ type: 'patch',
+ coords: new Int32Array(ps), // making copies of ps and cs
+ colors: new Int32Array(cs)
+ });
+ }
+ }
+
+ function updateBounds(mesh) {
+ var minX = mesh.coords[0][0], minY = mesh.coords[0][1],
+ maxX = minX, maxY = minY;
+ for (var i = 1, ii = mesh.coords.length; i < ii; i++) {
+ var x = mesh.coords[i][0], y = mesh.coords[i][1];
+ minX = minX > x ? x : minX;
+ minY = minY > y ? y : minY;
+ maxX = maxX < x ? x : maxX;
+ maxY = maxY < y ? y : maxY;
+ }
+ mesh.bounds = [minX, minY, maxX, maxY];
+ }
+
+ function packData(mesh) {
+ var i, ii, j, jj;
+
+ var coords = mesh.coords;
+ var coordsPacked = new Float32Array(coords.length * 2);
+ for (i = 0, j = 0, ii = coords.length; i < ii; i++) {
+ var xy = coords[i];
+ coordsPacked[j++] = xy[0];
+ coordsPacked[j++] = xy[1];
+ }
+ mesh.coords = coordsPacked;
+
+ var colors = mesh.colors;
+ var colorsPacked = new Uint8Array(colors.length * 3);
+ for (i = 0, j = 0, ii = colors.length; i < ii; i++) {
+ var c = colors[i];
+ colorsPacked[j++] = c[0];
+ colorsPacked[j++] = c[1];
+ colorsPacked[j++] = c[2];
+ }
+ mesh.colors = colorsPacked;
+
+ var figures = mesh.figures;
+ for (i = 0, ii = figures.length; i < ii; i++) {
+ var figure = figures[i], ps = figure.coords, cs = figure.colors;
+ for (j = 0, jj = ps.length; j < jj; j++) {
+ ps[j] *= 2;
+ cs[j] *= 3;
+ }
+ }
+ }
+
+ function Mesh(stream, matrix, xref, res) {
+ assert(isStream(stream), 'Mesh data is not a stream');
+ var dict = stream.dict;
+ this.matrix = matrix;
+ this.shadingType = dict.get('ShadingType');
+ this.type = 'Pattern';
+ this.bbox = dict.get('BBox');
+ var cs = dict.get('ColorSpace', 'CS');
+ cs = ColorSpace.parse(cs, xref, res);
+ this.cs = cs;
+ this.background = dict.has('Background') ?
+ cs.getRgb(dict.get('Background'), 0) : null;
+
+ var fnObj = dict.get('Function');
+ var fn = fnObj ? PDFFunction.parseArray(xref, fnObj) : null;
+
+ this.coords = [];
+ this.colors = [];
+ this.figures = [];
+
+ var decodeContext = {
+ bitsPerCoordinate: dict.get('BitsPerCoordinate'),
+ bitsPerComponent: dict.get('BitsPerComponent'),
+ bitsPerFlag: dict.get('BitsPerFlag'),
+ decode: dict.get('Decode'),
+ colorFn: fn,
+ colorSpace: cs,
+ numComps: fn ? 1 : cs.numComps
+ };
+ var reader = new MeshStreamReader(stream, decodeContext);
+
+ var patchMesh = false;
+ switch (this.shadingType) {
+ case PatternType.FREE_FORM_MESH:
+ decodeType4Shading(this, reader);
+ break;
+ case PatternType.LATTICE_FORM_MESH:
+ var verticesPerRow = dict.get('VerticesPerRow') | 0;
+ assert(verticesPerRow >= 2, 'Invalid VerticesPerRow');
+ decodeType5Shading(this, reader, verticesPerRow);
+ break;
+ case PatternType.COONS_PATCH_MESH:
+ decodeType6Shading(this, reader);
+ patchMesh = true;
+ break;
+ case PatternType.TENSOR_PATCH_MESH:
+ decodeType7Shading(this, reader);
+ patchMesh = true;
+ break;
+ default:
+ error('Unsupported mesh type.');
+ break;
+ }
+
+ if (patchMesh) {
+ // dirty bounds calculation for determining, how dense shall be triangles
+ updateBounds(this);
+ for (var i = 0, ii = this.figures.length; i < ii; i++) {
+ buildFigureFromPatch(this, i);
+ }
+ }
+ // calculate bounds
+ updateBounds(this);
+
+ packData(this);
+ }
+
+ Mesh.prototype = {
+ getIR: function Mesh_getIR() {
+ return ['Mesh', this.shadingType, this.coords, this.colors, this.figures,
+ this.bounds, this.matrix, this.bbox, this.background];
+ }
+ };
+
+ return Mesh;
+})();
+
+Shadings.Dummy = (function DummyClosure() {
+ function Dummy() {
+ this.type = 'Pattern';
+ }
+
+ Dummy.prototype = {
+ getIR: function Dummy_getIR() {
+ return ['Dummy'];
+ }
+ };
+ return Dummy;
+})();
+
+function getTilingPatternIR(operatorList, dict, args) {
+ var matrix = dict.get('Matrix');
+ var bbox = dict.get('BBox');
+ var xstep = dict.get('XStep');
+ var ystep = dict.get('YStep');
+ var paintType = dict.get('PaintType');
+ var tilingType = dict.get('TilingType');
+
+ return [
+ 'TilingPattern', args, operatorList, matrix, bbox, xstep, ystep,
+ paintType, tilingType
+ ];
+}
+
+
+var PartialEvaluator = (function PartialEvaluatorClosure() {
+ function PartialEvaluator(pdfManager, xref, handler, pageIndex,
+ uniquePrefix, idCounters, fontCache) {
+ this.pdfManager = pdfManager;
+ this.xref = xref;
+ this.handler = handler;
+ this.pageIndex = pageIndex;
+ this.uniquePrefix = uniquePrefix;
+ this.idCounters = idCounters;
+ this.fontCache = fontCache;
+ }
+
+ // Trying to minimize Date.now() usage and check every 100 time
+ var TIME_SLOT_DURATION_MS = 20;
+ var CHECK_TIME_EVERY = 100;
+ function TimeSlotManager() {
+ this.reset();
+ }
+ TimeSlotManager.prototype = {
+ check: function TimeSlotManager_check() {
+ if (++this.checked < CHECK_TIME_EVERY) {
+ return false;
+ }
+ this.checked = 0;
+ return this.endTime <= Date.now();
+ },
+ reset: function TimeSlotManager_reset() {
+ this.endTime = Date.now() + TIME_SLOT_DURATION_MS;
+ this.checked = 0;
+ }
+ };
+
+ var deferred = Promise.resolve();
+
+ var TILING_PATTERN = 1, SHADING_PATTERN = 2;
+
+ PartialEvaluator.prototype = {
+ hasBlendModes: function PartialEvaluator_hasBlendModes(resources) {
+ if (!isDict(resources)) {
+ return false;
+ }
+
+ var processed = Object.create(null);
+ if (resources.objId) {
+ processed[resources.objId] = true;
+ }
+
+ var nodes = [resources];
+ while (nodes.length) {
+ var key;
+ var node = nodes.shift();
+ // First check the current resources for blend modes.
+ var graphicStates = node.get('ExtGState');
+ if (isDict(graphicStates)) {
+ graphicStates = graphicStates.getAll();
+ for (key in graphicStates) {
+ var graphicState = graphicStates[key];
+ var bm = graphicState['BM'];
+ if (isName(bm) && bm.name !== 'Normal') {
+ return true;
+ }
+ }
+ }
+ // Descend into the XObjects to look for more resources and blend modes.
+ var xObjects = node.get('XObject');
+ if (!isDict(xObjects)) {
+ continue;
+ }
+ xObjects = xObjects.getAll();
+ for (key in xObjects) {
+ var xObject = xObjects[key];
+ if (!isStream(xObject)) {
+ continue;
+ }
+ if (xObject.dict.objId) {
+ if (processed[xObject.dict.objId]) {
+ // stream has objId and is processed already
+ continue;
+ }
+ processed[xObject.dict.objId] = true;
+ }
+ var xResources = xObject.dict.get('Resources');
+ // Checking objId to detect an infinite loop.
+ if (isDict(xResources) &&
+ (!xResources.objId || !processed[xResources.objId])) {
+ nodes.push(xResources);
+ if (xResources.objId) {
+ processed[xResources.objId] = true;
+ }
+ }
+ }
+ }
+ return false;
+ },
+
+ buildFormXObject: function PartialEvaluator_buildFormXObject(resources,
+ xobj, smask,
+ operatorList,
+ initialState) {
+ var matrix = xobj.dict.get('Matrix');
+ var bbox = xobj.dict.get('BBox');
+ var group = xobj.dict.get('Group');
+ if (group) {
+ var groupOptions = {
+ matrix: matrix,
+ bbox: bbox,
+ smask: smask,
+ isolated: false,
+ knockout: false
+ };
+
+ var groupSubtype = group.get('S');
+ var colorSpace;
+ if (isName(groupSubtype) && groupSubtype.name === 'Transparency') {
+ groupOptions.isolated = (group.get('I') || false);
+ groupOptions.knockout = (group.get('K') || false);
+ colorSpace = (group.has('CS') ?
+ ColorSpace.parse(group.get('CS'), this.xref, resources) : null);
+ }
+
+ if (smask && smask.backdrop) {
+ colorSpace = colorSpace || ColorSpace.singletons.rgb;
+ smask.backdrop = colorSpace.getRgb(smask.backdrop, 0);
+ }
+
+ operatorList.addOp(OPS.beginGroup, [groupOptions]);
+ }
+
+ operatorList.addOp(OPS.paintFormXObjectBegin, [matrix, bbox]);
+
+ return this.getOperatorList(xobj,
+ (xobj.dict.get('Resources') || resources), operatorList, initialState).
+ then(function () {
+ operatorList.addOp(OPS.paintFormXObjectEnd, []);
+
+ if (group) {
+ operatorList.addOp(OPS.endGroup, [groupOptions]);
+ }
+ });
+ },
+
+ buildPaintImageXObject:
+ function PartialEvaluator_buildPaintImageXObject(resources, image,
+ inline, operatorList,
+ cacheKey, imageCache) {
+ var self = this;
+ var dict = image.dict;
+ var w = dict.get('Width', 'W');
+ var h = dict.get('Height', 'H');
+
+ if (!(w && isNum(w)) || !(h && isNum(h))) {
+ warn('Image dimensions are missing, or not numbers.');
+ return;
+ }
+ if (PDFJS.maxImageSize !== -1 && w * h > PDFJS.maxImageSize) {
+ warn('Image exceeded maximum allowed size and was removed.');
+ return;
+ }
+
+ var imageMask = (dict.get('ImageMask', 'IM') || false);
+ var imgData, args;
+ if (imageMask) {
+ // This depends on a tmpCanvas being filled with the
+ // current fillStyle, such that processing the pixel
+ // data can't be done here. Instead of creating a
+ // complete PDFImage, only read the information needed
+ // for later.
+
+ var width = dict.get('Width', 'W');
+ var height = dict.get('Height', 'H');
+ var bitStrideLength = (width + 7) >> 3;
+ var imgArray = image.getBytes(bitStrideLength * height);
+ var decode = dict.get('Decode', 'D');
+ var inverseDecode = (!!decode && decode[0] > 0);
+
+ imgData = PDFImage.createMask(imgArray, width, height,
+ image instanceof DecodeStream,
+ inverseDecode);
+ imgData.cached = true;
+ args = [imgData];
+ operatorList.addOp(OPS.paintImageMaskXObject, args);
+ if (cacheKey) {
+ imageCache[cacheKey] = {
+ fn: OPS.paintImageMaskXObject,
+ args: args
+ };
+ }
+ return;
+ }
+
+ var softMask = (dict.get('SMask', 'SM') || false);
+ var mask = (dict.get('Mask') || false);
+
+ var SMALL_IMAGE_DIMENSIONS = 200;
+ // Inlining small images into the queue as RGB data
+ if (inline && !softMask && !mask && !(image instanceof JpegStream) &&
+ (w + h) < SMALL_IMAGE_DIMENSIONS) {
+ var imageObj = new PDFImage(this.xref, resources, image,
+ inline, null, null);
+ // We force the use of RGBA_32BPP images here, because we can't handle
+ // any other kind.
+ imgData = imageObj.createImageData(/* forceRGBA = */ true);
+ operatorList.addOp(OPS.paintInlineImageXObject, [imgData]);
+ return;
+ }
+
+ // If there is no imageMask, create the PDFImage and a lot
+ // of image processing can be done here.
+ var uniquePrefix = (this.uniquePrefix || '');
+ var objId = 'img_' + uniquePrefix + (++this.idCounters.obj);
+ operatorList.addDependency(objId);
+ args = [objId, w, h];
+
+ if (!softMask && !mask && image instanceof JpegStream &&
+ image.isNativelySupported(this.xref, resources)) {
+ // These JPEGs don't need any more processing so we can just send it.
+ operatorList.addOp(OPS.paintJpegXObject, args);
+ this.handler.send('obj',
+ [objId, this.pageIndex, 'JpegStream', image.getIR()]);
+ return;
+ }
+
+ PDFImage.buildImage(self.handler, self.xref, resources, image, inline).
+ then(function(imageObj) {
+ var imgData = imageObj.createImageData(/* forceRGBA = */ false);
+ self.handler.send('obj', [objId, self.pageIndex, 'Image', imgData],
+ [imgData.data.buffer]);
+ }).then(undefined, function (reason) {
+ warn('Unable to decode image: ' + reason);
+ self.handler.send('obj', [objId, self.pageIndex, 'Image', null]);
+ });
+
+ operatorList.addOp(OPS.paintImageXObject, args);
+ if (cacheKey) {
+ imageCache[cacheKey] = {
+ fn: OPS.paintImageXObject,
+ args: args
+ };
+ }
+ },
+
+ handleSMask: function PartialEvaluator_handleSmask(smask, resources,
+ operatorList,
+ stateManager) {
+ var smaskContent = smask.get('G');
+ var smaskOptions = {
+ subtype: smask.get('S').name,
+ backdrop: smask.get('BC')
+ };
+ return this.buildFormXObject(resources, smaskContent, smaskOptions,
+ operatorList, stateManager.state.clone());
+ },
+
+ handleTilingType:
+ function PartialEvaluator_handleTilingType(fn, args, resources,
+ pattern, patternDict,
+ operatorList) {
+ // Create an IR of the pattern code.
+ var tilingOpList = new OperatorList();
+ return this.getOperatorList(pattern,
+ (patternDict.get('Resources') || resources), tilingOpList).
+ then(function () {
+ // Add the dependencies to the parent operator list so they are
+ // resolved before sub operator list is executed synchronously.
+ operatorList.addDependencies(tilingOpList.dependencies);
+ operatorList.addOp(fn, getTilingPatternIR({
+ fnArray: tilingOpList.fnArray,
+ argsArray: tilingOpList.argsArray
+ }, patternDict, args));
+ });
+ },
+
+ handleSetFont:
+ function PartialEvaluator_handleSetFont(resources, fontArgs, fontRef,
+ operatorList, state) {
+ // TODO(mack): Not needed?
+ var fontName;
+ if (fontArgs) {
+ fontArgs = fontArgs.slice();
+ fontName = fontArgs[0].name;
+ }
+
+ var self = this;
+ return this.loadFont(fontName, fontRef, this.xref, resources).then(
+ function (translated) {
+ if (!translated.font.isType3Font) {
+ return translated;
+ }
+ return translated.loadType3Data(self, resources, operatorList).then(
+ function () {
+ return translated;
+ });
+ }).then(function (translated) {
+ state.font = translated.font;
+ translated.send(self.handler);
+ return translated.loadedName;
+ });
+ },
+
+ handleText: function PartialEvaluator_handleText(chars, state) {
+ var font = state.font;
+ var glyphs = font.charsToGlyphs(chars);
+ var isAddToPathSet = !!(state.textRenderingMode &
+ TextRenderingMode.ADD_TO_PATH_FLAG);
+ if (font.data && (isAddToPathSet || PDFJS.disableFontFace)) {
+ var buildPath = function (fontChar) {
+ if (!font.renderer.hasBuiltPath(fontChar)) {
+ var path = font.renderer.getPathJs(fontChar);
+ this.handler.send('commonobj', [
+ font.loadedName + '_path_' + fontChar,
+ 'FontPath',
+ path
+ ]);
+ }
+ }.bind(this);
+
+ for (var i = 0, ii = glyphs.length; i < ii; i++) {
+ var glyph = glyphs[i];
+ if (glyph === null) {
+ continue;
+ }
+ buildPath(glyph.fontChar);
+
+ // If the glyph has an accent we need to build a path for its
+ // fontChar too, otherwise CanvasGraphics_paintChar will fail.
+ var accent = glyph.accent;
+ if (accent && accent.fontChar) {
+ buildPath(accent.fontChar);
+ }
+ }
+ }
+
+ return glyphs;
+ },
+
+ setGState: function PartialEvaluator_setGState(resources, gState,
+ operatorList, xref,
+ stateManager) {
+ // This array holds the converted/processed state data.
+ var gStateObj = [];
+ var gStateMap = gState.map;
+ var self = this;
+ var promise = Promise.resolve();
+ for (var key in gStateMap) {
+ var value = gStateMap[key];
+ switch (key) {
+ case 'Type':
+ break;
+ case 'LW':
+ case 'LC':
+ case 'LJ':
+ case 'ML':
+ case 'D':
+ case 'RI':
+ case 'FL':
+ case 'CA':
+ case 'ca':
+ gStateObj.push([key, value]);
+ break;
+ case 'Font':
+ promise = promise.then(function () {
+ return self.handleSetFont(resources, null, value[0],
+ operatorList, stateManager.state).
+ then(function (loadedName) {
+ operatorList.addDependency(loadedName);
+ gStateObj.push([key, [loadedName, value[1]]]);
+ });
+ });
+ break;
+ case 'BM':
+ gStateObj.push([key, value]);
+ break;
+ case 'SMask':
+ if (isName(value) && value.name === 'None') {
+ gStateObj.push([key, false]);
+ break;
+ }
+ var dict = xref.fetchIfRef(value);
+ if (isDict(dict)) {
+ promise = promise.then(function () {
+ return self.handleSMask(dict, resources, operatorList,
+ stateManager);
+ });
+ gStateObj.push([key, true]);
+ } else {
+ warn('Unsupported SMask type');
+ }
+
+ break;
+ // Only generate info log messages for the following since
+ // they are unlikely to have a big impact on the rendering.
+ case 'OP':
+ case 'op':
+ case 'OPM':
+ case 'BG':
+ case 'BG2':
+ case 'UCR':
+ case 'UCR2':
+ case 'TR':
+ case 'TR2':
+ case 'HT':
+ case 'SM':
+ case 'SA':
+ case 'AIS':
+ case 'TK':
+ // TODO implement these operators.
+ info('graphic state operator ' + key);
+ break;
+ default:
+ info('Unknown graphic state operator ' + key);
+ break;
+ }
+ }
+ return promise.then(function () {
+ if (gStateObj.length >= 0) {
+ operatorList.addOp(OPS.setGState, [gStateObj]);
+ }
+ });
+ },
+
+ loadFont: function PartialEvaluator_loadFont(fontName, font, xref,
+ resources) {
+
+ function errorFont() {
+ return Promise.resolve(new TranslatedFont('g_font_error',
+ new ErrorFont('Font ' + fontName + ' is not available'), font));
+ }
+ var fontRef;
+ if (font) { // Loading by ref.
+ assert(isRef(font));
+ fontRef = font;
+ } else { // Loading by name.
+ var fontRes = resources.get('Font');
+ if (fontRes) {
+ fontRef = fontRes.getRaw(fontName);
+ } else {
+ warn('fontRes not available');
+ return errorFont();
+ }
+ }
+ if (!fontRef) {
+ warn('fontRef not available');
+ return errorFont();
+ }
+
+ if (this.fontCache.has(fontRef)) {
+ return this.fontCache.get(fontRef);
+ }
+
+ font = xref.fetchIfRef(fontRef);
+ if (!isDict(font)) {
+ return errorFont();
+ }
+
+ // We are holding font.translated references just for fontRef that are not
+ // dictionaries (Dict). See explanation below.
+ if (font.translated) {
+ return font.translated;
+ }
+
+ var fontCapability = createPromiseCapability();
+
+ var preEvaluatedFont = this.preEvaluateFont(font, xref);
+ var descriptor = preEvaluatedFont.descriptor;
+ var fontID = fontRef.num + '_' + fontRef.gen;
+ if (isDict(descriptor)) {
+ if (!descriptor.fontAliases) {
+ descriptor.fontAliases = Object.create(null);
+ }
+
+ var fontAliases = descriptor.fontAliases;
+ var hash = preEvaluatedFont.hash;
+ if (fontAliases[hash]) {
+ var aliasFontRef = fontAliases[hash].aliasRef;
+ if (aliasFontRef && this.fontCache.has(aliasFontRef)) {
+ this.fontCache.putAlias(fontRef, aliasFontRef);
+ return this.fontCache.get(fontRef);
+ }
+ }
+
+ if (!fontAliases[hash]) {
+ fontAliases[hash] = {
+ fontID: Font.getFontID()
+ };
+ }
+
+ fontAliases[hash].aliasRef = fontRef;
+ fontID = fontAliases[hash].fontID;
+ }
+
+ // Workaround for bad PDF generators that don't reference fonts
+ // properly, i.e. by not using an object identifier.
+ // Check if the fontRef is a Dict (as opposed to a standard object),
+ // in which case we don't cache the font and instead reference it by
+ // fontName in font.loadedName below.
+ var fontRefIsDict = isDict(fontRef);
+ if (!fontRefIsDict) {
+ this.fontCache.put(fontRef, fontCapability.promise);
+ }
+
+ // Keep track of each font we translated so the caller can
+ // load them asynchronously before calling display on a page.
+ font.loadedName = 'g_font_' + (fontRefIsDict ?
+ fontName.replace(/\W/g, '') : fontID);
+
+ font.translated = fontCapability.promise;
+
+ // TODO move promises into translate font
+ var translatedPromise;
+ try {
+ translatedPromise = Promise.resolve(
+ this.translateFont(preEvaluatedFont, xref));
+ } catch (e) {
+ translatedPromise = Promise.reject(e);
+ }
+
+ translatedPromise.then(function (translatedFont) {
+ if (translatedFont.fontType !== undefined) {
+ var xrefFontStats = xref.stats.fontTypes;
+ xrefFontStats[translatedFont.fontType] = true;
+ }
+
+ fontCapability.resolve(new TranslatedFont(font.loadedName,
+ translatedFont, font));
+ }, function (reason) {
+ // TODO fontCapability.reject?
+ UnsupportedManager.notify(UNSUPPORTED_FEATURES.font);
+
+ try {
+ // error, but it's still nice to have font type reported
+ var descriptor = preEvaluatedFont.descriptor;
+ var fontFile3 = descriptor && descriptor.get('FontFile3');
+ var subtype = fontFile3 && fontFile3.get('Subtype');
+ var fontType = getFontType(preEvaluatedFont.type,
+ subtype && subtype.name);
+ var xrefFontStats = xref.stats.fontTypes;
+ xrefFontStats[fontType] = true;
+ } catch (ex) { }
+
+ fontCapability.resolve(new TranslatedFont(font.loadedName,
+ new ErrorFont(reason instanceof Error ? reason.message : reason),
+ font));
+ });
+ return fontCapability.promise;
+ },
+
+ buildPath: function PartialEvaluator_buildPath(operatorList, fn, args) {
+ var lastIndex = operatorList.length - 1;
+ if (!args) {
+ args = [];
+ }
+ if (lastIndex < 0 ||
+ operatorList.fnArray[lastIndex] !== OPS.constructPath) {
+ operatorList.addOp(OPS.constructPath, [[fn], args]);
+ } else {
+ var opArgs = operatorList.argsArray[lastIndex];
+ opArgs[0].push(fn);
+ Array.prototype.push.apply(opArgs[1], args);
+ }
+ },
+
+ handleColorN: function PartialEvaluator_handleColorN(operatorList, fn, args,
+ cs, patterns, resources, xref) {
+ // compile tiling patterns
+ var patternName = args[args.length - 1];
+ // SCN/scn applies patterns along with normal colors
+ var pattern;
+ if (isName(patternName) &&
+ (pattern = patterns.get(patternName.name))) {
+ var dict = (isStream(pattern) ? pattern.dict : pattern);
+ var typeNum = dict.get('PatternType');
+
+ if (typeNum === TILING_PATTERN) {
+ var color = cs.base ? cs.base.getRgb(args, 0) : null;
+ return this.handleTilingType(fn, color, resources, pattern,
+ dict, operatorList);
+ } else if (typeNum === SHADING_PATTERN) {
+ var shading = dict.get('Shading');
+ var matrix = dict.get('Matrix');
+ pattern = Pattern.parseShading(shading, matrix, xref, resources);
+ operatorList.addOp(fn, pattern.getIR());
+ return Promise.resolve();
+ } else {
+ return Promise.reject('Unknown PatternType: ' + typeNum);
+ }
+ }
+ // TODO shall we fail here?
+ operatorList.addOp(fn, args);
+ return Promise.resolve();
+ },
+
+ getOperatorList: function PartialEvaluator_getOperatorList(stream,
+ resources,
+ operatorList,
+ initialState) {
+
+ var self = this;
+ var xref = this.xref;
+ var imageCache = {};
+
+ assert(operatorList);
+
+ resources = (resources || Dict.empty);
+ var xobjs = (resources.get('XObject') || Dict.empty);
+ var patterns = (resources.get('Pattern') || Dict.empty);
+ var stateManager = new StateManager(initialState || new EvalState());
+ var preprocessor = new EvaluatorPreprocessor(stream, xref, stateManager);
+ var timeSlotManager = new TimeSlotManager();
+
+ return new Promise(function next(resolve, reject) {
+ timeSlotManager.reset();
+ var stop, operation = {}, i, ii, cs;
+ while (!(stop = timeSlotManager.check())) {
+ // The arguments parsed by read() are used beyond this loop, so we
+ // cannot reuse the same array on each iteration. Therefore we pass
+ // in |null| as the initial value (see the comment on
+ // EvaluatorPreprocessor_read() for why).
+ operation.args = null;
+ if (!(preprocessor.read(operation))) {
+ break;
+ }
+ var args = operation.args;
+ var fn = operation.fn;
+
+ switch (fn | 0) {
+ case OPS.paintXObject:
+ if (args[0].code) {
+ break;
+ }
+ // eagerly compile XForm objects
+ var name = args[0].name;
+ if (imageCache[name] !== undefined) {
+ operatorList.addOp(imageCache[name].fn, imageCache[name].args);
+ args = null;
+ continue;
+ }
+
+ var xobj = xobjs.get(name);
+ if (xobj) {
+ assert(isStream(xobj), 'XObject should be a stream');
+
+ var type = xobj.dict.get('Subtype');
+ assert(isName(type),
+ 'XObject should have a Name subtype');
+
+ if (type.name === 'Form') {
+ stateManager.save();
+ return self.buildFormXObject(resources, xobj, null,
+ operatorList,
+ stateManager.state.clone()).
+ then(function () {
+ stateManager.restore();
+ next(resolve, reject);
+ }, reject);
+ } else if (type.name === 'Image') {
+ self.buildPaintImageXObject(resources, xobj, false,
+ operatorList, name, imageCache);
+ args = null;
+ continue;
+ } else if (type.name === 'PS') {
+ // PostScript XObjects are unused when viewing documents.
+ // See section 4.7.1 of Adobe's PDF reference.
+ info('Ignored XObject subtype PS');
+ continue;
+ } else {
+ error('Unhandled XObject subtype ' + type.name);
+ }
+ }
+ break;
+ case OPS.setFont:
+ var fontSize = args[1];
+ // eagerly collect all fonts
+ return self.handleSetFont(resources, args, null,
+ operatorList, stateManager.state).
+ then(function (loadedName) {
+ operatorList.addDependency(loadedName);
+ operatorList.addOp(OPS.setFont, [loadedName, fontSize]);
+ next(resolve, reject);
+ }, reject);
+ case OPS.endInlineImage:
+ var cacheKey = args[0].cacheKey;
+ if (cacheKey) {
+ var cacheEntry = imageCache[cacheKey];
+ if (cacheEntry !== undefined) {
+ operatorList.addOp(cacheEntry.fn, cacheEntry.args);
+ args = null;
+ continue;
+ }
+ }
+ self.buildPaintImageXObject(resources, args[0], true,
+ operatorList, cacheKey, imageCache);
+ args = null;
+ continue;
+ case OPS.showText:
+ args[0] = self.handleText(args[0], stateManager.state);
+ break;
+ case OPS.showSpacedText:
+ var arr = args[0];
+ var combinedGlyphs = [];
+ var arrLength = arr.length;
+ for (i = 0; i < arrLength; ++i) {
+ var arrItem = arr[i];
+ if (isString(arrItem)) {
+ Array.prototype.push.apply(combinedGlyphs,
+ self.handleText(arrItem, stateManager.state));
+ } else if (isNum(arrItem)) {
+ combinedGlyphs.push(arrItem);
+ }
+ }
+ args[0] = combinedGlyphs;
+ fn = OPS.showText;
+ break;
+ case OPS.nextLineShowText:
+ operatorList.addOp(OPS.nextLine);
+ args[0] = self.handleText(args[0], stateManager.state);
+ fn = OPS.showText;
+ break;
+ case OPS.nextLineSetSpacingShowText:
+ operatorList.addOp(OPS.nextLine);
+ operatorList.addOp(OPS.setWordSpacing, [args.shift()]);
+ operatorList.addOp(OPS.setCharSpacing, [args.shift()]);
+ args[0] = self.handleText(args[0], stateManager.state);
+ fn = OPS.showText;
+ break;
+ case OPS.setTextRenderingMode:
+ stateManager.state.textRenderingMode = args[0];
+ break;
+
+ case OPS.setFillColorSpace:
+ stateManager.state.fillColorSpace =
+ ColorSpace.parse(args[0], xref, resources);
+ continue;
+ case OPS.setStrokeColorSpace:
+ stateManager.state.strokeColorSpace =
+ ColorSpace.parse(args[0], xref, resources);
+ continue;
+ case OPS.setFillColor:
+ cs = stateManager.state.fillColorSpace;
+ args = cs.getRgb(args, 0);
+ fn = OPS.setFillRGBColor;
+ break;
+ case OPS.setStrokeColor:
+ cs = stateManager.state.strokeColorSpace;
+ args = cs.getRgb(args, 0);
+ fn = OPS.setStrokeRGBColor;
+ break;
+ case OPS.setFillGray:
+ stateManager.state.fillColorSpace = ColorSpace.singletons.gray;
+ args = ColorSpace.singletons.gray.getRgb(args, 0);
+ fn = OPS.setFillRGBColor;
+ break;
+ case OPS.setStrokeGray:
+ stateManager.state.strokeColorSpace = ColorSpace.singletons.gray;
+ args = ColorSpace.singletons.gray.getRgb(args, 0);
+ fn = OPS.setStrokeRGBColor;
+ break;
+ case OPS.setFillCMYKColor:
+ stateManager.state.fillColorSpace = ColorSpace.singletons.cmyk;
+ args = ColorSpace.singletons.cmyk.getRgb(args, 0);
+ fn = OPS.setFillRGBColor;
+ break;
+ case OPS.setStrokeCMYKColor:
+ stateManager.state.strokeColorSpace = ColorSpace.singletons.cmyk;
+ args = ColorSpace.singletons.cmyk.getRgb(args, 0);
+ fn = OPS.setStrokeRGBColor;
+ break;
+ case OPS.setFillRGBColor:
+ stateManager.state.fillColorSpace = ColorSpace.singletons.rgb;
+ args = ColorSpace.singletons.rgb.getRgb(args, 0);
+ break;
+ case OPS.setStrokeRGBColor:
+ stateManager.state.strokeColorSpace = ColorSpace.singletons.rgb;
+ args = ColorSpace.singletons.rgb.getRgb(args, 0);
+ break;
+ case OPS.setFillColorN:
+ cs = stateManager.state.fillColorSpace;
+ if (cs.name === 'Pattern') {
+ return self.handleColorN(operatorList, OPS.setFillColorN,
+ args, cs, patterns, resources, xref).then(function() {
+ next(resolve, reject);
+ }, reject);
+ }
+ args = cs.getRgb(args, 0);
+ fn = OPS.setFillRGBColor;
+ break;
+ case OPS.setStrokeColorN:
+ cs = stateManager.state.strokeColorSpace;
+ if (cs.name === 'Pattern') {
+ return self.handleColorN(operatorList, OPS.setStrokeColorN,
+ args, cs, patterns, resources, xref).then(function() {
+ next(resolve, reject);
+ }, reject);
+ }
+ args = cs.getRgb(args, 0);
+ fn = OPS.setStrokeRGBColor;
+ break;
+
+ case OPS.shadingFill:
+ var shadingRes = resources.get('Shading');
+ if (!shadingRes) {
+ error('No shading resource found');
+ }
+
+ var shading = shadingRes.get(args[0].name);
+ if (!shading) {
+ error('No shading object found');
+ }
+
+ var shadingFill = Pattern.parseShading(shading, null, xref,
+ resources);
+ var patternIR = shadingFill.getIR();
+ args = [patternIR];
+ fn = OPS.shadingFill;
+ break;
+ case OPS.setGState:
+ var dictName = args[0];
+ var extGState = resources.get('ExtGState');
+
+ if (!isDict(extGState) || !extGState.has(dictName.name)) {
+ break;
+ }
+
+ var gState = extGState.get(dictName.name);
+ return self.setGState(resources, gState, operatorList, xref,
+ stateManager).then(function() {
+ next(resolve, reject);
+ }, reject);
+ case OPS.moveTo:
+ case OPS.lineTo:
+ case OPS.curveTo:
+ case OPS.curveTo2:
+ case OPS.curveTo3:
+ case OPS.closePath:
+ self.buildPath(operatorList, fn, args);
+ continue;
+ case OPS.rectangle:
+ self.buildPath(operatorList, fn, args);
+ continue;
+ }
+ operatorList.addOp(fn, args);
+ }
+ if (stop) {
+ deferred.then(function () {
+ next(resolve, reject);
+ });
+ return;
+ }
+ // Some PDFs don't close all restores inside object/form.
+ // Closing those for them.
+ for (i = 0, ii = preprocessor.savedStatesDepth; i < ii; i++) {
+ operatorList.addOp(OPS.restore, []);
+ }
+ resolve();
+ });
+ },
+
+ getTextContent: function PartialEvaluator_getTextContent(stream, resources,
+ stateManager) {
+
+ stateManager = (stateManager || new StateManager(new TextState()));
+
+ var textContent = {
+ items: [],
+ styles: Object.create(null)
+ };
+ var bidiTexts = textContent.items;
+ var SPACE_FACTOR = 0.3;
+ var MULTI_SPACE_FACTOR = 1.5;
+
+ var self = this;
+ var xref = this.xref;
+
+ resources = (xref.fetchIfRef(resources) || Dict.empty);
+
+ // The xobj is parsed iff it's needed, e.g. if there is a `DO` cmd.
+ var xobjs = null;
+ var xobjsCache = {};
+
+ var preprocessor = new EvaluatorPreprocessor(stream, xref, stateManager);
+
+ var textState;
+
+ function newTextChunk() {
+ var font = textState.font;
+ if (!(font.loadedName in textContent.styles)) {
+ textContent.styles[font.loadedName] = {
+ fontFamily: font.fallbackName,
+ ascent: font.ascent,
+ descent: font.descent,
+ vertical: font.vertical
+ };
+ }
+ return {
+ // |str| is initially an array which we push individual chars to, and
+ // then runBidi() overwrites it with the final string.
+ str: [],
+ dir: null,
+ width: 0,
+ height: 0,
+ transform: null,
+ fontName: font.loadedName
+ };
+ }
+
+ function runBidi(textChunk) {
+ var str = textChunk.str.join('');
+ var bidiResult = PDFJS.bidi(str, -1, textState.font.vertical);
+ textChunk.str = bidiResult.str;
+ textChunk.dir = bidiResult.dir;
+ return textChunk;
+ }
+
+ function handleSetFont(fontName, fontRef) {
+ return self.loadFont(fontName, fontRef, xref, resources).
+ then(function (translated) {
+ textState.font = translated.font;
+ textState.fontMatrix = translated.font.fontMatrix ||
+ FONT_IDENTITY_MATRIX;
+ });
+ }
+
+ function buildTextGeometry(chars, textChunk) {
+ var font = textState.font;
+ textChunk = textChunk || newTextChunk();
+ if (!textChunk.transform) {
+ // 9.4.4 Text Space Details
+ var tsm = [textState.fontSize * textState.textHScale, 0,
+ 0, textState.fontSize,
+ 0, textState.textRise];
+
+ if (font.isType3Font &&
+ textState.fontMatrix !== FONT_IDENTITY_MATRIX &&
+ textState.fontSize === 1) {
+ var glyphHeight = font.bbox[3] - font.bbox[1];
+ if (glyphHeight > 0) {
+ glyphHeight = glyphHeight * textState.fontMatrix[3];
+ tsm[3] *= glyphHeight;
+ }
+ }
+
+ var trm = textChunk.transform = Util.transform(textState.ctm,
+ Util.transform(textState.textMatrix, tsm));
+ if (!font.vertical) {
+ textChunk.height = Math.sqrt(trm[2] * trm[2] + trm[3] * trm[3]);
+ } else {
+ textChunk.width = Math.sqrt(trm[0] * trm[0] + trm[1] * trm[1]);
+ }
+ }
+ var width = 0;
+ var height = 0;
+ var glyphs = font.charsToGlyphs(chars);
+ var defaultVMetrics = font.defaultVMetrics;
+ for (var i = 0; i < glyphs.length; i++) {
+ var glyph = glyphs[i];
+ if (!glyph) { // Previous glyph was a space.
+ width += textState.wordSpacing * textState.textHScale;
+ continue;
+ }
+ var vMetricX = null;
+ var vMetricY = null;
+ var glyphWidth = null;
+ if (font.vertical) {
+ if (glyph.vmetric) {
+ glyphWidth = glyph.vmetric[0];
+ vMetricX = glyph.vmetric[1];
+ vMetricY = glyph.vmetric[2];
+ } else {
+ glyphWidth = glyph.width;
+ vMetricX = glyph.width * 0.5;
+ vMetricY = defaultVMetrics[2];
+ }
+ } else {
+ glyphWidth = glyph.width;
+ }
+
+ var glyphUnicode = glyph.unicode;
+ if (NormalizedUnicodes[glyphUnicode] !== undefined) {
+ glyphUnicode = NormalizedUnicodes[glyphUnicode];
+ }
+ glyphUnicode = reverseIfRtl(glyphUnicode);
+
+ // The following will calculate the x and y of the individual glyphs.
+ // if (font.vertical) {
+ // tsm[4] -= vMetricX * Math.abs(textState.fontSize) *
+ // textState.fontMatrix[0];
+ // tsm[5] -= vMetricY * textState.fontSize *
+ // textState.fontMatrix[0];
+ // }
+ // var trm = Util.transform(textState.textMatrix, tsm);
+ // var pt = Util.applyTransform([trm[4], trm[5]], textState.ctm);
+ // var x = pt[0];
+ // var y = pt[1];
+
+ var charSpacing = 0;
+ if (textChunk.str.length > 0) {
+ // Apply char spacing only when there are chars.
+ // As a result there is only spacing between glyphs.
+ charSpacing = textState.charSpacing;
+ }
+
+ var tx = 0;
+ var ty = 0;
+ if (!font.vertical) {
+ var w0 = glyphWidth * textState.fontMatrix[0];
+ tx = (w0 * textState.fontSize + charSpacing) *
+ textState.textHScale;
+ width += tx;
+ } else {
+ var w1 = glyphWidth * textState.fontMatrix[0];
+ ty = w1 * textState.fontSize + charSpacing;
+ height += ty;
+ }
+ textState.translateTextMatrix(tx, ty);
+
+ textChunk.str.push(glyphUnicode);
+ }
+
+ var a = textState.textLineMatrix[0];
+ var b = textState.textLineMatrix[1];
+ var scaleLineX = Math.sqrt(a * a + b * b);
+ a = textState.ctm[0];
+ b = textState.ctm[1];
+ var scaleCtmX = Math.sqrt(a * a + b * b);
+ if (!font.vertical) {
+ textChunk.width += width * scaleCtmX * scaleLineX;
+ } else {
+ textChunk.height += Math.abs(height * scaleCtmX * scaleLineX);
+ }
+ return textChunk;
+ }
+
+ var timeSlotManager = new TimeSlotManager();
+
+ return new Promise(function next(resolve, reject) {
+ timeSlotManager.reset();
+ var stop, operation = {}, args = [];
+ while (!(stop = timeSlotManager.check())) {
+ // The arguments parsed by read() are not used beyond this loop, so
+ // we can reuse the same array on every iteration, thus avoiding
+ // unnecessary allocations.
+ args.length = 0;
+ operation.args = args;
+ if (!(preprocessor.read(operation))) {
+ break;
+ }
+ textState = stateManager.state;
+ var fn = operation.fn;
+ args = operation.args;
+
+ switch (fn | 0) {
+ case OPS.setFont:
+ textState.fontSize = args[1];
+ return handleSetFont(args[0].name).then(function() {
+ next(resolve, reject);
+ }, reject);
+ case OPS.setTextRise:
+ textState.textRise = args[0];
+ break;
+ case OPS.setHScale:
+ textState.textHScale = args[0] / 100;
+ break;
+ case OPS.setLeading:
+ textState.leading = args[0];
+ break;
+ case OPS.moveText:
+ textState.translateTextLineMatrix(args[0], args[1]);
+ textState.textMatrix = textState.textLineMatrix.slice();
+ break;
+ case OPS.setLeadingMoveText:
+ textState.leading = -args[1];
+ textState.translateTextLineMatrix(args[0], args[1]);
+ textState.textMatrix = textState.textLineMatrix.slice();
+ break;
+ case OPS.nextLine:
+ textState.carriageReturn();
+ break;
+ case OPS.setTextMatrix:
+ textState.setTextMatrix(args[0], args[1], args[2], args[3],
+ args[4], args[5]);
+ textState.setTextLineMatrix(args[0], args[1], args[2], args[3],
+ args[4], args[5]);
+ break;
+ case OPS.setCharSpacing:
+ textState.charSpacing = args[0];
+ break;
+ case OPS.setWordSpacing:
+ textState.wordSpacing = args[0];
+ break;
+ case OPS.beginText:
+ textState.textMatrix = IDENTITY_MATRIX.slice();
+ textState.textLineMatrix = IDENTITY_MATRIX.slice();
+ break;
+ case OPS.showSpacedText:
+ var items = args[0];
+ var textChunk = newTextChunk();
+ var offset;
+ for (var j = 0, jj = items.length; j < jj; j++) {
+ if (typeof items[j] === 'string') {
+ buildTextGeometry(items[j], textChunk);
+ } else {
+ var val = items[j] / 1000;
+ if (!textState.font.vertical) {
+ offset = -val * textState.fontSize * textState.textHScale *
+ textState.textMatrix[0];
+ textState.translateTextMatrix(offset, 0);
+ textChunk.width += offset;
+ } else {
+ offset = -val * textState.fontSize *
+ textState.textMatrix[3];
+ textState.translateTextMatrix(0, offset);
+ textChunk.height += offset;
+ }
+ if (items[j] < 0 && textState.font.spaceWidth > 0) {
+ var fakeSpaces = -items[j] / textState.font.spaceWidth;
+ if (fakeSpaces > MULTI_SPACE_FACTOR) {
+ fakeSpaces = Math.round(fakeSpaces);
+ while (fakeSpaces--) {
+ textChunk.str.push(' ');
+ }
+ } else if (fakeSpaces > SPACE_FACTOR) {
+ textChunk.str.push(' ');
+ }
+ }
+ }
+ }
+ bidiTexts.push(runBidi(textChunk));
+ break;
+ case OPS.showText:
+ bidiTexts.push(runBidi(buildTextGeometry(args[0])));
+ break;
+ case OPS.nextLineShowText:
+ textState.carriageReturn();
+ bidiTexts.push(runBidi(buildTextGeometry(args[0])));
+ break;
+ case OPS.nextLineSetSpacingShowText:
+ textState.wordSpacing = args[0];
+ textState.charSpacing = args[1];
+ textState.carriageReturn();
+ bidiTexts.push(runBidi(buildTextGeometry(args[2])));
+ break;
+ case OPS.paintXObject:
+ if (args[0].code) {
+ break;
+ }
+
+ if (!xobjs) {
+ xobjs = (resources.get('XObject') || Dict.empty);
+ }
+
+ var name = args[0].name;
+ if (xobjsCache.key === name) {
+ if (xobjsCache.texts) {
+ Util.appendToArray(bidiTexts, xobjsCache.texts.items);
+ Util.extendObj(textContent.styles, xobjsCache.texts.styles);
+ }
+ break;
+ }
+
+ var xobj = xobjs.get(name);
+ if (!xobj) {
+ break;
+ }
+ assert(isStream(xobj), 'XObject should be a stream');
+
+ var type = xobj.dict.get('Subtype');
+ assert(isName(type),
+ 'XObject should have a Name subtype');
+
+ if ('Form' !== type.name) {
+ xobjsCache.key = name;
+ xobjsCache.texts = null;
+ break;
+ }
+
+ stateManager.save();
+ var matrix = xobj.dict.get('Matrix');
+ if (isArray(matrix) && matrix.length === 6) {
+ stateManager.transform(matrix);
+ }
+
+ return self.getTextContent(xobj,
+ xobj.dict.get('Resources') || resources, stateManager).
+ then(function (formTextContent) {
+ Util.appendToArray(bidiTexts, formTextContent.items);
+ Util.extendObj(textContent.styles, formTextContent.styles);
+ stateManager.restore();
+
+ xobjsCache.key = name;
+ xobjsCache.texts = formTextContent;
+
+ next(resolve, reject);
+ }, reject);
+ case OPS.setGState:
+ var dictName = args[0];
+ var extGState = resources.get('ExtGState');
+
+ if (!isDict(extGState) || !extGState.has(dictName.name)) {
+ break;
+ }
+
+ var gsStateMap = extGState.get(dictName.name);
+ var gsStateFont = null;
+ for (var key in gsStateMap) {
+ if (key === 'Font') {
+ assert(!gsStateFont);
+ gsStateFont = gsStateMap[key];
+ }
+ }
+ if (gsStateFont) {
+ textState.fontSize = gsStateFont[1];
+ return handleSetFont(gsStateFont[0]).then(function() {
+ next(resolve, reject);
+ }, reject);
+ }
+ break;
+ } // switch
+ } // while
+ if (stop) {
+ deferred.then(function () {
+ next(resolve, reject);
+ });
+ return;
+ }
+ resolve(textContent);
+ });
+ },
+
+ extractDataStructures: function
+ partialEvaluatorExtractDataStructures(dict, baseDict,
+ xref, properties) {
+ // 9.10.2
+ var toUnicode = (dict.get('ToUnicode') || baseDict.get('ToUnicode'));
+ if (toUnicode) {
+ properties.toUnicode = this.readToUnicode(toUnicode);
+ }
+ if (properties.composite) {
+ // CIDSystemInfo helps to match CID to glyphs
+ var cidSystemInfo = dict.get('CIDSystemInfo');
+ if (isDict(cidSystemInfo)) {
+ properties.cidSystemInfo = {
+ registry: cidSystemInfo.get('Registry'),
+ ordering: cidSystemInfo.get('Ordering'),
+ supplement: cidSystemInfo.get('Supplement')
+ };
+ }
+
+ var cidToGidMap = dict.get('CIDToGIDMap');
+ if (isStream(cidToGidMap)) {
+ properties.cidToGidMap = this.readCidToGidMap(cidToGidMap);
+ }
+ }
+
+ // Based on 9.6.6 of the spec the encoding can come from multiple places
+ // and depends on the font type. The base encoding and differences are
+ // read here, but the encoding that is actually used is chosen during
+ // glyph mapping in the font.
+ // TODO: Loading the built in encoding in the font would allow the
+ // differences to be merged in here not require us to hold on to it.
+ var differences = [];
+ var baseEncodingName = null;
+ var encoding;
+ if (dict.has('Encoding')) {
+ encoding = dict.get('Encoding');
+ if (isDict(encoding)) {
+ baseEncodingName = encoding.get('BaseEncoding');
+ baseEncodingName = (isName(baseEncodingName) ?
+ baseEncodingName.name : null);
+ // Load the differences between the base and original
+ if (encoding.has('Differences')) {
+ var diffEncoding = encoding.get('Differences');
+ var index = 0;
+ for (var j = 0, jj = diffEncoding.length; j < jj; j++) {
+ var data = diffEncoding[j];
+ if (isNum(data)) {
+ index = data;
+ } else if (isName(data)) {
+ differences[index++] = data.name;
+ } else if (isRef(data)) {
+ diffEncoding[j--] = xref.fetch(data);
+ continue;
+ } else {
+ error('Invalid entry in \'Differences\' array: ' + data);
+ }
+ }
+ }
+ } else if (isName(encoding)) {
+ baseEncodingName = encoding.name;
+ } else {
+ error('Encoding is not a Name nor a Dict');
+ }
+ // According to table 114 if the encoding is a named encoding it must be
+ // one of these predefined encodings.
+ if ((baseEncodingName !== 'MacRomanEncoding' &&
+ baseEncodingName !== 'MacExpertEncoding' &&
+ baseEncodingName !== 'WinAnsiEncoding')) {
+ baseEncodingName = null;
+ }
+ }
+
+ if (baseEncodingName) {
+ properties.defaultEncoding = Encodings[baseEncodingName].slice();
+ } else {
+ encoding = (properties.type === 'TrueType' ?
+ Encodings.WinAnsiEncoding : Encodings.StandardEncoding);
+ // The Symbolic attribute can be misused for regular fonts
+ // Heuristic: we have to check if the font is a standard one also
+ if (!!(properties.flags & FontFlags.Symbolic)) {
+ encoding = Encodings.MacRomanEncoding;
+ if (!properties.file) {
+ if (/Symbol/i.test(properties.name)) {
+ encoding = Encodings.SymbolSetEncoding;
+ } else if (/Dingbats/i.test(properties.name)) {
+ encoding = Encodings.ZapfDingbatsEncoding;
+ }
+ }
+ }
+ properties.defaultEncoding = encoding;
+ }
+
+ properties.differences = differences;
+ properties.baseEncodingName = baseEncodingName;
+ properties.dict = dict;
+ },
+
+ readToUnicode: function PartialEvaluator_readToUnicode(toUnicode) {
+ var cmap, cmapObj = toUnicode;
+ if (isName(cmapObj)) {
+ cmap = CMapFactory.create(cmapObj,
+ { url: PDFJS.cMapUrl, packed: PDFJS.cMapPacked }, null);
+ if (cmap instanceof IdentityCMap) {
+ return new IdentityToUnicodeMap(0, 0xFFFF);
+ }
+ return new ToUnicodeMap(cmap.getMap());
+ } else if (isStream(cmapObj)) {
+ cmap = CMapFactory.create(cmapObj,
+ { url: PDFJS.cMapUrl, packed: PDFJS.cMapPacked }, null);
+ if (cmap instanceof IdentityCMap) {
+ return new IdentityToUnicodeMap(0, 0xFFFF);
+ }
+ cmap = cmap.getMap();
+ // Convert UTF-16BE
+ // NOTE: cmap can be a sparse array, so use forEach instead of for(;;)
+ // to iterate over all keys.
+ cmap.forEach(function(token, i) {
+ var str = [];
+ for (var k = 0; k < token.length; k += 2) {
+ var w1 = (token.charCodeAt(k) << 8) | token.charCodeAt(k + 1);
+ if ((w1 & 0xF800) !== 0xD800) { // w1 < 0xD800 || w1 > 0xDFFF
+ str.push(w1);
+ continue;
+ }
+ k += 2;
+ var w2 = (token.charCodeAt(k) << 8) | token.charCodeAt(k + 1);
+ str.push(((w1 & 0x3ff) << 10) + (w2 & 0x3ff) + 0x10000);
+ }
+ cmap[i] = String.fromCharCode.apply(String, str);
+ });
+ return new ToUnicodeMap(cmap);
+ }
+ return null;
+ },
+
+ readCidToGidMap: function PartialEvaluator_readCidToGidMap(cidToGidStream) {
+ // Extract the encoding from the CIDToGIDMap
+ var glyphsData = cidToGidStream.getBytes();
+
+ // Set encoding 0 to later verify the font has an encoding
+ var result = [];
+ for (var j = 0, jj = glyphsData.length; j < jj; j++) {
+ var glyphID = (glyphsData[j++] << 8) | glyphsData[j];
+ if (glyphID === 0) {
+ continue;
+ }
+ var code = j >> 1;
+ result[code] = glyphID;
+ }
+ return result;
+ },
+
+ extractWidths: function PartialEvaluator_extractWidths(dict, xref,
+ descriptor,
+ properties) {
+ var glyphsWidths = [];
+ var defaultWidth = 0;
+ var glyphsVMetrics = [];
+ var defaultVMetrics;
+ var i, ii, j, jj, start, code, widths;
+ if (properties.composite) {
+ defaultWidth = dict.get('DW') || 1000;
+
+ widths = dict.get('W');
+ if (widths) {
+ for (i = 0, ii = widths.length; i < ii; i++) {
+ start = widths[i++];
+ code = xref.fetchIfRef(widths[i]);
+ if (isArray(code)) {
+ for (j = 0, jj = code.length; j < jj; j++) {
+ glyphsWidths[start++] = code[j];
+ }
+ } else {
+ var width = widths[++i];
+ for (j = start; j <= code; j++) {
+ glyphsWidths[j] = width;
+ }
+ }
+ }
+ }
+
+ if (properties.vertical) {
+ var vmetrics = (dict.get('DW2') || [880, -1000]);
+ defaultVMetrics = [vmetrics[1], defaultWidth * 0.5, vmetrics[0]];
+ vmetrics = dict.get('W2');
+ if (vmetrics) {
+ for (i = 0, ii = vmetrics.length; i < ii; i++) {
+ start = vmetrics[i++];
+ code = xref.fetchIfRef(vmetrics[i]);
+ if (isArray(code)) {
+ for (j = 0, jj = code.length; j < jj; j++) {
+ glyphsVMetrics[start++] = [code[j++], code[j++], code[j]];
+ }
+ } else {
+ var vmetric = [vmetrics[++i], vmetrics[++i], vmetrics[++i]];
+ for (j = start; j <= code; j++) {
+ glyphsVMetrics[j] = vmetric;
+ }
+ }
+ }
+ }
+ }
+ } else {
+ var firstChar = properties.firstChar;
+ widths = dict.get('Widths');
+ if (widths) {
+ j = firstChar;
+ for (i = 0, ii = widths.length; i < ii; i++) {
+ glyphsWidths[j++] = widths[i];
+ }
+ defaultWidth = (parseFloat(descriptor.get('MissingWidth')) || 0);
+ } else {
+ // Trying get the BaseFont metrics (see comment above).
+ var baseFontName = dict.get('BaseFont');
+ if (isName(baseFontName)) {
+ var metrics = this.getBaseFontMetrics(baseFontName.name);
+
+ glyphsWidths = this.buildCharCodeToWidth(metrics.widths,
+ properties);
+ defaultWidth = metrics.defaultWidth;
+ }
+ }
+ }
+
+ // Heuristic: detection of monospace font by checking all non-zero widths
+ var isMonospace = true;
+ var firstWidth = defaultWidth;
+ for (var glyph in glyphsWidths) {
+ var glyphWidth = glyphsWidths[glyph];
+ if (!glyphWidth) {
+ continue;
+ }
+ if (!firstWidth) {
+ firstWidth = glyphWidth;
+ continue;
+ }
+ if (firstWidth !== glyphWidth) {
+ isMonospace = false;
+ break;
+ }
+ }
+ if (isMonospace) {
+ properties.flags |= FontFlags.FixedPitch;
+ }
+
+ properties.defaultWidth = defaultWidth;
+ properties.widths = glyphsWidths;
+ properties.defaultVMetrics = defaultVMetrics;
+ properties.vmetrics = glyphsVMetrics;
+ },
+
+ isSerifFont: function PartialEvaluator_isSerifFont(baseFontName) {
+ // Simulating descriptor flags attribute
+ var fontNameWoStyle = baseFontName.split('-')[0];
+ return (fontNameWoStyle in serifFonts) ||
+ (fontNameWoStyle.search(/serif/gi) !== -1);
+ },
+
+ getBaseFontMetrics: function PartialEvaluator_getBaseFontMetrics(name) {
+ var defaultWidth = 0;
+ var widths = [];
+ var monospace = false;
+ var lookupName = (stdFontMap[name] || name);
+
+ if (!(lookupName in Metrics)) {
+ // Use default fonts for looking up font metrics if the passed
+ // font is not a base font
+ if (this.isSerifFont(name)) {
+ lookupName = 'Times-Roman';
+ } else {
+ lookupName = 'Helvetica';
+ }
+ }
+ var glyphWidths = Metrics[lookupName];
+
+ if (isNum(glyphWidths)) {
+ defaultWidth = glyphWidths;
+ monospace = true;
+ } else {
+ widths = glyphWidths;
+ }
+
+ return {
+ defaultWidth: defaultWidth,
+ monospace: monospace,
+ widths: widths
+ };
+ },
+
+ buildCharCodeToWidth:
+ function PartialEvaluator_bulildCharCodeToWidth(widthsByGlyphName,
+ properties) {
+ var widths = Object.create(null);
+ var differences = properties.differences;
+ var encoding = properties.defaultEncoding;
+ for (var charCode = 0; charCode < 256; charCode++) {
+ if (charCode in differences &&
+ widthsByGlyphName[differences[charCode]]) {
+ widths[charCode] = widthsByGlyphName[differences[charCode]];
+ continue;
+ }
+ if (charCode in encoding && widthsByGlyphName[encoding[charCode]]) {
+ widths[charCode] = widthsByGlyphName[encoding[charCode]];
+ continue;
+ }
+ }
+ return widths;
+ },
+
+ preEvaluateFont: function PartialEvaluator_preEvaluateFont(dict, xref) {
+ var baseDict = dict;
+ var type = dict.get('Subtype');
+ assert(isName(type), 'invalid font Subtype');
+
+ var composite = false;
+ var uint8array;
+ if (type.name === 'Type0') {
+ // If font is a composite
+ // - get the descendant font
+ // - set the type according to the descendant font
+ // - get the FontDescriptor from the descendant font
+ var df = dict.get('DescendantFonts');
+ if (!df) {
+ error('Descendant fonts are not specified');
+ }
+ dict = (isArray(df) ? xref.fetchIfRef(df[0]) : df);
+
+ type = dict.get('Subtype');
+ assert(isName(type), 'invalid font Subtype');
+ composite = true;
+ }
+
+ var descriptor = dict.get('FontDescriptor');
+ if (descriptor) {
+ var hash = new MurmurHash3_64();
+ var encoding = baseDict.getRaw('Encoding');
+ if (isName(encoding)) {
+ hash.update(encoding.name);
+ } else if (isRef(encoding)) {
+ hash.update(encoding.num + '_' + encoding.gen);
+ } else if (isDict(encoding)) {
+ var keys = encoding.getKeys();
+ for (var i = 0, ii = keys.length; i < ii; i++) {
+ var entry = encoding.getRaw(keys[i]);
+ if (isName(entry)) {
+ hash.update(entry.name);
+ } else if (isRef(entry)) {
+ hash.update(entry.num + '_' + entry.gen);
+ } else if (isArray(entry)) { // 'Differences' entry.
+ // Ideally we should check the contents of the array, but to avoid
+ // parsing it here and then again in |extractDataStructures|,
+ // we only use the array length for now (fixes bug1157493.pdf).
+ hash.update(entry.length.toString());
+ }
+ }
+ }
+
+ var toUnicode = dict.get('ToUnicode') || baseDict.get('ToUnicode');
+ if (isStream(toUnicode)) {
+ var stream = toUnicode.str || toUnicode;
+ uint8array = stream.buffer ?
+ new Uint8Array(stream.buffer.buffer, 0, stream.bufferLength) :
+ new Uint8Array(stream.bytes.buffer,
+ stream.start, stream.end - stream.start);
+ hash.update(uint8array);
+
+ } else if (isName(toUnicode)) {
+ hash.update(toUnicode.name);
+ }
+
+ var widths = dict.get('Widths') || baseDict.get('Widths');
+ if (widths) {
+ uint8array = new Uint8Array(new Uint32Array(widths).buffer);
+ hash.update(uint8array);
+ }
+ }
+
+ return {
+ descriptor: descriptor,
+ dict: dict,
+ baseDict: baseDict,
+ composite: composite,
+ type: type.name,
+ hash: hash ? hash.hexdigest() : ''
+ };
+ },
+
+ translateFont: function PartialEvaluator_translateFont(preEvaluatedFont,
+ xref) {
+ var baseDict = preEvaluatedFont.baseDict;
+ var dict = preEvaluatedFont.dict;
+ var composite = preEvaluatedFont.composite;
+ var descriptor = preEvaluatedFont.descriptor;
+ var type = preEvaluatedFont.type;
+ var maxCharIndex = (composite ? 0xFFFF : 0xFF);
+ var properties;
+
+ if (!descriptor) {
+ if (type === 'Type3') {
+ // FontDescriptor is only required for Type3 fonts when the document
+ // is a tagged pdf. Create a barbebones one to get by.
+ descriptor = new Dict(null);
+ descriptor.set('FontName', Name.get(type));
+ descriptor.set('FontBBox', dict.get('FontBBox'));
+ } else {
+ // Before PDF 1.5 if the font was one of the base 14 fonts, having a
+ // FontDescriptor was not required.
+ // This case is here for compatibility.
+ var baseFontName = dict.get('BaseFont');
+ if (!isName(baseFontName)) {
+ error('Base font is not specified');
+ }
+
+ // Using base font name as a font name.
+ baseFontName = baseFontName.name.replace(/[,_]/g, '-');
+ var metrics = this.getBaseFontMetrics(baseFontName);
+
+ // Simulating descriptor flags attribute
+ var fontNameWoStyle = baseFontName.split('-')[0];
+ var flags =
+ (this.isSerifFont(fontNameWoStyle) ? FontFlags.Serif : 0) |
+ (metrics.monospace ? FontFlags.FixedPitch : 0) |
+ (symbolsFonts[fontNameWoStyle] ? FontFlags.Symbolic :
+ FontFlags.Nonsymbolic);
+
+ properties = {
+ type: type,
+ name: baseFontName,
+ widths: metrics.widths,
+ defaultWidth: metrics.defaultWidth,
+ flags: flags,
+ firstChar: 0,
+ lastChar: maxCharIndex
+ };
+ this.extractDataStructures(dict, dict, xref, properties);
+ properties.widths = this.buildCharCodeToWidth(metrics.widths,
+ properties);
+ return new Font(baseFontName, null, properties);
+ }
+ }
+
+ // According to the spec if 'FontDescriptor' is declared, 'FirstChar',
+ // 'LastChar' and 'Widths' should exist too, but some PDF encoders seem
+ // to ignore this rule when a variant of a standart font is used.
+ // TODO Fill the width array depending on which of the base font this is
+ // a variant.
+ var firstChar = (dict.get('FirstChar') || 0);
+ var lastChar = (dict.get('LastChar') || maxCharIndex);
+
+ var fontName = descriptor.get('FontName');
+ var baseFont = dict.get('BaseFont');
+ // Some bad PDFs have a string as the font name.
+ if (isString(fontName)) {
+ fontName = Name.get(fontName);
+ }
+ if (isString(baseFont)) {
+ baseFont = Name.get(baseFont);
+ }
+
+ if (type !== 'Type3') {
+ var fontNameStr = fontName && fontName.name;
+ var baseFontStr = baseFont && baseFont.name;
+ if (fontNameStr !== baseFontStr) {
+ info('The FontDescriptor\'s FontName is "' + fontNameStr +
+ '" but should be the same as the Font\'s BaseFont "' +
+ baseFontStr + '"');
+ // Workaround for cases where e.g. fontNameStr = 'Arial' and
+ // baseFontStr = 'Arial,Bold' (needed when no font file is embedded).
+ if (fontNameStr && baseFontStr &&
+ baseFontStr.indexOf(fontNameStr) === 0) {
+ fontName = baseFont;
+ }
+ }
+ }
+ fontName = (fontName || baseFont);
+
+ assert(isName(fontName), 'invalid font name');
+
+ var fontFile = descriptor.get('FontFile', 'FontFile2', 'FontFile3');
+ if (fontFile) {
+ if (fontFile.dict) {
+ var subtype = fontFile.dict.get('Subtype');
+ if (subtype) {
+ subtype = subtype.name;
+ }
+ var length1 = fontFile.dict.get('Length1');
+ var length2 = fontFile.dict.get('Length2');
+ }
+ }
+
+ properties = {
+ type: type,
+ name: fontName.name,
+ subtype: subtype,
+ file: fontFile,
+ length1: length1,
+ length2: length2,
+ loadedName: baseDict.loadedName,
+ composite: composite,
+ wideChars: composite,
+ fixedPitch: false,
+ fontMatrix: (dict.get('FontMatrix') || FONT_IDENTITY_MATRIX),
+ firstChar: firstChar || 0,
+ lastChar: (lastChar || maxCharIndex),
+ bbox: descriptor.get('FontBBox'),
+ ascent: descriptor.get('Ascent'),
+ descent: descriptor.get('Descent'),
+ xHeight: descriptor.get('XHeight'),
+ capHeight: descriptor.get('CapHeight'),
+ flags: descriptor.get('Flags'),
+ italicAngle: descriptor.get('ItalicAngle'),
+ coded: false
+ };
+
+ if (composite) {
+ var cidEncoding = baseDict.get('Encoding');
+ if (isName(cidEncoding)) {
+ properties.cidEncoding = cidEncoding.name;
+ }
+ properties.cMap = CMapFactory.create(cidEncoding,
+ { url: PDFJS.cMapUrl, packed: PDFJS.cMapPacked }, null);
+ properties.vertical = properties.cMap.vertical;
+ }
+ this.extractDataStructures(dict, baseDict, xref, properties);
+ this.extractWidths(dict, xref, descriptor, properties);
+
+ if (type === 'Type3') {
+ properties.isType3Font = true;
+ }
+
+ return new Font(fontName.name, fontFile, properties);
+ }
+ };
+
+ return PartialEvaluator;
+})();
+
+var TranslatedFont = (function TranslatedFontClosure() {
+ function TranslatedFont(loadedName, font, dict) {
+ this.loadedName = loadedName;
+ this.font = font;
+ this.dict = dict;
+ this.type3Loaded = null;
+ this.sent = false;
+ }
+ TranslatedFont.prototype = {
+ send: function (handler) {
+ if (this.sent) {
+ return;
+ }
+ var fontData = this.font.exportData();
+ handler.send('commonobj', [
+ this.loadedName,
+ 'Font',
+ fontData
+ ]);
+ this.sent = true;
+ },
+ loadType3Data: function (evaluator, resources, parentOperatorList) {
+ assert(this.font.isType3Font);
+
+ if (this.type3Loaded) {
+ return this.type3Loaded;
+ }
+
+ var translatedFont = this.font;
+ var loadCharProcsPromise = Promise.resolve();
+ var charProcs = this.dict.get('CharProcs').getAll();
+ var fontResources = this.dict.get('Resources') || resources;
+ var charProcKeys = Object.keys(charProcs);
+ var charProcOperatorList = {};
+ for (var i = 0, n = charProcKeys.length; i < n; ++i) {
+ loadCharProcsPromise = loadCharProcsPromise.then(function (key) {
+ var glyphStream = charProcs[key];
+ var operatorList = new OperatorList();
+ return evaluator.getOperatorList(glyphStream, fontResources,
+ operatorList).then(function () {
+ charProcOperatorList[key] = operatorList.getIR();
+
+ // Add the dependencies to the parent operator list so they are
+ // resolved before sub operator list is executed synchronously.
+ parentOperatorList.addDependencies(operatorList.dependencies);
+ }, function (reason) {
+ warn('Type3 font resource \"' + key + '\" is not available');
+ var operatorList = new OperatorList();
+ charProcOperatorList[key] = operatorList.getIR();
+ });
+ }.bind(this, charProcKeys[i]));
+ }
+ this.type3Loaded = loadCharProcsPromise.then(function () {
+ translatedFont.charProcOperatorList = charProcOperatorList;
+ });
+ return this.type3Loaded;
+ }
+ };
+ return TranslatedFont;
+})();
+
+var OperatorList = (function OperatorListClosure() {
+ var CHUNK_SIZE = 1000;
+ var CHUNK_SIZE_ABOUT = CHUNK_SIZE - 5; // close to chunk size
+
+ function getTransfers(queue) {
+ var transfers = [];
+ var fnArray = queue.fnArray, argsArray = queue.argsArray;
+ for (var i = 0, ii = queue.length; i < ii; i++) {
+ switch (fnArray[i]) {
+ case OPS.paintInlineImageXObject:
+ case OPS.paintInlineImageXObjectGroup:
+ case OPS.paintImageMaskXObject:
+ var arg = argsArray[i][0]; // first param in imgData
+ if (!arg.cached) {
+ transfers.push(arg.data.buffer);
+ }
+ break;
+ }
+ }
+ return transfers;
+ }
+
+ function OperatorList(intent, messageHandler, pageIndex) {
+ this.messageHandler = messageHandler;
+ this.fnArray = [];
+ this.argsArray = [];
+ this.dependencies = {};
+ this.pageIndex = pageIndex;
+ this.intent = intent;
+ }
+
+ OperatorList.prototype = {
+ get length() {
+ return this.argsArray.length;
+ },
+
+ addOp: function(fn, args) {
+ this.fnArray.push(fn);
+ this.argsArray.push(args);
+ if (this.messageHandler) {
+ if (this.fnArray.length >= CHUNK_SIZE) {
+ this.flush();
+ } else if (this.fnArray.length >= CHUNK_SIZE_ABOUT &&
+ (fn === OPS.restore || fn === OPS.endText)) {
+ // heuristic to flush on boundary of restore or endText
+ this.flush();
+ }
+ }
+ },
+
+ addDependency: function(dependency) {
+ if (dependency in this.dependencies) {
+ return;
+ }
+ this.dependencies[dependency] = true;
+ this.addOp(OPS.dependency, [dependency]);
+ },
+
+ addDependencies: function(dependencies) {
+ for (var key in dependencies) {
+ this.addDependency(key);
+ }
+ },
+
+ addOpList: function(opList) {
+ Util.extendObj(this.dependencies, opList.dependencies);
+ for (var i = 0, ii = opList.length; i < ii; i++) {
+ this.addOp(opList.fnArray[i], opList.argsArray[i]);
+ }
+ },
+
+ getIR: function() {
+ return {
+ fnArray: this.fnArray,
+ argsArray: this.argsArray,
+ length: this.length
+ };
+ },
+
+ flush: function(lastChunk) {
+ if (this.intent !== 'oplist') {
+ new QueueOptimizer().optimize(this);
+ }
+ var transfers = getTransfers(this);
+ this.messageHandler.send('RenderPageChunk', {
+ operatorList: {
+ fnArray: this.fnArray,
+ argsArray: this.argsArray,
+ lastChunk: lastChunk,
+ length: this.length
+ },
+ pageIndex: this.pageIndex,
+ intent: this.intent
+ }, transfers);
+ this.dependencies = {};
+ this.fnArray.length = 0;
+ this.argsArray.length = 0;
+ }
+ };
+
+ return OperatorList;
+})();
+
+var StateManager = (function StateManagerClosure() {
+ function StateManager(initialState) {
+ this.state = initialState;
+ this.stateStack = [];
+ }
+ StateManager.prototype = {
+ save: function () {
+ var old = this.state;
+ this.stateStack.push(this.state);
+ this.state = old.clone();
+ },
+ restore: function () {
+ var prev = this.stateStack.pop();
+ if (prev) {
+ this.state = prev;
+ }
+ },
+ transform: function (args) {
+ this.state.ctm = Util.transform(this.state.ctm, args);
+ }
+ };
+ return StateManager;
+})();
+
+var TextState = (function TextStateClosure() {
+ function TextState() {
+ this.ctm = new Float32Array(IDENTITY_MATRIX);
+ this.fontSize = 0;
+ this.font = null;
+ this.fontMatrix = FONT_IDENTITY_MATRIX;
+ this.textMatrix = IDENTITY_MATRIX.slice();
+ this.textLineMatrix = IDENTITY_MATRIX.slice();
+ this.charSpacing = 0;
+ this.wordSpacing = 0;
+ this.leading = 0;
+ this.textHScale = 1;
+ this.textRise = 0;
+ }
+
+ TextState.prototype = {
+ setTextMatrix: function TextState_setTextMatrix(a, b, c, d, e, f) {
+ var m = this.textMatrix;
+ m[0] = a; m[1] = b; m[2] = c; m[3] = d; m[4] = e; m[5] = f;
+ },
+ setTextLineMatrix: function TextState_setTextMatrix(a, b, c, d, e, f) {
+ var m = this.textLineMatrix;
+ m[0] = a; m[1] = b; m[2] = c; m[3] = d; m[4] = e; m[5] = f;
+ },
+ translateTextMatrix: function TextState_translateTextMatrix(x, y) {
+ var m = this.textMatrix;
+ m[4] = m[0] * x + m[2] * y + m[4];
+ m[5] = m[1] * x + m[3] * y + m[5];
+ },
+ translateTextLineMatrix: function TextState_translateTextMatrix(x, y) {
+ var m = this.textLineMatrix;
+ m[4] = m[0] * x + m[2] * y + m[4];
+ m[5] = m[1] * x + m[3] * y + m[5];
+ },
+ calcRenderMatrix: function TextState_calcRendeMatrix(ctm) {
+ // 9.4.4 Text Space Details
+ var tsm = [this.fontSize * this.textHScale, 0,
+ 0, this.fontSize,
+ 0, this.textRise];
+ return Util.transform(ctm, Util.transform(this.textMatrix, tsm));
+ },
+ carriageReturn: function TextState_carriageReturn() {
+ this.translateTextLineMatrix(0, -this.leading);
+ this.textMatrix = this.textLineMatrix.slice();
+ },
+ clone: function TextState_clone() {
+ var clone = Object.create(this);
+ clone.textMatrix = this.textMatrix.slice();
+ clone.textLineMatrix = this.textLineMatrix.slice();
+ clone.fontMatrix = this.fontMatrix.slice();
+ return clone;
+ }
+ };
+ return TextState;
+})();
+
+var EvalState = (function EvalStateClosure() {
+ function EvalState() {
+ this.ctm = new Float32Array(IDENTITY_MATRIX);
+ this.font = null;
+ this.textRenderingMode = TextRenderingMode.FILL;
+ this.fillColorSpace = ColorSpace.singletons.gray;
+ this.strokeColorSpace = ColorSpace.singletons.gray;
+ }
+ EvalState.prototype = {
+ clone: function CanvasExtraState_clone() {
+ return Object.create(this);
+ },
+ };
+ return EvalState;
+})();
+
+var EvaluatorPreprocessor = (function EvaluatorPreprocessorClosure() {
+ // Specifies properties for each command
+ //
+ // If variableArgs === true: [0, `numArgs`] expected
+ // If variableArgs === false: exactly `numArgs` expected
+ var OP_MAP = {
+ // Graphic state
+ w: { id: OPS.setLineWidth, numArgs: 1, variableArgs: false },
+ J: { id: OPS.setLineCap, numArgs: 1, variableArgs: false },
+ j: { id: OPS.setLineJoin, numArgs: 1, variableArgs: false },
+ M: { id: OPS.setMiterLimit, numArgs: 1, variableArgs: false },
+ d: { id: OPS.setDash, numArgs: 2, variableArgs: false },
+ ri: { id: OPS.setRenderingIntent, numArgs: 1, variableArgs: false },
+ i: { id: OPS.setFlatness, numArgs: 1, variableArgs: false },
+ gs: { id: OPS.setGState, numArgs: 1, variableArgs: false },
+ q: { id: OPS.save, numArgs: 0, variableArgs: false },
+ Q: { id: OPS.restore, numArgs: 0, variableArgs: false },
+ cm: { id: OPS.transform, numArgs: 6, variableArgs: false },
+
+ // Path
+ m: { id: OPS.moveTo, numArgs: 2, variableArgs: false },
+ l: { id: OPS.lineTo, numArgs: 2, variableArgs: false },
+ c: { id: OPS.curveTo, numArgs: 6, variableArgs: false },
+ v: { id: OPS.curveTo2, numArgs: 4, variableArgs: false },
+ y: { id: OPS.curveTo3, numArgs: 4, variableArgs: false },
+ h: { id: OPS.closePath, numArgs: 0, variableArgs: false },
+ re: { id: OPS.rectangle, numArgs: 4, variableArgs: false },
+ S: { id: OPS.stroke, numArgs: 0, variableArgs: false },
+ s: { id: OPS.closeStroke, numArgs: 0, variableArgs: false },
+ f: { id: OPS.fill, numArgs: 0, variableArgs: false },
+ F: { id: OPS.fill, numArgs: 0, variableArgs: false },
+ 'f*': { id: OPS.eoFill, numArgs: 0, variableArgs: false },
+ B: { id: OPS.fillStroke, numArgs: 0, variableArgs: false },
+ 'B*': { id: OPS.eoFillStroke, numArgs: 0, variableArgs: false },
+ b: { id: OPS.closeFillStroke, numArgs: 0, variableArgs: false },
+ 'b*': { id: OPS.closeEOFillStroke, numArgs: 0, variableArgs: false },
+ n: { id: OPS.endPath, numArgs: 0, variableArgs: false },
+
+ // Clipping
+ W: { id: OPS.clip, numArgs: 0, variableArgs: false },
+ 'W*': { id: OPS.eoClip, numArgs: 0, variableArgs: false },
+
+ // Text
+ BT: { id: OPS.beginText, numArgs: 0, variableArgs: false },
+ ET: { id: OPS.endText, numArgs: 0, variableArgs: false },
+ Tc: { id: OPS.setCharSpacing, numArgs: 1, variableArgs: false },
+ Tw: { id: OPS.setWordSpacing, numArgs: 1, variableArgs: false },
+ Tz: { id: OPS.setHScale, numArgs: 1, variableArgs: false },
+ TL: { id: OPS.setLeading, numArgs: 1, variableArgs: false },
+ Tf: { id: OPS.setFont, numArgs: 2, variableArgs: false },
+ Tr: { id: OPS.setTextRenderingMode, numArgs: 1, variableArgs: false },
+ Ts: { id: OPS.setTextRise, numArgs: 1, variableArgs: false },
+ Td: { id: OPS.moveText, numArgs: 2, variableArgs: false },
+ TD: { id: OPS.setLeadingMoveText, numArgs: 2, variableArgs: false },
+ Tm: { id: OPS.setTextMatrix, numArgs: 6, variableArgs: false },
+ 'T*': { id: OPS.nextLine, numArgs: 0, variableArgs: false },
+ Tj: { id: OPS.showText, numArgs: 1, variableArgs: false },
+ TJ: { id: OPS.showSpacedText, numArgs: 1, variableArgs: false },
+ '\'': { id: OPS.nextLineShowText, numArgs: 1, variableArgs: false },
+ '"': { id: OPS.nextLineSetSpacingShowText, numArgs: 3,
+ variableArgs: false },
+
+ // Type3 fonts
+ d0: { id: OPS.setCharWidth, numArgs: 2, variableArgs: false },
+ d1: { id: OPS.setCharWidthAndBounds, numArgs: 6, variableArgs: false },
+
+ // Color
+ CS: { id: OPS.setStrokeColorSpace, numArgs: 1, variableArgs: false },
+ cs: { id: OPS.setFillColorSpace, numArgs: 1, variableArgs: false },
+ SC: { id: OPS.setStrokeColor, numArgs: 4, variableArgs: true },
+ SCN: { id: OPS.setStrokeColorN, numArgs: 33, variableArgs: true },
+ sc: { id: OPS.setFillColor, numArgs: 4, variableArgs: true },
+ scn: { id: OPS.setFillColorN, numArgs: 33, variableArgs: true },
+ G: { id: OPS.setStrokeGray, numArgs: 1, variableArgs: false },
+ g: { id: OPS.setFillGray, numArgs: 1, variableArgs: false },
+ RG: { id: OPS.setStrokeRGBColor, numArgs: 3, variableArgs: false },
+ rg: { id: OPS.setFillRGBColor, numArgs: 3, variableArgs: false },
+ K: { id: OPS.setStrokeCMYKColor, numArgs: 4, variableArgs: false },
+ k: { id: OPS.setFillCMYKColor, numArgs: 4, variableArgs: false },
+
+ // Shading
+ sh: { id: OPS.shadingFill, numArgs: 1, variableArgs: false },
+
+ // Images
+ BI: { id: OPS.beginInlineImage, numArgs: 0, variableArgs: false },
+ ID: { id: OPS.beginImageData, numArgs: 0, variableArgs: false },
+ EI: { id: OPS.endInlineImage, numArgs: 1, variableArgs: false },
+
+ // XObjects
+ Do: { id: OPS.paintXObject, numArgs: 1, variableArgs: false },
+ MP: { id: OPS.markPoint, numArgs: 1, variableArgs: false },
+ DP: { id: OPS.markPointProps, numArgs: 2, variableArgs: false },
+ BMC: { id: OPS.beginMarkedContent, numArgs: 1, variableArgs: false },
+ BDC: { id: OPS.beginMarkedContentProps, numArgs: 2,
+ variableArgs: false },
+ EMC: { id: OPS.endMarkedContent, numArgs: 0, variableArgs: false },
+
+ // Compatibility
+ BX: { id: OPS.beginCompat, numArgs: 0, variableArgs: false },
+ EX: { id: OPS.endCompat, numArgs: 0, variableArgs: false },
+
+ // (reserved partial commands for the lexer)
+ BM: null,
+ BD: null,
+ 'true': null,
+ fa: null,
+ fal: null,
+ fals: null,
+ 'false': null,
+ nu: null,
+ nul: null,
+ 'null': null
+ };
+
+ function EvaluatorPreprocessor(stream, xref, stateManager) {
+ // TODO(mduan): pass array of knownCommands rather than OP_MAP
+ // dictionary
+ this.parser = new Parser(new Lexer(stream, OP_MAP), false, xref);
+ this.stateManager = stateManager;
+ this.nonProcessedArgs = [];
+ }
+
+ EvaluatorPreprocessor.prototype = {
+ get savedStatesDepth() {
+ return this.stateManager.stateStack.length;
+ },
+
+ // |operation| is an object with two fields:
+ //
+ // - |fn| is an out param.
+ //
+ // - |args| is an inout param. On entry, it should have one of two values.
+ //
+ // - An empty array. This indicates that the caller is providing the
+ // array in which the args will be stored in. The caller should use
+ // this value if it can reuse a single array for each call to read().
+ //
+ // - |null|. This indicates that the caller needs this function to create
+ // the array in which any args are stored in. If there are zero args,
+ // this function will leave |operation.args| as |null| (thus avoiding
+ // allocations that would occur if we used an empty array to represent
+ // zero arguments). Otherwise, it will replace |null| with a new array
+ // containing the arguments. The caller should use this value if it
+ // cannot reuse an array for each call to read().
+ //
+ // These two modes are present because this function is very hot and so
+ // avoiding allocations where possible is worthwhile.
+ //
+ read: function EvaluatorPreprocessor_read(operation) {
+ var args = operation.args;
+ while (true) {
+ var obj = this.parser.getObj();
+ if (isCmd(obj)) {
+ var cmd = obj.cmd;
+ // Check that the command is valid
+ var opSpec = OP_MAP[cmd];
+ if (!opSpec) {
+ warn('Unknown command "' + cmd + '"');
+ continue;
+ }
+
+ var fn = opSpec.id;
+ var numArgs = opSpec.numArgs;
+ var argsLength = args !== null ? args.length : 0;
+
+ if (!opSpec.variableArgs) {
+ // Postscript commands can be nested, e.g. /F2 /GS2 gs 5.711 Tf
+ if (argsLength !== numArgs) {
+ var nonProcessedArgs = this.nonProcessedArgs;
+ while (argsLength > numArgs) {
+ nonProcessedArgs.push(args.shift());
+ argsLength--;
+ }
+ while (argsLength < numArgs && nonProcessedArgs.length !== 0) {
+ if (!args) {
+ args = [];
+ }
+ args.unshift(nonProcessedArgs.pop());
+ argsLength++;
+ }
+ }
+
+ if (argsLength < numArgs) {
+ // If we receive too few args, it's not possible to possible
+ // to execute the command, so skip the command
+ info('Command ' + fn + ': because expected ' +
+ numArgs + ' args, but received ' + argsLength +
+ ' args; skipping');
+ args = null;
+ continue;
+ }
+ } else if (argsLength > numArgs) {
+ info('Command ' + fn + ': expected [0,' + numArgs +
+ '] args, but received ' + argsLength + ' args');
+ }
+
+ // TODO figure out how to type-check vararg functions
+ this.preprocessCommand(fn, args);
+
+ operation.fn = fn;
+ operation.args = args;
+ return true;
+ } else {
+ if (isEOF(obj)) {
+ return false; // no more commands
+ }
+ // argument
+ if (obj !== null) {
+ if (!args) {
+ args = [];
+ }
+ args.push((obj instanceof Dict ? obj.getAll() : obj));
+ assert(args.length <= 33, 'Too many arguments');
+ }
+ }
+ }
+ },
+
+ preprocessCommand:
+ function EvaluatorPreprocessor_preprocessCommand(fn, args) {
+ switch (fn | 0) {
+ case OPS.save:
+ this.stateManager.save();
+ break;
+ case OPS.restore:
+ this.stateManager.restore();
+ break;
+ case OPS.transform:
+ this.stateManager.transform(args);
+ break;
+ }
+ }
+ };
+ return EvaluatorPreprocessor;
+})();
+
+var QueueOptimizer = (function QueueOptimizerClosure() {
+ function addState(parentState, pattern, fn) {
+ var state = parentState;
+ for (var i = 0, ii = pattern.length - 1; i < ii; i++) {
+ var item = pattern[i];
+ state = (state[item] || (state[item] = []));
+ }
+ state[pattern[pattern.length - 1]] = fn;
+ }
+
+ function handlePaintSolidColorImageMask(iFirstSave, count, fnArray,
+ argsArray) {
+ // Handles special case of mainly LaTeX documents which use image masks to
+ // draw lines with the current fill style.
+ // 'count' groups of (save, transform, paintImageMaskXObject, restore)+
+ // have been found at iFirstSave.
+ var iFirstPIMXO = iFirstSave + 2;
+ for (var i = 0; i < count; i++) {
+ var arg = argsArray[iFirstPIMXO + 4 * i];
+ var imageMask = arg.length === 1 && arg[0];
+ if (imageMask && imageMask.width === 1 && imageMask.height === 1 &&
+ (!imageMask.data.length ||
+ (imageMask.data.length === 1 && imageMask.data[0] === 0))) {
+ fnArray[iFirstPIMXO + 4 * i] = OPS.paintSolidColorImageMask;
+ continue;
+ }
+ break;
+ }
+ return count - i;
+ }
+
+ var InitialState = [];
+
+ // This replaces (save, transform, paintInlineImageXObject, restore)+
+ // sequences with one |paintInlineImageXObjectGroup| operation.
+ addState(InitialState,
+ [OPS.save, OPS.transform, OPS.paintInlineImageXObject, OPS.restore],
+ function foundInlineImageGroup(context) {
+ var MIN_IMAGES_IN_INLINE_IMAGES_BLOCK = 10;
+ var MAX_IMAGES_IN_INLINE_IMAGES_BLOCK = 200;
+ var MAX_WIDTH = 1000;
+ var IMAGE_PADDING = 1;
+
+ var fnArray = context.fnArray, argsArray = context.argsArray;
+ var curr = context.iCurr;
+ var iFirstSave = curr - 3;
+ var iFirstTransform = curr - 2;
+ var iFirstPIIXO = curr - 1;
+
+ // Look for the quartets.
+ var i = iFirstSave + 4;
+ var ii = fnArray.length;
+ while (i + 3 < ii) {
+ if (fnArray[i] !== OPS.save ||
+ fnArray[i + 1] !== OPS.transform ||
+ fnArray[i + 2] !== OPS.paintInlineImageXObject ||
+ fnArray[i + 3] !== OPS.restore) {
+ break; // ops don't match
+ }
+ i += 4;
+ }
+
+ // At this point, i is the index of the first op past the last valid
+ // quartet.
+ var count = Math.min((i - iFirstSave) / 4,
+ MAX_IMAGES_IN_INLINE_IMAGES_BLOCK);
+ if (count < MIN_IMAGES_IN_INLINE_IMAGES_BLOCK) {
+ return i;
+ }
+
+ // assuming that heights of those image is too small (~1 pixel)
+ // packing as much as possible by lines
+ var maxX = 0;
+ var map = [], maxLineHeight = 0;
+ var currentX = IMAGE_PADDING, currentY = IMAGE_PADDING;
+ var q;
+ for (q = 0; q < count; q++) {
+ var transform = argsArray[iFirstTransform + (q << 2)];
+ var img = argsArray[iFirstPIIXO + (q << 2)][0];
+ if (currentX + img.width > MAX_WIDTH) {
+ // starting new line
+ maxX = Math.max(maxX, currentX);
+ currentY += maxLineHeight + 2 * IMAGE_PADDING;
+ currentX = 0;
+ maxLineHeight = 0;
+ }
+ map.push({
+ transform: transform,
+ x: currentX, y: currentY,
+ w: img.width, h: img.height
+ });
+ currentX += img.width + 2 * IMAGE_PADDING;
+ maxLineHeight = Math.max(maxLineHeight, img.height);
+ }
+ var imgWidth = Math.max(maxX, currentX) + IMAGE_PADDING;
+ var imgHeight = currentY + maxLineHeight + IMAGE_PADDING;
+ var imgData = new Uint8Array(imgWidth * imgHeight * 4);
+ var imgRowSize = imgWidth << 2;
+ for (q = 0; q < count; q++) {
+ var data = argsArray[iFirstPIIXO + (q << 2)][0].data;
+ // Copy image by lines and extends pixels into padding.
+ var rowSize = map[q].w << 2;
+ var dataOffset = 0;
+ var offset = (map[q].x + map[q].y * imgWidth) << 2;
+ imgData.set(data.subarray(0, rowSize), offset - imgRowSize);
+ for (var k = 0, kk = map[q].h; k < kk; k++) {
+ imgData.set(data.subarray(dataOffset, dataOffset + rowSize), offset);
+ dataOffset += rowSize;
+ offset += imgRowSize;
+ }
+ imgData.set(data.subarray(dataOffset - rowSize, dataOffset), offset);
+ while (offset >= 0) {
+ data[offset - 4] = data[offset];
+ data[offset - 3] = data[offset + 1];
+ data[offset - 2] = data[offset + 2];
+ data[offset - 1] = data[offset + 3];
+ data[offset + rowSize] = data[offset + rowSize - 4];
+ data[offset + rowSize + 1] = data[offset + rowSize - 3];
+ data[offset + rowSize + 2] = data[offset + rowSize - 2];
+ data[offset + rowSize + 3] = data[offset + rowSize - 1];
+ offset -= imgRowSize;
+ }
+ }
+
+ // Replace queue items.
+ fnArray.splice(iFirstSave, count * 4, OPS.paintInlineImageXObjectGroup);
+ argsArray.splice(iFirstSave, count * 4,
+ [{ width: imgWidth, height: imgHeight, kind: ImageKind.RGBA_32BPP,
+ data: imgData }, map]);
+
+ return iFirstSave + 1;
+ });
+
+ // This replaces (save, transform, paintImageMaskXObject, restore)+
+ // sequences with one |paintImageMaskXObjectGroup| or one
+ // |paintImageMaskXObjectRepeat| operation.
+ addState(InitialState,
+ [OPS.save, OPS.transform, OPS.paintImageMaskXObject, OPS.restore],
+ function foundImageMaskGroup(context) {
+ var MIN_IMAGES_IN_MASKS_BLOCK = 10;
+ var MAX_IMAGES_IN_MASKS_BLOCK = 100;
+ var MAX_SAME_IMAGES_IN_MASKS_BLOCK = 1000;
+
+ var fnArray = context.fnArray, argsArray = context.argsArray;
+ var curr = context.iCurr;
+ var iFirstSave = curr - 3;
+ var iFirstTransform = curr - 2;
+ var iFirstPIMXO = curr - 1;
+
+ // Look for the quartets.
+ var i = iFirstSave + 4;
+ var ii = fnArray.length;
+ while (i + 3 < ii) {
+ if (fnArray[i] !== OPS.save ||
+ fnArray[i + 1] !== OPS.transform ||
+ fnArray[i + 2] !== OPS.paintImageMaskXObject ||
+ fnArray[i + 3] !== OPS.restore) {
+ break; // ops don't match
+ }
+ i += 4;
+ }
+
+ // At this point, i is the index of the first op past the last valid
+ // quartet.
+ var count = (i - iFirstSave) / 4;
+ count = handlePaintSolidColorImageMask(iFirstSave, count, fnArray,
+ argsArray);
+ if (count < MIN_IMAGES_IN_MASKS_BLOCK) {
+ return i;
+ }
+
+ var q;
+ var isSameImage = false;
+ var iTransform, transformArgs;
+ var firstPIMXOArg0 = argsArray[iFirstPIMXO][0];
+ if (argsArray[iFirstTransform][1] === 0 &&
+ argsArray[iFirstTransform][2] === 0) {
+ isSameImage = true;
+ var firstTransformArg0 = argsArray[iFirstTransform][0];
+ var firstTransformArg3 = argsArray[iFirstTransform][3];
+ iTransform = iFirstTransform + 4;
+ var iPIMXO = iFirstPIMXO + 4;
+ for (q = 1; q < count; q++, iTransform += 4, iPIMXO += 4) {
+ transformArgs = argsArray[iTransform];
+ if (argsArray[iPIMXO][0] !== firstPIMXOArg0 ||
+ transformArgs[0] !== firstTransformArg0 ||
+ transformArgs[1] !== 0 ||
+ transformArgs[2] !== 0 ||
+ transformArgs[3] !== firstTransformArg3) {
+ if (q < MIN_IMAGES_IN_MASKS_BLOCK) {
+ isSameImage = false;
+ } else {
+ count = q;
+ }
+ break; // different image or transform
+ }
+ }
+ }
+
+ if (isSameImage) {
+ count = Math.min(count, MAX_SAME_IMAGES_IN_MASKS_BLOCK);
+ var positions = new Float32Array(count * 2);
+ iTransform = iFirstTransform;
+ for (q = 0; q < count; q++, iTransform += 4) {
+ transformArgs = argsArray[iTransform];
+ positions[(q << 1)] = transformArgs[4];
+ positions[(q << 1) + 1] = transformArgs[5];
+ }
+
+ // Replace queue items.
+ fnArray.splice(iFirstSave, count * 4, OPS.paintImageMaskXObjectRepeat);
+ argsArray.splice(iFirstSave, count * 4,
+ [firstPIMXOArg0, firstTransformArg0, firstTransformArg3, positions]);
+ } else {
+ count = Math.min(count, MAX_IMAGES_IN_MASKS_BLOCK);
+ var images = [];
+ for (q = 0; q < count; q++) {
+ transformArgs = argsArray[iFirstTransform + (q << 2)];
+ var maskParams = argsArray[iFirstPIMXO + (q << 2)][0];
+ images.push({ data: maskParams.data, width: maskParams.width,
+ height: maskParams.height,
+ transform: transformArgs });
+ }
+
+ // Replace queue items.
+ fnArray.splice(iFirstSave, count * 4, OPS.paintImageMaskXObjectGroup);
+ argsArray.splice(iFirstSave, count * 4, [images]);
+ }
+
+ return iFirstSave + 1;
+ });
+
+ // This replaces (save, transform, paintImageXObject, restore)+ sequences
+ // with one paintImageXObjectRepeat operation, if the |transform| and
+ // |paintImageXObjectRepeat| ops are appropriate.
+ addState(InitialState,
+ [OPS.save, OPS.transform, OPS.paintImageXObject, OPS.restore],
+ function (context) {
+ var MIN_IMAGES_IN_BLOCK = 3;
+ var MAX_IMAGES_IN_BLOCK = 1000;
+
+ var fnArray = context.fnArray, argsArray = context.argsArray;
+ var curr = context.iCurr;
+ var iFirstSave = curr - 3;
+ var iFirstTransform = curr - 2;
+ var iFirstPIXO = curr - 1;
+ var iFirstRestore = curr;
+
+ if (argsArray[iFirstTransform][1] !== 0 ||
+ argsArray[iFirstTransform][2] !== 0) {
+ return iFirstRestore + 1; // transform has the wrong form
+ }
+
+ // Look for the quartets.
+ var firstPIXOArg0 = argsArray[iFirstPIXO][0];
+ var firstTransformArg0 = argsArray[iFirstTransform][0];
+ var firstTransformArg3 = argsArray[iFirstTransform][3];
+ var i = iFirstSave + 4;
+ var ii = fnArray.length;
+ while (i + 3 < ii) {
+ if (fnArray[i] !== OPS.save ||
+ fnArray[i + 1] !== OPS.transform ||
+ fnArray[i + 2] !== OPS.paintImageXObject ||
+ fnArray[i + 3] !== OPS.restore) {
+ break; // ops don't match
+ }
+ if (argsArray[i + 1][0] !== firstTransformArg0 ||
+ argsArray[i + 1][1] !== 0 ||
+ argsArray[i + 1][2] !== 0 ||
+ argsArray[i + 1][3] !== firstTransformArg3) {
+ break; // transforms don't match
+ }
+ if (argsArray[i + 2][0] !== firstPIXOArg0) {
+ break; // images don't match
+ }
+ i += 4;
+ }
+
+ // At this point, i is the index of the first op past the last valid
+ // quartet.
+ var count = Math.min((i - iFirstSave) / 4, MAX_IMAGES_IN_BLOCK);
+ if (count < MIN_IMAGES_IN_BLOCK) {
+ return i;
+ }
+
+ // Extract the (x,y) positions from all of the matching transforms.
+ var positions = new Float32Array(count * 2);
+ var iTransform = iFirstTransform;
+ for (var q = 0; q < count; q++, iTransform += 4) {
+ var transformArgs = argsArray[iTransform];
+ positions[(q << 1)] = transformArgs[4];
+ positions[(q << 1) + 1] = transformArgs[5];
+ }
+
+ // Replace queue items.
+ var args = [firstPIXOArg0, firstTransformArg0, firstTransformArg3,
+ positions];
+ fnArray.splice(iFirstSave, count * 4, OPS.paintImageXObjectRepeat);
+ argsArray.splice(iFirstSave, count * 4, args);
+
+ return iFirstSave + 1;
+ });
+
+ // This replaces (beginText, setFont, setTextMatrix, showText, endText)+
+ // sequences with (beginText, setFont, (setTextMatrix, showText)+, endText)+
+ // sequences, if the font for each one is the same.
+ addState(InitialState,
+ [OPS.beginText, OPS.setFont, OPS.setTextMatrix, OPS.showText, OPS.endText],
+ function (context) {
+ var MIN_CHARS_IN_BLOCK = 3;
+ var MAX_CHARS_IN_BLOCK = 1000;
+
+ var fnArray = context.fnArray, argsArray = context.argsArray;
+ var curr = context.iCurr;
+ var iFirstBeginText = curr - 4;
+ var iFirstSetFont = curr - 3;
+ var iFirstSetTextMatrix = curr - 2;
+ var iFirstShowText = curr - 1;
+ var iFirstEndText = curr;
+
+ // Look for the quintets.
+ var firstSetFontArg0 = argsArray[iFirstSetFont][0];
+ var firstSetFontArg1 = argsArray[iFirstSetFont][1];
+ var i = iFirstBeginText + 5;
+ var ii = fnArray.length;
+ while (i + 4 < ii) {
+ if (fnArray[i] !== OPS.beginText ||
+ fnArray[i + 1] !== OPS.setFont ||
+ fnArray[i + 2] !== OPS.setTextMatrix ||
+ fnArray[i + 3] !== OPS.showText ||
+ fnArray[i + 4] !== OPS.endText) {
+ break; // ops don't match
+ }
+ if (argsArray[i + 1][0] !== firstSetFontArg0 ||
+ argsArray[i + 1][1] !== firstSetFontArg1) {
+ break; // fonts don't match
+ }
+ i += 5;
+ }
+
+ // At this point, i is the index of the first op past the last valid
+ // quintet.
+ var count = Math.min(((i - iFirstBeginText) / 5), MAX_CHARS_IN_BLOCK);
+ if (count < MIN_CHARS_IN_BLOCK) {
+ return i;
+ }
+
+ // If the preceding quintet is (<something>, setFont, setTextMatrix,
+ // showText, endText), include that as well. (E.g. <something> might be
+ // |dependency|.)
+ var iFirst = iFirstBeginText;
+ if (iFirstBeginText >= 4 &&
+ fnArray[iFirstBeginText - 4] === fnArray[iFirstSetFont] &&
+ fnArray[iFirstBeginText - 3] === fnArray[iFirstSetTextMatrix] &&
+ fnArray[iFirstBeginText - 2] === fnArray[iFirstShowText] &&
+ fnArray[iFirstBeginText - 1] === fnArray[iFirstEndText] &&
+ argsArray[iFirstBeginText - 4][0] === firstSetFontArg0 &&
+ argsArray[iFirstBeginText - 4][1] === firstSetFontArg1) {
+ count++;
+ iFirst -= 5;
+ }
+
+ // Remove (endText, beginText, setFont) trios.
+ var iEndText = iFirst + 4;
+ for (var q = 1; q < count; q++) {
+ fnArray.splice(iEndText, 3);
+ argsArray.splice(iEndText, 3);
+ iEndText += 2;
+ }
+
+ return iEndText + 1;
+ });
+
+ function QueueOptimizer() {}
+
+ QueueOptimizer.prototype = {
+ optimize: function QueueOptimizer_optimize(queue) {
+ var fnArray = queue.fnArray, argsArray = queue.argsArray;
+ var context = {
+ iCurr: 0,
+ fnArray: fnArray,
+ argsArray: argsArray
+ };
+ var state;
+ var i = 0, ii = fnArray.length;
+ while (i < ii) {
+ state = (state || InitialState)[fnArray[i]];
+ if (typeof state === 'function') { // we found some handler
+ context.iCurr = i;
+ // state() returns the index of the first non-matching op (if we
+ // didn't match) or the first op past the modified ops (if we did
+ // match and replace).
+ i = state(context);
+ state = undefined; // reset the state machine
+ ii = context.fnArray.length;
+ } else {
+ i++;
+ }
+ }
+ }
+ };
+ return QueueOptimizer;
+})();
+
+
+var BUILT_IN_CMAPS = [
+// << Start unicode maps.
+'Adobe-GB1-UCS2',
+'Adobe-CNS1-UCS2',
+'Adobe-Japan1-UCS2',
+'Adobe-Korea1-UCS2',
+// >> End unicode maps.
+'78-EUC-H',
+'78-EUC-V',
+'78-H',
+'78-RKSJ-H',
+'78-RKSJ-V',
+'78-V',
+'78ms-RKSJ-H',
+'78ms-RKSJ-V',
+'83pv-RKSJ-H',
+'90ms-RKSJ-H',
+'90ms-RKSJ-V',
+'90msp-RKSJ-H',
+'90msp-RKSJ-V',
+'90pv-RKSJ-H',
+'90pv-RKSJ-V',
+'Add-H',
+'Add-RKSJ-H',
+'Add-RKSJ-V',
+'Add-V',
+'Adobe-CNS1-0',
+'Adobe-CNS1-1',
+'Adobe-CNS1-2',
+'Adobe-CNS1-3',
+'Adobe-CNS1-4',
+'Adobe-CNS1-5',
+'Adobe-CNS1-6',
+'Adobe-GB1-0',
+'Adobe-GB1-1',
+'Adobe-GB1-2',
+'Adobe-GB1-3',
+'Adobe-GB1-4',
+'Adobe-GB1-5',
+'Adobe-Japan1-0',
+'Adobe-Japan1-1',
+'Adobe-Japan1-2',
+'Adobe-Japan1-3',
+'Adobe-Japan1-4',
+'Adobe-Japan1-5',
+'Adobe-Japan1-6',
+'Adobe-Korea1-0',
+'Adobe-Korea1-1',
+'Adobe-Korea1-2',
+'B5-H',
+'B5-V',
+'B5pc-H',
+'B5pc-V',
+'CNS-EUC-H',
+'CNS-EUC-V',
+'CNS1-H',
+'CNS1-V',
+'CNS2-H',
+'CNS2-V',
+'ETHK-B5-H',
+'ETHK-B5-V',
+'ETen-B5-H',
+'ETen-B5-V',
+'ETenms-B5-H',
+'ETenms-B5-V',
+'EUC-H',
+'EUC-V',
+'Ext-H',
+'Ext-RKSJ-H',
+'Ext-RKSJ-V',
+'Ext-V',
+'GB-EUC-H',
+'GB-EUC-V',
+'GB-H',
+'GB-V',
+'GBK-EUC-H',
+'GBK-EUC-V',
+'GBK2K-H',
+'GBK2K-V',
+'GBKp-EUC-H',
+'GBKp-EUC-V',
+'GBT-EUC-H',
+'GBT-EUC-V',
+'GBT-H',
+'GBT-V',
+'GBTpc-EUC-H',
+'GBTpc-EUC-V',
+'GBpc-EUC-H',
+'GBpc-EUC-V',
+'H',
+'HKdla-B5-H',
+'HKdla-B5-V',
+'HKdlb-B5-H',
+'HKdlb-B5-V',
+'HKgccs-B5-H',
+'HKgccs-B5-V',
+'HKm314-B5-H',
+'HKm314-B5-V',
+'HKm471-B5-H',
+'HKm471-B5-V',
+'HKscs-B5-H',
+'HKscs-B5-V',
+'Hankaku',
+'Hiragana',
+'KSC-EUC-H',
+'KSC-EUC-V',
+'KSC-H',
+'KSC-Johab-H',
+'KSC-Johab-V',
+'KSC-V',
+'KSCms-UHC-H',
+'KSCms-UHC-HW-H',
+'KSCms-UHC-HW-V',
+'KSCms-UHC-V',
+'KSCpc-EUC-H',
+'KSCpc-EUC-V',
+'Katakana',
+'NWP-H',
+'NWP-V',
+'RKSJ-H',
+'RKSJ-V',
+'Roman',
+'UniCNS-UCS2-H',
+'UniCNS-UCS2-V',
+'UniCNS-UTF16-H',
+'UniCNS-UTF16-V',
+'UniCNS-UTF32-H',
+'UniCNS-UTF32-V',
+'UniCNS-UTF8-H',
+'UniCNS-UTF8-V',
+'UniGB-UCS2-H',
+'UniGB-UCS2-V',
+'UniGB-UTF16-H',
+'UniGB-UTF16-V',
+'UniGB-UTF32-H',
+'UniGB-UTF32-V',
+'UniGB-UTF8-H',
+'UniGB-UTF8-V',
+'UniJIS-UCS2-H',
+'UniJIS-UCS2-HW-H',
+'UniJIS-UCS2-HW-V',
+'UniJIS-UCS2-V',
+'UniJIS-UTF16-H',
+'UniJIS-UTF16-V',
+'UniJIS-UTF32-H',
+'UniJIS-UTF32-V',
+'UniJIS-UTF8-H',
+'UniJIS-UTF8-V',
+'UniJIS2004-UTF16-H',
+'UniJIS2004-UTF16-V',
+'UniJIS2004-UTF32-H',
+'UniJIS2004-UTF32-V',
+'UniJIS2004-UTF8-H',
+'UniJIS2004-UTF8-V',
+'UniJISPro-UCS2-HW-V',
+'UniJISPro-UCS2-V',
+'UniJISPro-UTF8-V',
+'UniJISX0213-UTF32-H',
+'UniJISX0213-UTF32-V',
+'UniJISX02132004-UTF32-H',
+'UniJISX02132004-UTF32-V',
+'UniKS-UCS2-H',
+'UniKS-UCS2-V',
+'UniKS-UTF16-H',
+'UniKS-UTF16-V',
+'UniKS-UTF32-H',
+'UniKS-UTF32-V',
+'UniKS-UTF8-H',
+'UniKS-UTF8-V',
+'V',
+'WP-Symbol'];
+
+// CMap, not to be confused with TrueType's cmap.
+var CMap = (function CMapClosure() {
+ function CMap(builtInCMap) {
+ // Codespace ranges are stored as follows:
+ // [[1BytePairs], [2BytePairs], [3BytePairs], [4BytePairs]]
+ // where nBytePairs are ranges e.g. [low1, high1, low2, high2, ...]
+ this.codespaceRanges = [[], [], [], []];
+ this.numCodespaceRanges = 0;
+ // Map entries have one of two forms.
+ // - cid chars are 16-bit unsigned integers, stored as integers.
+ // - bf chars are variable-length byte sequences, stored as strings, with
+ // one byte per character.
+ this._map = [];
+ this.name = '';
+ this.vertical = false;
+ this.useCMap = null;
+ this.builtInCMap = builtInCMap;
+ }
+ CMap.prototype = {
+ addCodespaceRange: function(n, low, high) {
+ this.codespaceRanges[n - 1].push(low, high);
+ this.numCodespaceRanges++;
+ },
+
+ mapCidRange: function(low, high, dstLow) {
+ while (low <= high) {
+ this._map[low++] = dstLow++;
+ }
+ },
+
+ mapBfRange: function(low, high, dstLow) {
+ var lastByte = dstLow.length - 1;
+ while (low <= high) {
+ this._map[low++] = dstLow;
+ // Only the last byte has to be incremented.
+ dstLow = dstLow.substr(0, lastByte) +
+ String.fromCharCode(dstLow.charCodeAt(lastByte) + 1);
+ }
+ },
+
+ mapBfRangeToArray: function(low, high, array) {
+ var i = 0, ii = array.length;
+ while (low <= high && i < ii) {
+ this._map[low] = array[i++];
+ ++low;
+ }
+ },
+
+ // This is used for both bf and cid chars.
+ mapOne: function(src, dst) {
+ this._map[src] = dst;
+ },
+
+ lookup: function(code) {
+ return this._map[code];
+ },
+
+ contains: function(code) {
+ return this._map[code] !== undefined;
+ },
+
+ forEach: function(callback) {
+ // Most maps have fewer than 65536 entries, and for those we use normal
+ // array iteration. But really sparse tables are possible -- e.g. with
+ // indices in the *billions*. For such tables we use for..in, which isn't
+ // ideal because it stringifies the indices for all present elements, but
+ // it does avoid iterating over every undefined entry.
+ var map = this._map;
+ var length = map.length;
+ var i;
+ if (length <= 0x10000) {
+ for (i = 0; i < length; i++) {
+ if (map[i] !== undefined) {
+ callback(i, map[i]);
+ }
+ }
+ } else {
+ for (i in this._map) {
+ callback(i, map[i]);
+ }
+ }
+ },
+
+ charCodeOf: function(value) {
+ return this._map.indexOf(value);
+ },
+
+ getMap: function() {
+ return this._map;
+ },
+
+ readCharCode: function(str, offset, out) {
+ var c = 0;
+ var codespaceRanges = this.codespaceRanges;
+ var codespaceRangesLen = this.codespaceRanges.length;
+ // 9.7.6.2 CMap Mapping
+ // The code length is at most 4.
+ for (var n = 0; n < codespaceRangesLen; n++) {
+ c = ((c << 8) | str.charCodeAt(offset + n)) >>> 0;
+ // Check each codespace range to see if it falls within.
+ var codespaceRange = codespaceRanges[n];
+ for (var k = 0, kk = codespaceRange.length; k < kk;) {
+ var low = codespaceRange[k++];
+ var high = codespaceRange[k++];
+ if (c >= low && c <= high) {
+ out.charcode = c;
+ out.length = n + 1;
+ return;
+ }
+ }
+ }
+ out.charcode = 0;
+ out.length = 1;
+ },
+
+ get isIdentityCMap() {
+ if (!(this.name === 'Identity-H' || this.name === 'Identity-V')) {
+ return false;
+ }
+ if (this._map.length !== 0x10000) {
+ return false;
+ }
+ for (var i = 0; i < 0x10000; i++) {
+ if (this._map[i] !== i) {
+ return false;
+ }
+ }
+ return true;
+ }
+ };
+ return CMap;
+})();
+
+// A special case of CMap, where the _map array implicitly has a length of
+// 65536 and each element is equal to its index.
+var IdentityCMap = (function IdentityCMapClosure() {
+ function IdentityCMap(vertical, n) {
+ CMap.call(this);
+ this.vertical = vertical;
+ this.addCodespaceRange(n, 0, 0xffff);
+ }
+ Util.inherit(IdentityCMap, CMap, {});
+
+ IdentityCMap.prototype = {
+ addCodespaceRange: CMap.prototype.addCodespaceRange,
+
+ mapCidRange: function(low, high, dstLow) {
+ error('should not call mapCidRange');
+ },
+
+ mapBfRange: function(low, high, dstLow) {
+ error('should not call mapBfRange');
+ },
+
+ mapBfRangeToArray: function(low, high, array) {
+ error('should not call mapBfRangeToArray');
+ },
+
+ mapOne: function(src, dst) {
+ error('should not call mapCidOne');
+ },
+
+ lookup: function(code) {
+ return (isInt(code) && code <= 0xffff) ? code : undefined;
+ },
+
+ contains: function(code) {
+ return isInt(code) && code <= 0xffff;
+ },
+
+ forEach: function(callback) {
+ for (var i = 0; i <= 0xffff; i++) {
+ callback(i, i);
+ }
+ },
+
+ charCodeOf: function(value) {
+ return (isInt(value) && value <= 0xffff) ? value : -1;
+ },
+
+ getMap: function() {
+ // Sometimes identity maps must be instantiated, but it's rare.
+ var map = new Array(0x10000);
+ for (var i = 0; i <= 0xffff; i++) {
+ map[i] = i;
+ }
+ return map;
+ },
+
+ readCharCode: CMap.prototype.readCharCode,
+
+ get isIdentityCMap() {
+ error('should not access .isIdentityCMap');
+ }
+ };
+
+ return IdentityCMap;
+})();
+
+var BinaryCMapReader = (function BinaryCMapReaderClosure() {
+ function fetchBinaryData(url) {
+ var nonBinaryRequest = PDFJS.disableWorker;
+ var request = new XMLHttpRequest();
+ request.open('GET', url, false);
+ if (!nonBinaryRequest) {
+ try {
+ request.responseType = 'arraybuffer';
+ nonBinaryRequest = request.responseType !== 'arraybuffer';
+ } catch (e) {
+ nonBinaryRequest = true;
+ }
+ }
+ if (nonBinaryRequest && request.overrideMimeType) {
+ request.overrideMimeType('text/plain; charset=x-user-defined');
+ }
+ request.send(null);
+ if (nonBinaryRequest ? !request.responseText : !request.response) {
+ error('Unable to get binary cMap at: ' + url);
+ }
+ if (nonBinaryRequest) {
+ var data = Array.prototype.map.call(request.responseText, function (ch) {
+ return ch.charCodeAt(0) & 255;
+ });
+ return new Uint8Array(data);
+ }
+ return new Uint8Array(request.response);
+ }
+
+ function hexToInt(a, size) {
+ var n = 0;
+ for (var i = 0; i <= size; i++) {
+ n = (n << 8) | a[i];
+ }
+ return n >>> 0;
+ }
+
+ function hexToStr(a, size) {
+ // This code is hot. Special-case some common values to avoid creating an
+ // object with subarray().
+ if (size === 1) {
+ return String.fromCharCode(a[0], a[1]);
+ }
+ if (size === 3) {
+ return String.fromCharCode(a[0], a[1], a[2], a[3]);
+ }
+ return String.fromCharCode.apply(null, a.subarray(0, size + 1));
+ }
+
+ function addHex(a, b, size) {
+ var c = 0;
+ for (var i = size; i >= 0; i--) {
+ c += a[i] + b[i];
+ a[i] = c & 255;
+ c >>= 8;
+ }
+ }
+
+ function incHex(a, size) {
+ var c = 1;
+ for (var i = size; i >= 0 && c > 0; i--) {
+ c += a[i];
+ a[i] = c & 255;
+ c >>= 8;
+ }
+ }
+
+ var MAX_NUM_SIZE = 16;
+ var MAX_ENCODED_NUM_SIZE = 19; // ceil(MAX_NUM_SIZE * 7 / 8)
+
+ function BinaryCMapStream(data) {
+ this.buffer = data;
+ this.pos = 0;
+ this.end = data.length;
+ this.tmpBuf = new Uint8Array(MAX_ENCODED_NUM_SIZE);
+ }
+
+ BinaryCMapStream.prototype = {
+ readByte: function () {
+ if (this.pos >= this.end) {
+ return -1;
+ }
+ return this.buffer[this.pos++];
+ },
+ readNumber: function () {
+ var n = 0;
+ var last;
+ do {
+ var b = this.readByte();
+ if (b < 0) {
+ error('unexpected EOF in bcmap');
+ }
+ last = !(b & 0x80);
+ n = (n << 7) | (b & 0x7F);
+ } while (!last);
+ return n;
+ },
+ readSigned: function () {
+ var n = this.readNumber();
+ return (n & 1) ? ~(n >>> 1) : n >>> 1;
+ },
+ readHex: function (num, size) {
+ num.set(this.buffer.subarray(this.pos,
+ this.pos + size + 1));
+ this.pos += size + 1;
+ },
+ readHexNumber: function (num, size) {
+ var last;
+ var stack = this.tmpBuf, sp = 0;
+ do {
+ var b = this.readByte();
+ if (b < 0) {
+ error('unexpected EOF in bcmap');
+ }
+ last = !(b & 0x80);
+ stack[sp++] = b & 0x7F;
+ } while (!last);
+ var i = size, buffer = 0, bufferSize = 0;
+ while (i >= 0) {
+ while (bufferSize < 8 && stack.length > 0) {
+ buffer = (stack[--sp] << bufferSize) | buffer;
+ bufferSize += 7;
+ }
+ num[i] = buffer & 255;
+ i--;
+ buffer >>= 8;
+ bufferSize -= 8;
+ }
+ },
+ readHexSigned: function (num, size) {
+ this.readHexNumber(num, size);
+ var sign = num[size] & 1 ? 255 : 0;
+ var c = 0;
+ for (var i = 0; i <= size; i++) {
+ c = ((c & 1) << 8) | num[i];
+ num[i] = (c >> 1) ^ sign;
+ }
+ },
+ readString: function () {
+ var len = this.readNumber();
+ var s = '';
+ for (var i = 0; i < len; i++) {
+ s += String.fromCharCode(this.readNumber());
+ }
+ return s;
+ }
+ };
+
+ function processBinaryCMap(url, cMap, extend) {
+ var data = fetchBinaryData(url);
+ var stream = new BinaryCMapStream(data);
+
+ var header = stream.readByte();
+ cMap.vertical = !!(header & 1);
+
+ var useCMap = null;
+ var start = new Uint8Array(MAX_NUM_SIZE);
+ var end = new Uint8Array(MAX_NUM_SIZE);
+ var char = new Uint8Array(MAX_NUM_SIZE);
+ var charCode = new Uint8Array(MAX_NUM_SIZE);
+ var tmp = new Uint8Array(MAX_NUM_SIZE);
+ var code;
+
+ var b;
+ while ((b = stream.readByte()) >= 0) {
+ var type = b >> 5;
+ if (type === 7) { // metadata, e.g. comment or usecmap
+ switch (b & 0x1F) {
+ case 0:
+ stream.readString(); // skipping comment
+ break;
+ case 1:
+ useCMap = stream.readString();
+ break;
+ }
+ continue;
+ }
+ var sequence = !!(b & 0x10);
+ var dataSize = b & 15;
+
+ assert(dataSize + 1 <= MAX_NUM_SIZE);
+
+ var ucs2DataSize = 1;
+ var subitemsCount = stream.readNumber();
+ var i;
+ switch (type) {
+ case 0: // codespacerange
+ stream.readHex(start, dataSize);
+ stream.readHexNumber(end, dataSize);
+ addHex(end, start, dataSize);
+ cMap.addCodespaceRange(dataSize + 1, hexToInt(start, dataSize),
+ hexToInt(end, dataSize));
+ for (i = 1; i < subitemsCount; i++) {
+ incHex(end, dataSize);
+ stream.readHexNumber(start, dataSize);
+ addHex(start, end, dataSize);
+ stream.readHexNumber(end, dataSize);
+ addHex(end, start, dataSize);
+ cMap.addCodespaceRange(dataSize + 1, hexToInt(start, dataSize),
+ hexToInt(end, dataSize));
+ }
+ break;
+ case 1: // notdefrange
+ stream.readHex(start, dataSize);
+ stream.readHexNumber(end, dataSize);
+ addHex(end, start, dataSize);
+ code = stream.readNumber();
+ // undefined range, skipping
+ for (i = 1; i < subitemsCount; i++) {
+ incHex(end, dataSize);
+ stream.readHexNumber(start, dataSize);
+ addHex(start, end, dataSize);
+ stream.readHexNumber(end, dataSize);
+ addHex(end, start, dataSize);
+ code = stream.readNumber();
+ // nop
+ }
+ break;
+ case 2: // cidchar
+ stream.readHex(char, dataSize);
+ code = stream.readNumber();
+ cMap.mapOne(hexToInt(char, dataSize), code);
+ for (i = 1; i < subitemsCount; i++) {
+ incHex(char, dataSize);
+ if (!sequence) {
+ stream.readHexNumber(tmp, dataSize);
+ addHex(char, tmp, dataSize);
+ }
+ code = stream.readSigned() + (code + 1);
+ cMap.mapOne(hexToInt(char, dataSize), code);
+ }
+ break;
+ case 3: // cidrange
+ stream.readHex(start, dataSize);
+ stream.readHexNumber(end, dataSize);
+ addHex(end, start, dataSize);
+ code = stream.readNumber();
+ cMap.mapCidRange(hexToInt(start, dataSize), hexToInt(end, dataSize),
+ code);
+ for (i = 1; i < subitemsCount; i++) {
+ incHex(end, dataSize);
+ if (!sequence) {
+ stream.readHexNumber(start, dataSize);
+ addHex(start, end, dataSize);
+ } else {
+ start.set(end);
+ }
+ stream.readHexNumber(end, dataSize);
+ addHex(end, start, dataSize);
+ code = stream.readNumber();
+ cMap.mapCidRange(hexToInt(start, dataSize), hexToInt(end, dataSize),
+ code);
+ }
+ break;
+ case 4: // bfchar
+ stream.readHex(char, ucs2DataSize);
+ stream.readHex(charCode, dataSize);
+ cMap.mapOne(hexToInt(char, ucs2DataSize),
+ hexToStr(charCode, dataSize));
+ for (i = 1; i < subitemsCount; i++) {
+ incHex(char, ucs2DataSize);
+ if (!sequence) {
+ stream.readHexNumber(tmp, ucs2DataSize);
+ addHex(char, tmp, ucs2DataSize);
+ }
+ incHex(charCode, dataSize);
+ stream.readHexSigned(tmp, dataSize);
+ addHex(charCode, tmp, dataSize);
+ cMap.mapOne(hexToInt(char, ucs2DataSize),
+ hexToStr(charCode, dataSize));
+ }
+ break;
+ case 5: // bfrange
+ stream.readHex(start, ucs2DataSize);
+ stream.readHexNumber(end, ucs2DataSize);
+ addHex(end, start, ucs2DataSize);
+ stream.readHex(charCode, dataSize);
+ cMap.mapBfRange(hexToInt(start, ucs2DataSize),
+ hexToInt(end, ucs2DataSize),
+ hexToStr(charCode, dataSize));
+ for (i = 1; i < subitemsCount; i++) {
+ incHex(end, ucs2DataSize);
+ if (!sequence) {
+ stream.readHexNumber(start, ucs2DataSize);
+ addHex(start, end, ucs2DataSize);
+ } else {
+ start.set(end);
+ }
+ stream.readHexNumber(end, ucs2DataSize);
+ addHex(end, start, ucs2DataSize);
+ stream.readHex(charCode, dataSize);
+ cMap.mapBfRange(hexToInt(start, ucs2DataSize),
+ hexToInt(end, ucs2DataSize),
+ hexToStr(charCode, dataSize));
+ }
+ break;
+ default:
+ error('Unknown type: ' + type);
+ break;
+ }
+ }
+
+ if (useCMap) {
+ extend(useCMap);
+ }
+ return cMap;
+ }
+
+ function BinaryCMapReader() {}
+
+ BinaryCMapReader.prototype = {
+ read: processBinaryCMap
+ };
+
+ return BinaryCMapReader;
+})();
+
+var CMapFactory = (function CMapFactoryClosure() {
+ function strToInt(str) {
+ var a = 0;
+ for (var i = 0; i < str.length; i++) {
+ a = (a << 8) | str.charCodeAt(i);
+ }
+ return a >>> 0;
+ }
+
+ function expectString(obj) {
+ if (!isString(obj)) {
+ error('Malformed CMap: expected string.');
+ }
+ }
+
+ function expectInt(obj) {
+ if (!isInt(obj)) {
+ error('Malformed CMap: expected int.');
+ }
+ }
+
+ function parseBfChar(cMap, lexer) {
+ while (true) {
+ var obj = lexer.getObj();
+ if (isEOF(obj)) {
+ break;
+ }
+ if (isCmd(obj, 'endbfchar')) {
+ return;
+ }
+ expectString(obj);
+ var src = strToInt(obj);
+ obj = lexer.getObj();
+ // TODO are /dstName used?
+ expectString(obj);
+ var dst = obj;
+ cMap.mapOne(src, dst);
+ }
+ }
+
+ function parseBfRange(cMap, lexer) {
+ while (true) {
+ var obj = lexer.getObj();
+ if (isEOF(obj)) {
+ break;
+ }
+ if (isCmd(obj, 'endbfrange')) {
+ return;
+ }
+ expectString(obj);
+ var low = strToInt(obj);
+ obj = lexer.getObj();
+ expectString(obj);
+ var high = strToInt(obj);
+ obj = lexer.getObj();
+ if (isInt(obj) || isString(obj)) {
+ var dstLow = isInt(obj) ? String.fromCharCode(obj) : obj;
+ cMap.mapBfRange(low, high, dstLow);
+ } else if (isCmd(obj, '[')) {
+ obj = lexer.getObj();
+ var array = [];
+ while (!isCmd(obj, ']') && !isEOF(obj)) {
+ array.push(obj);
+ obj = lexer.getObj();
+ }
+ cMap.mapBfRangeToArray(low, high, array);
+ } else {
+ break;
+ }
+ }
+ error('Invalid bf range.');
+ }
+
+ function parseCidChar(cMap, lexer) {
+ while (true) {
+ var obj = lexer.getObj();
+ if (isEOF(obj)) {
+ break;
+ }
+ if (isCmd(obj, 'endcidchar')) {
+ return;
+ }
+ expectString(obj);
+ var src = strToInt(obj);
+ obj = lexer.getObj();
+ expectInt(obj);
+ var dst = obj;
+ cMap.mapOne(src, dst);
+ }
+ }
+
+ function parseCidRange(cMap, lexer) {
+ while (true) {
+ var obj = lexer.getObj();
+ if (isEOF(obj)) {
+ break;
+ }
+ if (isCmd(obj, 'endcidrange')) {
+ return;
+ }
+ expectString(obj);
+ var low = strToInt(obj);
+ obj = lexer.getObj();
+ expectString(obj);
+ var high = strToInt(obj);
+ obj = lexer.getObj();
+ expectInt(obj);
+ var dstLow = obj;
+ cMap.mapCidRange(low, high, dstLow);
+ }
+ }
+
+ function parseCodespaceRange(cMap, lexer) {
+ while (true) {
+ var obj = lexer.getObj();
+ if (isEOF(obj)) {
+ break;
+ }
+ if (isCmd(obj, 'endcodespacerange')) {
+ return;
+ }
+ if (!isString(obj)) {
+ break;
+ }
+ var low = strToInt(obj);
+ obj = lexer.getObj();
+ if (!isString(obj)) {
+ break;
+ }
+ var high = strToInt(obj);
+ cMap.addCodespaceRange(obj.length, low, high);
+ }
+ error('Invalid codespace range.');
+ }
+
+ function parseWMode(cMap, lexer) {
+ var obj = lexer.getObj();
+ if (isInt(obj)) {
+ cMap.vertical = !!obj;
+ }
+ }
+
+ function parseCMapName(cMap, lexer) {
+ var obj = lexer.getObj();
+ if (isName(obj) && isString(obj.name)) {
+ cMap.name = obj.name;
+ }
+ }
+
+ function parseCMap(cMap, lexer, builtInCMapParams, useCMap) {
+ var previous;
+ var embededUseCMap;
+ objLoop: while (true) {
+ var obj = lexer.getObj();
+ if (isEOF(obj)) {
+ break;
+ } else if (isName(obj)) {
+ if (obj.name === 'WMode') {
+ parseWMode(cMap, lexer);
+ } else if (obj.name === 'CMapName') {
+ parseCMapName(cMap, lexer);
+ }
+ previous = obj;
+ } else if (isCmd(obj)) {
+ switch (obj.cmd) {
+ case 'endcmap':
+ break objLoop;
+ case 'usecmap':
+ if (isName(previous)) {
+ embededUseCMap = previous.name;
+ }
+ break;
+ case 'begincodespacerange':
+ parseCodespaceRange(cMap, lexer);
+ break;
+ case 'beginbfchar':
+ parseBfChar(cMap, lexer);
+ break;
+ case 'begincidchar':
+ parseCidChar(cMap, lexer);
+ break;
+ case 'beginbfrange':
+ parseBfRange(cMap, lexer);
+ break;
+ case 'begincidrange':
+ parseCidRange(cMap, lexer);
+ break;
+ }
+ }
+ }
+
+ if (!useCMap && embededUseCMap) {
+ // Load the usecmap definition from the file only if there wasn't one
+ // specified.
+ useCMap = embededUseCMap;
+ }
+ if (useCMap) {
+ extendCMap(cMap, builtInCMapParams, useCMap);
+ }
+ }
+
+ function extendCMap(cMap, builtInCMapParams, useCMap) {
+ cMap.useCMap = createBuiltInCMap(useCMap, builtInCMapParams);
+ // If there aren't any code space ranges defined clone all the parent ones
+ // into this cMap.
+ if (cMap.numCodespaceRanges === 0) {
+ var useCodespaceRanges = cMap.useCMap.codespaceRanges;
+ for (var i = 0; i < useCodespaceRanges.length; i++) {
+ cMap.codespaceRanges[i] = useCodespaceRanges[i].slice();
+ }
+ cMap.numCodespaceRanges = cMap.useCMap.numCodespaceRanges;
+ }
+ // Merge the map into the current one, making sure not to override
+ // any previously defined entries.
+ cMap.useCMap.forEach(function(key, value) {
+ if (!cMap.contains(key)) {
+ cMap.mapOne(key, cMap.useCMap.lookup(key));
+ }
+ });
+ }
+
+ function parseBinaryCMap(name, builtInCMapParams) {
+ var url = builtInCMapParams.url + name + '.bcmap';
+ var cMap = new CMap(true);
+ new BinaryCMapReader().read(url, cMap, function (useCMap) {
+ extendCMap(cMap, builtInCMapParams, useCMap);
+ });
+ return cMap;
+ }
+
+ function createBuiltInCMap(name, builtInCMapParams) {
+ if (name === 'Identity-H') {
+ return new IdentityCMap(false, 2);
+ } else if (name === 'Identity-V') {
+ return new IdentityCMap(true, 2);
+ }
+ if (BUILT_IN_CMAPS.indexOf(name) === -1) {
+ error('Unknown cMap name: ' + name);
+ }
+ assert(builtInCMapParams, 'built-in cMap parameters are not provided');
+
+ if (builtInCMapParams.packed) {
+ return parseBinaryCMap(name, builtInCMapParams);
+ }
+
+ var request = new XMLHttpRequest();
+ var url = builtInCMapParams.url + name;
+ request.open('GET', url, false);
+ request.send(null);
+ if (!request.responseText) {
+ error('Unable to get cMap at: ' + url);
+ }
+ var cMap = new CMap(true);
+ var lexer = new Lexer(new StringStream(request.responseText));
+ parseCMap(cMap, lexer, builtInCMapParams, null);
+ return cMap;
+ }
+
+ return {
+ create: function (encoding, builtInCMapParams, useCMap) {
+ if (isName(encoding)) {
+ return createBuiltInCMap(encoding.name, builtInCMapParams);
+ } else if (isStream(encoding)) {
+ var cMap = new CMap();
+ var lexer = new Lexer(encoding);
+ try {
+ parseCMap(cMap, lexer, builtInCMapParams, useCMap);
+ } catch (e) {
+ warn('Invalid CMap data. ' + e);
+ }
+ if (cMap.isIdentityCMap) {
+ return createBuiltInCMap(cMap.name, builtInCMapParams);
+ }
+ return cMap;
+ }
+ error('Encoding required.');
+ }
+ };
+})();
+
+
+// Unicode Private Use Area
+var PRIVATE_USE_OFFSET_START = 0xE000;
+var PRIVATE_USE_OFFSET_END = 0xF8FF;
+var SKIP_PRIVATE_USE_RANGE_F000_TO_F01F = false;
+
+// PDF Glyph Space Units are one Thousandth of a TextSpace Unit
+// except for Type 3 fonts
+var PDF_GLYPH_SPACE_UNITS = 1000;
+
+// Hinting is currently disabled due to unknown problems on windows
+// in tracemonkey and various other pdfs with type1 fonts.
+var HINTING_ENABLED = false;
+
+// Accented charactars are not displayed properly on windows, using this flag
+// to control analysis of seac charstrings.
+var SEAC_ANALYSIS_ENABLED = false;
+
+var FontFlags = {
+ FixedPitch: 1,
+ Serif: 2,
+ Symbolic: 4,
+ Script: 8,
+ Nonsymbolic: 32,
+ Italic: 64,
+ AllCap: 65536,
+ SmallCap: 131072,
+ ForceBold: 262144
+};
+
+var Encodings = {
+ ExpertEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+ '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+ 'space', 'exclamsmall', 'Hungarumlautsmall', '', 'dollaroldstyle',
+ 'dollarsuperior', 'ampersandsmall', 'Acutesmall', 'parenleftsuperior',
+ 'parenrightsuperior', 'twodotenleader', 'onedotenleader', 'comma',
+ 'hyphen', 'period', 'fraction', 'zerooldstyle', 'oneoldstyle',
+ 'twooldstyle', 'threeoldstyle', 'fouroldstyle', 'fiveoldstyle',
+ 'sixoldstyle', 'sevenoldstyle', 'eightoldstyle', 'nineoldstyle', 'colon',
+ 'semicolon', 'commasuperior', 'threequartersemdash', 'periodsuperior',
+ 'questionsmall', '', 'asuperior', 'bsuperior', 'centsuperior', 'dsuperior',
+ 'esuperior', '', '', 'isuperior', '', '', 'lsuperior', 'msuperior',
+ 'nsuperior', 'osuperior', '', '', 'rsuperior', 'ssuperior', 'tsuperior',
+ '', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior', '',
+ 'parenrightinferior', 'Circumflexsmall', 'hyphensuperior', 'Gravesmall',
+ 'Asmall', 'Bsmall', 'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall',
+ 'Hsmall', 'Ismall', 'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall',
+ 'Osmall', 'Psmall', 'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall',
+ 'Vsmall', 'Wsmall', 'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary',
+ 'onefitted', 'rupiah', 'Tildesmall', '', '', '', '', '', '', '', '', '',
+ '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+ '', '', '', '', '', '', 'exclamdownsmall', 'centoldstyle', 'Lslashsmall',
+ '', '', 'Scaronsmall', 'Zcaronsmall', 'Dieresissmall', 'Brevesmall',
+ 'Caronsmall', '', 'Dotaccentsmall', '', '', 'Macronsmall', '', '',
+ 'figuredash', 'hypheninferior', '', '', 'Ogoneksmall', 'Ringsmall',
+ 'Cedillasmall', '', '', '', 'onequarter', 'onehalf', 'threequarters',
+ 'questiondownsmall', 'oneeighth', 'threeeighths', 'fiveeighths',
+ 'seveneighths', 'onethird', 'twothirds', '', '', 'zerosuperior',
+ 'onesuperior', 'twosuperior', 'threesuperior', 'foursuperior',
+ 'fivesuperior', 'sixsuperior', 'sevensuperior', 'eightsuperior',
+ 'ninesuperior', 'zeroinferior', 'oneinferior', 'twoinferior',
+ 'threeinferior', 'fourinferior', 'fiveinferior', 'sixinferior',
+ 'seveninferior', 'eightinferior', 'nineinferior', 'centinferior',
+ 'dollarinferior', 'periodinferior', 'commainferior', 'Agravesmall',
+ 'Aacutesmall', 'Acircumflexsmall', 'Atildesmall', 'Adieresissmall',
+ 'Aringsmall', 'AEsmall', 'Ccedillasmall', 'Egravesmall', 'Eacutesmall',
+ 'Ecircumflexsmall', 'Edieresissmall', 'Igravesmall', 'Iacutesmall',
+ 'Icircumflexsmall', 'Idieresissmall', 'Ethsmall', 'Ntildesmall',
+ 'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall', 'Otildesmall',
+ 'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall', 'Uacutesmall',
+ 'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall', 'Thornsmall',
+ 'Ydieresissmall'],
+ MacExpertEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '',
+ '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+ 'space', 'exclamsmall', 'Hungarumlautsmall', 'centoldstyle',
+ 'dollaroldstyle', 'dollarsuperior', 'ampersandsmall', 'Acutesmall',
+ 'parenleftsuperior', 'parenrightsuperior', 'twodotenleader',
+ 'onedotenleader', 'comma', 'hyphen', 'period', 'fraction', 'zerooldstyle',
+ 'oneoldstyle', 'twooldstyle', 'threeoldstyle', 'fouroldstyle',
+ 'fiveoldstyle', 'sixoldstyle', 'sevenoldstyle', 'eightoldstyle',
+ 'nineoldstyle', 'colon', 'semicolon', '', 'threequartersemdash', '',
+ 'questionsmall', '', '', '', '', 'Ethsmall', '', '', 'onequarter',
+ 'onehalf', 'threequarters', 'oneeighth', 'threeeighths', 'fiveeighths',
+ 'seveneighths', 'onethird', 'twothirds', '', '', '', '', '', '', 'ff',
+ 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior', '', 'parenrightinferior',
+ 'Circumflexsmall', 'hypheninferior', 'Gravesmall', 'Asmall', 'Bsmall',
+ 'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall', 'Hsmall', 'Ismall',
+ 'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall', 'Osmall', 'Psmall',
+ 'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall', 'Vsmall', 'Wsmall',
+ 'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary', 'onefitted', 'rupiah',
+ 'Tildesmall', '', '', 'asuperior', 'centsuperior', '', '', '', '',
+ 'Aacutesmall', 'Agravesmall', 'Acircumflexsmall', 'Adieresissmall',
+ 'Atildesmall', 'Aringsmall', 'Ccedillasmall', 'Eacutesmall', 'Egravesmall',
+ 'Ecircumflexsmall', 'Edieresissmall', 'Iacutesmall', 'Igravesmall',
+ 'Icircumflexsmall', 'Idieresissmall', 'Ntildesmall', 'Oacutesmall',
+ 'Ogravesmall', 'Ocircumflexsmall', 'Odieresissmall', 'Otildesmall',
+ 'Uacutesmall', 'Ugravesmall', 'Ucircumflexsmall', 'Udieresissmall', '',
+ 'eightsuperior', 'fourinferior', 'threeinferior', 'sixinferior',
+ 'eightinferior', 'seveninferior', 'Scaronsmall', '', 'centinferior',
+ 'twoinferior', '', 'Dieresissmall', '', 'Caronsmall', 'osuperior',
+ 'fiveinferior', '', 'commainferior', 'periodinferior', 'Yacutesmall', '',
+ 'dollarinferior', '', 'Thornsmall', '', 'nineinferior', 'zeroinferior',
+ 'Zcaronsmall', 'AEsmall', 'Oslashsmall', 'questiondownsmall',
+ 'oneinferior', 'Lslashsmall', '', '', '', '', '', '', 'Cedillasmall', '',
+ '', '', '', '', 'OEsmall', 'figuredash', 'hyphensuperior', '', '', '', '',
+ 'exclamdownsmall', '', 'Ydieresissmall', '', 'onesuperior', 'twosuperior',
+ 'threesuperior', 'foursuperior', 'fivesuperior', 'sixsuperior',
+ 'sevensuperior', 'ninesuperior', 'zerosuperior', '', 'esuperior',
+ 'rsuperior', 'tsuperior', '', '', 'isuperior', 'ssuperior', 'dsuperior',
+ '', '', '', '', '', 'lsuperior', 'Ogoneksmall', 'Brevesmall',
+ 'Macronsmall', 'bsuperior', 'nsuperior', 'msuperior', 'commasuperior',
+ 'periodsuperior', 'Dotaccentsmall', 'Ringsmall'],
+ MacRomanEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+ '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+ 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent',
+ 'ampersand', 'quotesingle', 'parenleft', 'parenright', 'asterisk', 'plus',
+ 'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three',
+ 'four', 'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon',
+ 'less', 'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F',
+ 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U',
+ 'V', 'W', 'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright',
+ 'asciicircum', 'underscore', 'grave', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
+ 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+ 'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright', 'asciitilde', '',
+ 'Adieresis', 'Aring', 'Ccedilla', 'Eacute', 'Ntilde', 'Odieresis',
+ 'Udieresis', 'aacute', 'agrave', 'acircumflex', 'adieresis', 'atilde',
+ 'aring', 'ccedilla', 'eacute', 'egrave', 'ecircumflex', 'edieresis',
+ 'iacute', 'igrave', 'icircumflex', 'idieresis', 'ntilde', 'oacute',
+ 'ograve', 'ocircumflex', 'odieresis', 'otilde', 'uacute', 'ugrave',
+ 'ucircumflex', 'udieresis', 'dagger', 'degree', 'cent', 'sterling',
+ 'section', 'bullet', 'paragraph', 'germandbls', 'registered', 'copyright',
+ 'trademark', 'acute', 'dieresis', 'notequal', 'AE', 'Oslash', 'infinity',
+ 'plusminus', 'lessequal', 'greaterequal', 'yen', 'mu', 'partialdiff',
+ 'summation', 'product', 'pi', 'integral', 'ordfeminine', 'ordmasculine',
+ 'Omega', 'ae', 'oslash', 'questiondown', 'exclamdown', 'logicalnot',
+ 'radical', 'florin', 'approxequal', 'Delta', 'guillemotleft',
+ 'guillemotright', 'ellipsis', 'space', 'Agrave', 'Atilde', 'Otilde', 'OE',
+ 'oe', 'endash', 'emdash', 'quotedblleft', 'quotedblright', 'quoteleft',
+ 'quoteright', 'divide', 'lozenge', 'ydieresis', 'Ydieresis', 'fraction',
+ 'currency', 'guilsinglleft', 'guilsinglright', 'fi', 'fl', 'daggerdbl',
+ 'periodcentered', 'quotesinglbase', 'quotedblbase', 'perthousand',
+ 'Acircumflex', 'Ecircumflex', 'Aacute', 'Edieresis', 'Egrave', 'Iacute',
+ 'Icircumflex', 'Idieresis', 'Igrave', 'Oacute', 'Ocircumflex', 'apple',
+ 'Ograve', 'Uacute', 'Ucircumflex', 'Ugrave', 'dotlessi', 'circumflex',
+ 'tilde', 'macron', 'breve', 'dotaccent', 'ring', 'cedilla', 'hungarumlaut',
+ 'ogonek', 'caron'],
+ StandardEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+ '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+ 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent',
+ 'ampersand', 'quoteright', 'parenleft', 'parenright', 'asterisk', 'plus',
+ 'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three',
+ 'four', 'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon',
+ 'less', 'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F',
+ 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U',
+ 'V', 'W', 'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright',
+ 'asciicircum', 'underscore', 'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f',
+ 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u',
+ 'v', 'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright', 'asciitilde',
+ '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+ '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'exclamdown',
+ 'cent', 'sterling', 'fraction', 'yen', 'florin', 'section', 'currency',
+ 'quotesingle', 'quotedblleft', 'guillemotleft', 'guilsinglleft',
+ 'guilsinglright', 'fi', 'fl', '', 'endash', 'dagger', 'daggerdbl',
+ 'periodcentered', '', 'paragraph', 'bullet', 'quotesinglbase',
+ 'quotedblbase', 'quotedblright', 'guillemotright', 'ellipsis',
+ 'perthousand', '', 'questiondown', '', 'grave', 'acute', 'circumflex',
+ 'tilde', 'macron', 'breve', 'dotaccent', 'dieresis', '', 'ring', 'cedilla',
+ '', 'hungarumlaut', 'ogonek', 'caron', 'emdash', '', '', '', '', '', '',
+ '', '', '', '', '', '', '', '', '', '', 'AE', '', 'ordfeminine', '', '',
+ '', '', 'Lslash', 'Oslash', 'OE', 'ordmasculine', '', '', '', '', '', 'ae',
+ '', '', '', 'dotlessi', '', '', 'lslash', 'oslash', 'oe', 'germandbls'],
+ WinAnsiEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+ '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+ 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent',
+ 'ampersand', 'quotesingle', 'parenleft', 'parenright', 'asterisk', 'plus',
+ 'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three',
+ 'four', 'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon',
+ 'less', 'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F',
+ 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U',
+ 'V', 'W', 'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright',
+ 'asciicircum', 'underscore', 'grave', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
+ 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+ 'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright', 'asciitilde',
+ 'bullet', 'Euro', 'bullet', 'quotesinglbase', 'florin', 'quotedblbase',
+ 'ellipsis', 'dagger', 'daggerdbl', 'circumflex', 'perthousand', 'Scaron',
+ 'guilsinglleft', 'OE', 'bullet', 'Zcaron', 'bullet', 'bullet', 'quoteleft',
+ 'quoteright', 'quotedblleft', 'quotedblright', 'bullet', 'endash',
+ 'emdash', 'tilde', 'trademark', 'scaron', 'guilsinglright', 'oe', 'bullet',
+ 'zcaron', 'Ydieresis', 'space', 'exclamdown', 'cent', 'sterling',
+ 'currency', 'yen', 'brokenbar', 'section', 'dieresis', 'copyright',
+ 'ordfeminine', 'guillemotleft', 'logicalnot', 'hyphen', 'registered',
+ 'macron', 'degree', 'plusminus', 'twosuperior', 'threesuperior', 'acute',
+ 'mu', 'paragraph', 'periodcentered', 'cedilla', 'onesuperior',
+ 'ordmasculine', 'guillemotright', 'onequarter', 'onehalf', 'threequarters',
+ 'questiondown', 'Agrave', 'Aacute', 'Acircumflex', 'Atilde', 'Adieresis',
+ 'Aring', 'AE', 'Ccedilla', 'Egrave', 'Eacute', 'Ecircumflex', 'Edieresis',
+ 'Igrave', 'Iacute', 'Icircumflex', 'Idieresis', 'Eth', 'Ntilde', 'Ograve',
+ 'Oacute', 'Ocircumflex', 'Otilde', 'Odieresis', 'multiply', 'Oslash',
+ 'Ugrave', 'Uacute', 'Ucircumflex', 'Udieresis', 'Yacute', 'Thorn',
+ 'germandbls', 'agrave', 'aacute', 'acircumflex', 'atilde', 'adieresis',
+ 'aring', 'ae', 'ccedilla', 'egrave', 'eacute', 'ecircumflex', 'edieresis',
+ 'igrave', 'iacute', 'icircumflex', 'idieresis', 'eth', 'ntilde', 'ograve',
+ 'oacute', 'ocircumflex', 'otilde', 'odieresis', 'divide', 'oslash',
+ 'ugrave', 'uacute', 'ucircumflex', 'udieresis', 'yacute', 'thorn',
+ 'ydieresis'],
+ SymbolSetEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '',
+ '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+ 'space', 'exclam', 'universal', 'numbersign', 'existential', 'percent',
+ 'ampersand', 'suchthat', 'parenleft', 'parenright', 'asteriskmath', 'plus',
+ 'comma', 'minus', 'period', 'slash', 'zero', 'one', 'two', 'three', 'four',
+ 'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon', 'less',
+ 'equal', 'greater', 'question', 'congruent', 'Alpha', 'Beta', 'Chi',
+ 'Delta', 'Epsilon', 'Phi', 'Gamma', 'Eta', 'Iota', 'theta1', 'Kappa',
+ 'Lambda', 'Mu', 'Nu', 'Omicron', 'Pi', 'Theta', 'Rho', 'Sigma', 'Tau',
+ 'Upsilon', 'sigma1', 'Omega', 'Xi', 'Psi', 'Zeta', 'bracketleft',
+ 'therefore', 'bracketright', 'perpendicular', 'underscore', 'radicalex',
+ 'alpha', 'beta', 'chi', 'delta', 'epsilon', 'phi', 'gamma', 'eta', 'iota',
+ 'phi1', 'kappa', 'lambda', 'mu', 'nu', 'omicron', 'pi', 'theta', 'rho',
+ 'sigma', 'tau', 'upsilon', 'omega1', 'omega', 'xi', 'psi', 'zeta',
+ 'braceleft', 'bar', 'braceright', 'similar', '', '', '', '', '', '', '',
+ '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+ '', '', '', '', '', '', '', 'Euro', 'Upsilon1', 'minute', 'lessequal',
+ 'fraction', 'infinity', 'florin', 'club', 'diamond', 'heart', 'spade',
+ 'arrowboth', 'arrowleft', 'arrowup', 'arrowright', 'arrowdown', 'degree',
+ 'plusminus', 'second', 'greaterequal', 'multiply', 'proportional',
+ 'partialdiff', 'bullet', 'divide', 'notequal', 'equivalence',
+ 'approxequal', 'ellipsis', 'arrowvertex', 'arrowhorizex', 'carriagereturn',
+ 'aleph', 'Ifraktur', 'Rfraktur', 'weierstrass', 'circlemultiply',
+ 'circleplus', 'emptyset', 'intersection', 'union', 'propersuperset',
+ 'reflexsuperset', 'notsubset', 'propersubset', 'reflexsubset', 'element',
+ 'notelement', 'angle', 'gradient', 'registerserif', 'copyrightserif',
+ 'trademarkserif', 'product', 'radical', 'dotmath', 'logicalnot',
+ 'logicaland', 'logicalor', 'arrowdblboth', 'arrowdblleft', 'arrowdblup',
+ 'arrowdblright', 'arrowdbldown', 'lozenge', 'angleleft', 'registersans',
+ 'copyrightsans', 'trademarksans', 'summation', 'parenlefttp',
+ 'parenleftex', 'parenleftbt', 'bracketlefttp', 'bracketleftex',
+ 'bracketleftbt', 'bracelefttp', 'braceleftmid', 'braceleftbt', 'braceex',
+ '', 'angleright', 'integral', 'integraltp', 'integralex', 'integralbt',
+ 'parenrighttp', 'parenrightex', 'parenrightbt', 'bracketrighttp',
+ 'bracketrightex', 'bracketrightbt', 'bracerighttp', 'bracerightmid',
+ 'bracerightbt'],
+ ZapfDingbatsEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '',
+ '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+ 'space', 'a1', 'a2', 'a202', 'a3', 'a4', 'a5', 'a119', 'a118', 'a117',
+ 'a11', 'a12', 'a13', 'a14', 'a15', 'a16', 'a105', 'a17', 'a18', 'a19',
+ 'a20', 'a21', 'a22', 'a23', 'a24', 'a25', 'a26', 'a27', 'a28', 'a6', 'a7',
+ 'a8', 'a9', 'a10', 'a29', 'a30', 'a31', 'a32', 'a33', 'a34', 'a35', 'a36',
+ 'a37', 'a38', 'a39', 'a40', 'a41', 'a42', 'a43', 'a44', 'a45', 'a46',
+ 'a47', 'a48', 'a49', 'a50', 'a51', 'a52', 'a53', 'a54', 'a55', 'a56',
+ 'a57', 'a58', 'a59', 'a60', 'a61', 'a62', 'a63', 'a64', 'a65', 'a66',
+ 'a67', 'a68', 'a69', 'a70', 'a71', 'a72', 'a73', 'a74', 'a203', 'a75',
+ 'a204', 'a76', 'a77', 'a78', 'a79', 'a81', 'a82', 'a83', 'a84', 'a97',
+ 'a98', 'a99', 'a100', '', 'a89', 'a90', 'a93', 'a94', 'a91', 'a92', 'a205',
+ 'a85', 'a206', 'a86', 'a87', 'a88', 'a95', 'a96', '', '', '', '', '', '',
+ '', '', '', '', '', '', '', '', '', '', '', '', '', 'a101', 'a102', 'a103',
+ 'a104', 'a106', 'a107', 'a108', 'a112', 'a111', 'a110', 'a109', 'a120',
+ 'a121', 'a122', 'a123', 'a124', 'a125', 'a126', 'a127', 'a128', 'a129',
+ 'a130', 'a131', 'a132', 'a133', 'a134', 'a135', 'a136', 'a137', 'a138',
+ 'a139', 'a140', 'a141', 'a142', 'a143', 'a144', 'a145', 'a146', 'a147',
+ 'a148', 'a149', 'a150', 'a151', 'a152', 'a153', 'a154', 'a155', 'a156',
+ 'a157', 'a158', 'a159', 'a160', 'a161', 'a163', 'a164', 'a196', 'a165',
+ 'a192', 'a166', 'a167', 'a168', 'a169', 'a170', 'a171', 'a172', 'a173',
+ 'a162', 'a174', 'a175', 'a176', 'a177', 'a178', 'a179', 'a193', 'a180',
+ 'a199', 'a181', 'a200', 'a182', '', 'a201', 'a183', 'a184', 'a197', 'a185',
+ 'a194', 'a198', 'a186', 'a195', 'a187', 'a188', 'a189', 'a190', 'a191']
+};
+
+/**
+ * Hold a map of decoded fonts and of the standard fourteen Type1
+ * fonts and their acronyms.
+ */
+var stdFontMap = {
+ 'ArialNarrow': 'Helvetica',
+ 'ArialNarrow-Bold': 'Helvetica-Bold',
+ 'ArialNarrow-BoldItalic': 'Helvetica-BoldOblique',
+ 'ArialNarrow-Italic': 'Helvetica-Oblique',
+ 'ArialBlack': 'Helvetica',
+ 'ArialBlack-Bold': 'Helvetica-Bold',
+ 'ArialBlack-BoldItalic': 'Helvetica-BoldOblique',
+ 'ArialBlack-Italic': 'Helvetica-Oblique',
+ 'Arial': 'Helvetica',
+ 'Arial-Bold': 'Helvetica-Bold',
+ 'Arial-BoldItalic': 'Helvetica-BoldOblique',
+ 'Arial-Italic': 'Helvetica-Oblique',
+ 'Arial-BoldItalicMT': 'Helvetica-BoldOblique',
+ 'Arial-BoldMT': 'Helvetica-Bold',
+ 'Arial-ItalicMT': 'Helvetica-Oblique',
+ 'ArialMT': 'Helvetica',
+ 'Courier-Bold': 'Courier-Bold',
+ 'Courier-BoldItalic': 'Courier-BoldOblique',
+ 'Courier-Italic': 'Courier-Oblique',
+ 'CourierNew': 'Courier',
+ 'CourierNew-Bold': 'Courier-Bold',
+ 'CourierNew-BoldItalic': 'Courier-BoldOblique',
+ 'CourierNew-Italic': 'Courier-Oblique',
+ 'CourierNewPS-BoldItalicMT': 'Courier-BoldOblique',
+ 'CourierNewPS-BoldMT': 'Courier-Bold',
+ 'CourierNewPS-ItalicMT': 'Courier-Oblique',
+ 'CourierNewPSMT': 'Courier',
+ 'Helvetica': 'Helvetica',
+ 'Helvetica-Bold': 'Helvetica-Bold',
+ 'Helvetica-BoldItalic': 'Helvetica-BoldOblique',
+ 'Helvetica-BoldOblique': 'Helvetica-BoldOblique',
+ 'Helvetica-Italic': 'Helvetica-Oblique',
+ 'Helvetica-Oblique':'Helvetica-Oblique',
+ 'Symbol-Bold': 'Symbol',
+ 'Symbol-BoldItalic': 'Symbol',
+ 'Symbol-Italic': 'Symbol',
+ 'TimesNewRoman': 'Times-Roman',
+ 'TimesNewRoman-Bold': 'Times-Bold',
+ 'TimesNewRoman-BoldItalic': 'Times-BoldItalic',
+ 'TimesNewRoman-Italic': 'Times-Italic',
+ 'TimesNewRomanPS': 'Times-Roman',
+ 'TimesNewRomanPS-Bold': 'Times-Bold',
+ 'TimesNewRomanPS-BoldItalic': 'Times-BoldItalic',
+ 'TimesNewRomanPS-BoldItalicMT': 'Times-BoldItalic',
+ 'TimesNewRomanPS-BoldMT': 'Times-Bold',
+ 'TimesNewRomanPS-Italic': 'Times-Italic',
+ 'TimesNewRomanPS-ItalicMT': 'Times-Italic',
+ 'TimesNewRomanPSMT': 'Times-Roman',
+ 'TimesNewRomanPSMT-Bold': 'Times-Bold',
+ 'TimesNewRomanPSMT-BoldItalic': 'Times-BoldItalic',
+ 'TimesNewRomanPSMT-Italic': 'Times-Italic'
+};
+
+/**
+ * Holds the map of the non-standard fonts that might be included as a standard
+ * fonts without glyph data.
+ */
+var nonStdFontMap = {
+ 'CenturyGothic': 'Helvetica',
+ 'CenturyGothic-Bold': 'Helvetica-Bold',
+ 'CenturyGothic-BoldItalic': 'Helvetica-BoldOblique',
+ 'CenturyGothic-Italic': 'Helvetica-Oblique',
+ 'ComicSansMS': 'Comic Sans MS',
+ 'ComicSansMS-Bold': 'Comic Sans MS-Bold',
+ 'ComicSansMS-BoldItalic': 'Comic Sans MS-BoldItalic',
+ 'ComicSansMS-Italic': 'Comic Sans MS-Italic',
+ 'LucidaConsole': 'Courier',
+ 'LucidaConsole-Bold': 'Courier-Bold',
+ 'LucidaConsole-BoldItalic': 'Courier-BoldOblique',
+ 'LucidaConsole-Italic': 'Courier-Oblique',
+ 'MS-Gothic': 'MS Gothic',
+ 'MS-Gothic-Bold': 'MS Gothic-Bold',
+ 'MS-Gothic-BoldItalic': 'MS Gothic-BoldItalic',
+ 'MS-Gothic-Italic': 'MS Gothic-Italic',
+ 'MS-Mincho': 'MS Mincho',
+ 'MS-Mincho-Bold': 'MS Mincho-Bold',
+ 'MS-Mincho-BoldItalic': 'MS Mincho-BoldItalic',
+ 'MS-Mincho-Italic': 'MS Mincho-Italic',
+ 'MS-PGothic': 'MS PGothic',
+ 'MS-PGothic-Bold': 'MS PGothic-Bold',
+ 'MS-PGothic-BoldItalic': 'MS PGothic-BoldItalic',
+ 'MS-PGothic-Italic': 'MS PGothic-Italic',
+ 'MS-PMincho': 'MS PMincho',
+ 'MS-PMincho-Bold': 'MS PMincho-Bold',
+ 'MS-PMincho-BoldItalic': 'MS PMincho-BoldItalic',
+ 'MS-PMincho-Italic': 'MS PMincho-Italic',
+ 'Wingdings': 'ZapfDingbats'
+};
+
+var serifFonts = {
+ 'Adobe Jenson': true, 'Adobe Text': true, 'Albertus': true,
+ 'Aldus': true, 'Alexandria': true, 'Algerian': true,
+ 'American Typewriter': true, 'Antiqua': true, 'Apex': true,
+ 'Arno': true, 'Aster': true, 'Aurora': true,
+ 'Baskerville': true, 'Bell': true, 'Bembo': true,
+ 'Bembo Schoolbook': true, 'Benguiat': true, 'Berkeley Old Style': true,
+ 'Bernhard Modern': true, 'Berthold City': true, 'Bodoni': true,
+ 'Bauer Bodoni': true, 'Book Antiqua': true, 'Bookman': true,
+ 'Bordeaux Roman': true, 'Californian FB': true, 'Calisto': true,
+ 'Calvert': true, 'Capitals': true, 'Cambria': true,
+ 'Cartier': true, 'Caslon': true, 'Catull': true,
+ 'Centaur': true, 'Century Old Style': true, 'Century Schoolbook': true,
+ 'Chaparral': true, 'Charis SIL': true, 'Cheltenham': true,
+ 'Cholla Slab': true, 'Clarendon': true, 'Clearface': true,
+ 'Cochin': true, 'Colonna': true, 'Computer Modern': true,
+ 'Concrete Roman': true, 'Constantia': true, 'Cooper Black': true,
+ 'Corona': true, 'Ecotype': true, 'Egyptienne': true,
+ 'Elephant': true, 'Excelsior': true, 'Fairfield': true,
+ 'FF Scala': true, 'Folkard': true, 'Footlight': true,
+ 'FreeSerif': true, 'Friz Quadrata': true, 'Garamond': true,
+ 'Gentium': true, 'Georgia': true, 'Gloucester': true,
+ 'Goudy Old Style': true, 'Goudy Schoolbook': true, 'Goudy Pro Font': true,
+ 'Granjon': true, 'Guardian Egyptian': true, 'Heather': true,
+ 'Hercules': true, 'High Tower Text': true, 'Hiroshige': true,
+ 'Hoefler Text': true, 'Humana Serif': true, 'Imprint': true,
+ 'Ionic No. 5': true, 'Janson': true, 'Joanna': true,
+ 'Korinna': true, 'Lexicon': true, 'Liberation Serif': true,
+ 'Linux Libertine': true, 'Literaturnaya': true, 'Lucida': true,
+ 'Lucida Bright': true, 'Melior': true, 'Memphis': true,
+ 'Miller': true, 'Minion': true, 'Modern': true,
+ 'Mona Lisa': true, 'Mrs Eaves': true, 'MS Serif': true,
+ 'Museo Slab': true, 'New York': true, 'Nimbus Roman': true,
+ 'NPS Rawlinson Roadway': true, 'Palatino': true, 'Perpetua': true,
+ 'Plantin': true, 'Plantin Schoolbook': true, 'Playbill': true,
+ 'Poor Richard': true, 'Rawlinson Roadway': true, 'Renault': true,
+ 'Requiem': true, 'Rockwell': true, 'Roman': true,
+ 'Rotis Serif': true, 'Sabon': true, 'Scala': true,
+ 'Seagull': true, 'Sistina': true, 'Souvenir': true,
+ 'STIX': true, 'Stone Informal': true, 'Stone Serif': true,
+ 'Sylfaen': true, 'Times': true, 'Trajan': true,
+ 'Trinité': true, 'Trump Mediaeval': true, 'Utopia': true,
+ 'Vale Type': true, 'Bitstream Vera': true, 'Vera Serif': true,
+ 'Versailles': true, 'Wanted': true, 'Weiss': true,
+ 'Wide Latin': true, 'Windsor': true, 'XITS': true
+};
+
+var symbolsFonts = {
+ 'Dingbats': true, 'Symbol': true, 'ZapfDingbats': true
+};
+
+// Glyph map for well-known standard fonts. Sometimes Ghostscript uses CID fonts
+// but does not embed the CID to GID mapping. The mapping is incomplete for all
+// glyphs, but common for some set of the standard fonts.
+var GlyphMapForStandardFonts = {
+ '2': 10, '3': 32, '4': 33, '5': 34, '6': 35, '7': 36, '8': 37, '9': 38,
+ '10': 39, '11': 40, '12': 41, '13': 42, '14': 43, '15': 44, '16': 45,
+ '17': 46, '18': 47, '19': 48, '20': 49, '21': 50, '22': 51, '23': 52,
+ '24': 53, '25': 54, '26': 55, '27': 56, '28': 57, '29': 58, '30': 894,
+ '31': 60, '32': 61, '33': 62, '34': 63, '35': 64, '36': 65, '37': 66,
+ '38': 67, '39': 68, '40': 69, '41': 70, '42': 71, '43': 72, '44': 73,
+ '45': 74, '46': 75, '47': 76, '48': 77, '49': 78, '50': 79, '51': 80,
+ '52': 81, '53': 82, '54': 83, '55': 84, '56': 85, '57': 86, '58': 87,
+ '59': 88, '60': 89, '61': 90, '62': 91, '63': 92, '64': 93, '65': 94,
+ '66': 95, '67': 96, '68': 97, '69': 98, '70': 99, '71': 100, '72': 101,
+ '73': 102, '74': 103, '75': 104, '76': 105, '77': 106, '78': 107, '79': 108,
+ '80': 109, '81': 110, '82': 111, '83': 112, '84': 113, '85': 114, '86': 115,
+ '87': 116, '88': 117, '89': 118, '90': 119, '91': 120, '92': 121, '93': 122,
+ '94': 123, '95': 124, '96': 125, '97': 126, '98': 196, '99': 197, '100': 199,
+ '101': 201, '102': 209, '103': 214, '104': 220, '105': 225, '106': 224,
+ '107': 226, '108': 228, '109': 227, '110': 229, '111': 231, '112': 233,
+ '113': 232, '114': 234, '115': 235, '116': 237, '117': 236, '118': 238,
+ '119': 239, '120': 241, '121': 243, '122': 242, '123': 244, '124': 246,
+ '125': 245, '126': 250, '127': 249, '128': 251, '129': 252, '130': 8224,
+ '131': 176, '132': 162, '133': 163, '134': 167, '135': 8226, '136': 182,
+ '137': 223, '138': 174, '139': 169, '140': 8482, '141': 180, '142': 168,
+ '143': 8800, '144': 198, '145': 216, '146': 8734, '147': 177, '148': 8804,
+ '149': 8805, '150': 165, '151': 181, '152': 8706, '153': 8721, '154': 8719,
+ '156': 8747, '157': 170, '158': 186, '159': 8486, '160': 230, '161': 248,
+ '162': 191, '163': 161, '164': 172, '165': 8730, '166': 402, '167': 8776,
+ '168': 8710, '169': 171, '170': 187, '171': 8230, '210': 218, '223': 711,
+ '224': 321, '225': 322, '227': 353, '229': 382, '234': 253, '252': 263,
+ '253': 268, '254': 269, '258': 258, '260': 260, '261': 261, '265': 280,
+ '266': 281, '268': 283, '269': 313, '275': 323, '276': 324, '278': 328,
+ '284': 345, '285': 346, '286': 347, '292': 367, '295': 377, '296': 378,
+ '298': 380, '305': 963,
+ '306': 964, '307': 966, '308': 8215, '309': 8252, '310': 8319, '311': 8359,
+ '312': 8592, '313': 8593, '337': 9552, '493': 1039, '494': 1040, '705': 1524,
+ '706': 8362, '710': 64288, '711': 64298, '759': 1617, '761': 1776,
+ '763': 1778, '775': 1652, '777': 1764, '778': 1780, '779': 1781, '780': 1782,
+ '782': 771, '783': 64726, '786': 8363, '788': 8532, '790': 768, '791': 769,
+ '792': 768, '795': 803, '797': 64336, '798': 64337, '799': 64342,
+ '800': 64343, '801': 64344, '802': 64345, '803': 64362, '804': 64363,
+ '805': 64364, '2424': 7821, '2425': 7822, '2426': 7823, '2427': 7824,
+ '2428': 7825, '2429': 7826, '2430': 7827, '2433': 7682, '2678': 8045,
+ '2679': 8046, '2830': 1552, '2838': 686, '2840': 751, '2842': 753,
+ '2843': 754, '2844': 755, '2846': 757, '2856': 767, '2857': 848, '2858': 849,
+ '2862': 853, '2863': 854, '2864': 855, '2865': 861, '2866': 862, '2906': 7460,
+ '2908': 7462, '2909': 7463, '2910': 7464, '2912': 7466, '2913': 7467,
+ '2914': 7468, '2916': 7470, '2917': 7471, '2918': 7472, '2920': 7474,
+ '2921': 7475, '2922': 7476, '2924': 7478, '2925': 7479, '2926': 7480,
+ '2928': 7482, '2929': 7483, '2930': 7484, '2932': 7486, '2933': 7487,
+ '2934': 7488, '2936': 7490, '2937': 7491, '2938': 7492, '2940': 7494,
+ '2941': 7495, '2942': 7496, '2944': 7498, '2946': 7500, '2948': 7502,
+ '2950': 7504, '2951': 7505, '2952': 7506, '2954': 7508, '2955': 7509,
+ '2956': 7510, '2958': 7512, '2959': 7513, '2960': 7514, '2962': 7516,
+ '2963': 7517, '2964': 7518, '2966': 7520, '2967': 7521, '2968': 7522,
+ '2970': 7524, '2971': 7525, '2972': 7526, '2974': 7528, '2975': 7529,
+ '2976': 7530, '2978': 1537, '2979': 1538, '2980': 1539, '2982': 1549,
+ '2983': 1551, '2984': 1552, '2986': 1554, '2987': 1555, '2988': 1556,
+ '2990': 1623, '2991': 1624, '2995': 1775, '2999': 1791, '3002': 64290,
+ '3003': 64291, '3004': 64292, '3006': 64294, '3007': 64295, '3008': 64296,
+ '3011': 1900, '3014': 8223, '3015': 8244, '3017': 7532, '3018': 7533,
+ '3019': 7534, '3075': 7590, '3076': 7591, '3079': 7594, '3080': 7595,
+ '3083': 7598, '3084': 7599, '3087': 7602, '3088': 7603, '3091': 7606,
+ '3092': 7607, '3095': 7610, '3096': 7611, '3099': 7614, '3100': 7615,
+ '3103': 7618, '3104': 7619, '3107': 8337, '3108': 8338, '3116': 1884,
+ '3119': 1885, '3120': 1885, '3123': 1886, '3124': 1886, '3127': 1887,
+ '3128': 1887, '3131': 1888, '3132': 1888, '3135': 1889, '3136': 1889,
+ '3139': 1890, '3140': 1890, '3143': 1891, '3144': 1891, '3147': 1892,
+ '3148': 1892, '3153': 580, '3154': 581, '3157': 584, '3158': 585, '3161': 588,
+ '3162': 589, '3165': 891, '3166': 892, '3169': 1274, '3170': 1275,
+ '3173': 1278, '3174': 1279, '3181': 7622, '3182': 7623, '3282': 11799,
+ '3316': 578, '3379': 42785, '3393': 1159, '3416': 8377
+};
+
+// Some characters, e.g. copyrightserif, are mapped to the private use area and
+// might not be displayed using standard fonts. Mapping/hacking well-known chars
+// to the similar equivalents in the normal characters range.
+var SpecialPUASymbols = {
+ '63721': 0x00A9, // copyrightsans (0xF8E9) => copyright
+ '63193': 0x00A9, // copyrightserif (0xF6D9) => copyright
+ '63720': 0x00AE, // registersans (0xF8E8) => registered
+ '63194': 0x00AE, // registerserif (0xF6DA) => registered
+ '63722': 0x2122, // trademarksans (0xF8EA) => trademark
+ '63195': 0x2122, // trademarkserif (0xF6DB) => trademark
+ '63729': 0x23A7, // bracelefttp (0xF8F1)
+ '63730': 0x23A8, // braceleftmid (0xF8F2)
+ '63731': 0x23A9, // braceleftbt (0xF8F3)
+ '63740': 0x23AB, // bracerighttp (0xF8FC)
+ '63741': 0x23AC, // bracerightmid (0xF8FD)
+ '63742': 0x23AD, // bracerightbt (0xF8FE)
+ '63726': 0x23A1, // bracketlefttp (0xF8EE)
+ '63727': 0x23A2, // bracketleftex (0xF8EF)
+ '63728': 0x23A3, // bracketleftbt (0xF8F0)
+ '63737': 0x23A4, // bracketrighttp (0xF8F9)
+ '63738': 0x23A5, // bracketrightex (0xF8FA)
+ '63739': 0x23A6, // bracketrightbt (0xF8FB)
+ '63723': 0x239B, // parenlefttp (0xF8EB)
+ '63724': 0x239C, // parenleftex (0xF8EC)
+ '63725': 0x239D, // parenleftbt (0xF8ED)
+ '63734': 0x239E, // parenrighttp (0xF8F6)
+ '63735': 0x239F, // parenrightex (0xF8F7)
+ '63736': 0x23A0, // parenrightbt (0xF8F8)
+};
+function mapSpecialUnicodeValues(code) {
+ if (code >= 0xFFF0 && code <= 0xFFFF) { // Specials unicode block.
+ return 0;
+ } else if (code >= 0xF600 && code <= 0xF8FF) {
+ return (SpecialPUASymbols[code] || code);
+ }
+ return code;
+}
+
+var UnicodeRanges = [
+ { 'begin': 0x0000, 'end': 0x007F }, // Basic Latin
+ { 'begin': 0x0080, 'end': 0x00FF }, // Latin-1 Supplement
+ { 'begin': 0x0100, 'end': 0x017F }, // Latin Extended-A
+ { 'begin': 0x0180, 'end': 0x024F }, // Latin Extended-B
+ { 'begin': 0x0250, 'end': 0x02AF }, // IPA Extensions
+ { 'begin': 0x02B0, 'end': 0x02FF }, // Spacing Modifier Letters
+ { 'begin': 0x0300, 'end': 0x036F }, // Combining Diacritical Marks
+ { 'begin': 0x0370, 'end': 0x03FF }, // Greek and Coptic
+ { 'begin': 0x2C80, 'end': 0x2CFF }, // Coptic
+ { 'begin': 0x0400, 'end': 0x04FF }, // Cyrillic
+ { 'begin': 0x0530, 'end': 0x058F }, // Armenian
+ { 'begin': 0x0590, 'end': 0x05FF }, // Hebrew
+ { 'begin': 0xA500, 'end': 0xA63F }, // Vai
+ { 'begin': 0x0600, 'end': 0x06FF }, // Arabic
+ { 'begin': 0x07C0, 'end': 0x07FF }, // NKo
+ { 'begin': 0x0900, 'end': 0x097F }, // Devanagari
+ { 'begin': 0x0980, 'end': 0x09FF }, // Bengali
+ { 'begin': 0x0A00, 'end': 0x0A7F }, // Gurmukhi
+ { 'begin': 0x0A80, 'end': 0x0AFF }, // Gujarati
+ { 'begin': 0x0B00, 'end': 0x0B7F }, // Oriya
+ { 'begin': 0x0B80, 'end': 0x0BFF }, // Tamil
+ { 'begin': 0x0C00, 'end': 0x0C7F }, // Telugu
+ { 'begin': 0x0C80, 'end': 0x0CFF }, // Kannada
+ { 'begin': 0x0D00, 'end': 0x0D7F }, // Malayalam
+ { 'begin': 0x0E00, 'end': 0x0E7F }, // Thai
+ { 'begin': 0x0E80, 'end': 0x0EFF }, // Lao
+ { 'begin': 0x10A0, 'end': 0x10FF }, // Georgian
+ { 'begin': 0x1B00, 'end': 0x1B7F }, // Balinese
+ { 'begin': 0x1100, 'end': 0x11FF }, // Hangul Jamo
+ { 'begin': 0x1E00, 'end': 0x1EFF }, // Latin Extended Additional
+ { 'begin': 0x1F00, 'end': 0x1FFF }, // Greek Extended
+ { 'begin': 0x2000, 'end': 0x206F }, // General Punctuation
+ { 'begin': 0x2070, 'end': 0x209F }, // Superscripts And Subscripts
+ { 'begin': 0x20A0, 'end': 0x20CF }, // Currency Symbol
+ { 'begin': 0x20D0, 'end': 0x20FF }, // Combining Diacritical Marks For Symbols
+ { 'begin': 0x2100, 'end': 0x214F }, // Letterlike Symbols
+ { 'begin': 0x2150, 'end': 0x218F }, // Number Forms
+ { 'begin': 0x2190, 'end': 0x21FF }, // Arrows
+ { 'begin': 0x2200, 'end': 0x22FF }, // Mathematical Operators
+ { 'begin': 0x2300, 'end': 0x23FF }, // Miscellaneous Technical
+ { 'begin': 0x2400, 'end': 0x243F }, // Control Pictures
+ { 'begin': 0x2440, 'end': 0x245F }, // Optical Character Recognition
+ { 'begin': 0x2460, 'end': 0x24FF }, // Enclosed Alphanumerics
+ { 'begin': 0x2500, 'end': 0x257F }, // Box Drawing
+ { 'begin': 0x2580, 'end': 0x259F }, // Block Elements
+ { 'begin': 0x25A0, 'end': 0x25FF }, // Geometric Shapes
+ { 'begin': 0x2600, 'end': 0x26FF }, // Miscellaneous Symbols
+ { 'begin': 0x2700, 'end': 0x27BF }, // Dingbats
+ { 'begin': 0x3000, 'end': 0x303F }, // CJK Symbols And Punctuation
+ { 'begin': 0x3040, 'end': 0x309F }, // Hiragana
+ { 'begin': 0x30A0, 'end': 0x30FF }, // Katakana
+ { 'begin': 0x3100, 'end': 0x312F }, // Bopomofo
+ { 'begin': 0x3130, 'end': 0x318F }, // Hangul Compatibility Jamo
+ { 'begin': 0xA840, 'end': 0xA87F }, // Phags-pa
+ { 'begin': 0x3200, 'end': 0x32FF }, // Enclosed CJK Letters And Months
+ { 'begin': 0x3300, 'end': 0x33FF }, // CJK Compatibility
+ { 'begin': 0xAC00, 'end': 0xD7AF }, // Hangul Syllables
+ { 'begin': 0xD800, 'end': 0xDFFF }, // Non-Plane 0 *
+ { 'begin': 0x10900, 'end': 0x1091F }, // Phoenicia
+ { 'begin': 0x4E00, 'end': 0x9FFF }, // CJK Unified Ideographs
+ { 'begin': 0xE000, 'end': 0xF8FF }, // Private Use Area (plane 0)
+ { 'begin': 0x31C0, 'end': 0x31EF }, // CJK Strokes
+ { 'begin': 0xFB00, 'end': 0xFB4F }, // Alphabetic Presentation Forms
+ { 'begin': 0xFB50, 'end': 0xFDFF }, // Arabic Presentation Forms-A
+ { 'begin': 0xFE20, 'end': 0xFE2F }, // Combining Half Marks
+ { 'begin': 0xFE10, 'end': 0xFE1F }, // Vertical Forms
+ { 'begin': 0xFE50, 'end': 0xFE6F }, // Small Form Variants
+ { 'begin': 0xFE70, 'end': 0xFEFF }, // Arabic Presentation Forms-B
+ { 'begin': 0xFF00, 'end': 0xFFEF }, // Halfwidth And Fullwidth Forms
+ { 'begin': 0xFFF0, 'end': 0xFFFF }, // Specials
+ { 'begin': 0x0F00, 'end': 0x0FFF }, // Tibetan
+ { 'begin': 0x0700, 'end': 0x074F }, // Syriac
+ { 'begin': 0x0780, 'end': 0x07BF }, // Thaana
+ { 'begin': 0x0D80, 'end': 0x0DFF }, // Sinhala
+ { 'begin': 0x1000, 'end': 0x109F }, // Myanmar
+ { 'begin': 0x1200, 'end': 0x137F }, // Ethiopic
+ { 'begin': 0x13A0, 'end': 0x13FF }, // Cherokee
+ { 'begin': 0x1400, 'end': 0x167F }, // Unified Canadian Aboriginal Syllabics
+ { 'begin': 0x1680, 'end': 0x169F }, // Ogham
+ { 'begin': 0x16A0, 'end': 0x16FF }, // Runic
+ { 'begin': 0x1780, 'end': 0x17FF }, // Khmer
+ { 'begin': 0x1800, 'end': 0x18AF }, // Mongolian
+ { 'begin': 0x2800, 'end': 0x28FF }, // Braille Patterns
+ { 'begin': 0xA000, 'end': 0xA48F }, // Yi Syllables
+ { 'begin': 0x1700, 'end': 0x171F }, // Tagalog
+ { 'begin': 0x10300, 'end': 0x1032F }, // Old Italic
+ { 'begin': 0x10330, 'end': 0x1034F }, // Gothic
+ { 'begin': 0x10400, 'end': 0x1044F }, // Deseret
+ { 'begin': 0x1D000, 'end': 0x1D0FF }, // Byzantine Musical Symbols
+ { 'begin': 0x1D400, 'end': 0x1D7FF }, // Mathematical Alphanumeric Symbols
+ { 'begin': 0xFF000, 'end': 0xFFFFD }, // Private Use (plane 15)
+ { 'begin': 0xFE00, 'end': 0xFE0F }, // Variation Selectors
+ { 'begin': 0xE0000, 'end': 0xE007F }, // Tags
+ { 'begin': 0x1900, 'end': 0x194F }, // Limbu
+ { 'begin': 0x1950, 'end': 0x197F }, // Tai Le
+ { 'begin': 0x1980, 'end': 0x19DF }, // New Tai Lue
+ { 'begin': 0x1A00, 'end': 0x1A1F }, // Buginese
+ { 'begin': 0x2C00, 'end': 0x2C5F }, // Glagolitic
+ { 'begin': 0x2D30, 'end': 0x2D7F }, // Tifinagh
+ { 'begin': 0x4DC0, 'end': 0x4DFF }, // Yijing Hexagram Symbols
+ { 'begin': 0xA800, 'end': 0xA82F }, // Syloti Nagri
+ { 'begin': 0x10000, 'end': 0x1007F }, // Linear B Syllabary
+ { 'begin': 0x10140, 'end': 0x1018F }, // Ancient Greek Numbers
+ { 'begin': 0x10380, 'end': 0x1039F }, // Ugaritic
+ { 'begin': 0x103A0, 'end': 0x103DF }, // Old Persian
+ { 'begin': 0x10450, 'end': 0x1047F }, // Shavian
+ { 'begin': 0x10480, 'end': 0x104AF }, // Osmanya
+ { 'begin': 0x10800, 'end': 0x1083F }, // Cypriot Syllabary
+ { 'begin': 0x10A00, 'end': 0x10A5F }, // Kharoshthi
+ { 'begin': 0x1D300, 'end': 0x1D35F }, // Tai Xuan Jing Symbols
+ { 'begin': 0x12000, 'end': 0x123FF }, // Cuneiform
+ { 'begin': 0x1D360, 'end': 0x1D37F }, // Counting Rod Numerals
+ { 'begin': 0x1B80, 'end': 0x1BBF }, // Sundanese
+ { 'begin': 0x1C00, 'end': 0x1C4F }, // Lepcha
+ { 'begin': 0x1C50, 'end': 0x1C7F }, // Ol Chiki
+ { 'begin': 0xA880, 'end': 0xA8DF }, // Saurashtra
+ { 'begin': 0xA900, 'end': 0xA92F }, // Kayah Li
+ { 'begin': 0xA930, 'end': 0xA95F }, // Rejang
+ { 'begin': 0xAA00, 'end': 0xAA5F }, // Cham
+ { 'begin': 0x10190, 'end': 0x101CF }, // Ancient Symbols
+ { 'begin': 0x101D0, 'end': 0x101FF }, // Phaistos Disc
+ { 'begin': 0x102A0, 'end': 0x102DF }, // Carian
+ { 'begin': 0x1F030, 'end': 0x1F09F } // Domino Tiles
+];
+
+var MacStandardGlyphOrdering = [
+ '.notdef', '.null', 'nonmarkingreturn', 'space', 'exclam', 'quotedbl',
+ 'numbersign', 'dollar', 'percent', 'ampersand', 'quotesingle', 'parenleft',
+ 'parenright', 'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash',
+ 'zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight',
+ 'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question', 'at',
+ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+ 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'bracketleft',
+ 'backslash', 'bracketright', 'asciicircum', 'underscore', 'grave', 'a', 'b',
+ 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q',
+ 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright',
+ 'asciitilde', 'Adieresis', 'Aring', 'Ccedilla', 'Eacute', 'Ntilde',
+ 'Odieresis', 'Udieresis', 'aacute', 'agrave', 'acircumflex', 'adieresis',
+ 'atilde', 'aring', 'ccedilla', 'eacute', 'egrave', 'ecircumflex', 'edieresis',
+ 'iacute', 'igrave', 'icircumflex', 'idieresis', 'ntilde', 'oacute', 'ograve',
+ 'ocircumflex', 'odieresis', 'otilde', 'uacute', 'ugrave', 'ucircumflex',
+ 'udieresis', 'dagger', 'degree', 'cent', 'sterling', 'section', 'bullet',
+ 'paragraph', 'germandbls', 'registered', 'copyright', 'trademark', 'acute',
+ 'dieresis', 'notequal', 'AE', 'Oslash', 'infinity', 'plusminus', 'lessequal',
+ 'greaterequal', 'yen', 'mu', 'partialdiff', 'summation', 'product', 'pi',
+ 'integral', 'ordfeminine', 'ordmasculine', 'Omega', 'ae', 'oslash',
+ 'questiondown', 'exclamdown', 'logicalnot', 'radical', 'florin',
+ 'approxequal', 'Delta', 'guillemotleft', 'guillemotright', 'ellipsis',
+ 'nonbreakingspace', 'Agrave', 'Atilde', 'Otilde', 'OE', 'oe', 'endash',
+ 'emdash', 'quotedblleft', 'quotedblright', 'quoteleft', 'quoteright',
+ 'divide', 'lozenge', 'ydieresis', 'Ydieresis', 'fraction', 'currency',
+ 'guilsinglleft', 'guilsinglright', 'fi', 'fl', 'daggerdbl', 'periodcentered',
+ 'quotesinglbase', 'quotedblbase', 'perthousand', 'Acircumflex',
+ 'Ecircumflex', 'Aacute', 'Edieresis', 'Egrave', 'Iacute', 'Icircumflex',
+ 'Idieresis', 'Igrave', 'Oacute', 'Ocircumflex', 'apple', 'Ograve', 'Uacute',
+ 'Ucircumflex', 'Ugrave', 'dotlessi', 'circumflex', 'tilde', 'macron',
+ 'breve', 'dotaccent', 'ring', 'cedilla', 'hungarumlaut', 'ogonek', 'caron',
+ 'Lslash', 'lslash', 'Scaron', 'scaron', 'Zcaron', 'zcaron', 'brokenbar',
+ 'Eth', 'eth', 'Yacute', 'yacute', 'Thorn', 'thorn', 'minus', 'multiply',
+ 'onesuperior', 'twosuperior', 'threesuperior', 'onehalf', 'onequarter',
+ 'threequarters', 'franc', 'Gbreve', 'gbreve', 'Idotaccent', 'Scedilla',
+ 'scedilla', 'Cacute', 'cacute', 'Ccaron', 'ccaron', 'dcroat'];
+
+function getUnicodeRangeFor(value) {
+ for (var i = 0, ii = UnicodeRanges.length; i < ii; i++) {
+ var range = UnicodeRanges[i];
+ if (value >= range.begin && value < range.end) {
+ return i;
+ }
+ }
+ return -1;
+}
+
+function isRTLRangeFor(value) {
+ var range = UnicodeRanges[13];
+ if (value >= range.begin && value < range.end) {
+ return true;
+ }
+ range = UnicodeRanges[11];
+ if (value >= range.begin && value < range.end) {
+ return true;
+ }
+ return false;
+}
+
+// The normalization table is obtained by filtering the Unicode characters
+// database with <compat> entries.
+var NormalizedUnicodes = {
+ '\u00A8': '\u0020\u0308',
+ '\u00AF': '\u0020\u0304',
+ '\u00B4': '\u0020\u0301',
+ '\u00B5': '\u03BC',
+ '\u00B8': '\u0020\u0327',
+ '\u0132': '\u0049\u004A',
+ '\u0133': '\u0069\u006A',
+ '\u013F': '\u004C\u00B7',
+ '\u0140': '\u006C\u00B7',
+ '\u0149': '\u02BC\u006E',
+ '\u017F': '\u0073',
+ '\u01C4': '\u0044\u017D',
+ '\u01C5': '\u0044\u017E',
+ '\u01C6': '\u0064\u017E',
+ '\u01C7': '\u004C\u004A',
+ '\u01C8': '\u004C\u006A',
+ '\u01C9': '\u006C\u006A',
+ '\u01CA': '\u004E\u004A',
+ '\u01CB': '\u004E\u006A',
+ '\u01CC': '\u006E\u006A',
+ '\u01F1': '\u0044\u005A',
+ '\u01F2': '\u0044\u007A',
+ '\u01F3': '\u0064\u007A',
+ '\u02D8': '\u0020\u0306',
+ '\u02D9': '\u0020\u0307',
+ '\u02DA': '\u0020\u030A',
+ '\u02DB': '\u0020\u0328',
+ '\u02DC': '\u0020\u0303',
+ '\u02DD': '\u0020\u030B',
+ '\u037A': '\u0020\u0345',
+ '\u0384': '\u0020\u0301',
+ '\u03D0': '\u03B2',
+ '\u03D1': '\u03B8',
+ '\u03D2': '\u03A5',
+ '\u03D5': '\u03C6',
+ '\u03D6': '\u03C0',
+ '\u03F0': '\u03BA',
+ '\u03F1': '\u03C1',
+ '\u03F2': '\u03C2',
+ '\u03F4': '\u0398',
+ '\u03F5': '\u03B5',
+ '\u03F9': '\u03A3',
+ '\u0587': '\u0565\u0582',
+ '\u0675': '\u0627\u0674',
+ '\u0676': '\u0648\u0674',
+ '\u0677': '\u06C7\u0674',
+ '\u0678': '\u064A\u0674',
+ '\u0E33': '\u0E4D\u0E32',
+ '\u0EB3': '\u0ECD\u0EB2',
+ '\u0EDC': '\u0EAB\u0E99',
+ '\u0EDD': '\u0EAB\u0EA1',
+ '\u0F77': '\u0FB2\u0F81',
+ '\u0F79': '\u0FB3\u0F81',
+ '\u1E9A': '\u0061\u02BE',
+ '\u1FBD': '\u0020\u0313',
+ '\u1FBF': '\u0020\u0313',
+ '\u1FC0': '\u0020\u0342',
+ '\u1FFE': '\u0020\u0314',
+ '\u2002': '\u0020',
+ '\u2003': '\u0020',
+ '\u2004': '\u0020',
+ '\u2005': '\u0020',
+ '\u2006': '\u0020',
+ '\u2008': '\u0020',
+ '\u2009': '\u0020',
+ '\u200A': '\u0020',
+ '\u2017': '\u0020\u0333',
+ '\u2024': '\u002E',
+ '\u2025': '\u002E\u002E',
+ '\u2026': '\u002E\u002E\u002E',
+ '\u2033': '\u2032\u2032',
+ '\u2034': '\u2032\u2032\u2032',
+ '\u2036': '\u2035\u2035',
+ '\u2037': '\u2035\u2035\u2035',
+ '\u203C': '\u0021\u0021',
+ '\u203E': '\u0020\u0305',
+ '\u2047': '\u003F\u003F',
+ '\u2048': '\u003F\u0021',
+ '\u2049': '\u0021\u003F',
+ '\u2057': '\u2032\u2032\u2032\u2032',
+ '\u205F': '\u0020',
+ '\u20A8': '\u0052\u0073',
+ '\u2100': '\u0061\u002F\u0063',
+ '\u2101': '\u0061\u002F\u0073',
+ '\u2103': '\u00B0\u0043',
+ '\u2105': '\u0063\u002F\u006F',
+ '\u2106': '\u0063\u002F\u0075',
+ '\u2107': '\u0190',
+ '\u2109': '\u00B0\u0046',
+ '\u2116': '\u004E\u006F',
+ '\u2121': '\u0054\u0045\u004C',
+ '\u2135': '\u05D0',
+ '\u2136': '\u05D1',
+ '\u2137': '\u05D2',
+ '\u2138': '\u05D3',
+ '\u213B': '\u0046\u0041\u0058',
+ '\u2160': '\u0049',
+ '\u2161': '\u0049\u0049',
+ '\u2162': '\u0049\u0049\u0049',
+ '\u2163': '\u0049\u0056',
+ '\u2164': '\u0056',
+ '\u2165': '\u0056\u0049',
+ '\u2166': '\u0056\u0049\u0049',
+ '\u2167': '\u0056\u0049\u0049\u0049',
+ '\u2168': '\u0049\u0058',
+ '\u2169': '\u0058',
+ '\u216A': '\u0058\u0049',
+ '\u216B': '\u0058\u0049\u0049',
+ '\u216C': '\u004C',
+ '\u216D': '\u0043',
+ '\u216E': '\u0044',
+ '\u216F': '\u004D',
+ '\u2170': '\u0069',
+ '\u2171': '\u0069\u0069',
+ '\u2172': '\u0069\u0069\u0069',
+ '\u2173': '\u0069\u0076',
+ '\u2174': '\u0076',
+ '\u2175': '\u0076\u0069',
+ '\u2176': '\u0076\u0069\u0069',
+ '\u2177': '\u0076\u0069\u0069\u0069',
+ '\u2178': '\u0069\u0078',
+ '\u2179': '\u0078',
+ '\u217A': '\u0078\u0069',
+ '\u217B': '\u0078\u0069\u0069',
+ '\u217C': '\u006C',
+ '\u217D': '\u0063',
+ '\u217E': '\u0064',
+ '\u217F': '\u006D',
+ '\u222C': '\u222B\u222B',
+ '\u222D': '\u222B\u222B\u222B',
+ '\u222F': '\u222E\u222E',
+ '\u2230': '\u222E\u222E\u222E',
+ '\u2474': '\u0028\u0031\u0029',
+ '\u2475': '\u0028\u0032\u0029',
+ '\u2476': '\u0028\u0033\u0029',
+ '\u2477': '\u0028\u0034\u0029',
+ '\u2478': '\u0028\u0035\u0029',
+ '\u2479': '\u0028\u0036\u0029',
+ '\u247A': '\u0028\u0037\u0029',
+ '\u247B': '\u0028\u0038\u0029',
+ '\u247C': '\u0028\u0039\u0029',
+ '\u247D': '\u0028\u0031\u0030\u0029',
+ '\u247E': '\u0028\u0031\u0031\u0029',
+ '\u247F': '\u0028\u0031\u0032\u0029',
+ '\u2480': '\u0028\u0031\u0033\u0029',
+ '\u2481': '\u0028\u0031\u0034\u0029',
+ '\u2482': '\u0028\u0031\u0035\u0029',
+ '\u2483': '\u0028\u0031\u0036\u0029',
+ '\u2484': '\u0028\u0031\u0037\u0029',
+ '\u2485': '\u0028\u0031\u0038\u0029',
+ '\u2486': '\u0028\u0031\u0039\u0029',
+ '\u2487': '\u0028\u0032\u0030\u0029',
+ '\u2488': '\u0031\u002E',
+ '\u2489': '\u0032\u002E',
+ '\u248A': '\u0033\u002E',
+ '\u248B': '\u0034\u002E',
+ '\u248C': '\u0035\u002E',
+ '\u248D': '\u0036\u002E',
+ '\u248E': '\u0037\u002E',
+ '\u248F': '\u0038\u002E',
+ '\u2490': '\u0039\u002E',
+ '\u2491': '\u0031\u0030\u002E',
+ '\u2492': '\u0031\u0031\u002E',
+ '\u2493': '\u0031\u0032\u002E',
+ '\u2494': '\u0031\u0033\u002E',
+ '\u2495': '\u0031\u0034\u002E',
+ '\u2496': '\u0031\u0035\u002E',
+ '\u2497': '\u0031\u0036\u002E',
+ '\u2498': '\u0031\u0037\u002E',
+ '\u2499': '\u0031\u0038\u002E',
+ '\u249A': '\u0031\u0039\u002E',
+ '\u249B': '\u0032\u0030\u002E',
+ '\u249C': '\u0028\u0061\u0029',
+ '\u249D': '\u0028\u0062\u0029',
+ '\u249E': '\u0028\u0063\u0029',
+ '\u249F': '\u0028\u0064\u0029',
+ '\u24A0': '\u0028\u0065\u0029',
+ '\u24A1': '\u0028\u0066\u0029',
+ '\u24A2': '\u0028\u0067\u0029',
+ '\u24A3': '\u0028\u0068\u0029',
+ '\u24A4': '\u0028\u0069\u0029',
+ '\u24A5': '\u0028\u006A\u0029',
+ '\u24A6': '\u0028\u006B\u0029',
+ '\u24A7': '\u0028\u006C\u0029',
+ '\u24A8': '\u0028\u006D\u0029',
+ '\u24A9': '\u0028\u006E\u0029',
+ '\u24AA': '\u0028\u006F\u0029',
+ '\u24AB': '\u0028\u0070\u0029',
+ '\u24AC': '\u0028\u0071\u0029',
+ '\u24AD': '\u0028\u0072\u0029',
+ '\u24AE': '\u0028\u0073\u0029',
+ '\u24AF': '\u0028\u0074\u0029',
+ '\u24B0': '\u0028\u0075\u0029',
+ '\u24B1': '\u0028\u0076\u0029',
+ '\u24B2': '\u0028\u0077\u0029',
+ '\u24B3': '\u0028\u0078\u0029',
+ '\u24B4': '\u0028\u0079\u0029',
+ '\u24B5': '\u0028\u007A\u0029',
+ '\u2A0C': '\u222B\u222B\u222B\u222B',
+ '\u2A74': '\u003A\u003A\u003D',
+ '\u2A75': '\u003D\u003D',
+ '\u2A76': '\u003D\u003D\u003D',
+ '\u2E9F': '\u6BCD',
+ '\u2EF3': '\u9F9F',
+ '\u2F00': '\u4E00',
+ '\u2F01': '\u4E28',
+ '\u2F02': '\u4E36',
+ '\u2F03': '\u4E3F',
+ '\u2F04': '\u4E59',
+ '\u2F05': '\u4E85',
+ '\u2F06': '\u4E8C',
+ '\u2F07': '\u4EA0',
+ '\u2F08': '\u4EBA',
+ '\u2F09': '\u513F',
+ '\u2F0A': '\u5165',
+ '\u2F0B': '\u516B',
+ '\u2F0C': '\u5182',
+ '\u2F0D': '\u5196',
+ '\u2F0E': '\u51AB',
+ '\u2F0F': '\u51E0',
+ '\u2F10': '\u51F5',
+ '\u2F11': '\u5200',
+ '\u2F12': '\u529B',
+ '\u2F13': '\u52F9',
+ '\u2F14': '\u5315',
+ '\u2F15': '\u531A',
+ '\u2F16': '\u5338',
+ '\u2F17': '\u5341',
+ '\u2F18': '\u535C',
+ '\u2F19': '\u5369',
+ '\u2F1A': '\u5382',
+ '\u2F1B': '\u53B6',
+ '\u2F1C': '\u53C8',
+ '\u2F1D': '\u53E3',
+ '\u2F1E': '\u56D7',
+ '\u2F1F': '\u571F',
+ '\u2F20': '\u58EB',
+ '\u2F21': '\u5902',
+ '\u2F22': '\u590A',
+ '\u2F23': '\u5915',
+ '\u2F24': '\u5927',
+ '\u2F25': '\u5973',
+ '\u2F26': '\u5B50',
+ '\u2F27': '\u5B80',
+ '\u2F28': '\u5BF8',
+ '\u2F29': '\u5C0F',
+ '\u2F2A': '\u5C22',
+ '\u2F2B': '\u5C38',
+ '\u2F2C': '\u5C6E',
+ '\u2F2D': '\u5C71',
+ '\u2F2E': '\u5DDB',
+ '\u2F2F': '\u5DE5',
+ '\u2F30': '\u5DF1',
+ '\u2F31': '\u5DFE',
+ '\u2F32': '\u5E72',
+ '\u2F33': '\u5E7A',
+ '\u2F34': '\u5E7F',
+ '\u2F35': '\u5EF4',
+ '\u2F36': '\u5EFE',
+ '\u2F37': '\u5F0B',
+ '\u2F38': '\u5F13',
+ '\u2F39': '\u5F50',
+ '\u2F3A': '\u5F61',
+ '\u2F3B': '\u5F73',
+ '\u2F3C': '\u5FC3',
+ '\u2F3D': '\u6208',
+ '\u2F3E': '\u6236',
+ '\u2F3F': '\u624B',
+ '\u2F40': '\u652F',
+ '\u2F41': '\u6534',
+ '\u2F42': '\u6587',
+ '\u2F43': '\u6597',
+ '\u2F44': '\u65A4',
+ '\u2F45': '\u65B9',
+ '\u2F46': '\u65E0',
+ '\u2F47': '\u65E5',
+ '\u2F48': '\u66F0',
+ '\u2F49': '\u6708',
+ '\u2F4A': '\u6728',
+ '\u2F4B': '\u6B20',
+ '\u2F4C': '\u6B62',
+ '\u2F4D': '\u6B79',
+ '\u2F4E': '\u6BB3',
+ '\u2F4F': '\u6BCB',
+ '\u2F50': '\u6BD4',
+ '\u2F51': '\u6BDB',
+ '\u2F52': '\u6C0F',
+ '\u2F53': '\u6C14',
+ '\u2F54': '\u6C34',
+ '\u2F55': '\u706B',
+ '\u2F56': '\u722A',
+ '\u2F57': '\u7236',
+ '\u2F58': '\u723B',
+ '\u2F59': '\u723F',
+ '\u2F5A': '\u7247',
+ '\u2F5B': '\u7259',
+ '\u2F5C': '\u725B',
+ '\u2F5D': '\u72AC',
+ '\u2F5E': '\u7384',
+ '\u2F5F': '\u7389',
+ '\u2F60': '\u74DC',
+ '\u2F61': '\u74E6',
+ '\u2F62': '\u7518',
+ '\u2F63': '\u751F',
+ '\u2F64': '\u7528',
+ '\u2F65': '\u7530',
+ '\u2F66': '\u758B',
+ '\u2F67': '\u7592',
+ '\u2F68': '\u7676',
+ '\u2F69': '\u767D',
+ '\u2F6A': '\u76AE',
+ '\u2F6B': '\u76BF',
+ '\u2F6C': '\u76EE',
+ '\u2F6D': '\u77DB',
+ '\u2F6E': '\u77E2',
+ '\u2F6F': '\u77F3',
+ '\u2F70': '\u793A',
+ '\u2F71': '\u79B8',
+ '\u2F72': '\u79BE',
+ '\u2F73': '\u7A74',
+ '\u2F74': '\u7ACB',
+ '\u2F75': '\u7AF9',
+ '\u2F76': '\u7C73',
+ '\u2F77': '\u7CF8',
+ '\u2F78': '\u7F36',
+ '\u2F79': '\u7F51',
+ '\u2F7A': '\u7F8A',
+ '\u2F7B': '\u7FBD',
+ '\u2F7C': '\u8001',
+ '\u2F7D': '\u800C',
+ '\u2F7E': '\u8012',
+ '\u2F7F': '\u8033',
+ '\u2F80': '\u807F',
+ '\u2F81': '\u8089',
+ '\u2F82': '\u81E3',
+ '\u2F83': '\u81EA',
+ '\u2F84': '\u81F3',
+ '\u2F85': '\u81FC',
+ '\u2F86': '\u820C',
+ '\u2F87': '\u821B',
+ '\u2F88': '\u821F',
+ '\u2F89': '\u826E',
+ '\u2F8A': '\u8272',
+ '\u2F8B': '\u8278',
+ '\u2F8C': '\u864D',
+ '\u2F8D': '\u866B',
+ '\u2F8E': '\u8840',
+ '\u2F8F': '\u884C',
+ '\u2F90': '\u8863',
+ '\u2F91': '\u897E',
+ '\u2F92': '\u898B',
+ '\u2F93': '\u89D2',
+ '\u2F94': '\u8A00',
+ '\u2F95': '\u8C37',
+ '\u2F96': '\u8C46',
+ '\u2F97': '\u8C55',
+ '\u2F98': '\u8C78',
+ '\u2F99': '\u8C9D',
+ '\u2F9A': '\u8D64',
+ '\u2F9B': '\u8D70',
+ '\u2F9C': '\u8DB3',
+ '\u2F9D': '\u8EAB',
+ '\u2F9E': '\u8ECA',
+ '\u2F9F': '\u8F9B',
+ '\u2FA0': '\u8FB0',
+ '\u2FA1': '\u8FB5',
+ '\u2FA2': '\u9091',
+ '\u2FA3': '\u9149',
+ '\u2FA4': '\u91C6',
+ '\u2FA5': '\u91CC',
+ '\u2FA6': '\u91D1',
+ '\u2FA7': '\u9577',
+ '\u2FA8': '\u9580',
+ '\u2FA9': '\u961C',
+ '\u2FAA': '\u96B6',
+ '\u2FAB': '\u96B9',
+ '\u2FAC': '\u96E8',
+ '\u2FAD': '\u9751',
+ '\u2FAE': '\u975E',
+ '\u2FAF': '\u9762',
+ '\u2FB0': '\u9769',
+ '\u2FB1': '\u97CB',
+ '\u2FB2': '\u97ED',
+ '\u2FB3': '\u97F3',
+ '\u2FB4': '\u9801',
+ '\u2FB5': '\u98A8',
+ '\u2FB6': '\u98DB',
+ '\u2FB7': '\u98DF',
+ '\u2FB8': '\u9996',
+ '\u2FB9': '\u9999',
+ '\u2FBA': '\u99AC',
+ '\u2FBB': '\u9AA8',
+ '\u2FBC': '\u9AD8',
+ '\u2FBD': '\u9ADF',
+ '\u2FBE': '\u9B25',
+ '\u2FBF': '\u9B2F',
+ '\u2FC0': '\u9B32',
+ '\u2FC1': '\u9B3C',
+ '\u2FC2': '\u9B5A',
+ '\u2FC3': '\u9CE5',
+ '\u2FC4': '\u9E75',
+ '\u2FC5': '\u9E7F',
+ '\u2FC6': '\u9EA5',
+ '\u2FC7': '\u9EBB',
+ '\u2FC8': '\u9EC3',
+ '\u2FC9': '\u9ECD',
+ '\u2FCA': '\u9ED1',
+ '\u2FCB': '\u9EF9',
+ '\u2FCC': '\u9EFD',
+ '\u2FCD': '\u9F0E',
+ '\u2FCE': '\u9F13',
+ '\u2FCF': '\u9F20',
+ '\u2FD0': '\u9F3B',
+ '\u2FD1': '\u9F4A',
+ '\u2FD2': '\u9F52',
+ '\u2FD3': '\u9F8D',
+ '\u2FD4': '\u9F9C',
+ '\u2FD5': '\u9FA0',
+ '\u3036': '\u3012',
+ '\u3038': '\u5341',
+ '\u3039': '\u5344',
+ '\u303A': '\u5345',
+ '\u309B': '\u0020\u3099',
+ '\u309C': '\u0020\u309A',
+ '\u3131': '\u1100',
+ '\u3132': '\u1101',
+ '\u3133': '\u11AA',
+ '\u3134': '\u1102',
+ '\u3135': '\u11AC',
+ '\u3136': '\u11AD',
+ '\u3137': '\u1103',
+ '\u3138': '\u1104',
+ '\u3139': '\u1105',
+ '\u313A': '\u11B0',
+ '\u313B': '\u11B1',
+ '\u313C': '\u11B2',
+ '\u313D': '\u11B3',
+ '\u313E': '\u11B4',
+ '\u313F': '\u11B5',
+ '\u3140': '\u111A',
+ '\u3141': '\u1106',
+ '\u3142': '\u1107',
+ '\u3143': '\u1108',
+ '\u3144': '\u1121',
+ '\u3145': '\u1109',
+ '\u3146': '\u110A',
+ '\u3147': '\u110B',
+ '\u3148': '\u110C',
+ '\u3149': '\u110D',
+ '\u314A': '\u110E',
+ '\u314B': '\u110F',
+ '\u314C': '\u1110',
+ '\u314D': '\u1111',
+ '\u314E': '\u1112',
+ '\u314F': '\u1161',
+ '\u3150': '\u1162',
+ '\u3151': '\u1163',
+ '\u3152': '\u1164',
+ '\u3153': '\u1165',
+ '\u3154': '\u1166',
+ '\u3155': '\u1167',
+ '\u3156': '\u1168',
+ '\u3157': '\u1169',
+ '\u3158': '\u116A',
+ '\u3159': '\u116B',
+ '\u315A': '\u116C',
+ '\u315B': '\u116D',
+ '\u315C': '\u116E',
+ '\u315D': '\u116F',
+ '\u315E': '\u1170',
+ '\u315F': '\u1171',
+ '\u3160': '\u1172',
+ '\u3161': '\u1173',
+ '\u3162': '\u1174',
+ '\u3163': '\u1175',
+ '\u3164': '\u1160',
+ '\u3165': '\u1114',
+ '\u3166': '\u1115',
+ '\u3167': '\u11C7',
+ '\u3168': '\u11C8',
+ '\u3169': '\u11CC',
+ '\u316A': '\u11CE',
+ '\u316B': '\u11D3',
+ '\u316C': '\u11D7',
+ '\u316D': '\u11D9',
+ '\u316E': '\u111C',
+ '\u316F': '\u11DD',
+ '\u3170': '\u11DF',
+ '\u3171': '\u111D',
+ '\u3172': '\u111E',
+ '\u3173': '\u1120',
+ '\u3174': '\u1122',
+ '\u3175': '\u1123',
+ '\u3176': '\u1127',
+ '\u3177': '\u1129',
+ '\u3178': '\u112B',
+ '\u3179': '\u112C',
+ '\u317A': '\u112D',
+ '\u317B': '\u112E',
+ '\u317C': '\u112F',
+ '\u317D': '\u1132',
+ '\u317E': '\u1136',
+ '\u317F': '\u1140',
+ '\u3180': '\u1147',
+ '\u3181': '\u114C',
+ '\u3182': '\u11F1',
+ '\u3183': '\u11F2',
+ '\u3184': '\u1157',
+ '\u3185': '\u1158',
+ '\u3186': '\u1159',
+ '\u3187': '\u1184',
+ '\u3188': '\u1185',
+ '\u3189': '\u1188',
+ '\u318A': '\u1191',
+ '\u318B': '\u1192',
+ '\u318C': '\u1194',
+ '\u318D': '\u119E',
+ '\u318E': '\u11A1',
+ '\u3200': '\u0028\u1100\u0029',
+ '\u3201': '\u0028\u1102\u0029',
+ '\u3202': '\u0028\u1103\u0029',
+ '\u3203': '\u0028\u1105\u0029',
+ '\u3204': '\u0028\u1106\u0029',
+ '\u3205': '\u0028\u1107\u0029',
+ '\u3206': '\u0028\u1109\u0029',
+ '\u3207': '\u0028\u110B\u0029',
+ '\u3208': '\u0028\u110C\u0029',
+ '\u3209': '\u0028\u110E\u0029',
+ '\u320A': '\u0028\u110F\u0029',
+ '\u320B': '\u0028\u1110\u0029',
+ '\u320C': '\u0028\u1111\u0029',
+ '\u320D': '\u0028\u1112\u0029',
+ '\u320E': '\u0028\u1100\u1161\u0029',
+ '\u320F': '\u0028\u1102\u1161\u0029',
+ '\u3210': '\u0028\u1103\u1161\u0029',
+ '\u3211': '\u0028\u1105\u1161\u0029',
+ '\u3212': '\u0028\u1106\u1161\u0029',
+ '\u3213': '\u0028\u1107\u1161\u0029',
+ '\u3214': '\u0028\u1109\u1161\u0029',
+ '\u3215': '\u0028\u110B\u1161\u0029',
+ '\u3216': '\u0028\u110C\u1161\u0029',
+ '\u3217': '\u0028\u110E\u1161\u0029',
+ '\u3218': '\u0028\u110F\u1161\u0029',
+ '\u3219': '\u0028\u1110\u1161\u0029',
+ '\u321A': '\u0028\u1111\u1161\u0029',
+ '\u321B': '\u0028\u1112\u1161\u0029',
+ '\u321C': '\u0028\u110C\u116E\u0029',
+ '\u321D': '\u0028\u110B\u1169\u110C\u1165\u11AB\u0029',
+ '\u321E': '\u0028\u110B\u1169\u1112\u116E\u0029',
+ '\u3220': '\u0028\u4E00\u0029',
+ '\u3221': '\u0028\u4E8C\u0029',
+ '\u3222': '\u0028\u4E09\u0029',
+ '\u3223': '\u0028\u56DB\u0029',
+ '\u3224': '\u0028\u4E94\u0029',
+ '\u3225': '\u0028\u516D\u0029',
+ '\u3226': '\u0028\u4E03\u0029',
+ '\u3227': '\u0028\u516B\u0029',
+ '\u3228': '\u0028\u4E5D\u0029',
+ '\u3229': '\u0028\u5341\u0029',
+ '\u322A': '\u0028\u6708\u0029',
+ '\u322B': '\u0028\u706B\u0029',
+ '\u322C': '\u0028\u6C34\u0029',
+ '\u322D': '\u0028\u6728\u0029',
+ '\u322E': '\u0028\u91D1\u0029',
+ '\u322F': '\u0028\u571F\u0029',
+ '\u3230': '\u0028\u65E5\u0029',
+ '\u3231': '\u0028\u682A\u0029',
+ '\u3232': '\u0028\u6709\u0029',
+ '\u3233': '\u0028\u793E\u0029',
+ '\u3234': '\u0028\u540D\u0029',
+ '\u3235': '\u0028\u7279\u0029',
+ '\u3236': '\u0028\u8CA1\u0029',
+ '\u3237': '\u0028\u795D\u0029',
+ '\u3238': '\u0028\u52B4\u0029',
+ '\u3239': '\u0028\u4EE3\u0029',
+ '\u323A': '\u0028\u547C\u0029',
+ '\u323B': '\u0028\u5B66\u0029',
+ '\u323C': '\u0028\u76E3\u0029',
+ '\u323D': '\u0028\u4F01\u0029',
+ '\u323E': '\u0028\u8CC7\u0029',
+ '\u323F': '\u0028\u5354\u0029',
+ '\u3240': '\u0028\u796D\u0029',
+ '\u3241': '\u0028\u4F11\u0029',
+ '\u3242': '\u0028\u81EA\u0029',
+ '\u3243': '\u0028\u81F3\u0029',
+ '\u32C0': '\u0031\u6708',
+ '\u32C1': '\u0032\u6708',
+ '\u32C2': '\u0033\u6708',
+ '\u32C3': '\u0034\u6708',
+ '\u32C4': '\u0035\u6708',
+ '\u32C5': '\u0036\u6708',
+ '\u32C6': '\u0037\u6708',
+ '\u32C7': '\u0038\u6708',
+ '\u32C8': '\u0039\u6708',
+ '\u32C9': '\u0031\u0030\u6708',
+ '\u32CA': '\u0031\u0031\u6708',
+ '\u32CB': '\u0031\u0032\u6708',
+ '\u3358': '\u0030\u70B9',
+ '\u3359': '\u0031\u70B9',
+ '\u335A': '\u0032\u70B9',
+ '\u335B': '\u0033\u70B9',
+ '\u335C': '\u0034\u70B9',
+ '\u335D': '\u0035\u70B9',
+ '\u335E': '\u0036\u70B9',
+ '\u335F': '\u0037\u70B9',
+ '\u3360': '\u0038\u70B9',
+ '\u3361': '\u0039\u70B9',
+ '\u3362': '\u0031\u0030\u70B9',
+ '\u3363': '\u0031\u0031\u70B9',
+ '\u3364': '\u0031\u0032\u70B9',
+ '\u3365': '\u0031\u0033\u70B9',
+ '\u3366': '\u0031\u0034\u70B9',
+ '\u3367': '\u0031\u0035\u70B9',
+ '\u3368': '\u0031\u0036\u70B9',
+ '\u3369': '\u0031\u0037\u70B9',
+ '\u336A': '\u0031\u0038\u70B9',
+ '\u336B': '\u0031\u0039\u70B9',
+ '\u336C': '\u0032\u0030\u70B9',
+ '\u336D': '\u0032\u0031\u70B9',
+ '\u336E': '\u0032\u0032\u70B9',
+ '\u336F': '\u0032\u0033\u70B9',
+ '\u3370': '\u0032\u0034\u70B9',
+ '\u33E0': '\u0031\u65E5',
+ '\u33E1': '\u0032\u65E5',
+ '\u33E2': '\u0033\u65E5',
+ '\u33E3': '\u0034\u65E5',
+ '\u33E4': '\u0035\u65E5',
+ '\u33E5': '\u0036\u65E5',
+ '\u33E6': '\u0037\u65E5',
+ '\u33E7': '\u0038\u65E5',
+ '\u33E8': '\u0039\u65E5',
+ '\u33E9': '\u0031\u0030\u65E5',
+ '\u33EA': '\u0031\u0031\u65E5',
+ '\u33EB': '\u0031\u0032\u65E5',
+ '\u33EC': '\u0031\u0033\u65E5',
+ '\u33ED': '\u0031\u0034\u65E5',
+ '\u33EE': '\u0031\u0035\u65E5',
+ '\u33EF': '\u0031\u0036\u65E5',
+ '\u33F0': '\u0031\u0037\u65E5',
+ '\u33F1': '\u0031\u0038\u65E5',
+ '\u33F2': '\u0031\u0039\u65E5',
+ '\u33F3': '\u0032\u0030\u65E5',
+ '\u33F4': '\u0032\u0031\u65E5',
+ '\u33F5': '\u0032\u0032\u65E5',
+ '\u33F6': '\u0032\u0033\u65E5',
+ '\u33F7': '\u0032\u0034\u65E5',
+ '\u33F8': '\u0032\u0035\u65E5',
+ '\u33F9': '\u0032\u0036\u65E5',
+ '\u33FA': '\u0032\u0037\u65E5',
+ '\u33FB': '\u0032\u0038\u65E5',
+ '\u33FC': '\u0032\u0039\u65E5',
+ '\u33FD': '\u0033\u0030\u65E5',
+ '\u33FE': '\u0033\u0031\u65E5',
+ '\uFB00': '\u0066\u0066',
+ '\uFB01': '\u0066\u0069',
+ '\uFB02': '\u0066\u006C',
+ '\uFB03': '\u0066\u0066\u0069',
+ '\uFB04': '\u0066\u0066\u006C',
+ '\uFB05': '\u017F\u0074',
+ '\uFB06': '\u0073\u0074',
+ '\uFB13': '\u0574\u0576',
+ '\uFB14': '\u0574\u0565',
+ '\uFB15': '\u0574\u056B',
+ '\uFB16': '\u057E\u0576',
+ '\uFB17': '\u0574\u056D',
+ '\uFB4F': '\u05D0\u05DC',
+ '\uFB50': '\u0671',
+ '\uFB51': '\u0671',
+ '\uFB52': '\u067B',
+ '\uFB53': '\u067B',
+ '\uFB54': '\u067B',
+ '\uFB55': '\u067B',
+ '\uFB56': '\u067E',
+ '\uFB57': '\u067E',
+ '\uFB58': '\u067E',
+ '\uFB59': '\u067E',
+ '\uFB5A': '\u0680',
+ '\uFB5B': '\u0680',
+ '\uFB5C': '\u0680',
+ '\uFB5D': '\u0680',
+ '\uFB5E': '\u067A',
+ '\uFB5F': '\u067A',
+ '\uFB60': '\u067A',
+ '\uFB61': '\u067A',
+ '\uFB62': '\u067F',
+ '\uFB63': '\u067F',
+ '\uFB64': '\u067F',
+ '\uFB65': '\u067F',
+ '\uFB66': '\u0679',
+ '\uFB67': '\u0679',
+ '\uFB68': '\u0679',
+ '\uFB69': '\u0679',
+ '\uFB6A': '\u06A4',
+ '\uFB6B': '\u06A4',
+ '\uFB6C': '\u06A4',
+ '\uFB6D': '\u06A4',
+ '\uFB6E': '\u06A6',
+ '\uFB6F': '\u06A6',
+ '\uFB70': '\u06A6',
+ '\uFB71': '\u06A6',
+ '\uFB72': '\u0684',
+ '\uFB73': '\u0684',
+ '\uFB74': '\u0684',
+ '\uFB75': '\u0684',
+ '\uFB76': '\u0683',
+ '\uFB77': '\u0683',
+ '\uFB78': '\u0683',
+ '\uFB79': '\u0683',
+ '\uFB7A': '\u0686',
+ '\uFB7B': '\u0686',
+ '\uFB7C': '\u0686',
+ '\uFB7D': '\u0686',
+ '\uFB7E': '\u0687',
+ '\uFB7F': '\u0687',
+ '\uFB80': '\u0687',
+ '\uFB81': '\u0687',
+ '\uFB82': '\u068D',
+ '\uFB83': '\u068D',
+ '\uFB84': '\u068C',
+ '\uFB85': '\u068C',
+ '\uFB86': '\u068E',
+ '\uFB87': '\u068E',
+ '\uFB88': '\u0688',
+ '\uFB89': '\u0688',
+ '\uFB8A': '\u0698',
+ '\uFB8B': '\u0698',
+ '\uFB8C': '\u0691',
+ '\uFB8D': '\u0691',
+ '\uFB8E': '\u06A9',
+ '\uFB8F': '\u06A9',
+ '\uFB90': '\u06A9',
+ '\uFB91': '\u06A9',
+ '\uFB92': '\u06AF',
+ '\uFB93': '\u06AF',
+ '\uFB94': '\u06AF',
+ '\uFB95': '\u06AF',
+ '\uFB96': '\u06B3',
+ '\uFB97': '\u06B3',
+ '\uFB98': '\u06B3',
+ '\uFB99': '\u06B3',
+ '\uFB9A': '\u06B1',
+ '\uFB9B': '\u06B1',
+ '\uFB9C': '\u06B1',
+ '\uFB9D': '\u06B1',
+ '\uFB9E': '\u06BA',
+ '\uFB9F': '\u06BA',
+ '\uFBA0': '\u06BB',
+ '\uFBA1': '\u06BB',
+ '\uFBA2': '\u06BB',
+ '\uFBA3': '\u06BB',
+ '\uFBA4': '\u06C0',
+ '\uFBA5': '\u06C0',
+ '\uFBA6': '\u06C1',
+ '\uFBA7': '\u06C1',
+ '\uFBA8': '\u06C1',
+ '\uFBA9': '\u06C1',
+ '\uFBAA': '\u06BE',
+ '\uFBAB': '\u06BE',
+ '\uFBAC': '\u06BE',
+ '\uFBAD': '\u06BE',
+ '\uFBAE': '\u06D2',
+ '\uFBAF': '\u06D2',
+ '\uFBB0': '\u06D3',
+ '\uFBB1': '\u06D3',
+ '\uFBD3': '\u06AD',
+ '\uFBD4': '\u06AD',
+ '\uFBD5': '\u06AD',
+ '\uFBD6': '\u06AD',
+ '\uFBD7': '\u06C7',
+ '\uFBD8': '\u06C7',
+ '\uFBD9': '\u06C6',
+ '\uFBDA': '\u06C6',
+ '\uFBDB': '\u06C8',
+ '\uFBDC': '\u06C8',
+ '\uFBDD': '\u0677',
+ '\uFBDE': '\u06CB',
+ '\uFBDF': '\u06CB',
+ '\uFBE0': '\u06C5',
+ '\uFBE1': '\u06C5',
+ '\uFBE2': '\u06C9',
+ '\uFBE3': '\u06C9',
+ '\uFBE4': '\u06D0',
+ '\uFBE5': '\u06D0',
+ '\uFBE6': '\u06D0',
+ '\uFBE7': '\u06D0',
+ '\uFBE8': '\u0649',
+ '\uFBE9': '\u0649',
+ '\uFBEA': '\u0626\u0627',
+ '\uFBEB': '\u0626\u0627',
+ '\uFBEC': '\u0626\u06D5',
+ '\uFBED': '\u0626\u06D5',
+ '\uFBEE': '\u0626\u0648',
+ '\uFBEF': '\u0626\u0648',
+ '\uFBF0': '\u0626\u06C7',
+ '\uFBF1': '\u0626\u06C7',
+ '\uFBF2': '\u0626\u06C6',
+ '\uFBF3': '\u0626\u06C6',
+ '\uFBF4': '\u0626\u06C8',
+ '\uFBF5': '\u0626\u06C8',
+ '\uFBF6': '\u0626\u06D0',
+ '\uFBF7': '\u0626\u06D0',
+ '\uFBF8': '\u0626\u06D0',
+ '\uFBF9': '\u0626\u0649',
+ '\uFBFA': '\u0626\u0649',
+ '\uFBFB': '\u0626\u0649',
+ '\uFBFC': '\u06CC',
+ '\uFBFD': '\u06CC',
+ '\uFBFE': '\u06CC',
+ '\uFBFF': '\u06CC',
+ '\uFC00': '\u0626\u062C',
+ '\uFC01': '\u0626\u062D',
+ '\uFC02': '\u0626\u0645',
+ '\uFC03': '\u0626\u0649',
+ '\uFC04': '\u0626\u064A',
+ '\uFC05': '\u0628\u062C',
+ '\uFC06': '\u0628\u062D',
+ '\uFC07': '\u0628\u062E',
+ '\uFC08': '\u0628\u0645',
+ '\uFC09': '\u0628\u0649',
+ '\uFC0A': '\u0628\u064A',
+ '\uFC0B': '\u062A\u062C',
+ '\uFC0C': '\u062A\u062D',
+ '\uFC0D': '\u062A\u062E',
+ '\uFC0E': '\u062A\u0645',
+ '\uFC0F': '\u062A\u0649',
+ '\uFC10': '\u062A\u064A',
+ '\uFC11': '\u062B\u062C',
+ '\uFC12': '\u062B\u0645',
+ '\uFC13': '\u062B\u0649',
+ '\uFC14': '\u062B\u064A',
+ '\uFC15': '\u062C\u062D',
+ '\uFC16': '\u062C\u0645',
+ '\uFC17': '\u062D\u062C',
+ '\uFC18': '\u062D\u0645',
+ '\uFC19': '\u062E\u062C',
+ '\uFC1A': '\u062E\u062D',
+ '\uFC1B': '\u062E\u0645',
+ '\uFC1C': '\u0633\u062C',
+ '\uFC1D': '\u0633\u062D',
+ '\uFC1E': '\u0633\u062E',
+ '\uFC1F': '\u0633\u0645',
+ '\uFC20': '\u0635\u062D',
+ '\uFC21': '\u0635\u0645',
+ '\uFC22': '\u0636\u062C',
+ '\uFC23': '\u0636\u062D',
+ '\uFC24': '\u0636\u062E',
+ '\uFC25': '\u0636\u0645',
+ '\uFC26': '\u0637\u062D',
+ '\uFC27': '\u0637\u0645',
+ '\uFC28': '\u0638\u0645',
+ '\uFC29': '\u0639\u062C',
+ '\uFC2A': '\u0639\u0645',
+ '\uFC2B': '\u063A\u062C',
+ '\uFC2C': '\u063A\u0645',
+ '\uFC2D': '\u0641\u062C',
+ '\uFC2E': '\u0641\u062D',
+ '\uFC2F': '\u0641\u062E',
+ '\uFC30': '\u0641\u0645',
+ '\uFC31': '\u0641\u0649',
+ '\uFC32': '\u0641\u064A',
+ '\uFC33': '\u0642\u062D',
+ '\uFC34': '\u0642\u0645',
+ '\uFC35': '\u0642\u0649',
+ '\uFC36': '\u0642\u064A',
+ '\uFC37': '\u0643\u0627',
+ '\uFC38': '\u0643\u062C',
+ '\uFC39': '\u0643\u062D',
+ '\uFC3A': '\u0643\u062E',
+ '\uFC3B': '\u0643\u0644',
+ '\uFC3C': '\u0643\u0645',
+ '\uFC3D': '\u0643\u0649',
+ '\uFC3E': '\u0643\u064A',
+ '\uFC3F': '\u0644\u062C',
+ '\uFC40': '\u0644\u062D',
+ '\uFC41': '\u0644\u062E',
+ '\uFC42': '\u0644\u0645',
+ '\uFC43': '\u0644\u0649',
+ '\uFC44': '\u0644\u064A',
+ '\uFC45': '\u0645\u062C',
+ '\uFC46': '\u0645\u062D',
+ '\uFC47': '\u0645\u062E',
+ '\uFC48': '\u0645\u0645',
+ '\uFC49': '\u0645\u0649',
+ '\uFC4A': '\u0645\u064A',
+ '\uFC4B': '\u0646\u062C',
+ '\uFC4C': '\u0646\u062D',
+ '\uFC4D': '\u0646\u062E',
+ '\uFC4E': '\u0646\u0645',
+ '\uFC4F': '\u0646\u0649',
+ '\uFC50': '\u0646\u064A',
+ '\uFC51': '\u0647\u062C',
+ '\uFC52': '\u0647\u0645',
+ '\uFC53': '\u0647\u0649',
+ '\uFC54': '\u0647\u064A',
+ '\uFC55': '\u064A\u062C',
+ '\uFC56': '\u064A\u062D',
+ '\uFC57': '\u064A\u062E',
+ '\uFC58': '\u064A\u0645',
+ '\uFC59': '\u064A\u0649',
+ '\uFC5A': '\u064A\u064A',
+ '\uFC5B': '\u0630\u0670',
+ '\uFC5C': '\u0631\u0670',
+ '\uFC5D': '\u0649\u0670',
+ '\uFC5E': '\u0020\u064C\u0651',
+ '\uFC5F': '\u0020\u064D\u0651',
+ '\uFC60': '\u0020\u064E\u0651',
+ '\uFC61': '\u0020\u064F\u0651',
+ '\uFC62': '\u0020\u0650\u0651',
+ '\uFC63': '\u0020\u0651\u0670',
+ '\uFC64': '\u0626\u0631',
+ '\uFC65': '\u0626\u0632',
+ '\uFC66': '\u0626\u0645',
+ '\uFC67': '\u0626\u0646',
+ '\uFC68': '\u0626\u0649',
+ '\uFC69': '\u0626\u064A',
+ '\uFC6A': '\u0628\u0631',
+ '\uFC6B': '\u0628\u0632',
+ '\uFC6C': '\u0628\u0645',
+ '\uFC6D': '\u0628\u0646',
+ '\uFC6E': '\u0628\u0649',
+ '\uFC6F': '\u0628\u064A',
+ '\uFC70': '\u062A\u0631',
+ '\uFC71': '\u062A\u0632',
+ '\uFC72': '\u062A\u0645',
+ '\uFC73': '\u062A\u0646',
+ '\uFC74': '\u062A\u0649',
+ '\uFC75': '\u062A\u064A',
+ '\uFC76': '\u062B\u0631',
+ '\uFC77': '\u062B\u0632',
+ '\uFC78': '\u062B\u0645',
+ '\uFC79': '\u062B\u0646',
+ '\uFC7A': '\u062B\u0649',
+ '\uFC7B': '\u062B\u064A',
+ '\uFC7C': '\u0641\u0649',
+ '\uFC7D': '\u0641\u064A',
+ '\uFC7E': '\u0642\u0649',
+ '\uFC7F': '\u0642\u064A',
+ '\uFC80': '\u0643\u0627',
+ '\uFC81': '\u0643\u0644',
+ '\uFC82': '\u0643\u0645',
+ '\uFC83': '\u0643\u0649',
+ '\uFC84': '\u0643\u064A',
+ '\uFC85': '\u0644\u0645',
+ '\uFC86': '\u0644\u0649',
+ '\uFC87': '\u0644\u064A',
+ '\uFC88': '\u0645\u0627',
+ '\uFC89': '\u0645\u0645',
+ '\uFC8A': '\u0646\u0631',
+ '\uFC8B': '\u0646\u0632',
+ '\uFC8C': '\u0646\u0645',
+ '\uFC8D': '\u0646\u0646',
+ '\uFC8E': '\u0646\u0649',
+ '\uFC8F': '\u0646\u064A',
+ '\uFC90': '\u0649\u0670',
+ '\uFC91': '\u064A\u0631',
+ '\uFC92': '\u064A\u0632',
+ '\uFC93': '\u064A\u0645',
+ '\uFC94': '\u064A\u0646',
+ '\uFC95': '\u064A\u0649',
+ '\uFC96': '\u064A\u064A',
+ '\uFC97': '\u0626\u062C',
+ '\uFC98': '\u0626\u062D',
+ '\uFC99': '\u0626\u062E',
+ '\uFC9A': '\u0626\u0645',
+ '\uFC9B': '\u0626\u0647',
+ '\uFC9C': '\u0628\u062C',
+ '\uFC9D': '\u0628\u062D',
+ '\uFC9E': '\u0628\u062E',
+ '\uFC9F': '\u0628\u0645',
+ '\uFCA0': '\u0628\u0647',
+ '\uFCA1': '\u062A\u062C',
+ '\uFCA2': '\u062A\u062D',
+ '\uFCA3': '\u062A\u062E',
+ '\uFCA4': '\u062A\u0645',
+ '\uFCA5': '\u062A\u0647',
+ '\uFCA6': '\u062B\u0645',
+ '\uFCA7': '\u062C\u062D',
+ '\uFCA8': '\u062C\u0645',
+ '\uFCA9': '\u062D\u062C',
+ '\uFCAA': '\u062D\u0645',
+ '\uFCAB': '\u062E\u062C',
+ '\uFCAC': '\u062E\u0645',
+ '\uFCAD': '\u0633\u062C',
+ '\uFCAE': '\u0633\u062D',
+ '\uFCAF': '\u0633\u062E',
+ '\uFCB0': '\u0633\u0645',
+ '\uFCB1': '\u0635\u062D',
+ '\uFCB2': '\u0635\u062E',
+ '\uFCB3': '\u0635\u0645',
+ '\uFCB4': '\u0636\u062C',
+ '\uFCB5': '\u0636\u062D',
+ '\uFCB6': '\u0636\u062E',
+ '\uFCB7': '\u0636\u0645',
+ '\uFCB8': '\u0637\u062D',
+ '\uFCB9': '\u0638\u0645',
+ '\uFCBA': '\u0639\u062C',
+ '\uFCBB': '\u0639\u0645',
+ '\uFCBC': '\u063A\u062C',
+ '\uFCBD': '\u063A\u0645',
+ '\uFCBE': '\u0641\u062C',
+ '\uFCBF': '\u0641\u062D',
+ '\uFCC0': '\u0641\u062E',
+ '\uFCC1': '\u0641\u0645',
+ '\uFCC2': '\u0642\u062D',
+ '\uFCC3': '\u0642\u0645',
+ '\uFCC4': '\u0643\u062C',
+ '\uFCC5': '\u0643\u062D',
+ '\uFCC6': '\u0643\u062E',
+ '\uFCC7': '\u0643\u0644',
+ '\uFCC8': '\u0643\u0645',
+ '\uFCC9': '\u0644\u062C',
+ '\uFCCA': '\u0644\u062D',
+ '\uFCCB': '\u0644\u062E',
+ '\uFCCC': '\u0644\u0645',
+ '\uFCCD': '\u0644\u0647',
+ '\uFCCE': '\u0645\u062C',
+ '\uFCCF': '\u0645\u062D',
+ '\uFCD0': '\u0645\u062E',
+ '\uFCD1': '\u0645\u0645',
+ '\uFCD2': '\u0646\u062C',
+ '\uFCD3': '\u0646\u062D',
+ '\uFCD4': '\u0646\u062E',
+ '\uFCD5': '\u0646\u0645',
+ '\uFCD6': '\u0646\u0647',
+ '\uFCD7': '\u0647\u062C',
+ '\uFCD8': '\u0647\u0645',
+ '\uFCD9': '\u0647\u0670',
+ '\uFCDA': '\u064A\u062C',
+ '\uFCDB': '\u064A\u062D',
+ '\uFCDC': '\u064A\u062E',
+ '\uFCDD': '\u064A\u0645',
+ '\uFCDE': '\u064A\u0647',
+ '\uFCDF': '\u0626\u0645',
+ '\uFCE0': '\u0626\u0647',
+ '\uFCE1': '\u0628\u0645',
+ '\uFCE2': '\u0628\u0647',
+ '\uFCE3': '\u062A\u0645',
+ '\uFCE4': '\u062A\u0647',
+ '\uFCE5': '\u062B\u0645',
+ '\uFCE6': '\u062B\u0647',
+ '\uFCE7': '\u0633\u0645',
+ '\uFCE8': '\u0633\u0647',
+ '\uFCE9': '\u0634\u0645',
+ '\uFCEA': '\u0634\u0647',
+ '\uFCEB': '\u0643\u0644',
+ '\uFCEC': '\u0643\u0645',
+ '\uFCED': '\u0644\u0645',
+ '\uFCEE': '\u0646\u0645',
+ '\uFCEF': '\u0646\u0647',
+ '\uFCF0': '\u064A\u0645',
+ '\uFCF1': '\u064A\u0647',
+ '\uFCF2': '\u0640\u064E\u0651',
+ '\uFCF3': '\u0640\u064F\u0651',
+ '\uFCF4': '\u0640\u0650\u0651',
+ '\uFCF5': '\u0637\u0649',
+ '\uFCF6': '\u0637\u064A',
+ '\uFCF7': '\u0639\u0649',
+ '\uFCF8': '\u0639\u064A',
+ '\uFCF9': '\u063A\u0649',
+ '\uFCFA': '\u063A\u064A',
+ '\uFCFB': '\u0633\u0649',
+ '\uFCFC': '\u0633\u064A',
+ '\uFCFD': '\u0634\u0649',
+ '\uFCFE': '\u0634\u064A',
+ '\uFCFF': '\u062D\u0649',
+ '\uFD00': '\u062D\u064A',
+ '\uFD01': '\u062C\u0649',
+ '\uFD02': '\u062C\u064A',
+ '\uFD03': '\u062E\u0649',
+ '\uFD04': '\u062E\u064A',
+ '\uFD05': '\u0635\u0649',
+ '\uFD06': '\u0635\u064A',
+ '\uFD07': '\u0636\u0649',
+ '\uFD08': '\u0636\u064A',
+ '\uFD09': '\u0634\u062C',
+ '\uFD0A': '\u0634\u062D',
+ '\uFD0B': '\u0634\u062E',
+ '\uFD0C': '\u0634\u0645',
+ '\uFD0D': '\u0634\u0631',
+ '\uFD0E': '\u0633\u0631',
+ '\uFD0F': '\u0635\u0631',
+ '\uFD10': '\u0636\u0631',
+ '\uFD11': '\u0637\u0649',
+ '\uFD12': '\u0637\u064A',
+ '\uFD13': '\u0639\u0649',
+ '\uFD14': '\u0639\u064A',
+ '\uFD15': '\u063A\u0649',
+ '\uFD16': '\u063A\u064A',
+ '\uFD17': '\u0633\u0649',
+ '\uFD18': '\u0633\u064A',
+ '\uFD19': '\u0634\u0649',
+ '\uFD1A': '\u0634\u064A',
+ '\uFD1B': '\u062D\u0649',
+ '\uFD1C': '\u062D\u064A',
+ '\uFD1D': '\u062C\u0649',
+ '\uFD1E': '\u062C\u064A',
+ '\uFD1F': '\u062E\u0649',
+ '\uFD20': '\u062E\u064A',
+ '\uFD21': '\u0635\u0649',
+ '\uFD22': '\u0635\u064A',
+ '\uFD23': '\u0636\u0649',
+ '\uFD24': '\u0636\u064A',
+ '\uFD25': '\u0634\u062C',
+ '\uFD26': '\u0634\u062D',
+ '\uFD27': '\u0634\u062E',
+ '\uFD28': '\u0634\u0645',
+ '\uFD29': '\u0634\u0631',
+ '\uFD2A': '\u0633\u0631',
+ '\uFD2B': '\u0635\u0631',
+ '\uFD2C': '\u0636\u0631',
+ '\uFD2D': '\u0634\u062C',
+ '\uFD2E': '\u0634\u062D',
+ '\uFD2F': '\u0634\u062E',
+ '\uFD30': '\u0634\u0645',
+ '\uFD31': '\u0633\u0647',
+ '\uFD32': '\u0634\u0647',
+ '\uFD33': '\u0637\u0645',
+ '\uFD34': '\u0633\u062C',
+ '\uFD35': '\u0633\u062D',
+ '\uFD36': '\u0633\u062E',
+ '\uFD37': '\u0634\u062C',
+ '\uFD38': '\u0634\u062D',
+ '\uFD39': '\u0634\u062E',
+ '\uFD3A': '\u0637\u0645',
+ '\uFD3B': '\u0638\u0645',
+ '\uFD3C': '\u0627\u064B',
+ '\uFD3D': '\u0627\u064B',
+ '\uFD50': '\u062A\u062C\u0645',
+ '\uFD51': '\u062A\u062D\u062C',
+ '\uFD52': '\u062A\u062D\u062C',
+ '\uFD53': '\u062A\u062D\u0645',
+ '\uFD54': '\u062A\u062E\u0645',
+ '\uFD55': '\u062A\u0645\u062C',
+ '\uFD56': '\u062A\u0645\u062D',
+ '\uFD57': '\u062A\u0645\u062E',
+ '\uFD58': '\u062C\u0645\u062D',
+ '\uFD59': '\u062C\u0645\u062D',
+ '\uFD5A': '\u062D\u0645\u064A',
+ '\uFD5B': '\u062D\u0645\u0649',
+ '\uFD5C': '\u0633\u062D\u062C',
+ '\uFD5D': '\u0633\u062C\u062D',
+ '\uFD5E': '\u0633\u062C\u0649',
+ '\uFD5F': '\u0633\u0645\u062D',
+ '\uFD60': '\u0633\u0645\u062D',
+ '\uFD61': '\u0633\u0645\u062C',
+ '\uFD62': '\u0633\u0645\u0645',
+ '\uFD63': '\u0633\u0645\u0645',
+ '\uFD64': '\u0635\u062D\u062D',
+ '\uFD65': '\u0635\u062D\u062D',
+ '\uFD66': '\u0635\u0645\u0645',
+ '\uFD67': '\u0634\u062D\u0645',
+ '\uFD68': '\u0634\u062D\u0645',
+ '\uFD69': '\u0634\u062C\u064A',
+ '\uFD6A': '\u0634\u0645\u062E',
+ '\uFD6B': '\u0634\u0645\u062E',
+ '\uFD6C': '\u0634\u0645\u0645',
+ '\uFD6D': '\u0634\u0645\u0645',
+ '\uFD6E': '\u0636\u062D\u0649',
+ '\uFD6F': '\u0636\u062E\u0645',
+ '\uFD70': '\u0636\u062E\u0645',
+ '\uFD71': '\u0637\u0645\u062D',
+ '\uFD72': '\u0637\u0645\u062D',
+ '\uFD73': '\u0637\u0645\u0645',
+ '\uFD74': '\u0637\u0645\u064A',
+ '\uFD75': '\u0639\u062C\u0645',
+ '\uFD76': '\u0639\u0645\u0645',
+ '\uFD77': '\u0639\u0645\u0645',
+ '\uFD78': '\u0639\u0645\u0649',
+ '\uFD79': '\u063A\u0645\u0645',
+ '\uFD7A': '\u063A\u0645\u064A',
+ '\uFD7B': '\u063A\u0645\u0649',
+ '\uFD7C': '\u0641\u062E\u0645',
+ '\uFD7D': '\u0641\u062E\u0645',
+ '\uFD7E': '\u0642\u0645\u062D',
+ '\uFD7F': '\u0642\u0645\u0645',
+ '\uFD80': '\u0644\u062D\u0645',
+ '\uFD81': '\u0644\u062D\u064A',
+ '\uFD82': '\u0644\u062D\u0649',
+ '\uFD83': '\u0644\u062C\u062C',
+ '\uFD84': '\u0644\u062C\u062C',
+ '\uFD85': '\u0644\u062E\u0645',
+ '\uFD86': '\u0644\u062E\u0645',
+ '\uFD87': '\u0644\u0645\u062D',
+ '\uFD88': '\u0644\u0645\u062D',
+ '\uFD89': '\u0645\u062D\u062C',
+ '\uFD8A': '\u0645\u062D\u0645',
+ '\uFD8B': '\u0645\u062D\u064A',
+ '\uFD8C': '\u0645\u062C\u062D',
+ '\uFD8D': '\u0645\u062C\u0645',
+ '\uFD8E': '\u0645\u062E\u062C',
+ '\uFD8F': '\u0645\u062E\u0645',
+ '\uFD92': '\u0645\u062C\u062E',
+ '\uFD93': '\u0647\u0645\u062C',
+ '\uFD94': '\u0647\u0645\u0645',
+ '\uFD95': '\u0646\u062D\u0645',
+ '\uFD96': '\u0646\u062D\u0649',
+ '\uFD97': '\u0646\u062C\u0645',
+ '\uFD98': '\u0646\u062C\u0645',
+ '\uFD99': '\u0646\u062C\u0649',
+ '\uFD9A': '\u0646\u0645\u064A',
+ '\uFD9B': '\u0646\u0645\u0649',
+ '\uFD9C': '\u064A\u0645\u0645',
+ '\uFD9D': '\u064A\u0645\u0645',
+ '\uFD9E': '\u0628\u062E\u064A',
+ '\uFD9F': '\u062A\u062C\u064A',
+ '\uFDA0': '\u062A\u062C\u0649',
+ '\uFDA1': '\u062A\u062E\u064A',
+ '\uFDA2': '\u062A\u062E\u0649',
+ '\uFDA3': '\u062A\u0645\u064A',
+ '\uFDA4': '\u062A\u0645\u0649',
+ '\uFDA5': '\u062C\u0645\u064A',
+ '\uFDA6': '\u062C\u062D\u0649',
+ '\uFDA7': '\u062C\u0645\u0649',
+ '\uFDA8': '\u0633\u062E\u0649',
+ '\uFDA9': '\u0635\u062D\u064A',
+ '\uFDAA': '\u0634\u062D\u064A',
+ '\uFDAB': '\u0636\u062D\u064A',
+ '\uFDAC': '\u0644\u062C\u064A',
+ '\uFDAD': '\u0644\u0645\u064A',
+ '\uFDAE': '\u064A\u062D\u064A',
+ '\uFDAF': '\u064A\u062C\u064A',
+ '\uFDB0': '\u064A\u0645\u064A',
+ '\uFDB1': '\u0645\u0645\u064A',
+ '\uFDB2': '\u0642\u0645\u064A',
+ '\uFDB3': '\u0646\u062D\u064A',
+ '\uFDB4': '\u0642\u0645\u062D',
+ '\uFDB5': '\u0644\u062D\u0645',
+ '\uFDB6': '\u0639\u0645\u064A',
+ '\uFDB7': '\u0643\u0645\u064A',
+ '\uFDB8': '\u0646\u062C\u062D',
+ '\uFDB9': '\u0645\u062E\u064A',
+ '\uFDBA': '\u0644\u062C\u0645',
+ '\uFDBB': '\u0643\u0645\u0645',
+ '\uFDBC': '\u0644\u062C\u0645',
+ '\uFDBD': '\u0646\u062C\u062D',
+ '\uFDBE': '\u062C\u062D\u064A',
+ '\uFDBF': '\u062D\u062C\u064A',
+ '\uFDC0': '\u0645\u062C\u064A',
+ '\uFDC1': '\u0641\u0645\u064A',
+ '\uFDC2': '\u0628\u062D\u064A',
+ '\uFDC3': '\u0643\u0645\u0645',
+ '\uFDC4': '\u0639\u062C\u0645',
+ '\uFDC5': '\u0635\u0645\u0645',
+ '\uFDC6': '\u0633\u062E\u064A',
+ '\uFDC7': '\u0646\u062C\u064A',
+ '\uFE49': '\u203E',
+ '\uFE4A': '\u203E',
+ '\uFE4B': '\u203E',
+ '\uFE4C': '\u203E',
+ '\uFE4D': '\u005F',
+ '\uFE4E': '\u005F',
+ '\uFE4F': '\u005F',
+ '\uFE80': '\u0621',
+ '\uFE81': '\u0622',
+ '\uFE82': '\u0622',
+ '\uFE83': '\u0623',
+ '\uFE84': '\u0623',
+ '\uFE85': '\u0624',
+ '\uFE86': '\u0624',
+ '\uFE87': '\u0625',
+ '\uFE88': '\u0625',
+ '\uFE89': '\u0626',
+ '\uFE8A': '\u0626',
+ '\uFE8B': '\u0626',
+ '\uFE8C': '\u0626',
+ '\uFE8D': '\u0627',
+ '\uFE8E': '\u0627',
+ '\uFE8F': '\u0628',
+ '\uFE90': '\u0628',
+ '\uFE91': '\u0628',
+ '\uFE92': '\u0628',
+ '\uFE93': '\u0629',
+ '\uFE94': '\u0629',
+ '\uFE95': '\u062A',
+ '\uFE96': '\u062A',
+ '\uFE97': '\u062A',
+ '\uFE98': '\u062A',
+ '\uFE99': '\u062B',
+ '\uFE9A': '\u062B',
+ '\uFE9B': '\u062B',
+ '\uFE9C': '\u062B',
+ '\uFE9D': '\u062C',
+ '\uFE9E': '\u062C',
+ '\uFE9F': '\u062C',
+ '\uFEA0': '\u062C',
+ '\uFEA1': '\u062D',
+ '\uFEA2': '\u062D',
+ '\uFEA3': '\u062D',
+ '\uFEA4': '\u062D',
+ '\uFEA5': '\u062E',
+ '\uFEA6': '\u062E',
+ '\uFEA7': '\u062E',
+ '\uFEA8': '\u062E',
+ '\uFEA9': '\u062F',
+ '\uFEAA': '\u062F',
+ '\uFEAB': '\u0630',
+ '\uFEAC': '\u0630',
+ '\uFEAD': '\u0631',
+ '\uFEAE': '\u0631',
+ '\uFEAF': '\u0632',
+ '\uFEB0': '\u0632',
+ '\uFEB1': '\u0633',
+ '\uFEB2': '\u0633',
+ '\uFEB3': '\u0633',
+ '\uFEB4': '\u0633',
+ '\uFEB5': '\u0634',
+ '\uFEB6': '\u0634',
+ '\uFEB7': '\u0634',
+ '\uFEB8': '\u0634',
+ '\uFEB9': '\u0635',
+ '\uFEBA': '\u0635',
+ '\uFEBB': '\u0635',
+ '\uFEBC': '\u0635',
+ '\uFEBD': '\u0636',
+ '\uFEBE': '\u0636',
+ '\uFEBF': '\u0636',
+ '\uFEC0': '\u0636',
+ '\uFEC1': '\u0637',
+ '\uFEC2': '\u0637',
+ '\uFEC3': '\u0637',
+ '\uFEC4': '\u0637',
+ '\uFEC5': '\u0638',
+ '\uFEC6': '\u0638',
+ '\uFEC7': '\u0638',
+ '\uFEC8': '\u0638',
+ '\uFEC9': '\u0639',
+ '\uFECA': '\u0639',
+ '\uFECB': '\u0639',
+ '\uFECC': '\u0639',
+ '\uFECD': '\u063A',
+ '\uFECE': '\u063A',
+ '\uFECF': '\u063A',
+ '\uFED0': '\u063A',
+ '\uFED1': '\u0641',
+ '\uFED2': '\u0641',
+ '\uFED3': '\u0641',
+ '\uFED4': '\u0641',
+ '\uFED5': '\u0642',
+ '\uFED6': '\u0642',
+ '\uFED7': '\u0642',
+ '\uFED8': '\u0642',
+ '\uFED9': '\u0643',
+ '\uFEDA': '\u0643',
+ '\uFEDB': '\u0643',
+ '\uFEDC': '\u0643',
+ '\uFEDD': '\u0644',
+ '\uFEDE': '\u0644',
+ '\uFEDF': '\u0644',
+ '\uFEE0': '\u0644',
+ '\uFEE1': '\u0645',
+ '\uFEE2': '\u0645',
+ '\uFEE3': '\u0645',
+ '\uFEE4': '\u0645',
+ '\uFEE5': '\u0646',
+ '\uFEE6': '\u0646',
+ '\uFEE7': '\u0646',
+ '\uFEE8': '\u0646',
+ '\uFEE9': '\u0647',
+ '\uFEEA': '\u0647',
+ '\uFEEB': '\u0647',
+ '\uFEEC': '\u0647',
+ '\uFEED': '\u0648',
+ '\uFEEE': '\u0648',
+ '\uFEEF': '\u0649',
+ '\uFEF0': '\u0649',
+ '\uFEF1': '\u064A',
+ '\uFEF2': '\u064A',
+ '\uFEF3': '\u064A',
+ '\uFEF4': '\u064A',
+ '\uFEF5': '\u0644\u0622',
+ '\uFEF6': '\u0644\u0622',
+ '\uFEF7': '\u0644\u0623',
+ '\uFEF8': '\u0644\u0623',
+ '\uFEF9': '\u0644\u0625',
+ '\uFEFA': '\u0644\u0625',
+ '\uFEFB': '\u0644\u0627',
+ '\uFEFC': '\u0644\u0627'
+};
+
+function reverseIfRtl(chars) {
+ var charsLength = chars.length;
+ //reverse an arabic ligature
+ if (charsLength <= 1 || !isRTLRangeFor(chars.charCodeAt(0))) {
+ return chars;
+ }
+ var s = '';
+ for (var ii = charsLength - 1; ii >= 0; ii--) {
+ s += chars[ii];
+ }
+ return s;
+}
+
+function adjustWidths(properties) {
+ if (properties.fontMatrix[0] === FONT_IDENTITY_MATRIX[0]) {
+ return;
+ }
+ // adjusting width to fontMatrix scale
+ var scale = 0.001 / properties.fontMatrix[0];
+ var glyphsWidths = properties.widths;
+ for (var glyph in glyphsWidths) {
+ glyphsWidths[glyph] *= scale;
+ }
+ properties.defaultWidth *= scale;
+}
+
+function getFontType(type, subtype) {
+ switch (type) {
+ case 'Type1':
+ return subtype === 'Type1C' ? FontType.TYPE1C : FontType.TYPE1;
+ case 'CIDFontType0':
+ return subtype === 'CIDFontType0C' ? FontType.CIDFONTTYPE0C :
+ FontType.CIDFONTTYPE0;
+ case 'OpenType':
+ return FontType.OPENTYPE;
+ case 'TrueType':
+ return FontType.TRUETYPE;
+ case 'CIDFontType2':
+ return FontType.CIDFONTTYPE2;
+ case 'MMType1':
+ return FontType.MMTYPE1;
+ case 'Type0':
+ return FontType.TYPE0;
+ default:
+ return FontType.UNKNOWN;
+ }
+}
+
+var Glyph = (function GlyphClosure() {
+ function Glyph(fontChar, unicode, accent, width, vmetric, operatorListId) {
+ this.fontChar = fontChar;
+ this.unicode = unicode;
+ this.accent = accent;
+ this.width = width;
+ this.vmetric = vmetric;
+ this.operatorListId = operatorListId;
+ }
+
+ Glyph.prototype.matchesForCache =
+ function(fontChar, unicode, accent, width, vmetric, operatorListId) {
+ return this.fontChar === fontChar &&
+ this.unicode === unicode &&
+ this.accent === accent &&
+ this.width === width &&
+ this.vmetric === vmetric &&
+ this.operatorListId === operatorListId;
+ };
+
+ return Glyph;
+})();
+
+var ToUnicodeMap = (function ToUnicodeMapClosure() {
+ function ToUnicodeMap(cmap) {
+ // The elements of this._map can be integers or strings, depending on how
+ // |cmap| was created.
+ this._map = cmap;
+ }
+
+ ToUnicodeMap.prototype = {
+ get length() {
+ return this._map.length;
+ },
+
+ forEach: function(callback) {
+ for (var charCode in this._map) {
+ callback(charCode, this._map[charCode].charCodeAt(0));
+ }
+ },
+
+ has: function(i) {
+ return this._map[i] !== undefined;
+ },
+
+ get: function(i) {
+ return this._map[i];
+ },
+
+ charCodeOf: function(v) {
+ return this._map.indexOf(v);
+ }
+ };
+
+ return ToUnicodeMap;
+})();
+
+var IdentityToUnicodeMap = (function IdentityToUnicodeMapClosure() {
+ function IdentityToUnicodeMap(firstChar, lastChar) {
+ this.firstChar = firstChar;
+ this.lastChar = lastChar;
+ }
+
+ IdentityToUnicodeMap.prototype = {
+ get length() {
+ return (this.lastChar + 1) - this.firstChar;
+ },
+
+ forEach: function (callback) {
+ for (var i = this.firstChar, ii = this.lastChar; i <= ii; i++) {
+ callback(i, i);
+ }
+ },
+
+ has: function (i) {
+ return this.firstChar <= i && i <= this.lastChar;
+ },
+
+ get: function (i) {
+ if (this.firstChar <= i && i <= this.lastChar) {
+ return String.fromCharCode(i);
+ }
+ return undefined;
+ },
+
+ charCodeOf: function (v) {
+ error('should not call .charCodeOf');
+ }
+ };
+
+ return IdentityToUnicodeMap;
+})();
+
+var OpenTypeFileBuilder = (function OpenTypeFileBuilderClosure() {
+ function writeInt16(dest, offset, num) {
+ dest[offset] = (num >> 8) & 0xFF;
+ dest[offset + 1] = num & 0xFF;
+ }
+
+ function writeInt32(dest, offset, num) {
+ dest[offset] = (num >> 24) & 0xFF;
+ dest[offset + 1] = (num >> 16) & 0xFF;
+ dest[offset + 2] = (num >> 8) & 0xFF;
+ dest[offset + 3] = num & 0xFF;
+ }
+
+ function writeData(dest, offset, data) {
+ var i, ii;
+ if (data instanceof Uint8Array) {
+ dest.set(data, offset);
+ } else if (typeof data === 'string') {
+ for (i = 0, ii = data.length; i < ii; i++) {
+ dest[offset++] = data.charCodeAt(i) & 0xFF;
+ }
+ } else {
+ // treating everything else as array
+ for (i = 0, ii = data.length; i < ii; i++) {
+ dest[offset++] = data[i] & 0xFF;
+ }
+ }
+ }
+
+ function OpenTypeFileBuilder(sfnt) {
+ this.sfnt = sfnt;
+ this.tables = Object.create(null);
+ }
+
+ OpenTypeFileBuilder.getSearchParams =
+ function OpenTypeFileBuilder_getSearchParams(entriesCount, entrySize) {
+ var maxPower2 = 1, log2 = 0;
+ while ((maxPower2 ^ entriesCount) > maxPower2) {
+ maxPower2 <<= 1;
+ log2++;
+ }
+ var searchRange = maxPower2 * entrySize;
+ return {
+ range: searchRange,
+ entry: log2,
+ rangeShift: entrySize * entriesCount - searchRange
+ };
+ };
+
+ var OTF_HEADER_SIZE = 12;
+ var OTF_TABLE_ENTRY_SIZE = 16;
+
+ OpenTypeFileBuilder.prototype = {
+ toArray: function OpenTypeFileBuilder_toArray() {
+ var sfnt = this.sfnt;
+
+ // Tables needs to be written by ascendant alphabetic order
+ var tables = this.tables;
+ var tablesNames = Object.keys(tables);
+ tablesNames.sort();
+ var numTables = tablesNames.length;
+
+ var i, j, jj, table, tableName;
+ // layout the tables data
+ var offset = OTF_HEADER_SIZE + numTables * OTF_TABLE_ENTRY_SIZE;
+ var tableOffsets = [offset];
+ for (i = 0; i < numTables; i++) {
+ table = tables[tablesNames[i]];
+ var paddedLength = ((table.length + 3) & ~3) >>> 0;
+ offset += paddedLength;
+ tableOffsets.push(offset);
+ }
+
+ var file = new Uint8Array(offset);
+ // write the table data first (mostly for checksum)
+ for (i = 0; i < numTables; i++) {
+ table = tables[tablesNames[i]];
+ writeData(file, tableOffsets[i], table);
+ }
+
+ // sfnt version (4 bytes)
+ if (sfnt === 'true') {
+ // Windows hates the Mac TrueType sfnt version number
+ sfnt = string32(0x00010000);
+ }
+ file[0] = sfnt.charCodeAt(0) & 0xFF;
+ file[1] = sfnt.charCodeAt(1) & 0xFF;
+ file[2] = sfnt.charCodeAt(2) & 0xFF;
+ file[3] = sfnt.charCodeAt(3) & 0xFF;
+
+ // numTables (2 bytes)
+ writeInt16(file, 4, numTables);
+
+ var searchParams = OpenTypeFileBuilder.getSearchParams(numTables, 16);
+
+ // searchRange (2 bytes)
+ writeInt16(file, 6, searchParams.range);
+ // entrySelector (2 bytes)
+ writeInt16(file, 8, searchParams.entry);
+ // rangeShift (2 bytes)
+ writeInt16(file, 10, searchParams.rangeShift);
+
+ offset = OTF_HEADER_SIZE;
+ // writing table entries
+ for (i = 0; i < numTables; i++) {
+ tableName = tablesNames[i];
+ file[offset] = tableName.charCodeAt(0) & 0xFF;
+ file[offset + 1] = tableName.charCodeAt(1) & 0xFF;
+ file[offset + 2] = tableName.charCodeAt(2) & 0xFF;
+ file[offset + 3] = tableName.charCodeAt(3) & 0xFF;
+
+ // checksum
+ var checksum = 0;
+ for (j = tableOffsets[i], jj = tableOffsets[i + 1]; j < jj; j += 4) {
+ var quad = (file[j] << 24) + (file[j + 1] << 16) +
+ (file[j + 2] << 8) + file[j + 3];
+ checksum = (checksum + quad) | 0;
+ }
+ writeInt32(file, offset + 4, checksum);
+
+ // offset
+ writeInt32(file, offset + 8, tableOffsets[i]);
+ // length
+ writeInt32(file, offset + 12, tables[tableName].length);
+
+ offset += OTF_TABLE_ENTRY_SIZE;
+ }
+ return file;
+ },
+
+ addTable: function OpenTypeFileBuilder_addTable(tag, data) {
+ if (tag in this.tables) {
+ throw new Error('Table ' + tag + ' already exists');
+ }
+ this.tables[tag] = data;
+ }
+ };
+
+ return OpenTypeFileBuilder;
+})();
+
+/**
+ * 'Font' is the class the outside world should use, it encapsulate all the font
+ * decoding logics whatever type it is (assuming the font type is supported).
+ *
+ * For example to read a Type1 font and to attach it to the document:
+ * var type1Font = new Font("MyFontName", binaryFile, propertiesObject);
+ * type1Font.bind();
+ */
+var Font = (function FontClosure() {
+ function Font(name, file, properties) {
+ var charCode, glyphName, fontChar;
+
+ this.name = name;
+ this.loadedName = properties.loadedName;
+ this.isType3Font = properties.isType3Font;
+ this.sizes = [];
+
+ this.glyphCache = {};
+
+ var names = name.split('+');
+ names = names.length > 1 ? names[1] : names[0];
+ names = names.split(/[-,_]/g)[0];
+ this.isSerifFont = !!(properties.flags & FontFlags.Serif);
+ this.isSymbolicFont = !!(properties.flags & FontFlags.Symbolic);
+ this.isMonospace = !!(properties.flags & FontFlags.FixedPitch);
+
+ var type = properties.type;
+ var subtype = properties.subtype;
+ this.type = type;
+
+ this.fallbackName = (this.isMonospace ? 'monospace' :
+ (this.isSerifFont ? 'serif' : 'sans-serif'));
+
+ this.differences = properties.differences;
+ this.widths = properties.widths;
+ this.defaultWidth = properties.defaultWidth;
+ this.composite = properties.composite;
+ this.wideChars = properties.wideChars;
+ this.cMap = properties.cMap;
+ this.ascent = properties.ascent / PDF_GLYPH_SPACE_UNITS;
+ this.descent = properties.descent / PDF_GLYPH_SPACE_UNITS;
+ this.fontMatrix = properties.fontMatrix;
+ this.bbox = properties.bbox;
+
+ this.toUnicode = properties.toUnicode = this.buildToUnicode(properties);
+
+ this.toFontChar = [];
+
+ if (properties.type === 'Type3') {
+ for (charCode = 0; charCode < 256; charCode++) {
+ this.toFontChar[charCode] = (this.differences[charCode] ||
+ properties.defaultEncoding[charCode]);
+ }
+ this.fontType = FontType.TYPE3;
+ return;
+ }
+
+ this.cidEncoding = properties.cidEncoding;
+ this.vertical = properties.vertical;
+ if (this.vertical) {
+ this.vmetrics = properties.vmetrics;
+ this.defaultVMetrics = properties.defaultVMetrics;
+ }
+
+ if (!file || file.isEmpty) {
+ if (file) {
+ // Some bad PDF generators will include empty font files,
+ // attempting to recover by assuming that no file exists.
+ warn('Font file is empty in "' + name + '" (' + this.loadedName + ')');
+ }
+
+ this.missingFile = true;
+ // The file data is not specified. Trying to fix the font name
+ // to be used with the canvas.font.
+ var fontName = name.replace(/[,_]/g, '-');
+ var isStandardFont = !!stdFontMap[fontName] ||
+ !!(nonStdFontMap[fontName] && stdFontMap[nonStdFontMap[fontName]]);
+ fontName = stdFontMap[fontName] || nonStdFontMap[fontName] || fontName;
+
+ this.bold = (fontName.search(/bold/gi) !== -1);
+ this.italic = ((fontName.search(/oblique/gi) !== -1) ||
+ (fontName.search(/italic/gi) !== -1));
+
+ // Use 'name' instead of 'fontName' here because the original
+ // name ArialBlack for example will be replaced by Helvetica.
+ this.black = (name.search(/Black/g) !== -1);
+
+ // if at least one width is present, remeasure all chars when exists
+ this.remeasure = Object.keys(this.widths).length > 0;
+ if (isStandardFont && type === 'CIDFontType2' &&
+ properties.cidEncoding.indexOf('Identity-') === 0) {
+ // Standard fonts might be embedded as CID font without glyph mapping.
+ // Building one based on GlyphMapForStandardFonts.
+ var map = [];
+ for (var code in GlyphMapForStandardFonts) {
+ map[+code] = GlyphMapForStandardFonts[code];
+ }
+ var isIdentityUnicode = this.toUnicode instanceof IdentityToUnicodeMap;
+ if (!isIdentityUnicode) {
+ this.toUnicode.forEach(function(charCode, unicodeCharCode) {
+ map[+charCode] = unicodeCharCode;
+ });
+ }
+ this.toFontChar = map;
+ this.toUnicode = new ToUnicodeMap(map);
+ } else if (/Symbol/i.test(fontName)) {
+ var symbols = Encodings.SymbolSetEncoding;
+ for (charCode in symbols) {
+ fontChar = GlyphsUnicode[symbols[charCode]];
+ if (!fontChar) {
+ continue;
+ }
+ this.toFontChar[charCode] = fontChar;
+ }
+ for (charCode in properties.differences) {
+ fontChar = GlyphsUnicode[properties.differences[charCode]];
+ if (!fontChar) {
+ continue;
+ }
+ this.toFontChar[charCode] = fontChar;
+ }
+ } else if (/Dingbats/i.test(fontName)) {
+ if (/Wingdings/i.test(name)) {
+ warn('Wingdings font without embedded font file, ' +
+ 'falling back to the ZapfDingbats encoding.');
+ }
+ var dingbats = Encodings.ZapfDingbatsEncoding;
+ for (charCode in dingbats) {
+ fontChar = DingbatsGlyphsUnicode[dingbats[charCode]];
+ if (!fontChar) {
+ continue;
+ }
+ this.toFontChar[charCode] = fontChar;
+ }
+ for (charCode in properties.differences) {
+ fontChar = DingbatsGlyphsUnicode[properties.differences[charCode]];
+ if (!fontChar) {
+ continue;
+ }
+ this.toFontChar[charCode] = fontChar;
+ }
+ } else if (isStandardFont) {
+ this.toFontChar = [];
+ for (charCode in properties.defaultEncoding) {
+ glyphName = (properties.differences[charCode] ||
+ properties.defaultEncoding[charCode]);
+ this.toFontChar[charCode] = GlyphsUnicode[glyphName];
+ }
+ } else {
+ var unicodeCharCode, notCidFont = (type.indexOf('CIDFontType') === -1);
+ this.toUnicode.forEach(function(charCode, unicodeCharCode) {
+ if (notCidFont) {
+ glyphName = (properties.differences[charCode] ||
+ properties.defaultEncoding[charCode]);
+ unicodeCharCode = (GlyphsUnicode[glyphName] || unicodeCharCode);
+ }
+ this.toFontChar[charCode] = unicodeCharCode;
+ }.bind(this));
+ }
+ this.loadedName = fontName.split('-')[0];
+ this.loading = false;
+ this.fontType = getFontType(type, subtype);
+ return;
+ }
+
+ // Some fonts might use wrong font types for Type1C or CIDFontType0C
+ if (subtype === 'Type1C' && (type !== 'Type1' && type !== 'MMType1')) {
+ // Some TrueType fonts by mistake claim Type1C
+ if (isTrueTypeFile(file)) {
+ subtype = 'TrueType';
+ } else {
+ type = 'Type1';
+ }
+ }
+ if (subtype === 'CIDFontType0C' && type !== 'CIDFontType0') {
+ type = 'CIDFontType0';
+ }
+ if (subtype === 'OpenType') {
+ type = 'OpenType';
+ }
+ // Some CIDFontType0C fonts by mistake claim CIDFontType0.
+ if (type === 'CIDFontType0') {
+ subtype = isType1File(file) ? 'CIDFontType0' : 'CIDFontType0C';
+ }
+
+ var data;
+ switch (type) {
+ case 'MMType1':
+ info('MMType1 font (' + name + '), falling back to Type1.');
+ /* falls through */
+ case 'Type1':
+ case 'CIDFontType0':
+ this.mimetype = 'font/opentype';
+
+ var cff = (subtype === 'Type1C' || subtype === 'CIDFontType0C') ?
+ new CFFFont(file, properties) : new Type1Font(name, file, properties);
+
+ adjustWidths(properties);
+
+ // Wrap the CFF data inside an OTF font file
+ data = this.convert(name, cff, properties);
+ break;
+
+ case 'OpenType':
+ case 'TrueType':
+ case 'CIDFontType2':
+ this.mimetype = 'font/opentype';
+
+ // Repair the TrueType file. It is can be damaged in the point of
+ // view of the sanitizer
+ data = this.checkAndRepair(name, file, properties);
+ if (this.isOpenType) {
+ type = 'OpenType';
+ }
+ break;
+
+ default:
+ error('Font ' + type + ' is not supported');
+ break;
+ }
+
+ this.data = data;
+ this.fontType = getFontType(type, subtype);
+
+ // Transfer some properties again that could change during font conversion
+ this.fontMatrix = properties.fontMatrix;
+ this.widths = properties.widths;
+ this.defaultWidth = properties.defaultWidth;
+ this.encoding = properties.baseEncoding;
+ this.seacMap = properties.seacMap;
+
+ this.loading = true;
+ }
+
+ Font.getFontID = (function () {
+ var ID = 1;
+ return function Font_getFontID() {
+ return String(ID++);
+ };
+ })();
+
+ function int16(b0, b1) {
+ return (b0 << 8) + b1;
+ }
+
+ function int32(b0, b1, b2, b3) {
+ return (b0 << 24) + (b1 << 16) + (b2 << 8) + b3;
+ }
+
+ function string16(value) {
+ return String.fromCharCode((value >> 8) & 0xff, value & 0xff);
+ }
+
+ function safeString16(value) {
+ // clamp value to the 16-bit int range
+ value = (value > 0x7FFF ? 0x7FFF : (value < -0x8000 ? -0x8000 : value));
+ return String.fromCharCode((value >> 8) & 0xff, value & 0xff);
+ }
+
+ function isTrueTypeFile(file) {
+ var header = file.peekBytes(4);
+ return readUint32(header, 0) === 0x00010000;
+ }
+
+ function isType1File(file) {
+ var header = file.peekBytes(2);
+ // All Type1 font programs must begin with the comment '%!' (0x25 + 0x21).
+ if (header[0] === 0x25 && header[1] === 0x21) {
+ return true;
+ }
+ // ... obviously some fonts violate that part of the specification,
+ // please refer to the comment in |Type1Font| below.
+ if (header[0] === 0x80 && header[1] === 0x01) { // pfb file header.
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Helper function for |adjustMapping|.
+ * @return {boolean}
+ */
+ function isProblematicUnicodeLocation(code) {
+ if (code <= 0x1F) { // Control chars
+ return true;
+ }
+ if (code >= 0x80 && code <= 0x9F) { // Control chars
+ return true;
+ }
+ if ((code >= 0x2000 && code <= 0x200F) || // General punctuation chars
+ (code >= 0x2028 && code <= 0x202F) ||
+ (code >= 0x2060 && code <= 0x206F)) {
+ return true;
+ }
+ if (code >= 0xFFF0 && code <= 0xFFFF) { // Specials Unicode block
+ return true;
+ }
+ switch (code) {
+ case 0x7F: // Control char
+ case 0xA0: // Non breaking space
+ case 0xAD: // Soft hyphen
+ case 0x0E33: // Thai character SARA AM
+ case 0x2011: // Non breaking hyphen
+ case 0x205F: // Medium mathematical space
+ case 0x25CC: // Dotted circle (combining mark)
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Rebuilds the char code to glyph ID map by trying to replace the char codes
+ * with their unicode value. It also moves char codes that are in known
+ * problematic locations.
+ * @return {Object} Two properties:
+ * 'toFontChar' - maps original char codes(the value that will be read
+ * from commands such as show text) to the char codes that will be used in the
+ * font that we build
+ * 'charCodeToGlyphId' - maps the new font char codes to glyph ids
+ */
+ function adjustMapping(charCodeToGlyphId, properties) {
+ var toUnicode = properties.toUnicode;
+ var isSymbolic = !!(properties.flags & FontFlags.Symbolic);
+ var isIdentityUnicode =
+ properties.toUnicode instanceof IdentityToUnicodeMap;
+ var newMap = Object.create(null);
+ var toFontChar = [];
+ var usedFontCharCodes = [];
+ var nextAvailableFontCharCode = PRIVATE_USE_OFFSET_START;
+ for (var originalCharCode in charCodeToGlyphId) {
+ originalCharCode |= 0;
+ var glyphId = charCodeToGlyphId[originalCharCode];
+ var fontCharCode = originalCharCode;
+ // First try to map the value to a unicode position if a non identity map
+ // was created.
+ if (!isIdentityUnicode && toUnicode.has(originalCharCode)) {
+ var unicode = toUnicode.get(fontCharCode);
+ // TODO: Try to map ligatures to the correct spot.
+ if (unicode.length === 1) {
+ fontCharCode = unicode.charCodeAt(0);
+ }
+ }
+ // Try to move control characters, special characters and already mapped
+ // characters to the private use area since they will not be drawn by
+ // canvas if left in their current position. Also, move characters if the
+ // font was symbolic and there is only an identity unicode map since the
+ // characters probably aren't in the correct position (fixes an issue
+ // with firefox and thuluthfont).
+ if ((usedFontCharCodes[fontCharCode] !== undefined ||
+ isProblematicUnicodeLocation(fontCharCode) ||
+ (isSymbolic && isIdentityUnicode)) &&
+ nextAvailableFontCharCode <= PRIVATE_USE_OFFSET_END) { // Room left.
+ // Loop to try and find a free spot in the private use area.
+ do {
+ fontCharCode = nextAvailableFontCharCode++;
+
+ if (SKIP_PRIVATE_USE_RANGE_F000_TO_F01F && fontCharCode === 0xF000) {
+ fontCharCode = 0xF020;
+ nextAvailableFontCharCode = fontCharCode + 1;
+ }
+
+ } while (usedFontCharCodes[fontCharCode] !== undefined &&
+ nextAvailableFontCharCode <= PRIVATE_USE_OFFSET_END);
+ }
+
+ newMap[fontCharCode] = glyphId;
+ toFontChar[originalCharCode] = fontCharCode;
+ usedFontCharCodes[fontCharCode] = true;
+ }
+ return {
+ toFontChar: toFontChar,
+ charCodeToGlyphId: newMap,
+ nextAvailableFontCharCode: nextAvailableFontCharCode
+ };
+ }
+
+ function getRanges(glyphs) {
+ // Array.sort() sorts by characters, not numerically, so convert to an
+ // array of characters.
+ var codes = [];
+ for (var charCode in glyphs) {
+ codes.push({ fontCharCode: charCode | 0, glyphId: glyphs[charCode] });
+ }
+ codes.sort(function fontGetRangesSort(a, b) {
+ return a.fontCharCode - b.fontCharCode;
+ });
+
+ // Split the sorted codes into ranges.
+ var ranges = [];
+ var length = codes.length;
+ for (var n = 0; n < length; ) {
+ var start = codes[n].fontCharCode;
+ var codeIndices = [codes[n].glyphId];
+ ++n;
+ var end = start;
+ while (n < length && end + 1 === codes[n].fontCharCode) {
+ codeIndices.push(codes[n].glyphId);
+ ++end;
+ ++n;
+ if (end === 0xFFFF) {
+ break;
+ }
+ }
+ ranges.push([start, end, codeIndices]);
+ }
+
+ return ranges;
+ }
+
+ function createCmapTable(glyphs) {
+ var ranges = getRanges(glyphs);
+ var numTables = ranges[ranges.length - 1][1] > 0xFFFF ? 2 : 1;
+ var cmap = '\x00\x00' + // version
+ string16(numTables) + // numTables
+ '\x00\x03' + // platformID
+ '\x00\x01' + // encodingID
+ string32(4 + numTables * 8); // start of the table record
+
+ var i, ii, j, jj;
+ for (i = ranges.length - 1; i >= 0; --i) {
+ if (ranges[i][0] <= 0xFFFF) { break; }
+ }
+ var bmpLength = i + 1;
+
+ if (ranges[i][0] < 0xFFFF && ranges[i][1] === 0xFFFF) {
+ ranges[i][1] = 0xFFFE;
+ }
+ var trailingRangesCount = ranges[i][1] < 0xFFFF ? 1 : 0;
+ var segCount = bmpLength + trailingRangesCount;
+ var searchParams = OpenTypeFileBuilder.getSearchParams(segCount, 2);
+
+ // Fill up the 4 parallel arrays describing the segments.
+ var startCount = '';
+ var endCount = '';
+ var idDeltas = '';
+ var idRangeOffsets = '';
+ var glyphsIds = '';
+ var bias = 0;
+
+ var range, start, end, codes;
+ for (i = 0, ii = bmpLength; i < ii; i++) {
+ range = ranges[i];
+ start = range[0];
+ end = range[1];
+ startCount += string16(start);
+ endCount += string16(end);
+ codes = range[2];
+ var contiguous = true;
+ for (j = 1, jj = codes.length; j < jj; ++j) {
+ if (codes[j] !== codes[j - 1] + 1) {
+ contiguous = false;
+ break;
+ }
+ }
+ if (!contiguous) {
+ var offset = (segCount - i) * 2 + bias * 2;
+ bias += (end - start + 1);
+
+ idDeltas += string16(0);
+ idRangeOffsets += string16(offset);
+
+ for (j = 0, jj = codes.length; j < jj; ++j) {
+ glyphsIds += string16(codes[j]);
+ }
+ } else {
+ var startCode = codes[0];
+
+ idDeltas += string16((startCode - start) & 0xFFFF);
+ idRangeOffsets += string16(0);
+ }
+ }
+
+ if (trailingRangesCount > 0) {
+ endCount += '\xFF\xFF';
+ startCount += '\xFF\xFF';
+ idDeltas += '\x00\x01';
+ idRangeOffsets += '\x00\x00';
+ }
+
+ var format314 = '\x00\x00' + // language
+ string16(2 * segCount) +
+ string16(searchParams.range) +
+ string16(searchParams.entry) +
+ string16(searchParams.rangeShift) +
+ endCount + '\x00\x00' + startCount +
+ idDeltas + idRangeOffsets + glyphsIds;
+
+ var format31012 = '';
+ var header31012 = '';
+ if (numTables > 1) {
+ cmap += '\x00\x03' + // platformID
+ '\x00\x0A' + // encodingID
+ string32(4 + numTables * 8 +
+ 4 + format314.length); // start of the table record
+ format31012 = '';
+ for (i = 0, ii = ranges.length; i < ii; i++) {
+ range = ranges[i];
+ start = range[0];
+ codes = range[2];
+ var code = codes[0];
+ for (j = 1, jj = codes.length; j < jj; ++j) {
+ if (codes[j] !== codes[j - 1] + 1) {
+ end = range[0] + j - 1;
+ format31012 += string32(start) + // startCharCode
+ string32(end) + // endCharCode
+ string32(code); // startGlyphID
+ start = end + 1;
+ code = codes[j];
+ }
+ }
+ format31012 += string32(start) + // startCharCode
+ string32(range[1]) + // endCharCode
+ string32(code); // startGlyphID
+ }
+ header31012 = '\x00\x0C' + // format
+ '\x00\x00' + // reserved
+ string32(format31012.length + 16) + // length
+ '\x00\x00\x00\x00' + // language
+ string32(format31012.length / 12); // nGroups
+ }
+
+ return cmap + '\x00\x04' + // format
+ string16(format314.length + 4) + // length
+ format314 + header31012 + format31012;
+ }
+
+ function validateOS2Table(os2) {
+ var stream = new Stream(os2.data);
+ var version = stream.getUint16();
+ // TODO verify all OS/2 tables fields, but currently we validate only those
+ // that give us issues
+ stream.getBytes(60); // skipping type, misc sizes, panose, unicode ranges
+ var selection = stream.getUint16();
+ if (version < 4 && (selection & 0x0300)) {
+ return false;
+ }
+ var firstChar = stream.getUint16();
+ var lastChar = stream.getUint16();
+ if (firstChar > lastChar) {
+ return false;
+ }
+ stream.getBytes(6); // skipping sTypoAscender/Descender/LineGap
+ var usWinAscent = stream.getUint16();
+ if (usWinAscent === 0) { // makes font unreadable by windows
+ return false;
+ }
+
+ // OS/2 appears to be valid, resetting some fields
+ os2.data[8] = os2.data[9] = 0; // IE rejects fonts if fsType != 0
+ return true;
+ }
+
+ function createOS2Table(properties, charstrings, override) {
+ override = override || {
+ unitsPerEm: 0,
+ yMax: 0,
+ yMin: 0,
+ ascent: 0,
+ descent: 0
+ };
+
+ var ulUnicodeRange1 = 0;
+ var ulUnicodeRange2 = 0;
+ var ulUnicodeRange3 = 0;
+ var ulUnicodeRange4 = 0;
+
+ var firstCharIndex = null;
+ var lastCharIndex = 0;
+
+ if (charstrings) {
+ for (var code in charstrings) {
+ code |= 0;
+ if (firstCharIndex > code || !firstCharIndex) {
+ firstCharIndex = code;
+ }
+ if (lastCharIndex < code) {
+ lastCharIndex = code;
+ }
+
+ var position = getUnicodeRangeFor(code);
+ if (position < 32) {
+ ulUnicodeRange1 |= 1 << position;
+ } else if (position < 64) {
+ ulUnicodeRange2 |= 1 << position - 32;
+ } else if (position < 96) {
+ ulUnicodeRange3 |= 1 << position - 64;
+ } else if (position < 123) {
+ ulUnicodeRange4 |= 1 << position - 96;
+ } else {
+ error('Unicode ranges Bits > 123 are reserved for internal usage');
+ }
+ }
+ } else {
+ // TODO
+ firstCharIndex = 0;
+ lastCharIndex = 255;
+ }
+
+ var bbox = properties.bbox || [0, 0, 0, 0];
+ var unitsPerEm = (override.unitsPerEm ||
+ 1 / (properties.fontMatrix || FONT_IDENTITY_MATRIX)[0]);
+
+ // if the font units differ to the PDF glyph space units
+ // then scale up the values
+ var scale = (properties.ascentScaled ? 1.0 :
+ unitsPerEm / PDF_GLYPH_SPACE_UNITS);
+
+ var typoAscent = (override.ascent ||
+ Math.round(scale * (properties.ascent || bbox[3])));
+ var typoDescent = (override.descent ||
+ Math.round(scale * (properties.descent || bbox[1])));
+ if (typoDescent > 0 && properties.descent > 0 && bbox[1] < 0) {
+ typoDescent = -typoDescent; // fixing incorrect descent
+ }
+ var winAscent = override.yMax || typoAscent;
+ var winDescent = -override.yMin || -typoDescent;
+
+ return '\x00\x03' + // version
+ '\x02\x24' + // xAvgCharWidth
+ '\x01\xF4' + // usWeightClass
+ '\x00\x05' + // usWidthClass
+ '\x00\x00' + // fstype (0 to let the font loads via font-face on IE)
+ '\x02\x8A' + // ySubscriptXSize
+ '\x02\xBB' + // ySubscriptYSize
+ '\x00\x00' + // ySubscriptXOffset
+ '\x00\x8C' + // ySubscriptYOffset
+ '\x02\x8A' + // ySuperScriptXSize
+ '\x02\xBB' + // ySuperScriptYSize
+ '\x00\x00' + // ySuperScriptXOffset
+ '\x01\xDF' + // ySuperScriptYOffset
+ '\x00\x31' + // yStrikeOutSize
+ '\x01\x02' + // yStrikeOutPosition
+ '\x00\x00' + // sFamilyClass
+ '\x00\x00\x06' +
+ String.fromCharCode(properties.fixedPitch ? 0x09 : 0x00) +
+ '\x00\x00\x00\x00\x00\x00' + // Panose
+ string32(ulUnicodeRange1) + // ulUnicodeRange1 (Bits 0-31)
+ string32(ulUnicodeRange2) + // ulUnicodeRange2 (Bits 32-63)
+ string32(ulUnicodeRange3) + // ulUnicodeRange3 (Bits 64-95)
+ string32(ulUnicodeRange4) + // ulUnicodeRange4 (Bits 96-127)
+ '\x2A\x32\x31\x2A' + // achVendID
+ string16(properties.italicAngle ? 1 : 0) + // fsSelection
+ string16(firstCharIndex ||
+ properties.firstChar) + // usFirstCharIndex
+ string16(lastCharIndex || properties.lastChar) + // usLastCharIndex
+ string16(typoAscent) + // sTypoAscender
+ string16(typoDescent) + // sTypoDescender
+ '\x00\x64' + // sTypoLineGap (7%-10% of the unitsPerEM value)
+ string16(winAscent) + // usWinAscent
+ string16(winDescent) + // usWinDescent
+ '\x00\x00\x00\x00' + // ulCodePageRange1 (Bits 0-31)
+ '\x00\x00\x00\x00' + // ulCodePageRange2 (Bits 32-63)
+ string16(properties.xHeight) + // sxHeight
+ string16(properties.capHeight) + // sCapHeight
+ string16(0) + // usDefaultChar
+ string16(firstCharIndex || properties.firstChar) + // usBreakChar
+ '\x00\x03'; // usMaxContext
+ }
+
+ function createPostTable(properties) {
+ var angle = Math.floor(properties.italicAngle * (Math.pow(2, 16)));
+ return ('\x00\x03\x00\x00' + // Version number
+ string32(angle) + // italicAngle
+ '\x00\x00' + // underlinePosition
+ '\x00\x00' + // underlineThickness
+ string32(properties.fixedPitch) + // isFixedPitch
+ '\x00\x00\x00\x00' + // minMemType42
+ '\x00\x00\x00\x00' + // maxMemType42
+ '\x00\x00\x00\x00' + // minMemType1
+ '\x00\x00\x00\x00'); // maxMemType1
+ }
+
+ function createNameTable(name, proto) {
+ if (!proto) {
+ proto = [[], []]; // no strings and unicode strings
+ }
+
+ var strings = [
+ proto[0][0] || 'Original licence', // 0.Copyright
+ proto[0][1] || name, // 1.Font family
+ proto[0][2] || 'Unknown', // 2.Font subfamily (font weight)
+ proto[0][3] || 'uniqueID', // 3.Unique ID
+ proto[0][4] || name, // 4.Full font name
+ proto[0][5] || 'Version 0.11', // 5.Version
+ proto[0][6] || '', // 6.Postscript name
+ proto[0][7] || 'Unknown', // 7.Trademark
+ proto[0][8] || 'Unknown', // 8.Manufacturer
+ proto[0][9] || 'Unknown' // 9.Designer
+ ];
+
+ // Mac want 1-byte per character strings while Windows want
+ // 2-bytes per character, so duplicate the names table
+ var stringsUnicode = [];
+ var i, ii, j, jj, str;
+ for (i = 0, ii = strings.length; i < ii; i++) {
+ str = proto[1][i] || strings[i];
+
+ var strBufUnicode = [];
+ for (j = 0, jj = str.length; j < jj; j++) {
+ strBufUnicode.push(string16(str.charCodeAt(j)));
+ }
+ stringsUnicode.push(strBufUnicode.join(''));
+ }
+
+ var names = [strings, stringsUnicode];
+ var platforms = ['\x00\x01', '\x00\x03'];
+ var encodings = ['\x00\x00', '\x00\x01'];
+ var languages = ['\x00\x00', '\x04\x09'];
+
+ var namesRecordCount = strings.length * platforms.length;
+ var nameTable =
+ '\x00\x00' + // format
+ string16(namesRecordCount) + // Number of names Record
+ string16(namesRecordCount * 12 + 6); // Storage
+
+ // Build the name records field
+ var strOffset = 0;
+ for (i = 0, ii = platforms.length; i < ii; i++) {
+ var strs = names[i];
+ for (j = 0, jj = strs.length; j < jj; j++) {
+ str = strs[j];
+ var nameRecord =
+ platforms[i] + // platform ID
+ encodings[i] + // encoding ID
+ languages[i] + // language ID
+ string16(j) + // name ID
+ string16(str.length) +
+ string16(strOffset);
+ nameTable += nameRecord;
+ strOffset += str.length;
+ }
+ }
+
+ nameTable += strings.join('') + stringsUnicode.join('');
+ return nameTable;
+ }
+
+ Font.prototype = {
+ name: null,
+ font: null,
+ mimetype: null,
+ encoding: null,
+ get renderer() {
+ var renderer = FontRendererFactory.create(this);
+ return shadow(this, 'renderer', renderer);
+ },
+
+ exportData: function Font_exportData() {
+ var data = {};
+ for (var i in this) {
+ if (this.hasOwnProperty(i)) {
+ data[i] = this[i];
+ }
+ }
+ return data;
+ },
+
+ checkAndRepair: function Font_checkAndRepair(name, font, properties) {
+ function readTableEntry(file) {
+ var tag = bytesToString(file.getBytes(4));
+
+ var checksum = file.getInt32();
+ var offset = file.getInt32() >>> 0;
+ var length = file.getInt32() >>> 0;
+
+ // Read the table associated data
+ var previousPosition = file.pos;
+ file.pos = file.start ? file.start : 0;
+ file.skip(offset);
+ var data = file.getBytes(length);
+ file.pos = previousPosition;
+
+ if (tag === 'head') {
+ // clearing checksum adjustment
+ data[8] = data[9] = data[10] = data[11] = 0;
+ data[17] |= 0x20; //Set font optimized for cleartype flag
+ }
+
+ return {
+ tag: tag,
+ checksum: checksum,
+ length: length,
+ offset: offset,
+ data: data
+ };
+ }
+
+ function readOpenTypeHeader(ttf) {
+ return {
+ version: bytesToString(ttf.getBytes(4)),
+ numTables: ttf.getUint16(),
+ searchRange: ttf.getUint16(),
+ entrySelector: ttf.getUint16(),
+ rangeShift: ttf.getUint16()
+ };
+ }
+
+ /**
+ * Read the appropriate subtable from the cmap according to 9.6.6.4 from
+ * PDF spec
+ */
+ function readCmapTable(cmap, font, isSymbolicFont) {
+ var segment;
+ var start = (font.start ? font.start : 0) + cmap.offset;
+ font.pos = start;
+
+ var version = font.getUint16();
+ var numTables = font.getUint16();
+
+ var potentialTable;
+ var canBreak = false;
+ // There's an order of preference in terms of which cmap subtable to
+ // use:
+ // - non-symbolic fonts the preference is a 3,1 table then a 1,0 table
+ // - symbolic fonts the preference is a 3,0 table then a 1,0 table
+ // The following takes advantage of the fact that the tables are sorted
+ // to work.
+ for (var i = 0; i < numTables; i++) {
+ var platformId = font.getUint16();
+ var encodingId = font.getUint16();
+ var offset = font.getInt32() >>> 0;
+ var useTable = false;
+
+ if (platformId === 0 && encodingId === 0) {
+ useTable = true;
+ // Continue the loop since there still may be a higher priority
+ // table.
+ } else if (platformId === 1 && encodingId === 0) {
+ useTable = true;
+ // Continue the loop since there still may be a higher priority
+ // table.
+ } else if (platformId === 3 && encodingId === 1 &&
+ (!isSymbolicFont || !potentialTable)) {
+ useTable = true;
+ if (!isSymbolicFont) {
+ canBreak = true;
+ }
+ } else if (isSymbolicFont && platformId === 3 && encodingId === 0) {
+ useTable = true;
+ canBreak = true;
+ }
+
+ if (useTable) {
+ potentialTable = {
+ platformId: platformId,
+ encodingId: encodingId,
+ offset: offset
+ };
+ }
+ if (canBreak) {
+ break;
+ }
+ }
+
+ if (potentialTable) {
+ font.pos = start + potentialTable.offset;
+ }
+ if (!potentialTable || font.peekByte() === -1) {
+ warn('Could not find a preferred cmap table.');
+ return {
+ platformId: -1,
+ encodingId: -1,
+ mappings: [],
+ hasShortCmap: false
+ };
+ }
+
+ var format = font.getUint16();
+ var length = font.getUint16();
+ var language = font.getUint16();
+
+ var hasShortCmap = false;
+ var mappings = [];
+ var j, glyphId;
+
+ // TODO(mack): refactor this cmap subtable reading logic out
+ if (format === 0) {
+ for (j = 0; j < 256; j++) {
+ var index = font.getByte();
+ if (!index) {
+ continue;
+ }
+ mappings.push({
+ charCode: j,
+ glyphId: index
+ });
+ }
+ hasShortCmap = true;
+ } else if (format === 4) {
+ // re-creating the table in format 4 since the encoding
+ // might be changed
+ var segCount = (font.getUint16() >> 1);
+ font.getBytes(6); // skipping range fields
+ var segIndex, segments = [];
+ for (segIndex = 0; segIndex < segCount; segIndex++) {
+ segments.push({ end: font.getUint16() });
+ }
+ font.getUint16();
+ for (segIndex = 0; segIndex < segCount; segIndex++) {
+ segments[segIndex].start = font.getUint16();
+ }
+
+ for (segIndex = 0; segIndex < segCount; segIndex++) {
+ segments[segIndex].delta = font.getUint16();
+ }
+
+ var offsetsCount = 0;
+ for (segIndex = 0; segIndex < segCount; segIndex++) {
+ segment = segments[segIndex];
+ var rangeOffset = font.getUint16();
+ if (!rangeOffset) {
+ segment.offsetIndex = -1;
+ continue;
+ }
+
+ var offsetIndex = (rangeOffset >> 1) - (segCount - segIndex);
+ segment.offsetIndex = offsetIndex;
+ offsetsCount = Math.max(offsetsCount, offsetIndex +
+ segment.end - segment.start + 1);
+ }
+
+ var offsets = [];
+ for (j = 0; j < offsetsCount; j++) {
+ offsets.push(font.getUint16());
+ }
+
+ for (segIndex = 0; segIndex < segCount; segIndex++) {
+ segment = segments[segIndex];
+ start = segment.start;
+ var end = segment.end;
+ var delta = segment.delta;
+ offsetIndex = segment.offsetIndex;
+
+ for (j = start; j <= end; j++) {
+ if (j === 0xFFFF) {
+ continue;
+ }
+
+ glyphId = (offsetIndex < 0 ?
+ j : offsets[offsetIndex + j - start]);
+ glyphId = (glyphId + delta) & 0xFFFF;
+ if (glyphId === 0) {
+ continue;
+ }
+ mappings.push({
+ charCode: j,
+ glyphId: glyphId
+ });
+ }
+ }
+ } else if (format === 6) {
+ // Format 6 is a 2-bytes dense mapping, which means the font data
+ // lives glue together even if they are pretty far in the unicode
+ // table. (This looks weird, so I can have missed something), this
+ // works on Linux but seems to fails on Mac so let's rewrite the
+ // cmap table to a 3-1-4 style
+ var firstCode = font.getUint16();
+ var entryCount = font.getUint16();
+
+ for (j = 0; j < entryCount; j++) {
+ glyphId = font.getUint16();
+ var charCode = firstCode + j;
+
+ mappings.push({
+ charCode: charCode,
+ glyphId: glyphId
+ });
+ }
+ } else {
+ error('cmap table has unsupported format: ' + format);
+ }
+
+ // removing duplicate entries
+ mappings.sort(function (a, b) {
+ return a.charCode - b.charCode;
+ });
+ for (i = 1; i < mappings.length; i++) {
+ if (mappings[i - 1].charCode === mappings[i].charCode) {
+ mappings.splice(i, 1);
+ i--;
+ }
+ }
+
+ return {
+ platformId: potentialTable.platformId,
+ encodingId: potentialTable.encodingId,
+ mappings: mappings,
+ hasShortCmap: hasShortCmap
+ };
+ }
+
+ function sanitizeMetrics(font, header, metrics, numGlyphs) {
+ if (!header) {
+ if (metrics) {
+ metrics.data = null;
+ }
+ return;
+ }
+
+ font.pos = (font.start ? font.start : 0) + header.offset;
+ font.pos += header.length - 2;
+ var numOfMetrics = font.getUint16();
+
+ if (numOfMetrics > numGlyphs) {
+ info('The numOfMetrics (' + numOfMetrics + ') should not be ' +
+ 'greater than the numGlyphs (' + numGlyphs + ')');
+ // Reduce numOfMetrics if it is greater than numGlyphs
+ numOfMetrics = numGlyphs;
+ header.data[34] = (numOfMetrics & 0xff00) >> 8;
+ header.data[35] = numOfMetrics & 0x00ff;
+ }
+
+ var numOfSidebearings = numGlyphs - numOfMetrics;
+ var numMissing = numOfSidebearings -
+ ((metrics.length - numOfMetrics * 4) >> 1);
+
+ if (numMissing > 0) {
+ // For each missing glyph, we set both the width and lsb to 0 (zero).
+ // Since we need to add two properties for each glyph, this explains
+ // the use of |numMissing * 2| when initializing the typed array.
+ var entries = new Uint8Array(metrics.length + numMissing * 2);
+ entries.set(metrics.data);
+ metrics.data = entries;
+ }
+ }
+
+ function sanitizeGlyph(source, sourceStart, sourceEnd, dest, destStart,
+ hintsValid) {
+ if (sourceEnd - sourceStart <= 12) {
+ // glyph with data less than 12 is invalid one
+ return 0;
+ }
+ var glyf = source.subarray(sourceStart, sourceEnd);
+ var contoursCount = (glyf[0] << 8) | glyf[1];
+ if (contoursCount & 0x8000) {
+ // complex glyph, writing as is
+ dest.set(glyf, destStart);
+ return glyf.length;
+ }
+
+ var i, j = 10, flagsCount = 0;
+ for (i = 0; i < contoursCount; i++) {
+ var endPoint = (glyf[j] << 8) | glyf[j + 1];
+ flagsCount = endPoint + 1;
+ j += 2;
+ }
+ // skipping instructions
+ var instructionsStart = j;
+ var instructionsLength = (glyf[j] << 8) | glyf[j + 1];
+ j += 2 + instructionsLength;
+ var instructionsEnd = j;
+ // validating flags
+ var coordinatesLength = 0;
+ for (i = 0; i < flagsCount; i++) {
+ var flag = glyf[j++];
+ if (flag & 0xC0) {
+ // reserved flags must be zero, cleaning up
+ glyf[j - 1] = flag & 0x3F;
+ }
+ var xyLength = ((flag & 2) ? 1 : (flag & 16) ? 0 : 2) +
+ ((flag & 4) ? 1 : (flag & 32) ? 0 : 2);
+ coordinatesLength += xyLength;
+ if (flag & 8) {
+ var repeat = glyf[j++];
+ i += repeat;
+ coordinatesLength += repeat * xyLength;
+ }
+ }
+ // glyph without coordinates will be rejected
+ if (coordinatesLength === 0) {
+ return 0;
+ }
+ var glyphDataLength = j + coordinatesLength;
+ if (glyphDataLength > glyf.length) {
+ // not enough data for coordinates
+ return 0;
+ }
+ if (!hintsValid && instructionsLength > 0) {
+ dest.set(glyf.subarray(0, instructionsStart), destStart);
+ dest.set([0, 0], destStart + instructionsStart);
+ dest.set(glyf.subarray(instructionsEnd, glyphDataLength),
+ destStart + instructionsStart + 2);
+ glyphDataLength -= instructionsLength;
+ if (glyf.length - glyphDataLength > 3) {
+ glyphDataLength = (glyphDataLength + 3) & ~3;
+ }
+ return glyphDataLength;
+ }
+ if (glyf.length - glyphDataLength > 3) {
+ // truncating and aligning to 4 bytes the long glyph data
+ glyphDataLength = (glyphDataLength + 3) & ~3;
+ dest.set(glyf.subarray(0, glyphDataLength), destStart);
+ return glyphDataLength;
+ }
+ // glyph data is fine
+ dest.set(glyf, destStart);
+ return glyf.length;
+ }
+
+ function sanitizeHead(head, numGlyphs, locaLength) {
+ var data = head.data;
+
+ // Validate version:
+ // Should always be 0x00010000
+ var version = int32(data[0], data[1], data[2], data[3]);
+ if (version >> 16 !== 1) {
+ info('Attempting to fix invalid version in head table: ' + version);
+ data[0] = 0;
+ data[1] = 1;
+ data[2] = 0;
+ data[3] = 0;
+ }
+
+ var indexToLocFormat = int16(data[50], data[51]);
+ if (indexToLocFormat < 0 || indexToLocFormat > 1) {
+ info('Attempting to fix invalid indexToLocFormat in head table: ' +
+ indexToLocFormat);
+
+ // The value of indexToLocFormat should be 0 if the loca table
+ // consists of short offsets, and should be 1 if the loca table
+ // consists of long offsets.
+ //
+ // The number of entries in the loca table should be numGlyphs + 1.
+ //
+ // Using this information, we can work backwards to deduce if the
+ // size of each offset in the loca table, and thus figure out the
+ // appropriate value for indexToLocFormat.
+
+ var numGlyphsPlusOne = numGlyphs + 1;
+ if (locaLength === numGlyphsPlusOne << 1) {
+ // 0x0000 indicates the loca table consists of short offsets
+ data[50] = 0;
+ data[51] = 0;
+ } else if (locaLength === numGlyphsPlusOne << 2) {
+ // 0x0001 indicates the loca table consists of long offsets
+ data[50] = 0;
+ data[51] = 1;
+ } else {
+ warn('Could not fix indexToLocFormat: ' + indexToLocFormat);
+ }
+ }
+ }
+
+ function sanitizeGlyphLocations(loca, glyf, numGlyphs,
+ isGlyphLocationsLong, hintsValid,
+ dupFirstEntry) {
+ var itemSize, itemDecode, itemEncode;
+ if (isGlyphLocationsLong) {
+ itemSize = 4;
+ itemDecode = function fontItemDecodeLong(data, offset) {
+ return (data[offset] << 24) | (data[offset + 1] << 16) |
+ (data[offset + 2] << 8) | data[offset + 3];
+ };
+ itemEncode = function fontItemEncodeLong(data, offset, value) {
+ data[offset] = (value >>> 24) & 0xFF;
+ data[offset + 1] = (value >> 16) & 0xFF;
+ data[offset + 2] = (value >> 8) & 0xFF;
+ data[offset + 3] = value & 0xFF;
+ };
+ } else {
+ itemSize = 2;
+ itemDecode = function fontItemDecode(data, offset) {
+ return (data[offset] << 9) | (data[offset + 1] << 1);
+ };
+ itemEncode = function fontItemEncode(data, offset, value) {
+ data[offset] = (value >> 9) & 0xFF;
+ data[offset + 1] = (value >> 1) & 0xFF;
+ };
+ }
+ var locaData = loca.data;
+ var locaDataSize = itemSize * (1 + numGlyphs);
+ // is loca.data too short or long?
+ if (locaData.length !== locaDataSize) {
+ locaData = new Uint8Array(locaDataSize);
+ locaData.set(loca.data.subarray(0, locaDataSize));
+ loca.data = locaData;
+ }
+ // removing the invalid glyphs
+ var oldGlyfData = glyf.data;
+ var oldGlyfDataLength = oldGlyfData.length;
+ var newGlyfData = new Uint8Array(oldGlyfDataLength);
+ var startOffset = itemDecode(locaData, 0);
+ var writeOffset = 0;
+ var missingGlyphData = {};
+ itemEncode(locaData, 0, writeOffset);
+ var i, j;
+ for (i = 0, j = itemSize; i < numGlyphs; i++, j += itemSize) {
+ var endOffset = itemDecode(locaData, j);
+ if (endOffset > oldGlyfDataLength &&
+ ((oldGlyfDataLength + 3) & ~3) === endOffset) {
+ // Aspose breaks fonts by aligning the glyphs to the qword, but not
+ // the glyf table size, which makes last glyph out of range.
+ endOffset = oldGlyfDataLength;
+ }
+ if (endOffset > oldGlyfDataLength) {
+ // glyph end offset points outside glyf data, rejecting the glyph
+ itemEncode(locaData, j, writeOffset);
+ startOffset = endOffset;
+ continue;
+ }
+
+ if (startOffset === endOffset) {
+ missingGlyphData[i] = true;
+ }
+
+ var newLength = sanitizeGlyph(oldGlyfData, startOffset, endOffset,
+ newGlyfData, writeOffset, hintsValid);
+ writeOffset += newLength;
+ itemEncode(locaData, j, writeOffset);
+ startOffset = endOffset;
+ }
+
+ if (writeOffset === 0) {
+ // glyf table cannot be empty -- redoing the glyf and loca tables
+ // to have single glyph with one point
+ var simpleGlyph = new Uint8Array(
+ [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0]);
+ for (i = 0, j = itemSize; i < numGlyphs; i++, j += itemSize) {
+ itemEncode(locaData, j, simpleGlyph.length);
+ }
+ glyf.data = simpleGlyph;
+ return missingGlyphData;
+ }
+
+ if (dupFirstEntry) {
+ var firstEntryLength = itemDecode(locaData, itemSize);
+ if (newGlyfData.length > firstEntryLength + writeOffset) {
+ glyf.data = newGlyfData.subarray(0, firstEntryLength + writeOffset);
+ } else {
+ glyf.data = new Uint8Array(firstEntryLength + writeOffset);
+ glyf.data.set(newGlyfData.subarray(0, writeOffset));
+ }
+ glyf.data.set(newGlyfData.subarray(0, firstEntryLength), writeOffset);
+ itemEncode(loca.data, locaData.length - itemSize,
+ writeOffset + firstEntryLength);
+ } else {
+ glyf.data = newGlyfData.subarray(0, writeOffset);
+ }
+ return missingGlyphData;
+ }
+
+ function readPostScriptTable(post, properties, maxpNumGlyphs) {
+ var start = (font.start ? font.start : 0) + post.offset;
+ font.pos = start;
+
+ var length = post.length, end = start + length;
+ var version = font.getInt32();
+ // skip rest to the tables
+ font.getBytes(28);
+
+ var glyphNames;
+ var valid = true;
+ var i;
+
+ switch (version) {
+ case 0x00010000:
+ glyphNames = MacStandardGlyphOrdering;
+ break;
+ case 0x00020000:
+ var numGlyphs = font.getUint16();
+ if (numGlyphs !== maxpNumGlyphs) {
+ valid = false;
+ break;
+ }
+ var glyphNameIndexes = [];
+ for (i = 0; i < numGlyphs; ++i) {
+ var index = font.getUint16();
+ if (index >= 32768) {
+ valid = false;
+ break;
+ }
+ glyphNameIndexes.push(index);
+ }
+ if (!valid) {
+ break;
+ }
+ var customNames = [];
+ var strBuf = [];
+ while (font.pos < end) {
+ var stringLength = font.getByte();
+ strBuf.length = stringLength;
+ for (i = 0; i < stringLength; ++i) {
+ strBuf[i] = String.fromCharCode(font.getByte());
+ }
+ customNames.push(strBuf.join(''));
+ }
+ glyphNames = [];
+ for (i = 0; i < numGlyphs; ++i) {
+ var j = glyphNameIndexes[i];
+ if (j < 258) {
+ glyphNames.push(MacStandardGlyphOrdering[j]);
+ continue;
+ }
+ glyphNames.push(customNames[j - 258]);
+ }
+ break;
+ case 0x00030000:
+ break;
+ default:
+ warn('Unknown/unsupported post table version ' + version);
+ valid = false;
+ if (properties.defaultEncoding) {
+ glyphNames = properties.defaultEncoding;
+ }
+ break;
+ }
+ properties.glyphNames = glyphNames;
+ return valid;
+ }
+
+ function readNameTable(nameTable) {
+ var start = (font.start ? font.start : 0) + nameTable.offset;
+ font.pos = start;
+
+ var names = [[], []];
+ var length = nameTable.length, end = start + length;
+ var format = font.getUint16();
+ var FORMAT_0_HEADER_LENGTH = 6;
+ if (format !== 0 || length < FORMAT_0_HEADER_LENGTH) {
+ // unsupported name table format or table "too" small
+ return names;
+ }
+ var numRecords = font.getUint16();
+ var stringsStart = font.getUint16();
+ var records = [];
+ var NAME_RECORD_LENGTH = 12;
+ var i, ii;
+
+ for (i = 0; i < numRecords &&
+ font.pos + NAME_RECORD_LENGTH <= end; i++) {
+ var r = {
+ platform: font.getUint16(),
+ encoding: font.getUint16(),
+ language: font.getUint16(),
+ name: font.getUint16(),
+ length: font.getUint16(),
+ offset: font.getUint16()
+ };
+ // using only Macintosh and Windows platform/encoding names
+ if ((r.platform === 1 && r.encoding === 0 && r.language === 0) ||
+ (r.platform === 3 && r.encoding === 1 && r.language === 0x409)) {
+ records.push(r);
+ }
+ }
+ for (i = 0, ii = records.length; i < ii; i++) {
+ var record = records[i];
+ var pos = start + stringsStart + record.offset;
+ if (pos + record.length > end) {
+ continue; // outside of name table, ignoring
+ }
+ font.pos = pos;
+ var nameIndex = record.name;
+ if (record.encoding) {
+ // unicode
+ var str = '';
+ for (var j = 0, jj = record.length; j < jj; j += 2) {
+ str += String.fromCharCode(font.getUint16());
+ }
+ names[1][nameIndex] = str;
+ } else {
+ names[0][nameIndex] = bytesToString(font.getBytes(record.length));
+ }
+ }
+ return names;
+ }
+
+ var TTOpsStackDeltas = [
+ 0, 0, 0, 0, 0, 0, 0, 0, -2, -2, -2, -2, 0, 0, -2, -5,
+ -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, -1, 0, -1, -1, -1, -1,
+ 1, -1, -999, 0, 1, 0, -1, -2, 0, -1, -2, -1, -1, 0, -1, -1,
+ 0, 0, -999, -999, -1, -1, -1, -1, -2, -999, -2, -2, -999, 0, -2, -2,
+ 0, 0, -2, 0, -2, 0, 0, 0, -2, -1, -1, 1, 1, 0, 0, -1,
+ -1, -1, -1, -1, -1, -1, 0, 0, -1, 0, -1, -1, 0, -999, -1, -1,
+ -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ -2, -999, -999, -999, -999, -999, -1, -1, -2, -2, 0, 0, 0, 0, -1, -1,
+ -999, -2, -2, 0, 0, -1, -2, -2, 0, 0, 0, -1, -1, -1, -2];
+ // 0xC0-DF == -1 and 0xE0-FF == -2
+
+ function sanitizeTTProgram(table, ttContext) {
+ var data = table.data;
+ var i = 0, j, n, b, funcId, pc, lastEndf = 0, lastDeff = 0;
+ var stack = [];
+ var callstack = [];
+ var functionsCalled = [];
+ var tooComplexToFollowFunctions =
+ ttContext.tooComplexToFollowFunctions;
+ var inFDEF = false, ifLevel = 0, inELSE = 0;
+ for (var ii = data.length; i < ii;) {
+ var op = data[i++];
+ // The TrueType instruction set docs can be found at
+ // https://developer.apple.com/fonts/TTRefMan/RM05/Chap5.html
+ if (op === 0x40) { // NPUSHB - pushes n bytes
+ n = data[i++];
+ if (inFDEF || inELSE) {
+ i += n;
+ } else {
+ for (j = 0; j < n; j++) {
+ stack.push(data[i++]);
+ }
+ }
+ } else if (op === 0x41) { // NPUSHW - pushes n words
+ n = data[i++];
+ if (inFDEF || inELSE) {
+ i += n * 2;
+ } else {
+ for (j = 0; j < n; j++) {
+ b = data[i++];
+ stack.push((b << 8) | data[i++]);
+ }
+ }
+ } else if ((op & 0xF8) === 0xB0) { // PUSHB - pushes bytes
+ n = op - 0xB0 + 1;
+ if (inFDEF || inELSE) {
+ i += n;
+ } else {
+ for (j = 0; j < n; j++) {
+ stack.push(data[i++]);
+ }
+ }
+ } else if ((op & 0xF8) === 0xB8) { // PUSHW - pushes words
+ n = op - 0xB8 + 1;
+ if (inFDEF || inELSE) {
+ i += n * 2;
+ } else {
+ for (j = 0; j < n; j++) {
+ b = data[i++];
+ stack.push((b << 8) | data[i++]);
+ }
+ }
+ } else if (op === 0x2B && !tooComplexToFollowFunctions) { // CALL
+ if (!inFDEF && !inELSE) {
+ // collecting inforamtion about which functions are used
+ funcId = stack[stack.length - 1];
+ ttContext.functionsUsed[funcId] = true;
+ if (funcId in ttContext.functionsStackDeltas) {
+ stack.length += ttContext.functionsStackDeltas[funcId];
+ } else if (funcId in ttContext.functionsDefined &&
+ functionsCalled.indexOf(funcId) < 0) {
+ callstack.push({data: data, i: i, stackTop: stack.length - 1});
+ functionsCalled.push(funcId);
+ pc = ttContext.functionsDefined[funcId];
+ if (!pc) {
+ warn('TT: CALL non-existent function');
+ ttContext.hintsValid = false;
+ return;
+ }
+ data = pc.data;
+ i = pc.i;
+ }
+ }
+ } else if (op === 0x2C && !tooComplexToFollowFunctions) { // FDEF
+ if (inFDEF || inELSE) {
+ warn('TT: nested FDEFs not allowed');
+ tooComplexToFollowFunctions = true;
+ }
+ inFDEF = true;
+ // collecting inforamtion about which functions are defined
+ lastDeff = i;
+ funcId = stack.pop();
+ ttContext.functionsDefined[funcId] = {data: data, i: i};
+ } else if (op === 0x2D) { // ENDF - end of function
+ if (inFDEF) {
+ inFDEF = false;
+ lastEndf = i;
+ } else {
+ pc = callstack.pop();
+ if (!pc) {
+ warn('TT: ENDF bad stack');
+ ttContext.hintsValid = false;
+ return;
+ }
+ funcId = functionsCalled.pop();
+ data = pc.data;
+ i = pc.i;
+ ttContext.functionsStackDeltas[funcId] =
+ stack.length - pc.stackTop;
+ }
+ } else if (op === 0x89) { // IDEF - instruction definition
+ if (inFDEF || inELSE) {
+ warn('TT: nested IDEFs not allowed');
+ tooComplexToFollowFunctions = true;
+ }
+ inFDEF = true;
+ // recording it as a function to track ENDF
+ lastDeff = i;
+ } else if (op === 0x58) { // IF
+ ++ifLevel;
+ } else if (op === 0x1B) { // ELSE
+ inELSE = ifLevel;
+ } else if (op === 0x59) { // EIF
+ if (inELSE === ifLevel) {
+ inELSE = 0;
+ }
+ --ifLevel;
+ } else if (op === 0x1C) { // JMPR
+ if (!inFDEF && !inELSE) {
+ var offset = stack[stack.length - 1];
+ // only jumping forward to prevent infinite loop
+ if (offset > 0) {
+ i += offset - 1;
+ }
+ }
+ }
+ // Adjusting stack not extactly, but just enough to get function id
+ if (!inFDEF && !inELSE) {
+ var stackDelta = op <= 0x8E ? TTOpsStackDeltas[op] :
+ op >= 0xC0 && op <= 0xDF ? -1 : op >= 0xE0 ? -2 : 0;
+ if (op >= 0x71 && op <= 0x75) {
+ n = stack.pop();
+ if (n === n) {
+ stackDelta = -n * 2;
+ }
+ }
+ while (stackDelta < 0 && stack.length > 0) {
+ stack.pop();
+ stackDelta++;
+ }
+ while (stackDelta > 0) {
+ stack.push(NaN); // pushing any number into stack
+ stackDelta--;
+ }
+ }
+ }
+ ttContext.tooComplexToFollowFunctions = tooComplexToFollowFunctions;
+ var content = [data];
+ if (i > data.length) {
+ content.push(new Uint8Array(i - data.length));
+ }
+ if (lastDeff > lastEndf) {
+ warn('TT: complementing a missing function tail');
+ // new function definition started, but not finished
+ // complete function by [CLEAR, ENDF]
+ content.push(new Uint8Array([0x22, 0x2D]));
+ }
+ foldTTTable(table, content);
+ }
+
+ function checkInvalidFunctions(ttContext, maxFunctionDefs) {
+ if (ttContext.tooComplexToFollowFunctions) {
+ return;
+ }
+ if (ttContext.functionsDefined.length > maxFunctionDefs) {
+ warn('TT: more functions defined than expected');
+ ttContext.hintsValid = false;
+ return;
+ }
+ for (var j = 0, jj = ttContext.functionsUsed.length; j < jj; j++) {
+ if (j > maxFunctionDefs) {
+ warn('TT: invalid function id: ' + j);
+ ttContext.hintsValid = false;
+ return;
+ }
+ if (ttContext.functionsUsed[j] && !ttContext.functionsDefined[j]) {
+ warn('TT: undefined function: ' + j);
+ ttContext.hintsValid = false;
+ return;
+ }
+ }
+ }
+
+ function foldTTTable(table, content) {
+ if (content.length > 1) {
+ // concatenating the content items
+ var newLength = 0;
+ var j, jj;
+ for (j = 0, jj = content.length; j < jj; j++) {
+ newLength += content[j].length;
+ }
+ newLength = (newLength + 3) & ~3;
+ var result = new Uint8Array(newLength);
+ var pos = 0;
+ for (j = 0, jj = content.length; j < jj; j++) {
+ result.set(content[j], pos);
+ pos += content[j].length;
+ }
+ table.data = result;
+ table.length = newLength;
+ }
+ }
+
+ function sanitizeTTPrograms(fpgm, prep, cvt) {
+ var ttContext = {
+ functionsDefined: [],
+ functionsUsed: [],
+ functionsStackDeltas: [],
+ tooComplexToFollowFunctions: false,
+ hintsValid: true
+ };
+ if (fpgm) {
+ sanitizeTTProgram(fpgm, ttContext);
+ }
+ if (prep) {
+ sanitizeTTProgram(prep, ttContext);
+ }
+ if (fpgm) {
+ checkInvalidFunctions(ttContext, maxFunctionDefs);
+ }
+ if (cvt && (cvt.length & 1)) {
+ var cvtData = new Uint8Array(cvt.length + 1);
+ cvtData.set(cvt.data);
+ cvt.data = cvtData;
+ }
+ return ttContext.hintsValid;
+ }
+
+ // The following steps modify the original font data, making copy
+ font = new Stream(new Uint8Array(font.getBytes()));
+
+ var VALID_TABLES = ['OS/2', 'cmap', 'head', 'hhea', 'hmtx', 'maxp',
+ 'name', 'post', 'loca', 'glyf', 'fpgm', 'prep', 'cvt ', 'CFF '];
+
+ var header = readOpenTypeHeader(font);
+ var numTables = header.numTables;
+ var cff, cffFile;
+
+ var tables = { 'OS/2': null, cmap: null, head: null, hhea: null,
+ hmtx: null, maxp: null, name: null, post: null };
+ var table;
+ for (var i = 0; i < numTables; i++) {
+ table = readTableEntry(font);
+ if (VALID_TABLES.indexOf(table.tag) < 0) {
+ continue; // skipping table if it's not a required or optional table
+ }
+ if (table.length === 0) {
+ continue; // skipping empty tables
+ }
+ tables[table.tag] = table;
+ }
+
+ var isTrueType = !tables['CFF '];
+ if (!isTrueType) {
+ // OpenType font
+ if (header.version === 'OTTO' ||
+ !tables.head || !tables.hhea || !tables.maxp || !tables.post) {
+ // no major tables: throwing everything at CFFFont
+ cffFile = new Stream(tables['CFF '].data);
+ cff = new CFFFont(cffFile, properties);
+
+ return this.convert(name, cff, properties);
+ }
+
+ delete tables.glyf;
+ delete tables.loca;
+ delete tables.fpgm;
+ delete tables.prep;
+ delete tables['cvt '];
+ this.isOpenType = true;
+ } else {
+ if (!tables.glyf || !tables.loca) {
+ error('Required "glyf" or "loca" tables are not found');
+ }
+ this.isOpenType = false;
+ }
+
+ if (!tables.maxp) {
+ error('Required "maxp" table is not found');
+ }
+
+ font.pos = (font.start || 0) + tables.maxp.offset;
+ var version = font.getInt32();
+ var numGlyphs = font.getUint16();
+ var maxFunctionDefs = 0;
+ if (version >= 0x00010000 && tables.maxp.length >= 22) {
+ // maxZones can be invalid
+ font.pos += 8;
+ var maxZones = font.getUint16();
+ if (maxZones > 2) { // reset to 2 if font has invalid maxZones
+ tables.maxp.data[14] = 0;
+ tables.maxp.data[15] = 2;
+ }
+ font.pos += 4;
+ maxFunctionDefs = font.getUint16();
+ }
+
+ var dupFirstEntry = false;
+ if (properties.type === 'CIDFontType2' && properties.toUnicode &&
+ properties.toUnicode.get(0) > '\u0000') {
+ // oracle's defect (see 3427), duplicating first entry
+ dupFirstEntry = true;
+ numGlyphs++;
+ tables.maxp.data[4] = numGlyphs >> 8;
+ tables.maxp.data[5] = numGlyphs & 255;
+ }
+
+ var hintsValid = sanitizeTTPrograms(tables.fpgm, tables.prep,
+ tables['cvt '], maxFunctionDefs);
+ if (!hintsValid) {
+ delete tables.fpgm;
+ delete tables.prep;
+ delete tables['cvt '];
+ }
+
+ // Ensure the hmtx table contains the advance width and
+ // sidebearings information for numGlyphs in the maxp table
+ sanitizeMetrics(font, tables.hhea, tables.hmtx, numGlyphs);
+
+ if (!tables.head) {
+ error('Required "head" table is not found');
+ }
+
+ sanitizeHead(tables.head, numGlyphs, isTrueType ? tables.loca.length : 0);
+
+ var missingGlyphs = {};
+ if (isTrueType) {
+ var isGlyphLocationsLong = int16(tables.head.data[50],
+ tables.head.data[51]);
+ missingGlyphs = sanitizeGlyphLocations(tables.loca, tables.glyf,
+ numGlyphs, isGlyphLocationsLong,
+ hintsValid, dupFirstEntry);
+ }
+
+ if (!tables.hhea) {
+ error('Required "hhea" table is not found');
+ }
+
+ // Sanitizer reduces the glyph advanceWidth to the maxAdvanceWidth
+ // Sometimes it's 0. That needs to be fixed
+ if (tables.hhea.data[10] === 0 && tables.hhea.data[11] === 0) {
+ tables.hhea.data[10] = 0xFF;
+ tables.hhea.data[11] = 0xFF;
+ }
+
+ // The 'post' table has glyphs names.
+ if (tables.post) {
+ var valid = readPostScriptTable(tables.post, properties, numGlyphs);
+ if (!valid) {
+ tables.post = null;
+ }
+ }
+
+ var charCodeToGlyphId = [], charCode, toUnicode = properties.toUnicode;
+
+ function hasGlyph(glyphId, charCode) {
+ if (!missingGlyphs[glyphId]) {
+ return true;
+ }
+ if (charCode >= 0 && toUnicode.has(charCode)) {
+ return true;
+ }
+ return false;
+ }
+
+ if (properties.type === 'CIDFontType2') {
+ var cidToGidMap = properties.cidToGidMap || [];
+ var isCidToGidMapEmpty = cidToGidMap.length === 0;
+
+ properties.cMap.forEach(function(charCode, cid) {
+ assert(cid <= 0xffff, 'Max size of CID is 65,535');
+ var glyphId = -1;
+ if (isCidToGidMapEmpty) {
+ glyphId = charCode;
+ } else if (cidToGidMap[cid] !== undefined) {
+ glyphId = cidToGidMap[cid];
+ }
+
+ if (glyphId >= 0 && glyphId < numGlyphs &&
+ hasGlyph(glyphId, charCode)) {
+ charCodeToGlyphId[charCode] = glyphId;
+ }
+ });
+ if (dupFirstEntry) {
+ charCodeToGlyphId[0] = numGlyphs - 1;
+ }
+ } else {
+ // Most of the following logic in this code branch is based on the
+ // 9.6.6.4 of the PDF spec.
+ var cmapTable = readCmapTable(tables.cmap, font, this.isSymbolicFont);
+ var cmapPlatformId = cmapTable.platformId;
+ var cmapEncodingId = cmapTable.encodingId;
+ var cmapMappings = cmapTable.mappings;
+ var cmapMappingsLength = cmapMappings.length;
+ var hasEncoding = properties.differences.length ||
+ !!properties.baseEncodingName;
+
+ // The spec seems to imply that if the font is symbolic the encoding
+ // should be ignored, this doesn't appear to work for 'preistabelle.pdf'
+ // where the the font is symbolic and it has an encoding.
+ if (hasEncoding &&
+ (cmapPlatformId === 3 && cmapEncodingId === 1 ||
+ cmapPlatformId === 1 && cmapEncodingId === 0) ||
+ (cmapPlatformId === -1 && cmapEncodingId === -1 && // Temporary hack
+ !!Encodings[properties.baseEncodingName])) { // Temporary hack
+ // When no preferred cmap table was found and |baseEncodingName| is
+ // one of the predefined encodings, we seem to obtain a better
+ // |charCodeToGlyphId| map from the code below (fixes bug 1057544).
+ // TODO: Note that this is a hack which should be removed as soon as
+ // we have proper support for more exotic cmap tables.
+
+ var baseEncoding = [];
+ if (properties.baseEncodingName === 'MacRomanEncoding' ||
+ properties.baseEncodingName === 'WinAnsiEncoding') {
+ baseEncoding = Encodings[properties.baseEncodingName];
+ }
+ for (charCode = 0; charCode < 256; charCode++) {
+ var glyphName;
+ if (this.differences && charCode in this.differences) {
+ glyphName = this.differences[charCode];
+ } else if (charCode in baseEncoding &&
+ baseEncoding[charCode] !== '') {
+ glyphName = baseEncoding[charCode];
+ } else {
+ glyphName = Encodings.StandardEncoding[charCode];
+ }
+ if (!glyphName) {
+ continue;
+ }
+ var unicodeOrCharCode;
+ if (cmapPlatformId === 3 && cmapEncodingId === 1) {
+ unicodeOrCharCode = GlyphsUnicode[glyphName];
+ } else if (cmapPlatformId === 1 && cmapEncodingId === 0) {
+ // TODO: the encoding needs to be updated with mac os table.
+ unicodeOrCharCode = Encodings.MacRomanEncoding.indexOf(glyphName);
+ }
+
+ var found = false;
+ for (i = 0; i < cmapMappingsLength; ++i) {
+ if (cmapMappings[i].charCode === unicodeOrCharCode &&
+ hasGlyph(cmapMappings[i].glyphId, unicodeOrCharCode)) {
+ charCodeToGlyphId[charCode] = cmapMappings[i].glyphId;
+ found = true;
+ break;
+ }
+ }
+ if (!found && properties.glyphNames) {
+ // Try to map using the post table. There are currently no known
+ // pdfs that this fixes.
+ var glyphId = properties.glyphNames.indexOf(glyphName);
+ if (glyphId > 0 && hasGlyph(glyphId, -1)) {
+ charCodeToGlyphId[charCode] = glyphId;
+ }
+ }
+ }
+ } else if (cmapPlatformId === 0 && cmapEncodingId === 0) {
+ // Default Unicode semantics, use the charcodes as is.
+ for (i = 0; i < cmapMappingsLength; ++i) {
+ charCodeToGlyphId[cmapMappings[i].charCode] =
+ cmapMappings[i].glyphId;
+ }
+ } else {
+ // For (3, 0) cmap tables:
+ // The charcode key being stored in charCodeToGlyphId is the lower
+ // byte of the two-byte charcodes of the cmap table since according to
+ // the spec: 'each byte from the string shall be prepended with the
+ // high byte of the range [of charcodes in the cmap table], to form
+ // a two-byte character, which shall be used to select the
+ // associated glyph description from the subtable'.
+ //
+ // For (1, 0) cmap tables:
+ // 'single bytes from the string shall be used to look up the
+ // associated glyph descriptions from the subtable'. This means
+ // charcodes in the cmap will be single bytes, so no-op since
+ // glyph.charCode & 0xFF === glyph.charCode
+ for (i = 0; i < cmapMappingsLength; ++i) {
+ charCode = cmapMappings[i].charCode & 0xFF;
+ charCodeToGlyphId[charCode] = cmapMappings[i].glyphId;
+ }
+ }
+ }
+
+ if (charCodeToGlyphId.length === 0) {
+ // defines at least one glyph
+ charCodeToGlyphId[0] = 0;
+ }
+
+ // Converting glyphs and ids into font's cmap table
+ var newMapping = adjustMapping(charCodeToGlyphId, properties);
+ this.toFontChar = newMapping.toFontChar;
+ tables.cmap = {
+ tag: 'cmap',
+ data: createCmapTable(newMapping.charCodeToGlyphId)
+ };
+
+ if (!tables['OS/2'] || !validateOS2Table(tables['OS/2'])) {
+ // extract some more font properties from the OpenType head and
+ // hhea tables; yMin and descent value are always negative
+ var override = {
+ unitsPerEm: int16(tables.head.data[18], tables.head.data[19]),
+ yMax: int16(tables.head.data[42], tables.head.data[43]),
+ yMin: int16(tables.head.data[38], tables.head.data[39]) - 0x10000,
+ ascent: int16(tables.hhea.data[4], tables.hhea.data[5]),
+ descent: int16(tables.hhea.data[6], tables.hhea.data[7]) - 0x10000
+ };
+
+ tables['OS/2'] = {
+ tag: 'OS/2',
+ data: createOS2Table(properties, newMapping.charCodeToGlyphId,
+ override)
+ };
+ }
+
+ // Rewrite the 'post' table if needed
+ if (!tables.post) {
+ tables.post = {
+ tag: 'post',
+ data: createPostTable(properties)
+ };
+ }
+
+ if (!isTrueType) {
+ try {
+ // Trying to repair CFF file
+ cffFile = new Stream(tables['CFF '].data);
+ var parser = new CFFParser(cffFile, properties);
+ cff = parser.parse();
+ var compiler = new CFFCompiler(cff);
+ tables['CFF '].data = compiler.compile();
+ } catch (e) {
+ warn('Failed to compile font ' + properties.loadedName);
+ }
+ }
+
+ // Re-creating 'name' table
+ if (!tables.name) {
+ tables.name = {
+ tag: 'name',
+ data: createNameTable(this.name)
+ };
+ } else {
+ // ... using existing 'name' table as prototype
+ var namePrototype = readNameTable(tables.name);
+ tables.name.data = createNameTable(name, namePrototype);
+ }
+
+ var builder = new OpenTypeFileBuilder(header.version);
+ for (var tableTag in tables) {
+ builder.addTable(tableTag, tables[tableTag].data);
+ }
+ return builder.toArray();
+ },
+
+ convert: function Font_convert(fontName, font, properties) {
+ // TODO: Check the charstring widths to determine this.
+ properties.fixedPitch = false;
+
+ var mapping = font.getGlyphMapping(properties);
+ var newMapping = adjustMapping(mapping, properties);
+ this.toFontChar = newMapping.toFontChar;
+ var numGlyphs = font.numGlyphs;
+
+ function getCharCodes(charCodeToGlyphId, glyphId) {
+ var charCodes = null;
+ for (var charCode in charCodeToGlyphId) {
+ if (glyphId === charCodeToGlyphId[charCode]) {
+ if (!charCodes) {
+ charCodes = [];
+ }
+ charCodes.push(charCode | 0);
+ }
+ }
+ return charCodes;
+ }
+
+ function createCharCode(charCodeToGlyphId, glyphId) {
+ for (var charCode in charCodeToGlyphId) {
+ if (glyphId === charCodeToGlyphId[charCode]) {
+ return charCode | 0;
+ }
+ }
+ newMapping.charCodeToGlyphId[newMapping.nextAvailableFontCharCode] =
+ glyphId;
+ return newMapping.nextAvailableFontCharCode++;
+ }
+
+ var seacs = font.seacs;
+ if (SEAC_ANALYSIS_ENABLED && seacs && seacs.length) {
+ var matrix = properties.fontMatrix || FONT_IDENTITY_MATRIX;
+ var charset = font.getCharset();
+ var seacMap = Object.create(null);
+ for (var glyphId in seacs) {
+ glyphId |= 0;
+ var seac = seacs[glyphId];
+ var baseGlyphName = Encodings.StandardEncoding[seac[2]];
+ var accentGlyphName = Encodings.StandardEncoding[seac[3]];
+ var baseGlyphId = charset.indexOf(baseGlyphName);
+ var accentGlyphId = charset.indexOf(accentGlyphName);
+ if (baseGlyphId < 0 || accentGlyphId < 0) {
+ continue;
+ }
+ var accentOffset = {
+ x: seac[0] * matrix[0] + seac[1] * matrix[2] + matrix[4],
+ y: seac[0] * matrix[1] + seac[1] * matrix[3] + matrix[5]
+ };
+
+ var charCodes = getCharCodes(mapping, glyphId);
+ if (!charCodes) {
+ // There's no point in mapping it if the char code was never mapped
+ // to begin with.
+ continue;
+ }
+ for (var i = 0, ii = charCodes.length; i < ii; i++) {
+ var charCode = charCodes[i];
+ // Find a fontCharCode that maps to the base and accent glyphs.
+ // If one doesn't exists, create it.
+ var charCodeToGlyphId = newMapping.charCodeToGlyphId;
+ var baseFontCharCode = createCharCode(charCodeToGlyphId,
+ baseGlyphId);
+ var accentFontCharCode = createCharCode(charCodeToGlyphId,
+ accentGlyphId);
+ seacMap[charCode] = {
+ baseFontCharCode: baseFontCharCode,
+ accentFontCharCode: accentFontCharCode,
+ accentOffset: accentOffset
+ };
+ }
+ }
+ properties.seacMap = seacMap;
+ }
+
+ var unitsPerEm = 1 / (properties.fontMatrix || FONT_IDENTITY_MATRIX)[0];
+
+ var builder = new OpenTypeFileBuilder('\x4F\x54\x54\x4F');
+ // PostScript Font Program
+ builder.addTable('CFF ', font.data);
+ // OS/2 and Windows Specific metrics
+ builder.addTable('OS/2', createOS2Table(properties,
+ newMapping.charCodeToGlyphId));
+ // Character to glyphs mapping
+ builder.addTable('cmap', createCmapTable(newMapping.charCodeToGlyphId));
+ // Font header
+ builder.addTable('head',
+ '\x00\x01\x00\x00' + // Version number
+ '\x00\x00\x10\x00' + // fontRevision
+ '\x00\x00\x00\x00' + // checksumAdjustement
+ '\x5F\x0F\x3C\xF5' + // magicNumber
+ '\x00\x00' + // Flags
+ safeString16(unitsPerEm) + // unitsPerEM
+ '\x00\x00\x00\x00\x9e\x0b\x7e\x27' + // creation date
+ '\x00\x00\x00\x00\x9e\x0b\x7e\x27' + // modifification date
+ '\x00\x00' + // xMin
+ safeString16(properties.descent) + // yMin
+ '\x0F\xFF' + // xMax
+ safeString16(properties.ascent) + // yMax
+ string16(properties.italicAngle ? 2 : 0) + // macStyle
+ '\x00\x11' + // lowestRecPPEM
+ '\x00\x00' + // fontDirectionHint
+ '\x00\x00' + // indexToLocFormat
+ '\x00\x00'); // glyphDataFormat
+
+ // Horizontal header
+ builder.addTable('hhea',
+ '\x00\x01\x00\x00' + // Version number
+ safeString16(properties.ascent) + // Typographic Ascent
+ safeString16(properties.descent) + // Typographic Descent
+ '\x00\x00' + // Line Gap
+ '\xFF\xFF' + // advanceWidthMax
+ '\x00\x00' + // minLeftSidebearing
+ '\x00\x00' + // minRightSidebearing
+ '\x00\x00' + // xMaxExtent
+ safeString16(properties.capHeight) + // caretSlopeRise
+ safeString16(Math.tan(properties.italicAngle) *
+ properties.xHeight) + // caretSlopeRun
+ '\x00\x00' + // caretOffset
+ '\x00\x00' + // -reserved-
+ '\x00\x00' + // -reserved-
+ '\x00\x00' + // -reserved-
+ '\x00\x00' + // -reserved-
+ '\x00\x00' + // metricDataFormat
+ string16(numGlyphs)); // Number of HMetrics
+
+ // Horizontal metrics
+ builder.addTable('hmtx', (function fontFieldsHmtx() {
+ var charstrings = font.charstrings;
+ var cffWidths = font.cff ? font.cff.widths : null;
+ var hmtx = '\x00\x00\x00\x00'; // Fake .notdef
+ for (var i = 1, ii = numGlyphs; i < ii; i++) {
+ var width = 0;
+ if (charstrings) {
+ var charstring = charstrings[i - 1];
+ width = 'width' in charstring ? charstring.width : 0;
+ } else if (cffWidths) {
+ width = Math.ceil(cffWidths[i] || 0);
+ }
+ hmtx += string16(width) + string16(0);
+ }
+ return hmtx;
+ })());
+
+ // Maximum profile
+ builder.addTable('maxp',
+ '\x00\x00\x50\x00' + // Version number
+ string16(numGlyphs)); // Num of glyphs
+
+ // Naming tables
+ builder.addTable('name', createNameTable(fontName));
+
+ // PostScript informations
+ builder.addTable('post', createPostTable(properties));
+
+ return builder.toArray();
+ },
+
+ /**
+ * Builds a char code to unicode map based on section 9.10 of the spec.
+ * @param {Object} properties Font properties object.
+ * @return {Object} A ToUnicodeMap object.
+ */
+ buildToUnicode: function Font_buildToUnicode(properties) {
+ // Section 9.10.2 Mapping Character Codes to Unicode Values
+ if (properties.toUnicode && properties.toUnicode.length !== 0) {
+ return properties.toUnicode;
+ }
+ // According to the spec if the font is a simple font we should only map
+ // to unicode if the base encoding is MacRoman, MacExpert, or WinAnsi or
+ // the differences array only contains adobe standard or symbol set names,
+ // in pratice it seems better to always try to create a toUnicode
+ // map based of the default encoding.
+ var toUnicode, charcode;
+ if (!properties.composite /* is simple font */) {
+ toUnicode = [];
+ var encoding = properties.defaultEncoding.slice();
+ var baseEncodingName = properties.baseEncodingName;
+ // Merge in the differences array.
+ var differences = properties.differences;
+ for (charcode in differences) {
+ encoding[charcode] = differences[charcode];
+ }
+ for (charcode in encoding) {
+ // a) Map the character code to a character name.
+ var glyphName = encoding[charcode];
+ // b) Look up the character name in the Adobe Glyph List (see the
+ // Bibliography) to obtain the corresponding Unicode value.
+ if (glyphName === '') {
+ continue;
+ } else if (GlyphsUnicode[glyphName] === undefined) {
+ // (undocumented) c) Few heuristics to recognize unknown glyphs
+ // NOTE: Adobe Reader does not do this step, but OSX Preview does
+ var code = 0;
+ switch (glyphName[0]) {
+ case 'G': // Gxx glyph
+ if (glyphName.length === 3) {
+ code = parseInt(glyphName.substr(1), 16);
+ }
+ break;
+ case 'g': // g00xx glyph
+ if (glyphName.length === 5) {
+ code = parseInt(glyphName.substr(1), 16);
+ }
+ break;
+ case 'C': // Cddd glyph
+ case 'c': // cddd glyph
+ if (glyphName.length >= 3) {
+ code = +glyphName.substr(1);
+ }
+ break;
+ }
+ if (code) {
+ // If |baseEncodingName| is one the predefined encodings,
+ // and |code| equals |charcode|, using the glyph defined in the
+ // baseEncoding seems to yield a better |toUnicode| mapping
+ // (fixes issue 5070).
+ if (baseEncodingName && code === +charcode) {
+ var baseEncoding = Encodings[baseEncodingName];
+ if (baseEncoding && (glyphName = baseEncoding[charcode])) {
+ toUnicode[charcode] =
+ String.fromCharCode(GlyphsUnicode[glyphName]);
+ continue;
+ }
+ }
+ toUnicode[charcode] = String.fromCharCode(code);
+ }
+ continue;
+ }
+ toUnicode[charcode] = String.fromCharCode(GlyphsUnicode[glyphName]);
+ }
+ return new ToUnicodeMap(toUnicode);
+ }
+ // If the font is a composite font that uses one of the predefined CMaps
+ // listed in Table 118 (except Identity–H and Identity–V) or whose
+ // descendant CIDFont uses the Adobe-GB1, Adobe-CNS1, Adobe-Japan1, or
+ // Adobe-Korea1 character collection:
+ if (properties.composite && (
+ (properties.cMap.builtInCMap &&
+ !(properties.cMap instanceof IdentityCMap)) ||
+ (properties.cidSystemInfo.registry === 'Adobe' &&
+ (properties.cidSystemInfo.ordering === 'GB1' ||
+ properties.cidSystemInfo.ordering === 'CNS1' ||
+ properties.cidSystemInfo.ordering === 'Japan1' ||
+ properties.cidSystemInfo.ordering === 'Korea1')))) {
+ // Then:
+ // a) Map the character code to a character identifier (CID) according
+ // to the font’s CMap.
+ // b) Obtain the registry and ordering of the character collection used
+ // by the font’s CMap (for example, Adobe and Japan1) from its
+ // CIDSystemInfo dictionary.
+ var registry = properties.cidSystemInfo.registry;
+ var ordering = properties.cidSystemInfo.ordering;
+ // c) Construct a second CMap name by concatenating the registry and
+ // ordering obtained in step (b) in the format registry–ordering–UCS2
+ // (for example, Adobe–Japan1–UCS2).
+ var ucs2CMapName = new Name(registry + '-' + ordering + '-UCS2');
+ // d) Obtain the CMap with the name constructed in step (c) (available
+ // from the ASN Web site; see the Bibliography).
+ var ucs2CMap = CMapFactory.create(ucs2CMapName,
+ { url: PDFJS.cMapUrl, packed: PDFJS.cMapPacked }, null);
+ var cMap = properties.cMap;
+ toUnicode = [];
+ cMap.forEach(function(charcode, cid) {
+ assert(cid <= 0xffff, 'Max size of CID is 65,535');
+ // e) Map the CID obtained in step (a) according to the CMap obtained
+ // in step (d), producing a Unicode value.
+ var ucs2 = ucs2CMap.lookup(cid);
+ if (ucs2) {
+ toUnicode[charcode] =
+ String.fromCharCode((ucs2.charCodeAt(0) << 8) +
+ ucs2.charCodeAt(1));
+ }
+ });
+ return new ToUnicodeMap(toUnicode);
+ }
+
+ // The viewer's choice, just use an identity map.
+ return new IdentityToUnicodeMap(properties.firstChar,
+ properties.lastChar);
+ },
+
+ get spaceWidth() {
+ if ('_shadowWidth' in this) {
+ return this._shadowWidth;
+ }
+
+ // trying to estimate space character width
+ var possibleSpaceReplacements = ['space', 'minus', 'one', 'i'];
+ var width;
+ for (var i = 0, ii = possibleSpaceReplacements.length; i < ii; i++) {
+ var glyphName = possibleSpaceReplacements[i];
+ // if possible, getting width by glyph name
+ if (glyphName in this.widths) {
+ width = this.widths[glyphName];
+ break;
+ }
+ var glyphUnicode = GlyphsUnicode[glyphName];
+ // finding the charcode via unicodeToCID map
+ var charcode = 0;
+ if (this.composite) {
+ if (this.cMap.contains(glyphUnicode)) {
+ charcode = this.cMap.lookup(glyphUnicode);
+ }
+ }
+ // ... via toUnicode map
+ if (!charcode && 'toUnicode' in this) {
+ charcode = this.toUnicode.charCodeOf(glyphUnicode);
+ }
+ // setting it to unicode if negative or undefined
+ if (charcode <= 0) {
+ charcode = glyphUnicode;
+ }
+ // trying to get width via charcode
+ width = this.widths[charcode];
+ if (width) {
+ break; // the non-zero width found
+ }
+ }
+ width = width || this.defaultWidth;
+ // Do not shadow the property here. See discussion:
+ // https://github.com/mozilla/pdf.js/pull/2127#discussion_r1662280
+ this._shadowWidth = width;
+ return width;
+ },
+
+ charToGlyph: function Font_charToGlyph(charcode) {
+ var fontCharCode, width, operatorListId;
+
+ var widthCode = charcode;
+ if (this.cMap && this.cMap.contains(charcode)) {
+ widthCode = this.cMap.lookup(charcode);
+ }
+ width = this.widths[widthCode];
+ width = isNum(width) ? width : this.defaultWidth;
+ var vmetric = this.vmetrics && this.vmetrics[widthCode];
+
+ var unicode = this.toUnicode.get(charcode) || charcode;
+ if (typeof unicode === 'number') {
+ unicode = String.fromCharCode(unicode);
+ }
+
+ // First try the toFontChar map, if it's not there then try falling
+ // back to the char code.
+ fontCharCode = this.toFontChar[charcode] || charcode;
+ if (this.missingFile) {
+ fontCharCode = mapSpecialUnicodeValues(fontCharCode);
+ }
+
+ if (this.isType3Font) {
+ // Font char code in this case is actually a glyph name.
+ operatorListId = fontCharCode;
+ }
+
+ var accent = null;
+ if (this.seacMap && this.seacMap[charcode]) {
+ var seac = this.seacMap[charcode];
+ fontCharCode = seac.baseFontCharCode;
+ accent = {
+ fontChar: String.fromCharCode(seac.accentFontCharCode),
+ offset: seac.accentOffset
+ };
+ }
+
+ var fontChar = String.fromCharCode(fontCharCode);
+
+ var glyph = this.glyphCache[charcode];
+ if (!glyph ||
+ !glyph.matchesForCache(fontChar, unicode, accent, width, vmetric,
+ operatorListId)) {
+ glyph = new Glyph(fontChar, unicode, accent, width, vmetric,
+ operatorListId);
+ this.glyphCache[charcode] = glyph;
+ }
+ return glyph;
+ },
+
+ charsToGlyphs: function Font_charsToGlyphs(chars) {
+ var charsCache = this.charsCache;
+ var glyphs, glyph, charcode;
+
+ // if we translated this string before, just grab it from the cache
+ if (charsCache) {
+ glyphs = charsCache[chars];
+ if (glyphs) {
+ return glyphs;
+ }
+ }
+
+ // lazily create the translation cache
+ if (!charsCache) {
+ charsCache = this.charsCache = Object.create(null);
+ }
+
+ glyphs = [];
+ var charsCacheKey = chars;
+ var i = 0, ii;
+
+ if (this.cMap) {
+ // composite fonts have multi-byte strings convert the string from
+ // single-byte to multi-byte
+ var c = {};
+ while (i < chars.length) {
+ this.cMap.readCharCode(chars, i, c);
+ charcode = c.charcode;
+ var length = c.length;
+ i += length;
+ glyph = this.charToGlyph(charcode);
+ glyphs.push(glyph);
+ // placing null after each word break charcode (ASCII SPACE)
+ // Ignore occurences of 0x20 in multiple-byte codes.
+ if (length === 1 && chars.charCodeAt(i - 1) === 0x20) {
+ glyphs.push(null);
+ }
+ }
+ } else {
+ for (i = 0, ii = chars.length; i < ii; ++i) {
+ charcode = chars.charCodeAt(i);
+ glyph = this.charToGlyph(charcode);
+ glyphs.push(glyph);
+ if (charcode === 0x20) {
+ glyphs.push(null);
+ }
+ }
+ }
+
+ // Enter the translated string into the cache
+ return (charsCache[charsCacheKey] = glyphs);
+ }
+ };
+
+ return Font;
+})();
+
+var ErrorFont = (function ErrorFontClosure() {
+ function ErrorFont(error) {
+ this.error = error;
+ this.loadedName = 'g_font_error';
+ this.loading = false;
+ }
+
+ ErrorFont.prototype = {
+ charsToGlyphs: function ErrorFont_charsToGlyphs() {
+ return [];
+ },
+ exportData: function ErrorFont_exportData() {
+ return {error: this.error};
+ }
+ };
+
+ return ErrorFont;
+})();
+
+/**
+ * Shared logic for building a char code to glyph id mapping for Type1 and
+ * simple CFF fonts. See section 9.6.6.2 of the spec.
+ * @param {Object} properties Font properties object.
+ * @param {Object} builtInEncoding The encoding contained within the actual font
+ * data.
+ * @param {Array} Array of glyph names where the index is the glyph ID.
+ * @returns {Object} A char code to glyph ID map.
+ */
+function type1FontGlyphMapping(properties, builtInEncoding, glyphNames) {
+ var charCodeToGlyphId = Object.create(null);
+ var glyphId, charCode, baseEncoding;
+
+ if (properties.baseEncodingName) {
+ // If a valid base encoding name was used, the mapping is initialized with
+ // that.
+ baseEncoding = Encodings[properties.baseEncodingName];
+ for (charCode = 0; charCode < baseEncoding.length; charCode++) {
+ glyphId = glyphNames.indexOf(baseEncoding[charCode]);
+ if (glyphId >= 0) {
+ charCodeToGlyphId[charCode] = glyphId;
+ } else {
+ charCodeToGlyphId[charCode] = 0; // notdef
+ }
+ }
+ } else if (!!(properties.flags & FontFlags.Symbolic)) {
+ // For a symbolic font the encoding should be the fonts built-in
+ // encoding.
+ for (charCode in builtInEncoding) {
+ charCodeToGlyphId[charCode] = builtInEncoding[charCode];
+ }
+ } else {
+ // For non-symbolic fonts that don't have a base encoding the standard
+ // encoding should be used.
+ baseEncoding = Encodings.StandardEncoding;
+ for (charCode = 0; charCode < baseEncoding.length; charCode++) {
+ glyphId = glyphNames.indexOf(baseEncoding[charCode]);
+ if (glyphId >= 0) {
+ charCodeToGlyphId[charCode] = glyphId;
+ } else {
+ charCodeToGlyphId[charCode] = 0; // notdef
+ }
+ }
+ }
+
+ // Lastly, merge in the differences.
+ var differences = properties.differences;
+ if (differences) {
+ for (charCode in differences) {
+ var glyphName = differences[charCode];
+ glyphId = glyphNames.indexOf(glyphName);
+ if (glyphId >= 0) {
+ charCodeToGlyphId[charCode] = glyphId;
+ } else {
+ charCodeToGlyphId[charCode] = 0; // notdef
+ }
+ }
+ }
+ return charCodeToGlyphId;
+}
+
+/*
+ * CharStrings are encoded following the the CharString Encoding sequence
+ * describe in Chapter 6 of the "Adobe Type1 Font Format" specification.
+ * The value in a byte indicates a command, a number, or subsequent bytes
+ * that are to be interpreted in a special way.
+ *
+ * CharString Number Encoding:
+ * A CharString byte containing the values from 32 through 255 inclusive
+ * indicate an integer. These values are decoded in four ranges.
+ *
+ * 1. A CharString byte containing a value, v, between 32 and 246 inclusive,
+ * indicate the integer v - 139. Thus, the integer values from -107 through
+ * 107 inclusive may be encoded in single byte.
+ *
+ * 2. A CharString byte containing a value, v, between 247 and 250 inclusive,
+ * indicates an integer involving the next byte, w, according to the formula:
+ * [(v - 247) x 256] + w + 108
+ *
+ * 3. A CharString byte containing a value, v, between 251 and 254 inclusive,
+ * indicates an integer involving the next byte, w, according to the formula:
+ * -[(v - 251) * 256] - w - 108
+ *
+ * 4. A CharString containing the value 255 indicates that the next 4 bytes
+ * are a two complement signed integer. The first of these bytes contains the
+ * highest order bits, the second byte contains the next higher order bits
+ * and the fourth byte contain the lowest order bits.
+ *
+ *
+ * CharString Command Encoding:
+ * CharStrings commands are encoded in 1 or 2 bytes.
+ *
+ * Single byte commands are encoded in 1 byte that contains a value between
+ * 0 and 31 inclusive.
+ * If a command byte contains the value 12, then the value in the next byte
+ * indicates a command. This "escape" mechanism allows many extra commands
+ * to be encoded and this encoding technique helps to minimize the length of
+ * the charStrings.
+ */
+var Type1CharString = (function Type1CharStringClosure() {
+ var COMMAND_MAP = {
+ 'hstem': [1],
+ 'vstem': [3],
+ 'vmoveto': [4],
+ 'rlineto': [5],
+ 'hlineto': [6],
+ 'vlineto': [7],
+ 'rrcurveto': [8],
+ 'callsubr': [10],
+ 'flex': [12, 35],
+ 'drop' : [12, 18],
+ 'endchar': [14],
+ 'rmoveto': [21],
+ 'hmoveto': [22],
+ 'vhcurveto': [30],
+ 'hvcurveto': [31]
+ };
+
+ function Type1CharString() {
+ this.width = 0;
+ this.lsb = 0;
+ this.flexing = false;
+ this.output = [];
+ this.stack = [];
+ }
+
+ Type1CharString.prototype = {
+ convert: function Type1CharString_convert(encoded, subrs) {
+ var count = encoded.length;
+ var error = false;
+ var wx, sbx, subrNumber;
+ for (var i = 0; i < count; i++) {
+ var value = encoded[i];
+ if (value < 32) {
+ if (value === 12) {
+ value = (value << 8) + encoded[++i];
+ }
+ switch (value) {
+ case 1: // hstem
+ if (!HINTING_ENABLED) {
+ this.stack = [];
+ break;
+ }
+ error = this.executeCommand(2, COMMAND_MAP.hstem);
+ break;
+ case 3: // vstem
+ if (!HINTING_ENABLED) {
+ this.stack = [];
+ break;
+ }
+ error = this.executeCommand(2, COMMAND_MAP.vstem);
+ break;
+ case 4: // vmoveto
+ if (this.flexing) {
+ if (this.stack.length < 1) {
+ error = true;
+ break;
+ }
+ // Add the dx for flex and but also swap the values so they are
+ // the right order.
+ var dy = this.stack.pop();
+ this.stack.push(0, dy);
+ break;
+ }
+ error = this.executeCommand(1, COMMAND_MAP.vmoveto);
+ break;
+ case 5: // rlineto
+ error = this.executeCommand(2, COMMAND_MAP.rlineto);
+ break;
+ case 6: // hlineto
+ error = this.executeCommand(1, COMMAND_MAP.hlineto);
+ break;
+ case 7: // vlineto
+ error = this.executeCommand(1, COMMAND_MAP.vlineto);
+ break;
+ case 8: // rrcurveto
+ error = this.executeCommand(6, COMMAND_MAP.rrcurveto);
+ break;
+ case 9: // closepath
+ // closepath is a Type1 command that does not take argument and is
+ // useless in Type2 and it can simply be ignored.
+ this.stack = [];
+ break;
+ case 10: // callsubr
+ if (this.stack.length < 1) {
+ error = true;
+ break;
+ }
+ subrNumber = this.stack.pop();
+ error = this.convert(subrs[subrNumber], subrs);
+ break;
+ case 11: // return
+ return error;
+ case 13: // hsbw
+ if (this.stack.length < 2) {
+ error = true;
+ break;
+ }
+ // To convert to type2 we have to move the width value to the
+ // first part of the charstring and then use hmoveto with lsb.
+ wx = this.stack.pop();
+ sbx = this.stack.pop();
+ this.lsb = sbx;
+ this.width = wx;
+ this.stack.push(wx, sbx);
+ error = this.executeCommand(2, COMMAND_MAP.hmoveto);
+ break;
+ case 14: // endchar
+ this.output.push(COMMAND_MAP.endchar[0]);
+ break;
+ case 21: // rmoveto
+ if (this.flexing) {
+ break;
+ }
+ error = this.executeCommand(2, COMMAND_MAP.rmoveto);
+ break;
+ case 22: // hmoveto
+ if (this.flexing) {
+ // Add the dy for flex.
+ this.stack.push(0);
+ break;
+ }
+ error = this.executeCommand(1, COMMAND_MAP.hmoveto);
+ break;
+ case 30: // vhcurveto
+ error = this.executeCommand(4, COMMAND_MAP.vhcurveto);
+ break;
+ case 31: // hvcurveto
+ error = this.executeCommand(4, COMMAND_MAP.hvcurveto);
+ break;
+ case (12 << 8) + 0: // dotsection
+ // dotsection is a Type1 command to specify some hinting feature
+ // for dots that do not take a parameter and it can safely be
+ // ignored for Type2.
+ this.stack = [];
+ break;
+ case (12 << 8) + 1: // vstem3
+ if (!HINTING_ENABLED) {
+ this.stack = [];
+ break;
+ }
+ // [vh]stem3 are Type1 only and Type2 supports [vh]stem with
+ // multiple parameters, so instead of returning [vh]stem3 take a
+ // shortcut and return [vhstem] instead.
+ error = this.executeCommand(2, COMMAND_MAP.vstem);
+ break;
+ case (12 << 8) + 2: // hstem3
+ if (!HINTING_ENABLED) {
+ this.stack = [];
+ break;
+ }
+ // See vstem3.
+ error = this.executeCommand(2, COMMAND_MAP.hstem);
+ break;
+ case (12 << 8) + 6: // seac
+ // seac is like type 2's special endchar but it doesn't use the
+ // first argument asb, so remove it.
+ if (SEAC_ANALYSIS_ENABLED) {
+ this.seac = this.stack.splice(-4, 4);
+ error = this.executeCommand(0, COMMAND_MAP.endchar);
+ } else {
+ error = this.executeCommand(4, COMMAND_MAP.endchar);
+ }
+ break;
+ case (12 << 8) + 7: // sbw
+ if (this.stack.length < 4) {
+ error = true;
+ break;
+ }
+ // To convert to type2 we have to move the width value to the
+ // first part of the charstring and then use rmoveto with
+ // (dx, dy). The height argument will not be used for vmtx and
+ // vhea tables reconstruction -- ignoring it.
+ var wy = this.stack.pop();
+ wx = this.stack.pop();
+ var sby = this.stack.pop();
+ sbx = this.stack.pop();
+ this.lsb = sbx;
+ this.width = wx;
+ this.stack.push(wx, sbx, sby);
+ error = this.executeCommand(3, COMMAND_MAP.rmoveto);
+ break;
+ case (12 << 8) + 12: // div
+ if (this.stack.length < 2) {
+ error = true;
+ break;
+ }
+ var num2 = this.stack.pop();
+ var num1 = this.stack.pop();
+ this.stack.push(num1 / num2);
+ break;
+ case (12 << 8) + 16: // callothersubr
+ if (this.stack.length < 2) {
+ error = true;
+ break;
+ }
+ subrNumber = this.stack.pop();
+ var numArgs = this.stack.pop();
+ if (subrNumber === 0 && numArgs === 3) {
+ var flexArgs = this.stack.splice(this.stack.length - 17, 17);
+ this.stack.push(
+ flexArgs[2] + flexArgs[0], // bcp1x + rpx
+ flexArgs[3] + flexArgs[1], // bcp1y + rpy
+ flexArgs[4], // bcp2x
+ flexArgs[5], // bcp2y
+ flexArgs[6], // p2x
+ flexArgs[7], // p2y
+ flexArgs[8], // bcp3x
+ flexArgs[9], // bcp3y
+ flexArgs[10], // bcp4x
+ flexArgs[11], // bcp4y
+ flexArgs[12], // p3x
+ flexArgs[13], // p3y
+ flexArgs[14] // flexDepth
+ // 15 = finalx unused by flex
+ // 16 = finaly unused by flex
+ );
+ error = this.executeCommand(13, COMMAND_MAP.flex, true);
+ this.flexing = false;
+ this.stack.push(flexArgs[15], flexArgs[16]);
+ } else if (subrNumber === 1 && numArgs === 0) {
+ this.flexing = true;
+ }
+ break;
+ case (12 << 8) + 17: // pop
+ // Ignore this since it is only used with othersubr.
+ break;
+ case (12 << 8) + 33: // setcurrentpoint
+ // Ignore for now.
+ this.stack = [];
+ break;
+ default:
+ warn('Unknown type 1 charstring command of "' + value + '"');
+ break;
+ }
+ if (error) {
+ break;
+ }
+ continue;
+ } else if (value <= 246) {
+ value = value - 139;
+ } else if (value <= 250) {
+ value = ((value - 247) * 256) + encoded[++i] + 108;
+ } else if (value <= 254) {
+ value = -((value - 251) * 256) - encoded[++i] - 108;
+ } else {
+ value = (encoded[++i] & 0xff) << 24 | (encoded[++i] & 0xff) << 16 |
+ (encoded[++i] & 0xff) << 8 | (encoded[++i] & 0xff) << 0;
+ }
+ this.stack.push(value);
+ }
+ return error;
+ },
+
+ executeCommand: function(howManyArgs, command, keepStack) {
+ var stackLength = this.stack.length;
+ if (howManyArgs > stackLength) {
+ return true;
+ }
+ var start = stackLength - howManyArgs;
+ for (var i = start; i < stackLength; i++) {
+ var value = this.stack[i];
+ if (value === (value | 0)) { // int
+ this.output.push(28, (value >> 8) & 0xff, value & 0xff);
+ } else { // fixed point
+ value = (65536 * value) | 0;
+ this.output.push(255,
+ (value >> 24) & 0xFF,
+ (value >> 16) & 0xFF,
+ (value >> 8) & 0xFF,
+ value & 0xFF);
+ }
+ }
+ this.output.push.apply(this.output, command);
+ if (keepStack) {
+ this.stack.splice(start, howManyArgs);
+ } else {
+ this.stack.length = 0;
+ }
+ return false;
+ }
+ };
+
+ return Type1CharString;
+})();
+
+/*
+ * Type1Parser encapsulate the needed code for parsing a Type1 font
+ * program. Some of its logic depends on the Type2 charstrings
+ * structure.
+ * Note: this doesn't really parse the font since that would require evaluation
+ * of PostScript, but it is possible in most cases to extract what we need
+ * without a full parse.
+ */
+var Type1Parser = (function Type1ParserClosure() {
+ /*
+ * Decrypt a Sequence of Ciphertext Bytes to Produce the Original Sequence
+ * of Plaintext Bytes. The function took a key as a parameter which can be
+ * for decrypting the eexec block of for decoding charStrings.
+ */
+ var EEXEC_ENCRYPT_KEY = 55665;
+ var CHAR_STRS_ENCRYPT_KEY = 4330;
+
+ function isHexDigit(code) {
+ return code >= 48 && code <= 57 || // '0'-'9'
+ code >= 65 && code <= 70 || // 'A'-'F'
+ code >= 97 && code <= 102; // 'a'-'f'
+ }
+
+ function decrypt(data, key, discardNumber) {
+ var r = key | 0, c1 = 52845, c2 = 22719;
+ var count = data.length;
+ var decrypted = new Uint8Array(count);
+ for (var i = 0; i < count; i++) {
+ var value = data[i];
+ decrypted[i] = value ^ (r >> 8);
+ r = ((value + r) * c1 + c2) & ((1 << 16) - 1);
+ }
+ return Array.prototype.slice.call(decrypted, discardNumber);
+ }
+
+ function decryptAscii(data, key, discardNumber) {
+ var r = key | 0, c1 = 52845, c2 = 22719;
+ var count = data.length, maybeLength = count >>> 1;
+ var decrypted = new Uint8Array(maybeLength);
+ var i, j;
+ for (i = 0, j = 0; i < count; i++) {
+ var digit1 = data[i];
+ if (!isHexDigit(digit1)) {
+ continue;
+ }
+ i++;
+ var digit2;
+ while (i < count && !isHexDigit(digit2 = data[i])) {
+ i++;
+ }
+ if (i < count) {
+ var value = parseInt(String.fromCharCode(digit1, digit2), 16);
+ decrypted[j++] = value ^ (r >> 8);
+ r = ((value + r) * c1 + c2) & ((1 << 16) - 1);
+ }
+ }
+ return Array.prototype.slice.call(decrypted, discardNumber, j);
+ }
+
+ function isSpecial(c) {
+ return c === 0x2F || // '/'
+ c === 0x5B || c === 0x5D || // '[', ']'
+ c === 0x7B || c === 0x7D || // '{', '}'
+ c === 0x28 || c === 0x29; // '(', ')'
+ }
+
+ function Type1Parser(stream, encrypted) {
+ if (encrypted) {
+ var data = stream.getBytes();
+ var isBinary = !(isHexDigit(data[0]) && isHexDigit(data[1]) &&
+ isHexDigit(data[2]) && isHexDigit(data[3]));
+ stream = new Stream(isBinary ? decrypt(data, EEXEC_ENCRYPT_KEY, 4) :
+ decryptAscii(data, EEXEC_ENCRYPT_KEY, 4));
+ }
+ this.stream = stream;
+ this.nextChar();
+ }
+
+ Type1Parser.prototype = {
+ readNumberArray: function Type1Parser_readNumberArray() {
+ this.getToken(); // read '[' or '{' (arrays can start with either)
+ var array = [];
+ while (true) {
+ var token = this.getToken();
+ if (token === null || token === ']' || token === '}') {
+ break;
+ }
+ array.push(parseFloat(token || 0));
+ }
+ return array;
+ },
+
+ readNumber: function Type1Parser_readNumber() {
+ var token = this.getToken();
+ return parseFloat(token || 0);
+ },
+
+ readInt: function Type1Parser_readInt() {
+ // Use '| 0' to prevent setting a double into length such as the double
+ // does not flow into the loop variable.
+ var token = this.getToken();
+ return parseInt(token || 0, 10) | 0;
+ },
+
+ readBoolean: function Type1Parser_readBoolean() {
+ var token = this.getToken();
+
+ // Use 1 and 0 since that's what type2 charstrings use.
+ return token === 'true' ? 1 : 0;
+ },
+
+ nextChar : function Type1_nextChar() {
+ return (this.currentChar = this.stream.getByte());
+ },
+
+ getToken: function Type1Parser_getToken() {
+ // Eat whitespace and comments.
+ var comment = false;
+ var ch = this.currentChar;
+ while (true) {
+ if (ch === -1) {
+ return null;
+ }
+
+ if (comment) {
+ if (ch === 0x0A || ch === 0x0D) {
+ comment = false;
+ }
+ } else if (ch === 0x25) { // '%'
+ comment = true;
+ } else if (!Lexer.isSpace(ch)) {
+ break;
+ }
+ ch = this.nextChar();
+ }
+ if (isSpecial(ch)) {
+ this.nextChar();
+ return String.fromCharCode(ch);
+ }
+ var token = '';
+ do {
+ token += String.fromCharCode(ch);
+ ch = this.nextChar();
+ } while (ch >= 0 && !Lexer.isSpace(ch) && !isSpecial(ch));
+ return token;
+ },
+
+ /*
+ * Returns an object containing a Subrs array and a CharStrings
+ * array extracted from and eexec encrypted block of data
+ */
+ extractFontProgram: function Type1Parser_extractFontProgram() {
+ var stream = this.stream;
+
+ var subrs = [], charstrings = [];
+ var program = {
+ subrs: [],
+ charstrings: [],
+ properties: {
+ 'privateData': {
+ 'lenIV': 4
+ }
+ }
+ };
+ var token, length, data, lenIV, encoded;
+ while ((token = this.getToken()) !== null) {
+ if (token !== '/') {
+ continue;
+ }
+ token = this.getToken();
+ switch (token) {
+ case 'CharStrings':
+ // The number immediately following CharStrings must be greater or
+ // equal to the number of CharStrings.
+ this.getToken();
+ this.getToken(); // read in 'dict'
+ this.getToken(); // read in 'dup'
+ this.getToken(); // read in 'begin'
+ while(true) {
+ token = this.getToken();
+ if (token === null || token === 'end') {
+ break;
+ }
+
+ if (token !== '/') {
+ continue;
+ }
+ var glyph = this.getToken();
+ length = this.readInt();
+ this.getToken(); // read in 'RD' or '-|'
+ data = stream.makeSubStream(stream.pos, length);
+ lenIV = program.properties.privateData['lenIV'];
+ encoded = decrypt(data.getBytes(), CHAR_STRS_ENCRYPT_KEY, lenIV);
+ // Skip past the required space and binary data.
+ stream.skip(length);
+ this.nextChar();
+ token = this.getToken(); // read in 'ND' or '|-'
+ if (token === 'noaccess') {
+ this.getToken(); // read in 'def'
+ }
+ charstrings.push({
+ glyph: glyph,
+ encoded: encoded
+ });
+ }
+ break;
+ case 'Subrs':
+ var num = this.readInt();
+ this.getToken(); // read in 'array'
+ while ((token = this.getToken()) === 'dup') {
+ var index = this.readInt();
+ length = this.readInt();
+ this.getToken(); // read in 'RD' or '-|'
+ data = stream.makeSubStream(stream.pos, length);
+ lenIV = program.properties.privateData['lenIV'];
+ encoded = decrypt(data.getBytes(), CHAR_STRS_ENCRYPT_KEY, lenIV);
+ // Skip past the required space and binary data.
+ stream.skip(length);
+ this.nextChar();
+ token = this.getToken(); // read in 'NP' or '|'
+ if (token === 'noaccess') {
+ this.getToken(); // read in 'put'
+ }
+ subrs[index] = encoded;
+ }
+ break;
+ case 'BlueValues':
+ case 'OtherBlues':
+ case 'FamilyBlues':
+ case 'FamilyOtherBlues':
+ var blueArray = this.readNumberArray();
+ // *Blue* values may contain invalid data: disables reading of
+ // those values when hinting is disabled.
+ if (blueArray.length > 0 && (blueArray.length % 2) === 0 &&
+ HINTING_ENABLED) {
+ program.properties.privateData[token] = blueArray;
+ }
+ break;
+ case 'StemSnapH':
+ case 'StemSnapV':
+ program.properties.privateData[token] = this.readNumberArray();
+ break;
+ case 'StdHW':
+ case 'StdVW':
+ program.properties.privateData[token] =
+ this.readNumberArray()[0];
+ break;
+ case 'BlueShift':
+ case 'lenIV':
+ case 'BlueFuzz':
+ case 'BlueScale':
+ case 'LanguageGroup':
+ case 'ExpansionFactor':
+ program.properties.privateData[token] = this.readNumber();
+ break;
+ case 'ForceBold':
+ program.properties.privateData[token] = this.readBoolean();
+ break;
+ }
+ }
+
+ for (var i = 0; i < charstrings.length; i++) {
+ glyph = charstrings[i].glyph;
+ encoded = charstrings[i].encoded;
+ var charString = new Type1CharString();
+ var error = charString.convert(encoded, subrs);
+ var output = charString.output;
+ if (error) {
+ // It seems when FreeType encounters an error while evaluating a glyph
+ // that it completely ignores the glyph so we'll mimic that behaviour
+ // here and put an endchar to make the validator happy.
+ output = [14];
+ }
+ program.charstrings.push({
+ glyphName: glyph,
+ charstring: output,
+ width: charString.width,
+ lsb: charString.lsb,
+ seac: charString.seac
+ });
+ }
+
+ return program;
+ },
+
+ extractFontHeader: function Type1Parser_extractFontHeader(properties) {
+ var token;
+ while ((token = this.getToken()) !== null) {
+ if (token !== '/') {
+ continue;
+ }
+ token = this.getToken();
+ switch (token) {
+ case 'FontMatrix':
+ var matrix = this.readNumberArray();
+ properties.fontMatrix = matrix;
+ break;
+ case 'Encoding':
+ var encodingArg = this.getToken();
+ var encoding;
+ if (!/^\d+$/.test(encodingArg)) {
+ // encoding name is specified
+ encoding = Encodings[encodingArg];
+ } else {
+ encoding = [];
+ var size = parseInt(encodingArg, 10) | 0;
+ this.getToken(); // read in 'array'
+
+ for (var j = 0; j < size; j++) {
+ token = this.getToken();
+ // skipping till first dup or def (e.g. ignoring for statement)
+ while (token !== 'dup' && token !== 'def') {
+ token = this.getToken();
+ if (token === null) {
+ return; // invalid header
+ }
+ }
+ if (token === 'def') {
+ break; // read all array data
+ }
+ var index = this.readInt();
+ this.getToken(); // read in '/'
+ var glyph = this.getToken();
+ encoding[index] = glyph;
+ this.getToken(); // read the in 'put'
+ }
+ }
+ properties.builtInEncoding = encoding;
+ break;
+ case 'FontBBox':
+ var fontBBox = this.readNumberArray();
+ // adjusting ascent/descent
+ properties.ascent = fontBBox[3];
+ properties.descent = fontBBox[1];
+ properties.ascentScaled = true;
+ break;
+ }
+ }
+ }
+ };
+
+ return Type1Parser;
+})();
+
+/**
+ * The CFF class takes a Type1 file and wrap it into a
+ * 'Compact Font Format' which itself embed Type2 charstrings.
+ */
+var CFFStandardStrings = [
+ '.notdef', 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent',
+ 'ampersand', 'quoteright', 'parenleft', 'parenright', 'asterisk', 'plus',
+ 'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three', 'four',
+ 'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon', 'less',
+ 'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+ 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
+ 'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright', 'asciicircum',
+ 'underscore', 'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
+ 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y',
+ 'z', 'braceleft', 'bar', 'braceright', 'asciitilde', 'exclamdown', 'cent',
+ 'sterling', 'fraction', 'yen', 'florin', 'section', 'currency',
+ 'quotesingle', 'quotedblleft', 'guillemotleft', 'guilsinglleft',
+ 'guilsinglright', 'fi', 'fl', 'endash', 'dagger', 'daggerdbl',
+ 'periodcentered', 'paragraph', 'bullet', 'quotesinglbase', 'quotedblbase',
+ 'quotedblright', 'guillemotright', 'ellipsis', 'perthousand', 'questiondown',
+ 'grave', 'acute', 'circumflex', 'tilde', 'macron', 'breve', 'dotaccent',
+ 'dieresis', 'ring', 'cedilla', 'hungarumlaut', 'ogonek', 'caron', 'emdash',
+ 'AE', 'ordfeminine', 'Lslash', 'Oslash', 'OE', 'ordmasculine', 'ae',
+ 'dotlessi', 'lslash', 'oslash', 'oe', 'germandbls', 'onesuperior',
+ 'logicalnot', 'mu', 'trademark', 'Eth', 'onehalf', 'plusminus', 'Thorn',
+ 'onequarter', 'divide', 'brokenbar', 'degree', 'thorn', 'threequarters',
+ 'twosuperior', 'registered', 'minus', 'eth', 'multiply', 'threesuperior',
+ 'copyright', 'Aacute', 'Acircumflex', 'Adieresis', 'Agrave', 'Aring',
+ 'Atilde', 'Ccedilla', 'Eacute', 'Ecircumflex', 'Edieresis', 'Egrave',
+ 'Iacute', 'Icircumflex', 'Idieresis', 'Igrave', 'Ntilde', 'Oacute',
+ 'Ocircumflex', 'Odieresis', 'Ograve', 'Otilde', 'Scaron', 'Uacute',
+ 'Ucircumflex', 'Udieresis', 'Ugrave', 'Yacute', 'Ydieresis', 'Zcaron',
+ 'aacute', 'acircumflex', 'adieresis', 'agrave', 'aring', 'atilde',
+ 'ccedilla', 'eacute', 'ecircumflex', 'edieresis', 'egrave', 'iacute',
+ 'icircumflex', 'idieresis', 'igrave', 'ntilde', 'oacute', 'ocircumflex',
+ 'odieresis', 'ograve', 'otilde', 'scaron', 'uacute', 'ucircumflex',
+ 'udieresis', 'ugrave', 'yacute', 'ydieresis', 'zcaron', 'exclamsmall',
+ 'Hungarumlautsmall', 'dollaroldstyle', 'dollarsuperior', 'ampersandsmall',
+ 'Acutesmall', 'parenleftsuperior', 'parenrightsuperior', 'twodotenleader',
+ 'onedotenleader', 'zerooldstyle', 'oneoldstyle', 'twooldstyle',
+ 'threeoldstyle', 'fouroldstyle', 'fiveoldstyle', 'sixoldstyle',
+ 'sevenoldstyle', 'eightoldstyle', 'nineoldstyle', 'commasuperior',
+ 'threequartersemdash', 'periodsuperior', 'questionsmall', 'asuperior',
+ 'bsuperior', 'centsuperior', 'dsuperior', 'esuperior', 'isuperior',
+ 'lsuperior', 'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior',
+ 'tsuperior', 'ff', 'ffi', 'ffl', 'parenleftinferior', 'parenrightinferior',
+ 'Circumflexsmall', 'hyphensuperior', 'Gravesmall', 'Asmall', 'Bsmall',
+ 'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall', 'Hsmall', 'Ismall',
+ 'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall', 'Osmall', 'Psmall',
+ 'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall', 'Vsmall', 'Wsmall',
+ 'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary', 'onefitted', 'rupiah',
+ 'Tildesmall', 'exclamdownsmall', 'centoldstyle', 'Lslashsmall',
+ 'Scaronsmall', 'Zcaronsmall', 'Dieresissmall', 'Brevesmall', 'Caronsmall',
+ 'Dotaccentsmall', 'Macronsmall', 'figuredash', 'hypheninferior',
+ 'Ogoneksmall', 'Ringsmall', 'Cedillasmall', 'questiondownsmall', 'oneeighth',
+ 'threeeighths', 'fiveeighths', 'seveneighths', 'onethird', 'twothirds',
+ 'zerosuperior', 'foursuperior', 'fivesuperior', 'sixsuperior',
+ 'sevensuperior', 'eightsuperior', 'ninesuperior', 'zeroinferior',
+ 'oneinferior', 'twoinferior', 'threeinferior', 'fourinferior',
+ 'fiveinferior', 'sixinferior', 'seveninferior', 'eightinferior',
+ 'nineinferior', 'centinferior', 'dollarinferior', 'periodinferior',
+ 'commainferior', 'Agravesmall', 'Aacutesmall', 'Acircumflexsmall',
+ 'Atildesmall', 'Adieresissmall', 'Aringsmall', 'AEsmall', 'Ccedillasmall',
+ 'Egravesmall', 'Eacutesmall', 'Ecircumflexsmall', 'Edieresissmall',
+ 'Igravesmall', 'Iacutesmall', 'Icircumflexsmall', 'Idieresissmall',
+ 'Ethsmall', 'Ntildesmall', 'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall',
+ 'Otildesmall', 'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall',
+ 'Uacutesmall', 'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall',
+ 'Thornsmall', 'Ydieresissmall', '001.000', '001.001', '001.002', '001.003',
+ 'Black', 'Bold', 'Book', 'Light', 'Medium', 'Regular', 'Roman', 'Semibold'
+];
+
+// Type1Font is also a CIDFontType0.
+var Type1Font = function Type1Font(name, file, properties) {
+ // Some bad generators embed pfb file as is, we have to strip 6-byte headers.
+ // Also, length1 and length2 might be off by 6 bytes as well.
+ // http://www.math.ubc.ca/~cass/piscript/type1.pdf
+ var PFB_HEADER_SIZE = 6;
+ var headerBlockLength = properties.length1;
+ var eexecBlockLength = properties.length2;
+ var pfbHeader = file.peekBytes(PFB_HEADER_SIZE);
+ var pfbHeaderPresent = pfbHeader[0] === 0x80 && pfbHeader[1] === 0x01;
+ if (pfbHeaderPresent) {
+ file.skip(PFB_HEADER_SIZE);
+ headerBlockLength = (pfbHeader[5] << 24) | (pfbHeader[4] << 16) |
+ (pfbHeader[3] << 8) | pfbHeader[2];
+ }
+
+ // Get the data block containing glyphs and subrs informations
+ var headerBlock = new Stream(file.getBytes(headerBlockLength));
+ var headerBlockParser = new Type1Parser(headerBlock);
+ headerBlockParser.extractFontHeader(properties);
+
+ if (pfbHeaderPresent) {
+ pfbHeader = file.getBytes(PFB_HEADER_SIZE);
+ eexecBlockLength = (pfbHeader[5] << 24) | (pfbHeader[4] << 16) |
+ (pfbHeader[3] << 8) | pfbHeader[2];
+ }
+
+ // Decrypt the data blocks and retrieve it's content
+ var eexecBlock = new Stream(file.getBytes(eexecBlockLength));
+ var eexecBlockParser = new Type1Parser(eexecBlock, true);
+ var data = eexecBlockParser.extractFontProgram();
+ for (var info in data.properties) {
+ properties[info] = data.properties[info];
+ }
+
+ var charstrings = data.charstrings;
+ var type2Charstrings = this.getType2Charstrings(charstrings);
+ var subrs = this.getType2Subrs(data.subrs);
+
+ this.charstrings = charstrings;
+ this.data = this.wrap(name, type2Charstrings, this.charstrings,
+ subrs, properties);
+ this.seacs = this.getSeacs(data.charstrings);
+};
+
+Type1Font.prototype = {
+ get numGlyphs() {
+ return this.charstrings.length + 1;
+ },
+
+ getCharset: function Type1Font_getCharset() {
+ var charset = ['.notdef'];
+ var charstrings = this.charstrings;
+ for (var glyphId = 0; glyphId < charstrings.length; glyphId++) {
+ charset.push(charstrings[glyphId].glyphName);
+ }
+ return charset;
+ },
+
+ getGlyphMapping: function Type1Font_getGlyphMapping(properties) {
+ var charstrings = this.charstrings;
+ var glyphNames = ['.notdef'], glyphId;
+ for (glyphId = 0; glyphId < charstrings.length; glyphId++) {
+ glyphNames.push(charstrings[glyphId].glyphName);
+ }
+ var encoding = properties.builtInEncoding;
+ if (encoding) {
+ var builtInEncoding = {};
+ for (var charCode in encoding) {
+ glyphId = glyphNames.indexOf(encoding[charCode]);
+ if (glyphId >= 0) {
+ builtInEncoding[charCode] = glyphId;
+ }
+ }
+ }
+
+ return type1FontGlyphMapping(properties, builtInEncoding, glyphNames);
+ },
+
+ getSeacs: function Type1Font_getSeacs(charstrings) {
+ var i, ii;
+ var seacMap = [];
+ for (i = 0, ii = charstrings.length; i < ii; i++) {
+ var charstring = charstrings[i];
+ if (charstring.seac) {
+ // Offset by 1 for .notdef
+ seacMap[i + 1] = charstring.seac;
+ }
+ }
+ return seacMap;
+ },
+
+ getType2Charstrings: function Type1Font_getType2Charstrings(
+ type1Charstrings) {
+ var type2Charstrings = [];
+ for (var i = 0, ii = type1Charstrings.length; i < ii; i++) {
+ type2Charstrings.push(type1Charstrings[i].charstring);
+ }
+ return type2Charstrings;
+ },
+
+ getType2Subrs: function Type1Font_getType2Subrs(type1Subrs) {
+ var bias = 0;
+ var count = type1Subrs.length;
+ if (count < 1133) {
+ bias = 107;
+ } else if (count < 33769) {
+ bias = 1131;
+ } else {
+ bias = 32768;
+ }
+
+ // Add a bunch of empty subrs to deal with the Type2 bias
+ var type2Subrs = [];
+ var i;
+ for (i = 0; i < bias; i++) {
+ type2Subrs.push([0x0B]);
+ }
+
+ for (i = 0; i < count; i++) {
+ type2Subrs.push(type1Subrs[i]);
+ }
+
+ return type2Subrs;
+ },
+
+ wrap: function Type1Font_wrap(name, glyphs, charstrings, subrs, properties) {
+ var cff = new CFF();
+ cff.header = new CFFHeader(1, 0, 4, 4);
+
+ cff.names = [name];
+
+ var topDict = new CFFTopDict();
+ // CFF strings IDs 0...390 are predefined names, so refering
+ // to entries in our own String INDEX starts at SID 391.
+ topDict.setByName('version', 391);
+ topDict.setByName('Notice', 392);
+ topDict.setByName('FullName', 393);
+ topDict.setByName('FamilyName', 394);
+ topDict.setByName('Weight', 395);
+ topDict.setByName('Encoding', null); // placeholder
+ topDict.setByName('FontMatrix', properties.fontMatrix);
+ topDict.setByName('FontBBox', properties.bbox);
+ topDict.setByName('charset', null); // placeholder
+ topDict.setByName('CharStrings', null); // placeholder
+ topDict.setByName('Private', null); // placeholder
+ cff.topDict = topDict;
+
+ var strings = new CFFStrings();
+ strings.add('Version 0.11'); // Version
+ strings.add('See original notice'); // Notice
+ strings.add(name); // FullName
+ strings.add(name); // FamilyName
+ strings.add('Medium'); // Weight
+ cff.strings = strings;
+
+ cff.globalSubrIndex = new CFFIndex();
+
+ var count = glyphs.length;
+ var charsetArray = [0];
+ var i, ii;
+ for (i = 0; i < count; i++) {
+ var index = CFFStandardStrings.indexOf(charstrings[i].glyphName);
+ // TODO: Insert the string and correctly map it. Previously it was
+ // thought mapping names that aren't in the standard strings to .notdef
+ // was fine, however in issue818 when mapping them all to .notdef the
+ // adieresis glyph no longer worked.
+ if (index === -1) {
+ index = 0;
+ }
+ charsetArray.push((index >> 8) & 0xff, index & 0xff);
+ }
+ cff.charset = new CFFCharset(false, 0, [], charsetArray);
+
+ var charStringsIndex = new CFFIndex();
+ charStringsIndex.add([0x8B, 0x0E]); // .notdef
+ for (i = 0; i < count; i++) {
+ charStringsIndex.add(glyphs[i]);
+ }
+ cff.charStrings = charStringsIndex;
+
+ var privateDict = new CFFPrivateDict();
+ privateDict.setByName('Subrs', null); // placeholder
+ var fields = [
+ 'BlueValues',
+ 'OtherBlues',
+ 'FamilyBlues',
+ 'FamilyOtherBlues',
+ 'StemSnapH',
+ 'StemSnapV',
+ 'BlueShift',
+ 'BlueFuzz',
+ 'BlueScale',
+ 'LanguageGroup',
+ 'ExpansionFactor',
+ 'ForceBold',
+ 'StdHW',
+ 'StdVW'
+ ];
+ for (i = 0, ii = fields.length; i < ii; i++) {
+ var field = fields[i];
+ if (!properties.privateData.hasOwnProperty(field)) {
+ continue;
+ }
+ var value = properties.privateData[field];
+ if (isArray(value)) {
+ // All of the private dictionary array data in CFF must be stored as
+ // "delta-encoded" numbers.
+ for (var j = value.length - 1; j > 0; j--) {
+ value[j] -= value[j - 1]; // ... difference from previous value
+ }
+ }
+ privateDict.setByName(field, value);
+ }
+ cff.topDict.privateDict = privateDict;
+
+ var subrIndex = new CFFIndex();
+ for (i = 0, ii = subrs.length; i < ii; i++) {
+ subrIndex.add(subrs[i]);
+ }
+ privateDict.subrsIndex = subrIndex;
+
+ var compiler = new CFFCompiler(cff);
+ return compiler.compile();
+ }
+};
+
+var CFFFont = (function CFFFontClosure() {
+ function CFFFont(file, properties) {
+ this.properties = properties;
+
+ var parser = new CFFParser(file, properties);
+ this.cff = parser.parse();
+ var compiler = new CFFCompiler(this.cff);
+ this.seacs = this.cff.seacs;
+ try {
+ this.data = compiler.compile();
+ } catch (e) {
+ warn('Failed to compile font ' + properties.loadedName);
+ // There may have just been an issue with the compiler, set the data
+ // anyway and hope the font loaded.
+ this.data = file;
+ }
+ }
+
+ CFFFont.prototype = {
+ get numGlyphs() {
+ return this.cff.charStrings.count;
+ },
+ getCharset: function CFFFont_getCharset() {
+ return this.cff.charset.charset;
+ },
+ getGlyphMapping: function CFFFont_getGlyphMapping() {
+ var cff = this.cff;
+ var properties = this.properties;
+ var charsets = cff.charset.charset;
+ var charCodeToGlyphId;
+ var glyphId;
+
+ if (properties.composite) {
+ charCodeToGlyphId = Object.create(null);
+ if (cff.isCIDFont) {
+ // If the font is actually a CID font then we should use the charset
+ // to map CIDs to GIDs.
+ for (glyphId = 0; glyphId < charsets.length; glyphId++) {
+ var cid = charsets[glyphId];
+ var charCode = properties.cMap.charCodeOf(cid);
+ charCodeToGlyphId[charCode] = glyphId;
+ }
+ } else {
+ // If it is NOT actually a CID font then CIDs should be mapped
+ // directly to GIDs.
+ for (glyphId = 0; glyphId < cff.charStrings.count; glyphId++) {
+ charCodeToGlyphId[glyphId] = glyphId;
+ }
+ }
+ return charCodeToGlyphId;
+ }
+
+ var encoding = cff.encoding ? cff.encoding.encoding : null;
+ charCodeToGlyphId = type1FontGlyphMapping(properties, encoding, charsets);
+ return charCodeToGlyphId;
+ }
+ };
+
+ return CFFFont;
+})();
+
+var CFFParser = (function CFFParserClosure() {
+ var CharstringValidationData = [
+ null,
+ { id: 'hstem', min: 2, stackClearing: true, stem: true },
+ null,
+ { id: 'vstem', min: 2, stackClearing: true, stem: true },
+ { id: 'vmoveto', min: 1, stackClearing: true },
+ { id: 'rlineto', min: 2, resetStack: true },
+ { id: 'hlineto', min: 1, resetStack: true },
+ { id: 'vlineto', min: 1, resetStack: true },
+ { id: 'rrcurveto', min: 6, resetStack: true },
+ null,
+ { id: 'callsubr', min: 1, undefStack: true },
+ { id: 'return', min: 0, undefStack: true },
+ null, // 12
+ null,
+ { id: 'endchar', min: 0, stackClearing: true },
+ null,
+ null,
+ null,
+ { id: 'hstemhm', min: 2, stackClearing: true, stem: true },
+ { id: 'hintmask', min: 0, stackClearing: true },
+ { id: 'cntrmask', min: 0, stackClearing: true },
+ { id: 'rmoveto', min: 2, stackClearing: true },
+ { id: 'hmoveto', min: 1, stackClearing: true },
+ { id: 'vstemhm', min: 2, stackClearing: true, stem: true },
+ { id: 'rcurveline', min: 8, resetStack: true },
+ { id: 'rlinecurve', min: 8, resetStack: true },
+ { id: 'vvcurveto', min: 4, resetStack: true },
+ { id: 'hhcurveto', min: 4, resetStack: true },
+ null, // shortint
+ { id: 'callgsubr', min: 1, undefStack: true },
+ { id: 'vhcurveto', min: 4, resetStack: true },
+ { id: 'hvcurveto', min: 4, resetStack: true }
+ ];
+ var CharstringValidationData12 = [
+ null,
+ null,
+ null,
+ { id: 'and', min: 2, stackDelta: -1 },
+ { id: 'or', min: 2, stackDelta: -1 },
+ { id: 'not', min: 1, stackDelta: 0 },
+ null,
+ null,
+ null,
+ { id: 'abs', min: 1, stackDelta: 0 },
+ { id: 'add', min: 2, stackDelta: -1,
+ stackFn: function stack_div(stack, index) {
+ stack[index - 2] = stack[index - 2] + stack[index - 1];
+ }
+ },
+ { id: 'sub', min: 2, stackDelta: -1,
+ stackFn: function stack_div(stack, index) {
+ stack[index - 2] = stack[index - 2] - stack[index - 1];
+ }
+ },
+ { id: 'div', min: 2, stackDelta: -1,
+ stackFn: function stack_div(stack, index) {
+ stack[index - 2] = stack[index - 2] / stack[index - 1];
+ }
+ },
+ null,
+ { id: 'neg', min: 1, stackDelta: 0,
+ stackFn: function stack_div(stack, index) {
+ stack[index - 1] = -stack[index - 1];
+ }
+ },
+ { id: 'eq', min: 2, stackDelta: -1 },
+ null,
+ null,
+ { id: 'drop', min: 1, stackDelta: -1 },
+ null,
+ { id: 'put', min: 2, stackDelta: -2 },
+ { id: 'get', min: 1, stackDelta: 0 },
+ { id: 'ifelse', min: 4, stackDelta: -3 },
+ { id: 'random', min: 0, stackDelta: 1 },
+ { id: 'mul', min: 2, stackDelta: -1,
+ stackFn: function stack_div(stack, index) {
+ stack[index - 2] = stack[index - 2] * stack[index - 1];
+ }
+ },
+ null,
+ { id: 'sqrt', min: 1, stackDelta: 0 },
+ { id: 'dup', min: 1, stackDelta: 1 },
+ { id: 'exch', min: 2, stackDelta: 0 },
+ { id: 'index', min: 2, stackDelta: 0 },
+ { id: 'roll', min: 3, stackDelta: -2 },
+ null,
+ null,
+ null,
+ { id: 'hflex', min: 7, resetStack: true },
+ { id: 'flex', min: 13, resetStack: true },
+ { id: 'hflex1', min: 9, resetStack: true },
+ { id: 'flex1', min: 11, resetStack: true }
+ ];
+
+ function CFFParser(file, properties) {
+ this.bytes = file.getBytes();
+ this.properties = properties;
+ }
+ CFFParser.prototype = {
+ parse: function CFFParser_parse() {
+ var properties = this.properties;
+ var cff = new CFF();
+ this.cff = cff;
+
+ // The first five sections must be in order, all the others are reached
+ // via offsets contained in one of the below.
+ var header = this.parseHeader();
+ var nameIndex = this.parseIndex(header.endPos);
+ var topDictIndex = this.parseIndex(nameIndex.endPos);
+ var stringIndex = this.parseIndex(topDictIndex.endPos);
+ var globalSubrIndex = this.parseIndex(stringIndex.endPos);
+
+ var topDictParsed = this.parseDict(topDictIndex.obj.get(0));
+ var topDict = this.createDict(CFFTopDict, topDictParsed, cff.strings);
+
+ cff.header = header.obj;
+ cff.names = this.parseNameIndex(nameIndex.obj);
+ cff.strings = this.parseStringIndex(stringIndex.obj);
+ cff.topDict = topDict;
+ cff.globalSubrIndex = globalSubrIndex.obj;
+
+ this.parsePrivateDict(cff.topDict);
+
+ cff.isCIDFont = topDict.hasName('ROS');
+
+ var charStringOffset = topDict.getByName('CharStrings');
+ var charStringsAndSeacs = this.parseCharStrings(charStringOffset);
+ cff.charStrings = charStringsAndSeacs.charStrings;
+ cff.seacs = charStringsAndSeacs.seacs;
+ cff.widths = charStringsAndSeacs.widths;
+
+ var fontMatrix = topDict.getByName('FontMatrix');
+ if (fontMatrix) {
+ properties.fontMatrix = fontMatrix;
+ }
+
+ var fontBBox = topDict.getByName('FontBBox');
+ if (fontBBox) {
+ // adjusting ascent/descent
+ properties.ascent = fontBBox[3];
+ properties.descent = fontBBox[1];
+ properties.ascentScaled = true;
+ }
+
+ var charset, encoding;
+ if (cff.isCIDFont) {
+ var fdArrayIndex = this.parseIndex(topDict.getByName('FDArray')).obj;
+ for (var i = 0, ii = fdArrayIndex.count; i < ii; ++i) {
+ var dictRaw = fdArrayIndex.get(i);
+ var fontDict = this.createDict(CFFTopDict, this.parseDict(dictRaw),
+ cff.strings);
+ this.parsePrivateDict(fontDict);
+ cff.fdArray.push(fontDict);
+ }
+ // cid fonts don't have an encoding
+ encoding = null;
+ charset = this.parseCharsets(topDict.getByName('charset'),
+ cff.charStrings.count, cff.strings, true);
+ cff.fdSelect = this.parseFDSelect(topDict.getByName('FDSelect'),
+ cff.charStrings.count);
+ } else {
+ charset = this.parseCharsets(topDict.getByName('charset'),
+ cff.charStrings.count, cff.strings, false);
+ encoding = this.parseEncoding(topDict.getByName('Encoding'),
+ properties,
+ cff.strings, charset.charset);
+ }
+ cff.charset = charset;
+ cff.encoding = encoding;
+
+ return cff;
+ },
+ parseHeader: function CFFParser_parseHeader() {
+ var bytes = this.bytes;
+ var bytesLength = bytes.length;
+ var offset = 0;
+
+ // Prevent an infinite loop, by checking that the offset is within the
+ // bounds of the bytes array. Necessary in empty, or invalid, font files.
+ while (offset < bytesLength && bytes[offset] !== 1) {
+ ++offset;
+ }
+ if (offset >= bytesLength) {
+ error('Invalid CFF header');
+ } else if (offset !== 0) {
+ info('cff data is shifted');
+ bytes = bytes.subarray(offset);
+ this.bytes = bytes;
+ }
+ var major = bytes[0];
+ var minor = bytes[1];
+ var hdrSize = bytes[2];
+ var offSize = bytes[3];
+ var header = new CFFHeader(major, minor, hdrSize, offSize);
+ return { obj: header, endPos: hdrSize };
+ },
+ parseDict: function CFFParser_parseDict(dict) {
+ var pos = 0;
+
+ function parseOperand() {
+ var value = dict[pos++];
+ if (value === 30) {
+ return parseFloatOperand(pos);
+ } else if (value === 28) {
+ value = dict[pos++];
+ value = ((value << 24) | (dict[pos++] << 16)) >> 16;
+ return value;
+ } else if (value === 29) {
+ value = dict[pos++];
+ value = (value << 8) | dict[pos++];
+ value = (value << 8) | dict[pos++];
+ value = (value << 8) | dict[pos++];
+ return value;
+ } else if (value >= 32 && value <= 246) {
+ return value - 139;
+ } else if (value >= 247 && value <= 250) {
+ return ((value - 247) * 256) + dict[pos++] + 108;
+ } else if (value >= 251 && value <= 254) {
+ return -((value - 251) * 256) - dict[pos++] - 108;
+ } else {
+ error('255 is not a valid DICT command');
+ }
+ return -1;
+ }
+
+ function parseFloatOperand() {
+ var str = '';
+ var eof = 15;
+ var lookup = ['0', '1', '2', '3', '4', '5', '6', '7', '8',
+ '9', '.', 'E', 'E-', null, '-'];
+ var length = dict.length;
+ while (pos < length) {
+ var b = dict[pos++];
+ var b1 = b >> 4;
+ var b2 = b & 15;
+
+ if (b1 === eof) {
+ break;
+ }
+ str += lookup[b1];
+
+ if (b2 === eof) {
+ break;
+ }
+ str += lookup[b2];
+ }
+ return parseFloat(str);
+ }
+
+ var operands = [];
+ var entries = [];
+
+ pos = 0;
+ var end = dict.length;
+ while (pos < end) {
+ var b = dict[pos];
+ if (b <= 21) {
+ if (b === 12) {
+ b = (b << 8) | dict[++pos];
+ }
+ entries.push([b, operands]);
+ operands = [];
+ ++pos;
+ } else {
+ operands.push(parseOperand());
+ }
+ }
+ return entries;
+ },
+ parseIndex: function CFFParser_parseIndex(pos) {
+ var cffIndex = new CFFIndex();
+ var bytes = this.bytes;
+ var count = (bytes[pos++] << 8) | bytes[pos++];
+ var offsets = [];
+ var end = pos;
+ var i, ii;
+
+ if (count !== 0) {
+ var offsetSize = bytes[pos++];
+ // add 1 for offset to determine size of last object
+ var startPos = pos + ((count + 1) * offsetSize) - 1;
+
+ for (i = 0, ii = count + 1; i < ii; ++i) {
+ var offset = 0;
+ for (var j = 0; j < offsetSize; ++j) {
+ offset <<= 8;
+ offset += bytes[pos++];
+ }
+ offsets.push(startPos + offset);
+ }
+ end = offsets[count];
+ }
+ for (i = 0, ii = offsets.length - 1; i < ii; ++i) {
+ var offsetStart = offsets[i];
+ var offsetEnd = offsets[i + 1];
+ cffIndex.add(bytes.subarray(offsetStart, offsetEnd));
+ }
+ return {obj: cffIndex, endPos: end};
+ },
+ parseNameIndex: function CFFParser_parseNameIndex(index) {
+ var names = [];
+ for (var i = 0, ii = index.count; i < ii; ++i) {
+ var name = index.get(i);
+ // OTS doesn't allow names to be over 127 characters.
+ var length = Math.min(name.length, 127);
+ var data = [];
+ // OTS also only permits certain characters in the name.
+ for (var j = 0; j < length; ++j) {
+ var c = name[j];
+ if (j === 0 && c === 0) {
+ data[j] = c;
+ continue;
+ }
+ if ((c < 33 || c > 126) || c === 91 /* [ */ || c === 93 /* ] */ ||
+ c === 40 /* ( */ || c === 41 /* ) */ || c === 123 /* { */ ||
+ c === 125 /* } */ || c === 60 /* < */ || c === 62 /* > */ ||
+ c === 47 /* / */ || c === 37 /* % */ || c === 35 /* # */) {
+ data[j] = 95;
+ continue;
+ }
+ data[j] = c;
+ }
+ names.push(bytesToString(data));
+ }
+ return names;
+ },
+ parseStringIndex: function CFFParser_parseStringIndex(index) {
+ var strings = new CFFStrings();
+ for (var i = 0, ii = index.count; i < ii; ++i) {
+ var data = index.get(i);
+ strings.add(bytesToString(data));
+ }
+ return strings;
+ },
+ createDict: function CFFParser_createDict(Type, dict, strings) {
+ var cffDict = new Type(strings);
+ for (var i = 0, ii = dict.length; i < ii; ++i) {
+ var pair = dict[i];
+ var key = pair[0];
+ var value = pair[1];
+ cffDict.setByKey(key, value);
+ }
+ return cffDict;
+ },
+ parseCharStrings: function CFFParser_parseCharStrings(charStringOffset) {
+ var charStrings = this.parseIndex(charStringOffset).obj;
+ var seacs = [];
+ var widths = [];
+ var count = charStrings.count;
+ for (var i = 0; i < count; i++) {
+ var charstring = charStrings.get(i);
+
+ var stackSize = 0;
+ var stack = [];
+ var undefStack = true;
+ var hints = 0;
+ var valid = true;
+ var data = charstring;
+ var length = data.length;
+ var firstStackClearing = true;
+ for (var j = 0; j < length;) {
+ var value = data[j++];
+ var validationCommand = null;
+ if (value === 12) {
+ var q = data[j++];
+ if (q === 0) {
+ // The CFF specification state that the 'dotsection' command
+ // (12, 0) is deprecated and treated as a no-op, but all Type2
+ // charstrings processors should support them. Unfortunately
+ // the font sanitizer don't. As a workaround the sequence (12, 0)
+ // is replaced by a useless (0, hmoveto).
+ data[j - 2] = 139;
+ data[j - 1] = 22;
+ stackSize = 0;
+ } else {
+ validationCommand = CharstringValidationData12[q];
+ }
+ } else if (value === 28) { // number (16 bit)
+ stack[stackSize] = ((data[j] << 24) | (data[j + 1] << 16)) >> 16;
+ j += 2;
+ stackSize++;
+ } else if (value === 14) {
+ if (stackSize >= 4) {
+ stackSize -= 4;
+ if (SEAC_ANALYSIS_ENABLED) {
+ seacs[i] = stack.slice(stackSize, stackSize + 4);
+ valid = false;
+ }
+ }
+ validationCommand = CharstringValidationData[value];
+ } else if (value >= 32 && value <= 246) { // number
+ stack[stackSize] = value - 139;
+ stackSize++;
+ } else if (value >= 247 && value <= 254) { // number (+1 bytes)
+ stack[stackSize] = (value < 251 ?
+ ((value - 247) << 8) + data[j] + 108 :
+ -((value - 251) << 8) - data[j] - 108);
+ j++;
+ stackSize++;
+ } else if (value === 255) { // number (32 bit)
+ stack[stackSize] = ((data[j] << 24) | (data[j + 1] << 16) |
+ (data[j + 2] << 8) | data[j + 3]) / 65536;
+ j += 4;
+ stackSize++;
+ } else if (value === 19 || value === 20) {
+ hints += stackSize >> 1;
+ j += (hints + 7) >> 3; // skipping right amount of hints flag data
+ stackSize %= 2;
+ validationCommand = CharstringValidationData[value];
+ } else {
+ validationCommand = CharstringValidationData[value];
+ }
+ if (validationCommand) {
+ if (validationCommand.stem) {
+ hints += stackSize >> 1;
+ }
+ if ('min' in validationCommand) {
+ if (!undefStack && stackSize < validationCommand.min) {
+ warn('Not enough parameters for ' + validationCommand.id +
+ '; actual: ' + stackSize +
+ ', expected: ' + validationCommand.min);
+ valid = false;
+ break;
+ }
+ }
+ if (firstStackClearing && validationCommand.stackClearing) {
+ firstStackClearing = false;
+ // the optional character width can be found before the first
+ // stack-clearing command arguments
+ stackSize -= validationCommand.min;
+ if (stackSize >= 2 && validationCommand.stem) {
+ // there are even amount of arguments for stem commands
+ stackSize %= 2;
+ } else if (stackSize > 1) {
+ warn('Found too many parameters for stack-clearing command');
+ }
+ if (stackSize > 0 && stack[stackSize - 1] >= 0) {
+ widths[i] = stack[stackSize - 1];
+ }
+ }
+ if ('stackDelta' in validationCommand) {
+ if ('stackFn' in validationCommand) {
+ validationCommand.stackFn(stack, stackSize);
+ }
+ stackSize += validationCommand.stackDelta;
+ } else if (validationCommand.stackClearing) {
+ stackSize = 0;
+ } else if (validationCommand.resetStack) {
+ stackSize = 0;
+ undefStack = false;
+ } else if (validationCommand.undefStack) {
+ stackSize = 0;
+ undefStack = true;
+ firstStackClearing = false;
+ }
+ }
+ }
+ if (!valid) {
+ // resetting invalid charstring to single 'endchar'
+ charStrings.set(i, new Uint8Array([14]));
+ }
+ }
+ return { charStrings: charStrings, seacs: seacs, widths: widths };
+ },
+ emptyPrivateDictionary:
+ function CFFParser_emptyPrivateDictionary(parentDict) {
+ var privateDict = this.createDict(CFFPrivateDict, [],
+ parentDict.strings);
+ parentDict.setByKey(18, [0, 0]);
+ parentDict.privateDict = privateDict;
+ },
+ parsePrivateDict: function CFFParser_parsePrivateDict(parentDict) {
+ // no private dict, do nothing
+ if (!parentDict.hasName('Private')) {
+ this.emptyPrivateDictionary(parentDict);
+ return;
+ }
+ var privateOffset = parentDict.getByName('Private');
+ // make sure the params are formatted correctly
+ if (!isArray(privateOffset) || privateOffset.length !== 2) {
+ parentDict.removeByName('Private');
+ return;
+ }
+ var size = privateOffset[0];
+ var offset = privateOffset[1];
+ // remove empty dicts or ones that refer to invalid location
+ if (size === 0 || offset >= this.bytes.length) {
+ this.emptyPrivateDictionary(parentDict);
+ return;
+ }
+
+ var privateDictEnd = offset + size;
+ var dictData = this.bytes.subarray(offset, privateDictEnd);
+ var dict = this.parseDict(dictData);
+ var privateDict = this.createDict(CFFPrivateDict, dict,
+ parentDict.strings);
+ parentDict.privateDict = privateDict;
+
+ // Parse the Subrs index also since it's relative to the private dict.
+ if (!privateDict.getByName('Subrs')) {
+ return;
+ }
+ var subrsOffset = privateDict.getByName('Subrs');
+ var relativeOffset = offset + subrsOffset;
+ // Validate the offset.
+ if (subrsOffset === 0 || relativeOffset >= this.bytes.length) {
+ this.emptyPrivateDictionary(parentDict);
+ return;
+ }
+ var subrsIndex = this.parseIndex(relativeOffset);
+ privateDict.subrsIndex = subrsIndex.obj;
+ },
+ parseCharsets: function CFFParser_parseCharsets(pos, length, strings, cid) {
+ if (pos === 0) {
+ return new CFFCharset(true, CFFCharsetPredefinedTypes.ISO_ADOBE,
+ ISOAdobeCharset);
+ } else if (pos === 1) {
+ return new CFFCharset(true, CFFCharsetPredefinedTypes.EXPERT,
+ ExpertCharset);
+ } else if (pos === 2) {
+ return new CFFCharset(true, CFFCharsetPredefinedTypes.EXPERT_SUBSET,
+ ExpertSubsetCharset);
+ }
+
+ var bytes = this.bytes;
+ var start = pos;
+ var format = bytes[pos++];
+ var charset = ['.notdef'];
+ var id, count, i;
+
+ // subtract 1 for the .notdef glyph
+ length -= 1;
+
+ switch (format) {
+ case 0:
+ for (i = 0; i < length; i++) {
+ id = (bytes[pos++] << 8) | bytes[pos++];
+ charset.push(cid ? id : strings.get(id));
+ }
+ break;
+ case 1:
+ while (charset.length <= length) {
+ id = (bytes[pos++] << 8) | bytes[pos++];
+ count = bytes[pos++];
+ for (i = 0; i <= count; i++) {
+ charset.push(cid ? id++ : strings.get(id++));
+ }
+ }
+ break;
+ case 2:
+ while (charset.length <= length) {
+ id = (bytes[pos++] << 8) | bytes[pos++];
+ count = (bytes[pos++] << 8) | bytes[pos++];
+ for (i = 0; i <= count; i++) {
+ charset.push(cid ? id++ : strings.get(id++));
+ }
+ }
+ break;
+ default:
+ error('Unknown charset format');
+ }
+ // Raw won't be needed if we actually compile the charset.
+ var end = pos;
+ var raw = bytes.subarray(start, end);
+
+ return new CFFCharset(false, format, charset, raw);
+ },
+ parseEncoding: function CFFParser_parseEncoding(pos,
+ properties,
+ strings,
+ charset) {
+ var encoding = {};
+ var bytes = this.bytes;
+ var predefined = false;
+ var hasSupplement = false;
+ var format, i, ii;
+ var raw = null;
+
+ function readSupplement() {
+ var supplementsCount = bytes[pos++];
+ for (i = 0; i < supplementsCount; i++) {
+ var code = bytes[pos++];
+ var sid = (bytes[pos++] << 8) + (bytes[pos++] & 0xff);
+ encoding[code] = charset.indexOf(strings.get(sid));
+ }
+ }
+
+ if (pos === 0 || pos === 1) {
+ predefined = true;
+ format = pos;
+ var baseEncoding = pos ? Encodings.ExpertEncoding :
+ Encodings.StandardEncoding;
+ for (i = 0, ii = charset.length; i < ii; i++) {
+ var index = baseEncoding.indexOf(charset[i]);
+ if (index !== -1) {
+ encoding[index] = i;
+ }
+ }
+ } else {
+ var dataStart = pos;
+ format = bytes[pos++];
+ switch (format & 0x7f) {
+ case 0:
+ var glyphsCount = bytes[pos++];
+ for (i = 1; i <= glyphsCount; i++) {
+ encoding[bytes[pos++]] = i;
+ }
+ break;
+
+ case 1:
+ var rangesCount = bytes[pos++];
+ var gid = 1;
+ for (i = 0; i < rangesCount; i++) {
+ var start = bytes[pos++];
+ var left = bytes[pos++];
+ for (var j = start; j <= start + left; j++) {
+ encoding[j] = gid++;
+ }
+ }
+ break;
+
+ default:
+ error('Unknow encoding format: ' + format + ' in CFF');
+ break;
+ }
+ var dataEnd = pos;
+ if (format & 0x80) {
+ // The font sanitizer does not support CFF encoding with a
+ // supplement, since the encoding is not really used to map
+ // between gid to glyph, let's overwrite what is declared in
+ // the top dictionary to let the sanitizer think the font use
+ // StandardEncoding, that's a lie but that's ok.
+ bytes[dataStart] &= 0x7f;
+ readSupplement();
+ hasSupplement = true;
+ }
+ raw = bytes.subarray(dataStart, dataEnd);
+ }
+ format = format & 0x7f;
+ return new CFFEncoding(predefined, format, encoding, raw);
+ },
+ parseFDSelect: function CFFParser_parseFDSelect(pos, length) {
+ var start = pos;
+ var bytes = this.bytes;
+ var format = bytes[pos++];
+ var fdSelect = [];
+ var i;
+
+ switch (format) {
+ case 0:
+ for (i = 0; i < length; ++i) {
+ var id = bytes[pos++];
+ fdSelect.push(id);
+ }
+ break;
+ case 3:
+ var rangesCount = (bytes[pos++] << 8) | bytes[pos++];
+ for (i = 0; i < rangesCount; ++i) {
+ var first = (bytes[pos++] << 8) | bytes[pos++];
+ var fdIndex = bytes[pos++];
+ var next = (bytes[pos] << 8) | bytes[pos + 1];
+ for (var j = first; j < next; ++j) {
+ fdSelect.push(fdIndex);
+ }
+ }
+ // Advance past the sentinel(next).
+ pos += 2;
+ break;
+ default:
+ error('Unknown fdselect format ' + format);
+ break;
+ }
+ var end = pos;
+ return new CFFFDSelect(fdSelect, bytes.subarray(start, end));
+ }
+ };
+ return CFFParser;
+})();
+
+// Compact Font Format
+var CFF = (function CFFClosure() {
+ function CFF() {
+ this.header = null;
+ this.names = [];
+ this.topDict = null;
+ this.strings = new CFFStrings();
+ this.globalSubrIndex = null;
+
+ // The following could really be per font, but since we only have one font
+ // store them here.
+ this.encoding = null;
+ this.charset = null;
+ this.charStrings = null;
+ this.fdArray = [];
+ this.fdSelect = null;
+
+ this.isCIDFont = false;
+ }
+ return CFF;
+})();
+
+var CFFHeader = (function CFFHeaderClosure() {
+ function CFFHeader(major, minor, hdrSize, offSize) {
+ this.major = major;
+ this.minor = minor;
+ this.hdrSize = hdrSize;
+ this.offSize = offSize;
+ }
+ return CFFHeader;
+})();
+
+var CFFStrings = (function CFFStringsClosure() {
+ function CFFStrings() {
+ this.strings = [];
+ }
+ CFFStrings.prototype = {
+ get: function CFFStrings_get(index) {
+ if (index >= 0 && index <= 390) {
+ return CFFStandardStrings[index];
+ }
+ if (index - 391 <= this.strings.length) {
+ return this.strings[index - 391];
+ }
+ return CFFStandardStrings[0];
+ },
+ add: function CFFStrings_add(value) {
+ this.strings.push(value);
+ },
+ get count() {
+ return this.strings.length;
+ }
+ };
+ return CFFStrings;
+})();
+
+var CFFIndex = (function CFFIndexClosure() {
+ function CFFIndex() {
+ this.objects = [];
+ this.length = 0;
+ }
+ CFFIndex.prototype = {
+ add: function CFFIndex_add(data) {
+ this.length += data.length;
+ this.objects.push(data);
+ },
+ set: function CFFIndex_set(index, data) {
+ this.length += data.length - this.objects[index].length;
+ this.objects[index] = data;
+ },
+ get: function CFFIndex_get(index) {
+ return this.objects[index];
+ },
+ get count() {
+ return this.objects.length;
+ }
+ };
+ return CFFIndex;
+})();
+
+var CFFDict = (function CFFDictClosure() {
+ function CFFDict(tables, strings) {
+ this.keyToNameMap = tables.keyToNameMap;
+ this.nameToKeyMap = tables.nameToKeyMap;
+ this.defaults = tables.defaults;
+ this.types = tables.types;
+ this.opcodes = tables.opcodes;
+ this.order = tables.order;
+ this.strings = strings;
+ this.values = {};
+ }
+ CFFDict.prototype = {
+ // value should always be an array
+ setByKey: function CFFDict_setByKey(key, value) {
+ if (!(key in this.keyToNameMap)) {
+ return false;
+ }
+ // ignore empty values
+ if (value.length === 0) {
+ return true;
+ }
+ var type = this.types[key];
+ // remove the array wrapping these types of values
+ if (type === 'num' || type === 'sid' || type === 'offset') {
+ value = value[0];
+ }
+ this.values[key] = value;
+ return true;
+ },
+ setByName: function CFFDict_setByName(name, value) {
+ if (!(name in this.nameToKeyMap)) {
+ error('Invalid dictionary name "' + name + '"');
+ }
+ this.values[this.nameToKeyMap[name]] = value;
+ },
+ hasName: function CFFDict_hasName(name) {
+ return this.nameToKeyMap[name] in this.values;
+ },
+ getByName: function CFFDict_getByName(name) {
+ if (!(name in this.nameToKeyMap)) {
+ error('Invalid dictionary name "' + name + '"');
+ }
+ var key = this.nameToKeyMap[name];
+ if (!(key in this.values)) {
+ return this.defaults[key];
+ }
+ return this.values[key];
+ },
+ removeByName: function CFFDict_removeByName(name) {
+ delete this.values[this.nameToKeyMap[name]];
+ }
+ };
+ CFFDict.createTables = function CFFDict_createTables(layout) {
+ var tables = {
+ keyToNameMap: {},
+ nameToKeyMap: {},
+ defaults: {},
+ types: {},
+ opcodes: {},
+ order: []
+ };
+ for (var i = 0, ii = layout.length; i < ii; ++i) {
+ var entry = layout[i];
+ var key = isArray(entry[0]) ? (entry[0][0] << 8) + entry[0][1] : entry[0];
+ tables.keyToNameMap[key] = entry[1];
+ tables.nameToKeyMap[entry[1]] = key;
+ tables.types[key] = entry[2];
+ tables.defaults[key] = entry[3];
+ tables.opcodes[key] = isArray(entry[0]) ? entry[0] : [entry[0]];
+ tables.order.push(key);
+ }
+ return tables;
+ };
+ return CFFDict;
+})();
+
+var CFFTopDict = (function CFFTopDictClosure() {
+ var layout = [
+ [[12, 30], 'ROS', ['sid', 'sid', 'num'], null],
+ [[12, 20], 'SyntheticBase', 'num', null],
+ [0, 'version', 'sid', null],
+ [1, 'Notice', 'sid', null],
+ [[12, 0], 'Copyright', 'sid', null],
+ [2, 'FullName', 'sid', null],
+ [3, 'FamilyName', 'sid', null],
+ [4, 'Weight', 'sid', null],
+ [[12, 1], 'isFixedPitch', 'num', 0],
+ [[12, 2], 'ItalicAngle', 'num', 0],
+ [[12, 3], 'UnderlinePosition', 'num', -100],
+ [[12, 4], 'UnderlineThickness', 'num', 50],
+ [[12, 5], 'PaintType', 'num', 0],
+ [[12, 6], 'CharstringType', 'num', 2],
+ [[12, 7], 'FontMatrix', ['num', 'num', 'num', 'num', 'num', 'num'],
+ [0.001, 0, 0, 0.001, 0, 0]],
+ [13, 'UniqueID', 'num', null],
+ [5, 'FontBBox', ['num', 'num', 'num', 'num'], [0, 0, 0, 0]],
+ [[12, 8], 'StrokeWidth', 'num', 0],
+ [14, 'XUID', 'array', null],
+ [15, 'charset', 'offset', 0],
+ [16, 'Encoding', 'offset', 0],
+ [17, 'CharStrings', 'offset', 0],
+ [18, 'Private', ['offset', 'offset'], null],
+ [[12, 21], 'PostScript', 'sid', null],
+ [[12, 22], 'BaseFontName', 'sid', null],
+ [[12, 23], 'BaseFontBlend', 'delta', null],
+ [[12, 31], 'CIDFontVersion', 'num', 0],
+ [[12, 32], 'CIDFontRevision', 'num', 0],
+ [[12, 33], 'CIDFontType', 'num', 0],
+ [[12, 34], 'CIDCount', 'num', 8720],
+ [[12, 35], 'UIDBase', 'num', null],
+ // XXX: CID Fonts on DirectWrite 6.1 only seem to work if FDSelect comes
+ // before FDArray.
+ [[12, 37], 'FDSelect', 'offset', null],
+ [[12, 36], 'FDArray', 'offset', null],
+ [[12, 38], 'FontName', 'sid', null]
+ ];
+ var tables = null;
+ function CFFTopDict(strings) {
+ if (tables === null) {
+ tables = CFFDict.createTables(layout);
+ }
+ CFFDict.call(this, tables, strings);
+ this.privateDict = null;
+ }
+ CFFTopDict.prototype = Object.create(CFFDict.prototype);
+ return CFFTopDict;
+})();
+
+var CFFPrivateDict = (function CFFPrivateDictClosure() {
+ var layout = [
+ [6, 'BlueValues', 'delta', null],
+ [7, 'OtherBlues', 'delta', null],
+ [8, 'FamilyBlues', 'delta', null],
+ [9, 'FamilyOtherBlues', 'delta', null],
+ [[12, 9], 'BlueScale', 'num', 0.039625],
+ [[12, 10], 'BlueShift', 'num', 7],
+ [[12, 11], 'BlueFuzz', 'num', 1],
+ [10, 'StdHW', 'num', null],
+ [11, 'StdVW', 'num', null],
+ [[12, 12], 'StemSnapH', 'delta', null],
+ [[12, 13], 'StemSnapV', 'delta', null],
+ [[12, 14], 'ForceBold', 'num', 0],
+ [[12, 17], 'LanguageGroup', 'num', 0],
+ [[12, 18], 'ExpansionFactor', 'num', 0.06],
+ [[12, 19], 'initialRandomSeed', 'num', 0],
+ [20, 'defaultWidthX', 'num', 0],
+ [21, 'nominalWidthX', 'num', 0],
+ [19, 'Subrs', 'offset', null]
+ ];
+ var tables = null;
+ function CFFPrivateDict(strings) {
+ if (tables === null) {
+ tables = CFFDict.createTables(layout);
+ }
+ CFFDict.call(this, tables, strings);
+ this.subrsIndex = null;
+ }
+ CFFPrivateDict.prototype = Object.create(CFFDict.prototype);
+ return CFFPrivateDict;
+})();
+
+var CFFCharsetPredefinedTypes = {
+ ISO_ADOBE: 0,
+ EXPERT: 1,
+ EXPERT_SUBSET: 2
+};
+var CFFCharset = (function CFFCharsetClosure() {
+ function CFFCharset(predefined, format, charset, raw) {
+ this.predefined = predefined;
+ this.format = format;
+ this.charset = charset;
+ this.raw = raw;
+ }
+ return CFFCharset;
+})();
+
+var CFFEncoding = (function CFFEncodingClosure() {
+ function CFFEncoding(predefined, format, encoding, raw) {
+ this.predefined = predefined;
+ this.format = format;
+ this.encoding = encoding;
+ this.raw = raw;
+ }
+ return CFFEncoding;
+})();
+
+var CFFFDSelect = (function CFFFDSelectClosure() {
+ function CFFFDSelect(fdSelect, raw) {
+ this.fdSelect = fdSelect;
+ this.raw = raw;
+ }
+ return CFFFDSelect;
+})();
+
+// Helper class to keep track of where an offset is within the data and helps
+// filling in that offset once it's known.
+var CFFOffsetTracker = (function CFFOffsetTrackerClosure() {
+ function CFFOffsetTracker() {
+ this.offsets = {};
+ }
+ CFFOffsetTracker.prototype = {
+ isTracking: function CFFOffsetTracker_isTracking(key) {
+ return key in this.offsets;
+ },
+ track: function CFFOffsetTracker_track(key, location) {
+ if (key in this.offsets) {
+ error('Already tracking location of ' + key);
+ }
+ this.offsets[key] = location;
+ },
+ offset: function CFFOffsetTracker_offset(value) {
+ for (var key in this.offsets) {
+ this.offsets[key] += value;
+ }
+ },
+ setEntryLocation: function CFFOffsetTracker_setEntryLocation(key,
+ values,
+ output) {
+ if (!(key in this.offsets)) {
+ error('Not tracking location of ' + key);
+ }
+ var data = output.data;
+ var dataOffset = this.offsets[key];
+ var size = 5;
+ for (var i = 0, ii = values.length; i < ii; ++i) {
+ var offset0 = i * size + dataOffset;
+ var offset1 = offset0 + 1;
+ var offset2 = offset0 + 2;
+ var offset3 = offset0 + 3;
+ var offset4 = offset0 + 4;
+ // It's easy to screw up offsets so perform this sanity check.
+ if (data[offset0] !== 0x1d || data[offset1] !== 0 ||
+ data[offset2] !== 0 || data[offset3] !== 0 || data[offset4] !== 0) {
+ error('writing to an offset that is not empty');
+ }
+ var value = values[i];
+ data[offset0] = 0x1d;
+ data[offset1] = (value >> 24) & 0xFF;
+ data[offset2] = (value >> 16) & 0xFF;
+ data[offset3] = (value >> 8) & 0xFF;
+ data[offset4] = value & 0xFF;
+ }
+ }
+ };
+ return CFFOffsetTracker;
+})();
+
+// Takes a CFF and converts it to the binary representation.
+var CFFCompiler = (function CFFCompilerClosure() {
+ function CFFCompiler(cff) {
+ this.cff = cff;
+ }
+ CFFCompiler.prototype = {
+ compile: function CFFCompiler_compile() {
+ var cff = this.cff;
+ var output = {
+ data: [],
+ length: 0,
+ add: function CFFCompiler_add(data) {
+ this.data = this.data.concat(data);
+ this.length = this.data.length;
+ }
+ };
+
+ // Compile the five entries that must be in order.
+ var header = this.compileHeader(cff.header);
+ output.add(header);
+
+ var nameIndex = this.compileNameIndex(cff.names);
+ output.add(nameIndex);
+
+ if (cff.isCIDFont) {
+ // The spec is unclear on how font matrices should relate to each other
+ // when there is one in the main top dict and the sub top dicts.
+ // Windows handles this differently than linux and osx so we have to
+ // normalize to work on all.
+ // Rules based off of some mailing list discussions:
+ // - If main font has a matrix and subfont doesn't, use the main matrix.
+ // - If no main font matrix and there is a subfont matrix, use the
+ // subfont matrix.
+ // - If both have matrices, concat together.
+ // - If neither have matrices, use default.
+ // To make this work on all platforms we move the top matrix into each
+ // sub top dict and concat if necessary.
+ if (cff.topDict.hasName('FontMatrix')) {
+ var base = cff.topDict.getByName('FontMatrix');
+ cff.topDict.removeByName('FontMatrix');
+ for (var i = 0, ii = cff.fdArray.length; i < ii; i++) {
+ var subDict = cff.fdArray[i];
+ var matrix = base.slice(0);
+ if (subDict.hasName('FontMatrix')) {
+ matrix = Util.transform(matrix, subDict.getByName('FontMatrix'));
+ }
+ subDict.setByName('FontMatrix', matrix);
+ }
+ }
+ }
+
+ var compiled = this.compileTopDicts([cff.topDict],
+ output.length,
+ cff.isCIDFont);
+ output.add(compiled.output);
+ var topDictTracker = compiled.trackers[0];
+
+ var stringIndex = this.compileStringIndex(cff.strings.strings);
+ output.add(stringIndex);
+
+ var globalSubrIndex = this.compileIndex(cff.globalSubrIndex);
+ output.add(globalSubrIndex);
+
+ // Now start on the other entries that have no specfic order.
+ if (cff.encoding && cff.topDict.hasName('Encoding')) {
+ if (cff.encoding.predefined) {
+ topDictTracker.setEntryLocation('Encoding', [cff.encoding.format],
+ output);
+ } else {
+ var encoding = this.compileEncoding(cff.encoding);
+ topDictTracker.setEntryLocation('Encoding', [output.length], output);
+ output.add(encoding);
+ }
+ }
+
+ if (cff.charset && cff.topDict.hasName('charset')) {
+ if (cff.charset.predefined) {
+ topDictTracker.setEntryLocation('charset', [cff.charset.format],
+ output);
+ } else {
+ var charset = this.compileCharset(cff.charset);
+ topDictTracker.setEntryLocation('charset', [output.length], output);
+ output.add(charset);
+ }
+ }
+
+ var charStrings = this.compileCharStrings(cff.charStrings);
+ topDictTracker.setEntryLocation('CharStrings', [output.length], output);
+ output.add(charStrings);
+
+ if (cff.isCIDFont) {
+ // For some reason FDSelect must be in front of FDArray on windows. OSX
+ // and linux don't seem to care.
+ topDictTracker.setEntryLocation('FDSelect', [output.length], output);
+ var fdSelect = this.compileFDSelect(cff.fdSelect.raw);
+ output.add(fdSelect);
+ // It is unclear if the sub font dictionary can have CID related
+ // dictionary keys, but the sanitizer doesn't like them so remove them.
+ compiled = this.compileTopDicts(cff.fdArray, output.length, true);
+ topDictTracker.setEntryLocation('FDArray', [output.length], output);
+ output.add(compiled.output);
+ var fontDictTrackers = compiled.trackers;
+
+ this.compilePrivateDicts(cff.fdArray, fontDictTrackers, output);
+ }
+
+ this.compilePrivateDicts([cff.topDict], [topDictTracker], output);
+
+ // If the font data ends with INDEX whose object data is zero-length,
+ // the sanitizer will bail out. Add a dummy byte to avoid that.
+ output.add([0]);
+
+ return output.data;
+ },
+ encodeNumber: function CFFCompiler_encodeNumber(value) {
+ if (parseFloat(value) === parseInt(value, 10) && !isNaN(value)) { // isInt
+ return this.encodeInteger(value);
+ } else {
+ return this.encodeFloat(value);
+ }
+ },
+ encodeFloat: function CFFCompiler_encodeFloat(num) {
+ var value = num.toString();
+
+ // rounding inaccurate doubles
+ var m = /\.(\d*?)(?:9{5,20}|0{5,20})\d{0,2}(?:e(.+)|$)/.exec(value);
+ if (m) {
+ var epsilon = parseFloat('1e' + ((m[2] ? +m[2] : 0) + m[1].length));
+ value = (Math.round(num * epsilon) / epsilon).toString();
+ }
+
+ var nibbles = '';
+ var i, ii;
+ for (i = 0, ii = value.length; i < ii; ++i) {
+ var a = value[i];
+ if (a === 'e') {
+ nibbles += value[++i] === '-' ? 'c' : 'b';
+ } else if (a === '.') {
+ nibbles += 'a';
+ } else if (a === '-') {
+ nibbles += 'e';
+ } else {
+ nibbles += a;
+ }
+ }
+ nibbles += (nibbles.length & 1) ? 'f' : 'ff';
+ var out = [30];
+ for (i = 0, ii = nibbles.length; i < ii; i += 2) {
+ out.push(parseInt(nibbles.substr(i, 2), 16));
+ }
+ return out;
+ },
+ encodeInteger: function CFFCompiler_encodeInteger(value) {
+ var code;
+ if (value >= -107 && value <= 107) {
+ code = [value + 139];
+ } else if (value >= 108 && value <= 1131) {
+ value = [value - 108];
+ code = [(value >> 8) + 247, value & 0xFF];
+ } else if (value >= -1131 && value <= -108) {
+ value = -value - 108;
+ code = [(value >> 8) + 251, value & 0xFF];
+ } else if (value >= -32768 && value <= 32767) {
+ code = [0x1c, (value >> 8) & 0xFF, value & 0xFF];
+ } else {
+ code = [0x1d,
+ (value >> 24) & 0xFF,
+ (value >> 16) & 0xFF,
+ (value >> 8) & 0xFF,
+ value & 0xFF];
+ }
+ return code;
+ },
+ compileHeader: function CFFCompiler_compileHeader(header) {
+ return [
+ header.major,
+ header.minor,
+ header.hdrSize,
+ header.offSize
+ ];
+ },
+ compileNameIndex: function CFFCompiler_compileNameIndex(names) {
+ var nameIndex = new CFFIndex();
+ for (var i = 0, ii = names.length; i < ii; ++i) {
+ nameIndex.add(stringToBytes(names[i]));
+ }
+ return this.compileIndex(nameIndex);
+ },
+ compileTopDicts: function CFFCompiler_compileTopDicts(dicts,
+ length,
+ removeCidKeys) {
+ var fontDictTrackers = [];
+ var fdArrayIndex = new CFFIndex();
+ for (var i = 0, ii = dicts.length; i < ii; ++i) {
+ var fontDict = dicts[i];
+ if (removeCidKeys) {
+ fontDict.removeByName('CIDFontVersion');
+ fontDict.removeByName('CIDFontRevision');
+ fontDict.removeByName('CIDFontType');
+ fontDict.removeByName('CIDCount');
+ fontDict.removeByName('UIDBase');
+ }
+ var fontDictTracker = new CFFOffsetTracker();
+ var fontDictData = this.compileDict(fontDict, fontDictTracker);
+ fontDictTrackers.push(fontDictTracker);
+ fdArrayIndex.add(fontDictData);
+ fontDictTracker.offset(length);
+ }
+ fdArrayIndex = this.compileIndex(fdArrayIndex, fontDictTrackers);
+ return {
+ trackers: fontDictTrackers,
+ output: fdArrayIndex
+ };
+ },
+ compilePrivateDicts: function CFFCompiler_compilePrivateDicts(dicts,
+ trackers,
+ output) {
+ for (var i = 0, ii = dicts.length; i < ii; ++i) {
+ var fontDict = dicts[i];
+ assert(fontDict.privateDict && fontDict.hasName('Private'),
+ 'There must be an private dictionary.');
+ var privateDict = fontDict.privateDict;
+ var privateDictTracker = new CFFOffsetTracker();
+ var privateDictData = this.compileDict(privateDict, privateDictTracker);
+
+ var outputLength = output.length;
+ privateDictTracker.offset(outputLength);
+ if (!privateDictData.length) {
+ // The private dictionary was empty, set the output length to zero to
+ // ensure the offset length isn't out of bounds in the eyes of the
+ // sanitizer.
+ outputLength = 0;
+ }
+
+ trackers[i].setEntryLocation('Private',
+ [privateDictData.length, outputLength],
+ output);
+ output.add(privateDictData);
+
+ if (privateDict.subrsIndex && privateDict.hasName('Subrs')) {
+ var subrs = this.compileIndex(privateDict.subrsIndex);
+ privateDictTracker.setEntryLocation('Subrs', [privateDictData.length],
+ output);
+ output.add(subrs);
+ }
+ }
+ },
+ compileDict: function CFFCompiler_compileDict(dict, offsetTracker) {
+ var out = [];
+ // The dictionary keys must be in a certain order.
+ var order = dict.order;
+ for (var i = 0; i < order.length; ++i) {
+ var key = order[i];
+ if (!(key in dict.values)) {
+ continue;
+ }
+ var values = dict.values[key];
+ var types = dict.types[key];
+ if (!isArray(types)) {
+ types = [types];
+ }
+ if (!isArray(values)) {
+ values = [values];
+ }
+
+ // Remove any empty dict values.
+ if (values.length === 0) {
+ continue;
+ }
+
+ for (var j = 0, jj = types.length; j < jj; ++j) {
+ var type = types[j];
+ var value = values[j];
+ switch (type) {
+ case 'num':
+ case 'sid':
+ out = out.concat(this.encodeNumber(value));
+ break;
+ case 'offset':
+ // For offsets we just insert a 32bit integer so we don't have to
+ // deal with figuring out the length of the offset when it gets
+ // replaced later on by the compiler.
+ var name = dict.keyToNameMap[key];
+ // Some offsets have the offset and the length, so just record the
+ // position of the first one.
+ if (!offsetTracker.isTracking(name)) {
+ offsetTracker.track(name, out.length);
+ }
+ out = out.concat([0x1d, 0, 0, 0, 0]);
+ break;
+ case 'array':
+ case 'delta':
+ out = out.concat(this.encodeNumber(value));
+ for (var k = 1, kk = values.length; k < kk; ++k) {
+ out = out.concat(this.encodeNumber(values[k]));
+ }
+ break;
+ default:
+ error('Unknown data type of ' + type);
+ break;
+ }
+ }
+ out = out.concat(dict.opcodes[key]);
+ }
+ return out;
+ },
+ compileStringIndex: function CFFCompiler_compileStringIndex(strings) {
+ var stringIndex = new CFFIndex();
+ for (var i = 0, ii = strings.length; i < ii; ++i) {
+ stringIndex.add(stringToBytes(strings[i]));
+ }
+ return this.compileIndex(stringIndex);
+ },
+ compileGlobalSubrIndex: function CFFCompiler_compileGlobalSubrIndex() {
+ var globalSubrIndex = this.cff.globalSubrIndex;
+ this.out.writeByteArray(this.compileIndex(globalSubrIndex));
+ },
+ compileCharStrings: function CFFCompiler_compileCharStrings(charStrings) {
+ return this.compileIndex(charStrings);
+ },
+ compileCharset: function CFFCompiler_compileCharset(charset) {
+ return this.compileTypedArray(charset.raw);
+ },
+ compileEncoding: function CFFCompiler_compileEncoding(encoding) {
+ return this.compileTypedArray(encoding.raw);
+ },
+ compileFDSelect: function CFFCompiler_compileFDSelect(fdSelect) {
+ return this.compileTypedArray(fdSelect);
+ },
+ compileTypedArray: function CFFCompiler_compileTypedArray(data) {
+ var out = [];
+ for (var i = 0, ii = data.length; i < ii; ++i) {
+ out[i] = data[i];
+ }
+ return out;
+ },
+ compileIndex: function CFFCompiler_compileIndex(index, trackers) {
+ trackers = trackers || [];
+ var objects = index.objects;
+ // First 2 bytes contains the number of objects contained into this index
+ var count = objects.length;
+
+ // If there is no object, just create an index. This technically
+ // should just be [0, 0] but OTS has an issue with that.
+ if (count === 0) {
+ return [0, 0, 0];
+ }
+
+ var data = [(count >> 8) & 0xFF, count & 0xff];
+
+ var lastOffset = 1, i;
+ for (i = 0; i < count; ++i) {
+ lastOffset += objects[i].length;
+ }
+
+ var offsetSize;
+ if (lastOffset < 0x100) {
+ offsetSize = 1;
+ } else if (lastOffset < 0x10000) {
+ offsetSize = 2;
+ } else if (lastOffset < 0x1000000) {
+ offsetSize = 3;
+ } else {
+ offsetSize = 4;
+ }
+
+ // Next byte contains the offset size use to reference object in the file
+ data.push(offsetSize);
+
+ // Add another offset after this one because we need a new offset
+ var relativeOffset = 1;
+ for (i = 0; i < count + 1; i++) {
+ if (offsetSize === 1) {
+ data.push(relativeOffset & 0xFF);
+ } else if (offsetSize === 2) {
+ data.push((relativeOffset >> 8) & 0xFF,
+ relativeOffset & 0xFF);
+ } else if (offsetSize === 3) {
+ data.push((relativeOffset >> 16) & 0xFF,
+ (relativeOffset >> 8) & 0xFF,
+ relativeOffset & 0xFF);
+ } else {
+ data.push((relativeOffset >>> 24) & 0xFF,
+ (relativeOffset >> 16) & 0xFF,
+ (relativeOffset >> 8) & 0xFF,
+ relativeOffset & 0xFF);
+ }
+
+ if (objects[i]) {
+ relativeOffset += objects[i].length;
+ }
+ }
+
+ for (i = 0; i < count; i++) {
+ // Notify the tracker where the object will be offset in the data.
+ if (trackers[i]) {
+ trackers[i].offset(data.length);
+ }
+ for (var j = 0, jj = objects[i].length; j < jj; j++) {
+ data.push(objects[i][j]);
+ }
+ }
+ return data;
+ }
+ };
+ return CFFCompiler;
+})();
+
+// Workaround for seac on Windows.
+(function checkSeacSupport() {
+ if (/Windows/.test(navigator.userAgent)) {
+ SEAC_ANALYSIS_ENABLED = true;
+ }
+})();
+
+// Workaround for Private Use Area characters in Chrome on Windows
+// http://code.google.com/p/chromium/issues/detail?id=122465
+// https://github.com/mozilla/pdf.js/issues/1689
+(function checkChromeWindows() {
+ if (/Windows.*Chrome/.test(navigator.userAgent)) {
+ SKIP_PRIVATE_USE_RANGE_F000_TO_F01F = true;
+ }
+})();
+
+
+var FontRendererFactory = (function FontRendererFactoryClosure() {
+ function getLong(data, offset) {
+ return (data[offset] << 24) | (data[offset + 1] << 16) |
+ (data[offset + 2] << 8) | data[offset + 3];
+ }
+
+ function getUshort(data, offset) {
+ return (data[offset] << 8) | data[offset + 1];
+ }
+
+ function parseCmap(data, start, end) {
+ var offset = (getUshort(data, start + 2) === 1 ?
+ getLong(data, start + 8) : getLong(data, start + 16));
+ var format = getUshort(data, start + offset);
+ var length, ranges, p, i;
+ if (format === 4) {
+ length = getUshort(data, start + offset + 2);
+ var segCount = getUshort(data, start + offset + 6) >> 1;
+ p = start + offset + 14;
+ ranges = [];
+ for (i = 0; i < segCount; i++, p += 2) {
+ ranges[i] = {end: getUshort(data, p)};
+ }
+ p += 2;
+ for (i = 0; i < segCount; i++, p += 2) {
+ ranges[i].start = getUshort(data, p);
+ }
+ for (i = 0; i < segCount; i++, p += 2) {
+ ranges[i].idDelta = getUshort(data, p);
+ }
+ for (i = 0; i < segCount; i++, p += 2) {
+ var idOffset = getUshort(data, p);
+ if (idOffset === 0) {
+ continue;
+ }
+ ranges[i].ids = [];
+ for (var j = 0, jj = ranges[i].end - ranges[i].start + 1; j < jj; j++) {
+ ranges[i].ids[j] = getUshort(data, p + idOffset);
+ idOffset += 2;
+ }
+ }
+ return ranges;
+ } else if (format === 12) {
+ length = getLong(data, start + offset + 4);
+ var groups = getLong(data, start + offset + 12);
+ p = start + offset + 16;
+ ranges = [];
+ for (i = 0; i < groups; i++) {
+ ranges.push({
+ start: getLong(data, p),
+ end: getLong(data, p + 4),
+ idDelta: getLong(data, p + 8) - getLong(data, p)
+ });
+ p += 12;
+ }
+ return ranges;
+ }
+ error('not supported cmap: ' + format);
+ }
+
+ function parseCff(data, start, end) {
+ var properties = {};
+ var parser = new CFFParser(new Stream(data, start, end - start),
+ properties);
+ var cff = parser.parse();
+ return {
+ glyphs: cff.charStrings.objects,
+ subrs: (cff.topDict.privateDict && cff.topDict.privateDict.subrsIndex &&
+ cff.topDict.privateDict.subrsIndex.objects),
+ gsubrs: cff.globalSubrIndex && cff.globalSubrIndex.objects
+ };
+ }
+
+ function parseGlyfTable(glyf, loca, isGlyphLocationsLong) {
+ var itemSize, itemDecode;
+ if (isGlyphLocationsLong) {
+ itemSize = 4;
+ itemDecode = function fontItemDecodeLong(data, offset) {
+ return (data[offset] << 24) | (data[offset + 1] << 16) |
+ (data[offset + 2] << 8) | data[offset + 3];
+ };
+ } else {
+ itemSize = 2;
+ itemDecode = function fontItemDecode(data, offset) {
+ return (data[offset] << 9) | (data[offset + 1] << 1);
+ };
+ }
+ var glyphs = [];
+ var startOffset = itemDecode(loca, 0);
+ for (var j = itemSize; j < loca.length; j += itemSize) {
+ var endOffset = itemDecode(loca, j);
+ glyphs.push(glyf.subarray(startOffset, endOffset));
+ startOffset = endOffset;
+ }
+ return glyphs;
+ }
+
+ function lookupCmap(ranges, unicode) {
+ var code = unicode.charCodeAt(0);
+ var l = 0, r = ranges.length - 1;
+ while (l < r) {
+ var c = (l + r + 1) >> 1;
+ if (code < ranges[c].start) {
+ r = c - 1;
+ } else {
+ l = c;
+ }
+ }
+ if (ranges[l].start <= code && code <= ranges[l].end) {
+ return (ranges[l].idDelta + (ranges[l].ids ?
+ ranges[l].ids[code - ranges[l].start] : code)) & 0xFFFF;
+ }
+ return 0;
+ }
+
+ function compileGlyf(code, js, font) {
+ function moveTo(x, y) {
+ js.push('c.moveTo(' + x + ',' + y + ');');
+ }
+ function lineTo(x, y) {
+ js.push('c.lineTo(' + x + ',' + y + ');');
+ }
+ function quadraticCurveTo(xa, ya, x, y) {
+ js.push('c.quadraticCurveTo(' + xa + ',' + ya + ',' +
+ x + ',' + y + ');');
+ }
+
+ var i = 0;
+ var numberOfContours = ((code[i] << 24) | (code[i + 1] << 16)) >> 16;
+ var flags;
+ var x = 0, y = 0;
+ i += 10;
+ if (numberOfContours < 0) {
+ // composite glyph
+ do {
+ flags = (code[i] << 8) | code[i + 1];
+ var glyphIndex = (code[i + 2] << 8) | code[i + 3];
+ i += 4;
+ var arg1, arg2;
+ if ((flags & 0x01)) {
+ arg1 = ((code[i] << 24) | (code[i + 1] << 16)) >> 16;
+ arg2 = ((code[i + 2] << 24) | (code[i + 3] << 16)) >> 16;
+ i += 4;
+ } else {
+ arg1 = code[i++]; arg2 = code[i++];
+ }
+ if ((flags & 0x02)) {
+ x = arg1;
+ y = arg2;
+ } else {
+ x = 0; y = 0; // TODO "they are points" ?
+ }
+ var scaleX = 1, scaleY = 1, scale01 = 0, scale10 = 0;
+ if ((flags & 0x08)) {
+ scaleX =
+ scaleY = ((code[i] << 24) | (code[i + 1] << 16)) / 1073741824;
+ i += 2;
+ } else if ((flags & 0x40)) {
+ scaleX = ((code[i] << 24) | (code[i + 1] << 16)) / 1073741824;
+ scaleY = ((code[i + 2] << 24) | (code[i + 3] << 16)) / 1073741824;
+ i += 4;
+ } else if ((flags & 0x80)) {
+ scaleX = ((code[i] << 24) | (code[i + 1] << 16)) / 1073741824;
+ scale01 = ((code[i + 2] << 24) | (code[i + 3] << 16)) / 1073741824;
+ scale10 = ((code[i + 4] << 24) | (code[i + 5] << 16)) / 1073741824;
+ scaleY = ((code[i + 6] << 24) | (code[i + 7] << 16)) / 1073741824;
+ i += 8;
+ }
+ var subglyph = font.glyphs[glyphIndex];
+ if (subglyph) {
+ js.push('c.save();');
+ js.push('c.transform(' + scaleX + ',' + scale01 + ',' +
+ scale10 + ',' + scaleY + ',' + x + ',' + y + ');');
+ compileGlyf(subglyph, js, font);
+ js.push('c.restore();');
+ }
+ } while ((flags & 0x20));
+ } else {
+ // simple glyph
+ var endPtsOfContours = [];
+ var j, jj;
+ for (j = 0; j < numberOfContours; j++) {
+ endPtsOfContours.push((code[i] << 8) | code[i + 1]);
+ i += 2;
+ }
+ var instructionLength = (code[i] << 8) | code[i + 1];
+ i += 2 + instructionLength; // skipping the instructions
+ var numberOfPoints = endPtsOfContours[endPtsOfContours.length - 1] + 1;
+ var points = [];
+ while (points.length < numberOfPoints) {
+ flags = code[i++];
+ var repeat = 1;
+ if ((flags & 0x08)) {
+ repeat += code[i++];
+ }
+ while (repeat-- > 0) {
+ points.push({flags: flags});
+ }
+ }
+ for (j = 0; j < numberOfPoints; j++) {
+ switch (points[j].flags & 0x12) {
+ case 0x00:
+ x += ((code[i] << 24) | (code[i + 1] << 16)) >> 16;
+ i += 2;
+ break;
+ case 0x02:
+ x -= code[i++];
+ break;
+ case 0x12:
+ x += code[i++];
+ break;
+ }
+ points[j].x = x;
+ }
+ for (j = 0; j < numberOfPoints; j++) {
+ switch (points[j].flags & 0x24) {
+ case 0x00:
+ y += ((code[i] << 24) | (code[i + 1] << 16)) >> 16;
+ i += 2;
+ break;
+ case 0x04:
+ y -= code[i++];
+ break;
+ case 0x24:
+ y += code[i++];
+ break;
+ }
+ points[j].y = y;
+ }
+
+ var startPoint = 0;
+ for (i = 0; i < numberOfContours; i++) {
+ var endPoint = endPtsOfContours[i];
+ // contours might have implicit points, which is located in the middle
+ // between two neighboring off-curve points
+ var contour = points.slice(startPoint, endPoint + 1);
+ if ((contour[0].flags & 1)) {
+ contour.push(contour[0]); // using start point at the contour end
+ } else if ((contour[contour.length - 1].flags & 1)) {
+ // first is off-curve point, trying to use one from the end
+ contour.unshift(contour[contour.length - 1]);
+ } else {
+ // start and end are off-curve points, creating implicit one
+ var p = {
+ flags: 1,
+ x: (contour[0].x + contour[contour.length - 1].x) / 2,
+ y: (contour[0].y + contour[contour.length - 1].y) / 2
+ };
+ contour.unshift(p);
+ contour.push(p);
+ }
+ moveTo(contour[0].x, contour[0].y);
+ for (j = 1, jj = contour.length; j < jj; j++) {
+ if ((contour[j].flags & 1)) {
+ lineTo(contour[j].x, contour[j].y);
+ } else if ((contour[j + 1].flags & 1)){
+ quadraticCurveTo(contour[j].x, contour[j].y,
+ contour[j + 1].x, contour[j + 1].y);
+ j++;
+ } else {
+ quadraticCurveTo(contour[j].x, contour[j].y,
+ (contour[j].x + contour[j + 1].x) / 2,
+ (contour[j].y + contour[j + 1].y) / 2);
+ }
+ }
+ startPoint = endPoint + 1;
+ }
+ }
+ }
+
+ function compileCharString(code, js, font) {
+ var stack = [];
+ var x = 0, y = 0;
+ var stems = 0;
+
+ function moveTo(x, y) {
+ js.push('c.moveTo(' + x + ',' + y + ');');
+ }
+ function lineTo(x, y) {
+ js.push('c.lineTo(' + x + ',' + y + ');');
+ }
+ function bezierCurveTo(x1, y1, x2, y2, x, y) {
+ js.push('c.bezierCurveTo(' + x1 + ',' + y1 + ',' + x2 + ',' + y2 + ',' +
+ x + ',' + y + ');');
+ }
+
+ function parse(code) {
+ var i = 0;
+ while (i < code.length) {
+ var stackClean = false;
+ var v = code[i++];
+ var xa, xb, ya, yb, y1, y2, y3, n, subrCode;
+ switch (v) {
+ case 1: // hstem
+ stems += stack.length >> 1;
+ stackClean = true;
+ break;
+ case 3: // vstem
+ stems += stack.length >> 1;
+ stackClean = true;
+ break;
+ case 4: // vmoveto
+ y += stack.pop();
+ moveTo(x, y);
+ stackClean = true;
+ break;
+ case 5: // rlineto
+ while (stack.length > 0) {
+ x += stack.shift();
+ y += stack.shift();
+ lineTo(x, y);
+ }
+ break;
+ case 6: // hlineto
+ while (stack.length > 0) {
+ x += stack.shift();
+ lineTo(x, y);
+ if (stack.length === 0) {
+ break;
+ }
+ y += stack.shift();
+ lineTo(x, y);
+ }
+ break;
+ case 7: // vlineto
+ while (stack.length > 0) {
+ y += stack.shift();
+ lineTo(x, y);
+ if (stack.length === 0) {
+ break;
+ }
+ x += stack.shift();
+ lineTo(x, y);
+ }
+ break;
+ case 8: // rrcurveto
+ while (stack.length > 0) {
+ xa = x + stack.shift(); ya = y + stack.shift();
+ xb = xa + stack.shift(); yb = ya + stack.shift();
+ x = xb + stack.shift(); y = yb + stack.shift();
+ bezierCurveTo(xa, ya, xb, yb, x, y);
+ }
+ break;
+ case 10: // callsubr
+ n = stack.pop() + font.subrsBias;
+ subrCode = font.subrs[n];
+ if (subrCode) {
+ parse(subrCode);
+ }
+ break;
+ case 11: // return
+ return;
+ case 12:
+ v = code[i++];
+ switch (v) {
+ case 34: // flex
+ xa = x + stack.shift();
+ xb = xa + stack.shift(); y1 = y + stack.shift();
+ x = xb + stack.shift();
+ bezierCurveTo(xa, y, xb, y1, x, y1);
+ xa = x + stack.shift();
+ xb = xa + stack.shift();
+ x = xb + stack.shift();
+ bezierCurveTo(xa, y1, xb, y, x, y);
+ break;
+ case 35: // flex
+ xa = x + stack.shift(); ya = y + stack.shift();
+ xb = xa + stack.shift(); yb = ya + stack.shift();
+ x = xb + stack.shift(); y = yb + stack.shift();
+ bezierCurveTo(xa, ya, xb, yb, x, y);
+ xa = x + stack.shift(); ya = y + stack.shift();
+ xb = xa + stack.shift(); yb = ya + stack.shift();
+ x = xb + stack.shift(); y = yb + stack.shift();
+ bezierCurveTo(xa, ya, xb, yb, x, y);
+ stack.pop(); // fd
+ break;
+ case 36: // hflex1
+ xa = x + stack.shift(); y1 = y + stack.shift();
+ xb = xa + stack.shift(); y2 = y1 + stack.shift();
+ x = xb + stack.shift();
+ bezierCurveTo(xa, y1, xb, y2, x, y2);
+ xa = x + stack.shift();
+ xb = xa + stack.shift(); y3 = y2 + stack.shift();
+ x = xb + stack.shift();
+ bezierCurveTo(xa, y2, xb, y3, x, y);
+ break;
+ case 37: // flex1
+ var x0 = x, y0 = y;
+ xa = x + stack.shift(); ya = y + stack.shift();
+ xb = xa + stack.shift(); yb = ya + stack.shift();
+ x = xb + stack.shift(); y = yb + stack.shift();
+ bezierCurveTo(xa, ya, xb, yb, x, y);
+ xa = x + stack.shift(); ya = y + stack.shift();
+ xb = xa + stack.shift(); yb = ya + stack.shift();
+ x = xb; y = yb;
+ if (Math.abs(x - x0) > Math.abs(y - y0)) {
+ x += stack.shift();
+ } else {
+ y += stack.shift();
+ }
+ bezierCurveTo(xa, ya, xb, yb, x, y);
+ break;
+ default:
+ error('unknown operator: 12 ' + v);
+ }
+ break;
+ case 14: // endchar
+ if (stack.length >= 4) {
+ var achar = stack.pop();
+ var bchar = stack.pop();
+ y = stack.pop();
+ x = stack.pop();
+ js.push('c.save();');
+ js.push('c.translate('+ x + ',' + y + ');');
+ var gid = lookupCmap(font.cmap, String.fromCharCode(
+ font.glyphNameMap[Encodings.StandardEncoding[achar]]));
+ compileCharString(font.glyphs[gid], js, font);
+ js.push('c.restore();');
+
+ gid = lookupCmap(font.cmap, String.fromCharCode(
+ font.glyphNameMap[Encodings.StandardEncoding[bchar]]));
+ compileCharString(font.glyphs[gid], js, font);
+ }
+ return;
+ case 18: // hstemhm
+ stems += stack.length >> 1;
+ stackClean = true;
+ break;
+ case 19: // hintmask
+ stems += stack.length >> 1;
+ i += (stems + 7) >> 3;
+ stackClean = true;
+ break;
+ case 20: // cntrmask
+ stems += stack.length >> 1;
+ i += (stems + 7) >> 3;
+ stackClean = true;
+ break;
+ case 21: // rmoveto
+ y += stack.pop();
+ x += stack.pop();
+ moveTo(x, y);
+ stackClean = true;
+ break;
+ case 22: // hmoveto
+ x += stack.pop();
+ moveTo(x, y);
+ stackClean = true;
+ break;
+ case 23: // vstemhm
+ stems += stack.length >> 1;
+ stackClean = true;
+ break;
+ case 24: // rcurveline
+ while (stack.length > 2) {
+ xa = x + stack.shift(); ya = y + stack.shift();
+ xb = xa + stack.shift(); yb = ya + stack.shift();
+ x = xb + stack.shift(); y = yb + stack.shift();
+ bezierCurveTo(xa, ya, xb, yb, x, y);
+ }
+ x += stack.shift();
+ y += stack.shift();
+ lineTo(x, y);
+ break;
+ case 25: // rlinecurve
+ while (stack.length > 6) {
+ x += stack.shift();
+ y += stack.shift();
+ lineTo(x, y);
+ }
+ xa = x + stack.shift(); ya = y + stack.shift();
+ xb = xa + stack.shift(); yb = ya + stack.shift();
+ x = xb + stack.shift(); y = yb + stack.shift();
+ bezierCurveTo(xa, ya, xb, yb, x, y);
+ break;
+ case 26: // vvcurveto
+ if (stack.length % 2) {
+ x += stack.shift();
+ }
+ while (stack.length > 0) {
+ xa = x; ya = y + stack.shift();
+ xb = xa + stack.shift(); yb = ya + stack.shift();
+ x = xb; y = yb + stack.shift();
+ bezierCurveTo(xa, ya, xb, yb, x, y);
+ }
+ break;
+ case 27: // hhcurveto
+ if (stack.length % 2) {
+ y += stack.shift();
+ }
+ while (stack.length > 0) {
+ xa = x + stack.shift(); ya = y;
+ xb = xa + stack.shift(); yb = ya + stack.shift();
+ x = xb + stack.shift(); y = yb;
+ bezierCurveTo(xa, ya, xb, yb, x, y);
+ }
+ break;
+ case 28:
+ stack.push(((code[i] << 24) | (code[i + 1] << 16)) >> 16);
+ i += 2;
+ break;
+ case 29: // callgsubr
+ n = stack.pop() + font.gsubrsBias;
+ subrCode = font.gsubrs[n];
+ if (subrCode) {
+ parse(subrCode);
+ }
+ break;
+ case 30: // vhcurveto
+ while (stack.length > 0) {
+ xa = x; ya = y + stack.shift();
+ xb = xa + stack.shift(); yb = ya + stack.shift();
+ x = xb + stack.shift();
+ y = yb + (stack.length === 1 ? stack.shift() : 0);
+ bezierCurveTo(xa, ya, xb, yb, x, y);
+ if (stack.length === 0) {
+ break;
+ }
+
+ xa = x + stack.shift(); ya = y;
+ xb = xa + stack.shift(); yb = ya + stack.shift();
+ y = yb + stack.shift();
+ x = xb + (stack.length === 1 ? stack.shift() : 0);
+ bezierCurveTo(xa, ya, xb, yb, x, y);
+ }
+ break;
+ case 31: // hvcurveto
+ while (stack.length > 0) {
+ xa = x + stack.shift(); ya = y;
+ xb = xa + stack.shift(); yb = ya + stack.shift();
+ y = yb + stack.shift();
+ x = xb + (stack.length === 1 ? stack.shift() : 0);
+ bezierCurveTo(xa, ya, xb, yb, x, y);
+ if (stack.length === 0) {
+ break;
+ }
+
+ xa = x; ya = y + stack.shift();
+ xb = xa + stack.shift(); yb = ya + stack.shift();
+ x = xb + stack.shift();
+ y = yb + (stack.length === 1 ? stack.shift() : 0);
+ bezierCurveTo(xa, ya, xb, yb, x, y);
+ }
+ break;
+ default:
+ if (v < 32) {
+ error('unknown operator: ' + v);
+ }
+ if (v < 247) {
+ stack.push(v - 139);
+ } else if (v < 251) {
+ stack.push((v - 247) * 256 + code[i++] + 108);
+ } else if (v < 255) {
+ stack.push(-(v - 251) * 256 - code[i++] - 108);
+ } else {
+ stack.push(((code[i] << 24) | (code[i + 1] << 16) |
+ (code[i + 2] << 8) | code[i + 3]) / 65536);
+ i += 4;
+ }
+ break;
+ }
+ if (stackClean) {
+ stack.length = 0;
+ }
+ }
+ }
+ parse(code);
+ }
+
+ var noop = '';
+
+ function CompiledFont(fontMatrix) {
+ this.compiledGlyphs = {};
+ this.fontMatrix = fontMatrix;
+ }
+ CompiledFont.prototype = {
+ getPathJs: function (unicode) {
+ var gid = lookupCmap(this.cmap, unicode);
+ var fn = this.compiledGlyphs[gid];
+ if (!fn) {
+ this.compiledGlyphs[gid] = fn = this.compileGlyph(this.glyphs[gid]);
+ }
+ return fn;
+ },
+
+ compileGlyph: function (code) {
+ if (!code || code.length === 0 || code[0] === 14) {
+ return noop;
+ }
+
+ var js = [];
+ js.push('c.save();');
+ js.push('c.transform(' + this.fontMatrix.join(',') + ');');
+ js.push('c.scale(size, -size);');
+
+ this.compileGlyphImpl(code, js);
+
+ js.push('c.restore();');
+
+ return js.join('\n');
+ },
+
+ compileGlyphImpl: function () {
+ error('Children classes should implement this.');
+ },
+
+ hasBuiltPath: function (unicode) {
+ var gid = lookupCmap(this.cmap, unicode);
+ return gid in this.compiledGlyphs;
+ }
+ };
+
+ function TrueTypeCompiled(glyphs, cmap, fontMatrix) {
+ fontMatrix = fontMatrix || [0.000488, 0, 0, 0.000488, 0, 0];
+ CompiledFont.call(this, fontMatrix);
+
+ this.glyphs = glyphs;
+ this.cmap = cmap;
+
+ this.compiledGlyphs = [];
+ }
+
+ Util.inherit(TrueTypeCompiled, CompiledFont, {
+ compileGlyphImpl: function (code, js) {
+ compileGlyf(code, js, this);
+ }
+ });
+
+ function Type2Compiled(cffInfo, cmap, fontMatrix, glyphNameMap) {
+ fontMatrix = fontMatrix || [0.001, 0, 0, 0.001, 0, 0];
+ CompiledFont.call(this, fontMatrix);
+ this.glyphs = cffInfo.glyphs;
+ this.gsubrs = cffInfo.gsubrs || [];
+ this.subrs = cffInfo.subrs || [];
+ this.cmap = cmap;
+ this.glyphNameMap = glyphNameMap || GlyphsUnicode;
+
+ this.compiledGlyphs = [];
+ this.gsubrsBias = (this.gsubrs.length < 1240 ?
+ 107 : (this.gsubrs.length < 33900 ? 1131 : 32768));
+ this.subrsBias = (this.subrs.length < 1240 ?
+ 107 : (this.subrs.length < 33900 ? 1131 : 32768));
+ }
+
+ Util.inherit(Type2Compiled, CompiledFont, {
+ compileGlyphImpl: function (code, js) {
+ compileCharString(code, js, this);
+ }
+ });
+
+
+ return {
+ create: function FontRendererFactory_create(font) {
+ var data = new Uint8Array(font.data);
+ var cmap, glyf, loca, cff, indexToLocFormat, unitsPerEm;
+ var numTables = getUshort(data, 4);
+ for (var i = 0, p = 12; i < numTables; i++, p += 16) {
+ var tag = bytesToString(data.subarray(p, p + 4));
+ var offset = getLong(data, p + 8);
+ var length = getLong(data, p + 12);
+ switch (tag) {
+ case 'cmap':
+ cmap = parseCmap(data, offset, offset + length);
+ break;
+ case 'glyf':
+ glyf = data.subarray(offset, offset + length);
+ break;
+ case 'loca':
+ loca = data.subarray(offset, offset + length);
+ break;
+ case 'head':
+ unitsPerEm = getUshort(data, offset + 18);
+ indexToLocFormat = getUshort(data, offset + 50);
+ break;
+ case 'CFF ':
+ cff = parseCff(data, offset, offset + length);
+ break;
+ }
+ }
+
+ if (glyf) {
+ var fontMatrix = (!unitsPerEm ? font.fontMatrix :
+ [1 / unitsPerEm, 0, 0, 1 / unitsPerEm, 0, 0]);
+ return new TrueTypeCompiled(
+ parseGlyfTable(glyf, loca, indexToLocFormat), cmap, fontMatrix);
+ } else {
+ return new Type2Compiled(cff, cmap, font.fontMatrix, font.glyphNameMap);
+ }
+ }
+ };
+})();
+
+
+var GlyphsUnicode = {
+ A: 0x0041,
+ AE: 0x00C6,
+ AEacute: 0x01FC,
+ AEmacron: 0x01E2,
+ AEsmall: 0xF7E6,
+ Aacute: 0x00C1,
+ Aacutesmall: 0xF7E1,
+ Abreve: 0x0102,
+ Abreveacute: 0x1EAE,
+ Abrevecyrillic: 0x04D0,
+ Abrevedotbelow: 0x1EB6,
+ Abrevegrave: 0x1EB0,
+ Abrevehookabove: 0x1EB2,
+ Abrevetilde: 0x1EB4,
+ Acaron: 0x01CD,
+ Acircle: 0x24B6,
+ Acircumflex: 0x00C2,
+ Acircumflexacute: 0x1EA4,
+ Acircumflexdotbelow: 0x1EAC,
+ Acircumflexgrave: 0x1EA6,
+ Acircumflexhookabove: 0x1EA8,
+ Acircumflexsmall: 0xF7E2,
+ Acircumflextilde: 0x1EAA,
+ Acute: 0xF6C9,
+ Acutesmall: 0xF7B4,
+ Acyrillic: 0x0410,
+ Adblgrave: 0x0200,
+ Adieresis: 0x00C4,
+ Adieresiscyrillic: 0x04D2,
+ Adieresismacron: 0x01DE,
+ Adieresissmall: 0xF7E4,
+ Adotbelow: 0x1EA0,
+ Adotmacron: 0x01E0,
+ Agrave: 0x00C0,
+ Agravesmall: 0xF7E0,
+ Ahookabove: 0x1EA2,
+ Aiecyrillic: 0x04D4,
+ Ainvertedbreve: 0x0202,
+ Alpha: 0x0391,
+ Alphatonos: 0x0386,
+ Amacron: 0x0100,
+ Amonospace: 0xFF21,
+ Aogonek: 0x0104,
+ Aring: 0x00C5,
+ Aringacute: 0x01FA,
+ Aringbelow: 0x1E00,
+ Aringsmall: 0xF7E5,
+ Asmall: 0xF761,
+ Atilde: 0x00C3,
+ Atildesmall: 0xF7E3,
+ Aybarmenian: 0x0531,
+ B: 0x0042,
+ Bcircle: 0x24B7,
+ Bdotaccent: 0x1E02,
+ Bdotbelow: 0x1E04,
+ Becyrillic: 0x0411,
+ Benarmenian: 0x0532,
+ Beta: 0x0392,
+ Bhook: 0x0181,
+ Blinebelow: 0x1E06,
+ Bmonospace: 0xFF22,
+ Brevesmall: 0xF6F4,
+ Bsmall: 0xF762,
+ Btopbar: 0x0182,
+ C: 0x0043,
+ Caarmenian: 0x053E,
+ Cacute: 0x0106,
+ Caron: 0xF6CA,
+ Caronsmall: 0xF6F5,
+ Ccaron: 0x010C,
+ Ccedilla: 0x00C7,
+ Ccedillaacute: 0x1E08,
+ Ccedillasmall: 0xF7E7,
+ Ccircle: 0x24B8,
+ Ccircumflex: 0x0108,
+ Cdot: 0x010A,
+ Cdotaccent: 0x010A,
+ Cedillasmall: 0xF7B8,
+ Chaarmenian: 0x0549,
+ Cheabkhasiancyrillic: 0x04BC,
+ Checyrillic: 0x0427,
+ Chedescenderabkhasiancyrillic: 0x04BE,
+ Chedescendercyrillic: 0x04B6,
+ Chedieresiscyrillic: 0x04F4,
+ Cheharmenian: 0x0543,
+ Chekhakassiancyrillic: 0x04CB,
+ Cheverticalstrokecyrillic: 0x04B8,
+ Chi: 0x03A7,
+ Chook: 0x0187,
+ Circumflexsmall: 0xF6F6,
+ Cmonospace: 0xFF23,
+ Coarmenian: 0x0551,
+ Csmall: 0xF763,
+ D: 0x0044,
+ DZ: 0x01F1,
+ DZcaron: 0x01C4,
+ Daarmenian: 0x0534,
+ Dafrican: 0x0189,
+ Dcaron: 0x010E,
+ Dcedilla: 0x1E10,
+ Dcircle: 0x24B9,
+ Dcircumflexbelow: 0x1E12,
+ Dcroat: 0x0110,
+ Ddotaccent: 0x1E0A,
+ Ddotbelow: 0x1E0C,
+ Decyrillic: 0x0414,
+ Deicoptic: 0x03EE,
+ Delta: 0x2206,
+ Deltagreek: 0x0394,
+ Dhook: 0x018A,
+ Dieresis: 0xF6CB,
+ DieresisAcute: 0xF6CC,
+ DieresisGrave: 0xF6CD,
+ Dieresissmall: 0xF7A8,
+ Digammagreek: 0x03DC,
+ Djecyrillic: 0x0402,
+ Dlinebelow: 0x1E0E,
+ Dmonospace: 0xFF24,
+ Dotaccentsmall: 0xF6F7,
+ Dslash: 0x0110,
+ Dsmall: 0xF764,
+ Dtopbar: 0x018B,
+ Dz: 0x01F2,
+ Dzcaron: 0x01C5,
+ Dzeabkhasiancyrillic: 0x04E0,
+ Dzecyrillic: 0x0405,
+ Dzhecyrillic: 0x040F,
+ E: 0x0045,
+ Eacute: 0x00C9,
+ Eacutesmall: 0xF7E9,
+ Ebreve: 0x0114,
+ Ecaron: 0x011A,
+ Ecedillabreve: 0x1E1C,
+ Echarmenian: 0x0535,
+ Ecircle: 0x24BA,
+ Ecircumflex: 0x00CA,
+ Ecircumflexacute: 0x1EBE,
+ Ecircumflexbelow: 0x1E18,
+ Ecircumflexdotbelow: 0x1EC6,
+ Ecircumflexgrave: 0x1EC0,
+ Ecircumflexhookabove: 0x1EC2,
+ Ecircumflexsmall: 0xF7EA,
+ Ecircumflextilde: 0x1EC4,
+ Ecyrillic: 0x0404,
+ Edblgrave: 0x0204,
+ Edieresis: 0x00CB,
+ Edieresissmall: 0xF7EB,
+ Edot: 0x0116,
+ Edotaccent: 0x0116,
+ Edotbelow: 0x1EB8,
+ Efcyrillic: 0x0424,
+ Egrave: 0x00C8,
+ Egravesmall: 0xF7E8,
+ Eharmenian: 0x0537,
+ Ehookabove: 0x1EBA,
+ Eightroman: 0x2167,
+ Einvertedbreve: 0x0206,
+ Eiotifiedcyrillic: 0x0464,
+ Elcyrillic: 0x041B,
+ Elevenroman: 0x216A,
+ Emacron: 0x0112,
+ Emacronacute: 0x1E16,
+ Emacrongrave: 0x1E14,
+ Emcyrillic: 0x041C,
+ Emonospace: 0xFF25,
+ Encyrillic: 0x041D,
+ Endescendercyrillic: 0x04A2,
+ Eng: 0x014A,
+ Enghecyrillic: 0x04A4,
+ Enhookcyrillic: 0x04C7,
+ Eogonek: 0x0118,
+ Eopen: 0x0190,
+ Epsilon: 0x0395,
+ Epsilontonos: 0x0388,
+ Ercyrillic: 0x0420,
+ Ereversed: 0x018E,
+ Ereversedcyrillic: 0x042D,
+ Escyrillic: 0x0421,
+ Esdescendercyrillic: 0x04AA,
+ Esh: 0x01A9,
+ Esmall: 0xF765,
+ Eta: 0x0397,
+ Etarmenian: 0x0538,
+ Etatonos: 0x0389,
+ Eth: 0x00D0,
+ Ethsmall: 0xF7F0,
+ Etilde: 0x1EBC,
+ Etildebelow: 0x1E1A,
+ Euro: 0x20AC,
+ Ezh: 0x01B7,
+ Ezhcaron: 0x01EE,
+ Ezhreversed: 0x01B8,
+ F: 0x0046,
+ Fcircle: 0x24BB,
+ Fdotaccent: 0x1E1E,
+ Feharmenian: 0x0556,
+ Feicoptic: 0x03E4,
+ Fhook: 0x0191,
+ Fitacyrillic: 0x0472,
+ Fiveroman: 0x2164,
+ Fmonospace: 0xFF26,
+ Fourroman: 0x2163,
+ Fsmall: 0xF766,
+ G: 0x0047,
+ GBsquare: 0x3387,
+ Gacute: 0x01F4,
+ Gamma: 0x0393,
+ Gammaafrican: 0x0194,
+ Gangiacoptic: 0x03EA,
+ Gbreve: 0x011E,
+ Gcaron: 0x01E6,
+ Gcedilla: 0x0122,
+ Gcircle: 0x24BC,
+ Gcircumflex: 0x011C,
+ Gcommaaccent: 0x0122,
+ Gdot: 0x0120,
+ Gdotaccent: 0x0120,
+ Gecyrillic: 0x0413,
+ Ghadarmenian: 0x0542,
+ Ghemiddlehookcyrillic: 0x0494,
+ Ghestrokecyrillic: 0x0492,
+ Gheupturncyrillic: 0x0490,
+ Ghook: 0x0193,
+ Gimarmenian: 0x0533,
+ Gjecyrillic: 0x0403,
+ Gmacron: 0x1E20,
+ Gmonospace: 0xFF27,
+ Grave: 0xF6CE,
+ Gravesmall: 0xF760,
+ Gsmall: 0xF767,
+ Gsmallhook: 0x029B,
+ Gstroke: 0x01E4,
+ H: 0x0048,
+ H18533: 0x25CF,
+ H18543: 0x25AA,
+ H18551: 0x25AB,
+ H22073: 0x25A1,
+ HPsquare: 0x33CB,
+ Haabkhasiancyrillic: 0x04A8,
+ Hadescendercyrillic: 0x04B2,
+ Hardsigncyrillic: 0x042A,
+ Hbar: 0x0126,
+ Hbrevebelow: 0x1E2A,
+ Hcedilla: 0x1E28,
+ Hcircle: 0x24BD,
+ Hcircumflex: 0x0124,
+ Hdieresis: 0x1E26,
+ Hdotaccent: 0x1E22,
+ Hdotbelow: 0x1E24,
+ Hmonospace: 0xFF28,
+ Hoarmenian: 0x0540,
+ Horicoptic: 0x03E8,
+ Hsmall: 0xF768,
+ Hungarumlaut: 0xF6CF,
+ Hungarumlautsmall: 0xF6F8,
+ Hzsquare: 0x3390,
+ I: 0x0049,
+ IAcyrillic: 0x042F,
+ IJ: 0x0132,
+ IUcyrillic: 0x042E,
+ Iacute: 0x00CD,
+ Iacutesmall: 0xF7ED,
+ Ibreve: 0x012C,
+ Icaron: 0x01CF,
+ Icircle: 0x24BE,
+ Icircumflex: 0x00CE,
+ Icircumflexsmall: 0xF7EE,
+ Icyrillic: 0x0406,
+ Idblgrave: 0x0208,
+ Idieresis: 0x00CF,
+ Idieresisacute: 0x1E2E,
+ Idieresiscyrillic: 0x04E4,
+ Idieresissmall: 0xF7EF,
+ Idot: 0x0130,
+ Idotaccent: 0x0130,
+ Idotbelow: 0x1ECA,
+ Iebrevecyrillic: 0x04D6,
+ Iecyrillic: 0x0415,
+ Ifraktur: 0x2111,
+ Igrave: 0x00CC,
+ Igravesmall: 0xF7EC,
+ Ihookabove: 0x1EC8,
+ Iicyrillic: 0x0418,
+ Iinvertedbreve: 0x020A,
+ Iishortcyrillic: 0x0419,
+ Imacron: 0x012A,
+ Imacroncyrillic: 0x04E2,
+ Imonospace: 0xFF29,
+ Iniarmenian: 0x053B,
+ Iocyrillic: 0x0401,
+ Iogonek: 0x012E,
+ Iota: 0x0399,
+ Iotaafrican: 0x0196,
+ Iotadieresis: 0x03AA,
+ Iotatonos: 0x038A,
+ Ismall: 0xF769,
+ Istroke: 0x0197,
+ Itilde: 0x0128,
+ Itildebelow: 0x1E2C,
+ Izhitsacyrillic: 0x0474,
+ Izhitsadblgravecyrillic: 0x0476,
+ J: 0x004A,
+ Jaarmenian: 0x0541,
+ Jcircle: 0x24BF,
+ Jcircumflex: 0x0134,
+ Jecyrillic: 0x0408,
+ Jheharmenian: 0x054B,
+ Jmonospace: 0xFF2A,
+ Jsmall: 0xF76A,
+ K: 0x004B,
+ KBsquare: 0x3385,
+ KKsquare: 0x33CD,
+ Kabashkircyrillic: 0x04A0,
+ Kacute: 0x1E30,
+ Kacyrillic: 0x041A,
+ Kadescendercyrillic: 0x049A,
+ Kahookcyrillic: 0x04C3,
+ Kappa: 0x039A,
+ Kastrokecyrillic: 0x049E,
+ Kaverticalstrokecyrillic: 0x049C,
+ Kcaron: 0x01E8,
+ Kcedilla: 0x0136,
+ Kcircle: 0x24C0,
+ Kcommaaccent: 0x0136,
+ Kdotbelow: 0x1E32,
+ Keharmenian: 0x0554,
+ Kenarmenian: 0x053F,
+ Khacyrillic: 0x0425,
+ Kheicoptic: 0x03E6,
+ Khook: 0x0198,
+ Kjecyrillic: 0x040C,
+ Klinebelow: 0x1E34,
+ Kmonospace: 0xFF2B,
+ Koppacyrillic: 0x0480,
+ Koppagreek: 0x03DE,
+ Ksicyrillic: 0x046E,
+ Ksmall: 0xF76B,
+ L: 0x004C,
+ LJ: 0x01C7,
+ LL: 0xF6BF,
+ Lacute: 0x0139,
+ Lambda: 0x039B,
+ Lcaron: 0x013D,
+ Lcedilla: 0x013B,
+ Lcircle: 0x24C1,
+ Lcircumflexbelow: 0x1E3C,
+ Lcommaaccent: 0x013B,
+ Ldot: 0x013F,
+ Ldotaccent: 0x013F,
+ Ldotbelow: 0x1E36,
+ Ldotbelowmacron: 0x1E38,
+ Liwnarmenian: 0x053C,
+ Lj: 0x01C8,
+ Ljecyrillic: 0x0409,
+ Llinebelow: 0x1E3A,
+ Lmonospace: 0xFF2C,
+ Lslash: 0x0141,
+ Lslashsmall: 0xF6F9,
+ Lsmall: 0xF76C,
+ M: 0x004D,
+ MBsquare: 0x3386,
+ Macron: 0xF6D0,
+ Macronsmall: 0xF7AF,
+ Macute: 0x1E3E,
+ Mcircle: 0x24C2,
+ Mdotaccent: 0x1E40,
+ Mdotbelow: 0x1E42,
+ Menarmenian: 0x0544,
+ Mmonospace: 0xFF2D,
+ Msmall: 0xF76D,
+ Mturned: 0x019C,
+ Mu: 0x039C,
+ N: 0x004E,
+ NJ: 0x01CA,
+ Nacute: 0x0143,
+ Ncaron: 0x0147,
+ Ncedilla: 0x0145,
+ Ncircle: 0x24C3,
+ Ncircumflexbelow: 0x1E4A,
+ Ncommaaccent: 0x0145,
+ Ndotaccent: 0x1E44,
+ Ndotbelow: 0x1E46,
+ Nhookleft: 0x019D,
+ Nineroman: 0x2168,
+ Nj: 0x01CB,
+ Njecyrillic: 0x040A,
+ Nlinebelow: 0x1E48,
+ Nmonospace: 0xFF2E,
+ Nowarmenian: 0x0546,
+ Nsmall: 0xF76E,
+ Ntilde: 0x00D1,
+ Ntildesmall: 0xF7F1,
+ Nu: 0x039D,
+ O: 0x004F,
+ OE: 0x0152,
+ OEsmall: 0xF6FA,
+ Oacute: 0x00D3,
+ Oacutesmall: 0xF7F3,
+ Obarredcyrillic: 0x04E8,
+ Obarreddieresiscyrillic: 0x04EA,
+ Obreve: 0x014E,
+ Ocaron: 0x01D1,
+ Ocenteredtilde: 0x019F,
+ Ocircle: 0x24C4,
+ Ocircumflex: 0x00D4,
+ Ocircumflexacute: 0x1ED0,
+ Ocircumflexdotbelow: 0x1ED8,
+ Ocircumflexgrave: 0x1ED2,
+ Ocircumflexhookabove: 0x1ED4,
+ Ocircumflexsmall: 0xF7F4,
+ Ocircumflextilde: 0x1ED6,
+ Ocyrillic: 0x041E,
+ Odblacute: 0x0150,
+ Odblgrave: 0x020C,
+ Odieresis: 0x00D6,
+ Odieresiscyrillic: 0x04E6,
+ Odieresissmall: 0xF7F6,
+ Odotbelow: 0x1ECC,
+ Ogoneksmall: 0xF6FB,
+ Ograve: 0x00D2,
+ Ogravesmall: 0xF7F2,
+ Oharmenian: 0x0555,
+ Ohm: 0x2126,
+ Ohookabove: 0x1ECE,
+ Ohorn: 0x01A0,
+ Ohornacute: 0x1EDA,
+ Ohorndotbelow: 0x1EE2,
+ Ohorngrave: 0x1EDC,
+ Ohornhookabove: 0x1EDE,
+ Ohorntilde: 0x1EE0,
+ Ohungarumlaut: 0x0150,
+ Oi: 0x01A2,
+ Oinvertedbreve: 0x020E,
+ Omacron: 0x014C,
+ Omacronacute: 0x1E52,
+ Omacrongrave: 0x1E50,
+ Omega: 0x2126,
+ Omegacyrillic: 0x0460,
+ Omegagreek: 0x03A9,
+ Omegaroundcyrillic: 0x047A,
+ Omegatitlocyrillic: 0x047C,
+ Omegatonos: 0x038F,
+ Omicron: 0x039F,
+ Omicrontonos: 0x038C,
+ Omonospace: 0xFF2F,
+ Oneroman: 0x2160,
+ Oogonek: 0x01EA,
+ Oogonekmacron: 0x01EC,
+ Oopen: 0x0186,
+ Oslash: 0x00D8,
+ Oslashacute: 0x01FE,
+ Oslashsmall: 0xF7F8,
+ Osmall: 0xF76F,
+ Ostrokeacute: 0x01FE,
+ Otcyrillic: 0x047E,
+ Otilde: 0x00D5,
+ Otildeacute: 0x1E4C,
+ Otildedieresis: 0x1E4E,
+ Otildesmall: 0xF7F5,
+ P: 0x0050,
+ Pacute: 0x1E54,
+ Pcircle: 0x24C5,
+ Pdotaccent: 0x1E56,
+ Pecyrillic: 0x041F,
+ Peharmenian: 0x054A,
+ Pemiddlehookcyrillic: 0x04A6,
+ Phi: 0x03A6,
+ Phook: 0x01A4,
+ Pi: 0x03A0,
+ Piwrarmenian: 0x0553,
+ Pmonospace: 0xFF30,
+ Psi: 0x03A8,
+ Psicyrillic: 0x0470,
+ Psmall: 0xF770,
+ Q: 0x0051,
+ Qcircle: 0x24C6,
+ Qmonospace: 0xFF31,
+ Qsmall: 0xF771,
+ R: 0x0052,
+ Raarmenian: 0x054C,
+ Racute: 0x0154,
+ Rcaron: 0x0158,
+ Rcedilla: 0x0156,
+ Rcircle: 0x24C7,
+ Rcommaaccent: 0x0156,
+ Rdblgrave: 0x0210,
+ Rdotaccent: 0x1E58,
+ Rdotbelow: 0x1E5A,
+ Rdotbelowmacron: 0x1E5C,
+ Reharmenian: 0x0550,
+ Rfraktur: 0x211C,
+ Rho: 0x03A1,
+ Ringsmall: 0xF6FC,
+ Rinvertedbreve: 0x0212,
+ Rlinebelow: 0x1E5E,
+ Rmonospace: 0xFF32,
+ Rsmall: 0xF772,
+ Rsmallinverted: 0x0281,
+ Rsmallinvertedsuperior: 0x02B6,
+ S: 0x0053,
+ SF010000: 0x250C,
+ SF020000: 0x2514,
+ SF030000: 0x2510,
+ SF040000: 0x2518,
+ SF050000: 0x253C,
+ SF060000: 0x252C,
+ SF070000: 0x2534,
+ SF080000: 0x251C,
+ SF090000: 0x2524,
+ SF100000: 0x2500,
+ SF110000: 0x2502,
+ SF190000: 0x2561,
+ SF200000: 0x2562,
+ SF210000: 0x2556,
+ SF220000: 0x2555,
+ SF230000: 0x2563,
+ SF240000: 0x2551,
+ SF250000: 0x2557,
+ SF260000: 0x255D,
+ SF270000: 0x255C,
+ SF280000: 0x255B,
+ SF360000: 0x255E,
+ SF370000: 0x255F,
+ SF380000: 0x255A,
+ SF390000: 0x2554,
+ SF400000: 0x2569,
+ SF410000: 0x2566,
+ SF420000: 0x2560,
+ SF430000: 0x2550,
+ SF440000: 0x256C,
+ SF450000: 0x2567,
+ SF460000: 0x2568,
+ SF470000: 0x2564,
+ SF480000: 0x2565,
+ SF490000: 0x2559,
+ SF500000: 0x2558,
+ SF510000: 0x2552,
+ SF520000: 0x2553,
+ SF530000: 0x256B,
+ SF540000: 0x256A,
+ Sacute: 0x015A,
+ Sacutedotaccent: 0x1E64,
+ Sampigreek: 0x03E0,
+ Scaron: 0x0160,
+ Scarondotaccent: 0x1E66,
+ Scaronsmall: 0xF6FD,
+ Scedilla: 0x015E,
+ Schwa: 0x018F,
+ Schwacyrillic: 0x04D8,
+ Schwadieresiscyrillic: 0x04DA,
+ Scircle: 0x24C8,
+ Scircumflex: 0x015C,
+ Scommaaccent: 0x0218,
+ Sdotaccent: 0x1E60,
+ Sdotbelow: 0x1E62,
+ Sdotbelowdotaccent: 0x1E68,
+ Seharmenian: 0x054D,
+ Sevenroman: 0x2166,
+ Shaarmenian: 0x0547,
+ Shacyrillic: 0x0428,
+ Shchacyrillic: 0x0429,
+ Sheicoptic: 0x03E2,
+ Shhacyrillic: 0x04BA,
+ Shimacoptic: 0x03EC,
+ Sigma: 0x03A3,
+ Sixroman: 0x2165,
+ Smonospace: 0xFF33,
+ Softsigncyrillic: 0x042C,
+ Ssmall: 0xF773,
+ Stigmagreek: 0x03DA,
+ T: 0x0054,
+ Tau: 0x03A4,
+ Tbar: 0x0166,
+ Tcaron: 0x0164,
+ Tcedilla: 0x0162,
+ Tcircle: 0x24C9,
+ Tcircumflexbelow: 0x1E70,
+ Tcommaaccent: 0x0162,
+ Tdotaccent: 0x1E6A,
+ Tdotbelow: 0x1E6C,
+ Tecyrillic: 0x0422,
+ Tedescendercyrillic: 0x04AC,
+ Tenroman: 0x2169,
+ Tetsecyrillic: 0x04B4,
+ Theta: 0x0398,
+ Thook: 0x01AC,
+ Thorn: 0x00DE,
+ Thornsmall: 0xF7FE,
+ Threeroman: 0x2162,
+ Tildesmall: 0xF6FE,
+ Tiwnarmenian: 0x054F,
+ Tlinebelow: 0x1E6E,
+ Tmonospace: 0xFF34,
+ Toarmenian: 0x0539,
+ Tonefive: 0x01BC,
+ Tonesix: 0x0184,
+ Tonetwo: 0x01A7,
+ Tretroflexhook: 0x01AE,
+ Tsecyrillic: 0x0426,
+ Tshecyrillic: 0x040B,
+ Tsmall: 0xF774,
+ Twelveroman: 0x216B,
+ Tworoman: 0x2161,
+ U: 0x0055,
+ Uacute: 0x00DA,
+ Uacutesmall: 0xF7FA,
+ Ubreve: 0x016C,
+ Ucaron: 0x01D3,
+ Ucircle: 0x24CA,
+ Ucircumflex: 0x00DB,
+ Ucircumflexbelow: 0x1E76,
+ Ucircumflexsmall: 0xF7FB,
+ Ucyrillic: 0x0423,
+ Udblacute: 0x0170,
+ Udblgrave: 0x0214,
+ Udieresis: 0x00DC,
+ Udieresisacute: 0x01D7,
+ Udieresisbelow: 0x1E72,
+ Udieresiscaron: 0x01D9,
+ Udieresiscyrillic: 0x04F0,
+ Udieresisgrave: 0x01DB,
+ Udieresismacron: 0x01D5,
+ Udieresissmall: 0xF7FC,
+ Udotbelow: 0x1EE4,
+ Ugrave: 0x00D9,
+ Ugravesmall: 0xF7F9,
+ Uhookabove: 0x1EE6,
+ Uhorn: 0x01AF,
+ Uhornacute: 0x1EE8,
+ Uhorndotbelow: 0x1EF0,
+ Uhorngrave: 0x1EEA,
+ Uhornhookabove: 0x1EEC,
+ Uhorntilde: 0x1EEE,
+ Uhungarumlaut: 0x0170,
+ Uhungarumlautcyrillic: 0x04F2,
+ Uinvertedbreve: 0x0216,
+ Ukcyrillic: 0x0478,
+ Umacron: 0x016A,
+ Umacroncyrillic: 0x04EE,
+ Umacrondieresis: 0x1E7A,
+ Umonospace: 0xFF35,
+ Uogonek: 0x0172,
+ Upsilon: 0x03A5,
+ Upsilon1: 0x03D2,
+ Upsilonacutehooksymbolgreek: 0x03D3,
+ Upsilonafrican: 0x01B1,
+ Upsilondieresis: 0x03AB,
+ Upsilondieresishooksymbolgreek: 0x03D4,
+ Upsilonhooksymbol: 0x03D2,
+ Upsilontonos: 0x038E,
+ Uring: 0x016E,
+ Ushortcyrillic: 0x040E,
+ Usmall: 0xF775,
+ Ustraightcyrillic: 0x04AE,
+ Ustraightstrokecyrillic: 0x04B0,
+ Utilde: 0x0168,
+ Utildeacute: 0x1E78,
+ Utildebelow: 0x1E74,
+ V: 0x0056,
+ Vcircle: 0x24CB,
+ Vdotbelow: 0x1E7E,
+ Vecyrillic: 0x0412,
+ Vewarmenian: 0x054E,
+ Vhook: 0x01B2,
+ Vmonospace: 0xFF36,
+ Voarmenian: 0x0548,
+ Vsmall: 0xF776,
+ Vtilde: 0x1E7C,
+ W: 0x0057,
+ Wacute: 0x1E82,
+ Wcircle: 0x24CC,
+ Wcircumflex: 0x0174,
+ Wdieresis: 0x1E84,
+ Wdotaccent: 0x1E86,
+ Wdotbelow: 0x1E88,
+ Wgrave: 0x1E80,
+ Wmonospace: 0xFF37,
+ Wsmall: 0xF777,
+ X: 0x0058,
+ Xcircle: 0x24CD,
+ Xdieresis: 0x1E8C,
+ Xdotaccent: 0x1E8A,
+ Xeharmenian: 0x053D,
+ Xi: 0x039E,
+ Xmonospace: 0xFF38,
+ Xsmall: 0xF778,
+ Y: 0x0059,
+ Yacute: 0x00DD,
+ Yacutesmall: 0xF7FD,
+ Yatcyrillic: 0x0462,
+ Ycircle: 0x24CE,
+ Ycircumflex: 0x0176,
+ Ydieresis: 0x0178,
+ Ydieresissmall: 0xF7FF,
+ Ydotaccent: 0x1E8E,
+ Ydotbelow: 0x1EF4,
+ Yericyrillic: 0x042B,
+ Yerudieresiscyrillic: 0x04F8,
+ Ygrave: 0x1EF2,
+ Yhook: 0x01B3,
+ Yhookabove: 0x1EF6,
+ Yiarmenian: 0x0545,
+ Yicyrillic: 0x0407,
+ Yiwnarmenian: 0x0552,
+ Ymonospace: 0xFF39,
+ Ysmall: 0xF779,
+ Ytilde: 0x1EF8,
+ Yusbigcyrillic: 0x046A,
+ Yusbigiotifiedcyrillic: 0x046C,
+ Yuslittlecyrillic: 0x0466,
+ Yuslittleiotifiedcyrillic: 0x0468,
+ Z: 0x005A,
+ Zaarmenian: 0x0536,
+ Zacute: 0x0179,
+ Zcaron: 0x017D,
+ Zcaronsmall: 0xF6FF,
+ Zcircle: 0x24CF,
+ Zcircumflex: 0x1E90,
+ Zdot: 0x017B,
+ Zdotaccent: 0x017B,
+ Zdotbelow: 0x1E92,
+ Zecyrillic: 0x0417,
+ Zedescendercyrillic: 0x0498,
+ Zedieresiscyrillic: 0x04DE,
+ Zeta: 0x0396,
+ Zhearmenian: 0x053A,
+ Zhebrevecyrillic: 0x04C1,
+ Zhecyrillic: 0x0416,
+ Zhedescendercyrillic: 0x0496,
+ Zhedieresiscyrillic: 0x04DC,
+ Zlinebelow: 0x1E94,
+ Zmonospace: 0xFF3A,
+ Zsmall: 0xF77A,
+ Zstroke: 0x01B5,
+ a: 0x0061,
+ aabengali: 0x0986,
+ aacute: 0x00E1,
+ aadeva: 0x0906,
+ aagujarati: 0x0A86,
+ aagurmukhi: 0x0A06,
+ aamatragurmukhi: 0x0A3E,
+ aarusquare: 0x3303,
+ aavowelsignbengali: 0x09BE,
+ aavowelsigndeva: 0x093E,
+ aavowelsigngujarati: 0x0ABE,
+ abbreviationmarkarmenian: 0x055F,
+ abbreviationsigndeva: 0x0970,
+ abengali: 0x0985,
+ abopomofo: 0x311A,
+ abreve: 0x0103,
+ abreveacute: 0x1EAF,
+ abrevecyrillic: 0x04D1,
+ abrevedotbelow: 0x1EB7,
+ abrevegrave: 0x1EB1,
+ abrevehookabove: 0x1EB3,
+ abrevetilde: 0x1EB5,
+ acaron: 0x01CE,
+ acircle: 0x24D0,
+ acircumflex: 0x00E2,
+ acircumflexacute: 0x1EA5,
+ acircumflexdotbelow: 0x1EAD,
+ acircumflexgrave: 0x1EA7,
+ acircumflexhookabove: 0x1EA9,
+ acircumflextilde: 0x1EAB,
+ acute: 0x00B4,
+ acutebelowcmb: 0x0317,
+ acutecmb: 0x0301,
+ acutecomb: 0x0301,
+ acutedeva: 0x0954,
+ acutelowmod: 0x02CF,
+ acutetonecmb: 0x0341,
+ acyrillic: 0x0430,
+ adblgrave: 0x0201,
+ addakgurmukhi: 0x0A71,
+ adeva: 0x0905,
+ adieresis: 0x00E4,
+ adieresiscyrillic: 0x04D3,
+ adieresismacron: 0x01DF,
+ adotbelow: 0x1EA1,
+ adotmacron: 0x01E1,
+ ae: 0x00E6,
+ aeacute: 0x01FD,
+ aekorean: 0x3150,
+ aemacron: 0x01E3,
+ afii00208: 0x2015,
+ afii08941: 0x20A4,
+ afii10017: 0x0410,
+ afii10018: 0x0411,
+ afii10019: 0x0412,
+ afii10020: 0x0413,
+ afii10021: 0x0414,
+ afii10022: 0x0415,
+ afii10023: 0x0401,
+ afii10024: 0x0416,
+ afii10025: 0x0417,
+ afii10026: 0x0418,
+ afii10027: 0x0419,
+ afii10028: 0x041A,
+ afii10029: 0x041B,
+ afii10030: 0x041C,
+ afii10031: 0x041D,
+ afii10032: 0x041E,
+ afii10033: 0x041F,
+ afii10034: 0x0420,
+ afii10035: 0x0421,
+ afii10036: 0x0422,
+ afii10037: 0x0423,
+ afii10038: 0x0424,
+ afii10039: 0x0425,
+ afii10040: 0x0426,
+ afii10041: 0x0427,
+ afii10042: 0x0428,
+ afii10043: 0x0429,
+ afii10044: 0x042A,
+ afii10045: 0x042B,
+ afii10046: 0x042C,
+ afii10047: 0x042D,
+ afii10048: 0x042E,
+ afii10049: 0x042F,
+ afii10050: 0x0490,
+ afii10051: 0x0402,
+ afii10052: 0x0403,
+ afii10053: 0x0404,
+ afii10054: 0x0405,
+ afii10055: 0x0406,
+ afii10056: 0x0407,
+ afii10057: 0x0408,
+ afii10058: 0x0409,
+ afii10059: 0x040A,
+ afii10060: 0x040B,
+ afii10061: 0x040C,
+ afii10062: 0x040E,
+ afii10063: 0xF6C4,
+ afii10064: 0xF6C5,
+ afii10065: 0x0430,
+ afii10066: 0x0431,
+ afii10067: 0x0432,
+ afii10068: 0x0433,
+ afii10069: 0x0434,
+ afii10070: 0x0435,
+ afii10071: 0x0451,
+ afii10072: 0x0436,
+ afii10073: 0x0437,
+ afii10074: 0x0438,
+ afii10075: 0x0439,
+ afii10076: 0x043A,
+ afii10077: 0x043B,
+ afii10078: 0x043C,
+ afii10079: 0x043D,
+ afii10080: 0x043E,
+ afii10081: 0x043F,
+ afii10082: 0x0440,
+ afii10083: 0x0441,
+ afii10084: 0x0442,
+ afii10085: 0x0443,
+ afii10086: 0x0444,
+ afii10087: 0x0445,
+ afii10088: 0x0446,
+ afii10089: 0x0447,
+ afii10090: 0x0448,
+ afii10091: 0x0449,
+ afii10092: 0x044A,
+ afii10093: 0x044B,
+ afii10094: 0x044C,
+ afii10095: 0x044D,
+ afii10096: 0x044E,
+ afii10097: 0x044F,
+ afii10098: 0x0491,
+ afii10099: 0x0452,
+ afii10100: 0x0453,
+ afii10101: 0x0454,
+ afii10102: 0x0455,
+ afii10103: 0x0456,
+ afii10104: 0x0457,
+ afii10105: 0x0458,
+ afii10106: 0x0459,
+ afii10107: 0x045A,
+ afii10108: 0x045B,
+ afii10109: 0x045C,
+ afii10110: 0x045E,
+ afii10145: 0x040F,
+ afii10146: 0x0462,
+ afii10147: 0x0472,
+ afii10148: 0x0474,
+ afii10192: 0xF6C6,
+ afii10193: 0x045F,
+ afii10194: 0x0463,
+ afii10195: 0x0473,
+ afii10196: 0x0475,
+ afii10831: 0xF6C7,
+ afii10832: 0xF6C8,
+ afii10846: 0x04D9,
+ afii299: 0x200E,
+ afii300: 0x200F,
+ afii301: 0x200D,
+ afii57381: 0x066A,
+ afii57388: 0x060C,
+ afii57392: 0x0660,
+ afii57393: 0x0661,
+ afii57394: 0x0662,
+ afii57395: 0x0663,
+ afii57396: 0x0664,
+ afii57397: 0x0665,
+ afii57398: 0x0666,
+ afii57399: 0x0667,
+ afii57400: 0x0668,
+ afii57401: 0x0669,
+ afii57403: 0x061B,
+ afii57407: 0x061F,
+ afii57409: 0x0621,
+ afii57410: 0x0622,
+ afii57411: 0x0623,
+ afii57412: 0x0624,
+ afii57413: 0x0625,
+ afii57414: 0x0626,
+ afii57415: 0x0627,
+ afii57416: 0x0628,
+ afii57417: 0x0629,
+ afii57418: 0x062A,
+ afii57419: 0x062B,
+ afii57420: 0x062C,
+ afii57421: 0x062D,
+ afii57422: 0x062E,
+ afii57423: 0x062F,
+ afii57424: 0x0630,
+ afii57425: 0x0631,
+ afii57426: 0x0632,
+ afii57427: 0x0633,
+ afii57428: 0x0634,
+ afii57429: 0x0635,
+ afii57430: 0x0636,
+ afii57431: 0x0637,
+ afii57432: 0x0638,
+ afii57433: 0x0639,
+ afii57434: 0x063A,
+ afii57440: 0x0640,
+ afii57441: 0x0641,
+ afii57442: 0x0642,
+ afii57443: 0x0643,
+ afii57444: 0x0644,
+ afii57445: 0x0645,
+ afii57446: 0x0646,
+ afii57448: 0x0648,
+ afii57449: 0x0649,
+ afii57450: 0x064A,
+ afii57451: 0x064B,
+ afii57452: 0x064C,
+ afii57453: 0x064D,
+ afii57454: 0x064E,
+ afii57455: 0x064F,
+ afii57456: 0x0650,
+ afii57457: 0x0651,
+ afii57458: 0x0652,
+ afii57470: 0x0647,
+ afii57505: 0x06A4,
+ afii57506: 0x067E,
+ afii57507: 0x0686,
+ afii57508: 0x0698,
+ afii57509: 0x06AF,
+ afii57511: 0x0679,
+ afii57512: 0x0688,
+ afii57513: 0x0691,
+ afii57514: 0x06BA,
+ afii57519: 0x06D2,
+ afii57534: 0x06D5,
+ afii57636: 0x20AA,
+ afii57645: 0x05BE,
+ afii57658: 0x05C3,
+ afii57664: 0x05D0,
+ afii57665: 0x05D1,
+ afii57666: 0x05D2,
+ afii57667: 0x05D3,
+ afii57668: 0x05D4,
+ afii57669: 0x05D5,
+ afii57670: 0x05D6,
+ afii57671: 0x05D7,
+ afii57672: 0x05D8,
+ afii57673: 0x05D9,
+ afii57674: 0x05DA,
+ afii57675: 0x05DB,
+ afii57676: 0x05DC,
+ afii57677: 0x05DD,
+ afii57678: 0x05DE,
+ afii57679: 0x05DF,
+ afii57680: 0x05E0,
+ afii57681: 0x05E1,
+ afii57682: 0x05E2,
+ afii57683: 0x05E3,
+ afii57684: 0x05E4,
+ afii57685: 0x05E5,
+ afii57686: 0x05E6,
+ afii57687: 0x05E7,
+ afii57688: 0x05E8,
+ afii57689: 0x05E9,
+ afii57690: 0x05EA,
+ afii57694: 0xFB2A,
+ afii57695: 0xFB2B,
+ afii57700: 0xFB4B,
+ afii57705: 0xFB1F,
+ afii57716: 0x05F0,
+ afii57717: 0x05F1,
+ afii57718: 0x05F2,
+ afii57723: 0xFB35,
+ afii57793: 0x05B4,
+ afii57794: 0x05B5,
+ afii57795: 0x05B6,
+ afii57796: 0x05BB,
+ afii57797: 0x05B8,
+ afii57798: 0x05B7,
+ afii57799: 0x05B0,
+ afii57800: 0x05B2,
+ afii57801: 0x05B1,
+ afii57802: 0x05B3,
+ afii57803: 0x05C2,
+ afii57804: 0x05C1,
+ afii57806: 0x05B9,
+ afii57807: 0x05BC,
+ afii57839: 0x05BD,
+ afii57841: 0x05BF,
+ afii57842: 0x05C0,
+ afii57929: 0x02BC,
+ afii61248: 0x2105,
+ afii61289: 0x2113,
+ afii61352: 0x2116,
+ afii61573: 0x202C,
+ afii61574: 0x202D,
+ afii61575: 0x202E,
+ afii61664: 0x200C,
+ afii63167: 0x066D,
+ afii64937: 0x02BD,
+ agrave: 0x00E0,
+ agujarati: 0x0A85,
+ agurmukhi: 0x0A05,
+ ahiragana: 0x3042,
+ ahookabove: 0x1EA3,
+ aibengali: 0x0990,
+ aibopomofo: 0x311E,
+ aideva: 0x0910,
+ aiecyrillic: 0x04D5,
+ aigujarati: 0x0A90,
+ aigurmukhi: 0x0A10,
+ aimatragurmukhi: 0x0A48,
+ ainarabic: 0x0639,
+ ainfinalarabic: 0xFECA,
+ aininitialarabic: 0xFECB,
+ ainmedialarabic: 0xFECC,
+ ainvertedbreve: 0x0203,
+ aivowelsignbengali: 0x09C8,
+ aivowelsigndeva: 0x0948,
+ aivowelsigngujarati: 0x0AC8,
+ akatakana: 0x30A2,
+ akatakanahalfwidth: 0xFF71,
+ akorean: 0x314F,
+ alef: 0x05D0,
+ alefarabic: 0x0627,
+ alefdageshhebrew: 0xFB30,
+ aleffinalarabic: 0xFE8E,
+ alefhamzaabovearabic: 0x0623,
+ alefhamzaabovefinalarabic: 0xFE84,
+ alefhamzabelowarabic: 0x0625,
+ alefhamzabelowfinalarabic: 0xFE88,
+ alefhebrew: 0x05D0,
+ aleflamedhebrew: 0xFB4F,
+ alefmaddaabovearabic: 0x0622,
+ alefmaddaabovefinalarabic: 0xFE82,
+ alefmaksuraarabic: 0x0649,
+ alefmaksurafinalarabic: 0xFEF0,
+ alefmaksurainitialarabic: 0xFEF3,
+ alefmaksuramedialarabic: 0xFEF4,
+ alefpatahhebrew: 0xFB2E,
+ alefqamatshebrew: 0xFB2F,
+ aleph: 0x2135,
+ allequal: 0x224C,
+ alpha: 0x03B1,
+ alphatonos: 0x03AC,
+ amacron: 0x0101,
+ amonospace: 0xFF41,
+ ampersand: 0x0026,
+ ampersandmonospace: 0xFF06,
+ ampersandsmall: 0xF726,
+ amsquare: 0x33C2,
+ anbopomofo: 0x3122,
+ angbopomofo: 0x3124,
+ angbracketleft: 0x3008, // This glyph is missing from Adobe's original list.
+ angbracketright: 0x3009, // This glyph is missing from Adobe's original list.
+ angkhankhuthai: 0x0E5A,
+ angle: 0x2220,
+ anglebracketleft: 0x3008,
+ anglebracketleftvertical: 0xFE3F,
+ anglebracketright: 0x3009,
+ anglebracketrightvertical: 0xFE40,
+ angleleft: 0x2329,
+ angleright: 0x232A,
+ angstrom: 0x212B,
+ anoteleia: 0x0387,
+ anudattadeva: 0x0952,
+ anusvarabengali: 0x0982,
+ anusvaradeva: 0x0902,
+ anusvaragujarati: 0x0A82,
+ aogonek: 0x0105,
+ apaatosquare: 0x3300,
+ aparen: 0x249C,
+ apostrophearmenian: 0x055A,
+ apostrophemod: 0x02BC,
+ apple: 0xF8FF,
+ approaches: 0x2250,
+ approxequal: 0x2248,
+ approxequalorimage: 0x2252,
+ approximatelyequal: 0x2245,
+ araeaekorean: 0x318E,
+ araeakorean: 0x318D,
+ arc: 0x2312,
+ arighthalfring: 0x1E9A,
+ aring: 0x00E5,
+ aringacute: 0x01FB,
+ aringbelow: 0x1E01,
+ arrowboth: 0x2194,
+ arrowdashdown: 0x21E3,
+ arrowdashleft: 0x21E0,
+ arrowdashright: 0x21E2,
+ arrowdashup: 0x21E1,
+ arrowdblboth: 0x21D4,
+ arrowdbldown: 0x21D3,
+ arrowdblleft: 0x21D0,
+ arrowdblright: 0x21D2,
+ arrowdblup: 0x21D1,
+ arrowdown: 0x2193,
+ arrowdownleft: 0x2199,
+ arrowdownright: 0x2198,
+ arrowdownwhite: 0x21E9,
+ arrowheaddownmod: 0x02C5,
+ arrowheadleftmod: 0x02C2,
+ arrowheadrightmod: 0x02C3,
+ arrowheadupmod: 0x02C4,
+ arrowhorizex: 0xF8E7,
+ arrowleft: 0x2190,
+ arrowleftdbl: 0x21D0,
+ arrowleftdblstroke: 0x21CD,
+ arrowleftoverright: 0x21C6,
+ arrowleftwhite: 0x21E6,
+ arrowright: 0x2192,
+ arrowrightdblstroke: 0x21CF,
+ arrowrightheavy: 0x279E,
+ arrowrightoverleft: 0x21C4,
+ arrowrightwhite: 0x21E8,
+ arrowtableft: 0x21E4,
+ arrowtabright: 0x21E5,
+ arrowup: 0x2191,
+ arrowupdn: 0x2195,
+ arrowupdnbse: 0x21A8,
+ arrowupdownbase: 0x21A8,
+ arrowupleft: 0x2196,
+ arrowupleftofdown: 0x21C5,
+ arrowupright: 0x2197,
+ arrowupwhite: 0x21E7,
+ arrowvertex: 0xF8E6,
+ asciicircum: 0x005E,
+ asciicircummonospace: 0xFF3E,
+ asciitilde: 0x007E,
+ asciitildemonospace: 0xFF5E,
+ ascript: 0x0251,
+ ascriptturned: 0x0252,
+ asmallhiragana: 0x3041,
+ asmallkatakana: 0x30A1,
+ asmallkatakanahalfwidth: 0xFF67,
+ asterisk: 0x002A,
+ asteriskaltonearabic: 0x066D,
+ asteriskarabic: 0x066D,
+ asteriskmath: 0x2217,
+ asteriskmonospace: 0xFF0A,
+ asterisksmall: 0xFE61,
+ asterism: 0x2042,
+ asuperior: 0xF6E9,
+ asymptoticallyequal: 0x2243,
+ at: 0x0040,
+ atilde: 0x00E3,
+ atmonospace: 0xFF20,
+ atsmall: 0xFE6B,
+ aturned: 0x0250,
+ aubengali: 0x0994,
+ aubopomofo: 0x3120,
+ audeva: 0x0914,
+ augujarati: 0x0A94,
+ augurmukhi: 0x0A14,
+ aulengthmarkbengali: 0x09D7,
+ aumatragurmukhi: 0x0A4C,
+ auvowelsignbengali: 0x09CC,
+ auvowelsigndeva: 0x094C,
+ auvowelsigngujarati: 0x0ACC,
+ avagrahadeva: 0x093D,
+ aybarmenian: 0x0561,
+ ayin: 0x05E2,
+ ayinaltonehebrew: 0xFB20,
+ ayinhebrew: 0x05E2,
+ b: 0x0062,
+ babengali: 0x09AC,
+ backslash: 0x005C,
+ backslashmonospace: 0xFF3C,
+ badeva: 0x092C,
+ bagujarati: 0x0AAC,
+ bagurmukhi: 0x0A2C,
+ bahiragana: 0x3070,
+ bahtthai: 0x0E3F,
+ bakatakana: 0x30D0,
+ bar: 0x007C,
+ barmonospace: 0xFF5C,
+ bbopomofo: 0x3105,
+ bcircle: 0x24D1,
+ bdotaccent: 0x1E03,
+ bdotbelow: 0x1E05,
+ beamedsixteenthnotes: 0x266C,
+ because: 0x2235,
+ becyrillic: 0x0431,
+ beharabic: 0x0628,
+ behfinalarabic: 0xFE90,
+ behinitialarabic: 0xFE91,
+ behiragana: 0x3079,
+ behmedialarabic: 0xFE92,
+ behmeeminitialarabic: 0xFC9F,
+ behmeemisolatedarabic: 0xFC08,
+ behnoonfinalarabic: 0xFC6D,
+ bekatakana: 0x30D9,
+ benarmenian: 0x0562,
+ bet: 0x05D1,
+ beta: 0x03B2,
+ betasymbolgreek: 0x03D0,
+ betdagesh: 0xFB31,
+ betdageshhebrew: 0xFB31,
+ bethebrew: 0x05D1,
+ betrafehebrew: 0xFB4C,
+ bhabengali: 0x09AD,
+ bhadeva: 0x092D,
+ bhagujarati: 0x0AAD,
+ bhagurmukhi: 0x0A2D,
+ bhook: 0x0253,
+ bihiragana: 0x3073,
+ bikatakana: 0x30D3,
+ bilabialclick: 0x0298,
+ bindigurmukhi: 0x0A02,
+ birusquare: 0x3331,
+ blackcircle: 0x25CF,
+ blackdiamond: 0x25C6,
+ blackdownpointingtriangle: 0x25BC,
+ blackleftpointingpointer: 0x25C4,
+ blackleftpointingtriangle: 0x25C0,
+ blacklenticularbracketleft: 0x3010,
+ blacklenticularbracketleftvertical: 0xFE3B,
+ blacklenticularbracketright: 0x3011,
+ blacklenticularbracketrightvertical: 0xFE3C,
+ blacklowerlefttriangle: 0x25E3,
+ blacklowerrighttriangle: 0x25E2,
+ blackrectangle: 0x25AC,
+ blackrightpointingpointer: 0x25BA,
+ blackrightpointingtriangle: 0x25B6,
+ blacksmallsquare: 0x25AA,
+ blacksmilingface: 0x263B,
+ blacksquare: 0x25A0,
+ blackstar: 0x2605,
+ blackupperlefttriangle: 0x25E4,
+ blackupperrighttriangle: 0x25E5,
+ blackuppointingsmalltriangle: 0x25B4,
+ blackuppointingtriangle: 0x25B2,
+ blank: 0x2423,
+ blinebelow: 0x1E07,
+ block: 0x2588,
+ bmonospace: 0xFF42,
+ bobaimaithai: 0x0E1A,
+ bohiragana: 0x307C,
+ bokatakana: 0x30DC,
+ bparen: 0x249D,
+ bqsquare: 0x33C3,
+ braceex: 0xF8F4,
+ braceleft: 0x007B,
+ braceleftbt: 0xF8F3,
+ braceleftmid: 0xF8F2,
+ braceleftmonospace: 0xFF5B,
+ braceleftsmall: 0xFE5B,
+ bracelefttp: 0xF8F1,
+ braceleftvertical: 0xFE37,
+ braceright: 0x007D,
+ bracerightbt: 0xF8FE,
+ bracerightmid: 0xF8FD,
+ bracerightmonospace: 0xFF5D,
+ bracerightsmall: 0xFE5C,
+ bracerighttp: 0xF8FC,
+ bracerightvertical: 0xFE38,
+ bracketleft: 0x005B,
+ bracketleftbt: 0xF8F0,
+ bracketleftex: 0xF8EF,
+ bracketleftmonospace: 0xFF3B,
+ bracketlefttp: 0xF8EE,
+ bracketright: 0x005D,
+ bracketrightbt: 0xF8FB,
+ bracketrightex: 0xF8FA,
+ bracketrightmonospace: 0xFF3D,
+ bracketrighttp: 0xF8F9,
+ breve: 0x02D8,
+ brevebelowcmb: 0x032E,
+ brevecmb: 0x0306,
+ breveinvertedbelowcmb: 0x032F,
+ breveinvertedcmb: 0x0311,
+ breveinverteddoublecmb: 0x0361,
+ bridgebelowcmb: 0x032A,
+ bridgeinvertedbelowcmb: 0x033A,
+ brokenbar: 0x00A6,
+ bstroke: 0x0180,
+ bsuperior: 0xF6EA,
+ btopbar: 0x0183,
+ buhiragana: 0x3076,
+ bukatakana: 0x30D6,
+ bullet: 0x2022,
+ bulletinverse: 0x25D8,
+ bulletoperator: 0x2219,
+ bullseye: 0x25CE,
+ c: 0x0063,
+ caarmenian: 0x056E,
+ cabengali: 0x099A,
+ cacute: 0x0107,
+ cadeva: 0x091A,
+ cagujarati: 0x0A9A,
+ cagurmukhi: 0x0A1A,
+ calsquare: 0x3388,
+ candrabindubengali: 0x0981,
+ candrabinducmb: 0x0310,
+ candrabindudeva: 0x0901,
+ candrabindugujarati: 0x0A81,
+ capslock: 0x21EA,
+ careof: 0x2105,
+ caron: 0x02C7,
+ caronbelowcmb: 0x032C,
+ caroncmb: 0x030C,
+ carriagereturn: 0x21B5,
+ cbopomofo: 0x3118,
+ ccaron: 0x010D,
+ ccedilla: 0x00E7,
+ ccedillaacute: 0x1E09,
+ ccircle: 0x24D2,
+ ccircumflex: 0x0109,
+ ccurl: 0x0255,
+ cdot: 0x010B,
+ cdotaccent: 0x010B,
+ cdsquare: 0x33C5,
+ cedilla: 0x00B8,
+ cedillacmb: 0x0327,
+ cent: 0x00A2,
+ centigrade: 0x2103,
+ centinferior: 0xF6DF,
+ centmonospace: 0xFFE0,
+ centoldstyle: 0xF7A2,
+ centsuperior: 0xF6E0,
+ chaarmenian: 0x0579,
+ chabengali: 0x099B,
+ chadeva: 0x091B,
+ chagujarati: 0x0A9B,
+ chagurmukhi: 0x0A1B,
+ chbopomofo: 0x3114,
+ cheabkhasiancyrillic: 0x04BD,
+ checkmark: 0x2713,
+ checyrillic: 0x0447,
+ chedescenderabkhasiancyrillic: 0x04BF,
+ chedescendercyrillic: 0x04B7,
+ chedieresiscyrillic: 0x04F5,
+ cheharmenian: 0x0573,
+ chekhakassiancyrillic: 0x04CC,
+ cheverticalstrokecyrillic: 0x04B9,
+ chi: 0x03C7,
+ chieuchacirclekorean: 0x3277,
+ chieuchaparenkorean: 0x3217,
+ chieuchcirclekorean: 0x3269,
+ chieuchkorean: 0x314A,
+ chieuchparenkorean: 0x3209,
+ chochangthai: 0x0E0A,
+ chochanthai: 0x0E08,
+ chochingthai: 0x0E09,
+ chochoethai: 0x0E0C,
+ chook: 0x0188,
+ cieucacirclekorean: 0x3276,
+ cieucaparenkorean: 0x3216,
+ cieuccirclekorean: 0x3268,
+ cieuckorean: 0x3148,
+ cieucparenkorean: 0x3208,
+ cieucuparenkorean: 0x321C,
+ circle: 0x25CB,
+ circlecopyrt: 0x00A9, // This glyph is missing from Adobe's original list.
+ circlemultiply: 0x2297,
+ circleot: 0x2299,
+ circleplus: 0x2295,
+ circlepostalmark: 0x3036,
+ circlewithlefthalfblack: 0x25D0,
+ circlewithrighthalfblack: 0x25D1,
+ circumflex: 0x02C6,
+ circumflexbelowcmb: 0x032D,
+ circumflexcmb: 0x0302,
+ clear: 0x2327,
+ clickalveolar: 0x01C2,
+ clickdental: 0x01C0,
+ clicklateral: 0x01C1,
+ clickretroflex: 0x01C3,
+ club: 0x2663,
+ clubsuitblack: 0x2663,
+ clubsuitwhite: 0x2667,
+ cmcubedsquare: 0x33A4,
+ cmonospace: 0xFF43,
+ cmsquaredsquare: 0x33A0,
+ coarmenian: 0x0581,
+ colon: 0x003A,
+ colonmonetary: 0x20A1,
+ colonmonospace: 0xFF1A,
+ colonsign: 0x20A1,
+ colonsmall: 0xFE55,
+ colontriangularhalfmod: 0x02D1,
+ colontriangularmod: 0x02D0,
+ comma: 0x002C,
+ commaabovecmb: 0x0313,
+ commaaboverightcmb: 0x0315,
+ commaaccent: 0xF6C3,
+ commaarabic: 0x060C,
+ commaarmenian: 0x055D,
+ commainferior: 0xF6E1,
+ commamonospace: 0xFF0C,
+ commareversedabovecmb: 0x0314,
+ commareversedmod: 0x02BD,
+ commasmall: 0xFE50,
+ commasuperior: 0xF6E2,
+ commaturnedabovecmb: 0x0312,
+ commaturnedmod: 0x02BB,
+ compass: 0x263C,
+ congruent: 0x2245,
+ contourintegral: 0x222E,
+ control: 0x2303,
+ controlACK: 0x0006,
+ controlBEL: 0x0007,
+ controlBS: 0x0008,
+ controlCAN: 0x0018,
+ controlCR: 0x000D,
+ controlDC1: 0x0011,
+ controlDC2: 0x0012,
+ controlDC3: 0x0013,
+ controlDC4: 0x0014,
+ controlDEL: 0x007F,
+ controlDLE: 0x0010,
+ controlEM: 0x0019,
+ controlENQ: 0x0005,
+ controlEOT: 0x0004,
+ controlESC: 0x001B,
+ controlETB: 0x0017,
+ controlETX: 0x0003,
+ controlFF: 0x000C,
+ controlFS: 0x001C,
+ controlGS: 0x001D,
+ controlHT: 0x0009,
+ controlLF: 0x000A,
+ controlNAK: 0x0015,
+ controlRS: 0x001E,
+ controlSI: 0x000F,
+ controlSO: 0x000E,
+ controlSOT: 0x0002,
+ controlSTX: 0x0001,
+ controlSUB: 0x001A,
+ controlSYN: 0x0016,
+ controlUS: 0x001F,
+ controlVT: 0x000B,
+ copyright: 0x00A9,
+ copyrightsans: 0xF8E9,
+ copyrightserif: 0xF6D9,
+ cornerbracketleft: 0x300C,
+ cornerbracketlefthalfwidth: 0xFF62,
+ cornerbracketleftvertical: 0xFE41,
+ cornerbracketright: 0x300D,
+ cornerbracketrighthalfwidth: 0xFF63,
+ cornerbracketrightvertical: 0xFE42,
+ corporationsquare: 0x337F,
+ cosquare: 0x33C7,
+ coverkgsquare: 0x33C6,
+ cparen: 0x249E,
+ cruzeiro: 0x20A2,
+ cstretched: 0x0297,
+ curlyand: 0x22CF,
+ curlyor: 0x22CE,
+ currency: 0x00A4,
+ cyrBreve: 0xF6D1,
+ cyrFlex: 0xF6D2,
+ cyrbreve: 0xF6D4,
+ cyrflex: 0xF6D5,
+ d: 0x0064,
+ daarmenian: 0x0564,
+ dabengali: 0x09A6,
+ dadarabic: 0x0636,
+ dadeva: 0x0926,
+ dadfinalarabic: 0xFEBE,
+ dadinitialarabic: 0xFEBF,
+ dadmedialarabic: 0xFEC0,
+ dagesh: 0x05BC,
+ dageshhebrew: 0x05BC,
+ dagger: 0x2020,
+ daggerdbl: 0x2021,
+ dagujarati: 0x0AA6,
+ dagurmukhi: 0x0A26,
+ dahiragana: 0x3060,
+ dakatakana: 0x30C0,
+ dalarabic: 0x062F,
+ dalet: 0x05D3,
+ daletdagesh: 0xFB33,
+ daletdageshhebrew: 0xFB33,
+ dalethebrew: 0x05D3,
+ dalfinalarabic: 0xFEAA,
+ dammaarabic: 0x064F,
+ dammalowarabic: 0x064F,
+ dammatanaltonearabic: 0x064C,
+ dammatanarabic: 0x064C,
+ danda: 0x0964,
+ dargahebrew: 0x05A7,
+ dargalefthebrew: 0x05A7,
+ dasiapneumatacyrilliccmb: 0x0485,
+ dblGrave: 0xF6D3,
+ dblanglebracketleft: 0x300A,
+ dblanglebracketleftvertical: 0xFE3D,
+ dblanglebracketright: 0x300B,
+ dblanglebracketrightvertical: 0xFE3E,
+ dblarchinvertedbelowcmb: 0x032B,
+ dblarrowleft: 0x21D4,
+ dblarrowright: 0x21D2,
+ dbldanda: 0x0965,
+ dblgrave: 0xF6D6,
+ dblgravecmb: 0x030F,
+ dblintegral: 0x222C,
+ dbllowline: 0x2017,
+ dbllowlinecmb: 0x0333,
+ dbloverlinecmb: 0x033F,
+ dblprimemod: 0x02BA,
+ dblverticalbar: 0x2016,
+ dblverticallineabovecmb: 0x030E,
+ dbopomofo: 0x3109,
+ dbsquare: 0x33C8,
+ dcaron: 0x010F,
+ dcedilla: 0x1E11,
+ dcircle: 0x24D3,
+ dcircumflexbelow: 0x1E13,
+ dcroat: 0x0111,
+ ddabengali: 0x09A1,
+ ddadeva: 0x0921,
+ ddagujarati: 0x0AA1,
+ ddagurmukhi: 0x0A21,
+ ddalarabic: 0x0688,
+ ddalfinalarabic: 0xFB89,
+ dddhadeva: 0x095C,
+ ddhabengali: 0x09A2,
+ ddhadeva: 0x0922,
+ ddhagujarati: 0x0AA2,
+ ddhagurmukhi: 0x0A22,
+ ddotaccent: 0x1E0B,
+ ddotbelow: 0x1E0D,
+ decimalseparatorarabic: 0x066B,
+ decimalseparatorpersian: 0x066B,
+ decyrillic: 0x0434,
+ degree: 0x00B0,
+ dehihebrew: 0x05AD,
+ dehiragana: 0x3067,
+ deicoptic: 0x03EF,
+ dekatakana: 0x30C7,
+ deleteleft: 0x232B,
+ deleteright: 0x2326,
+ delta: 0x03B4,
+ deltaturned: 0x018D,
+ denominatorminusonenumeratorbengali: 0x09F8,
+ dezh: 0x02A4,
+ dhabengali: 0x09A7,
+ dhadeva: 0x0927,
+ dhagujarati: 0x0AA7,
+ dhagurmukhi: 0x0A27,
+ dhook: 0x0257,
+ dialytikatonos: 0x0385,
+ dialytikatonoscmb: 0x0344,
+ diamond: 0x2666,
+ diamondsuitwhite: 0x2662,
+ dieresis: 0x00A8,
+ dieresisacute: 0xF6D7,
+ dieresisbelowcmb: 0x0324,
+ dieresiscmb: 0x0308,
+ dieresisgrave: 0xF6D8,
+ dieresistonos: 0x0385,
+ dihiragana: 0x3062,
+ dikatakana: 0x30C2,
+ dittomark: 0x3003,
+ divide: 0x00F7,
+ divides: 0x2223,
+ divisionslash: 0x2215,
+ djecyrillic: 0x0452,
+ dkshade: 0x2593,
+ dlinebelow: 0x1E0F,
+ dlsquare: 0x3397,
+ dmacron: 0x0111,
+ dmonospace: 0xFF44,
+ dnblock: 0x2584,
+ dochadathai: 0x0E0E,
+ dodekthai: 0x0E14,
+ dohiragana: 0x3069,
+ dokatakana: 0x30C9,
+ dollar: 0x0024,
+ dollarinferior: 0xF6E3,
+ dollarmonospace: 0xFF04,
+ dollaroldstyle: 0xF724,
+ dollarsmall: 0xFE69,
+ dollarsuperior: 0xF6E4,
+ dong: 0x20AB,
+ dorusquare: 0x3326,
+ dotaccent: 0x02D9,
+ dotaccentcmb: 0x0307,
+ dotbelowcmb: 0x0323,
+ dotbelowcomb: 0x0323,
+ dotkatakana: 0x30FB,
+ dotlessi: 0x0131,
+ dotlessj: 0xF6BE,
+ dotlessjstrokehook: 0x0284,
+ dotmath: 0x22C5,
+ dottedcircle: 0x25CC,
+ doubleyodpatah: 0xFB1F,
+ doubleyodpatahhebrew: 0xFB1F,
+ downtackbelowcmb: 0x031E,
+ downtackmod: 0x02D5,
+ dparen: 0x249F,
+ dsuperior: 0xF6EB,
+ dtail: 0x0256,
+ dtopbar: 0x018C,
+ duhiragana: 0x3065,
+ dukatakana: 0x30C5,
+ dz: 0x01F3,
+ dzaltone: 0x02A3,
+ dzcaron: 0x01C6,
+ dzcurl: 0x02A5,
+ dzeabkhasiancyrillic: 0x04E1,
+ dzecyrillic: 0x0455,
+ dzhecyrillic: 0x045F,
+ e: 0x0065,
+ eacute: 0x00E9,
+ earth: 0x2641,
+ ebengali: 0x098F,
+ ebopomofo: 0x311C,
+ ebreve: 0x0115,
+ ecandradeva: 0x090D,
+ ecandragujarati: 0x0A8D,
+ ecandravowelsigndeva: 0x0945,
+ ecandravowelsigngujarati: 0x0AC5,
+ ecaron: 0x011B,
+ ecedillabreve: 0x1E1D,
+ echarmenian: 0x0565,
+ echyiwnarmenian: 0x0587,
+ ecircle: 0x24D4,
+ ecircumflex: 0x00EA,
+ ecircumflexacute: 0x1EBF,
+ ecircumflexbelow: 0x1E19,
+ ecircumflexdotbelow: 0x1EC7,
+ ecircumflexgrave: 0x1EC1,
+ ecircumflexhookabove: 0x1EC3,
+ ecircumflextilde: 0x1EC5,
+ ecyrillic: 0x0454,
+ edblgrave: 0x0205,
+ edeva: 0x090F,
+ edieresis: 0x00EB,
+ edot: 0x0117,
+ edotaccent: 0x0117,
+ edotbelow: 0x1EB9,
+ eegurmukhi: 0x0A0F,
+ eematragurmukhi: 0x0A47,
+ efcyrillic: 0x0444,
+ egrave: 0x00E8,
+ egujarati: 0x0A8F,
+ eharmenian: 0x0567,
+ ehbopomofo: 0x311D,
+ ehiragana: 0x3048,
+ ehookabove: 0x1EBB,
+ eibopomofo: 0x311F,
+ eight: 0x0038,
+ eightarabic: 0x0668,
+ eightbengali: 0x09EE,
+ eightcircle: 0x2467,
+ eightcircleinversesansserif: 0x2791,
+ eightdeva: 0x096E,
+ eighteencircle: 0x2471,
+ eighteenparen: 0x2485,
+ eighteenperiod: 0x2499,
+ eightgujarati: 0x0AEE,
+ eightgurmukhi: 0x0A6E,
+ eighthackarabic: 0x0668,
+ eighthangzhou: 0x3028,
+ eighthnotebeamed: 0x266B,
+ eightideographicparen: 0x3227,
+ eightinferior: 0x2088,
+ eightmonospace: 0xFF18,
+ eightoldstyle: 0xF738,
+ eightparen: 0x247B,
+ eightperiod: 0x248F,
+ eightpersian: 0x06F8,
+ eightroman: 0x2177,
+ eightsuperior: 0x2078,
+ eightthai: 0x0E58,
+ einvertedbreve: 0x0207,
+ eiotifiedcyrillic: 0x0465,
+ ekatakana: 0x30A8,
+ ekatakanahalfwidth: 0xFF74,
+ ekonkargurmukhi: 0x0A74,
+ ekorean: 0x3154,
+ elcyrillic: 0x043B,
+ element: 0x2208,
+ elevencircle: 0x246A,
+ elevenparen: 0x247E,
+ elevenperiod: 0x2492,
+ elevenroman: 0x217A,
+ ellipsis: 0x2026,
+ ellipsisvertical: 0x22EE,
+ emacron: 0x0113,
+ emacronacute: 0x1E17,
+ emacrongrave: 0x1E15,
+ emcyrillic: 0x043C,
+ emdash: 0x2014,
+ emdashvertical: 0xFE31,
+ emonospace: 0xFF45,
+ emphasismarkarmenian: 0x055B,
+ emptyset: 0x2205,
+ enbopomofo: 0x3123,
+ encyrillic: 0x043D,
+ endash: 0x2013,
+ endashvertical: 0xFE32,
+ endescendercyrillic: 0x04A3,
+ eng: 0x014B,
+ engbopomofo: 0x3125,
+ enghecyrillic: 0x04A5,
+ enhookcyrillic: 0x04C8,
+ enspace: 0x2002,
+ eogonek: 0x0119,
+ eokorean: 0x3153,
+ eopen: 0x025B,
+ eopenclosed: 0x029A,
+ eopenreversed: 0x025C,
+ eopenreversedclosed: 0x025E,
+ eopenreversedhook: 0x025D,
+ eparen: 0x24A0,
+ epsilon: 0x03B5,
+ epsilontonos: 0x03AD,
+ equal: 0x003D,
+ equalmonospace: 0xFF1D,
+ equalsmall: 0xFE66,
+ equalsuperior: 0x207C,
+ equivalence: 0x2261,
+ erbopomofo: 0x3126,
+ ercyrillic: 0x0440,
+ ereversed: 0x0258,
+ ereversedcyrillic: 0x044D,
+ escyrillic: 0x0441,
+ esdescendercyrillic: 0x04AB,
+ esh: 0x0283,
+ eshcurl: 0x0286,
+ eshortdeva: 0x090E,
+ eshortvowelsigndeva: 0x0946,
+ eshreversedloop: 0x01AA,
+ eshsquatreversed: 0x0285,
+ esmallhiragana: 0x3047,
+ esmallkatakana: 0x30A7,
+ esmallkatakanahalfwidth: 0xFF6A,
+ estimated: 0x212E,
+ esuperior: 0xF6EC,
+ eta: 0x03B7,
+ etarmenian: 0x0568,
+ etatonos: 0x03AE,
+ eth: 0x00F0,
+ etilde: 0x1EBD,
+ etildebelow: 0x1E1B,
+ etnahtafoukhhebrew: 0x0591,
+ etnahtafoukhlefthebrew: 0x0591,
+ etnahtahebrew: 0x0591,
+ etnahtalefthebrew: 0x0591,
+ eturned: 0x01DD,
+ eukorean: 0x3161,
+ euro: 0x20AC,
+ evowelsignbengali: 0x09C7,
+ evowelsigndeva: 0x0947,
+ evowelsigngujarati: 0x0AC7,
+ exclam: 0x0021,
+ exclamarmenian: 0x055C,
+ exclamdbl: 0x203C,
+ exclamdown: 0x00A1,
+ exclamdownsmall: 0xF7A1,
+ exclammonospace: 0xFF01,
+ exclamsmall: 0xF721,
+ existential: 0x2203,
+ ezh: 0x0292,
+ ezhcaron: 0x01EF,
+ ezhcurl: 0x0293,
+ ezhreversed: 0x01B9,
+ ezhtail: 0x01BA,
+ f: 0x0066,
+ fadeva: 0x095E,
+ fagurmukhi: 0x0A5E,
+ fahrenheit: 0x2109,
+ fathaarabic: 0x064E,
+ fathalowarabic: 0x064E,
+ fathatanarabic: 0x064B,
+ fbopomofo: 0x3108,
+ fcircle: 0x24D5,
+ fdotaccent: 0x1E1F,
+ feharabic: 0x0641,
+ feharmenian: 0x0586,
+ fehfinalarabic: 0xFED2,
+ fehinitialarabic: 0xFED3,
+ fehmedialarabic: 0xFED4,
+ feicoptic: 0x03E5,
+ female: 0x2640,
+ ff: 0xFB00,
+ ffi: 0xFB03,
+ ffl: 0xFB04,
+ fi: 0xFB01,
+ fifteencircle: 0x246E,
+ fifteenparen: 0x2482,
+ fifteenperiod: 0x2496,
+ figuredash: 0x2012,
+ filledbox: 0x25A0,
+ filledrect: 0x25AC,
+ finalkaf: 0x05DA,
+ finalkafdagesh: 0xFB3A,
+ finalkafdageshhebrew: 0xFB3A,
+ finalkafhebrew: 0x05DA,
+ finalmem: 0x05DD,
+ finalmemhebrew: 0x05DD,
+ finalnun: 0x05DF,
+ finalnunhebrew: 0x05DF,
+ finalpe: 0x05E3,
+ finalpehebrew: 0x05E3,
+ finaltsadi: 0x05E5,
+ finaltsadihebrew: 0x05E5,
+ firsttonechinese: 0x02C9,
+ fisheye: 0x25C9,
+ fitacyrillic: 0x0473,
+ five: 0x0035,
+ fivearabic: 0x0665,
+ fivebengali: 0x09EB,
+ fivecircle: 0x2464,
+ fivecircleinversesansserif: 0x278E,
+ fivedeva: 0x096B,
+ fiveeighths: 0x215D,
+ fivegujarati: 0x0AEB,
+ fivegurmukhi: 0x0A6B,
+ fivehackarabic: 0x0665,
+ fivehangzhou: 0x3025,
+ fiveideographicparen: 0x3224,
+ fiveinferior: 0x2085,
+ fivemonospace: 0xFF15,
+ fiveoldstyle: 0xF735,
+ fiveparen: 0x2478,
+ fiveperiod: 0x248C,
+ fivepersian: 0x06F5,
+ fiveroman: 0x2174,
+ fivesuperior: 0x2075,
+ fivethai: 0x0E55,
+ fl: 0xFB02,
+ florin: 0x0192,
+ fmonospace: 0xFF46,
+ fmsquare: 0x3399,
+ fofanthai: 0x0E1F,
+ fofathai: 0x0E1D,
+ fongmanthai: 0x0E4F,
+ forall: 0x2200,
+ four: 0x0034,
+ fourarabic: 0x0664,
+ fourbengali: 0x09EA,
+ fourcircle: 0x2463,
+ fourcircleinversesansserif: 0x278D,
+ fourdeva: 0x096A,
+ fourgujarati: 0x0AEA,
+ fourgurmukhi: 0x0A6A,
+ fourhackarabic: 0x0664,
+ fourhangzhou: 0x3024,
+ fourideographicparen: 0x3223,
+ fourinferior: 0x2084,
+ fourmonospace: 0xFF14,
+ fournumeratorbengali: 0x09F7,
+ fouroldstyle: 0xF734,
+ fourparen: 0x2477,
+ fourperiod: 0x248B,
+ fourpersian: 0x06F4,
+ fourroman: 0x2173,
+ foursuperior: 0x2074,
+ fourteencircle: 0x246D,
+ fourteenparen: 0x2481,
+ fourteenperiod: 0x2495,
+ fourthai: 0x0E54,
+ fourthtonechinese: 0x02CB,
+ fparen: 0x24A1,
+ fraction: 0x2044,
+ franc: 0x20A3,
+ g: 0x0067,
+ gabengali: 0x0997,
+ gacute: 0x01F5,
+ gadeva: 0x0917,
+ gafarabic: 0x06AF,
+ gaffinalarabic: 0xFB93,
+ gafinitialarabic: 0xFB94,
+ gafmedialarabic: 0xFB95,
+ gagujarati: 0x0A97,
+ gagurmukhi: 0x0A17,
+ gahiragana: 0x304C,
+ gakatakana: 0x30AC,
+ gamma: 0x03B3,
+ gammalatinsmall: 0x0263,
+ gammasuperior: 0x02E0,
+ gangiacoptic: 0x03EB,
+ gbopomofo: 0x310D,
+ gbreve: 0x011F,
+ gcaron: 0x01E7,
+ gcedilla: 0x0123,
+ gcircle: 0x24D6,
+ gcircumflex: 0x011D,
+ gcommaaccent: 0x0123,
+ gdot: 0x0121,
+ gdotaccent: 0x0121,
+ gecyrillic: 0x0433,
+ gehiragana: 0x3052,
+ gekatakana: 0x30B2,
+ geometricallyequal: 0x2251,
+ gereshaccenthebrew: 0x059C,
+ gereshhebrew: 0x05F3,
+ gereshmuqdamhebrew: 0x059D,
+ germandbls: 0x00DF,
+ gershayimaccenthebrew: 0x059E,
+ gershayimhebrew: 0x05F4,
+ getamark: 0x3013,
+ ghabengali: 0x0998,
+ ghadarmenian: 0x0572,
+ ghadeva: 0x0918,
+ ghagujarati: 0x0A98,
+ ghagurmukhi: 0x0A18,
+ ghainarabic: 0x063A,
+ ghainfinalarabic: 0xFECE,
+ ghaininitialarabic: 0xFECF,
+ ghainmedialarabic: 0xFED0,
+ ghemiddlehookcyrillic: 0x0495,
+ ghestrokecyrillic: 0x0493,
+ gheupturncyrillic: 0x0491,
+ ghhadeva: 0x095A,
+ ghhagurmukhi: 0x0A5A,
+ ghook: 0x0260,
+ ghzsquare: 0x3393,
+ gihiragana: 0x304E,
+ gikatakana: 0x30AE,
+ gimarmenian: 0x0563,
+ gimel: 0x05D2,
+ gimeldagesh: 0xFB32,
+ gimeldageshhebrew: 0xFB32,
+ gimelhebrew: 0x05D2,
+ gjecyrillic: 0x0453,
+ glottalinvertedstroke: 0x01BE,
+ glottalstop: 0x0294,
+ glottalstopinverted: 0x0296,
+ glottalstopmod: 0x02C0,
+ glottalstopreversed: 0x0295,
+ glottalstopreversedmod: 0x02C1,
+ glottalstopreversedsuperior: 0x02E4,
+ glottalstopstroke: 0x02A1,
+ glottalstopstrokereversed: 0x02A2,
+ gmacron: 0x1E21,
+ gmonospace: 0xFF47,
+ gohiragana: 0x3054,
+ gokatakana: 0x30B4,
+ gparen: 0x24A2,
+ gpasquare: 0x33AC,
+ gradient: 0x2207,
+ grave: 0x0060,
+ gravebelowcmb: 0x0316,
+ gravecmb: 0x0300,
+ gravecomb: 0x0300,
+ gravedeva: 0x0953,
+ gravelowmod: 0x02CE,
+ gravemonospace: 0xFF40,
+ gravetonecmb: 0x0340,
+ greater: 0x003E,
+ greaterequal: 0x2265,
+ greaterequalorless: 0x22DB,
+ greatermonospace: 0xFF1E,
+ greaterorequivalent: 0x2273,
+ greaterorless: 0x2277,
+ greateroverequal: 0x2267,
+ greatersmall: 0xFE65,
+ gscript: 0x0261,
+ gstroke: 0x01E5,
+ guhiragana: 0x3050,
+ guillemotleft: 0x00AB,
+ guillemotright: 0x00BB,
+ guilsinglleft: 0x2039,
+ guilsinglright: 0x203A,
+ gukatakana: 0x30B0,
+ guramusquare: 0x3318,
+ gysquare: 0x33C9,
+ h: 0x0068,
+ haabkhasiancyrillic: 0x04A9,
+ haaltonearabic: 0x06C1,
+ habengali: 0x09B9,
+ hadescendercyrillic: 0x04B3,
+ hadeva: 0x0939,
+ hagujarati: 0x0AB9,
+ hagurmukhi: 0x0A39,
+ haharabic: 0x062D,
+ hahfinalarabic: 0xFEA2,
+ hahinitialarabic: 0xFEA3,
+ hahiragana: 0x306F,
+ hahmedialarabic: 0xFEA4,
+ haitusquare: 0x332A,
+ hakatakana: 0x30CF,
+ hakatakanahalfwidth: 0xFF8A,
+ halantgurmukhi: 0x0A4D,
+ hamzaarabic: 0x0621,
+ hamzalowarabic: 0x0621,
+ hangulfiller: 0x3164,
+ hardsigncyrillic: 0x044A,
+ harpoonleftbarbup: 0x21BC,
+ harpoonrightbarbup: 0x21C0,
+ hasquare: 0x33CA,
+ hatafpatah: 0x05B2,
+ hatafpatah16: 0x05B2,
+ hatafpatah23: 0x05B2,
+ hatafpatah2f: 0x05B2,
+ hatafpatahhebrew: 0x05B2,
+ hatafpatahnarrowhebrew: 0x05B2,
+ hatafpatahquarterhebrew: 0x05B2,
+ hatafpatahwidehebrew: 0x05B2,
+ hatafqamats: 0x05B3,
+ hatafqamats1b: 0x05B3,
+ hatafqamats28: 0x05B3,
+ hatafqamats34: 0x05B3,
+ hatafqamatshebrew: 0x05B3,
+ hatafqamatsnarrowhebrew: 0x05B3,
+ hatafqamatsquarterhebrew: 0x05B3,
+ hatafqamatswidehebrew: 0x05B3,
+ hatafsegol: 0x05B1,
+ hatafsegol17: 0x05B1,
+ hatafsegol24: 0x05B1,
+ hatafsegol30: 0x05B1,
+ hatafsegolhebrew: 0x05B1,
+ hatafsegolnarrowhebrew: 0x05B1,
+ hatafsegolquarterhebrew: 0x05B1,
+ hatafsegolwidehebrew: 0x05B1,
+ hbar: 0x0127,
+ hbopomofo: 0x310F,
+ hbrevebelow: 0x1E2B,
+ hcedilla: 0x1E29,
+ hcircle: 0x24D7,
+ hcircumflex: 0x0125,
+ hdieresis: 0x1E27,
+ hdotaccent: 0x1E23,
+ hdotbelow: 0x1E25,
+ he: 0x05D4,
+ heart: 0x2665,
+ heartsuitblack: 0x2665,
+ heartsuitwhite: 0x2661,
+ hedagesh: 0xFB34,
+ hedageshhebrew: 0xFB34,
+ hehaltonearabic: 0x06C1,
+ heharabic: 0x0647,
+ hehebrew: 0x05D4,
+ hehfinalaltonearabic: 0xFBA7,
+ hehfinalalttwoarabic: 0xFEEA,
+ hehfinalarabic: 0xFEEA,
+ hehhamzaabovefinalarabic: 0xFBA5,
+ hehhamzaaboveisolatedarabic: 0xFBA4,
+ hehinitialaltonearabic: 0xFBA8,
+ hehinitialarabic: 0xFEEB,
+ hehiragana: 0x3078,
+ hehmedialaltonearabic: 0xFBA9,
+ hehmedialarabic: 0xFEEC,
+ heiseierasquare: 0x337B,
+ hekatakana: 0x30D8,
+ hekatakanahalfwidth: 0xFF8D,
+ hekutaarusquare: 0x3336,
+ henghook: 0x0267,
+ herutusquare: 0x3339,
+ het: 0x05D7,
+ hethebrew: 0x05D7,
+ hhook: 0x0266,
+ hhooksuperior: 0x02B1,
+ hieuhacirclekorean: 0x327B,
+ hieuhaparenkorean: 0x321B,
+ hieuhcirclekorean: 0x326D,
+ hieuhkorean: 0x314E,
+ hieuhparenkorean: 0x320D,
+ hihiragana: 0x3072,
+ hikatakana: 0x30D2,
+ hikatakanahalfwidth: 0xFF8B,
+ hiriq: 0x05B4,
+ hiriq14: 0x05B4,
+ hiriq21: 0x05B4,
+ hiriq2d: 0x05B4,
+ hiriqhebrew: 0x05B4,
+ hiriqnarrowhebrew: 0x05B4,
+ hiriqquarterhebrew: 0x05B4,
+ hiriqwidehebrew: 0x05B4,
+ hlinebelow: 0x1E96,
+ hmonospace: 0xFF48,
+ hoarmenian: 0x0570,
+ hohipthai: 0x0E2B,
+ hohiragana: 0x307B,
+ hokatakana: 0x30DB,
+ hokatakanahalfwidth: 0xFF8E,
+ holam: 0x05B9,
+ holam19: 0x05B9,
+ holam26: 0x05B9,
+ holam32: 0x05B9,
+ holamhebrew: 0x05B9,
+ holamnarrowhebrew: 0x05B9,
+ holamquarterhebrew: 0x05B9,
+ holamwidehebrew: 0x05B9,
+ honokhukthai: 0x0E2E,
+ hookabovecomb: 0x0309,
+ hookcmb: 0x0309,
+ hookpalatalizedbelowcmb: 0x0321,
+ hookretroflexbelowcmb: 0x0322,
+ hoonsquare: 0x3342,
+ horicoptic: 0x03E9,
+ horizontalbar: 0x2015,
+ horncmb: 0x031B,
+ hotsprings: 0x2668,
+ house: 0x2302,
+ hparen: 0x24A3,
+ hsuperior: 0x02B0,
+ hturned: 0x0265,
+ huhiragana: 0x3075,
+ huiitosquare: 0x3333,
+ hukatakana: 0x30D5,
+ hukatakanahalfwidth: 0xFF8C,
+ hungarumlaut: 0x02DD,
+ hungarumlautcmb: 0x030B,
+ hv: 0x0195,
+ hyphen: 0x002D,
+ hypheninferior: 0xF6E5,
+ hyphenmonospace: 0xFF0D,
+ hyphensmall: 0xFE63,
+ hyphensuperior: 0xF6E6,
+ hyphentwo: 0x2010,
+ i: 0x0069,
+ iacute: 0x00ED,
+ iacyrillic: 0x044F,
+ ibengali: 0x0987,
+ ibopomofo: 0x3127,
+ ibreve: 0x012D,
+ icaron: 0x01D0,
+ icircle: 0x24D8,
+ icircumflex: 0x00EE,
+ icyrillic: 0x0456,
+ idblgrave: 0x0209,
+ ideographearthcircle: 0x328F,
+ ideographfirecircle: 0x328B,
+ ideographicallianceparen: 0x323F,
+ ideographiccallparen: 0x323A,
+ ideographiccentrecircle: 0x32A5,
+ ideographicclose: 0x3006,
+ ideographiccomma: 0x3001,
+ ideographiccommaleft: 0xFF64,
+ ideographiccongratulationparen: 0x3237,
+ ideographiccorrectcircle: 0x32A3,
+ ideographicearthparen: 0x322F,
+ ideographicenterpriseparen: 0x323D,
+ ideographicexcellentcircle: 0x329D,
+ ideographicfestivalparen: 0x3240,
+ ideographicfinancialcircle: 0x3296,
+ ideographicfinancialparen: 0x3236,
+ ideographicfireparen: 0x322B,
+ ideographichaveparen: 0x3232,
+ ideographichighcircle: 0x32A4,
+ ideographiciterationmark: 0x3005,
+ ideographiclaborcircle: 0x3298,
+ ideographiclaborparen: 0x3238,
+ ideographicleftcircle: 0x32A7,
+ ideographiclowcircle: 0x32A6,
+ ideographicmedicinecircle: 0x32A9,
+ ideographicmetalparen: 0x322E,
+ ideographicmoonparen: 0x322A,
+ ideographicnameparen: 0x3234,
+ ideographicperiod: 0x3002,
+ ideographicprintcircle: 0x329E,
+ ideographicreachparen: 0x3243,
+ ideographicrepresentparen: 0x3239,
+ ideographicresourceparen: 0x323E,
+ ideographicrightcircle: 0x32A8,
+ ideographicsecretcircle: 0x3299,
+ ideographicselfparen: 0x3242,
+ ideographicsocietyparen: 0x3233,
+ ideographicspace: 0x3000,
+ ideographicspecialparen: 0x3235,
+ ideographicstockparen: 0x3231,
+ ideographicstudyparen: 0x323B,
+ ideographicsunparen: 0x3230,
+ ideographicsuperviseparen: 0x323C,
+ ideographicwaterparen: 0x322C,
+ ideographicwoodparen: 0x322D,
+ ideographiczero: 0x3007,
+ ideographmetalcircle: 0x328E,
+ ideographmooncircle: 0x328A,
+ ideographnamecircle: 0x3294,
+ ideographsuncircle: 0x3290,
+ ideographwatercircle: 0x328C,
+ ideographwoodcircle: 0x328D,
+ ideva: 0x0907,
+ idieresis: 0x00EF,
+ idieresisacute: 0x1E2F,
+ idieresiscyrillic: 0x04E5,
+ idotbelow: 0x1ECB,
+ iebrevecyrillic: 0x04D7,
+ iecyrillic: 0x0435,
+ ieungacirclekorean: 0x3275,
+ ieungaparenkorean: 0x3215,
+ ieungcirclekorean: 0x3267,
+ ieungkorean: 0x3147,
+ ieungparenkorean: 0x3207,
+ igrave: 0x00EC,
+ igujarati: 0x0A87,
+ igurmukhi: 0x0A07,
+ ihiragana: 0x3044,
+ ihookabove: 0x1EC9,
+ iibengali: 0x0988,
+ iicyrillic: 0x0438,
+ iideva: 0x0908,
+ iigujarati: 0x0A88,
+ iigurmukhi: 0x0A08,
+ iimatragurmukhi: 0x0A40,
+ iinvertedbreve: 0x020B,
+ iishortcyrillic: 0x0439,
+ iivowelsignbengali: 0x09C0,
+ iivowelsigndeva: 0x0940,
+ iivowelsigngujarati: 0x0AC0,
+ ij: 0x0133,
+ ikatakana: 0x30A4,
+ ikatakanahalfwidth: 0xFF72,
+ ikorean: 0x3163,
+ ilde: 0x02DC,
+ iluyhebrew: 0x05AC,
+ imacron: 0x012B,
+ imacroncyrillic: 0x04E3,
+ imageorapproximatelyequal: 0x2253,
+ imatragurmukhi: 0x0A3F,
+ imonospace: 0xFF49,
+ increment: 0x2206,
+ infinity: 0x221E,
+ iniarmenian: 0x056B,
+ integral: 0x222B,
+ integralbottom: 0x2321,
+ integralbt: 0x2321,
+ integralex: 0xF8F5,
+ integraltop: 0x2320,
+ integraltp: 0x2320,
+ intersection: 0x2229,
+ intisquare: 0x3305,
+ invbullet: 0x25D8,
+ invcircle: 0x25D9,
+ invsmileface: 0x263B,
+ iocyrillic: 0x0451,
+ iogonek: 0x012F,
+ iota: 0x03B9,
+ iotadieresis: 0x03CA,
+ iotadieresistonos: 0x0390,
+ iotalatin: 0x0269,
+ iotatonos: 0x03AF,
+ iparen: 0x24A4,
+ irigurmukhi: 0x0A72,
+ ismallhiragana: 0x3043,
+ ismallkatakana: 0x30A3,
+ ismallkatakanahalfwidth: 0xFF68,
+ issharbengali: 0x09FA,
+ istroke: 0x0268,
+ isuperior: 0xF6ED,
+ iterationhiragana: 0x309D,
+ iterationkatakana: 0x30FD,
+ itilde: 0x0129,
+ itildebelow: 0x1E2D,
+ iubopomofo: 0x3129,
+ iucyrillic: 0x044E,
+ ivowelsignbengali: 0x09BF,
+ ivowelsigndeva: 0x093F,
+ ivowelsigngujarati: 0x0ABF,
+ izhitsacyrillic: 0x0475,
+ izhitsadblgravecyrillic: 0x0477,
+ j: 0x006A,
+ jaarmenian: 0x0571,
+ jabengali: 0x099C,
+ jadeva: 0x091C,
+ jagujarati: 0x0A9C,
+ jagurmukhi: 0x0A1C,
+ jbopomofo: 0x3110,
+ jcaron: 0x01F0,
+ jcircle: 0x24D9,
+ jcircumflex: 0x0135,
+ jcrossedtail: 0x029D,
+ jdotlessstroke: 0x025F,
+ jecyrillic: 0x0458,
+ jeemarabic: 0x062C,
+ jeemfinalarabic: 0xFE9E,
+ jeeminitialarabic: 0xFE9F,
+ jeemmedialarabic: 0xFEA0,
+ jeharabic: 0x0698,
+ jehfinalarabic: 0xFB8B,
+ jhabengali: 0x099D,
+ jhadeva: 0x091D,
+ jhagujarati: 0x0A9D,
+ jhagurmukhi: 0x0A1D,
+ jheharmenian: 0x057B,
+ jis: 0x3004,
+ jmonospace: 0xFF4A,
+ jparen: 0x24A5,
+ jsuperior: 0x02B2,
+ k: 0x006B,
+ kabashkircyrillic: 0x04A1,
+ kabengali: 0x0995,
+ kacute: 0x1E31,
+ kacyrillic: 0x043A,
+ kadescendercyrillic: 0x049B,
+ kadeva: 0x0915,
+ kaf: 0x05DB,
+ kafarabic: 0x0643,
+ kafdagesh: 0xFB3B,
+ kafdageshhebrew: 0xFB3B,
+ kaffinalarabic: 0xFEDA,
+ kafhebrew: 0x05DB,
+ kafinitialarabic: 0xFEDB,
+ kafmedialarabic: 0xFEDC,
+ kafrafehebrew: 0xFB4D,
+ kagujarati: 0x0A95,
+ kagurmukhi: 0x0A15,
+ kahiragana: 0x304B,
+ kahookcyrillic: 0x04C4,
+ kakatakana: 0x30AB,
+ kakatakanahalfwidth: 0xFF76,
+ kappa: 0x03BA,
+ kappasymbolgreek: 0x03F0,
+ kapyeounmieumkorean: 0x3171,
+ kapyeounphieuphkorean: 0x3184,
+ kapyeounpieupkorean: 0x3178,
+ kapyeounssangpieupkorean: 0x3179,
+ karoriisquare: 0x330D,
+ kashidaautoarabic: 0x0640,
+ kashidaautonosidebearingarabic: 0x0640,
+ kasmallkatakana: 0x30F5,
+ kasquare: 0x3384,
+ kasraarabic: 0x0650,
+ kasratanarabic: 0x064D,
+ kastrokecyrillic: 0x049F,
+ katahiraprolongmarkhalfwidth: 0xFF70,
+ kaverticalstrokecyrillic: 0x049D,
+ kbopomofo: 0x310E,
+ kcalsquare: 0x3389,
+ kcaron: 0x01E9,
+ kcedilla: 0x0137,
+ kcircle: 0x24DA,
+ kcommaaccent: 0x0137,
+ kdotbelow: 0x1E33,
+ keharmenian: 0x0584,
+ kehiragana: 0x3051,
+ kekatakana: 0x30B1,
+ kekatakanahalfwidth: 0xFF79,
+ kenarmenian: 0x056F,
+ kesmallkatakana: 0x30F6,
+ kgreenlandic: 0x0138,
+ khabengali: 0x0996,
+ khacyrillic: 0x0445,
+ khadeva: 0x0916,
+ khagujarati: 0x0A96,
+ khagurmukhi: 0x0A16,
+ khaharabic: 0x062E,
+ khahfinalarabic: 0xFEA6,
+ khahinitialarabic: 0xFEA7,
+ khahmedialarabic: 0xFEA8,
+ kheicoptic: 0x03E7,
+ khhadeva: 0x0959,
+ khhagurmukhi: 0x0A59,
+ khieukhacirclekorean: 0x3278,
+ khieukhaparenkorean: 0x3218,
+ khieukhcirclekorean: 0x326A,
+ khieukhkorean: 0x314B,
+ khieukhparenkorean: 0x320A,
+ khokhaithai: 0x0E02,
+ khokhonthai: 0x0E05,
+ khokhuatthai: 0x0E03,
+ khokhwaithai: 0x0E04,
+ khomutthai: 0x0E5B,
+ khook: 0x0199,
+ khorakhangthai: 0x0E06,
+ khzsquare: 0x3391,
+ kihiragana: 0x304D,
+ kikatakana: 0x30AD,
+ kikatakanahalfwidth: 0xFF77,
+ kiroguramusquare: 0x3315,
+ kiromeetorusquare: 0x3316,
+ kirosquare: 0x3314,
+ kiyeokacirclekorean: 0x326E,
+ kiyeokaparenkorean: 0x320E,
+ kiyeokcirclekorean: 0x3260,
+ kiyeokkorean: 0x3131,
+ kiyeokparenkorean: 0x3200,
+ kiyeoksioskorean: 0x3133,
+ kjecyrillic: 0x045C,
+ klinebelow: 0x1E35,
+ klsquare: 0x3398,
+ kmcubedsquare: 0x33A6,
+ kmonospace: 0xFF4B,
+ kmsquaredsquare: 0x33A2,
+ kohiragana: 0x3053,
+ kohmsquare: 0x33C0,
+ kokaithai: 0x0E01,
+ kokatakana: 0x30B3,
+ kokatakanahalfwidth: 0xFF7A,
+ kooposquare: 0x331E,
+ koppacyrillic: 0x0481,
+ koreanstandardsymbol: 0x327F,
+ koroniscmb: 0x0343,
+ kparen: 0x24A6,
+ kpasquare: 0x33AA,
+ ksicyrillic: 0x046F,
+ ktsquare: 0x33CF,
+ kturned: 0x029E,
+ kuhiragana: 0x304F,
+ kukatakana: 0x30AF,
+ kukatakanahalfwidth: 0xFF78,
+ kvsquare: 0x33B8,
+ kwsquare: 0x33BE,
+ l: 0x006C,
+ labengali: 0x09B2,
+ lacute: 0x013A,
+ ladeva: 0x0932,
+ lagujarati: 0x0AB2,
+ lagurmukhi: 0x0A32,
+ lakkhangyaothai: 0x0E45,
+ lamaleffinalarabic: 0xFEFC,
+ lamalefhamzaabovefinalarabic: 0xFEF8,
+ lamalefhamzaaboveisolatedarabic: 0xFEF7,
+ lamalefhamzabelowfinalarabic: 0xFEFA,
+ lamalefhamzabelowisolatedarabic: 0xFEF9,
+ lamalefisolatedarabic: 0xFEFB,
+ lamalefmaddaabovefinalarabic: 0xFEF6,
+ lamalefmaddaaboveisolatedarabic: 0xFEF5,
+ lamarabic: 0x0644,
+ lambda: 0x03BB,
+ lambdastroke: 0x019B,
+ lamed: 0x05DC,
+ lameddagesh: 0xFB3C,
+ lameddageshhebrew: 0xFB3C,
+ lamedhebrew: 0x05DC,
+ lamfinalarabic: 0xFEDE,
+ lamhahinitialarabic: 0xFCCA,
+ laminitialarabic: 0xFEDF,
+ lamjeeminitialarabic: 0xFCC9,
+ lamkhahinitialarabic: 0xFCCB,
+ lamlamhehisolatedarabic: 0xFDF2,
+ lammedialarabic: 0xFEE0,
+ lammeemhahinitialarabic: 0xFD88,
+ lammeeminitialarabic: 0xFCCC,
+ largecircle: 0x25EF,
+ lbar: 0x019A,
+ lbelt: 0x026C,
+ lbopomofo: 0x310C,
+ lcaron: 0x013E,
+ lcedilla: 0x013C,
+ lcircle: 0x24DB,
+ lcircumflexbelow: 0x1E3D,
+ lcommaaccent: 0x013C,
+ ldot: 0x0140,
+ ldotaccent: 0x0140,
+ ldotbelow: 0x1E37,
+ ldotbelowmacron: 0x1E39,
+ leftangleabovecmb: 0x031A,
+ lefttackbelowcmb: 0x0318,
+ less: 0x003C,
+ lessequal: 0x2264,
+ lessequalorgreater: 0x22DA,
+ lessmonospace: 0xFF1C,
+ lessorequivalent: 0x2272,
+ lessorgreater: 0x2276,
+ lessoverequal: 0x2266,
+ lesssmall: 0xFE64,
+ lezh: 0x026E,
+ lfblock: 0x258C,
+ lhookretroflex: 0x026D,
+ lira: 0x20A4,
+ liwnarmenian: 0x056C,
+ lj: 0x01C9,
+ ljecyrillic: 0x0459,
+ ll: 0xF6C0,
+ lladeva: 0x0933,
+ llagujarati: 0x0AB3,
+ llinebelow: 0x1E3B,
+ llladeva: 0x0934,
+ llvocalicbengali: 0x09E1,
+ llvocalicdeva: 0x0961,
+ llvocalicvowelsignbengali: 0x09E3,
+ llvocalicvowelsigndeva: 0x0963,
+ lmiddletilde: 0x026B,
+ lmonospace: 0xFF4C,
+ lmsquare: 0x33D0,
+ lochulathai: 0x0E2C,
+ logicaland: 0x2227,
+ logicalnot: 0x00AC,
+ logicalnotreversed: 0x2310,
+ logicalor: 0x2228,
+ lolingthai: 0x0E25,
+ longs: 0x017F,
+ lowlinecenterline: 0xFE4E,
+ lowlinecmb: 0x0332,
+ lowlinedashed: 0xFE4D,
+ lozenge: 0x25CA,
+ lparen: 0x24A7,
+ lslash: 0x0142,
+ lsquare: 0x2113,
+ lsuperior: 0xF6EE,
+ ltshade: 0x2591,
+ luthai: 0x0E26,
+ lvocalicbengali: 0x098C,
+ lvocalicdeva: 0x090C,
+ lvocalicvowelsignbengali: 0x09E2,
+ lvocalicvowelsigndeva: 0x0962,
+ lxsquare: 0x33D3,
+ m: 0x006D,
+ mabengali: 0x09AE,
+ macron: 0x00AF,
+ macronbelowcmb: 0x0331,
+ macroncmb: 0x0304,
+ macronlowmod: 0x02CD,
+ macronmonospace: 0xFFE3,
+ macute: 0x1E3F,
+ madeva: 0x092E,
+ magujarati: 0x0AAE,
+ magurmukhi: 0x0A2E,
+ mahapakhhebrew: 0x05A4,
+ mahapakhlefthebrew: 0x05A4,
+ mahiragana: 0x307E,
+ maichattawalowleftthai: 0xF895,
+ maichattawalowrightthai: 0xF894,
+ maichattawathai: 0x0E4B,
+ maichattawaupperleftthai: 0xF893,
+ maieklowleftthai: 0xF88C,
+ maieklowrightthai: 0xF88B,
+ maiekthai: 0x0E48,
+ maiekupperleftthai: 0xF88A,
+ maihanakatleftthai: 0xF884,
+ maihanakatthai: 0x0E31,
+ maitaikhuleftthai: 0xF889,
+ maitaikhuthai: 0x0E47,
+ maitholowleftthai: 0xF88F,
+ maitholowrightthai: 0xF88E,
+ maithothai: 0x0E49,
+ maithoupperleftthai: 0xF88D,
+ maitrilowleftthai: 0xF892,
+ maitrilowrightthai: 0xF891,
+ maitrithai: 0x0E4A,
+ maitriupperleftthai: 0xF890,
+ maiyamokthai: 0x0E46,
+ makatakana: 0x30DE,
+ makatakanahalfwidth: 0xFF8F,
+ male: 0x2642,
+ mansyonsquare: 0x3347,
+ maqafhebrew: 0x05BE,
+ mars: 0x2642,
+ masoracirclehebrew: 0x05AF,
+ masquare: 0x3383,
+ mbopomofo: 0x3107,
+ mbsquare: 0x33D4,
+ mcircle: 0x24DC,
+ mcubedsquare: 0x33A5,
+ mdotaccent: 0x1E41,
+ mdotbelow: 0x1E43,
+ meemarabic: 0x0645,
+ meemfinalarabic: 0xFEE2,
+ meeminitialarabic: 0xFEE3,
+ meemmedialarabic: 0xFEE4,
+ meemmeeminitialarabic: 0xFCD1,
+ meemmeemisolatedarabic: 0xFC48,
+ meetorusquare: 0x334D,
+ mehiragana: 0x3081,
+ meizierasquare: 0x337E,
+ mekatakana: 0x30E1,
+ mekatakanahalfwidth: 0xFF92,
+ mem: 0x05DE,
+ memdagesh: 0xFB3E,
+ memdageshhebrew: 0xFB3E,
+ memhebrew: 0x05DE,
+ menarmenian: 0x0574,
+ merkhahebrew: 0x05A5,
+ merkhakefulahebrew: 0x05A6,
+ merkhakefulalefthebrew: 0x05A6,
+ merkhalefthebrew: 0x05A5,
+ mhook: 0x0271,
+ mhzsquare: 0x3392,
+ middledotkatakanahalfwidth: 0xFF65,
+ middot: 0x00B7,
+ mieumacirclekorean: 0x3272,
+ mieumaparenkorean: 0x3212,
+ mieumcirclekorean: 0x3264,
+ mieumkorean: 0x3141,
+ mieumpansioskorean: 0x3170,
+ mieumparenkorean: 0x3204,
+ mieumpieupkorean: 0x316E,
+ mieumsioskorean: 0x316F,
+ mihiragana: 0x307F,
+ mikatakana: 0x30DF,
+ mikatakanahalfwidth: 0xFF90,
+ minus: 0x2212,
+ minusbelowcmb: 0x0320,
+ minuscircle: 0x2296,
+ minusmod: 0x02D7,
+ minusplus: 0x2213,
+ minute: 0x2032,
+ miribaarusquare: 0x334A,
+ mirisquare: 0x3349,
+ mlonglegturned: 0x0270,
+ mlsquare: 0x3396,
+ mmcubedsquare: 0x33A3,
+ mmonospace: 0xFF4D,
+ mmsquaredsquare: 0x339F,
+ mohiragana: 0x3082,
+ mohmsquare: 0x33C1,
+ mokatakana: 0x30E2,
+ mokatakanahalfwidth: 0xFF93,
+ molsquare: 0x33D6,
+ momathai: 0x0E21,
+ moverssquare: 0x33A7,
+ moverssquaredsquare: 0x33A8,
+ mparen: 0x24A8,
+ mpasquare: 0x33AB,
+ mssquare: 0x33B3,
+ msuperior: 0xF6EF,
+ mturned: 0x026F,
+ mu: 0x00B5,
+ mu1: 0x00B5,
+ muasquare: 0x3382,
+ muchgreater: 0x226B,
+ muchless: 0x226A,
+ mufsquare: 0x338C,
+ mugreek: 0x03BC,
+ mugsquare: 0x338D,
+ muhiragana: 0x3080,
+ mukatakana: 0x30E0,
+ mukatakanahalfwidth: 0xFF91,
+ mulsquare: 0x3395,
+ multiply: 0x00D7,
+ mumsquare: 0x339B,
+ munahhebrew: 0x05A3,
+ munahlefthebrew: 0x05A3,
+ musicalnote: 0x266A,
+ musicalnotedbl: 0x266B,
+ musicflatsign: 0x266D,
+ musicsharpsign: 0x266F,
+ mussquare: 0x33B2,
+ muvsquare: 0x33B6,
+ muwsquare: 0x33BC,
+ mvmegasquare: 0x33B9,
+ mvsquare: 0x33B7,
+ mwmegasquare: 0x33BF,
+ mwsquare: 0x33BD,
+ n: 0x006E,
+ nabengali: 0x09A8,
+ nabla: 0x2207,
+ nacute: 0x0144,
+ nadeva: 0x0928,
+ nagujarati: 0x0AA8,
+ nagurmukhi: 0x0A28,
+ nahiragana: 0x306A,
+ nakatakana: 0x30CA,
+ nakatakanahalfwidth: 0xFF85,
+ napostrophe: 0x0149,
+ nasquare: 0x3381,
+ nbopomofo: 0x310B,
+ nbspace: 0x00A0,
+ ncaron: 0x0148,
+ ncedilla: 0x0146,
+ ncircle: 0x24DD,
+ ncircumflexbelow: 0x1E4B,
+ ncommaaccent: 0x0146,
+ ndotaccent: 0x1E45,
+ ndotbelow: 0x1E47,
+ nehiragana: 0x306D,
+ nekatakana: 0x30CD,
+ nekatakanahalfwidth: 0xFF88,
+ newsheqelsign: 0x20AA,
+ nfsquare: 0x338B,
+ ngabengali: 0x0999,
+ ngadeva: 0x0919,
+ ngagujarati: 0x0A99,
+ ngagurmukhi: 0x0A19,
+ ngonguthai: 0x0E07,
+ nhiragana: 0x3093,
+ nhookleft: 0x0272,
+ nhookretroflex: 0x0273,
+ nieunacirclekorean: 0x326F,
+ nieunaparenkorean: 0x320F,
+ nieuncieuckorean: 0x3135,
+ nieuncirclekorean: 0x3261,
+ nieunhieuhkorean: 0x3136,
+ nieunkorean: 0x3134,
+ nieunpansioskorean: 0x3168,
+ nieunparenkorean: 0x3201,
+ nieunsioskorean: 0x3167,
+ nieuntikeutkorean: 0x3166,
+ nihiragana: 0x306B,
+ nikatakana: 0x30CB,
+ nikatakanahalfwidth: 0xFF86,
+ nikhahitleftthai: 0xF899,
+ nikhahitthai: 0x0E4D,
+ nine: 0x0039,
+ ninearabic: 0x0669,
+ ninebengali: 0x09EF,
+ ninecircle: 0x2468,
+ ninecircleinversesansserif: 0x2792,
+ ninedeva: 0x096F,
+ ninegujarati: 0x0AEF,
+ ninegurmukhi: 0x0A6F,
+ ninehackarabic: 0x0669,
+ ninehangzhou: 0x3029,
+ nineideographicparen: 0x3228,
+ nineinferior: 0x2089,
+ ninemonospace: 0xFF19,
+ nineoldstyle: 0xF739,
+ nineparen: 0x247C,
+ nineperiod: 0x2490,
+ ninepersian: 0x06F9,
+ nineroman: 0x2178,
+ ninesuperior: 0x2079,
+ nineteencircle: 0x2472,
+ nineteenparen: 0x2486,
+ nineteenperiod: 0x249A,
+ ninethai: 0x0E59,
+ nj: 0x01CC,
+ njecyrillic: 0x045A,
+ nkatakana: 0x30F3,
+ nkatakanahalfwidth: 0xFF9D,
+ nlegrightlong: 0x019E,
+ nlinebelow: 0x1E49,
+ nmonospace: 0xFF4E,
+ nmsquare: 0x339A,
+ nnabengali: 0x09A3,
+ nnadeva: 0x0923,
+ nnagujarati: 0x0AA3,
+ nnagurmukhi: 0x0A23,
+ nnnadeva: 0x0929,
+ nohiragana: 0x306E,
+ nokatakana: 0x30CE,
+ nokatakanahalfwidth: 0xFF89,
+ nonbreakingspace: 0x00A0,
+ nonenthai: 0x0E13,
+ nonuthai: 0x0E19,
+ noonarabic: 0x0646,
+ noonfinalarabic: 0xFEE6,
+ noonghunnaarabic: 0x06BA,
+ noonghunnafinalarabic: 0xFB9F,
+ nooninitialarabic: 0xFEE7,
+ noonjeeminitialarabic: 0xFCD2,
+ noonjeemisolatedarabic: 0xFC4B,
+ noonmedialarabic: 0xFEE8,
+ noonmeeminitialarabic: 0xFCD5,
+ noonmeemisolatedarabic: 0xFC4E,
+ noonnoonfinalarabic: 0xFC8D,
+ notcontains: 0x220C,
+ notelement: 0x2209,
+ notelementof: 0x2209,
+ notequal: 0x2260,
+ notgreater: 0x226F,
+ notgreaternorequal: 0x2271,
+ notgreaternorless: 0x2279,
+ notidentical: 0x2262,
+ notless: 0x226E,
+ notlessnorequal: 0x2270,
+ notparallel: 0x2226,
+ notprecedes: 0x2280,
+ notsubset: 0x2284,
+ notsucceeds: 0x2281,
+ notsuperset: 0x2285,
+ nowarmenian: 0x0576,
+ nparen: 0x24A9,
+ nssquare: 0x33B1,
+ nsuperior: 0x207F,
+ ntilde: 0x00F1,
+ nu: 0x03BD,
+ nuhiragana: 0x306C,
+ nukatakana: 0x30CC,
+ nukatakanahalfwidth: 0xFF87,
+ nuktabengali: 0x09BC,
+ nuktadeva: 0x093C,
+ nuktagujarati: 0x0ABC,
+ nuktagurmukhi: 0x0A3C,
+ numbersign: 0x0023,
+ numbersignmonospace: 0xFF03,
+ numbersignsmall: 0xFE5F,
+ numeralsigngreek: 0x0374,
+ numeralsignlowergreek: 0x0375,
+ numero: 0x2116,
+ nun: 0x05E0,
+ nundagesh: 0xFB40,
+ nundageshhebrew: 0xFB40,
+ nunhebrew: 0x05E0,
+ nvsquare: 0x33B5,
+ nwsquare: 0x33BB,
+ nyabengali: 0x099E,
+ nyadeva: 0x091E,
+ nyagujarati: 0x0A9E,
+ nyagurmukhi: 0x0A1E,
+ o: 0x006F,
+ oacute: 0x00F3,
+ oangthai: 0x0E2D,
+ obarred: 0x0275,
+ obarredcyrillic: 0x04E9,
+ obarreddieresiscyrillic: 0x04EB,
+ obengali: 0x0993,
+ obopomofo: 0x311B,
+ obreve: 0x014F,
+ ocandradeva: 0x0911,
+ ocandragujarati: 0x0A91,
+ ocandravowelsigndeva: 0x0949,
+ ocandravowelsigngujarati: 0x0AC9,
+ ocaron: 0x01D2,
+ ocircle: 0x24DE,
+ ocircumflex: 0x00F4,
+ ocircumflexacute: 0x1ED1,
+ ocircumflexdotbelow: 0x1ED9,
+ ocircumflexgrave: 0x1ED3,
+ ocircumflexhookabove: 0x1ED5,
+ ocircumflextilde: 0x1ED7,
+ ocyrillic: 0x043E,
+ odblacute: 0x0151,
+ odblgrave: 0x020D,
+ odeva: 0x0913,
+ odieresis: 0x00F6,
+ odieresiscyrillic: 0x04E7,
+ odotbelow: 0x1ECD,
+ oe: 0x0153,
+ oekorean: 0x315A,
+ ogonek: 0x02DB,
+ ogonekcmb: 0x0328,
+ ograve: 0x00F2,
+ ogujarati: 0x0A93,
+ oharmenian: 0x0585,
+ ohiragana: 0x304A,
+ ohookabove: 0x1ECF,
+ ohorn: 0x01A1,
+ ohornacute: 0x1EDB,
+ ohorndotbelow: 0x1EE3,
+ ohorngrave: 0x1EDD,
+ ohornhookabove: 0x1EDF,
+ ohorntilde: 0x1EE1,
+ ohungarumlaut: 0x0151,
+ oi: 0x01A3,
+ oinvertedbreve: 0x020F,
+ okatakana: 0x30AA,
+ okatakanahalfwidth: 0xFF75,
+ okorean: 0x3157,
+ olehebrew: 0x05AB,
+ omacron: 0x014D,
+ omacronacute: 0x1E53,
+ omacrongrave: 0x1E51,
+ omdeva: 0x0950,
+ omega: 0x03C9,
+ omega1: 0x03D6,
+ omegacyrillic: 0x0461,
+ omegalatinclosed: 0x0277,
+ omegaroundcyrillic: 0x047B,
+ omegatitlocyrillic: 0x047D,
+ omegatonos: 0x03CE,
+ omgujarati: 0x0AD0,
+ omicron: 0x03BF,
+ omicrontonos: 0x03CC,
+ omonospace: 0xFF4F,
+ one: 0x0031,
+ onearabic: 0x0661,
+ onebengali: 0x09E7,
+ onecircle: 0x2460,
+ onecircleinversesansserif: 0x278A,
+ onedeva: 0x0967,
+ onedotenleader: 0x2024,
+ oneeighth: 0x215B,
+ onefitted: 0xF6DC,
+ onegujarati: 0x0AE7,
+ onegurmukhi: 0x0A67,
+ onehackarabic: 0x0661,
+ onehalf: 0x00BD,
+ onehangzhou: 0x3021,
+ oneideographicparen: 0x3220,
+ oneinferior: 0x2081,
+ onemonospace: 0xFF11,
+ onenumeratorbengali: 0x09F4,
+ oneoldstyle: 0xF731,
+ oneparen: 0x2474,
+ oneperiod: 0x2488,
+ onepersian: 0x06F1,
+ onequarter: 0x00BC,
+ oneroman: 0x2170,
+ onesuperior: 0x00B9,
+ onethai: 0x0E51,
+ onethird: 0x2153,
+ oogonek: 0x01EB,
+ oogonekmacron: 0x01ED,
+ oogurmukhi: 0x0A13,
+ oomatragurmukhi: 0x0A4B,
+ oopen: 0x0254,
+ oparen: 0x24AA,
+ openbullet: 0x25E6,
+ option: 0x2325,
+ ordfeminine: 0x00AA,
+ ordmasculine: 0x00BA,
+ orthogonal: 0x221F,
+ oshortdeva: 0x0912,
+ oshortvowelsigndeva: 0x094A,
+ oslash: 0x00F8,
+ oslashacute: 0x01FF,
+ osmallhiragana: 0x3049,
+ osmallkatakana: 0x30A9,
+ osmallkatakanahalfwidth: 0xFF6B,
+ ostrokeacute: 0x01FF,
+ osuperior: 0xF6F0,
+ otcyrillic: 0x047F,
+ otilde: 0x00F5,
+ otildeacute: 0x1E4D,
+ otildedieresis: 0x1E4F,
+ oubopomofo: 0x3121,
+ overline: 0x203E,
+ overlinecenterline: 0xFE4A,
+ overlinecmb: 0x0305,
+ overlinedashed: 0xFE49,
+ overlinedblwavy: 0xFE4C,
+ overlinewavy: 0xFE4B,
+ overscore: 0x00AF,
+ ovowelsignbengali: 0x09CB,
+ ovowelsigndeva: 0x094B,
+ ovowelsigngujarati: 0x0ACB,
+ p: 0x0070,
+ paampssquare: 0x3380,
+ paasentosquare: 0x332B,
+ pabengali: 0x09AA,
+ pacute: 0x1E55,
+ padeva: 0x092A,
+ pagedown: 0x21DF,
+ pageup: 0x21DE,
+ pagujarati: 0x0AAA,
+ pagurmukhi: 0x0A2A,
+ pahiragana: 0x3071,
+ paiyannoithai: 0x0E2F,
+ pakatakana: 0x30D1,
+ palatalizationcyrilliccmb: 0x0484,
+ palochkacyrillic: 0x04C0,
+ pansioskorean: 0x317F,
+ paragraph: 0x00B6,
+ parallel: 0x2225,
+ parenleft: 0x0028,
+ parenleftaltonearabic: 0xFD3E,
+ parenleftbt: 0xF8ED,
+ parenleftex: 0xF8EC,
+ parenleftinferior: 0x208D,
+ parenleftmonospace: 0xFF08,
+ parenleftsmall: 0xFE59,
+ parenleftsuperior: 0x207D,
+ parenlefttp: 0xF8EB,
+ parenleftvertical: 0xFE35,
+ parenright: 0x0029,
+ parenrightaltonearabic: 0xFD3F,
+ parenrightbt: 0xF8F8,
+ parenrightex: 0xF8F7,
+ parenrightinferior: 0x208E,
+ parenrightmonospace: 0xFF09,
+ parenrightsmall: 0xFE5A,
+ parenrightsuperior: 0x207E,
+ parenrighttp: 0xF8F6,
+ parenrightvertical: 0xFE36,
+ partialdiff: 0x2202,
+ paseqhebrew: 0x05C0,
+ pashtahebrew: 0x0599,
+ pasquare: 0x33A9,
+ patah: 0x05B7,
+ patah11: 0x05B7,
+ patah1d: 0x05B7,
+ patah2a: 0x05B7,
+ patahhebrew: 0x05B7,
+ patahnarrowhebrew: 0x05B7,
+ patahquarterhebrew: 0x05B7,
+ patahwidehebrew: 0x05B7,
+ pazerhebrew: 0x05A1,
+ pbopomofo: 0x3106,
+ pcircle: 0x24DF,
+ pdotaccent: 0x1E57,
+ pe: 0x05E4,
+ pecyrillic: 0x043F,
+ pedagesh: 0xFB44,
+ pedageshhebrew: 0xFB44,
+ peezisquare: 0x333B,
+ pefinaldageshhebrew: 0xFB43,
+ peharabic: 0x067E,
+ peharmenian: 0x057A,
+ pehebrew: 0x05E4,
+ pehfinalarabic: 0xFB57,
+ pehinitialarabic: 0xFB58,
+ pehiragana: 0x307A,
+ pehmedialarabic: 0xFB59,
+ pekatakana: 0x30DA,
+ pemiddlehookcyrillic: 0x04A7,
+ perafehebrew: 0xFB4E,
+ percent: 0x0025,
+ percentarabic: 0x066A,
+ percentmonospace: 0xFF05,
+ percentsmall: 0xFE6A,
+ period: 0x002E,
+ periodarmenian: 0x0589,
+ periodcentered: 0x00B7,
+ periodhalfwidth: 0xFF61,
+ periodinferior: 0xF6E7,
+ periodmonospace: 0xFF0E,
+ periodsmall: 0xFE52,
+ periodsuperior: 0xF6E8,
+ perispomenigreekcmb: 0x0342,
+ perpendicular: 0x22A5,
+ perthousand: 0x2030,
+ peseta: 0x20A7,
+ pfsquare: 0x338A,
+ phabengali: 0x09AB,
+ phadeva: 0x092B,
+ phagujarati: 0x0AAB,
+ phagurmukhi: 0x0A2B,
+ phi: 0x03C6,
+ phi1: 0x03D5,
+ phieuphacirclekorean: 0x327A,
+ phieuphaparenkorean: 0x321A,
+ phieuphcirclekorean: 0x326C,
+ phieuphkorean: 0x314D,
+ phieuphparenkorean: 0x320C,
+ philatin: 0x0278,
+ phinthuthai: 0x0E3A,
+ phisymbolgreek: 0x03D5,
+ phook: 0x01A5,
+ phophanthai: 0x0E1E,
+ phophungthai: 0x0E1C,
+ phosamphaothai: 0x0E20,
+ pi: 0x03C0,
+ pieupacirclekorean: 0x3273,
+ pieupaparenkorean: 0x3213,
+ pieupcieuckorean: 0x3176,
+ pieupcirclekorean: 0x3265,
+ pieupkiyeokkorean: 0x3172,
+ pieupkorean: 0x3142,
+ pieupparenkorean: 0x3205,
+ pieupsioskiyeokkorean: 0x3174,
+ pieupsioskorean: 0x3144,
+ pieupsiostikeutkorean: 0x3175,
+ pieupthieuthkorean: 0x3177,
+ pieuptikeutkorean: 0x3173,
+ pihiragana: 0x3074,
+ pikatakana: 0x30D4,
+ pisymbolgreek: 0x03D6,
+ piwrarmenian: 0x0583,
+ plus: 0x002B,
+ plusbelowcmb: 0x031F,
+ pluscircle: 0x2295,
+ plusminus: 0x00B1,
+ plusmod: 0x02D6,
+ plusmonospace: 0xFF0B,
+ plussmall: 0xFE62,
+ plussuperior: 0x207A,
+ pmonospace: 0xFF50,
+ pmsquare: 0x33D8,
+ pohiragana: 0x307D,
+ pointingindexdownwhite: 0x261F,
+ pointingindexleftwhite: 0x261C,
+ pointingindexrightwhite: 0x261E,
+ pointingindexupwhite: 0x261D,
+ pokatakana: 0x30DD,
+ poplathai: 0x0E1B,
+ postalmark: 0x3012,
+ postalmarkface: 0x3020,
+ pparen: 0x24AB,
+ precedes: 0x227A,
+ prescription: 0x211E,
+ primemod: 0x02B9,
+ primereversed: 0x2035,
+ product: 0x220F,
+ projective: 0x2305,
+ prolongedkana: 0x30FC,
+ propellor: 0x2318,
+ propersubset: 0x2282,
+ propersuperset: 0x2283,
+ proportion: 0x2237,
+ proportional: 0x221D,
+ psi: 0x03C8,
+ psicyrillic: 0x0471,
+ psilipneumatacyrilliccmb: 0x0486,
+ pssquare: 0x33B0,
+ puhiragana: 0x3077,
+ pukatakana: 0x30D7,
+ pvsquare: 0x33B4,
+ pwsquare: 0x33BA,
+ q: 0x0071,
+ qadeva: 0x0958,
+ qadmahebrew: 0x05A8,
+ qafarabic: 0x0642,
+ qaffinalarabic: 0xFED6,
+ qafinitialarabic: 0xFED7,
+ qafmedialarabic: 0xFED8,
+ qamats: 0x05B8,
+ qamats10: 0x05B8,
+ qamats1a: 0x05B8,
+ qamats1c: 0x05B8,
+ qamats27: 0x05B8,
+ qamats29: 0x05B8,
+ qamats33: 0x05B8,
+ qamatsde: 0x05B8,
+ qamatshebrew: 0x05B8,
+ qamatsnarrowhebrew: 0x05B8,
+ qamatsqatanhebrew: 0x05B8,
+ qamatsqatannarrowhebrew: 0x05B8,
+ qamatsqatanquarterhebrew: 0x05B8,
+ qamatsqatanwidehebrew: 0x05B8,
+ qamatsquarterhebrew: 0x05B8,
+ qamatswidehebrew: 0x05B8,
+ qarneyparahebrew: 0x059F,
+ qbopomofo: 0x3111,
+ qcircle: 0x24E0,
+ qhook: 0x02A0,
+ qmonospace: 0xFF51,
+ qof: 0x05E7,
+ qofdagesh: 0xFB47,
+ qofdageshhebrew: 0xFB47,
+ qofhebrew: 0x05E7,
+ qparen: 0x24AC,
+ quarternote: 0x2669,
+ qubuts: 0x05BB,
+ qubuts18: 0x05BB,
+ qubuts25: 0x05BB,
+ qubuts31: 0x05BB,
+ qubutshebrew: 0x05BB,
+ qubutsnarrowhebrew: 0x05BB,
+ qubutsquarterhebrew: 0x05BB,
+ qubutswidehebrew: 0x05BB,
+ question: 0x003F,
+ questionarabic: 0x061F,
+ questionarmenian: 0x055E,
+ questiondown: 0x00BF,
+ questiondownsmall: 0xF7BF,
+ questiongreek: 0x037E,
+ questionmonospace: 0xFF1F,
+ questionsmall: 0xF73F,
+ quotedbl: 0x0022,
+ quotedblbase: 0x201E,
+ quotedblleft: 0x201C,
+ quotedblmonospace: 0xFF02,
+ quotedblprime: 0x301E,
+ quotedblprimereversed: 0x301D,
+ quotedblright: 0x201D,
+ quoteleft: 0x2018,
+ quoteleftreversed: 0x201B,
+ quotereversed: 0x201B,
+ quoteright: 0x2019,
+ quoterightn: 0x0149,
+ quotesinglbase: 0x201A,
+ quotesingle: 0x0027,
+ quotesinglemonospace: 0xFF07,
+ r: 0x0072,
+ raarmenian: 0x057C,
+ rabengali: 0x09B0,
+ racute: 0x0155,
+ radeva: 0x0930,
+ radical: 0x221A,
+ radicalex: 0xF8E5,
+ radoverssquare: 0x33AE,
+ radoverssquaredsquare: 0x33AF,
+ radsquare: 0x33AD,
+ rafe: 0x05BF,
+ rafehebrew: 0x05BF,
+ ragujarati: 0x0AB0,
+ ragurmukhi: 0x0A30,
+ rahiragana: 0x3089,
+ rakatakana: 0x30E9,
+ rakatakanahalfwidth: 0xFF97,
+ ralowerdiagonalbengali: 0x09F1,
+ ramiddlediagonalbengali: 0x09F0,
+ ramshorn: 0x0264,
+ ratio: 0x2236,
+ rbopomofo: 0x3116,
+ rcaron: 0x0159,
+ rcedilla: 0x0157,
+ rcircle: 0x24E1,
+ rcommaaccent: 0x0157,
+ rdblgrave: 0x0211,
+ rdotaccent: 0x1E59,
+ rdotbelow: 0x1E5B,
+ rdotbelowmacron: 0x1E5D,
+ referencemark: 0x203B,
+ reflexsubset: 0x2286,
+ reflexsuperset: 0x2287,
+ registered: 0x00AE,
+ registersans: 0xF8E8,
+ registerserif: 0xF6DA,
+ reharabic: 0x0631,
+ reharmenian: 0x0580,
+ rehfinalarabic: 0xFEAE,
+ rehiragana: 0x308C,
+ rekatakana: 0x30EC,
+ rekatakanahalfwidth: 0xFF9A,
+ resh: 0x05E8,
+ reshdageshhebrew: 0xFB48,
+ reshhebrew: 0x05E8,
+ reversedtilde: 0x223D,
+ reviahebrew: 0x0597,
+ reviamugrashhebrew: 0x0597,
+ revlogicalnot: 0x2310,
+ rfishhook: 0x027E,
+ rfishhookreversed: 0x027F,
+ rhabengali: 0x09DD,
+ rhadeva: 0x095D,
+ rho: 0x03C1,
+ rhook: 0x027D,
+ rhookturned: 0x027B,
+ rhookturnedsuperior: 0x02B5,
+ rhosymbolgreek: 0x03F1,
+ rhotichookmod: 0x02DE,
+ rieulacirclekorean: 0x3271,
+ rieulaparenkorean: 0x3211,
+ rieulcirclekorean: 0x3263,
+ rieulhieuhkorean: 0x3140,
+ rieulkiyeokkorean: 0x313A,
+ rieulkiyeoksioskorean: 0x3169,
+ rieulkorean: 0x3139,
+ rieulmieumkorean: 0x313B,
+ rieulpansioskorean: 0x316C,
+ rieulparenkorean: 0x3203,
+ rieulphieuphkorean: 0x313F,
+ rieulpieupkorean: 0x313C,
+ rieulpieupsioskorean: 0x316B,
+ rieulsioskorean: 0x313D,
+ rieulthieuthkorean: 0x313E,
+ rieultikeutkorean: 0x316A,
+ rieulyeorinhieuhkorean: 0x316D,
+ rightangle: 0x221F,
+ righttackbelowcmb: 0x0319,
+ righttriangle: 0x22BF,
+ rihiragana: 0x308A,
+ rikatakana: 0x30EA,
+ rikatakanahalfwidth: 0xFF98,
+ ring: 0x02DA,
+ ringbelowcmb: 0x0325,
+ ringcmb: 0x030A,
+ ringhalfleft: 0x02BF,
+ ringhalfleftarmenian: 0x0559,
+ ringhalfleftbelowcmb: 0x031C,
+ ringhalfleftcentered: 0x02D3,
+ ringhalfright: 0x02BE,
+ ringhalfrightbelowcmb: 0x0339,
+ ringhalfrightcentered: 0x02D2,
+ rinvertedbreve: 0x0213,
+ rittorusquare: 0x3351,
+ rlinebelow: 0x1E5F,
+ rlongleg: 0x027C,
+ rlonglegturned: 0x027A,
+ rmonospace: 0xFF52,
+ rohiragana: 0x308D,
+ rokatakana: 0x30ED,
+ rokatakanahalfwidth: 0xFF9B,
+ roruathai: 0x0E23,
+ rparen: 0x24AD,
+ rrabengali: 0x09DC,
+ rradeva: 0x0931,
+ rragurmukhi: 0x0A5C,
+ rreharabic: 0x0691,
+ rrehfinalarabic: 0xFB8D,
+ rrvocalicbengali: 0x09E0,
+ rrvocalicdeva: 0x0960,
+ rrvocalicgujarati: 0x0AE0,
+ rrvocalicvowelsignbengali: 0x09C4,
+ rrvocalicvowelsigndeva: 0x0944,
+ rrvocalicvowelsigngujarati: 0x0AC4,
+ rsuperior: 0xF6F1,
+ rtblock: 0x2590,
+ rturned: 0x0279,
+ rturnedsuperior: 0x02B4,
+ ruhiragana: 0x308B,
+ rukatakana: 0x30EB,
+ rukatakanahalfwidth: 0xFF99,
+ rupeemarkbengali: 0x09F2,
+ rupeesignbengali: 0x09F3,
+ rupiah: 0xF6DD,
+ ruthai: 0x0E24,
+ rvocalicbengali: 0x098B,
+ rvocalicdeva: 0x090B,
+ rvocalicgujarati: 0x0A8B,
+ rvocalicvowelsignbengali: 0x09C3,
+ rvocalicvowelsigndeva: 0x0943,
+ rvocalicvowelsigngujarati: 0x0AC3,
+ s: 0x0073,
+ sabengali: 0x09B8,
+ sacute: 0x015B,
+ sacutedotaccent: 0x1E65,
+ sadarabic: 0x0635,
+ sadeva: 0x0938,
+ sadfinalarabic: 0xFEBA,
+ sadinitialarabic: 0xFEBB,
+ sadmedialarabic: 0xFEBC,
+ sagujarati: 0x0AB8,
+ sagurmukhi: 0x0A38,
+ sahiragana: 0x3055,
+ sakatakana: 0x30B5,
+ sakatakanahalfwidth: 0xFF7B,
+ sallallahoualayhewasallamarabic: 0xFDFA,
+ samekh: 0x05E1,
+ samekhdagesh: 0xFB41,
+ samekhdageshhebrew: 0xFB41,
+ samekhhebrew: 0x05E1,
+ saraaathai: 0x0E32,
+ saraaethai: 0x0E41,
+ saraaimaimalaithai: 0x0E44,
+ saraaimaimuanthai: 0x0E43,
+ saraamthai: 0x0E33,
+ saraathai: 0x0E30,
+ saraethai: 0x0E40,
+ saraiileftthai: 0xF886,
+ saraiithai: 0x0E35,
+ saraileftthai: 0xF885,
+ saraithai: 0x0E34,
+ saraothai: 0x0E42,
+ saraueeleftthai: 0xF888,
+ saraueethai: 0x0E37,
+ saraueleftthai: 0xF887,
+ sarauethai: 0x0E36,
+ sarauthai: 0x0E38,
+ sarauuthai: 0x0E39,
+ sbopomofo: 0x3119,
+ scaron: 0x0161,
+ scarondotaccent: 0x1E67,
+ scedilla: 0x015F,
+ schwa: 0x0259,
+ schwacyrillic: 0x04D9,
+ schwadieresiscyrillic: 0x04DB,
+ schwahook: 0x025A,
+ scircle: 0x24E2,
+ scircumflex: 0x015D,
+ scommaaccent: 0x0219,
+ sdotaccent: 0x1E61,
+ sdotbelow: 0x1E63,
+ sdotbelowdotaccent: 0x1E69,
+ seagullbelowcmb: 0x033C,
+ second: 0x2033,
+ secondtonechinese: 0x02CA,
+ section: 0x00A7,
+ seenarabic: 0x0633,
+ seenfinalarabic: 0xFEB2,
+ seeninitialarabic: 0xFEB3,
+ seenmedialarabic: 0xFEB4,
+ segol: 0x05B6,
+ segol13: 0x05B6,
+ segol1f: 0x05B6,
+ segol2c: 0x05B6,
+ segolhebrew: 0x05B6,
+ segolnarrowhebrew: 0x05B6,
+ segolquarterhebrew: 0x05B6,
+ segoltahebrew: 0x0592,
+ segolwidehebrew: 0x05B6,
+ seharmenian: 0x057D,
+ sehiragana: 0x305B,
+ sekatakana: 0x30BB,
+ sekatakanahalfwidth: 0xFF7E,
+ semicolon: 0x003B,
+ semicolonarabic: 0x061B,
+ semicolonmonospace: 0xFF1B,
+ semicolonsmall: 0xFE54,
+ semivoicedmarkkana: 0x309C,
+ semivoicedmarkkanahalfwidth: 0xFF9F,
+ sentisquare: 0x3322,
+ sentosquare: 0x3323,
+ seven: 0x0037,
+ sevenarabic: 0x0667,
+ sevenbengali: 0x09ED,
+ sevencircle: 0x2466,
+ sevencircleinversesansserif: 0x2790,
+ sevendeva: 0x096D,
+ seveneighths: 0x215E,
+ sevengujarati: 0x0AED,
+ sevengurmukhi: 0x0A6D,
+ sevenhackarabic: 0x0667,
+ sevenhangzhou: 0x3027,
+ sevenideographicparen: 0x3226,
+ seveninferior: 0x2087,
+ sevenmonospace: 0xFF17,
+ sevenoldstyle: 0xF737,
+ sevenparen: 0x247A,
+ sevenperiod: 0x248E,
+ sevenpersian: 0x06F7,
+ sevenroman: 0x2176,
+ sevensuperior: 0x2077,
+ seventeencircle: 0x2470,
+ seventeenparen: 0x2484,
+ seventeenperiod: 0x2498,
+ seventhai: 0x0E57,
+ sfthyphen: 0x00AD,
+ shaarmenian: 0x0577,
+ shabengali: 0x09B6,
+ shacyrillic: 0x0448,
+ shaddaarabic: 0x0651,
+ shaddadammaarabic: 0xFC61,
+ shaddadammatanarabic: 0xFC5E,
+ shaddafathaarabic: 0xFC60,
+ shaddakasraarabic: 0xFC62,
+ shaddakasratanarabic: 0xFC5F,
+ shade: 0x2592,
+ shadedark: 0x2593,
+ shadelight: 0x2591,
+ shademedium: 0x2592,
+ shadeva: 0x0936,
+ shagujarati: 0x0AB6,
+ shagurmukhi: 0x0A36,
+ shalshelethebrew: 0x0593,
+ shbopomofo: 0x3115,
+ shchacyrillic: 0x0449,
+ sheenarabic: 0x0634,
+ sheenfinalarabic: 0xFEB6,
+ sheeninitialarabic: 0xFEB7,
+ sheenmedialarabic: 0xFEB8,
+ sheicoptic: 0x03E3,
+ sheqel: 0x20AA,
+ sheqelhebrew: 0x20AA,
+ sheva: 0x05B0,
+ sheva115: 0x05B0,
+ sheva15: 0x05B0,
+ sheva22: 0x05B0,
+ sheva2e: 0x05B0,
+ shevahebrew: 0x05B0,
+ shevanarrowhebrew: 0x05B0,
+ shevaquarterhebrew: 0x05B0,
+ shevawidehebrew: 0x05B0,
+ shhacyrillic: 0x04BB,
+ shimacoptic: 0x03ED,
+ shin: 0x05E9,
+ shindagesh: 0xFB49,
+ shindageshhebrew: 0xFB49,
+ shindageshshindot: 0xFB2C,
+ shindageshshindothebrew: 0xFB2C,
+ shindageshsindot: 0xFB2D,
+ shindageshsindothebrew: 0xFB2D,
+ shindothebrew: 0x05C1,
+ shinhebrew: 0x05E9,
+ shinshindot: 0xFB2A,
+ shinshindothebrew: 0xFB2A,
+ shinsindot: 0xFB2B,
+ shinsindothebrew: 0xFB2B,
+ shook: 0x0282,
+ sigma: 0x03C3,
+ sigma1: 0x03C2,
+ sigmafinal: 0x03C2,
+ sigmalunatesymbolgreek: 0x03F2,
+ sihiragana: 0x3057,
+ sikatakana: 0x30B7,
+ sikatakanahalfwidth: 0xFF7C,
+ siluqhebrew: 0x05BD,
+ siluqlefthebrew: 0x05BD,
+ similar: 0x223C,
+ sindothebrew: 0x05C2,
+ siosacirclekorean: 0x3274,
+ siosaparenkorean: 0x3214,
+ sioscieuckorean: 0x317E,
+ sioscirclekorean: 0x3266,
+ sioskiyeokkorean: 0x317A,
+ sioskorean: 0x3145,
+ siosnieunkorean: 0x317B,
+ siosparenkorean: 0x3206,
+ siospieupkorean: 0x317D,
+ siostikeutkorean: 0x317C,
+ six: 0x0036,
+ sixarabic: 0x0666,
+ sixbengali: 0x09EC,
+ sixcircle: 0x2465,
+ sixcircleinversesansserif: 0x278F,
+ sixdeva: 0x096C,
+ sixgujarati: 0x0AEC,
+ sixgurmukhi: 0x0A6C,
+ sixhackarabic: 0x0666,
+ sixhangzhou: 0x3026,
+ sixideographicparen: 0x3225,
+ sixinferior: 0x2086,
+ sixmonospace: 0xFF16,
+ sixoldstyle: 0xF736,
+ sixparen: 0x2479,
+ sixperiod: 0x248D,
+ sixpersian: 0x06F6,
+ sixroman: 0x2175,
+ sixsuperior: 0x2076,
+ sixteencircle: 0x246F,
+ sixteencurrencydenominatorbengali: 0x09F9,
+ sixteenparen: 0x2483,
+ sixteenperiod: 0x2497,
+ sixthai: 0x0E56,
+ slash: 0x002F,
+ slashmonospace: 0xFF0F,
+ slong: 0x017F,
+ slongdotaccent: 0x1E9B,
+ smileface: 0x263A,
+ smonospace: 0xFF53,
+ sofpasuqhebrew: 0x05C3,
+ softhyphen: 0x00AD,
+ softsigncyrillic: 0x044C,
+ sohiragana: 0x305D,
+ sokatakana: 0x30BD,
+ sokatakanahalfwidth: 0xFF7F,
+ soliduslongoverlaycmb: 0x0338,
+ solidusshortoverlaycmb: 0x0337,
+ sorusithai: 0x0E29,
+ sosalathai: 0x0E28,
+ sosothai: 0x0E0B,
+ sosuathai: 0x0E2A,
+ space: 0x0020,
+ spacehackarabic: 0x0020,
+ spade: 0x2660,
+ spadesuitblack: 0x2660,
+ spadesuitwhite: 0x2664,
+ sparen: 0x24AE,
+ squarebelowcmb: 0x033B,
+ squarecc: 0x33C4,
+ squarecm: 0x339D,
+ squarediagonalcrosshatchfill: 0x25A9,
+ squarehorizontalfill: 0x25A4,
+ squarekg: 0x338F,
+ squarekm: 0x339E,
+ squarekmcapital: 0x33CE,
+ squareln: 0x33D1,
+ squarelog: 0x33D2,
+ squaremg: 0x338E,
+ squaremil: 0x33D5,
+ squaremm: 0x339C,
+ squaremsquared: 0x33A1,
+ squareorthogonalcrosshatchfill: 0x25A6,
+ squareupperlefttolowerrightfill: 0x25A7,
+ squareupperrighttolowerleftfill: 0x25A8,
+ squareverticalfill: 0x25A5,
+ squarewhitewithsmallblack: 0x25A3,
+ srsquare: 0x33DB,
+ ssabengali: 0x09B7,
+ ssadeva: 0x0937,
+ ssagujarati: 0x0AB7,
+ ssangcieuckorean: 0x3149,
+ ssanghieuhkorean: 0x3185,
+ ssangieungkorean: 0x3180,
+ ssangkiyeokkorean: 0x3132,
+ ssangnieunkorean: 0x3165,
+ ssangpieupkorean: 0x3143,
+ ssangsioskorean: 0x3146,
+ ssangtikeutkorean: 0x3138,
+ ssuperior: 0xF6F2,
+ sterling: 0x00A3,
+ sterlingmonospace: 0xFFE1,
+ strokelongoverlaycmb: 0x0336,
+ strokeshortoverlaycmb: 0x0335,
+ subset: 0x2282,
+ subsetnotequal: 0x228A,
+ subsetorequal: 0x2286,
+ succeeds: 0x227B,
+ suchthat: 0x220B,
+ suhiragana: 0x3059,
+ sukatakana: 0x30B9,
+ sukatakanahalfwidth: 0xFF7D,
+ sukunarabic: 0x0652,
+ summation: 0x2211,
+ sun: 0x263C,
+ superset: 0x2283,
+ supersetnotequal: 0x228B,
+ supersetorequal: 0x2287,
+ svsquare: 0x33DC,
+ syouwaerasquare: 0x337C,
+ t: 0x0074,
+ tabengali: 0x09A4,
+ tackdown: 0x22A4,
+ tackleft: 0x22A3,
+ tadeva: 0x0924,
+ tagujarati: 0x0AA4,
+ tagurmukhi: 0x0A24,
+ taharabic: 0x0637,
+ tahfinalarabic: 0xFEC2,
+ tahinitialarabic: 0xFEC3,
+ tahiragana: 0x305F,
+ tahmedialarabic: 0xFEC4,
+ taisyouerasquare: 0x337D,
+ takatakana: 0x30BF,
+ takatakanahalfwidth: 0xFF80,
+ tatweelarabic: 0x0640,
+ tau: 0x03C4,
+ tav: 0x05EA,
+ tavdages: 0xFB4A,
+ tavdagesh: 0xFB4A,
+ tavdageshhebrew: 0xFB4A,
+ tavhebrew: 0x05EA,
+ tbar: 0x0167,
+ tbopomofo: 0x310A,
+ tcaron: 0x0165,
+ tccurl: 0x02A8,
+ tcedilla: 0x0163,
+ tcheharabic: 0x0686,
+ tchehfinalarabic: 0xFB7B,
+ tchehinitialarabic: 0xFB7C,
+ tchehmedialarabic: 0xFB7D,
+ tcircle: 0x24E3,
+ tcircumflexbelow: 0x1E71,
+ tcommaaccent: 0x0163,
+ tdieresis: 0x1E97,
+ tdotaccent: 0x1E6B,
+ tdotbelow: 0x1E6D,
+ tecyrillic: 0x0442,
+ tedescendercyrillic: 0x04AD,
+ teharabic: 0x062A,
+ tehfinalarabic: 0xFE96,
+ tehhahinitialarabic: 0xFCA2,
+ tehhahisolatedarabic: 0xFC0C,
+ tehinitialarabic: 0xFE97,
+ tehiragana: 0x3066,
+ tehjeeminitialarabic: 0xFCA1,
+ tehjeemisolatedarabic: 0xFC0B,
+ tehmarbutaarabic: 0x0629,
+ tehmarbutafinalarabic: 0xFE94,
+ tehmedialarabic: 0xFE98,
+ tehmeeminitialarabic: 0xFCA4,
+ tehmeemisolatedarabic: 0xFC0E,
+ tehnoonfinalarabic: 0xFC73,
+ tekatakana: 0x30C6,
+ tekatakanahalfwidth: 0xFF83,
+ telephone: 0x2121,
+ telephoneblack: 0x260E,
+ telishagedolahebrew: 0x05A0,
+ telishaqetanahebrew: 0x05A9,
+ tencircle: 0x2469,
+ tenideographicparen: 0x3229,
+ tenparen: 0x247D,
+ tenperiod: 0x2491,
+ tenroman: 0x2179,
+ tesh: 0x02A7,
+ tet: 0x05D8,
+ tetdagesh: 0xFB38,
+ tetdageshhebrew: 0xFB38,
+ tethebrew: 0x05D8,
+ tetsecyrillic: 0x04B5,
+ tevirhebrew: 0x059B,
+ tevirlefthebrew: 0x059B,
+ thabengali: 0x09A5,
+ thadeva: 0x0925,
+ thagujarati: 0x0AA5,
+ thagurmukhi: 0x0A25,
+ thalarabic: 0x0630,
+ thalfinalarabic: 0xFEAC,
+ thanthakhatlowleftthai: 0xF898,
+ thanthakhatlowrightthai: 0xF897,
+ thanthakhatthai: 0x0E4C,
+ thanthakhatupperleftthai: 0xF896,
+ theharabic: 0x062B,
+ thehfinalarabic: 0xFE9A,
+ thehinitialarabic: 0xFE9B,
+ thehmedialarabic: 0xFE9C,
+ thereexists: 0x2203,
+ therefore: 0x2234,
+ theta: 0x03B8,
+ theta1: 0x03D1,
+ thetasymbolgreek: 0x03D1,
+ thieuthacirclekorean: 0x3279,
+ thieuthaparenkorean: 0x3219,
+ thieuthcirclekorean: 0x326B,
+ thieuthkorean: 0x314C,
+ thieuthparenkorean: 0x320B,
+ thirteencircle: 0x246C,
+ thirteenparen: 0x2480,
+ thirteenperiod: 0x2494,
+ thonangmonthothai: 0x0E11,
+ thook: 0x01AD,
+ thophuthaothai: 0x0E12,
+ thorn: 0x00FE,
+ thothahanthai: 0x0E17,
+ thothanthai: 0x0E10,
+ thothongthai: 0x0E18,
+ thothungthai: 0x0E16,
+ thousandcyrillic: 0x0482,
+ thousandsseparatorarabic: 0x066C,
+ thousandsseparatorpersian: 0x066C,
+ three: 0x0033,
+ threearabic: 0x0663,
+ threebengali: 0x09E9,
+ threecircle: 0x2462,
+ threecircleinversesansserif: 0x278C,
+ threedeva: 0x0969,
+ threeeighths: 0x215C,
+ threegujarati: 0x0AE9,
+ threegurmukhi: 0x0A69,
+ threehackarabic: 0x0663,
+ threehangzhou: 0x3023,
+ threeideographicparen: 0x3222,
+ threeinferior: 0x2083,
+ threemonospace: 0xFF13,
+ threenumeratorbengali: 0x09F6,
+ threeoldstyle: 0xF733,
+ threeparen: 0x2476,
+ threeperiod: 0x248A,
+ threepersian: 0x06F3,
+ threequarters: 0x00BE,
+ threequartersemdash: 0xF6DE,
+ threeroman: 0x2172,
+ threesuperior: 0x00B3,
+ threethai: 0x0E53,
+ thzsquare: 0x3394,
+ tihiragana: 0x3061,
+ tikatakana: 0x30C1,
+ tikatakanahalfwidth: 0xFF81,
+ tikeutacirclekorean: 0x3270,
+ tikeutaparenkorean: 0x3210,
+ tikeutcirclekorean: 0x3262,
+ tikeutkorean: 0x3137,
+ tikeutparenkorean: 0x3202,
+ tilde: 0x02DC,
+ tildebelowcmb: 0x0330,
+ tildecmb: 0x0303,
+ tildecomb: 0x0303,
+ tildedoublecmb: 0x0360,
+ tildeoperator: 0x223C,
+ tildeoverlaycmb: 0x0334,
+ tildeverticalcmb: 0x033E,
+ timescircle: 0x2297,
+ tipehahebrew: 0x0596,
+ tipehalefthebrew: 0x0596,
+ tippigurmukhi: 0x0A70,
+ titlocyrilliccmb: 0x0483,
+ tiwnarmenian: 0x057F,
+ tlinebelow: 0x1E6F,
+ tmonospace: 0xFF54,
+ toarmenian: 0x0569,
+ tohiragana: 0x3068,
+ tokatakana: 0x30C8,
+ tokatakanahalfwidth: 0xFF84,
+ tonebarextrahighmod: 0x02E5,
+ tonebarextralowmod: 0x02E9,
+ tonebarhighmod: 0x02E6,
+ tonebarlowmod: 0x02E8,
+ tonebarmidmod: 0x02E7,
+ tonefive: 0x01BD,
+ tonesix: 0x0185,
+ tonetwo: 0x01A8,
+ tonos: 0x0384,
+ tonsquare: 0x3327,
+ topatakthai: 0x0E0F,
+ tortoiseshellbracketleft: 0x3014,
+ tortoiseshellbracketleftsmall: 0xFE5D,
+ tortoiseshellbracketleftvertical: 0xFE39,
+ tortoiseshellbracketright: 0x3015,
+ tortoiseshellbracketrightsmall: 0xFE5E,
+ tortoiseshellbracketrightvertical: 0xFE3A,
+ totaothai: 0x0E15,
+ tpalatalhook: 0x01AB,
+ tparen: 0x24AF,
+ trademark: 0x2122,
+ trademarksans: 0xF8EA,
+ trademarkserif: 0xF6DB,
+ tretroflexhook: 0x0288,
+ triagdn: 0x25BC,
+ triaglf: 0x25C4,
+ triagrt: 0x25BA,
+ triagup: 0x25B2,
+ ts: 0x02A6,
+ tsadi: 0x05E6,
+ tsadidagesh: 0xFB46,
+ tsadidageshhebrew: 0xFB46,
+ tsadihebrew: 0x05E6,
+ tsecyrillic: 0x0446,
+ tsere: 0x05B5,
+ tsere12: 0x05B5,
+ tsere1e: 0x05B5,
+ tsere2b: 0x05B5,
+ tserehebrew: 0x05B5,
+ tserenarrowhebrew: 0x05B5,
+ tserequarterhebrew: 0x05B5,
+ tserewidehebrew: 0x05B5,
+ tshecyrillic: 0x045B,
+ tsuperior: 0xF6F3,
+ ttabengali: 0x099F,
+ ttadeva: 0x091F,
+ ttagujarati: 0x0A9F,
+ ttagurmukhi: 0x0A1F,
+ tteharabic: 0x0679,
+ ttehfinalarabic: 0xFB67,
+ ttehinitialarabic: 0xFB68,
+ ttehmedialarabic: 0xFB69,
+ tthabengali: 0x09A0,
+ tthadeva: 0x0920,
+ tthagujarati: 0x0AA0,
+ tthagurmukhi: 0x0A20,
+ tturned: 0x0287,
+ tuhiragana: 0x3064,
+ tukatakana: 0x30C4,
+ tukatakanahalfwidth: 0xFF82,
+ tusmallhiragana: 0x3063,
+ tusmallkatakana: 0x30C3,
+ tusmallkatakanahalfwidth: 0xFF6F,
+ twelvecircle: 0x246B,
+ twelveparen: 0x247F,
+ twelveperiod: 0x2493,
+ twelveroman: 0x217B,
+ twentycircle: 0x2473,
+ twentyhangzhou: 0x5344,
+ twentyparen: 0x2487,
+ twentyperiod: 0x249B,
+ two: 0x0032,
+ twoarabic: 0x0662,
+ twobengali: 0x09E8,
+ twocircle: 0x2461,
+ twocircleinversesansserif: 0x278B,
+ twodeva: 0x0968,
+ twodotenleader: 0x2025,
+ twodotleader: 0x2025,
+ twodotleadervertical: 0xFE30,
+ twogujarati: 0x0AE8,
+ twogurmukhi: 0x0A68,
+ twohackarabic: 0x0662,
+ twohangzhou: 0x3022,
+ twoideographicparen: 0x3221,
+ twoinferior: 0x2082,
+ twomonospace: 0xFF12,
+ twonumeratorbengali: 0x09F5,
+ twooldstyle: 0xF732,
+ twoparen: 0x2475,
+ twoperiod: 0x2489,
+ twopersian: 0x06F2,
+ tworoman: 0x2171,
+ twostroke: 0x01BB,
+ twosuperior: 0x00B2,
+ twothai: 0x0E52,
+ twothirds: 0x2154,
+ u: 0x0075,
+ uacute: 0x00FA,
+ ubar: 0x0289,
+ ubengali: 0x0989,
+ ubopomofo: 0x3128,
+ ubreve: 0x016D,
+ ucaron: 0x01D4,
+ ucircle: 0x24E4,
+ ucircumflex: 0x00FB,
+ ucircumflexbelow: 0x1E77,
+ ucyrillic: 0x0443,
+ udattadeva: 0x0951,
+ udblacute: 0x0171,
+ udblgrave: 0x0215,
+ udeva: 0x0909,
+ udieresis: 0x00FC,
+ udieresisacute: 0x01D8,
+ udieresisbelow: 0x1E73,
+ udieresiscaron: 0x01DA,
+ udieresiscyrillic: 0x04F1,
+ udieresisgrave: 0x01DC,
+ udieresismacron: 0x01D6,
+ udotbelow: 0x1EE5,
+ ugrave: 0x00F9,
+ ugujarati: 0x0A89,
+ ugurmukhi: 0x0A09,
+ uhiragana: 0x3046,
+ uhookabove: 0x1EE7,
+ uhorn: 0x01B0,
+ uhornacute: 0x1EE9,
+ uhorndotbelow: 0x1EF1,
+ uhorngrave: 0x1EEB,
+ uhornhookabove: 0x1EED,
+ uhorntilde: 0x1EEF,
+ uhungarumlaut: 0x0171,
+ uhungarumlautcyrillic: 0x04F3,
+ uinvertedbreve: 0x0217,
+ ukatakana: 0x30A6,
+ ukatakanahalfwidth: 0xFF73,
+ ukcyrillic: 0x0479,
+ ukorean: 0x315C,
+ umacron: 0x016B,
+ umacroncyrillic: 0x04EF,
+ umacrondieresis: 0x1E7B,
+ umatragurmukhi: 0x0A41,
+ umonospace: 0xFF55,
+ underscore: 0x005F,
+ underscoredbl: 0x2017,
+ underscoremonospace: 0xFF3F,
+ underscorevertical: 0xFE33,
+ underscorewavy: 0xFE4F,
+ union: 0x222A,
+ universal: 0x2200,
+ uogonek: 0x0173,
+ uparen: 0x24B0,
+ upblock: 0x2580,
+ upperdothebrew: 0x05C4,
+ upsilon: 0x03C5,
+ upsilondieresis: 0x03CB,
+ upsilondieresistonos: 0x03B0,
+ upsilonlatin: 0x028A,
+ upsilontonos: 0x03CD,
+ uptackbelowcmb: 0x031D,
+ uptackmod: 0x02D4,
+ uragurmukhi: 0x0A73,
+ uring: 0x016F,
+ ushortcyrillic: 0x045E,
+ usmallhiragana: 0x3045,
+ usmallkatakana: 0x30A5,
+ usmallkatakanahalfwidth: 0xFF69,
+ ustraightcyrillic: 0x04AF,
+ ustraightstrokecyrillic: 0x04B1,
+ utilde: 0x0169,
+ utildeacute: 0x1E79,
+ utildebelow: 0x1E75,
+ uubengali: 0x098A,
+ uudeva: 0x090A,
+ uugujarati: 0x0A8A,
+ uugurmukhi: 0x0A0A,
+ uumatragurmukhi: 0x0A42,
+ uuvowelsignbengali: 0x09C2,
+ uuvowelsigndeva: 0x0942,
+ uuvowelsigngujarati: 0x0AC2,
+ uvowelsignbengali: 0x09C1,
+ uvowelsigndeva: 0x0941,
+ uvowelsigngujarati: 0x0AC1,
+ v: 0x0076,
+ vadeva: 0x0935,
+ vagujarati: 0x0AB5,
+ vagurmukhi: 0x0A35,
+ vakatakana: 0x30F7,
+ vav: 0x05D5,
+ vavdagesh: 0xFB35,
+ vavdagesh65: 0xFB35,
+ vavdageshhebrew: 0xFB35,
+ vavhebrew: 0x05D5,
+ vavholam: 0xFB4B,
+ vavholamhebrew: 0xFB4B,
+ vavvavhebrew: 0x05F0,
+ vavyodhebrew: 0x05F1,
+ vcircle: 0x24E5,
+ vdotbelow: 0x1E7F,
+ vecyrillic: 0x0432,
+ veharabic: 0x06A4,
+ vehfinalarabic: 0xFB6B,
+ vehinitialarabic: 0xFB6C,
+ vehmedialarabic: 0xFB6D,
+ vekatakana: 0x30F9,
+ venus: 0x2640,
+ verticalbar: 0x007C,
+ verticallineabovecmb: 0x030D,
+ verticallinebelowcmb: 0x0329,
+ verticallinelowmod: 0x02CC,
+ verticallinemod: 0x02C8,
+ vewarmenian: 0x057E,
+ vhook: 0x028B,
+ vikatakana: 0x30F8,
+ viramabengali: 0x09CD,
+ viramadeva: 0x094D,
+ viramagujarati: 0x0ACD,
+ visargabengali: 0x0983,
+ visargadeva: 0x0903,
+ visargagujarati: 0x0A83,
+ vmonospace: 0xFF56,
+ voarmenian: 0x0578,
+ voicediterationhiragana: 0x309E,
+ voicediterationkatakana: 0x30FE,
+ voicedmarkkana: 0x309B,
+ voicedmarkkanahalfwidth: 0xFF9E,
+ vokatakana: 0x30FA,
+ vparen: 0x24B1,
+ vtilde: 0x1E7D,
+ vturned: 0x028C,
+ vuhiragana: 0x3094,
+ vukatakana: 0x30F4,
+ w: 0x0077,
+ wacute: 0x1E83,
+ waekorean: 0x3159,
+ wahiragana: 0x308F,
+ wakatakana: 0x30EF,
+ wakatakanahalfwidth: 0xFF9C,
+ wakorean: 0x3158,
+ wasmallhiragana: 0x308E,
+ wasmallkatakana: 0x30EE,
+ wattosquare: 0x3357,
+ wavedash: 0x301C,
+ wavyunderscorevertical: 0xFE34,
+ wawarabic: 0x0648,
+ wawfinalarabic: 0xFEEE,
+ wawhamzaabovearabic: 0x0624,
+ wawhamzaabovefinalarabic: 0xFE86,
+ wbsquare: 0x33DD,
+ wcircle: 0x24E6,
+ wcircumflex: 0x0175,
+ wdieresis: 0x1E85,
+ wdotaccent: 0x1E87,
+ wdotbelow: 0x1E89,
+ wehiragana: 0x3091,
+ weierstrass: 0x2118,
+ wekatakana: 0x30F1,
+ wekorean: 0x315E,
+ weokorean: 0x315D,
+ wgrave: 0x1E81,
+ whitebullet: 0x25E6,
+ whitecircle: 0x25CB,
+ whitecircleinverse: 0x25D9,
+ whitecornerbracketleft: 0x300E,
+ whitecornerbracketleftvertical: 0xFE43,
+ whitecornerbracketright: 0x300F,
+ whitecornerbracketrightvertical: 0xFE44,
+ whitediamond: 0x25C7,
+ whitediamondcontainingblacksmalldiamond: 0x25C8,
+ whitedownpointingsmalltriangle: 0x25BF,
+ whitedownpointingtriangle: 0x25BD,
+ whiteleftpointingsmalltriangle: 0x25C3,
+ whiteleftpointingtriangle: 0x25C1,
+ whitelenticularbracketleft: 0x3016,
+ whitelenticularbracketright: 0x3017,
+ whiterightpointingsmalltriangle: 0x25B9,
+ whiterightpointingtriangle: 0x25B7,
+ whitesmallsquare: 0x25AB,
+ whitesmilingface: 0x263A,
+ whitesquare: 0x25A1,
+ whitestar: 0x2606,
+ whitetelephone: 0x260F,
+ whitetortoiseshellbracketleft: 0x3018,
+ whitetortoiseshellbracketright: 0x3019,
+ whiteuppointingsmalltriangle: 0x25B5,
+ whiteuppointingtriangle: 0x25B3,
+ wihiragana: 0x3090,
+ wikatakana: 0x30F0,
+ wikorean: 0x315F,
+ wmonospace: 0xFF57,
+ wohiragana: 0x3092,
+ wokatakana: 0x30F2,
+ wokatakanahalfwidth: 0xFF66,
+ won: 0x20A9,
+ wonmonospace: 0xFFE6,
+ wowaenthai: 0x0E27,
+ wparen: 0x24B2,
+ wring: 0x1E98,
+ wsuperior: 0x02B7,
+ wturned: 0x028D,
+ wynn: 0x01BF,
+ x: 0x0078,
+ xabovecmb: 0x033D,
+ xbopomofo: 0x3112,
+ xcircle: 0x24E7,
+ xdieresis: 0x1E8D,
+ xdotaccent: 0x1E8B,
+ xeharmenian: 0x056D,
+ xi: 0x03BE,
+ xmonospace: 0xFF58,
+ xparen: 0x24B3,
+ xsuperior: 0x02E3,
+ y: 0x0079,
+ yaadosquare: 0x334E,
+ yabengali: 0x09AF,
+ yacute: 0x00FD,
+ yadeva: 0x092F,
+ yaekorean: 0x3152,
+ yagujarati: 0x0AAF,
+ yagurmukhi: 0x0A2F,
+ yahiragana: 0x3084,
+ yakatakana: 0x30E4,
+ yakatakanahalfwidth: 0xFF94,
+ yakorean: 0x3151,
+ yamakkanthai: 0x0E4E,
+ yasmallhiragana: 0x3083,
+ yasmallkatakana: 0x30E3,
+ yasmallkatakanahalfwidth: 0xFF6C,
+ yatcyrillic: 0x0463,
+ ycircle: 0x24E8,
+ ycircumflex: 0x0177,
+ ydieresis: 0x00FF,
+ ydotaccent: 0x1E8F,
+ ydotbelow: 0x1EF5,
+ yeharabic: 0x064A,
+ yehbarreearabic: 0x06D2,
+ yehbarreefinalarabic: 0xFBAF,
+ yehfinalarabic: 0xFEF2,
+ yehhamzaabovearabic: 0x0626,
+ yehhamzaabovefinalarabic: 0xFE8A,
+ yehhamzaaboveinitialarabic: 0xFE8B,
+ yehhamzaabovemedialarabic: 0xFE8C,
+ yehinitialarabic: 0xFEF3,
+ yehmedialarabic: 0xFEF4,
+ yehmeeminitialarabic: 0xFCDD,
+ yehmeemisolatedarabic: 0xFC58,
+ yehnoonfinalarabic: 0xFC94,
+ yehthreedotsbelowarabic: 0x06D1,
+ yekorean: 0x3156,
+ yen: 0x00A5,
+ yenmonospace: 0xFFE5,
+ yeokorean: 0x3155,
+ yeorinhieuhkorean: 0x3186,
+ yerahbenyomohebrew: 0x05AA,
+ yerahbenyomolefthebrew: 0x05AA,
+ yericyrillic: 0x044B,
+ yerudieresiscyrillic: 0x04F9,
+ yesieungkorean: 0x3181,
+ yesieungpansioskorean: 0x3183,
+ yesieungsioskorean: 0x3182,
+ yetivhebrew: 0x059A,
+ ygrave: 0x1EF3,
+ yhook: 0x01B4,
+ yhookabove: 0x1EF7,
+ yiarmenian: 0x0575,
+ yicyrillic: 0x0457,
+ yikorean: 0x3162,
+ yinyang: 0x262F,
+ yiwnarmenian: 0x0582,
+ ymonospace: 0xFF59,
+ yod: 0x05D9,
+ yoddagesh: 0xFB39,
+ yoddageshhebrew: 0xFB39,
+ yodhebrew: 0x05D9,
+ yodyodhebrew: 0x05F2,
+ yodyodpatahhebrew: 0xFB1F,
+ yohiragana: 0x3088,
+ yoikorean: 0x3189,
+ yokatakana: 0x30E8,
+ yokatakanahalfwidth: 0xFF96,
+ yokorean: 0x315B,
+ yosmallhiragana: 0x3087,
+ yosmallkatakana: 0x30E7,
+ yosmallkatakanahalfwidth: 0xFF6E,
+ yotgreek: 0x03F3,
+ yoyaekorean: 0x3188,
+ yoyakorean: 0x3187,
+ yoyakthai: 0x0E22,
+ yoyingthai: 0x0E0D,
+ yparen: 0x24B4,
+ ypogegrammeni: 0x037A,
+ ypogegrammenigreekcmb: 0x0345,
+ yr: 0x01A6,
+ yring: 0x1E99,
+ ysuperior: 0x02B8,
+ ytilde: 0x1EF9,
+ yturned: 0x028E,
+ yuhiragana: 0x3086,
+ yuikorean: 0x318C,
+ yukatakana: 0x30E6,
+ yukatakanahalfwidth: 0xFF95,
+ yukorean: 0x3160,
+ yusbigcyrillic: 0x046B,
+ yusbigiotifiedcyrillic: 0x046D,
+ yuslittlecyrillic: 0x0467,
+ yuslittleiotifiedcyrillic: 0x0469,
+ yusmallhiragana: 0x3085,
+ yusmallkatakana: 0x30E5,
+ yusmallkatakanahalfwidth: 0xFF6D,
+ yuyekorean: 0x318B,
+ yuyeokorean: 0x318A,
+ yyabengali: 0x09DF,
+ yyadeva: 0x095F,
+ z: 0x007A,
+ zaarmenian: 0x0566,
+ zacute: 0x017A,
+ zadeva: 0x095B,
+ zagurmukhi: 0x0A5B,
+ zaharabic: 0x0638,
+ zahfinalarabic: 0xFEC6,
+ zahinitialarabic: 0xFEC7,
+ zahiragana: 0x3056,
+ zahmedialarabic: 0xFEC8,
+ zainarabic: 0x0632,
+ zainfinalarabic: 0xFEB0,
+ zakatakana: 0x30B6,
+ zaqefgadolhebrew: 0x0595,
+ zaqefqatanhebrew: 0x0594,
+ zarqahebrew: 0x0598,
+ zayin: 0x05D6,
+ zayindagesh: 0xFB36,
+ zayindageshhebrew: 0xFB36,
+ zayinhebrew: 0x05D6,
+ zbopomofo: 0x3117,
+ zcaron: 0x017E,
+ zcircle: 0x24E9,
+ zcircumflex: 0x1E91,
+ zcurl: 0x0291,
+ zdot: 0x017C,
+ zdotaccent: 0x017C,
+ zdotbelow: 0x1E93,
+ zecyrillic: 0x0437,
+ zedescendercyrillic: 0x0499,
+ zedieresiscyrillic: 0x04DF,
+ zehiragana: 0x305C,
+ zekatakana: 0x30BC,
+ zero: 0x0030,
+ zeroarabic: 0x0660,
+ zerobengali: 0x09E6,
+ zerodeva: 0x0966,
+ zerogujarati: 0x0AE6,
+ zerogurmukhi: 0x0A66,
+ zerohackarabic: 0x0660,
+ zeroinferior: 0x2080,
+ zeromonospace: 0xFF10,
+ zerooldstyle: 0xF730,
+ zeropersian: 0x06F0,
+ zerosuperior: 0x2070,
+ zerothai: 0x0E50,
+ zerowidthjoiner: 0xFEFF,
+ zerowidthnonjoiner: 0x200C,
+ zerowidthspace: 0x200B,
+ zeta: 0x03B6,
+ zhbopomofo: 0x3113,
+ zhearmenian: 0x056A,
+ zhebrevecyrillic: 0x04C2,
+ zhecyrillic: 0x0436,
+ zhedescendercyrillic: 0x0497,
+ zhedieresiscyrillic: 0x04DD,
+ zihiragana: 0x3058,
+ zikatakana: 0x30B8,
+ zinorhebrew: 0x05AE,
+ zlinebelow: 0x1E95,
+ zmonospace: 0xFF5A,
+ zohiragana: 0x305E,
+ zokatakana: 0x30BE,
+ zparen: 0x24B5,
+ zretroflexhook: 0x0290,
+ zstroke: 0x01B6,
+ zuhiragana: 0x305A,
+ zukatakana: 0x30BA,
+ '.notdef': 0x0000
+};
+
+var DingbatsGlyphsUnicode = {
+ space: 0x0020,
+ a1: 0x2701,
+ a2: 0x2702,
+ a202: 0x2703,
+ a3: 0x2704,
+ a4: 0x260E,
+ a5: 0x2706,
+ a119: 0x2707,
+ a118: 0x2708,
+ a117: 0x2709,
+ a11: 0x261B,
+ a12: 0x261E,
+ a13: 0x270C,
+ a14: 0x270D,
+ a15: 0x270E,
+ a16: 0x270F,
+ a105: 0x2710,
+ a17: 0x2711,
+ a18: 0x2712,
+ a19: 0x2713,
+ a20: 0x2714,
+ a21: 0x2715,
+ a22: 0x2716,
+ a23: 0x2717,
+ a24: 0x2718,
+ a25: 0x2719,
+ a26: 0x271A,
+ a27: 0x271B,
+ a28: 0x271C,
+ a6: 0x271D,
+ a7: 0x271E,
+ a8: 0x271F,
+ a9: 0x2720,
+ a10: 0x2721,
+ a29: 0x2722,
+ a30: 0x2723,
+ a31: 0x2724,
+ a32: 0x2725,
+ a33: 0x2726,
+ a34: 0x2727,
+ a35: 0x2605,
+ a36: 0x2729,
+ a37: 0x272A,
+ a38: 0x272B,
+ a39: 0x272C,
+ a40: 0x272D,
+ a41: 0x272E,
+ a42: 0x272F,
+ a43: 0x2730,
+ a44: 0x2731,
+ a45: 0x2732,
+ a46: 0x2733,
+ a47: 0x2734,
+ a48: 0x2735,
+ a49: 0x2736,
+ a50: 0x2737,
+ a51: 0x2738,
+ a52: 0x2739,
+ a53: 0x273A,
+ a54: 0x273B,
+ a55: 0x273C,
+ a56: 0x273D,
+ a57: 0x273E,
+ a58: 0x273F,
+ a59: 0x2740,
+ a60: 0x2741,
+ a61: 0x2742,
+ a62: 0x2743,
+ a63: 0x2744,
+ a64: 0x2745,
+ a65: 0x2746,
+ a66: 0x2747,
+ a67: 0x2748,
+ a68: 0x2749,
+ a69: 0x274A,
+ a70: 0x274B,
+ a71: 0x25CF,
+ a72: 0x274D,
+ a73: 0x25A0,
+ a74: 0x274F,
+ a203: 0x2750,
+ a75: 0x2751,
+ a204: 0x2752,
+ a76: 0x25B2,
+ a77: 0x25BC,
+ a78: 0x25C6,
+ a79: 0x2756,
+ a81: 0x25D7,
+ a82: 0x2758,
+ a83: 0x2759,
+ a84: 0x275A,
+ a97: 0x275B,
+ a98: 0x275C,
+ a99: 0x275D,
+ a100: 0x275E,
+ a101: 0x2761,
+ a102: 0x2762,
+ a103: 0x2763,
+ a104: 0x2764,
+ a106: 0x2765,
+ a107: 0x2766,
+ a108: 0x2767,
+ a112: 0x2663,
+ a111: 0x2666,
+ a110: 0x2665,
+ a109: 0x2660,
+ a120: 0x2460,
+ a121: 0x2461,
+ a122: 0x2462,
+ a123: 0x2463,
+ a124: 0x2464,
+ a125: 0x2465,
+ a126: 0x2466,
+ a127: 0x2467,
+ a128: 0x2468,
+ a129: 0x2469,
+ a130: 0x2776,
+ a131: 0x2777,
+ a132: 0x2778,
+ a133: 0x2779,
+ a134: 0x277A,
+ a135: 0x277B,
+ a136: 0x277C,
+ a137: 0x277D,
+ a138: 0x277E,
+ a139: 0x277F,
+ a140: 0x2780,
+ a141: 0x2781,
+ a142: 0x2782,
+ a143: 0x2783,
+ a144: 0x2784,
+ a145: 0x2785,
+ a146: 0x2786,
+ a147: 0x2787,
+ a148: 0x2788,
+ a149: 0x2789,
+ a150: 0x278A,
+ a151: 0x278B,
+ a152: 0x278C,
+ a153: 0x278D,
+ a154: 0x278E,
+ a155: 0x278F,
+ a156: 0x2790,
+ a157: 0x2791,
+ a158: 0x2792,
+ a159: 0x2793,
+ a160: 0x2794,
+ a161: 0x2192,
+ a163: 0x2194,
+ a164: 0x2195,
+ a196: 0x2798,
+ a165: 0x2799,
+ a192: 0x279A,
+ a166: 0x279B,
+ a167: 0x279C,
+ a168: 0x279D,
+ a169: 0x279E,
+ a170: 0x279F,
+ a171: 0x27A0,
+ a172: 0x27A1,
+ a173: 0x27A2,
+ a162: 0x27A3,
+ a174: 0x27A4,
+ a175: 0x27A5,
+ a176: 0x27A6,
+ a177: 0x27A7,
+ a178: 0x27A8,
+ a179: 0x27A9,
+ a193: 0x27AA,
+ a180: 0x27AB,
+ a199: 0x27AC,
+ a181: 0x27AD,
+ a200: 0x27AE,
+ a182: 0x27AF,
+ a201: 0x27B1,
+ a183: 0x27B2,
+ a184: 0x27B3,
+ a197: 0x27B4,
+ a185: 0x27B5,
+ a194: 0x27B6,
+ a198: 0x27B7,
+ a186: 0x27B8,
+ a195: 0x27B9,
+ a187: 0x27BA,
+ a188: 0x27BB,
+ a189: 0x27BC,
+ a190: 0x27BD,
+ a191: 0x27BE,
+ a89: 0x2768, // 0xF8D7
+ a90: 0x2769, // 0xF8D8
+ a93: 0x276A, // 0xF8D9
+ a94: 0x276B, // 0xF8DA
+ a91: 0x276C, // 0xF8DB
+ a92: 0x276D, // 0xF8DC
+ a205: 0x276E, // 0xF8DD
+ a85: 0x276F, // 0xF8DE
+ a206: 0x2770, // 0xF8DF
+ a86: 0x2771, // 0xF8E0
+ a87: 0x2772, // 0xF8E1
+ a88: 0x2773, // 0xF8E2
+ a95: 0x2774, // 0xF8E3
+ a96: 0x2775, // 0xF8E4
+ '.notdef': 0x0000
+};
+
+
+var PDFImage = (function PDFImageClosure() {
+ /**
+ * Decode the image in the main thread if it supported. Resovles the promise
+ * when the image data is ready.
+ */
+ function handleImageData(handler, xref, res, image) {
+ if (image instanceof JpegStream && image.isNativelyDecodable(xref, res)) {
+ // For natively supported jpegs send them to the main thread for decoding.
+ var dict = image.dict;
+ var colorSpace = dict.get('ColorSpace', 'CS');
+ colorSpace = ColorSpace.parse(colorSpace, xref, res);
+ var numComps = colorSpace.numComps;
+ var decodePromise = handler.sendWithPromise('JpegDecode',
+ [image.getIR(), numComps]);
+ return decodePromise.then(function (message) {
+ var data = message.data;
+ return new Stream(data, 0, data.length, image.dict);
+ });
+ } else {
+ return Promise.resolve(image);
+ }
+ }
+
+ /**
+ * Decode and clamp a value. The formula is different from the spec because we
+ * don't decode to float range [0,1], we decode it in the [0,max] range.
+ */
+ function decodeAndClamp(value, addend, coefficient, max) {
+ value = addend + value * coefficient;
+ // Clamp the value to the range
+ return (value < 0 ? 0 : (value > max ? max : value));
+ }
+
+ function PDFImage(xref, res, image, inline, smask, mask, isMask) {
+ this.image = image;
+ var dict = image.dict;
+ if (dict.has('Filter')) {
+ var filter = dict.get('Filter').name;
+ if (filter === 'JPXDecode') {
+ var jpxImage = new JpxImage();
+ jpxImage.parseImageProperties(image.stream);
+ image.stream.reset();
+ image.bitsPerComponent = jpxImage.bitsPerComponent;
+ image.numComps = jpxImage.componentsCount;
+ } else if (filter === 'JBIG2Decode') {
+ image.bitsPerComponent = 1;
+ image.numComps = 1;
+ }
+ }
+ // TODO cache rendered images?
+
+ this.width = dict.get('Width', 'W');
+ this.height = dict.get('Height', 'H');
+
+ if (this.width < 1 || this.height < 1) {
+ error('Invalid image width: ' + this.width + ' or height: ' +
+ this.height);
+ }
+
+ this.interpolate = dict.get('Interpolate', 'I') || false;
+ this.imageMask = dict.get('ImageMask', 'IM') || false;
+ this.matte = dict.get('Matte') || false;
+
+ var bitsPerComponent = image.bitsPerComponent;
+ if (!bitsPerComponent) {
+ bitsPerComponent = dict.get('BitsPerComponent', 'BPC');
+ if (!bitsPerComponent) {
+ if (this.imageMask) {
+ bitsPerComponent = 1;
+ } else {
+ error('Bits per component missing in image: ' + this.imageMask);
+ }
+ }
+ }
+ this.bpc = bitsPerComponent;
+
+ if (!this.imageMask) {
+ var colorSpace = dict.get('ColorSpace', 'CS');
+ if (!colorSpace) {
+ info('JPX images (which do not require color spaces)');
+ switch (image.numComps) {
+ case 1:
+ colorSpace = Name.get('DeviceGray');
+ break;
+ case 3:
+ colorSpace = Name.get('DeviceRGB');
+ break;
+ case 4:
+ colorSpace = Name.get('DeviceCMYK');
+ break;
+ default:
+ error('JPX images with ' + this.numComps +
+ ' color components not supported.');
+ }
+ }
+ this.colorSpace = ColorSpace.parse(colorSpace, xref, res);
+ this.numComps = this.colorSpace.numComps;
+ }
+
+ this.decode = dict.get('Decode', 'D');
+ this.needsDecode = false;
+ if (this.decode &&
+ ((this.colorSpace && !this.colorSpace.isDefaultDecode(this.decode)) ||
+ (isMask && !ColorSpace.isDefaultDecode(this.decode, 1)))) {
+ this.needsDecode = true;
+ // Do some preprocessing to avoid more math.
+ var max = (1 << bitsPerComponent) - 1;
+ this.decodeCoefficients = [];
+ this.decodeAddends = [];
+ for (var i = 0, j = 0; i < this.decode.length; i += 2, ++j) {
+ var dmin = this.decode[i];
+ var dmax = this.decode[i + 1];
+ this.decodeCoefficients[j] = dmax - dmin;
+ this.decodeAddends[j] = max * dmin;
+ }
+ }
+
+ if (smask) {
+ this.smask = new PDFImage(xref, res, smask, false);
+ } else if (mask) {
+ if (isStream(mask)) {
+ this.mask = new PDFImage(xref, res, mask, false, null, null, true);
+ } else {
+ // Color key mask (just an array).
+ this.mask = mask;
+ }
+ }
+ }
+ /**
+ * Handles processing of image data and returns the Promise that is resolved
+ * with a PDFImage when the image is ready to be used.
+ */
+ PDFImage.buildImage = function PDFImage_buildImage(handler, xref,
+ res, image, inline) {
+ var imagePromise = handleImageData(handler, xref, res, image);
+ var smaskPromise;
+ var maskPromise;
+
+ var smask = image.dict.get('SMask');
+ var mask = image.dict.get('Mask');
+
+ if (smask) {
+ smaskPromise = handleImageData(handler, xref, res, smask);
+ maskPromise = Promise.resolve(null);
+ } else {
+ smaskPromise = Promise.resolve(null);
+ if (mask) {
+ if (isStream(mask)) {
+ maskPromise = handleImageData(handler, xref, res, mask);
+ } else if (isArray(mask)) {
+ maskPromise = Promise.resolve(mask);
+ } else {
+ warn('Unsupported mask format.');
+ maskPromise = Promise.resolve(null);
+ }
+ } else {
+ maskPromise = Promise.resolve(null);
+ }
+ }
+ return Promise.all([imagePromise, smaskPromise, maskPromise]).then(
+ function(results) {
+ var imageData = results[0];
+ var smaskData = results[1];
+ var maskData = results[2];
+ return new PDFImage(xref, res, imageData, inline, smaskData, maskData);
+ });
+ };
+
+ /**
+ * Resize an image using the nearest neighbor algorithm. Currently only
+ * supports one and three component images.
+ * @param {TypedArray} pixels The original image with one component.
+ * @param {Number} bpc Number of bits per component.
+ * @param {Number} components Number of color components, 1 or 3 is supported.
+ * @param {Number} w1 Original width.
+ * @param {Number} h1 Original height.
+ * @param {Number} w2 New width.
+ * @param {Number} h2 New height.
+ * @param {TypedArray} dest (Optional) The destination buffer.
+ * @param {Number} alpha01 (Optional) Size reserved for the alpha channel.
+ * @return {TypedArray} Resized image data.
+ */
+ PDFImage.resize = function PDFImage_resize(pixels, bpc, components,
+ w1, h1, w2, h2, dest, alpha01) {
+
+ if (components !== 1 && components !== 3) {
+ error('Unsupported component count for resizing.');
+ }
+
+ var length = w2 * h2 * components;
+ var temp = dest ? dest : (bpc <= 8 ? new Uint8Array(length) :
+ (bpc <= 16 ? new Uint16Array(length) : new Uint32Array(length)));
+ var xRatio = w1 / w2;
+ var yRatio = h1 / h2;
+ var i, j, py, newIndex = 0, oldIndex;
+ var xScaled = new Uint16Array(w2);
+ var w1Scanline = w1 * components;
+ if (alpha01 !== 1) {
+ alpha01 = 0;
+ }
+
+ for (j = 0; j < w2; j++) {
+ xScaled[j] = Math.floor(j * xRatio) * components;
+ }
+
+ if (components === 1) {
+ for (i = 0; i < h2; i++) {
+ py = Math.floor(i * yRatio) * w1Scanline;
+ for (j = 0; j < w2; j++) {
+ oldIndex = py + xScaled[j];
+ temp[newIndex++] = pixels[oldIndex];
+ }
+ }
+ } else if (components === 3) {
+ for (i = 0; i < h2; i++) {
+ py = Math.floor(i * yRatio) * w1Scanline;
+ for (j = 0; j < w2; j++) {
+ oldIndex = py + xScaled[j];
+ temp[newIndex++] = pixels[oldIndex++];
+ temp[newIndex++] = pixels[oldIndex++];
+ temp[newIndex++] = pixels[oldIndex++];
+ newIndex += alpha01;
+ }
+ }
+ }
+ return temp;
+ };
+
+ PDFImage.createMask =
+ function PDFImage_createMask(imgArray, width, height,
+ imageIsFromDecodeStream, inverseDecode) {
+
+ // |imgArray| might not contain full data for every pixel of the mask, so
+ // we need to distinguish between |computedLength| and |actualLength|.
+ // In particular, if inverseDecode is true, then the array we return must
+ // have a length of |computedLength|.
+
+ var computedLength = ((width + 7) >> 3) * height;
+ var actualLength = imgArray.byteLength;
+ var haveFullData = computedLength === actualLength;
+ var data, i;
+
+ if (imageIsFromDecodeStream && (!inverseDecode || haveFullData)) {
+ // imgArray came from a DecodeStream and its data is in an appropriate
+ // form, so we can just transfer it.
+ data = imgArray;
+ } else if (!inverseDecode) {
+ data = new Uint8Array(actualLength);
+ data.set(imgArray);
+ } else {
+ data = new Uint8Array(computedLength);
+ data.set(imgArray);
+ for (i = actualLength; i < computedLength; i++) {
+ data[i] = 0xff;
+ }
+ }
+
+ // If necessary, invert the original mask data (but not any extra we might
+ // have added above). It's safe to modify the array -- whether it's the
+ // original or a copy, we're about to transfer it anyway, so nothing else
+ // in this thread can be relying on its contents.
+ if (inverseDecode) {
+ for (i = 0; i < actualLength; i++) {
+ data[i] = ~data[i];
+ }
+ }
+
+ return {data: data, width: width, height: height};
+ };
+
+ PDFImage.prototype = {
+ get drawWidth() {
+ return Math.max(this.width,
+ this.smask && this.smask.width || 0,
+ this.mask && this.mask.width || 0);
+ },
+
+ get drawHeight() {
+ return Math.max(this.height,
+ this.smask && this.smask.height || 0,
+ this.mask && this.mask.height || 0);
+ },
+
+ decodeBuffer: function PDFImage_decodeBuffer(buffer) {
+ var bpc = this.bpc;
+ var numComps = this.numComps;
+
+ var decodeAddends = this.decodeAddends;
+ var decodeCoefficients = this.decodeCoefficients;
+ var max = (1 << bpc) - 1;
+ var i, ii;
+
+ if (bpc === 1) {
+ // If the buffer needed decode that means it just needs to be inverted.
+ for (i = 0, ii = buffer.length; i < ii; i++) {
+ buffer[i] = +!(buffer[i]);
+ }
+ return;
+ }
+ var index = 0;
+ for (i = 0, ii = this.width * this.height; i < ii; i++) {
+ for (var j = 0; j < numComps; j++) {
+ buffer[index] = decodeAndClamp(buffer[index], decodeAddends[j],
+ decodeCoefficients[j], max);
+ index++;
+ }
+ }
+ },
+
+ getComponents: function PDFImage_getComponents(buffer) {
+ var bpc = this.bpc;
+
+ // This image doesn't require any extra work.
+ if (bpc === 8) {
+ return buffer;
+ }
+
+ var width = this.width;
+ var height = this.height;
+ var numComps = this.numComps;
+
+ var length = width * height * numComps;
+ var bufferPos = 0;
+ var output = (bpc <= 8 ? new Uint8Array(length) :
+ (bpc <= 16 ? new Uint16Array(length) : new Uint32Array(length)));
+ var rowComps = width * numComps;
+
+ var max = (1 << bpc) - 1;
+ var i = 0, ii, buf;
+
+ if (bpc === 1) {
+ // Optimization for reading 1 bpc images.
+ var mask, loop1End, loop2End;
+ for (var j = 0; j < height; j++) {
+ loop1End = i + (rowComps & ~7);
+ loop2End = i + rowComps;
+
+ // unroll loop for all full bytes
+ while (i < loop1End) {
+ buf = buffer[bufferPos++];
+ output[i] = (buf >> 7) & 1;
+ output[i + 1] = (buf >> 6) & 1;
+ output[i + 2] = (buf >> 5) & 1;
+ output[i + 3] = (buf >> 4) & 1;
+ output[i + 4] = (buf >> 3) & 1;
+ output[i + 5] = (buf >> 2) & 1;
+ output[i + 6] = (buf >> 1) & 1;
+ output[i + 7] = buf & 1;
+ i += 8;
+ }
+
+ // handle remaing bits
+ if (i < loop2End) {
+ buf = buffer[bufferPos++];
+ mask = 128;
+ while (i < loop2End) {
+ output[i++] = +!!(buf & mask);
+ mask >>= 1;
+ }
+ }
+ }
+ } else {
+ // The general case that handles all other bpc values.
+ var bits = 0;
+ buf = 0;
+ for (i = 0, ii = length; i < ii; ++i) {
+ if (i % rowComps === 0) {
+ buf = 0;
+ bits = 0;
+ }
+
+ while (bits < bpc) {
+ buf = (buf << 8) | buffer[bufferPos++];
+ bits += 8;
+ }
+
+ var remainingBits = bits - bpc;
+ var value = buf >> remainingBits;
+ output[i] = (value < 0 ? 0 : (value > max ? max : value));
+ buf = buf & ((1 << remainingBits) - 1);
+ bits = remainingBits;
+ }
+ }
+ return output;
+ },
+
+ fillOpacity: function PDFImage_fillOpacity(rgbaBuf, width, height,
+ actualHeight, image) {
+ var smask = this.smask;
+ var mask = this.mask;
+ var alphaBuf, sw, sh, i, ii, j;
+
+ if (smask) {
+ sw = smask.width;
+ sh = smask.height;
+ alphaBuf = new Uint8Array(sw * sh);
+ smask.fillGrayBuffer(alphaBuf);
+ if (sw !== width || sh !== height) {
+ alphaBuf = PDFImage.resize(alphaBuf, smask.bpc, 1, sw, sh, width,
+ height);
+ }
+ } else if (mask) {
+ if (mask instanceof PDFImage) {
+ sw = mask.width;
+ sh = mask.height;
+ alphaBuf = new Uint8Array(sw * sh);
+ mask.numComps = 1;
+ mask.fillGrayBuffer(alphaBuf);
+
+ // Need to invert values in rgbaBuf
+ for (i = 0, ii = sw * sh; i < ii; ++i) {
+ alphaBuf[i] = 255 - alphaBuf[i];
+ }
+
+ if (sw !== width || sh !== height) {
+ alphaBuf = PDFImage.resize(alphaBuf, mask.bpc, 1, sw, sh, width,
+ height);
+ }
+ } else if (isArray(mask)) {
+ // Color key mask: if any of the compontents are outside the range
+ // then they should be painted.
+ alphaBuf = new Uint8Array(width * height);
+ var numComps = this.numComps;
+ for (i = 0, ii = width * height; i < ii; ++i) {
+ var opacity = 0;
+ var imageOffset = i * numComps;
+ for (j = 0; j < numComps; ++j) {
+ var color = image[imageOffset + j];
+ var maskOffset = j * 2;
+ if (color < mask[maskOffset] || color > mask[maskOffset + 1]) {
+ opacity = 255;
+ break;
+ }
+ }
+ alphaBuf[i] = opacity;
+ }
+ } else {
+ error('Unknown mask format.');
+ }
+ }
+
+ if (alphaBuf) {
+ for (i = 0, j = 3, ii = width * actualHeight; i < ii; ++i, j += 4) {
+ rgbaBuf[j] = alphaBuf[i];
+ }
+ } else {
+ // No mask.
+ for (i = 0, j = 3, ii = width * actualHeight; i < ii; ++i, j += 4) {
+ rgbaBuf[j] = 255;
+ }
+ }
+ },
+
+ undoPreblend: function PDFImage_undoPreblend(buffer, width, height) {
+ var matte = this.smask && this.smask.matte;
+ if (!matte) {
+ return;
+ }
+ var matteRgb = this.colorSpace.getRgb(matte, 0);
+ var matteR = matteRgb[0];
+ var matteG = matteRgb[1];
+ var matteB = matteRgb[2];
+ var length = width * height * 4;
+ var r, g, b;
+ for (var i = 0; i < length; i += 4) {
+ var alpha = buffer[i + 3];
+ if (alpha === 0) {
+ // according formula we have to get Infinity in all components
+ // making it white (typical paper color) should be okay
+ buffer[i] = 255;
+ buffer[i + 1] = 255;
+ buffer[i + 2] = 255;
+ continue;
+ }
+ var k = 255 / alpha;
+ r = (buffer[i] - matteR) * k + matteR;
+ g = (buffer[i + 1] - matteG) * k + matteG;
+ b = (buffer[i + 2] - matteB) * k + matteB;
+ buffer[i] = r <= 0 ? 0 : r >= 255 ? 255 : r | 0;
+ buffer[i + 1] = g <= 0 ? 0 : g >= 255 ? 255 : g | 0;
+ buffer[i + 2] = b <= 0 ? 0 : b >= 255 ? 255 : b | 0;
+ }
+ },
+
+ createImageData: function PDFImage_createImageData(forceRGBA) {
+ var drawWidth = this.drawWidth;
+ var drawHeight = this.drawHeight;
+ var imgData = { // other fields are filled in below
+ width: drawWidth,
+ height: drawHeight
+ };
+
+ var numComps = this.numComps;
+ var originalWidth = this.width;
+ var originalHeight = this.height;
+ var bpc = this.bpc;
+
+ // Rows start at byte boundary.
+ var rowBytes = (originalWidth * numComps * bpc + 7) >> 3;
+ var imgArray;
+
+ if (!forceRGBA) {
+ // If it is a 1-bit-per-pixel grayscale (i.e. black-and-white) image
+ // without any complications, we pass a same-sized copy to the main
+ // thread rather than expanding by 32x to RGBA form. This saves *lots*
+ // of memory for many scanned documents. It's also much faster.
+ //
+ // Similarly, if it is a 24-bit-per pixel RGB image without any
+ // complications, we avoid expanding by 1.333x to RGBA form.
+ var kind;
+ if (this.colorSpace.name === 'DeviceGray' && bpc === 1) {
+ kind = ImageKind.GRAYSCALE_1BPP;
+ } else if (this.colorSpace.name === 'DeviceRGB' && bpc === 8 &&
+ !this.needsDecode) {
+ kind = ImageKind.RGB_24BPP;
+ }
+ if (kind && !this.smask && !this.mask &&
+ drawWidth === originalWidth && drawHeight === originalHeight) {
+ imgData.kind = kind;
+
+ imgArray = this.getImageBytes(originalHeight * rowBytes);
+ // If imgArray came from a DecodeStream, we're safe to transfer it
+ // (and thus neuter it) because it will constitute the entire
+ // DecodeStream's data. But if it came from a Stream, we need to
+ // copy it because it'll only be a portion of the Stream's data, and
+ // the rest will be read later on.
+ if (this.image instanceof DecodeStream) {
+ imgData.data = imgArray;
+ } else {
+ var newArray = new Uint8Array(imgArray.length);
+ newArray.set(imgArray);
+ imgData.data = newArray;
+ }
+ if (this.needsDecode) {
+ // Invert the buffer (which must be grayscale if we reached here).
+ assert(kind === ImageKind.GRAYSCALE_1BPP);
+ var buffer = imgData.data;
+ for (var i = 0, ii = buffer.length; i < ii; i++) {
+ buffer[i] ^= 0xff;
+ }
+ }
+ return imgData;
+ }
+ if (this.image instanceof JpegStream && !this.smask && !this.mask) {
+ imgData.kind = ImageKind.RGB_24BPP;
+ imgData.data = this.getImageBytes(originalHeight * rowBytes,
+ drawWidth, drawHeight, true);
+ return imgData;
+ }
+ }
+
+ imgArray = this.getImageBytes(originalHeight * rowBytes);
+ // imgArray can be incomplete (e.g. after CCITT fax encoding).
+ var actualHeight = 0 | (imgArray.length / rowBytes *
+ drawHeight / originalHeight);
+
+ var comps = this.getComponents(imgArray);
+
+ // If opacity data is present, use RGBA_32BPP form. Otherwise, use the
+ // more compact RGB_24BPP form if allowable.
+ var alpha01, maybeUndoPreblend;
+ if (!forceRGBA && !this.smask && !this.mask) {
+ imgData.kind = ImageKind.RGB_24BPP;
+ imgData.data = new Uint8Array(drawWidth * drawHeight * 3);
+ alpha01 = 0;
+ maybeUndoPreblend = false;
+ } else {
+ imgData.kind = ImageKind.RGBA_32BPP;
+ imgData.data = new Uint8Array(drawWidth * drawHeight * 4);
+ alpha01 = 1;
+ maybeUndoPreblend = true;
+
+ // Color key masking (opacity) must be performed before decoding.
+ this.fillOpacity(imgData.data, drawWidth, drawHeight, actualHeight,
+ comps);
+ }
+
+ if (this.needsDecode) {
+ this.decodeBuffer(comps);
+ }
+ this.colorSpace.fillRgb(imgData.data, originalWidth, originalHeight,
+ drawWidth, drawHeight, actualHeight, bpc, comps,
+ alpha01);
+ if (maybeUndoPreblend) {
+ this.undoPreblend(imgData.data, drawWidth, actualHeight);
+ }
+
+ return imgData;
+ },
+
+ fillGrayBuffer: function PDFImage_fillGrayBuffer(buffer) {
+ var numComps = this.numComps;
+ if (numComps !== 1) {
+ error('Reading gray scale from a color image: ' + numComps);
+ }
+
+ var width = this.width;
+ var height = this.height;
+ var bpc = this.bpc;
+
+ // rows start at byte boundary
+ var rowBytes = (width * numComps * bpc + 7) >> 3;
+ var imgArray = this.getImageBytes(height * rowBytes);
+
+ var comps = this.getComponents(imgArray);
+ var i, length;
+
+ if (bpc === 1) {
+ // inline decoding (= inversion) for 1 bpc images
+ length = width * height;
+ if (this.needsDecode) {
+ // invert and scale to {0, 255}
+ for (i = 0; i < length; ++i) {
+ buffer[i] = (comps[i] - 1) & 255;
+ }
+ } else {
+ // scale to {0, 255}
+ for (i = 0; i < length; ++i) {
+ buffer[i] = (-comps[i]) & 255;
+ }
+ }
+ return;
+ }
+
+ if (this.needsDecode) {
+ this.decodeBuffer(comps);
+ }
+ length = width * height;
+ // we aren't using a colorspace so we need to scale the value
+ var scale = 255 / ((1 << bpc) - 1);
+ for (i = 0; i < length; ++i) {
+ buffer[i] = (scale * comps[i]) | 0;
+ }
+ },
+
+ getImageBytes: function PDFImage_getImageBytes(length,
+ drawWidth, drawHeight,
+ forceRGB) {
+ this.image.reset();
+ this.image.drawWidth = drawWidth || this.width;
+ this.image.drawHeight = drawHeight || this.height;
+ this.image.forceRGB = !!forceRGB;
+ return this.image.getBytes(length);
+ }
+ };
+ return PDFImage;
+})();
+
+
+// The Metrics object contains glyph widths (in glyph space units).
+// As per PDF spec, for most fonts (Type 3 being an exception) a glyph
+// space unit corresponds to 1/1000th of text space unit.
+var Metrics = {
+ 'Courier': 600,
+ 'Courier-Bold': 600,
+ 'Courier-BoldOblique': 600,
+ 'Courier-Oblique': 600,
+ 'Helvetica' : {
+ 'space': 278,
+ 'exclam': 278,
+ 'quotedbl': 355,
+ 'numbersign': 556,
+ 'dollar': 556,
+ 'percent': 889,
+ 'ampersand': 667,
+ 'quoteright': 222,
+ 'parenleft': 333,
+ 'parenright': 333,
+ 'asterisk': 389,
+ 'plus': 584,
+ 'comma': 278,
+ 'hyphen': 333,
+ 'period': 278,
+ 'slash': 278,
+ 'zero': 556,
+ 'one': 556,
+ 'two': 556,
+ 'three': 556,
+ 'four': 556,
+ 'five': 556,
+ 'six': 556,
+ 'seven': 556,
+ 'eight': 556,
+ 'nine': 556,
+ 'colon': 278,
+ 'semicolon': 278,
+ 'less': 584,
+ 'equal': 584,
+ 'greater': 584,
+ 'question': 556,
+ 'at': 1015,
+ 'A': 667,
+ 'B': 667,
+ 'C': 722,
+ 'D': 722,
+ 'E': 667,
+ 'F': 611,
+ 'G': 778,
+ 'H': 722,
+ 'I': 278,
+ 'J': 500,
+ 'K': 667,
+ 'L': 556,
+ 'M': 833,
+ 'N': 722,
+ 'O': 778,
+ 'P': 667,
+ 'Q': 778,
+ 'R': 722,
+ 'S': 667,
+ 'T': 611,
+ 'U': 722,
+ 'V': 667,
+ 'W': 944,
+ 'X': 667,
+ 'Y': 667,
+ 'Z': 611,
+ 'bracketleft': 278,
+ 'backslash': 278,
+ 'bracketright': 278,
+ 'asciicircum': 469,
+ 'underscore': 556,
+ 'quoteleft': 222,
+ 'a': 556,
+ 'b': 556,
+ 'c': 500,
+ 'd': 556,
+ 'e': 556,
+ 'f': 278,
+ 'g': 556,
+ 'h': 556,
+ 'i': 222,
+ 'j': 222,
+ 'k': 500,
+ 'l': 222,
+ 'm': 833,
+ 'n': 556,
+ 'o': 556,
+ 'p': 556,
+ 'q': 556,
+ 'r': 333,
+ 's': 500,
+ 't': 278,
+ 'u': 556,
+ 'v': 500,
+ 'w': 722,
+ 'x': 500,
+ 'y': 500,
+ 'z': 500,
+ 'braceleft': 334,
+ 'bar': 260,
+ 'braceright': 334,
+ 'asciitilde': 584,
+ 'exclamdown': 333,
+ 'cent': 556,
+ 'sterling': 556,
+ 'fraction': 167,
+ 'yen': 556,
+ 'florin': 556,
+ 'section': 556,
+ 'currency': 556,
+ 'quotesingle': 191,
+ 'quotedblleft': 333,
+ 'guillemotleft': 556,
+ 'guilsinglleft': 333,
+ 'guilsinglright': 333,
+ 'fi': 500,
+ 'fl': 500,
+ 'endash': 556,
+ 'dagger': 556,
+ 'daggerdbl': 556,
+ 'periodcentered': 278,
+ 'paragraph': 537,
+ 'bullet': 350,
+ 'quotesinglbase': 222,
+ 'quotedblbase': 333,
+ 'quotedblright': 333,
+ 'guillemotright': 556,
+ 'ellipsis': 1000,
+ 'perthousand': 1000,
+ 'questiondown': 611,
+ 'grave': 333,
+ 'acute': 333,
+ 'circumflex': 333,
+ 'tilde': 333,
+ 'macron': 333,
+ 'breve': 333,
+ 'dotaccent': 333,
+ 'dieresis': 333,
+ 'ring': 333,
+ 'cedilla': 333,
+ 'hungarumlaut': 333,
+ 'ogonek': 333,
+ 'caron': 333,
+ 'emdash': 1000,
+ 'AE': 1000,
+ 'ordfeminine': 370,
+ 'Lslash': 556,
+ 'Oslash': 778,
+ 'OE': 1000,
+ 'ordmasculine': 365,
+ 'ae': 889,
+ 'dotlessi': 278,
+ 'lslash': 222,
+ 'oslash': 611,
+ 'oe': 944,
+ 'germandbls': 611,
+ 'Idieresis': 278,
+ 'eacute': 556,
+ 'abreve': 556,
+ 'uhungarumlaut': 556,
+ 'ecaron': 556,
+ 'Ydieresis': 667,
+ 'divide': 584,
+ 'Yacute': 667,
+ 'Acircumflex': 667,
+ 'aacute': 556,
+ 'Ucircumflex': 722,
+ 'yacute': 500,
+ 'scommaaccent': 500,
+ 'ecircumflex': 556,
+ 'Uring': 722,
+ 'Udieresis': 722,
+ 'aogonek': 556,
+ 'Uacute': 722,
+ 'uogonek': 556,
+ 'Edieresis': 667,
+ 'Dcroat': 722,
+ 'commaaccent': 250,
+ 'copyright': 737,
+ 'Emacron': 667,
+ 'ccaron': 500,
+ 'aring': 556,
+ 'Ncommaaccent': 722,
+ 'lacute': 222,
+ 'agrave': 556,
+ 'Tcommaaccent': 611,
+ 'Cacute': 722,
+ 'atilde': 556,
+ 'Edotaccent': 667,
+ 'scaron': 500,
+ 'scedilla': 500,
+ 'iacute': 278,
+ 'lozenge': 471,
+ 'Rcaron': 722,
+ 'Gcommaaccent': 778,
+ 'ucircumflex': 556,
+ 'acircumflex': 556,
+ 'Amacron': 667,
+ 'rcaron': 333,
+ 'ccedilla': 500,
+ 'Zdotaccent': 611,
+ 'Thorn': 667,
+ 'Omacron': 778,
+ 'Racute': 722,
+ 'Sacute': 667,
+ 'dcaron': 643,
+ 'Umacron': 722,
+ 'uring': 556,
+ 'threesuperior': 333,
+ 'Ograve': 778,
+ 'Agrave': 667,
+ 'Abreve': 667,
+ 'multiply': 584,
+ 'uacute': 556,
+ 'Tcaron': 611,
+ 'partialdiff': 476,
+ 'ydieresis': 500,
+ 'Nacute': 722,
+ 'icircumflex': 278,
+ 'Ecircumflex': 667,
+ 'adieresis': 556,
+ 'edieresis': 556,
+ 'cacute': 500,
+ 'nacute': 556,
+ 'umacron': 556,
+ 'Ncaron': 722,
+ 'Iacute': 278,
+ 'plusminus': 584,
+ 'brokenbar': 260,
+ 'registered': 737,
+ 'Gbreve': 778,
+ 'Idotaccent': 278,
+ 'summation': 600,
+ 'Egrave': 667,
+ 'racute': 333,
+ 'omacron': 556,
+ 'Zacute': 611,
+ 'Zcaron': 611,
+ 'greaterequal': 549,
+ 'Eth': 722,
+ 'Ccedilla': 722,
+ 'lcommaaccent': 222,
+ 'tcaron': 317,
+ 'eogonek': 556,
+ 'Uogonek': 722,
+ 'Aacute': 667,
+ 'Adieresis': 667,
+ 'egrave': 556,
+ 'zacute': 500,
+ 'iogonek': 222,
+ 'Oacute': 778,
+ 'oacute': 556,
+ 'amacron': 556,
+ 'sacute': 500,
+ 'idieresis': 278,
+ 'Ocircumflex': 778,
+ 'Ugrave': 722,
+ 'Delta': 612,
+ 'thorn': 556,
+ 'twosuperior': 333,
+ 'Odieresis': 778,
+ 'mu': 556,
+ 'igrave': 278,
+ 'ohungarumlaut': 556,
+ 'Eogonek': 667,
+ 'dcroat': 556,
+ 'threequarters': 834,
+ 'Scedilla': 667,
+ 'lcaron': 299,
+ 'Kcommaaccent': 667,
+ 'Lacute': 556,
+ 'trademark': 1000,
+ 'edotaccent': 556,
+ 'Igrave': 278,
+ 'Imacron': 278,
+ 'Lcaron': 556,
+ 'onehalf': 834,
+ 'lessequal': 549,
+ 'ocircumflex': 556,
+ 'ntilde': 556,
+ 'Uhungarumlaut': 722,
+ 'Eacute': 667,
+ 'emacron': 556,
+ 'gbreve': 556,
+ 'onequarter': 834,
+ 'Scaron': 667,
+ 'Scommaaccent': 667,
+ 'Ohungarumlaut': 778,
+ 'degree': 400,
+ 'ograve': 556,
+ 'Ccaron': 722,
+ 'ugrave': 556,
+ 'radical': 453,
+ 'Dcaron': 722,
+ 'rcommaaccent': 333,
+ 'Ntilde': 722,
+ 'otilde': 556,
+ 'Rcommaaccent': 722,
+ 'Lcommaaccent': 556,
+ 'Atilde': 667,
+ 'Aogonek': 667,
+ 'Aring': 667,
+ 'Otilde': 778,
+ 'zdotaccent': 500,
+ 'Ecaron': 667,
+ 'Iogonek': 278,
+ 'kcommaaccent': 500,
+ 'minus': 584,
+ 'Icircumflex': 278,
+ 'ncaron': 556,
+ 'tcommaaccent': 278,
+ 'logicalnot': 584,
+ 'odieresis': 556,
+ 'udieresis': 556,
+ 'notequal': 549,
+ 'gcommaaccent': 556,
+ 'eth': 556,
+ 'zcaron': 500,
+ 'ncommaaccent': 556,
+ 'onesuperior': 333,
+ 'imacron': 278,
+ 'Euro': 556
+ },
+ 'Helvetica-Bold': {
+ 'space': 278,
+ 'exclam': 333,
+ 'quotedbl': 474,
+ 'numbersign': 556,
+ 'dollar': 556,
+ 'percent': 889,
+ 'ampersand': 722,
+ 'quoteright': 278,
+ 'parenleft': 333,
+ 'parenright': 333,
+ 'asterisk': 389,
+ 'plus': 584,
+ 'comma': 278,
+ 'hyphen': 333,
+ 'period': 278,
+ 'slash': 278,
+ 'zero': 556,
+ 'one': 556,
+ 'two': 556,
+ 'three': 556,
+ 'four': 556,
+ 'five': 556,
+ 'six': 556,
+ 'seven': 556,
+ 'eight': 556,
+ 'nine': 556,
+ 'colon': 333,
+ 'semicolon': 333,
+ 'less': 584,
+ 'equal': 584,
+ 'greater': 584,
+ 'question': 611,
+ 'at': 975,
+ 'A': 722,
+ 'B': 722,
+ 'C': 722,
+ 'D': 722,
+ 'E': 667,
+ 'F': 611,
+ 'G': 778,
+ 'H': 722,
+ 'I': 278,
+ 'J': 556,
+ 'K': 722,
+ 'L': 611,
+ 'M': 833,
+ 'N': 722,
+ 'O': 778,
+ 'P': 667,
+ 'Q': 778,
+ 'R': 722,
+ 'S': 667,
+ 'T': 611,
+ 'U': 722,
+ 'V': 667,
+ 'W': 944,
+ 'X': 667,
+ 'Y': 667,
+ 'Z': 611,
+ 'bracketleft': 333,
+ 'backslash': 278,
+ 'bracketright': 333,
+ 'asciicircum': 584,
+ 'underscore': 556,
+ 'quoteleft': 278,
+ 'a': 556,
+ 'b': 611,
+ 'c': 556,
+ 'd': 611,
+ 'e': 556,
+ 'f': 333,
+ 'g': 611,
+ 'h': 611,
+ 'i': 278,
+ 'j': 278,
+ 'k': 556,
+ 'l': 278,
+ 'm': 889,
+ 'n': 611,
+ 'o': 611,
+ 'p': 611,
+ 'q': 611,
+ 'r': 389,
+ 's': 556,
+ 't': 333,
+ 'u': 611,
+ 'v': 556,
+ 'w': 778,
+ 'x': 556,
+ 'y': 556,
+ 'z': 500,
+ 'braceleft': 389,
+ 'bar': 280,
+ 'braceright': 389,
+ 'asciitilde': 584,
+ 'exclamdown': 333,
+ 'cent': 556,
+ 'sterling': 556,
+ 'fraction': 167,
+ 'yen': 556,
+ 'florin': 556,
+ 'section': 556,
+ 'currency': 556,
+ 'quotesingle': 238,
+ 'quotedblleft': 500,
+ 'guillemotleft': 556,
+ 'guilsinglleft': 333,
+ 'guilsinglright': 333,
+ 'fi': 611,
+ 'fl': 611,
+ 'endash': 556,
+ 'dagger': 556,
+ 'daggerdbl': 556,
+ 'periodcentered': 278,
+ 'paragraph': 556,
+ 'bullet': 350,
+ 'quotesinglbase': 278,
+ 'quotedblbase': 500,
+ 'quotedblright': 500,
+ 'guillemotright': 556,
+ 'ellipsis': 1000,
+ 'perthousand': 1000,
+ 'questiondown': 611,
+ 'grave': 333,
+ 'acute': 333,
+ 'circumflex': 333,
+ 'tilde': 333,
+ 'macron': 333,
+ 'breve': 333,
+ 'dotaccent': 333,
+ 'dieresis': 333,
+ 'ring': 333,
+ 'cedilla': 333,
+ 'hungarumlaut': 333,
+ 'ogonek': 333,
+ 'caron': 333,
+ 'emdash': 1000,
+ 'AE': 1000,
+ 'ordfeminine': 370,
+ 'Lslash': 611,
+ 'Oslash': 778,
+ 'OE': 1000,
+ 'ordmasculine': 365,
+ 'ae': 889,
+ 'dotlessi': 278,
+ 'lslash': 278,
+ 'oslash': 611,
+ 'oe': 944,
+ 'germandbls': 611,
+ 'Idieresis': 278,
+ 'eacute': 556,
+ 'abreve': 556,
+ 'uhungarumlaut': 611,
+ 'ecaron': 556,
+ 'Ydieresis': 667,
+ 'divide': 584,
+ 'Yacute': 667,
+ 'Acircumflex': 722,
+ 'aacute': 556,
+ 'Ucircumflex': 722,
+ 'yacute': 556,
+ 'scommaaccent': 556,
+ 'ecircumflex': 556,
+ 'Uring': 722,
+ 'Udieresis': 722,
+ 'aogonek': 556,
+ 'Uacute': 722,
+ 'uogonek': 611,
+ 'Edieresis': 667,
+ 'Dcroat': 722,
+ 'commaaccent': 250,
+ 'copyright': 737,
+ 'Emacron': 667,
+ 'ccaron': 556,
+ 'aring': 556,
+ 'Ncommaaccent': 722,
+ 'lacute': 278,
+ 'agrave': 556,
+ 'Tcommaaccent': 611,
+ 'Cacute': 722,
+ 'atilde': 556,
+ 'Edotaccent': 667,
+ 'scaron': 556,
+ 'scedilla': 556,
+ 'iacute': 278,
+ 'lozenge': 494,
+ 'Rcaron': 722,
+ 'Gcommaaccent': 778,
+ 'ucircumflex': 611,
+ 'acircumflex': 556,
+ 'Amacron': 722,
+ 'rcaron': 389,
+ 'ccedilla': 556,
+ 'Zdotaccent': 611,
+ 'Thorn': 667,
+ 'Omacron': 778,
+ 'Racute': 722,
+ 'Sacute': 667,
+ 'dcaron': 743,
+ 'Umacron': 722,
+ 'uring': 611,
+ 'threesuperior': 333,
+ 'Ograve': 778,
+ 'Agrave': 722,
+ 'Abreve': 722,
+ 'multiply': 584,
+ 'uacute': 611,
+ 'Tcaron': 611,
+ 'partialdiff': 494,
+ 'ydieresis': 556,
+ 'Nacute': 722,
+ 'icircumflex': 278,
+ 'Ecircumflex': 667,
+ 'adieresis': 556,
+ 'edieresis': 556,
+ 'cacute': 556,
+ 'nacute': 611,
+ 'umacron': 611,
+ 'Ncaron': 722,
+ 'Iacute': 278,
+ 'plusminus': 584,
+ 'brokenbar': 280,
+ 'registered': 737,
+ 'Gbreve': 778,
+ 'Idotaccent': 278,
+ 'summation': 600,
+ 'Egrave': 667,
+ 'racute': 389,
+ 'omacron': 611,
+ 'Zacute': 611,
+ 'Zcaron': 611,
+ 'greaterequal': 549,
+ 'Eth': 722,
+ 'Ccedilla': 722,
+ 'lcommaaccent': 278,
+ 'tcaron': 389,
+ 'eogonek': 556,
+ 'Uogonek': 722,
+ 'Aacute': 722,
+ 'Adieresis': 722,
+ 'egrave': 556,
+ 'zacute': 500,
+ 'iogonek': 278,
+ 'Oacute': 778,
+ 'oacute': 611,
+ 'amacron': 556,
+ 'sacute': 556,
+ 'idieresis': 278,
+ 'Ocircumflex': 778,
+ 'Ugrave': 722,
+ 'Delta': 612,
+ 'thorn': 611,
+ 'twosuperior': 333,
+ 'Odieresis': 778,
+ 'mu': 611,
+ 'igrave': 278,
+ 'ohungarumlaut': 611,
+ 'Eogonek': 667,
+ 'dcroat': 611,
+ 'threequarters': 834,
+ 'Scedilla': 667,
+ 'lcaron': 400,
+ 'Kcommaaccent': 722,
+ 'Lacute': 611,
+ 'trademark': 1000,
+ 'edotaccent': 556,
+ 'Igrave': 278,
+ 'Imacron': 278,
+ 'Lcaron': 611,
+ 'onehalf': 834,
+ 'lessequal': 549,
+ 'ocircumflex': 611,
+ 'ntilde': 611,
+ 'Uhungarumlaut': 722,
+ 'Eacute': 667,
+ 'emacron': 556,
+ 'gbreve': 611,
+ 'onequarter': 834,
+ 'Scaron': 667,
+ 'Scommaaccent': 667,
+ 'Ohungarumlaut': 778,
+ 'degree': 400,
+ 'ograve': 611,
+ 'Ccaron': 722,
+ 'ugrave': 611,
+ 'radical': 549,
+ 'Dcaron': 722,
+ 'rcommaaccent': 389,
+ 'Ntilde': 722,
+ 'otilde': 611,
+ 'Rcommaaccent': 722,
+ 'Lcommaaccent': 611,
+ 'Atilde': 722,
+ 'Aogonek': 722,
+ 'Aring': 722,
+ 'Otilde': 778,
+ 'zdotaccent': 500,
+ 'Ecaron': 667,
+ 'Iogonek': 278,
+ 'kcommaaccent': 556,
+ 'minus': 584,
+ 'Icircumflex': 278,
+ 'ncaron': 611,
+ 'tcommaaccent': 333,
+ 'logicalnot': 584,
+ 'odieresis': 611,
+ 'udieresis': 611,
+ 'notequal': 549,
+ 'gcommaaccent': 611,
+ 'eth': 611,
+ 'zcaron': 500,
+ 'ncommaaccent': 611,
+ 'onesuperior': 333,
+ 'imacron': 278,
+ 'Euro': 556
+ },
+ 'Helvetica-BoldOblique': {
+ 'space': 278,
+ 'exclam': 333,
+ 'quotedbl': 474,
+ 'numbersign': 556,
+ 'dollar': 556,
+ 'percent': 889,
+ 'ampersand': 722,
+ 'quoteright': 278,
+ 'parenleft': 333,
+ 'parenright': 333,
+ 'asterisk': 389,
+ 'plus': 584,
+ 'comma': 278,
+ 'hyphen': 333,
+ 'period': 278,
+ 'slash': 278,
+ 'zero': 556,
+ 'one': 556,
+ 'two': 556,
+ 'three': 556,
+ 'four': 556,
+ 'five': 556,
+ 'six': 556,
+ 'seven': 556,
+ 'eight': 556,
+ 'nine': 556,
+ 'colon': 333,
+ 'semicolon': 333,
+ 'less': 584,
+ 'equal': 584,
+ 'greater': 584,
+ 'question': 611,
+ 'at': 975,
+ 'A': 722,
+ 'B': 722,
+ 'C': 722,
+ 'D': 722,
+ 'E': 667,
+ 'F': 611,
+ 'G': 778,
+ 'H': 722,
+ 'I': 278,
+ 'J': 556,
+ 'K': 722,
+ 'L': 611,
+ 'M': 833,
+ 'N': 722,
+ 'O': 778,
+ 'P': 667,
+ 'Q': 778,
+ 'R': 722,
+ 'S': 667,
+ 'T': 611,
+ 'U': 722,
+ 'V': 667,
+ 'W': 944,
+ 'X': 667,
+ 'Y': 667,
+ 'Z': 611,
+ 'bracketleft': 333,
+ 'backslash': 278,
+ 'bracketright': 333,
+ 'asciicircum': 584,
+ 'underscore': 556,
+ 'quoteleft': 278,
+ 'a': 556,
+ 'b': 611,
+ 'c': 556,
+ 'd': 611,
+ 'e': 556,
+ 'f': 333,
+ 'g': 611,
+ 'h': 611,
+ 'i': 278,
+ 'j': 278,
+ 'k': 556,
+ 'l': 278,
+ 'm': 889,
+ 'n': 611,
+ 'o': 611,
+ 'p': 611,
+ 'q': 611,
+ 'r': 389,
+ 's': 556,
+ 't': 333,
+ 'u': 611,
+ 'v': 556,
+ 'w': 778,
+ 'x': 556,
+ 'y': 556,
+ 'z': 500,
+ 'braceleft': 389,
+ 'bar': 280,
+ 'braceright': 389,
+ 'asciitilde': 584,
+ 'exclamdown': 333,
+ 'cent': 556,
+ 'sterling': 556,
+ 'fraction': 167,
+ 'yen': 556,
+ 'florin': 556,
+ 'section': 556,
+ 'currency': 556,
+ 'quotesingle': 238,
+ 'quotedblleft': 500,
+ 'guillemotleft': 556,
+ 'guilsinglleft': 333,
+ 'guilsinglright': 333,
+ 'fi': 611,
+ 'fl': 611,
+ 'endash': 556,
+ 'dagger': 556,
+ 'daggerdbl': 556,
+ 'periodcentered': 278,
+ 'paragraph': 556,
+ 'bullet': 350,
+ 'quotesinglbase': 278,
+ 'quotedblbase': 500,
+ 'quotedblright': 500,
+ 'guillemotright': 556,
+ 'ellipsis': 1000,
+ 'perthousand': 1000,
+ 'questiondown': 611,
+ 'grave': 333,
+ 'acute': 333,
+ 'circumflex': 333,
+ 'tilde': 333,
+ 'macron': 333,
+ 'breve': 333,
+ 'dotaccent': 333,
+ 'dieresis': 333,
+ 'ring': 333,
+ 'cedilla': 333,
+ 'hungarumlaut': 333,
+ 'ogonek': 333,
+ 'caron': 333,
+ 'emdash': 1000,
+ 'AE': 1000,
+ 'ordfeminine': 370,
+ 'Lslash': 611,
+ 'Oslash': 778,
+ 'OE': 1000,
+ 'ordmasculine': 365,
+ 'ae': 889,
+ 'dotlessi': 278,
+ 'lslash': 278,
+ 'oslash': 611,
+ 'oe': 944,
+ 'germandbls': 611,
+ 'Idieresis': 278,
+ 'eacute': 556,
+ 'abreve': 556,
+ 'uhungarumlaut': 611,
+ 'ecaron': 556,
+ 'Ydieresis': 667,
+ 'divide': 584,
+ 'Yacute': 667,
+ 'Acircumflex': 722,
+ 'aacute': 556,
+ 'Ucircumflex': 722,
+ 'yacute': 556,
+ 'scommaaccent': 556,
+ 'ecircumflex': 556,
+ 'Uring': 722,
+ 'Udieresis': 722,
+ 'aogonek': 556,
+ 'Uacute': 722,
+ 'uogonek': 611,
+ 'Edieresis': 667,
+ 'Dcroat': 722,
+ 'commaaccent': 250,
+ 'copyright': 737,
+ 'Emacron': 667,
+ 'ccaron': 556,
+ 'aring': 556,
+ 'Ncommaaccent': 722,
+ 'lacute': 278,
+ 'agrave': 556,
+ 'Tcommaaccent': 611,
+ 'Cacute': 722,
+ 'atilde': 556,
+ 'Edotaccent': 667,
+ 'scaron': 556,
+ 'scedilla': 556,
+ 'iacute': 278,
+ 'lozenge': 494,
+ 'Rcaron': 722,
+ 'Gcommaaccent': 778,
+ 'ucircumflex': 611,
+ 'acircumflex': 556,
+ 'Amacron': 722,
+ 'rcaron': 389,
+ 'ccedilla': 556,
+ 'Zdotaccent': 611,
+ 'Thorn': 667,
+ 'Omacron': 778,
+ 'Racute': 722,
+ 'Sacute': 667,
+ 'dcaron': 743,
+ 'Umacron': 722,
+ 'uring': 611,
+ 'threesuperior': 333,
+ 'Ograve': 778,
+ 'Agrave': 722,
+ 'Abreve': 722,
+ 'multiply': 584,
+ 'uacute': 611,
+ 'Tcaron': 611,
+ 'partialdiff': 494,
+ 'ydieresis': 556,
+ 'Nacute': 722,
+ 'icircumflex': 278,
+ 'Ecircumflex': 667,
+ 'adieresis': 556,
+ 'edieresis': 556,
+ 'cacute': 556,
+ 'nacute': 611,
+ 'umacron': 611,
+ 'Ncaron': 722,
+ 'Iacute': 278,
+ 'plusminus': 584,
+ 'brokenbar': 280,
+ 'registered': 737,
+ 'Gbreve': 778,
+ 'Idotaccent': 278,
+ 'summation': 600,
+ 'Egrave': 667,
+ 'racute': 389,
+ 'omacron': 611,
+ 'Zacute': 611,
+ 'Zcaron': 611,
+ 'greaterequal': 549,
+ 'Eth': 722,
+ 'Ccedilla': 722,
+ 'lcommaaccent': 278,
+ 'tcaron': 389,
+ 'eogonek': 556,
+ 'Uogonek': 722,
+ 'Aacute': 722,
+ 'Adieresis': 722,
+ 'egrave': 556,
+ 'zacute': 500,
+ 'iogonek': 278,
+ 'Oacute': 778,
+ 'oacute': 611,
+ 'amacron': 556,
+ 'sacute': 556,
+ 'idieresis': 278,
+ 'Ocircumflex': 778,
+ 'Ugrave': 722,
+ 'Delta': 612,
+ 'thorn': 611,
+ 'twosuperior': 333,
+ 'Odieresis': 778,
+ 'mu': 611,
+ 'igrave': 278,
+ 'ohungarumlaut': 611,
+ 'Eogonek': 667,
+ 'dcroat': 611,
+ 'threequarters': 834,
+ 'Scedilla': 667,
+ 'lcaron': 400,
+ 'Kcommaaccent': 722,
+ 'Lacute': 611,
+ 'trademark': 1000,
+ 'edotaccent': 556,
+ 'Igrave': 278,
+ 'Imacron': 278,
+ 'Lcaron': 611,
+ 'onehalf': 834,
+ 'lessequal': 549,
+ 'ocircumflex': 611,
+ 'ntilde': 611,
+ 'Uhungarumlaut': 722,
+ 'Eacute': 667,
+ 'emacron': 556,
+ 'gbreve': 611,
+ 'onequarter': 834,
+ 'Scaron': 667,
+ 'Scommaaccent': 667,
+ 'Ohungarumlaut': 778,
+ 'degree': 400,
+ 'ograve': 611,
+ 'Ccaron': 722,
+ 'ugrave': 611,
+ 'radical': 549,
+ 'Dcaron': 722,
+ 'rcommaaccent': 389,
+ 'Ntilde': 722,
+ 'otilde': 611,
+ 'Rcommaaccent': 722,
+ 'Lcommaaccent': 611,
+ 'Atilde': 722,
+ 'Aogonek': 722,
+ 'Aring': 722,
+ 'Otilde': 778,
+ 'zdotaccent': 500,
+ 'Ecaron': 667,
+ 'Iogonek': 278,
+ 'kcommaaccent': 556,
+ 'minus': 584,
+ 'Icircumflex': 278,
+ 'ncaron': 611,
+ 'tcommaaccent': 333,
+ 'logicalnot': 584,
+ 'odieresis': 611,
+ 'udieresis': 611,
+ 'notequal': 549,
+ 'gcommaaccent': 611,
+ 'eth': 611,
+ 'zcaron': 500,
+ 'ncommaaccent': 611,
+ 'onesuperior': 333,
+ 'imacron': 278,
+ 'Euro': 556
+ },
+ 'Helvetica-Oblique' : {
+ 'space': 278,
+ 'exclam': 278,
+ 'quotedbl': 355,
+ 'numbersign': 556,
+ 'dollar': 556,
+ 'percent': 889,
+ 'ampersand': 667,
+ 'quoteright': 222,
+ 'parenleft': 333,
+ 'parenright': 333,
+ 'asterisk': 389,
+ 'plus': 584,
+ 'comma': 278,
+ 'hyphen': 333,
+ 'period': 278,
+ 'slash': 278,
+ 'zero': 556,
+ 'one': 556,
+ 'two': 556,
+ 'three': 556,
+ 'four': 556,
+ 'five': 556,
+ 'six': 556,
+ 'seven': 556,
+ 'eight': 556,
+ 'nine': 556,
+ 'colon': 278,
+ 'semicolon': 278,
+ 'less': 584,
+ 'equal': 584,
+ 'greater': 584,
+ 'question': 556,
+ 'at': 1015,
+ 'A': 667,
+ 'B': 667,
+ 'C': 722,
+ 'D': 722,
+ 'E': 667,
+ 'F': 611,
+ 'G': 778,
+ 'H': 722,
+ 'I': 278,
+ 'J': 500,
+ 'K': 667,
+ 'L': 556,
+ 'M': 833,
+ 'N': 722,
+ 'O': 778,
+ 'P': 667,
+ 'Q': 778,
+ 'R': 722,
+ 'S': 667,
+ 'T': 611,
+ 'U': 722,
+ 'V': 667,
+ 'W': 944,
+ 'X': 667,
+ 'Y': 667,
+ 'Z': 611,
+ 'bracketleft': 278,
+ 'backslash': 278,
+ 'bracketright': 278,
+ 'asciicircum': 469,
+ 'underscore': 556,
+ 'quoteleft': 222,
+ 'a': 556,
+ 'b': 556,
+ 'c': 500,
+ 'd': 556,
+ 'e': 556,
+ 'f': 278,
+ 'g': 556,
+ 'h': 556,
+ 'i': 222,
+ 'j': 222,
+ 'k': 500,
+ 'l': 222,
+ 'm': 833,
+ 'n': 556,
+ 'o': 556,
+ 'p': 556,
+ 'q': 556,
+ 'r': 333,
+ 's': 500,
+ 't': 278,
+ 'u': 556,
+ 'v': 500,
+ 'w': 722,
+ 'x': 500,
+ 'y': 500,
+ 'z': 500,
+ 'braceleft': 334,
+ 'bar': 260,
+ 'braceright': 334,
+ 'asciitilde': 584,
+ 'exclamdown': 333,
+ 'cent': 556,
+ 'sterling': 556,
+ 'fraction': 167,
+ 'yen': 556,
+ 'florin': 556,
+ 'section': 556,
+ 'currency': 556,
+ 'quotesingle': 191,
+ 'quotedblleft': 333,
+ 'guillemotleft': 556,
+ 'guilsinglleft': 333,
+ 'guilsinglright': 333,
+ 'fi': 500,
+ 'fl': 500,
+ 'endash': 556,
+ 'dagger': 556,
+ 'daggerdbl': 556,
+ 'periodcentered': 278,
+ 'paragraph': 537,
+ 'bullet': 350,
+ 'quotesinglbase': 222,
+ 'quotedblbase': 333,
+ 'quotedblright': 333,
+ 'guillemotright': 556,
+ 'ellipsis': 1000,
+ 'perthousand': 1000,
+ 'questiondown': 611,
+ 'grave': 333,
+ 'acute': 333,
+ 'circumflex': 333,
+ 'tilde': 333,
+ 'macron': 333,
+ 'breve': 333,
+ 'dotaccent': 333,
+ 'dieresis': 333,
+ 'ring': 333,
+ 'cedilla': 333,
+ 'hungarumlaut': 333,
+ 'ogonek': 333,
+ 'caron': 333,
+ 'emdash': 1000,
+ 'AE': 1000,
+ 'ordfeminine': 370,
+ 'Lslash': 556,
+ 'Oslash': 778,
+ 'OE': 1000,
+ 'ordmasculine': 365,
+ 'ae': 889,
+ 'dotlessi': 278,
+ 'lslash': 222,
+ 'oslash': 611,
+ 'oe': 944,
+ 'germandbls': 611,
+ 'Idieresis': 278,
+ 'eacute': 556,
+ 'abreve': 556,
+ 'uhungarumlaut': 556,
+ 'ecaron': 556,
+ 'Ydieresis': 667,
+ 'divide': 584,
+ 'Yacute': 667,
+ 'Acircumflex': 667,
+ 'aacute': 556,
+ 'Ucircumflex': 722,
+ 'yacute': 500,
+ 'scommaaccent': 500,
+ 'ecircumflex': 556,
+ 'Uring': 722,
+ 'Udieresis': 722,
+ 'aogonek': 556,
+ 'Uacute': 722,
+ 'uogonek': 556,
+ 'Edieresis': 667,
+ 'Dcroat': 722,
+ 'commaaccent': 250,
+ 'copyright': 737,
+ 'Emacron': 667,
+ 'ccaron': 500,
+ 'aring': 556,
+ 'Ncommaaccent': 722,
+ 'lacute': 222,
+ 'agrave': 556,
+ 'Tcommaaccent': 611,
+ 'Cacute': 722,
+ 'atilde': 556,
+ 'Edotaccent': 667,
+ 'scaron': 500,
+ 'scedilla': 500,
+ 'iacute': 278,
+ 'lozenge': 471,
+ 'Rcaron': 722,
+ 'Gcommaaccent': 778,
+ 'ucircumflex': 556,
+ 'acircumflex': 556,
+ 'Amacron': 667,
+ 'rcaron': 333,
+ 'ccedilla': 500,
+ 'Zdotaccent': 611,
+ 'Thorn': 667,
+ 'Omacron': 778,
+ 'Racute': 722,
+ 'Sacute': 667,
+ 'dcaron': 643,
+ 'Umacron': 722,
+ 'uring': 556,
+ 'threesuperior': 333,
+ 'Ograve': 778,
+ 'Agrave': 667,
+ 'Abreve': 667,
+ 'multiply': 584,
+ 'uacute': 556,
+ 'Tcaron': 611,
+ 'partialdiff': 476,
+ 'ydieresis': 500,
+ 'Nacute': 722,
+ 'icircumflex': 278,
+ 'Ecircumflex': 667,
+ 'adieresis': 556,
+ 'edieresis': 556,
+ 'cacute': 500,
+ 'nacute': 556,
+ 'umacron': 556,
+ 'Ncaron': 722,
+ 'Iacute': 278,
+ 'plusminus': 584,
+ 'brokenbar': 260,
+ 'registered': 737,
+ 'Gbreve': 778,
+ 'Idotaccent': 278,
+ 'summation': 600,
+ 'Egrave': 667,
+ 'racute': 333,
+ 'omacron': 556,
+ 'Zacute': 611,
+ 'Zcaron': 611,
+ 'greaterequal': 549,
+ 'Eth': 722,
+ 'Ccedilla': 722,
+ 'lcommaaccent': 222,
+ 'tcaron': 317,
+ 'eogonek': 556,
+ 'Uogonek': 722,
+ 'Aacute': 667,
+ 'Adieresis': 667,
+ 'egrave': 556,
+ 'zacute': 500,
+ 'iogonek': 222,
+ 'Oacute': 778,
+ 'oacute': 556,
+ 'amacron': 556,
+ 'sacute': 500,
+ 'idieresis': 278,
+ 'Ocircumflex': 778,
+ 'Ugrave': 722,
+ 'Delta': 612,
+ 'thorn': 556,
+ 'twosuperior': 333,
+ 'Odieresis': 778,
+ 'mu': 556,
+ 'igrave': 278,
+ 'ohungarumlaut': 556,
+ 'Eogonek': 667,
+ 'dcroat': 556,
+ 'threequarters': 834,
+ 'Scedilla': 667,
+ 'lcaron': 299,
+ 'Kcommaaccent': 667,
+ 'Lacute': 556,
+ 'trademark': 1000,
+ 'edotaccent': 556,
+ 'Igrave': 278,
+ 'Imacron': 278,
+ 'Lcaron': 556,
+ 'onehalf': 834,
+ 'lessequal': 549,
+ 'ocircumflex': 556,
+ 'ntilde': 556,
+ 'Uhungarumlaut': 722,
+ 'Eacute': 667,
+ 'emacron': 556,
+ 'gbreve': 556,
+ 'onequarter': 834,
+ 'Scaron': 667,
+ 'Scommaaccent': 667,
+ 'Ohungarumlaut': 778,
+ 'degree': 400,
+ 'ograve': 556,
+ 'Ccaron': 722,
+ 'ugrave': 556,
+ 'radical': 453,
+ 'Dcaron': 722,
+ 'rcommaaccent': 333,
+ 'Ntilde': 722,
+ 'otilde': 556,
+ 'Rcommaaccent': 722,
+ 'Lcommaaccent': 556,
+ 'Atilde': 667,
+ 'Aogonek': 667,
+ 'Aring': 667,
+ 'Otilde': 778,
+ 'zdotaccent': 500,
+ 'Ecaron': 667,
+ 'Iogonek': 278,
+ 'kcommaaccent': 500,
+ 'minus': 584,
+ 'Icircumflex': 278,
+ 'ncaron': 556,
+ 'tcommaaccent': 278,
+ 'logicalnot': 584,
+ 'odieresis': 556,
+ 'udieresis': 556,
+ 'notequal': 549,
+ 'gcommaaccent': 556,
+ 'eth': 556,
+ 'zcaron': 500,
+ 'ncommaaccent': 556,
+ 'onesuperior': 333,
+ 'imacron': 278,
+ 'Euro': 556
+ },
+ 'Symbol': {
+ 'space': 250,
+ 'exclam': 333,
+ 'universal': 713,
+ 'numbersign': 500,
+ 'existential': 549,
+ 'percent': 833,
+ 'ampersand': 778,
+ 'suchthat': 439,
+ 'parenleft': 333,
+ 'parenright': 333,
+ 'asteriskmath': 500,
+ 'plus': 549,
+ 'comma': 250,
+ 'minus': 549,
+ 'period': 250,
+ 'slash': 278,
+ 'zero': 500,
+ 'one': 500,
+ 'two': 500,
+ 'three': 500,
+ 'four': 500,
+ 'five': 500,
+ 'six': 500,
+ 'seven': 500,
+ 'eight': 500,
+ 'nine': 500,
+ 'colon': 278,
+ 'semicolon': 278,
+ 'less': 549,
+ 'equal': 549,
+ 'greater': 549,
+ 'question': 444,
+ 'congruent': 549,
+ 'Alpha': 722,
+ 'Beta': 667,
+ 'Chi': 722,
+ 'Delta': 612,
+ 'Epsilon': 611,
+ 'Phi': 763,
+ 'Gamma': 603,
+ 'Eta': 722,
+ 'Iota': 333,
+ 'theta1': 631,
+ 'Kappa': 722,
+ 'Lambda': 686,
+ 'Mu': 889,
+ 'Nu': 722,
+ 'Omicron': 722,
+ 'Pi': 768,
+ 'Theta': 741,
+ 'Rho': 556,
+ 'Sigma': 592,
+ 'Tau': 611,
+ 'Upsilon': 690,
+ 'sigma1': 439,
+ 'Omega': 768,
+ 'Xi': 645,
+ 'Psi': 795,
+ 'Zeta': 611,
+ 'bracketleft': 333,
+ 'therefore': 863,
+ 'bracketright': 333,
+ 'perpendicular': 658,
+ 'underscore': 500,
+ 'radicalex': 500,
+ 'alpha': 631,
+ 'beta': 549,
+ 'chi': 549,
+ 'delta': 494,
+ 'epsilon': 439,
+ 'phi': 521,
+ 'gamma': 411,
+ 'eta': 603,
+ 'iota': 329,
+ 'phi1': 603,
+ 'kappa': 549,
+ 'lambda': 549,
+ 'mu': 576,
+ 'nu': 521,
+ 'omicron': 549,
+ 'pi': 549,
+ 'theta': 521,
+ 'rho': 549,
+ 'sigma': 603,
+ 'tau': 439,
+ 'upsilon': 576,
+ 'omega1': 713,
+ 'omega': 686,
+ 'xi': 493,
+ 'psi': 686,
+ 'zeta': 494,
+ 'braceleft': 480,
+ 'bar': 200,
+ 'braceright': 480,
+ 'similar': 549,
+ 'Euro': 750,
+ 'Upsilon1': 620,
+ 'minute': 247,
+ 'lessequal': 549,
+ 'fraction': 167,
+ 'infinity': 713,
+ 'florin': 500,
+ 'club': 753,
+ 'diamond': 753,
+ 'heart': 753,
+ 'spade': 753,
+ 'arrowboth': 1042,
+ 'arrowleft': 987,
+ 'arrowup': 603,
+ 'arrowright': 987,
+ 'arrowdown': 603,
+ 'degree': 400,
+ 'plusminus': 549,
+ 'second': 411,
+ 'greaterequal': 549,
+ 'multiply': 549,
+ 'proportional': 713,
+ 'partialdiff': 494,
+ 'bullet': 460,
+ 'divide': 549,
+ 'notequal': 549,
+ 'equivalence': 549,
+ 'approxequal': 549,
+ 'ellipsis': 1000,
+ 'arrowvertex': 603,
+ 'arrowhorizex': 1000,
+ 'carriagereturn': 658,
+ 'aleph': 823,
+ 'Ifraktur': 686,
+ 'Rfraktur': 795,
+ 'weierstrass': 987,
+ 'circlemultiply': 768,
+ 'circleplus': 768,
+ 'emptyset': 823,
+ 'intersection': 768,
+ 'union': 768,
+ 'propersuperset': 713,
+ 'reflexsuperset': 713,
+ 'notsubset': 713,
+ 'propersubset': 713,
+ 'reflexsubset': 713,
+ 'element': 713,
+ 'notelement': 713,
+ 'angle': 768,
+ 'gradient': 713,
+ 'registerserif': 790,
+ 'copyrightserif': 790,
+ 'trademarkserif': 890,
+ 'product': 823,
+ 'radical': 549,
+ 'dotmath': 250,
+ 'logicalnot': 713,
+ 'logicaland': 603,
+ 'logicalor': 603,
+ 'arrowdblboth': 1042,
+ 'arrowdblleft': 987,
+ 'arrowdblup': 603,
+ 'arrowdblright': 987,
+ 'arrowdbldown': 603,
+ 'lozenge': 494,
+ 'angleleft': 329,
+ 'registersans': 790,
+ 'copyrightsans': 790,
+ 'trademarksans': 786,
+ 'summation': 713,
+ 'parenlefttp': 384,
+ 'parenleftex': 384,
+ 'parenleftbt': 384,
+ 'bracketlefttp': 384,
+ 'bracketleftex': 384,
+ 'bracketleftbt': 384,
+ 'bracelefttp': 494,
+ 'braceleftmid': 494,
+ 'braceleftbt': 494,
+ 'braceex': 494,
+ 'angleright': 329,
+ 'integral': 274,
+ 'integraltp': 686,
+ 'integralex': 686,
+ 'integralbt': 686,
+ 'parenrighttp': 384,
+ 'parenrightex': 384,
+ 'parenrightbt': 384,
+ 'bracketrighttp': 384,
+ 'bracketrightex': 384,
+ 'bracketrightbt': 384,
+ 'bracerighttp': 494,
+ 'bracerightmid': 494,
+ 'bracerightbt': 494,
+ 'apple': 790
+ },
+ 'Times-Roman': {
+ 'space': 250,
+ 'exclam': 333,
+ 'quotedbl': 408,
+ 'numbersign': 500,
+ 'dollar': 500,
+ 'percent': 833,
+ 'ampersand': 778,
+ 'quoteright': 333,
+ 'parenleft': 333,
+ 'parenright': 333,
+ 'asterisk': 500,
+ 'plus': 564,
+ 'comma': 250,
+ 'hyphen': 333,
+ 'period': 250,
+ 'slash': 278,
+ 'zero': 500,
+ 'one': 500,
+ 'two': 500,
+ 'three': 500,
+ 'four': 500,
+ 'five': 500,
+ 'six': 500,
+ 'seven': 500,
+ 'eight': 500,
+ 'nine': 500,
+ 'colon': 278,
+ 'semicolon': 278,
+ 'less': 564,
+ 'equal': 564,
+ 'greater': 564,
+ 'question': 444,
+ 'at': 921,
+ 'A': 722,
+ 'B': 667,
+ 'C': 667,
+ 'D': 722,
+ 'E': 611,
+ 'F': 556,
+ 'G': 722,
+ 'H': 722,
+ 'I': 333,
+ 'J': 389,
+ 'K': 722,
+ 'L': 611,
+ 'M': 889,
+ 'N': 722,
+ 'O': 722,
+ 'P': 556,
+ 'Q': 722,
+ 'R': 667,
+ 'S': 556,
+ 'T': 611,
+ 'U': 722,
+ 'V': 722,
+ 'W': 944,
+ 'X': 722,
+ 'Y': 722,
+ 'Z': 611,
+ 'bracketleft': 333,
+ 'backslash': 278,
+ 'bracketright': 333,
+ 'asciicircum': 469,
+ 'underscore': 500,
+ 'quoteleft': 333,
+ 'a': 444,
+ 'b': 500,
+ 'c': 444,
+ 'd': 500,
+ 'e': 444,
+ 'f': 333,
+ 'g': 500,
+ 'h': 500,
+ 'i': 278,
+ 'j': 278,
+ 'k': 500,
+ 'l': 278,
+ 'm': 778,
+ 'n': 500,
+ 'o': 500,
+ 'p': 500,
+ 'q': 500,
+ 'r': 333,
+ 's': 389,
+ 't': 278,
+ 'u': 500,
+ 'v': 500,
+ 'w': 722,
+ 'x': 500,
+ 'y': 500,
+ 'z': 444,
+ 'braceleft': 480,
+ 'bar': 200,
+ 'braceright': 480,
+ 'asciitilde': 541,
+ 'exclamdown': 333,
+ 'cent': 500,
+ 'sterling': 500,
+ 'fraction': 167,
+ 'yen': 500,
+ 'florin': 500,
+ 'section': 500,
+ 'currency': 500,
+ 'quotesingle': 180,
+ 'quotedblleft': 444,
+ 'guillemotleft': 500,
+ 'guilsinglleft': 333,
+ 'guilsinglright': 333,
+ 'fi': 556,
+ 'fl': 556,
+ 'endash': 500,
+ 'dagger': 500,
+ 'daggerdbl': 500,
+ 'periodcentered': 250,
+ 'paragraph': 453,
+ 'bullet': 350,
+ 'quotesinglbase': 333,
+ 'quotedblbase': 444,
+ 'quotedblright': 444,
+ 'guillemotright': 500,
+ 'ellipsis': 1000,
+ 'perthousand': 1000,
+ 'questiondown': 444,
+ 'grave': 333,
+ 'acute': 333,
+ 'circumflex': 333,
+ 'tilde': 333,
+ 'macron': 333,
+ 'breve': 333,
+ 'dotaccent': 333,
+ 'dieresis': 333,
+ 'ring': 333,
+ 'cedilla': 333,
+ 'hungarumlaut': 333,
+ 'ogonek': 333,
+ 'caron': 333,
+ 'emdash': 1000,
+ 'AE': 889,
+ 'ordfeminine': 276,
+ 'Lslash': 611,
+ 'Oslash': 722,
+ 'OE': 889,
+ 'ordmasculine': 310,
+ 'ae': 667,
+ 'dotlessi': 278,
+ 'lslash': 278,
+ 'oslash': 500,
+ 'oe': 722,
+ 'germandbls': 500,
+ 'Idieresis': 333,
+ 'eacute': 444,
+ 'abreve': 444,
+ 'uhungarumlaut': 500,
+ 'ecaron': 444,
+ 'Ydieresis': 722,
+ 'divide': 564,
+ 'Yacute': 722,
+ 'Acircumflex': 722,
+ 'aacute': 444,
+ 'Ucircumflex': 722,
+ 'yacute': 500,
+ 'scommaaccent': 389,
+ 'ecircumflex': 444,
+ 'Uring': 722,
+ 'Udieresis': 722,
+ 'aogonek': 444,
+ 'Uacute': 722,
+ 'uogonek': 500,
+ 'Edieresis': 611,
+ 'Dcroat': 722,
+ 'commaaccent': 250,
+ 'copyright': 760,
+ 'Emacron': 611,
+ 'ccaron': 444,
+ 'aring': 444,
+ 'Ncommaaccent': 722,
+ 'lacute': 278,
+ 'agrave': 444,
+ 'Tcommaaccent': 611,
+ 'Cacute': 667,
+ 'atilde': 444,
+ 'Edotaccent': 611,
+ 'scaron': 389,
+ 'scedilla': 389,
+ 'iacute': 278,
+ 'lozenge': 471,
+ 'Rcaron': 667,
+ 'Gcommaaccent': 722,
+ 'ucircumflex': 500,
+ 'acircumflex': 444,
+ 'Amacron': 722,
+ 'rcaron': 333,
+ 'ccedilla': 444,
+ 'Zdotaccent': 611,
+ 'Thorn': 556,
+ 'Omacron': 722,
+ 'Racute': 667,
+ 'Sacute': 556,
+ 'dcaron': 588,
+ 'Umacron': 722,
+ 'uring': 500,
+ 'threesuperior': 300,
+ 'Ograve': 722,
+ 'Agrave': 722,
+ 'Abreve': 722,
+ 'multiply': 564,
+ 'uacute': 500,
+ 'Tcaron': 611,
+ 'partialdiff': 476,
+ 'ydieresis': 500,
+ 'Nacute': 722,
+ 'icircumflex': 278,
+ 'Ecircumflex': 611,
+ 'adieresis': 444,
+ 'edieresis': 444,
+ 'cacute': 444,
+ 'nacute': 500,
+ 'umacron': 500,
+ 'Ncaron': 722,
+ 'Iacute': 333,
+ 'plusminus': 564,
+ 'brokenbar': 200,
+ 'registered': 760,
+ 'Gbreve': 722,
+ 'Idotaccent': 333,
+ 'summation': 600,
+ 'Egrave': 611,
+ 'racute': 333,
+ 'omacron': 500,
+ 'Zacute': 611,
+ 'Zcaron': 611,
+ 'greaterequal': 549,
+ 'Eth': 722,
+ 'Ccedilla': 667,
+ 'lcommaaccent': 278,
+ 'tcaron': 326,
+ 'eogonek': 444,
+ 'Uogonek': 722,
+ 'Aacute': 722,
+ 'Adieresis': 722,
+ 'egrave': 444,
+ 'zacute': 444,
+ 'iogonek': 278,
+ 'Oacute': 722,
+ 'oacute': 500,
+ 'amacron': 444,
+ 'sacute': 389,
+ 'idieresis': 278,
+ 'Ocircumflex': 722,
+ 'Ugrave': 722,
+ 'Delta': 612,
+ 'thorn': 500,
+ 'twosuperior': 300,
+ 'Odieresis': 722,
+ 'mu': 500,
+ 'igrave': 278,
+ 'ohungarumlaut': 500,
+ 'Eogonek': 611,
+ 'dcroat': 500,
+ 'threequarters': 750,
+ 'Scedilla': 556,
+ 'lcaron': 344,
+ 'Kcommaaccent': 722,
+ 'Lacute': 611,
+ 'trademark': 980,
+ 'edotaccent': 444,
+ 'Igrave': 333,
+ 'Imacron': 333,
+ 'Lcaron': 611,
+ 'onehalf': 750,
+ 'lessequal': 549,
+ 'ocircumflex': 500,
+ 'ntilde': 500,
+ 'Uhungarumlaut': 722,
+ 'Eacute': 611,
+ 'emacron': 444,
+ 'gbreve': 500,
+ 'onequarter': 750,
+ 'Scaron': 556,
+ 'Scommaaccent': 556,
+ 'Ohungarumlaut': 722,
+ 'degree': 400,
+ 'ograve': 500,
+ 'Ccaron': 667,
+ 'ugrave': 500,
+ 'radical': 453,
+ 'Dcaron': 722,
+ 'rcommaaccent': 333,
+ 'Ntilde': 722,
+ 'otilde': 500,
+ 'Rcommaaccent': 667,
+ 'Lcommaaccent': 611,
+ 'Atilde': 722,
+ 'Aogonek': 722,
+ 'Aring': 722,
+ 'Otilde': 722,
+ 'zdotaccent': 444,
+ 'Ecaron': 611,
+ 'Iogonek': 333,
+ 'kcommaaccent': 500,
+ 'minus': 564,
+ 'Icircumflex': 333,
+ 'ncaron': 500,
+ 'tcommaaccent': 278,
+ 'logicalnot': 564,
+ 'odieresis': 500,
+ 'udieresis': 500,
+ 'notequal': 549,
+ 'gcommaaccent': 500,
+ 'eth': 500,
+ 'zcaron': 444,
+ 'ncommaaccent': 500,
+ 'onesuperior': 300,
+ 'imacron': 278,
+ 'Euro': 500
+ },
+ 'Times-Bold': {
+ 'space': 250,
+ 'exclam': 333,
+ 'quotedbl': 555,
+ 'numbersign': 500,
+ 'dollar': 500,
+ 'percent': 1000,
+ 'ampersand': 833,
+ 'quoteright': 333,
+ 'parenleft': 333,
+ 'parenright': 333,
+ 'asterisk': 500,
+ 'plus': 570,
+ 'comma': 250,
+ 'hyphen': 333,
+ 'period': 250,
+ 'slash': 278,
+ 'zero': 500,
+ 'one': 500,
+ 'two': 500,
+ 'three': 500,
+ 'four': 500,
+ 'five': 500,
+ 'six': 500,
+ 'seven': 500,
+ 'eight': 500,
+ 'nine': 500,
+ 'colon': 333,
+ 'semicolon': 333,
+ 'less': 570,
+ 'equal': 570,
+ 'greater': 570,
+ 'question': 500,
+ 'at': 930,
+ 'A': 722,
+ 'B': 667,
+ 'C': 722,
+ 'D': 722,
+ 'E': 667,
+ 'F': 611,
+ 'G': 778,
+ 'H': 778,
+ 'I': 389,
+ 'J': 500,
+ 'K': 778,
+ 'L': 667,
+ 'M': 944,
+ 'N': 722,
+ 'O': 778,
+ 'P': 611,
+ 'Q': 778,
+ 'R': 722,
+ 'S': 556,
+ 'T': 667,
+ 'U': 722,
+ 'V': 722,
+ 'W': 1000,
+ 'X': 722,
+ 'Y': 722,
+ 'Z': 667,
+ 'bracketleft': 333,
+ 'backslash': 278,
+ 'bracketright': 333,
+ 'asciicircum': 581,
+ 'underscore': 500,
+ 'quoteleft': 333,
+ 'a': 500,
+ 'b': 556,
+ 'c': 444,
+ 'd': 556,
+ 'e': 444,
+ 'f': 333,
+ 'g': 500,
+ 'h': 556,
+ 'i': 278,
+ 'j': 333,
+ 'k': 556,
+ 'l': 278,
+ 'm': 833,
+ 'n': 556,
+ 'o': 500,
+ 'p': 556,
+ 'q': 556,
+ 'r': 444,
+ 's': 389,
+ 't': 333,
+ 'u': 556,
+ 'v': 500,
+ 'w': 722,
+ 'x': 500,
+ 'y': 500,
+ 'z': 444,
+ 'braceleft': 394,
+ 'bar': 220,
+ 'braceright': 394,
+ 'asciitilde': 520,
+ 'exclamdown': 333,
+ 'cent': 500,
+ 'sterling': 500,
+ 'fraction': 167,
+ 'yen': 500,
+ 'florin': 500,
+ 'section': 500,
+ 'currency': 500,
+ 'quotesingle': 278,
+ 'quotedblleft': 500,
+ 'guillemotleft': 500,
+ 'guilsinglleft': 333,
+ 'guilsinglright': 333,
+ 'fi': 556,
+ 'fl': 556,
+ 'endash': 500,
+ 'dagger': 500,
+ 'daggerdbl': 500,
+ 'periodcentered': 250,
+ 'paragraph': 540,
+ 'bullet': 350,
+ 'quotesinglbase': 333,
+ 'quotedblbase': 500,
+ 'quotedblright': 500,
+ 'guillemotright': 500,
+ 'ellipsis': 1000,
+ 'perthousand': 1000,
+ 'questiondown': 500,
+ 'grave': 333,
+ 'acute': 333,
+ 'circumflex': 333,
+ 'tilde': 333,
+ 'macron': 333,
+ 'breve': 333,
+ 'dotaccent': 333,
+ 'dieresis': 333,
+ 'ring': 333,
+ 'cedilla': 333,
+ 'hungarumlaut': 333,
+ 'ogonek': 333,
+ 'caron': 333,
+ 'emdash': 1000,
+ 'AE': 1000,
+ 'ordfeminine': 300,
+ 'Lslash': 667,
+ 'Oslash': 778,
+ 'OE': 1000,
+ 'ordmasculine': 330,
+ 'ae': 722,
+ 'dotlessi': 278,
+ 'lslash': 278,
+ 'oslash': 500,
+ 'oe': 722,
+ 'germandbls': 556,
+ 'Idieresis': 389,
+ 'eacute': 444,
+ 'abreve': 500,
+ 'uhungarumlaut': 556,
+ 'ecaron': 444,
+ 'Ydieresis': 722,
+ 'divide': 570,
+ 'Yacute': 722,
+ 'Acircumflex': 722,
+ 'aacute': 500,
+ 'Ucircumflex': 722,
+ 'yacute': 500,
+ 'scommaaccent': 389,
+ 'ecircumflex': 444,
+ 'Uring': 722,
+ 'Udieresis': 722,
+ 'aogonek': 500,
+ 'Uacute': 722,
+ 'uogonek': 556,
+ 'Edieresis': 667,
+ 'Dcroat': 722,
+ 'commaaccent': 250,
+ 'copyright': 747,
+ 'Emacron': 667,
+ 'ccaron': 444,
+ 'aring': 500,
+ 'Ncommaaccent': 722,
+ 'lacute': 278,
+ 'agrave': 500,
+ 'Tcommaaccent': 667,
+ 'Cacute': 722,
+ 'atilde': 500,
+ 'Edotaccent': 667,
+ 'scaron': 389,
+ 'scedilla': 389,
+ 'iacute': 278,
+ 'lozenge': 494,
+ 'Rcaron': 722,
+ 'Gcommaaccent': 778,
+ 'ucircumflex': 556,
+ 'acircumflex': 500,
+ 'Amacron': 722,
+ 'rcaron': 444,
+ 'ccedilla': 444,
+ 'Zdotaccent': 667,
+ 'Thorn': 611,
+ 'Omacron': 778,
+ 'Racute': 722,
+ 'Sacute': 556,
+ 'dcaron': 672,
+ 'Umacron': 722,
+ 'uring': 556,
+ 'threesuperior': 300,
+ 'Ograve': 778,
+ 'Agrave': 722,
+ 'Abreve': 722,
+ 'multiply': 570,
+ 'uacute': 556,
+ 'Tcaron': 667,
+ 'partialdiff': 494,
+ 'ydieresis': 500,
+ 'Nacute': 722,
+ 'icircumflex': 278,
+ 'Ecircumflex': 667,
+ 'adieresis': 500,
+ 'edieresis': 444,
+ 'cacute': 444,
+ 'nacute': 556,
+ 'umacron': 556,
+ 'Ncaron': 722,
+ 'Iacute': 389,
+ 'plusminus': 570,
+ 'brokenbar': 220,
+ 'registered': 747,
+ 'Gbreve': 778,
+ 'Idotaccent': 389,
+ 'summation': 600,
+ 'Egrave': 667,
+ 'racute': 444,
+ 'omacron': 500,
+ 'Zacute': 667,
+ 'Zcaron': 667,
+ 'greaterequal': 549,
+ 'Eth': 722,
+ 'Ccedilla': 722,
+ 'lcommaaccent': 278,
+ 'tcaron': 416,
+ 'eogonek': 444,
+ 'Uogonek': 722,
+ 'Aacute': 722,
+ 'Adieresis': 722,
+ 'egrave': 444,
+ 'zacute': 444,
+ 'iogonek': 278,
+ 'Oacute': 778,
+ 'oacute': 500,
+ 'amacron': 500,
+ 'sacute': 389,
+ 'idieresis': 278,
+ 'Ocircumflex': 778,
+ 'Ugrave': 722,
+ 'Delta': 612,
+ 'thorn': 556,
+ 'twosuperior': 300,
+ 'Odieresis': 778,
+ 'mu': 556,
+ 'igrave': 278,
+ 'ohungarumlaut': 500,
+ 'Eogonek': 667,
+ 'dcroat': 556,
+ 'threequarters': 750,
+ 'Scedilla': 556,
+ 'lcaron': 394,
+ 'Kcommaaccent': 778,
+ 'Lacute': 667,
+ 'trademark': 1000,
+ 'edotaccent': 444,
+ 'Igrave': 389,
+ 'Imacron': 389,
+ 'Lcaron': 667,
+ 'onehalf': 750,
+ 'lessequal': 549,
+ 'ocircumflex': 500,
+ 'ntilde': 556,
+ 'Uhungarumlaut': 722,
+ 'Eacute': 667,
+ 'emacron': 444,
+ 'gbreve': 500,
+ 'onequarter': 750,
+ 'Scaron': 556,
+ 'Scommaaccent': 556,
+ 'Ohungarumlaut': 778,
+ 'degree': 400,
+ 'ograve': 500,
+ 'Ccaron': 722,
+ 'ugrave': 556,
+ 'radical': 549,
+ 'Dcaron': 722,
+ 'rcommaaccent': 444,
+ 'Ntilde': 722,
+ 'otilde': 500,
+ 'Rcommaaccent': 722,
+ 'Lcommaaccent': 667,
+ 'Atilde': 722,
+ 'Aogonek': 722,
+ 'Aring': 722,
+ 'Otilde': 778,
+ 'zdotaccent': 444,
+ 'Ecaron': 667,
+ 'Iogonek': 389,
+ 'kcommaaccent': 556,
+ 'minus': 570,
+ 'Icircumflex': 389,
+ 'ncaron': 556,
+ 'tcommaaccent': 333,
+ 'logicalnot': 570,
+ 'odieresis': 500,
+ 'udieresis': 556,
+ 'notequal': 549,
+ 'gcommaaccent': 500,
+ 'eth': 500,
+ 'zcaron': 444,
+ 'ncommaaccent': 556,
+ 'onesuperior': 300,
+ 'imacron': 278,
+ 'Euro': 500
+ },
+ 'Times-BoldItalic': {
+ 'space': 250,
+ 'exclam': 389,
+ 'quotedbl': 555,
+ 'numbersign': 500,
+ 'dollar': 500,
+ 'percent': 833,
+ 'ampersand': 778,
+ 'quoteright': 333,
+ 'parenleft': 333,
+ 'parenright': 333,
+ 'asterisk': 500,
+ 'plus': 570,
+ 'comma': 250,
+ 'hyphen': 333,
+ 'period': 250,
+ 'slash': 278,
+ 'zero': 500,
+ 'one': 500,
+ 'two': 500,
+ 'three': 500,
+ 'four': 500,
+ 'five': 500,
+ 'six': 500,
+ 'seven': 500,
+ 'eight': 500,
+ 'nine': 500,
+ 'colon': 333,
+ 'semicolon': 333,
+ 'less': 570,
+ 'equal': 570,
+ 'greater': 570,
+ 'question': 500,
+ 'at': 832,
+ 'A': 667,
+ 'B': 667,
+ 'C': 667,
+ 'D': 722,
+ 'E': 667,
+ 'F': 667,
+ 'G': 722,
+ 'H': 778,
+ 'I': 389,
+ 'J': 500,
+ 'K': 667,
+ 'L': 611,
+ 'M': 889,
+ 'N': 722,
+ 'O': 722,
+ 'P': 611,
+ 'Q': 722,
+ 'R': 667,
+ 'S': 556,
+ 'T': 611,
+ 'U': 722,
+ 'V': 667,
+ 'W': 889,
+ 'X': 667,
+ 'Y': 611,
+ 'Z': 611,
+ 'bracketleft': 333,
+ 'backslash': 278,
+ 'bracketright': 333,
+ 'asciicircum': 570,
+ 'underscore': 500,
+ 'quoteleft': 333,
+ 'a': 500,
+ 'b': 500,
+ 'c': 444,
+ 'd': 500,
+ 'e': 444,
+ 'f': 333,
+ 'g': 500,
+ 'h': 556,
+ 'i': 278,
+ 'j': 278,
+ 'k': 500,
+ 'l': 278,
+ 'm': 778,
+ 'n': 556,
+ 'o': 500,
+ 'p': 500,
+ 'q': 500,
+ 'r': 389,
+ 's': 389,
+ 't': 278,
+ 'u': 556,
+ 'v': 444,
+ 'w': 667,
+ 'x': 500,
+ 'y': 444,
+ 'z': 389,
+ 'braceleft': 348,
+ 'bar': 220,
+ 'braceright': 348,
+ 'asciitilde': 570,
+ 'exclamdown': 389,
+ 'cent': 500,
+ 'sterling': 500,
+ 'fraction': 167,
+ 'yen': 500,
+ 'florin': 500,
+ 'section': 500,
+ 'currency': 500,
+ 'quotesingle': 278,
+ 'quotedblleft': 500,
+ 'guillemotleft': 500,
+ 'guilsinglleft': 333,
+ 'guilsinglright': 333,
+ 'fi': 556,
+ 'fl': 556,
+ 'endash': 500,
+ 'dagger': 500,
+ 'daggerdbl': 500,
+ 'periodcentered': 250,
+ 'paragraph': 500,
+ 'bullet': 350,
+ 'quotesinglbase': 333,
+ 'quotedblbase': 500,
+ 'quotedblright': 500,
+ 'guillemotright': 500,
+ 'ellipsis': 1000,
+ 'perthousand': 1000,
+ 'questiondown': 500,
+ 'grave': 333,
+ 'acute': 333,
+ 'circumflex': 333,
+ 'tilde': 333,
+ 'macron': 333,
+ 'breve': 333,
+ 'dotaccent': 333,
+ 'dieresis': 333,
+ 'ring': 333,
+ 'cedilla': 333,
+ 'hungarumlaut': 333,
+ 'ogonek': 333,
+ 'caron': 333,
+ 'emdash': 1000,
+ 'AE': 944,
+ 'ordfeminine': 266,
+ 'Lslash': 611,
+ 'Oslash': 722,
+ 'OE': 944,
+ 'ordmasculine': 300,
+ 'ae': 722,
+ 'dotlessi': 278,
+ 'lslash': 278,
+ 'oslash': 500,
+ 'oe': 722,
+ 'germandbls': 500,
+ 'Idieresis': 389,
+ 'eacute': 444,
+ 'abreve': 500,
+ 'uhungarumlaut': 556,
+ 'ecaron': 444,
+ 'Ydieresis': 611,
+ 'divide': 570,
+ 'Yacute': 611,
+ 'Acircumflex': 667,
+ 'aacute': 500,
+ 'Ucircumflex': 722,
+ 'yacute': 444,
+ 'scommaaccent': 389,
+ 'ecircumflex': 444,
+ 'Uring': 722,
+ 'Udieresis': 722,
+ 'aogonek': 500,
+ 'Uacute': 722,
+ 'uogonek': 556,
+ 'Edieresis': 667,
+ 'Dcroat': 722,
+ 'commaaccent': 250,
+ 'copyright': 747,
+ 'Emacron': 667,
+ 'ccaron': 444,
+ 'aring': 500,
+ 'Ncommaaccent': 722,
+ 'lacute': 278,
+ 'agrave': 500,
+ 'Tcommaaccent': 611,
+ 'Cacute': 667,
+ 'atilde': 500,
+ 'Edotaccent': 667,
+ 'scaron': 389,
+ 'scedilla': 389,
+ 'iacute': 278,
+ 'lozenge': 494,
+ 'Rcaron': 667,
+ 'Gcommaaccent': 722,
+ 'ucircumflex': 556,
+ 'acircumflex': 500,
+ 'Amacron': 667,
+ 'rcaron': 389,
+ 'ccedilla': 444,
+ 'Zdotaccent': 611,
+ 'Thorn': 611,
+ 'Omacron': 722,
+ 'Racute': 667,
+ 'Sacute': 556,
+ 'dcaron': 608,
+ 'Umacron': 722,
+ 'uring': 556,
+ 'threesuperior': 300,
+ 'Ograve': 722,
+ 'Agrave': 667,
+ 'Abreve': 667,
+ 'multiply': 570,
+ 'uacute': 556,
+ 'Tcaron': 611,
+ 'partialdiff': 494,
+ 'ydieresis': 444,
+ 'Nacute': 722,
+ 'icircumflex': 278,
+ 'Ecircumflex': 667,
+ 'adieresis': 500,
+ 'edieresis': 444,
+ 'cacute': 444,
+ 'nacute': 556,
+ 'umacron': 556,
+ 'Ncaron': 722,
+ 'Iacute': 389,
+ 'plusminus': 570,
+ 'brokenbar': 220,
+ 'registered': 747,
+ 'Gbreve': 722,
+ 'Idotaccent': 389,
+ 'summation': 600,
+ 'Egrave': 667,
+ 'racute': 389,
+ 'omacron': 500,
+ 'Zacute': 611,
+ 'Zcaron': 611,
+ 'greaterequal': 549,
+ 'Eth': 722,
+ 'Ccedilla': 667,
+ 'lcommaaccent': 278,
+ 'tcaron': 366,
+ 'eogonek': 444,
+ 'Uogonek': 722,
+ 'Aacute': 667,
+ 'Adieresis': 667,
+ 'egrave': 444,
+ 'zacute': 389,
+ 'iogonek': 278,
+ 'Oacute': 722,
+ 'oacute': 500,
+ 'amacron': 500,
+ 'sacute': 389,
+ 'idieresis': 278,
+ 'Ocircumflex': 722,
+ 'Ugrave': 722,
+ 'Delta': 612,
+ 'thorn': 500,
+ 'twosuperior': 300,
+ 'Odieresis': 722,
+ 'mu': 576,
+ 'igrave': 278,
+ 'ohungarumlaut': 500,
+ 'Eogonek': 667,
+ 'dcroat': 500,
+ 'threequarters': 750,
+ 'Scedilla': 556,
+ 'lcaron': 382,
+ 'Kcommaaccent': 667,
+ 'Lacute': 611,
+ 'trademark': 1000,
+ 'edotaccent': 444,
+ 'Igrave': 389,
+ 'Imacron': 389,
+ 'Lcaron': 611,
+ 'onehalf': 750,
+ 'lessequal': 549,
+ 'ocircumflex': 500,
+ 'ntilde': 556,
+ 'Uhungarumlaut': 722,
+ 'Eacute': 667,
+ 'emacron': 444,
+ 'gbreve': 500,
+ 'onequarter': 750,
+ 'Scaron': 556,
+ 'Scommaaccent': 556,
+ 'Ohungarumlaut': 722,
+ 'degree': 400,
+ 'ograve': 500,
+ 'Ccaron': 667,
+ 'ugrave': 556,
+ 'radical': 549,
+ 'Dcaron': 722,
+ 'rcommaaccent': 389,
+ 'Ntilde': 722,
+ 'otilde': 500,
+ 'Rcommaaccent': 667,
+ 'Lcommaaccent': 611,
+ 'Atilde': 667,
+ 'Aogonek': 667,
+ 'Aring': 667,
+ 'Otilde': 722,
+ 'zdotaccent': 389,
+ 'Ecaron': 667,
+ 'Iogonek': 389,
+ 'kcommaaccent': 500,
+ 'minus': 606,
+ 'Icircumflex': 389,
+ 'ncaron': 556,
+ 'tcommaaccent': 278,
+ 'logicalnot': 606,
+ 'odieresis': 500,
+ 'udieresis': 556,
+ 'notequal': 549,
+ 'gcommaaccent': 500,
+ 'eth': 500,
+ 'zcaron': 389,
+ 'ncommaaccent': 556,
+ 'onesuperior': 300,
+ 'imacron': 278,
+ 'Euro': 500
+ },
+ 'Times-Italic': {
+ 'space': 250,
+ 'exclam': 333,
+ 'quotedbl': 420,
+ 'numbersign': 500,
+ 'dollar': 500,
+ 'percent': 833,
+ 'ampersand': 778,
+ 'quoteright': 333,
+ 'parenleft': 333,
+ 'parenright': 333,
+ 'asterisk': 500,
+ 'plus': 675,
+ 'comma': 250,
+ 'hyphen': 333,
+ 'period': 250,
+ 'slash': 278,
+ 'zero': 500,
+ 'one': 500,
+ 'two': 500,
+ 'three': 500,
+ 'four': 500,
+ 'five': 500,
+ 'six': 500,
+ 'seven': 500,
+ 'eight': 500,
+ 'nine': 500,
+ 'colon': 333,
+ 'semicolon': 333,
+ 'less': 675,
+ 'equal': 675,
+ 'greater': 675,
+ 'question': 500,
+ 'at': 920,
+ 'A': 611,
+ 'B': 611,
+ 'C': 667,
+ 'D': 722,
+ 'E': 611,
+ 'F': 611,
+ 'G': 722,
+ 'H': 722,
+ 'I': 333,
+ 'J': 444,
+ 'K': 667,
+ 'L': 556,
+ 'M': 833,
+ 'N': 667,
+ 'O': 722,
+ 'P': 611,
+ 'Q': 722,
+ 'R': 611,
+ 'S': 500,
+ 'T': 556,
+ 'U': 722,
+ 'V': 611,
+ 'W': 833,
+ 'X': 611,
+ 'Y': 556,
+ 'Z': 556,
+ 'bracketleft': 389,
+ 'backslash': 278,
+ 'bracketright': 389,
+ 'asciicircum': 422,
+ 'underscore': 500,
+ 'quoteleft': 333,
+ 'a': 500,
+ 'b': 500,
+ 'c': 444,
+ 'd': 500,
+ 'e': 444,
+ 'f': 278,
+ 'g': 500,
+ 'h': 500,
+ 'i': 278,
+ 'j': 278,
+ 'k': 444,
+ 'l': 278,
+ 'm': 722,
+ 'n': 500,
+ 'o': 500,
+ 'p': 500,
+ 'q': 500,
+ 'r': 389,
+ 's': 389,
+ 't': 278,
+ 'u': 500,
+ 'v': 444,
+ 'w': 667,
+ 'x': 444,
+ 'y': 444,
+ 'z': 389,
+ 'braceleft': 400,
+ 'bar': 275,
+ 'braceright': 400,
+ 'asciitilde': 541,
+ 'exclamdown': 389,
+ 'cent': 500,
+ 'sterling': 500,
+ 'fraction': 167,
+ 'yen': 500,
+ 'florin': 500,
+ 'section': 500,
+ 'currency': 500,
+ 'quotesingle': 214,
+ 'quotedblleft': 556,
+ 'guillemotleft': 500,
+ 'guilsinglleft': 333,
+ 'guilsinglright': 333,
+ 'fi': 500,
+ 'fl': 500,
+ 'endash': 500,
+ 'dagger': 500,
+ 'daggerdbl': 500,
+ 'periodcentered': 250,
+ 'paragraph': 523,
+ 'bullet': 350,
+ 'quotesinglbase': 333,
+ 'quotedblbase': 556,
+ 'quotedblright': 556,
+ 'guillemotright': 500,
+ 'ellipsis': 889,
+ 'perthousand': 1000,
+ 'questiondown': 500,
+ 'grave': 333,
+ 'acute': 333,
+ 'circumflex': 333,
+ 'tilde': 333,
+ 'macron': 333,
+ 'breve': 333,
+ 'dotaccent': 333,
+ 'dieresis': 333,
+ 'ring': 333,
+ 'cedilla': 333,
+ 'hungarumlaut': 333,
+ 'ogonek': 333,
+ 'caron': 333,
+ 'emdash': 889,
+ 'AE': 889,
+ 'ordfeminine': 276,
+ 'Lslash': 556,
+ 'Oslash': 722,
+ 'OE': 944,
+ 'ordmasculine': 310,
+ 'ae': 667,
+ 'dotlessi': 278,
+ 'lslash': 278,
+ 'oslash': 500,
+ 'oe': 667,
+ 'germandbls': 500,
+ 'Idieresis': 333,
+ 'eacute': 444,
+ 'abreve': 500,
+ 'uhungarumlaut': 500,
+ 'ecaron': 444,
+ 'Ydieresis': 556,
+ 'divide': 675,
+ 'Yacute': 556,
+ 'Acircumflex': 611,
+ 'aacute': 500,
+ 'Ucircumflex': 722,
+ 'yacute': 444,
+ 'scommaaccent': 389,
+ 'ecircumflex': 444,
+ 'Uring': 722,
+ 'Udieresis': 722,
+ 'aogonek': 500,
+ 'Uacute': 722,
+ 'uogonek': 500,
+ 'Edieresis': 611,
+ 'Dcroat': 722,
+ 'commaaccent': 250,
+ 'copyright': 760,
+ 'Emacron': 611,
+ 'ccaron': 444,
+ 'aring': 500,
+ 'Ncommaaccent': 667,
+ 'lacute': 278,
+ 'agrave': 500,
+ 'Tcommaaccent': 556,
+ 'Cacute': 667,
+ 'atilde': 500,
+ 'Edotaccent': 611,
+ 'scaron': 389,
+ 'scedilla': 389,
+ 'iacute': 278,
+ 'lozenge': 471,
+ 'Rcaron': 611,
+ 'Gcommaaccent': 722,
+ 'ucircumflex': 500,
+ 'acircumflex': 500,
+ 'Amacron': 611,
+ 'rcaron': 389,
+ 'ccedilla': 444,
+ 'Zdotaccent': 556,
+ 'Thorn': 611,
+ 'Omacron': 722,
+ 'Racute': 611,
+ 'Sacute': 500,
+ 'dcaron': 544,
+ 'Umacron': 722,
+ 'uring': 500,
+ 'threesuperior': 300,
+ 'Ograve': 722,
+ 'Agrave': 611,
+ 'Abreve': 611,
+ 'multiply': 675,
+ 'uacute': 500,
+ 'Tcaron': 556,
+ 'partialdiff': 476,
+ 'ydieresis': 444,
+ 'Nacute': 667,
+ 'icircumflex': 278,
+ 'Ecircumflex': 611,
+ 'adieresis': 500,
+ 'edieresis': 444,
+ 'cacute': 444,
+ 'nacute': 500,
+ 'umacron': 500,
+ 'Ncaron': 667,
+ 'Iacute': 333,
+ 'plusminus': 675,
+ 'brokenbar': 275,
+ 'registered': 760,
+ 'Gbreve': 722,
+ 'Idotaccent': 333,
+ 'summation': 600,
+ 'Egrave': 611,
+ 'racute': 389,
+ 'omacron': 500,
+ 'Zacute': 556,
+ 'Zcaron': 556,
+ 'greaterequal': 549,
+ 'Eth': 722,
+ 'Ccedilla': 667,
+ 'lcommaaccent': 278,
+ 'tcaron': 300,
+ 'eogonek': 444,
+ 'Uogonek': 722,
+ 'Aacute': 611,
+ 'Adieresis': 611,
+ 'egrave': 444,
+ 'zacute': 389,
+ 'iogonek': 278,
+ 'Oacute': 722,
+ 'oacute': 500,
+ 'amacron': 500,
+ 'sacute': 389,
+ 'idieresis': 278,
+ 'Ocircumflex': 722,
+ 'Ugrave': 722,
+ 'Delta': 612,
+ 'thorn': 500,
+ 'twosuperior': 300,
+ 'Odieresis': 722,
+ 'mu': 500,
+ 'igrave': 278,
+ 'ohungarumlaut': 500,
+ 'Eogonek': 611,
+ 'dcroat': 500,
+ 'threequarters': 750,
+ 'Scedilla': 500,
+ 'lcaron': 300,
+ 'Kcommaaccent': 667,
+ 'Lacute': 556,
+ 'trademark': 980,
+ 'edotaccent': 444,
+ 'Igrave': 333,
+ 'Imacron': 333,
+ 'Lcaron': 611,
+ 'onehalf': 750,
+ 'lessequal': 549,
+ 'ocircumflex': 500,
+ 'ntilde': 500,
+ 'Uhungarumlaut': 722,
+ 'Eacute': 611,
+ 'emacron': 444,
+ 'gbreve': 500,
+ 'onequarter': 750,
+ 'Scaron': 500,
+ 'Scommaaccent': 500,
+ 'Ohungarumlaut': 722,
+ 'degree': 400,
+ 'ograve': 500,
+ 'Ccaron': 667,
+ 'ugrave': 500,
+ 'radical': 453,
+ 'Dcaron': 722,
+ 'rcommaaccent': 389,
+ 'Ntilde': 667,
+ 'otilde': 500,
+ 'Rcommaaccent': 611,
+ 'Lcommaaccent': 556,
+ 'Atilde': 611,
+ 'Aogonek': 611,
+ 'Aring': 611,
+ 'Otilde': 722,
+ 'zdotaccent': 389,
+ 'Ecaron': 611,
+ 'Iogonek': 333,
+ 'kcommaaccent': 444,
+ 'minus': 675,
+ 'Icircumflex': 333,
+ 'ncaron': 500,
+ 'tcommaaccent': 278,
+ 'logicalnot': 675,
+ 'odieresis': 500,
+ 'udieresis': 500,
+ 'notequal': 549,
+ 'gcommaaccent': 500,
+ 'eth': 500,
+ 'zcaron': 389,
+ 'ncommaaccent': 500,
+ 'onesuperior': 300,
+ 'imacron': 278,
+ 'Euro': 500
+ },
+ 'ZapfDingbats': {
+ 'space': 278,
+ 'a1': 974,
+ 'a2': 961,
+ 'a202': 974,
+ 'a3': 980,
+ 'a4': 719,
+ 'a5': 789,
+ 'a119': 790,
+ 'a118': 791,
+ 'a117': 690,
+ 'a11': 960,
+ 'a12': 939,
+ 'a13': 549,
+ 'a14': 855,
+ 'a15': 911,
+ 'a16': 933,
+ 'a105': 911,
+ 'a17': 945,
+ 'a18': 974,
+ 'a19': 755,
+ 'a20': 846,
+ 'a21': 762,
+ 'a22': 761,
+ 'a23': 571,
+ 'a24': 677,
+ 'a25': 763,
+ 'a26': 760,
+ 'a27': 759,
+ 'a28': 754,
+ 'a6': 494,
+ 'a7': 552,
+ 'a8': 537,
+ 'a9': 577,
+ 'a10': 692,
+ 'a29': 786,
+ 'a30': 788,
+ 'a31': 788,
+ 'a32': 790,
+ 'a33': 793,
+ 'a34': 794,
+ 'a35': 816,
+ 'a36': 823,
+ 'a37': 789,
+ 'a38': 841,
+ 'a39': 823,
+ 'a40': 833,
+ 'a41': 816,
+ 'a42': 831,
+ 'a43': 923,
+ 'a44': 744,
+ 'a45': 723,
+ 'a46': 749,
+ 'a47': 790,
+ 'a48': 792,
+ 'a49': 695,
+ 'a50': 776,
+ 'a51': 768,
+ 'a52': 792,
+ 'a53': 759,
+ 'a54': 707,
+ 'a55': 708,
+ 'a56': 682,
+ 'a57': 701,
+ 'a58': 826,
+ 'a59': 815,
+ 'a60': 789,
+ 'a61': 789,
+ 'a62': 707,
+ 'a63': 687,
+ 'a64': 696,
+ 'a65': 689,
+ 'a66': 786,
+ 'a67': 787,
+ 'a68': 713,
+ 'a69': 791,
+ 'a70': 785,
+ 'a71': 791,
+ 'a72': 873,
+ 'a73': 761,
+ 'a74': 762,
+ 'a203': 762,
+ 'a75': 759,
+ 'a204': 759,
+ 'a76': 892,
+ 'a77': 892,
+ 'a78': 788,
+ 'a79': 784,
+ 'a81': 438,
+ 'a82': 138,
+ 'a83': 277,
+ 'a84': 415,
+ 'a97': 392,
+ 'a98': 392,
+ 'a99': 668,
+ 'a100': 668,
+ 'a89': 390,
+ 'a90': 390,
+ 'a93': 317,
+ 'a94': 317,
+ 'a91': 276,
+ 'a92': 276,
+ 'a205': 509,
+ 'a85': 509,
+ 'a206': 410,
+ 'a86': 410,
+ 'a87': 234,
+ 'a88': 234,
+ 'a95': 334,
+ 'a96': 334,
+ 'a101': 732,
+ 'a102': 544,
+ 'a103': 544,
+ 'a104': 910,
+ 'a106': 667,
+ 'a107': 760,
+ 'a108': 760,
+ 'a112': 776,
+ 'a111': 595,
+ 'a110': 694,
+ 'a109': 626,
+ 'a120': 788,
+ 'a121': 788,
+ 'a122': 788,
+ 'a123': 788,
+ 'a124': 788,
+ 'a125': 788,
+ 'a126': 788,
+ 'a127': 788,
+ 'a128': 788,
+ 'a129': 788,
+ 'a130': 788,
+ 'a131': 788,
+ 'a132': 788,
+ 'a133': 788,
+ 'a134': 788,
+ 'a135': 788,
+ 'a136': 788,
+ 'a137': 788,
+ 'a138': 788,
+ 'a139': 788,
+ 'a140': 788,
+ 'a141': 788,
+ 'a142': 788,
+ 'a143': 788,
+ 'a144': 788,
+ 'a145': 788,
+ 'a146': 788,
+ 'a147': 788,
+ 'a148': 788,
+ 'a149': 788,
+ 'a150': 788,
+ 'a151': 788,
+ 'a152': 788,
+ 'a153': 788,
+ 'a154': 788,
+ 'a155': 788,
+ 'a156': 788,
+ 'a157': 788,
+ 'a158': 788,
+ 'a159': 788,
+ 'a160': 894,
+ 'a161': 838,
+ 'a163': 1016,
+ 'a164': 458,
+ 'a196': 748,
+ 'a165': 924,
+ 'a192': 748,
+ 'a166': 918,
+ 'a167': 927,
+ 'a168': 928,
+ 'a169': 928,
+ 'a170': 834,
+ 'a171': 873,
+ 'a172': 828,
+ 'a173': 924,
+ 'a162': 924,
+ 'a174': 917,
+ 'a175': 930,
+ 'a176': 931,
+ 'a177': 463,
+ 'a178': 883,
+ 'a179': 836,
+ 'a193': 836,
+ 'a180': 867,
+ 'a199': 867,
+ 'a181': 696,
+ 'a200': 696,
+ 'a182': 874,
+ 'a201': 874,
+ 'a183': 760,
+ 'a184': 946,
+ 'a197': 771,
+ 'a185': 865,
+ 'a194': 771,
+ 'a198': 888,
+ 'a186': 967,
+ 'a195': 888,
+ 'a187': 831,
+ 'a188': 873,
+ 'a189': 927,
+ 'a190': 970,
+ 'a191': 918
+ }
+};
+
+
+var EOF = {};
+
+function isEOF(v) {
+ return (v === EOF);
+}
+
+var MAX_LENGTH_TO_CACHE = 1000;
+
+var Parser = (function ParserClosure() {
+ function Parser(lexer, allowStreams, xref) {
+ this.lexer = lexer;
+ this.allowStreams = allowStreams;
+ this.xref = xref;
+ this.imageCache = {};
+ this.refill();
+ }
+
+ Parser.prototype = {
+ refill: function Parser_refill() {
+ this.buf1 = this.lexer.getObj();
+ this.buf2 = this.lexer.getObj();
+ },
+ shift: function Parser_shift() {
+ if (isCmd(this.buf2, 'ID')) {
+ this.buf1 = this.buf2;
+ this.buf2 = null;
+ } else {
+ this.buf1 = this.buf2;
+ this.buf2 = this.lexer.getObj();
+ }
+ },
+ getObj: function Parser_getObj(cipherTransform) {
+ var buf1 = this.buf1;
+ this.shift();
+
+ if (buf1 instanceof Cmd) {
+ switch (buf1.cmd) {
+ case 'BI': // inline image
+ return this.makeInlineImage(cipherTransform);
+ case '[': // array
+ var array = [];
+ while (!isCmd(this.buf1, ']') && !isEOF(this.buf1)) {
+ array.push(this.getObj(cipherTransform));
+ }
+ if (isEOF(this.buf1)) {
+ error('End of file inside array');
+ }
+ this.shift();
+ return array;
+ case '<<': // dictionary or stream
+ var dict = new Dict(this.xref);
+ while (!isCmd(this.buf1, '>>') && !isEOF(this.buf1)) {
+ if (!isName(this.buf1)) {
+ info('Malformed dictionary: key must be a name object');
+ this.shift();
+ continue;
+ }
+
+ var key = this.buf1.name;
+ this.shift();
+ if (isEOF(this.buf1)) {
+ break;
+ }
+ dict.set(key, this.getObj(cipherTransform));
+ }
+ if (isEOF(this.buf1)) {
+ error('End of file inside dictionary');
+ }
+
+ // Stream objects are not allowed inside content streams or
+ // object streams.
+ if (isCmd(this.buf2, 'stream')) {
+ return (this.allowStreams ?
+ this.makeStream(dict, cipherTransform) : dict);
+ }
+ this.shift();
+ return dict;
+ default: // simple object
+ return buf1;
+ }
+ }
+
+ if (isInt(buf1)) { // indirect reference or integer
+ var num = buf1;
+ if (isInt(this.buf1) && isCmd(this.buf2, 'R')) {
+ var ref = new Ref(num, this.buf1);
+ this.shift();
+ this.shift();
+ return ref;
+ }
+ return num;
+ }
+
+ if (isString(buf1)) { // string
+ var str = buf1;
+ if (cipherTransform) {
+ str = cipherTransform.decryptString(str);
+ }
+ return str;
+ }
+
+ // simple object
+ return buf1;
+ },
+ /**
+ * Find the end of the stream by searching for the /EI\s/.
+ * @returns {number} The inline stream length.
+ */
+ findDefaultInlineStreamEnd:
+ function Parser_findDefaultInlineStreamEnd(stream) {
+ var E = 0x45, I = 0x49, SPACE = 0x20, LF = 0xA, CR = 0xD;
+ var startPos = stream.pos, state = 0, ch, i, n, followingBytes;
+ while ((ch = stream.getByte()) !== -1) {
+ if (state === 0) {
+ state = (ch === E) ? 1 : 0;
+ } else if (state === 1) {
+ state = (ch === I) ? 2 : 0;
+ } else {
+ assert(state === 2);
+ if (ch === SPACE || ch === LF || ch === CR) {
+ // Let's check the next five bytes are ASCII... just be sure.
+ n = 5;
+ followingBytes = stream.peekBytes(n);
+ for (i = 0; i < n; i++) {
+ ch = followingBytes[i];
+ if (ch !== LF && ch !== CR && (ch < SPACE || ch > 0x7F)) {
+ // Not a LF, CR, SPACE or any visible ASCII character, i.e.
+ // it's binary stuff. Resetting the state.
+ state = 0;
+ break;
+ }
+ }
+ if (state === 2) {
+ break; // Finished!
+ }
+ } else {
+ state = 0;
+ }
+ }
+ }
+ return ((stream.pos - 4) - startPos);
+ },
+ /**
+ * Find the EOI (end-of-image) marker 0xFFD9 of the stream.
+ * @returns {number} The inline stream length.
+ */
+ findDCTDecodeInlineStreamEnd:
+ function Parser_findDCTDecodeInlineStreamEnd(stream) {
+ var startPos = stream.pos, foundEOI = false, b, markerLength, length;
+ while ((b = stream.getByte()) !== -1) {
+ if (b !== 0xFF) { // Not a valid marker.
+ continue;
+ }
+ switch (stream.getByte()) {
+ case 0x00: // Byte stuffing.
+ // 0xFF00 appears to be a very common byte sequence in JPEG images.
+ break;
+
+ case 0xFF: // Fill byte.
+ // Avoid skipping a valid marker, resetting the stream position.
+ stream.skip(-1);
+ break;
+
+ case 0xD9: // EOI
+ foundEOI = true;
+ break;
+
+ case 0xC0: // SOF0
+ case 0xC1: // SOF1
+ case 0xC2: // SOF2
+ case 0xC3: // SOF3
+
+ case 0xC5: // SOF5
+ case 0xC6: // SOF6
+ case 0xC7: // SOF7
+
+ case 0xC9: // SOF9
+ case 0xCA: // SOF10
+ case 0xCB: // SOF11
+
+ case 0xCD: // SOF13
+ case 0xCE: // SOF14
+ case 0xCF: // SOF15
+
+ case 0xC4: // DHT
+ case 0xCC: // DAC
+
+ case 0xDA: // SOS
+ case 0xDB: // DQT
+ case 0xDC: // DNL
+ case 0xDD: // DRI
+ case 0xDE: // DHP
+ case 0xDF: // EXP
+
+ case 0xE0: // APP0
+ case 0xE1: // APP1
+ case 0xE2: // APP2
+ case 0xE3: // APP3
+ case 0xE4: // APP4
+ case 0xE5: // APP5
+ case 0xE6: // APP6
+ case 0xE7: // APP7
+ case 0xE8: // APP8
+ case 0xE9: // APP9
+ case 0xEA: // APP10
+ case 0xEB: // APP11
+ case 0xEC: // APP12
+ case 0xED: // APP13
+ case 0xEE: // APP14
+ case 0xEF: // APP15
+
+ case 0xFE: // COM
+ // The marker should be followed by the length of the segment.
+ markerLength = stream.getUint16();
+ if (markerLength > 2) {
+ // |markerLength| contains the byte length of the marker segment,
+ // including its own length (2 bytes) and excluding the marker.
+ stream.skip(markerLength - 2); // Jump to the next marker.
+ } else {
+ // The marker length is invalid, resetting the stream position.
+ stream.skip(-2);
+ }
+ break;
+ }
+ if (foundEOI) {
+ break;
+ }
+ }
+ length = stream.pos - startPos;
+ if (b === -1) {
+ warn('Inline DCTDecode image stream: ' +
+ 'EOI marker not found, searching for /EI/ instead.');
+ stream.skip(-length); // Reset the stream position.
+ return this.findDefaultInlineStreamEnd(stream);
+ }
+ this.inlineStreamSkipEI(stream);
+ return length;
+ },
+ /**
+ * Find the EOD (end-of-data) marker '~>' (i.e. TILDE + GT) of the stream.
+ * @returns {number} The inline stream length.
+ */
+ findASCII85DecodeInlineStreamEnd:
+ function Parser_findASCII85DecodeInlineStreamEnd(stream) {
+ var TILDE = 0x7E, GT = 0x3E;
+ var startPos = stream.pos, ch, length;
+ while ((ch = stream.getByte()) !== -1) {
+ if (ch === TILDE && stream.peekByte() === GT) {
+ stream.skip();
+ break;
+ }
+ }
+ length = stream.pos - startPos;
+ if (ch === -1) {
+ warn('Inline ASCII85Decode image stream: ' +
+ 'EOD marker not found, searching for /EI/ instead.');
+ stream.skip(-length); // Reset the stream position.
+ return this.findDefaultInlineStreamEnd(stream);
+ }
+ this.inlineStreamSkipEI(stream);
+ return length;
+ },
+ /**
+ * Find the EOD (end-of-data) marker '>' (i.e. GT) of the stream.
+ * @returns {number} The inline stream length.
+ */
+ findASCIIHexDecodeInlineStreamEnd:
+ function Parser_findASCIIHexDecodeInlineStreamEnd(stream) {
+ var GT = 0x3E;
+ var startPos = stream.pos, ch, length;
+ while ((ch = stream.getByte()) !== -1) {
+ if (ch === GT) {
+ break;
+ }
+ }
+ length = stream.pos - startPos;
+ if (ch === -1) {
+ warn('Inline ASCIIHexDecode image stream: ' +
+ 'EOD marker not found, searching for /EI/ instead.');
+ stream.skip(-length); // Reset the stream position.
+ return this.findDefaultInlineStreamEnd(stream);
+ }
+ this.inlineStreamSkipEI(stream);
+ return length;
+ },
+ /**
+ * Skip over the /EI/ for streams where we search for an EOD marker.
+ */
+ inlineStreamSkipEI: function Parser_inlineStreamSkipEI(stream) {
+ var E = 0x45, I = 0x49;
+ var state = 0, ch;
+ while ((ch = stream.getByte()) !== -1) {
+ if (state === 0) {
+ state = (ch === E) ? 1 : 0;
+ } else if (state === 1) {
+ state = (ch === I) ? 2 : 0;
+ } else if (state === 2) {
+ break;
+ }
+ }
+ },
+ makeInlineImage: function Parser_makeInlineImage(cipherTransform) {
+ var lexer = this.lexer;
+ var stream = lexer.stream;
+
+ // Parse dictionary.
+ var dict = new Dict(null);
+ while (!isCmd(this.buf1, 'ID') && !isEOF(this.buf1)) {
+ if (!isName(this.buf1)) {
+ error('Dictionary key must be a name object');
+ }
+ var key = this.buf1.name;
+ this.shift();
+ if (isEOF(this.buf1)) {
+ break;
+ }
+ dict.set(key, this.getObj(cipherTransform));
+ }
+
+ // Extract the name of the first (i.e. the current) image filter.
+ var filter = this.fetchIfRef(dict.get('Filter', 'F')), filterName;
+ if (isName(filter)) {
+ filterName = filter.name;
+ } else if (isArray(filter) && isName(filter[0])) {
+ filterName = filter[0].name;
+ }
+
+ // Parse image stream.
+ var startPos = stream.pos, length, i, ii;
+ if (filterName === 'DCTDecode' || filterName === 'DCT') {
+ length = this.findDCTDecodeInlineStreamEnd(stream);
+ } else if (filterName === 'ASCII85Decide' || filterName === 'A85') {
+ length = this.findASCII85DecodeInlineStreamEnd(stream);
+ } else if (filterName === 'ASCIIHexDecode' || filterName === 'AHx') {
+ length = this.findASCIIHexDecodeInlineStreamEnd(stream);
+ } else {
+ length = this.findDefaultInlineStreamEnd(stream);
+ }
+ var imageStream = stream.makeSubStream(startPos, length, dict);
+
+ // Cache all images below the MAX_LENGTH_TO_CACHE threshold by their
+ // adler32 checksum.
+ var adler32;
+ if (length < MAX_LENGTH_TO_CACHE) {
+ var imageBytes = imageStream.getBytes();
+ imageStream.reset();
+
+ var a = 1;
+ var b = 0;
+ for (i = 0, ii = imageBytes.length; i < ii; ++i) {
+ // No modulo required in the loop if imageBytes.length < 5552.
+ a += imageBytes[i] & 0xff;
+ b += a;
+ }
+ adler32 = ((b % 65521) << 16) | (a % 65521);
+
+ if (this.imageCache.adler32 === adler32) {
+ this.buf2 = Cmd.get('EI');
+ this.shift();
+
+ this.imageCache[adler32].reset();
+ return this.imageCache[adler32];
+ }
+ }
+
+ if (cipherTransform) {
+ imageStream = cipherTransform.createStream(imageStream, length);
+ }
+
+ imageStream = this.filter(imageStream, dict, length);
+ imageStream.dict = dict;
+ if (adler32 !== undefined) {
+ imageStream.cacheKey = 'inline_' + length + '_' + adler32;
+ this.imageCache[adler32] = imageStream;
+ }
+
+ this.buf2 = Cmd.get('EI');
+ this.shift();
+
+ return imageStream;
+ },
+ fetchIfRef: function Parser_fetchIfRef(obj) {
+ // not relying on the xref.fetchIfRef -- xref might not be set
+ return (isRef(obj) ? this.xref.fetch(obj) : obj);
+ },
+ makeStream: function Parser_makeStream(dict, cipherTransform) {
+ var lexer = this.lexer;
+ var stream = lexer.stream;
+
+ // get stream start position
+ lexer.skipToNextLine();
+ var pos = stream.pos - 1;
+
+ // get length
+ var length = this.fetchIfRef(dict.get('Length'));
+ if (!isInt(length)) {
+ info('Bad ' + length + ' attribute in stream');
+ length = 0;
+ }
+
+ // skip over the stream data
+ stream.pos = pos + length;
+ lexer.nextChar();
+
+ this.shift(); // '>>'
+ this.shift(); // 'stream'
+ if (!isCmd(this.buf1, 'endstream')) {
+ // bad stream length, scanning for endstream
+ stream.pos = pos;
+ var SCAN_BLOCK_SIZE = 2048;
+ var ENDSTREAM_SIGNATURE_LENGTH = 9;
+ var ENDSTREAM_SIGNATURE = [0x65, 0x6E, 0x64, 0x73, 0x74, 0x72, 0x65,
+ 0x61, 0x6D];
+ var skipped = 0, found = false, i, j;
+ while (stream.pos < stream.end) {
+ var scanBytes = stream.peekBytes(SCAN_BLOCK_SIZE);
+ var scanLength = scanBytes.length - ENDSTREAM_SIGNATURE_LENGTH;
+ if (scanLength <= 0) {
+ break;
+ }
+ found = false;
+ for (i = 0, j = 0; i < scanLength; i++) {
+ var b = scanBytes[i];
+ if (b !== ENDSTREAM_SIGNATURE[j]) {
+ i -= j;
+ j = 0;
+ } else {
+ j++;
+ if (j >= ENDSTREAM_SIGNATURE_LENGTH) {
+ i++;
+ found = true;
+ break;
+ }
+ }
+ }
+ if (found) {
+ skipped += i - ENDSTREAM_SIGNATURE_LENGTH;
+ stream.pos += i - ENDSTREAM_SIGNATURE_LENGTH;
+ break;
+ }
+ skipped += scanLength;
+ stream.pos += scanLength;
+ }
+ if (!found) {
+ error('Missing endstream');
+ }
+ length = skipped;
+
+ lexer.nextChar();
+ this.shift();
+ this.shift();
+ }
+ this.shift(); // 'endstream'
+
+ stream = stream.makeSubStream(pos, length, dict);
+ if (cipherTransform) {
+ stream = cipherTransform.createStream(stream, length);
+ }
+ stream = this.filter(stream, dict, length);
+ stream.dict = dict;
+ return stream;
+ },
+ filter: function Parser_filter(stream, dict, length) {
+ var filter = this.fetchIfRef(dict.get('Filter', 'F'));
+ var params = this.fetchIfRef(dict.get('DecodeParms', 'DP'));
+ if (isName(filter)) {
+ return this.makeFilter(stream, filter.name, length, params);
+ }
+
+ var maybeLength = length;
+ if (isArray(filter)) {
+ var filterArray = filter;
+ var paramsArray = params;
+ for (var i = 0, ii = filterArray.length; i < ii; ++i) {
+ filter = filterArray[i];
+ if (!isName(filter)) {
+ error('Bad filter name: ' + filter);
+ }
+
+ params = null;
+ if (isArray(paramsArray) && (i in paramsArray)) {
+ params = paramsArray[i];
+ }
+ stream = this.makeFilter(stream, filter.name, maybeLength, params);
+ // after the first stream the length variable is invalid
+ maybeLength = null;
+ }
+ }
+ return stream;
+ },
+ makeFilter: function Parser_makeFilter(stream, name, maybeLength, params) {
+ if (stream.dict.get('Length') === 0) {
+ return new NullStream(stream);
+ }
+ try {
+ if (params) {
+ params = this.fetchIfRef(params);
+ }
+ var xrefStreamStats = this.xref.stats.streamTypes;
+ if (name === 'FlateDecode' || name === 'Fl') {
+ xrefStreamStats[StreamType.FLATE] = true;
+ if (params) {
+ return new PredictorStream(new FlateStream(stream, maybeLength),
+ maybeLength, params);
+ }
+ return new FlateStream(stream, maybeLength);
+ }
+ if (name === 'LZWDecode' || name === 'LZW') {
+ xrefStreamStats[StreamType.LZW] = true;
+ var earlyChange = 1;
+ if (params) {
+ if (params.has('EarlyChange')) {
+ earlyChange = params.get('EarlyChange');
+ }
+ return new PredictorStream(
+ new LZWStream(stream, maybeLength, earlyChange),
+ maybeLength, params);
+ }
+ return new LZWStream(stream, maybeLength, earlyChange);
+ }
+ if (name === 'DCTDecode' || name === 'DCT') {
+ xrefStreamStats[StreamType.DCT] = true;
+ return new JpegStream(stream, maybeLength, stream.dict, this.xref);
+ }
+ if (name === 'JPXDecode' || name === 'JPX') {
+ xrefStreamStats[StreamType.JPX] = true;
+ return new JpxStream(stream, maybeLength, stream.dict);
+ }
+ if (name === 'ASCII85Decode' || name === 'A85') {
+ xrefStreamStats[StreamType.A85] = true;
+ return new Ascii85Stream(stream, maybeLength);
+ }
+ if (name === 'ASCIIHexDecode' || name === 'AHx') {
+ xrefStreamStats[StreamType.AHX] = true;
+ return new AsciiHexStream(stream, maybeLength);
+ }
+ if (name === 'CCITTFaxDecode' || name === 'CCF') {
+ xrefStreamStats[StreamType.CCF] = true;
+ return new CCITTFaxStream(stream, maybeLength, params);
+ }
+ if (name === 'RunLengthDecode' || name === 'RL') {
+ xrefStreamStats[StreamType.RL] = true;
+ return new RunLengthStream(stream, maybeLength);
+ }
+ if (name === 'JBIG2Decode') {
+ xrefStreamStats[StreamType.JBIG] = true;
+ return new Jbig2Stream(stream, maybeLength, stream.dict);
+ }
+ warn('filter "' + name + '" not supported yet');
+ return stream;
+ } catch (ex) {
+ if (ex instanceof MissingDataException) {
+ throw ex;
+ }
+ warn('Invalid stream: \"' + ex + '\"');
+ return new NullStream(stream);
+ }
+ }
+ };
+
+ return Parser;
+})();
+
+var Lexer = (function LexerClosure() {
+ function Lexer(stream, knownCommands) {
+ this.stream = stream;
+ this.nextChar();
+
+ // While lexing, we build up many strings one char at a time. Using += for
+ // this can result in lots of garbage strings. It's better to build an
+ // array of single-char strings and then join() them together at the end.
+ // And reusing a single array (i.e. |this.strBuf|) over and over for this
+ // purpose uses less memory than using a new array for each string.
+ this.strBuf = [];
+
+ // The PDFs might have "glued" commands with other commands, operands or
+ // literals, e.g. "q1". The knownCommands is a dictionary of the valid
+ // commands and their prefixes. The prefixes are built the following way:
+ // if there a command that is a prefix of the other valid command or
+ // literal (e.g. 'f' and 'false') the following prefixes must be included,
+ // 'fa', 'fal', 'fals'. The prefixes are not needed, if the command has no
+ // other commands or literals as a prefix. The knowCommands is optional.
+ this.knownCommands = knownCommands;
+ }
+
+ Lexer.isSpace = function Lexer_isSpace(ch) {
+ // Space is one of the following characters: SPACE, TAB, CR or LF.
+ return (ch === 0x20 || ch === 0x09 || ch === 0x0D || ch === 0x0A);
+ };
+
+ // A '1' in this array means the character is white space. A '1' or
+ // '2' means the character ends a name or command.
+ var specialChars = [
+ 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, // 0x
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+ 1, 0, 0, 0, 0, 2, 0, 0, 2, 2, 0, 0, 0, 0, 0, 2, // 2x
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, // 3x
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 4x
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0, // 5x
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 6x
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0, // 7x
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // ax
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // bx
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // cx
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // dx
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // ex
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 // fx
+ ];
+
+ function toHexDigit(ch) {
+ if (ch >= 0x30 && ch <= 0x39) { // '0'-'9'
+ return ch & 0x0F;
+ }
+ if ((ch >= 0x41 && ch <= 0x46) || (ch >= 0x61 && ch <= 0x66)) {
+ // 'A'-'F', 'a'-'f'
+ return (ch & 0x0F) + 9;
+ }
+ return -1;
+ }
+
+ Lexer.prototype = {
+ nextChar: function Lexer_nextChar() {
+ return (this.currentChar = this.stream.getByte());
+ },
+ peekChar: function Lexer_peekChar() {
+ return this.stream.peekByte();
+ },
+ getNumber: function Lexer_getNumber() {
+ var ch = this.currentChar;
+ var eNotation = false;
+ var divideBy = 0; // different from 0 if it's a floating point value
+ var sign = 1;
+
+ if (ch === 0x2D) { // '-'
+ sign = -1;
+ ch = this.nextChar();
+ } else if (ch === 0x2B) { // '+'
+ ch = this.nextChar();
+ }
+ if (ch === 0x2E) { // '.'
+ divideBy = 10;
+ ch = this.nextChar();
+ }
+ if (ch < 0x30 || ch > 0x39) { // '0' - '9'
+ error('Invalid number: ' + String.fromCharCode(ch));
+ return 0;
+ }
+
+ var baseValue = ch - 0x30; // '0'
+ var powerValue = 0;
+ var powerValueSign = 1;
+
+ while ((ch = this.nextChar()) >= 0) {
+ if (0x30 <= ch && ch <= 0x39) { // '0' - '9'
+ var currentDigit = ch - 0x30; // '0'
+ if (eNotation) { // We are after an 'e' or 'E'
+ powerValue = powerValue * 10 + currentDigit;
+ } else {
+ if (divideBy !== 0) { // We are after a point
+ divideBy *= 10;
+ }
+ baseValue = baseValue * 10 + currentDigit;
+ }
+ } else if (ch === 0x2E) { // '.'
+ if (divideBy === 0) {
+ divideBy = 1;
+ } else {
+ // A number can have only one '.'
+ break;
+ }
+ } else if (ch === 0x2D) { // '-'
+ // ignore minus signs in the middle of numbers to match
+ // Adobe's behavior
+ warn('Badly formated number');
+ } else if (ch === 0x45 || ch === 0x65) { // 'E', 'e'
+ // 'E' can be either a scientific notation or the beginning of a new
+ // operator
+ ch = this.peekChar();
+ if (ch === 0x2B || ch === 0x2D) { // '+', '-'
+ powerValueSign = (ch === 0x2D) ? -1 : 1;
+ this.nextChar(); // Consume the sign character
+ } else if (ch < 0x30 || ch > 0x39) { // '0' - '9'
+ // The 'E' must be the beginning of a new operator
+ break;
+ }
+ eNotation = true;
+ } else {
+ // the last character doesn't belong to us
+ break;
+ }
+ }
+
+ if (divideBy !== 0) {
+ baseValue /= divideBy;
+ }
+ if (eNotation) {
+ baseValue *= Math.pow(10, powerValueSign * powerValue);
+ }
+ return sign * baseValue;
+ },
+ getString: function Lexer_getString() {
+ var numParen = 1;
+ var done = false;
+ var strBuf = this.strBuf;
+ strBuf.length = 0;
+
+ var ch = this.nextChar();
+ while (true) {
+ var charBuffered = false;
+ switch (ch | 0) {
+ case -1:
+ warn('Unterminated string');
+ done = true;
+ break;
+ case 0x28: // '('
+ ++numParen;
+ strBuf.push('(');
+ break;
+ case 0x29: // ')'
+ if (--numParen === 0) {
+ this.nextChar(); // consume strings ')'
+ done = true;
+ } else {
+ strBuf.push(')');
+ }
+ break;
+ case 0x5C: // '\\'
+ ch = this.nextChar();
+ switch (ch) {
+ case -1:
+ warn('Unterminated string');
+ done = true;
+ break;
+ case 0x6E: // 'n'
+ strBuf.push('\n');
+ break;
+ case 0x72: // 'r'
+ strBuf.push('\r');
+ break;
+ case 0x74: // 't'
+ strBuf.push('\t');
+ break;
+ case 0x62: // 'b'
+ strBuf.push('\b');
+ break;
+ case 0x66: // 'f'
+ strBuf.push('\f');
+ break;
+ case 0x5C: // '\'
+ case 0x28: // '('
+ case 0x29: // ')'
+ strBuf.push(String.fromCharCode(ch));
+ break;
+ case 0x30: case 0x31: case 0x32: case 0x33: // '0'-'3'
+ case 0x34: case 0x35: case 0x36: case 0x37: // '4'-'7'
+ var x = ch & 0x0F;
+ ch = this.nextChar();
+ charBuffered = true;
+ if (ch >= 0x30 && ch <= 0x37) { // '0'-'7'
+ x = (x << 3) + (ch & 0x0F);
+ ch = this.nextChar();
+ if (ch >= 0x30 && ch <= 0x37) { // '0'-'7'
+ charBuffered = false;
+ x = (x << 3) + (ch & 0x0F);
+ }
+ }
+ strBuf.push(String.fromCharCode(x));
+ break;
+ case 0x0D: // CR
+ if (this.peekChar() === 0x0A) { // LF
+ this.nextChar();
+ }
+ break;
+ case 0x0A: // LF
+ break;
+ default:
+ strBuf.push(String.fromCharCode(ch));
+ break;
+ }
+ break;
+ default:
+ strBuf.push(String.fromCharCode(ch));
+ break;
+ }
+ if (done) {
+ break;
+ }
+ if (!charBuffered) {
+ ch = this.nextChar();
+ }
+ }
+ return strBuf.join('');
+ },
+ getName: function Lexer_getName() {
+ var ch;
+ var strBuf = this.strBuf;
+ strBuf.length = 0;
+ while ((ch = this.nextChar()) >= 0 && !specialChars[ch]) {
+ if (ch === 0x23) { // '#'
+ ch = this.nextChar();
+ var x = toHexDigit(ch);
+ if (x !== -1) {
+ var x2 = toHexDigit(this.nextChar());
+ if (x2 === -1) {
+ error('Illegal digit in hex char in name: ' + x2);
+ }
+ strBuf.push(String.fromCharCode((x << 4) | x2));
+ } else {
+ strBuf.push('#', String.fromCharCode(ch));
+ }
+ } else {
+ strBuf.push(String.fromCharCode(ch));
+ }
+ }
+ if (strBuf.length > 128) {
+ error('Warning: name token is longer than allowed by the spec: ' +
+ strBuf.length);
+ }
+ return Name.get(strBuf.join(''));
+ },
+ getHexString: function Lexer_getHexString() {
+ var strBuf = this.strBuf;
+ strBuf.length = 0;
+ var ch = this.currentChar;
+ var isFirstHex = true;
+ var firstDigit;
+ var secondDigit;
+ while (true) {
+ if (ch < 0) {
+ warn('Unterminated hex string');
+ break;
+ } else if (ch === 0x3E) { // '>'
+ this.nextChar();
+ break;
+ } else if (specialChars[ch] === 1) {
+ ch = this.nextChar();
+ continue;
+ } else {
+ if (isFirstHex) {
+ firstDigit = toHexDigit(ch);
+ if (firstDigit === -1) {
+ warn('Ignoring invalid character "' + ch + '" in hex string');
+ ch = this.nextChar();
+ continue;
+ }
+ } else {
+ secondDigit = toHexDigit(ch);
+ if (secondDigit === -1) {
+ warn('Ignoring invalid character "' + ch + '" in hex string');
+ ch = this.nextChar();
+ continue;
+ }
+ strBuf.push(String.fromCharCode((firstDigit << 4) | secondDigit));
+ }
+ isFirstHex = !isFirstHex;
+ ch = this.nextChar();
+ }
+ }
+ return strBuf.join('');
+ },
+ getObj: function Lexer_getObj() {
+ // skip whitespace and comments
+ var comment = false;
+ var ch = this.currentChar;
+ while (true) {
+ if (ch < 0) {
+ return EOF;
+ }
+ if (comment) {
+ if (ch === 0x0A || ch === 0x0D) { // LF, CR
+ comment = false;
+ }
+ } else if (ch === 0x25) { // '%'
+ comment = true;
+ } else if (specialChars[ch] !== 1) {
+ break;
+ }
+ ch = this.nextChar();
+ }
+
+ // start reading token
+ switch (ch | 0) {
+ case 0x30: case 0x31: case 0x32: case 0x33: case 0x34: // '0'-'4'
+ case 0x35: case 0x36: case 0x37: case 0x38: case 0x39: // '5'-'9'
+ case 0x2B: case 0x2D: case 0x2E: // '+', '-', '.'
+ return this.getNumber();
+ case 0x28: // '('
+ return this.getString();
+ case 0x2F: // '/'
+ return this.getName();
+ // array punctuation
+ case 0x5B: // '['
+ this.nextChar();
+ return Cmd.get('[');
+ case 0x5D: // ']'
+ this.nextChar();
+ return Cmd.get(']');
+ // hex string or dict punctuation
+ case 0x3C: // '<'
+ ch = this.nextChar();
+ if (ch === 0x3C) {
+ // dict punctuation
+ this.nextChar();
+ return Cmd.get('<<');
+ }
+ return this.getHexString();
+ // dict punctuation
+ case 0x3E: // '>'
+ ch = this.nextChar();
+ if (ch === 0x3E) {
+ this.nextChar();
+ return Cmd.get('>>');
+ }
+ return Cmd.get('>');
+ case 0x7B: // '{'
+ this.nextChar();
+ return Cmd.get('{');
+ case 0x7D: // '}'
+ this.nextChar();
+ return Cmd.get('}');
+ case 0x29: // ')'
+ error('Illegal character: ' + ch);
+ break;
+ }
+
+ // command
+ var str = String.fromCharCode(ch);
+ var knownCommands = this.knownCommands;
+ var knownCommandFound = knownCommands && knownCommands[str] !== undefined;
+ while ((ch = this.nextChar()) >= 0 && !specialChars[ch]) {
+ // stop if known command is found and next character does not make
+ // the str a command
+ var possibleCommand = str + String.fromCharCode(ch);
+ if (knownCommandFound && knownCommands[possibleCommand] === undefined) {
+ break;
+ }
+ if (str.length === 128) {
+ error('Command token too long: ' + str.length);
+ }
+ str = possibleCommand;
+ knownCommandFound = knownCommands && knownCommands[str] !== undefined;
+ }
+ if (str === 'true') {
+ return true;
+ }
+ if (str === 'false') {
+ return false;
+ }
+ if (str === 'null') {
+ return null;
+ }
+ return Cmd.get(str);
+ },
+ skipToNextLine: function Lexer_skipToNextLine() {
+ var ch = this.currentChar;
+ while (ch >= 0) {
+ if (ch === 0x0D) { // CR
+ ch = this.nextChar();
+ if (ch === 0x0A) { // LF
+ this.nextChar();
+ }
+ break;
+ } else if (ch === 0x0A) { // LF
+ this.nextChar();
+ break;
+ }
+ ch = this.nextChar();
+ }
+ }
+ };
+
+ return Lexer;
+})();
+
+var Linearization = {
+ create: function LinearizationCreate(stream) {
+ function getInt(name, allowZeroValue) {
+ var obj = linDict.get(name);
+ if (isInt(obj) && (allowZeroValue ? obj >= 0 : obj > 0)) {
+ return obj;
+ }
+ throw new Error('The "' + name + '" parameter in the linearization ' +
+ 'dictionary is invalid.');
+ }
+ function getHints() {
+ var hints = linDict.get('H'), hintsLength, item;
+ if (isArray(hints) &&
+ ((hintsLength = hints.length) === 2 || hintsLength === 4)) {
+ for (var index = 0; index < hintsLength; index++) {
+ if (!(isInt(item = hints[index]) && item > 0)) {
+ throw new Error('Hint (' + index +
+ ') in the linearization dictionary is invalid.');
+ }
+ }
+ return hints;
+ }
+ throw new Error('Hint array in the linearization dictionary is invalid.');
+ }
+ var parser = new Parser(new Lexer(stream), false, null);
+ var obj1 = parser.getObj();
+ var obj2 = parser.getObj();
+ var obj3 = parser.getObj();
+ var linDict = parser.getObj();
+ var obj, length;
+ if (!(isInt(obj1) && isInt(obj2) && isCmd(obj3, 'obj') && isDict(linDict) &&
+ isNum(obj = linDict.get('Linearized')) && obj > 0)) {
+ return null; // No valid linearization dictionary found.
+ } else if ((length = getInt('L')) !== stream.length) {
+ throw new Error('The "L" parameter in the linearization dictionary ' +
+ 'does not equal the stream length.');
+ }
+ return {
+ length: length,
+ hints: getHints(),
+ objectNumberFirst: getInt('O'),
+ endFirst: getInt('E'),
+ numPages: getInt('N'),
+ mainXRefEntriesOffset: getInt('T'),
+ pageFirst: (linDict.has('P') ? getInt('P', true) : 0)
+ };
+ }
+};
+
+
+var PostScriptParser = (function PostScriptParserClosure() {
+ function PostScriptParser(lexer) {
+ this.lexer = lexer;
+ this.operators = [];
+ this.token = null;
+ this.prev = null;
+ }
+ PostScriptParser.prototype = {
+ nextToken: function PostScriptParser_nextToken() {
+ this.prev = this.token;
+ this.token = this.lexer.getToken();
+ },
+ accept: function PostScriptParser_accept(type) {
+ if (this.token.type === type) {
+ this.nextToken();
+ return true;
+ }
+ return false;
+ },
+ expect: function PostScriptParser_expect(type) {
+ if (this.accept(type)) {
+ return true;
+ }
+ error('Unexpected symbol: found ' + this.token.type + ' expected ' +
+ type + '.');
+ },
+ parse: function PostScriptParser_parse() {
+ this.nextToken();
+ this.expect(PostScriptTokenTypes.LBRACE);
+ this.parseBlock();
+ this.expect(PostScriptTokenTypes.RBRACE);
+ return this.operators;
+ },
+ parseBlock: function PostScriptParser_parseBlock() {
+ while (true) {
+ if (this.accept(PostScriptTokenTypes.NUMBER)) {
+ this.operators.push(this.prev.value);
+ } else if (this.accept(PostScriptTokenTypes.OPERATOR)) {
+ this.operators.push(this.prev.value);
+ } else if (this.accept(PostScriptTokenTypes.LBRACE)) {
+ this.parseCondition();
+ } else {
+ return;
+ }
+ }
+ },
+ parseCondition: function PostScriptParser_parseCondition() {
+ // Add two place holders that will be updated later
+ var conditionLocation = this.operators.length;
+ this.operators.push(null, null);
+
+ this.parseBlock();
+ this.expect(PostScriptTokenTypes.RBRACE);
+ if (this.accept(PostScriptTokenTypes.IF)) {
+ // The true block is right after the 'if' so it just falls through on
+ // true else it jumps and skips the true block.
+ this.operators[conditionLocation] = this.operators.length;
+ this.operators[conditionLocation + 1] = 'jz';
+ } else if (this.accept(PostScriptTokenTypes.LBRACE)) {
+ var jumpLocation = this.operators.length;
+ this.operators.push(null, null);
+ var endOfTrue = this.operators.length;
+ this.parseBlock();
+ this.expect(PostScriptTokenTypes.RBRACE);
+ this.expect(PostScriptTokenTypes.IFELSE);
+ // The jump is added at the end of the true block to skip the false
+ // block.
+ this.operators[jumpLocation] = this.operators.length;
+ this.operators[jumpLocation + 1] = 'j';
+
+ this.operators[conditionLocation] = endOfTrue;
+ this.operators[conditionLocation + 1] = 'jz';
+ } else {
+ error('PS Function: error parsing conditional.');
+ }
+ }
+ };
+ return PostScriptParser;
+})();
+
+var PostScriptTokenTypes = {
+ LBRACE: 0,
+ RBRACE: 1,
+ NUMBER: 2,
+ OPERATOR: 3,
+ IF: 4,
+ IFELSE: 5
+};
+
+var PostScriptToken = (function PostScriptTokenClosure() {
+ function PostScriptToken(type, value) {
+ this.type = type;
+ this.value = value;
+ }
+
+ var opCache = {};
+
+ PostScriptToken.getOperator = function PostScriptToken_getOperator(op) {
+ var opValue = opCache[op];
+ if (opValue) {
+ return opValue;
+ }
+ return opCache[op] = new PostScriptToken(PostScriptTokenTypes.OPERATOR, op);
+ };
+
+ PostScriptToken.LBRACE = new PostScriptToken(PostScriptTokenTypes.LBRACE,
+ '{');
+ PostScriptToken.RBRACE = new PostScriptToken(PostScriptTokenTypes.RBRACE,
+ '}');
+ PostScriptToken.IF = new PostScriptToken(PostScriptTokenTypes.IF, 'IF');
+ PostScriptToken.IFELSE = new PostScriptToken(PostScriptTokenTypes.IFELSE,
+ 'IFELSE');
+ return PostScriptToken;
+})();
+
+var PostScriptLexer = (function PostScriptLexerClosure() {
+ function PostScriptLexer(stream) {
+ this.stream = stream;
+ this.nextChar();
+
+ this.strBuf = [];
+ }
+ PostScriptLexer.prototype = {
+ nextChar: function PostScriptLexer_nextChar() {
+ return (this.currentChar = this.stream.getByte());
+ },
+ getToken: function PostScriptLexer_getToken() {
+ var comment = false;
+ var ch = this.currentChar;
+
+ // skip comments
+ while (true) {
+ if (ch < 0) {
+ return EOF;
+ }
+
+ if (comment) {
+ if (ch === 0x0A || ch === 0x0D) {
+ comment = false;
+ }
+ } else if (ch === 0x25) { // '%'
+ comment = true;
+ } else if (!Lexer.isSpace(ch)) {
+ break;
+ }
+ ch = this.nextChar();
+ }
+ switch (ch | 0) {
+ case 0x30: case 0x31: case 0x32: case 0x33: case 0x34: // '0'-'4'
+ case 0x35: case 0x36: case 0x37: case 0x38: case 0x39: // '5'-'9'
+ case 0x2B: case 0x2D: case 0x2E: // '+', '-', '.'
+ return new PostScriptToken(PostScriptTokenTypes.NUMBER,
+ this.getNumber());
+ case 0x7B: // '{'
+ this.nextChar();
+ return PostScriptToken.LBRACE;
+ case 0x7D: // '}'
+ this.nextChar();
+ return PostScriptToken.RBRACE;
+ }
+ // operator
+ var strBuf = this.strBuf;
+ strBuf.length = 0;
+ strBuf[0] = String.fromCharCode(ch);
+
+ while ((ch = this.nextChar()) >= 0 && // and 'A'-'Z', 'a'-'z'
+ ((ch >= 0x41 && ch <= 0x5A) || (ch >= 0x61 && ch <= 0x7A))) {
+ strBuf.push(String.fromCharCode(ch));
+ }
+ var str = strBuf.join('');
+ switch (str.toLowerCase()) {
+ case 'if':
+ return PostScriptToken.IF;
+ case 'ifelse':
+ return PostScriptToken.IFELSE;
+ default:
+ return PostScriptToken.getOperator(str);
+ }
+ },
+ getNumber: function PostScriptLexer_getNumber() {
+ var ch = this.currentChar;
+ var strBuf = this.strBuf;
+ strBuf.length = 0;
+ strBuf[0] = String.fromCharCode(ch);
+
+ while ((ch = this.nextChar()) >= 0) {
+ if ((ch >= 0x30 && ch <= 0x39) || // '0'-'9'
+ ch === 0x2D || ch === 0x2E) { // '-', '.'
+ strBuf.push(String.fromCharCode(ch));
+ } else {
+ break;
+ }
+ }
+ var value = parseFloat(strBuf.join(''));
+ if (isNaN(value)) {
+ error('Invalid floating point number: ' + value);
+ }
+ return value;
+ }
+ };
+ return PostScriptLexer;
+})();
+
+
+var Stream = (function StreamClosure() {
+ function Stream(arrayBuffer, start, length, dict) {
+ this.bytes = (arrayBuffer instanceof Uint8Array ?
+ arrayBuffer : new Uint8Array(arrayBuffer));
+ this.start = start || 0;
+ this.pos = this.start;
+ this.end = (start + length) || this.bytes.length;
+ this.dict = dict;
+ }
+
+ // required methods for a stream. if a particular stream does not
+ // implement these, an error should be thrown
+ Stream.prototype = {
+ get length() {
+ return this.end - this.start;
+ },
+ get isEmpty() {
+ return this.length === 0;
+ },
+ getByte: function Stream_getByte() {
+ if (this.pos >= this.end) {
+ return -1;
+ }
+ return this.bytes[this.pos++];
+ },
+ getUint16: function Stream_getUint16() {
+ var b0 = this.getByte();
+ var b1 = this.getByte();
+ if (b0 === -1 || b1 === -1) {
+ return -1;
+ }
+ return (b0 << 8) + b1;
+ },
+ getInt32: function Stream_getInt32() {
+ var b0 = this.getByte();
+ var b1 = this.getByte();
+ var b2 = this.getByte();
+ var b3 = this.getByte();
+ return (b0 << 24) + (b1 << 16) + (b2 << 8) + b3;
+ },
+ // returns subarray of original buffer
+ // should only be read
+ getBytes: function Stream_getBytes(length) {
+ var bytes = this.bytes;
+ var pos = this.pos;
+ var strEnd = this.end;
+
+ if (!length) {
+ return bytes.subarray(pos, strEnd);
+ }
+ var end = pos + length;
+ if (end > strEnd) {
+ end = strEnd;
+ }
+ this.pos = end;
+ return bytes.subarray(pos, end);
+ },
+ peekByte: function Stream_peekByte() {
+ var peekedByte = this.getByte();
+ this.pos--;
+ return peekedByte;
+ },
+ peekBytes: function Stream_peekBytes(length) {
+ var bytes = this.getBytes(length);
+ this.pos -= bytes.length;
+ return bytes;
+ },
+ skip: function Stream_skip(n) {
+ if (!n) {
+ n = 1;
+ }
+ this.pos += n;
+ },
+ reset: function Stream_reset() {
+ this.pos = this.start;
+ },
+ moveStart: function Stream_moveStart() {
+ this.start = this.pos;
+ },
+ makeSubStream: function Stream_makeSubStream(start, length, dict) {
+ return new Stream(this.bytes.buffer, start, length, dict);
+ },
+ isStream: true
+ };
+
+ return Stream;
+})();
+
+var StringStream = (function StringStreamClosure() {
+ function StringStream(str) {
+ var length = str.length;
+ var bytes = new Uint8Array(length);
+ for (var n = 0; n < length; ++n) {
+ bytes[n] = str.charCodeAt(n);
+ }
+ Stream.call(this, bytes);
+ }
+
+ StringStream.prototype = Stream.prototype;
+
+ return StringStream;
+})();
+
+// super class for the decoding streams
+var DecodeStream = (function DecodeStreamClosure() {
+ // Lots of DecodeStreams are created whose buffers are never used. For these
+ // we share a single empty buffer. This is (a) space-efficient and (b) avoids
+ // having special cases that would be required if we used |null| for an empty
+ // buffer.
+ var emptyBuffer = new Uint8Array(0);
+
+ function DecodeStream(maybeMinBufferLength) {
+ this.pos = 0;
+ this.bufferLength = 0;
+ this.eof = false;
+ this.buffer = emptyBuffer;
+ this.minBufferLength = 512;
+ if (maybeMinBufferLength) {
+ // Compute the first power of two that is as big as maybeMinBufferLength.
+ while (this.minBufferLength < maybeMinBufferLength) {
+ this.minBufferLength *= 2;
+ }
+ }
+ }
+
+ DecodeStream.prototype = {
+ get isEmpty() {
+ while (!this.eof && this.bufferLength === 0) {
+ this.readBlock();
+ }
+ return this.bufferLength === 0;
+ },
+ ensureBuffer: function DecodeStream_ensureBuffer(requested) {
+ var buffer = this.buffer;
+ if (requested <= buffer.byteLength) {
+ return buffer;
+ }
+ var size = this.minBufferLength;
+ while (size < requested) {
+ size *= 2;
+ }
+ var buffer2 = new Uint8Array(size);
+ buffer2.set(buffer);
+ return (this.buffer = buffer2);
+ },
+ getByte: function DecodeStream_getByte() {
+ var pos = this.pos;
+ while (this.bufferLength <= pos) {
+ if (this.eof) {
+ return -1;
+ }
+ this.readBlock();
+ }
+ return this.buffer[this.pos++];
+ },
+ getUint16: function DecodeStream_getUint16() {
+ var b0 = this.getByte();
+ var b1 = this.getByte();
+ if (b0 === -1 || b1 === -1) {
+ return -1;
+ }
+ return (b0 << 8) + b1;
+ },
+ getInt32: function DecodeStream_getInt32() {
+ var b0 = this.getByte();
+ var b1 = this.getByte();
+ var b2 = this.getByte();
+ var b3 = this.getByte();
+ return (b0 << 24) + (b1 << 16) + (b2 << 8) + b3;
+ },
+ getBytes: function DecodeStream_getBytes(length) {
+ var end, pos = this.pos;
+
+ if (length) {
+ this.ensureBuffer(pos + length);
+ end = pos + length;
+
+ while (!this.eof && this.bufferLength < end) {
+ this.readBlock();
+ }
+ var bufEnd = this.bufferLength;
+ if (end > bufEnd) {
+ end = bufEnd;
+ }
+ } else {
+ while (!this.eof) {
+ this.readBlock();
+ }
+ end = this.bufferLength;
+ }
+
+ this.pos = end;
+ return this.buffer.subarray(pos, end);
+ },
+ peekByte: function DecodeStream_peekByte() {
+ var peekedByte = this.getByte();
+ this.pos--;
+ return peekedByte;
+ },
+ peekBytes: function DecodeStream_peekBytes(length) {
+ var bytes = this.getBytes(length);
+ this.pos -= bytes.length;
+ return bytes;
+ },
+ makeSubStream: function DecodeStream_makeSubStream(start, length, dict) {
+ var end = start + length;
+ while (this.bufferLength <= end && !this.eof) {
+ this.readBlock();
+ }
+ return new Stream(this.buffer, start, length, dict);
+ },
+ skip: function DecodeStream_skip(n) {
+ if (!n) {
+ n = 1;
+ }
+ this.pos += n;
+ },
+ reset: function DecodeStream_reset() {
+ this.pos = 0;
+ },
+ getBaseStreams: function DecodeStream_getBaseStreams() {
+ if (this.str && this.str.getBaseStreams) {
+ return this.str.getBaseStreams();
+ }
+ return [];
+ }
+ };
+
+ return DecodeStream;
+})();
+
+var StreamsSequenceStream = (function StreamsSequenceStreamClosure() {
+ function StreamsSequenceStream(streams) {
+ this.streams = streams;
+ DecodeStream.call(this, /* maybeLength = */ null);
+ }
+
+ StreamsSequenceStream.prototype = Object.create(DecodeStream.prototype);
+
+ StreamsSequenceStream.prototype.readBlock =
+ function streamSequenceStreamReadBlock() {
+
+ var streams = this.streams;
+ if (streams.length === 0) {
+ this.eof = true;
+ return;
+ }
+ var stream = streams.shift();
+ var chunk = stream.getBytes();
+ var bufferLength = this.bufferLength;
+ var newLength = bufferLength + chunk.length;
+ var buffer = this.ensureBuffer(newLength);
+ buffer.set(chunk, bufferLength);
+ this.bufferLength = newLength;
+ };
+
+ StreamsSequenceStream.prototype.getBaseStreams =
+ function StreamsSequenceStream_getBaseStreams() {
+
+ var baseStreams = [];
+ for (var i = 0, ii = this.streams.length; i < ii; i++) {
+ var stream = this.streams[i];
+ if (stream.getBaseStreams) {
+ Util.appendToArray(baseStreams, stream.getBaseStreams());
+ }
+ }
+ return baseStreams;
+ };
+
+ return StreamsSequenceStream;
+})();
+
+var FlateStream = (function FlateStreamClosure() {
+ var codeLenCodeMap = new Int32Array([
+ 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
+ ]);
+
+ var lengthDecode = new Int32Array([
+ 0x00003, 0x00004, 0x00005, 0x00006, 0x00007, 0x00008, 0x00009, 0x0000a,
+ 0x1000b, 0x1000d, 0x1000f, 0x10011, 0x20013, 0x20017, 0x2001b, 0x2001f,
+ 0x30023, 0x3002b, 0x30033, 0x3003b, 0x40043, 0x40053, 0x40063, 0x40073,
+ 0x50083, 0x500a3, 0x500c3, 0x500e3, 0x00102, 0x00102, 0x00102
+ ]);
+
+ var distDecode = new Int32Array([
+ 0x00001, 0x00002, 0x00003, 0x00004, 0x10005, 0x10007, 0x20009, 0x2000d,
+ 0x30011, 0x30019, 0x40021, 0x40031, 0x50041, 0x50061, 0x60081, 0x600c1,
+ 0x70101, 0x70181, 0x80201, 0x80301, 0x90401, 0x90601, 0xa0801, 0xa0c01,
+ 0xb1001, 0xb1801, 0xc2001, 0xc3001, 0xd4001, 0xd6001
+ ]);
+
+ var fixedLitCodeTab = [new Int32Array([
+ 0x70100, 0x80050, 0x80010, 0x80118, 0x70110, 0x80070, 0x80030, 0x900c0,
+ 0x70108, 0x80060, 0x80020, 0x900a0, 0x80000, 0x80080, 0x80040, 0x900e0,
+ 0x70104, 0x80058, 0x80018, 0x90090, 0x70114, 0x80078, 0x80038, 0x900d0,
+ 0x7010c, 0x80068, 0x80028, 0x900b0, 0x80008, 0x80088, 0x80048, 0x900f0,
+ 0x70102, 0x80054, 0x80014, 0x8011c, 0x70112, 0x80074, 0x80034, 0x900c8,
+ 0x7010a, 0x80064, 0x80024, 0x900a8, 0x80004, 0x80084, 0x80044, 0x900e8,
+ 0x70106, 0x8005c, 0x8001c, 0x90098, 0x70116, 0x8007c, 0x8003c, 0x900d8,
+ 0x7010e, 0x8006c, 0x8002c, 0x900b8, 0x8000c, 0x8008c, 0x8004c, 0x900f8,
+ 0x70101, 0x80052, 0x80012, 0x8011a, 0x70111, 0x80072, 0x80032, 0x900c4,
+ 0x70109, 0x80062, 0x80022, 0x900a4, 0x80002, 0x80082, 0x80042, 0x900e4,
+ 0x70105, 0x8005a, 0x8001a, 0x90094, 0x70115, 0x8007a, 0x8003a, 0x900d4,
+ 0x7010d, 0x8006a, 0x8002a, 0x900b4, 0x8000a, 0x8008a, 0x8004a, 0x900f4,
+ 0x70103, 0x80056, 0x80016, 0x8011e, 0x70113, 0x80076, 0x80036, 0x900cc,
+ 0x7010b, 0x80066, 0x80026, 0x900ac, 0x80006, 0x80086, 0x80046, 0x900ec,
+ 0x70107, 0x8005e, 0x8001e, 0x9009c, 0x70117, 0x8007e, 0x8003e, 0x900dc,
+ 0x7010f, 0x8006e, 0x8002e, 0x900bc, 0x8000e, 0x8008e, 0x8004e, 0x900fc,
+ 0x70100, 0x80051, 0x80011, 0x80119, 0x70110, 0x80071, 0x80031, 0x900c2,
+ 0x70108, 0x80061, 0x80021, 0x900a2, 0x80001, 0x80081, 0x80041, 0x900e2,
+ 0x70104, 0x80059, 0x80019, 0x90092, 0x70114, 0x80079, 0x80039, 0x900d2,
+ 0x7010c, 0x80069, 0x80029, 0x900b2, 0x80009, 0x80089, 0x80049, 0x900f2,
+ 0x70102, 0x80055, 0x80015, 0x8011d, 0x70112, 0x80075, 0x80035, 0x900ca,
+ 0x7010a, 0x80065, 0x80025, 0x900aa, 0x80005, 0x80085, 0x80045, 0x900ea,
+ 0x70106, 0x8005d, 0x8001d, 0x9009a, 0x70116, 0x8007d, 0x8003d, 0x900da,
+ 0x7010e, 0x8006d, 0x8002d, 0x900ba, 0x8000d, 0x8008d, 0x8004d, 0x900fa,
+ 0x70101, 0x80053, 0x80013, 0x8011b, 0x70111, 0x80073, 0x80033, 0x900c6,
+ 0x70109, 0x80063, 0x80023, 0x900a6, 0x80003, 0x80083, 0x80043, 0x900e6,
+ 0x70105, 0x8005b, 0x8001b, 0x90096, 0x70115, 0x8007b, 0x8003b, 0x900d6,
+ 0x7010d, 0x8006b, 0x8002b, 0x900b6, 0x8000b, 0x8008b, 0x8004b, 0x900f6,
+ 0x70103, 0x80057, 0x80017, 0x8011f, 0x70113, 0x80077, 0x80037, 0x900ce,
+ 0x7010b, 0x80067, 0x80027, 0x900ae, 0x80007, 0x80087, 0x80047, 0x900ee,
+ 0x70107, 0x8005f, 0x8001f, 0x9009e, 0x70117, 0x8007f, 0x8003f, 0x900de,
+ 0x7010f, 0x8006f, 0x8002f, 0x900be, 0x8000f, 0x8008f, 0x8004f, 0x900fe,
+ 0x70100, 0x80050, 0x80010, 0x80118, 0x70110, 0x80070, 0x80030, 0x900c1,
+ 0x70108, 0x80060, 0x80020, 0x900a1, 0x80000, 0x80080, 0x80040, 0x900e1,
+ 0x70104, 0x80058, 0x80018, 0x90091, 0x70114, 0x80078, 0x80038, 0x900d1,
+ 0x7010c, 0x80068, 0x80028, 0x900b1, 0x80008, 0x80088, 0x80048, 0x900f1,
+ 0x70102, 0x80054, 0x80014, 0x8011c, 0x70112, 0x80074, 0x80034, 0x900c9,
+ 0x7010a, 0x80064, 0x80024, 0x900a9, 0x80004, 0x80084, 0x80044, 0x900e9,
+ 0x70106, 0x8005c, 0x8001c, 0x90099, 0x70116, 0x8007c, 0x8003c, 0x900d9,
+ 0x7010e, 0x8006c, 0x8002c, 0x900b9, 0x8000c, 0x8008c, 0x8004c, 0x900f9,
+ 0x70101, 0x80052, 0x80012, 0x8011a, 0x70111, 0x80072, 0x80032, 0x900c5,
+ 0x70109, 0x80062, 0x80022, 0x900a5, 0x80002, 0x80082, 0x80042, 0x900e5,
+ 0x70105, 0x8005a, 0x8001a, 0x90095, 0x70115, 0x8007a, 0x8003a, 0x900d5,
+ 0x7010d, 0x8006a, 0x8002a, 0x900b5, 0x8000a, 0x8008a, 0x8004a, 0x900f5,
+ 0x70103, 0x80056, 0x80016, 0x8011e, 0x70113, 0x80076, 0x80036, 0x900cd,
+ 0x7010b, 0x80066, 0x80026, 0x900ad, 0x80006, 0x80086, 0x80046, 0x900ed,
+ 0x70107, 0x8005e, 0x8001e, 0x9009d, 0x70117, 0x8007e, 0x8003e, 0x900dd,
+ 0x7010f, 0x8006e, 0x8002e, 0x900bd, 0x8000e, 0x8008e, 0x8004e, 0x900fd,
+ 0x70100, 0x80051, 0x80011, 0x80119, 0x70110, 0x80071, 0x80031, 0x900c3,
+ 0x70108, 0x80061, 0x80021, 0x900a3, 0x80001, 0x80081, 0x80041, 0x900e3,
+ 0x70104, 0x80059, 0x80019, 0x90093, 0x70114, 0x80079, 0x80039, 0x900d3,
+ 0x7010c, 0x80069, 0x80029, 0x900b3, 0x80009, 0x80089, 0x80049, 0x900f3,
+ 0x70102, 0x80055, 0x80015, 0x8011d, 0x70112, 0x80075, 0x80035, 0x900cb,
+ 0x7010a, 0x80065, 0x80025, 0x900ab, 0x80005, 0x80085, 0x80045, 0x900eb,
+ 0x70106, 0x8005d, 0x8001d, 0x9009b, 0x70116, 0x8007d, 0x8003d, 0x900db,
+ 0x7010e, 0x8006d, 0x8002d, 0x900bb, 0x8000d, 0x8008d, 0x8004d, 0x900fb,
+ 0x70101, 0x80053, 0x80013, 0x8011b, 0x70111, 0x80073, 0x80033, 0x900c7,
+ 0x70109, 0x80063, 0x80023, 0x900a7, 0x80003, 0x80083, 0x80043, 0x900e7,
+ 0x70105, 0x8005b, 0x8001b, 0x90097, 0x70115, 0x8007b, 0x8003b, 0x900d7,
+ 0x7010d, 0x8006b, 0x8002b, 0x900b7, 0x8000b, 0x8008b, 0x8004b, 0x900f7,
+ 0x70103, 0x80057, 0x80017, 0x8011f, 0x70113, 0x80077, 0x80037, 0x900cf,
+ 0x7010b, 0x80067, 0x80027, 0x900af, 0x80007, 0x80087, 0x80047, 0x900ef,
+ 0x70107, 0x8005f, 0x8001f, 0x9009f, 0x70117, 0x8007f, 0x8003f, 0x900df,
+ 0x7010f, 0x8006f, 0x8002f, 0x900bf, 0x8000f, 0x8008f, 0x8004f, 0x900ff
+ ]), 9];
+
+ var fixedDistCodeTab = [new Int32Array([
+ 0x50000, 0x50010, 0x50008, 0x50018, 0x50004, 0x50014, 0x5000c, 0x5001c,
+ 0x50002, 0x50012, 0x5000a, 0x5001a, 0x50006, 0x50016, 0x5000e, 0x00000,
+ 0x50001, 0x50011, 0x50009, 0x50019, 0x50005, 0x50015, 0x5000d, 0x5001d,
+ 0x50003, 0x50013, 0x5000b, 0x5001b, 0x50007, 0x50017, 0x5000f, 0x00000
+ ]), 5];
+
+ function FlateStream(str, maybeLength) {
+ this.str = str;
+ this.dict = str.dict;
+
+ var cmf = str.getByte();
+ var flg = str.getByte();
+ if (cmf === -1 || flg === -1) {
+ error('Invalid header in flate stream: ' + cmf + ', ' + flg);
+ }
+ if ((cmf & 0x0f) !== 0x08) {
+ error('Unknown compression method in flate stream: ' + cmf + ', ' + flg);
+ }
+ if ((((cmf << 8) + flg) % 31) !== 0) {
+ error('Bad FCHECK in flate stream: ' + cmf + ', ' + flg);
+ }
+ if (flg & 0x20) {
+ error('FDICT bit set in flate stream: ' + cmf + ', ' + flg);
+ }
+
+ this.codeSize = 0;
+ this.codeBuf = 0;
+
+ DecodeStream.call(this, maybeLength);
+ }
+
+ FlateStream.prototype = Object.create(DecodeStream.prototype);
+
+ FlateStream.prototype.getBits = function FlateStream_getBits(bits) {
+ var str = this.str;
+ var codeSize = this.codeSize;
+ var codeBuf = this.codeBuf;
+
+ var b;
+ while (codeSize < bits) {
+ if ((b = str.getByte()) === -1) {
+ error('Bad encoding in flate stream');
+ }
+ codeBuf |= b << codeSize;
+ codeSize += 8;
+ }
+ b = codeBuf & ((1 << bits) - 1);
+ this.codeBuf = codeBuf >> bits;
+ this.codeSize = codeSize -= bits;
+
+ return b;
+ };
+
+ FlateStream.prototype.getCode = function FlateStream_getCode(table) {
+ var str = this.str;
+ var codes = table[0];
+ var maxLen = table[1];
+ var codeSize = this.codeSize;
+ var codeBuf = this.codeBuf;
+
+ var b;
+ while (codeSize < maxLen) {
+ if ((b = str.getByte()) === -1) {
+ // premature end of stream. code might however still be valid.
+ // codeSize < codeLen check below guards against incomplete codeVal.
+ break;
+ }
+ codeBuf |= (b << codeSize);
+ codeSize += 8;
+ }
+ var code = codes[codeBuf & ((1 << maxLen) - 1)];
+ var codeLen = code >> 16;
+ var codeVal = code & 0xffff;
+ if (codeLen < 1 || codeSize < codeLen) {
+ error('Bad encoding in flate stream');
+ }
+ this.codeBuf = (codeBuf >> codeLen);
+ this.codeSize = (codeSize - codeLen);
+ return codeVal;
+ };
+
+ FlateStream.prototype.generateHuffmanTable =
+ function flateStreamGenerateHuffmanTable(lengths) {
+ var n = lengths.length;
+
+ // find max code length
+ var maxLen = 0;
+ var i;
+ for (i = 0; i < n; ++i) {
+ if (lengths[i] > maxLen) {
+ maxLen = lengths[i];
+ }
+ }
+
+ // build the table
+ var size = 1 << maxLen;
+ var codes = new Int32Array(size);
+ for (var len = 1, code = 0, skip = 2;
+ len <= maxLen;
+ ++len, code <<= 1, skip <<= 1) {
+ for (var val = 0; val < n; ++val) {
+ if (lengths[val] === len) {
+ // bit-reverse the code
+ var code2 = 0;
+ var t = code;
+ for (i = 0; i < len; ++i) {
+ code2 = (code2 << 1) | (t & 1);
+ t >>= 1;
+ }
+
+ // fill the table entries
+ for (i = code2; i < size; i += skip) {
+ codes[i] = (len << 16) | val;
+ }
+ ++code;
+ }
+ }
+ }
+
+ return [codes, maxLen];
+ };
+
+ FlateStream.prototype.readBlock = function FlateStream_readBlock() {
+ var buffer, len;
+ var str = this.str;
+ // read block header
+ var hdr = this.getBits(3);
+ if (hdr & 1) {
+ this.eof = true;
+ }
+ hdr >>= 1;
+
+ if (hdr === 0) { // uncompressed block
+ var b;
+
+ if ((b = str.getByte()) === -1) {
+ error('Bad block header in flate stream');
+ }
+ var blockLen = b;
+ if ((b = str.getByte()) === -1) {
+ error('Bad block header in flate stream');
+ }
+ blockLen |= (b << 8);
+ if ((b = str.getByte()) === -1) {
+ error('Bad block header in flate stream');
+ }
+ var check = b;
+ if ((b = str.getByte()) === -1) {
+ error('Bad block header in flate stream');
+ }
+ check |= (b << 8);
+ if (check !== (~blockLen & 0xffff) &&
+ (blockLen !== 0 || check !== 0)) {
+ // Ignoring error for bad "empty" block (see issue 1277)
+ error('Bad uncompressed block length in flate stream');
+ }
+
+ this.codeBuf = 0;
+ this.codeSize = 0;
+
+ var bufferLength = this.bufferLength;
+ buffer = this.ensureBuffer(bufferLength + blockLen);
+ var end = bufferLength + blockLen;
+ this.bufferLength = end;
+ if (blockLen === 0) {
+ if (str.peekByte() === -1) {
+ this.eof = true;
+ }
+ } else {
+ for (var n = bufferLength; n < end; ++n) {
+ if ((b = str.getByte()) === -1) {
+ this.eof = true;
+ break;
+ }
+ buffer[n] = b;
+ }
+ }
+ return;
+ }
+
+ var litCodeTable;
+ var distCodeTable;
+ if (hdr === 1) { // compressed block, fixed codes
+ litCodeTable = fixedLitCodeTab;
+ distCodeTable = fixedDistCodeTab;
+ } else if (hdr === 2) { // compressed block, dynamic codes
+ var numLitCodes = this.getBits(5) + 257;
+ var numDistCodes = this.getBits(5) + 1;
+ var numCodeLenCodes = this.getBits(4) + 4;
+
+ // build the code lengths code table
+ var codeLenCodeLengths = new Uint8Array(codeLenCodeMap.length);
+
+ var i;
+ for (i = 0; i < numCodeLenCodes; ++i) {
+ codeLenCodeLengths[codeLenCodeMap[i]] = this.getBits(3);
+ }
+ var codeLenCodeTab = this.generateHuffmanTable(codeLenCodeLengths);
+
+ // build the literal and distance code tables
+ len = 0;
+ i = 0;
+ var codes = numLitCodes + numDistCodes;
+ var codeLengths = new Uint8Array(codes);
+ var bitsLength, bitsOffset, what;
+ while (i < codes) {
+ var code = this.getCode(codeLenCodeTab);
+ if (code === 16) {
+ bitsLength = 2; bitsOffset = 3; what = len;
+ } else if (code === 17) {
+ bitsLength = 3; bitsOffset = 3; what = (len = 0);
+ } else if (code === 18) {
+ bitsLength = 7; bitsOffset = 11; what = (len = 0);
+ } else {
+ codeLengths[i++] = len = code;
+ continue;
+ }
+
+ var repeatLength = this.getBits(bitsLength) + bitsOffset;
+ while (repeatLength-- > 0) {
+ codeLengths[i++] = what;
+ }
+ }
+
+ litCodeTable =
+ this.generateHuffmanTable(codeLengths.subarray(0, numLitCodes));
+ distCodeTable =
+ this.generateHuffmanTable(codeLengths.subarray(numLitCodes, codes));
+ } else {
+ error('Unknown block type in flate stream');
+ }
+
+ buffer = this.buffer;
+ var limit = buffer ? buffer.length : 0;
+ var pos = this.bufferLength;
+ while (true) {
+ var code1 = this.getCode(litCodeTable);
+ if (code1 < 256) {
+ if (pos + 1 >= limit) {
+ buffer = this.ensureBuffer(pos + 1);
+ limit = buffer.length;
+ }
+ buffer[pos++] = code1;
+ continue;
+ }
+ if (code1 === 256) {
+ this.bufferLength = pos;
+ return;
+ }
+ code1 -= 257;
+ code1 = lengthDecode[code1];
+ var code2 = code1 >> 16;
+ if (code2 > 0) {
+ code2 = this.getBits(code2);
+ }
+ len = (code1 & 0xffff) + code2;
+ code1 = this.getCode(distCodeTable);
+ code1 = distDecode[code1];
+ code2 = code1 >> 16;
+ if (code2 > 0) {
+ code2 = this.getBits(code2);
+ }
+ var dist = (code1 & 0xffff) + code2;
+ if (pos + len >= limit) {
+ buffer = this.ensureBuffer(pos + len);
+ limit = buffer.length;
+ }
+ for (var k = 0; k < len; ++k, ++pos) {
+ buffer[pos] = buffer[pos - dist];
+ }
+ }
+ };
+
+ return FlateStream;
+})();
+
+var PredictorStream = (function PredictorStreamClosure() {
+ function PredictorStream(str, maybeLength, params) {
+ var predictor = this.predictor = params.get('Predictor') || 1;
+
+ if (predictor <= 1) {
+ return str; // no prediction
+ }
+ if (predictor !== 2 && (predictor < 10 || predictor > 15)) {
+ error('Unsupported predictor: ' + predictor);
+ }
+
+ if (predictor === 2) {
+ this.readBlock = this.readBlockTiff;
+ } else {
+ this.readBlock = this.readBlockPng;
+ }
+
+ this.str = str;
+ this.dict = str.dict;
+
+ var colors = this.colors = params.get('Colors') || 1;
+ var bits = this.bits = params.get('BitsPerComponent') || 8;
+ var columns = this.columns = params.get('Columns') || 1;
+
+ this.pixBytes = (colors * bits + 7) >> 3;
+ this.rowBytes = (columns * colors * bits + 7) >> 3;
+
+ DecodeStream.call(this, maybeLength);
+ return this;
+ }
+
+ PredictorStream.prototype = Object.create(DecodeStream.prototype);
+
+ PredictorStream.prototype.readBlockTiff =
+ function predictorStreamReadBlockTiff() {
+ var rowBytes = this.rowBytes;
+
+ var bufferLength = this.bufferLength;
+ var buffer = this.ensureBuffer(bufferLength + rowBytes);
+
+ var bits = this.bits;
+ var colors = this.colors;
+
+ var rawBytes = this.str.getBytes(rowBytes);
+ this.eof = !rawBytes.length;
+ if (this.eof) {
+ return;
+ }
+
+ var inbuf = 0, outbuf = 0;
+ var inbits = 0, outbits = 0;
+ var pos = bufferLength;
+ var i;
+
+ if (bits === 1) {
+ for (i = 0; i < rowBytes; ++i) {
+ var c = rawBytes[i];
+ inbuf = (inbuf << 8) | c;
+ // bitwise addition is exclusive or
+ // first shift inbuf and then add
+ buffer[pos++] = (c ^ (inbuf >> colors)) & 0xFF;
+ // truncate inbuf (assumes colors < 16)
+ inbuf &= 0xFFFF;
+ }
+ } else if (bits === 8) {
+ for (i = 0; i < colors; ++i) {
+ buffer[pos++] = rawBytes[i];
+ }
+ for (; i < rowBytes; ++i) {
+ buffer[pos] = buffer[pos - colors] + rawBytes[i];
+ pos++;
+ }
+ } else {
+ var compArray = new Uint8Array(colors + 1);
+ var bitMask = (1 << bits) - 1;
+ var j = 0, k = bufferLength;
+ var columns = this.columns;
+ for (i = 0; i < columns; ++i) {
+ for (var kk = 0; kk < colors; ++kk) {
+ if (inbits < bits) {
+ inbuf = (inbuf << 8) | (rawBytes[j++] & 0xFF);
+ inbits += 8;
+ }
+ compArray[kk] = (compArray[kk] +
+ (inbuf >> (inbits - bits))) & bitMask;
+ inbits -= bits;
+ outbuf = (outbuf << bits) | compArray[kk];
+ outbits += bits;
+ if (outbits >= 8) {
+ buffer[k++] = (outbuf >> (outbits - 8)) & 0xFF;
+ outbits -= 8;
+ }
+ }
+ }
+ if (outbits > 0) {
+ buffer[k++] = (outbuf << (8 - outbits)) +
+ (inbuf & ((1 << (8 - outbits)) - 1));
+ }
+ }
+ this.bufferLength += rowBytes;
+ };
+
+ PredictorStream.prototype.readBlockPng =
+ function predictorStreamReadBlockPng() {
+
+ var rowBytes = this.rowBytes;
+ var pixBytes = this.pixBytes;
+
+ var predictor = this.str.getByte();
+ var rawBytes = this.str.getBytes(rowBytes);
+ this.eof = !rawBytes.length;
+ if (this.eof) {
+ return;
+ }
+
+ var bufferLength = this.bufferLength;
+ var buffer = this.ensureBuffer(bufferLength + rowBytes);
+
+ var prevRow = buffer.subarray(bufferLength - rowBytes, bufferLength);
+ if (prevRow.length === 0) {
+ prevRow = new Uint8Array(rowBytes);
+ }
+
+ var i, j = bufferLength, up, c;
+ switch (predictor) {
+ case 0:
+ for (i = 0; i < rowBytes; ++i) {
+ buffer[j++] = rawBytes[i];
+ }
+ break;
+ case 1:
+ for (i = 0; i < pixBytes; ++i) {
+ buffer[j++] = rawBytes[i];
+ }
+ for (; i < rowBytes; ++i) {
+ buffer[j] = (buffer[j - pixBytes] + rawBytes[i]) & 0xFF;
+ j++;
+ }
+ break;
+ case 2:
+ for (i = 0; i < rowBytes; ++i) {
+ buffer[j++] = (prevRow[i] + rawBytes[i]) & 0xFF;
+ }
+ break;
+ case 3:
+ for (i = 0; i < pixBytes; ++i) {
+ buffer[j++] = (prevRow[i] >> 1) + rawBytes[i];
+ }
+ for (; i < rowBytes; ++i) {
+ buffer[j] = (((prevRow[i] + buffer[j - pixBytes]) >> 1) +
+ rawBytes[i]) & 0xFF;
+ j++;
+ }
+ break;
+ case 4:
+ // we need to save the up left pixels values. the simplest way
+ // is to create a new buffer
+ for (i = 0; i < pixBytes; ++i) {
+ up = prevRow[i];
+ c = rawBytes[i];
+ buffer[j++] = up + c;
+ }
+ for (; i < rowBytes; ++i) {
+ up = prevRow[i];
+ var upLeft = prevRow[i - pixBytes];
+ var left = buffer[j - pixBytes];
+ var p = left + up - upLeft;
+
+ var pa = p - left;
+ if (pa < 0) {
+ pa = -pa;
+ }
+ var pb = p - up;
+ if (pb < 0) {
+ pb = -pb;
+ }
+ var pc = p - upLeft;
+ if (pc < 0) {
+ pc = -pc;
+ }
+
+ c = rawBytes[i];
+ if (pa <= pb && pa <= pc) {
+ buffer[j++] = left + c;
+ } else if (pb <= pc) {
+ buffer[j++] = up + c;
+ } else {
+ buffer[j++] = upLeft + c;
+ }
+ }
+ break;
+ default:
+ error('Unsupported predictor: ' + predictor);
+ }
+ this.bufferLength += rowBytes;
+ };
+
+ return PredictorStream;
+})();
+
+/**
+ * Depending on the type of JPEG a JpegStream is handled in different ways. For
+ * JPEG's that are supported natively such as DeviceGray and DeviceRGB the image
+ * data is stored and then loaded by the browser. For unsupported JPEG's we use
+ * a library to decode these images and the stream behaves like all the other
+ * DecodeStreams.
+ */
+var JpegStream = (function JpegStreamClosure() {
+ function JpegStream(stream, maybeLength, dict, xref) {
+ // Some images may contain 'junk' before the SOI (start-of-image) marker.
+ // Note: this seems to mainly affect inline images.
+ var ch;
+ while ((ch = stream.getByte()) !== -1) {
+ if (ch === 0xFF) { // Find the first byte of the SOI marker (0xFFD8).
+ stream.skip(-1); // Reset the stream position to the SOI.
+ break;
+ }
+ }
+ this.stream = stream;
+ this.maybeLength = maybeLength;
+ this.dict = dict;
+
+ DecodeStream.call(this, maybeLength);
+ }
+
+ JpegStream.prototype = Object.create(DecodeStream.prototype);
+
+ Object.defineProperty(JpegStream.prototype, 'bytes', {
+ get: function JpegStream_bytes() {
+ // If this.maybeLength is null, we'll get the entire stream.
+ return shadow(this, 'bytes', this.stream.getBytes(this.maybeLength));
+ },
+ configurable: true
+ });
+
+ JpegStream.prototype.ensureBuffer = function JpegStream_ensureBuffer(req) {
+ if (this.bufferLength) {
+ return;
+ }
+ try {
+ var jpegImage = new JpegImage();
+
+ // checking if values needs to be transformed before conversion
+ if (this.forceRGB && this.dict && isArray(this.dict.get('Decode'))) {
+ var decodeArr = this.dict.get('Decode');
+ var bitsPerComponent = this.dict.get('BitsPerComponent') || 8;
+ var decodeArrLength = decodeArr.length;
+ var transform = new Int32Array(decodeArrLength);
+ var transformNeeded = false;
+ var maxValue = (1 << bitsPerComponent) - 1;
+ for (var i = 0; i < decodeArrLength; i += 2) {
+ transform[i] = ((decodeArr[i + 1] - decodeArr[i]) * 256) | 0;
+ transform[i + 1] = (decodeArr[i] * maxValue) | 0;
+ if (transform[i] !== 256 || transform[i + 1] !== 0) {
+ transformNeeded = true;
+ }
+ }
+ if (transformNeeded) {
+ jpegImage.decodeTransform = transform;
+ }
+ }
+
+ jpegImage.parse(this.bytes);
+ var data = jpegImage.getData(this.drawWidth, this.drawHeight,
+ this.forceRGB);
+ this.buffer = data;
+ this.bufferLength = data.length;
+ this.eof = true;
+ } catch (e) {
+ error('JPEG error: ' + e);
+ }
+ };
+
+ JpegStream.prototype.getBytes = function JpegStream_getBytes(length) {
+ this.ensureBuffer();
+ return this.buffer;
+ };
+
+ JpegStream.prototype.getIR = function JpegStream_getIR() {
+ return PDFJS.createObjectURL(this.bytes, 'image/jpeg');
+ };
+ /**
+ * Checks if the image can be decoded and displayed by the browser without any
+ * further processing such as color space conversions.
+ */
+ JpegStream.prototype.isNativelySupported =
+ function JpegStream_isNativelySupported(xref, res) {
+ var cs = ColorSpace.parse(this.dict.get('ColorSpace', 'CS'), xref, res);
+ return cs.name === 'DeviceGray' || cs.name === 'DeviceRGB';
+ };
+ /**
+ * Checks if the image can be decoded by the browser.
+ */
+ JpegStream.prototype.isNativelyDecodable =
+ function JpegStream_isNativelyDecodable(xref, res) {
+ var cs = ColorSpace.parse(this.dict.get('ColorSpace', 'CS'), xref, res);
+ var numComps = cs.numComps;
+ return numComps === 1 || numComps === 3;
+ };
+
+ return JpegStream;
+})();
+
+/**
+ * For JPEG 2000's we use a library to decode these images and
+ * the stream behaves like all the other DecodeStreams.
+ */
+var JpxStream = (function JpxStreamClosure() {
+ function JpxStream(stream, maybeLength, dict) {
+ this.stream = stream;
+ this.maybeLength = maybeLength;
+ this.dict = dict;
+
+ DecodeStream.call(this, maybeLength);
+ }
+
+ JpxStream.prototype = Object.create(DecodeStream.prototype);
+
+ Object.defineProperty(JpxStream.prototype, 'bytes', {
+ get: function JpxStream_bytes() {
+ // If this.maybeLength is null, we'll get the entire stream.
+ return shadow(this, 'bytes', this.stream.getBytes(this.maybeLength));
+ },
+ configurable: true
+ });
+
+ JpxStream.prototype.ensureBuffer = function JpxStream_ensureBuffer(req) {
+ if (this.bufferLength) {
+ return;
+ }
+
+ var jpxImage = new JpxImage();
+ jpxImage.parse(this.bytes);
+
+ var width = jpxImage.width;
+ var height = jpxImage.height;
+ var componentsCount = jpxImage.componentsCount;
+ var tileCount = jpxImage.tiles.length;
+ if (tileCount === 1) {
+ this.buffer = jpxImage.tiles[0].items;
+ } else {
+ var data = new Uint8Array(width * height * componentsCount);
+
+ for (var k = 0; k < tileCount; k++) {
+ var tileComponents = jpxImage.tiles[k];
+ var tileWidth = tileComponents.width;
+ var tileHeight = tileComponents.height;
+ var tileLeft = tileComponents.left;
+ var tileTop = tileComponents.top;
+
+ var src = tileComponents.items;
+ var srcPosition = 0;
+ var dataPosition = (width * tileTop + tileLeft) * componentsCount;
+ var imgRowSize = width * componentsCount;
+ var tileRowSize = tileWidth * componentsCount;
+
+ for (var j = 0; j < tileHeight; j++) {
+ var rowBytes = src.subarray(srcPosition, srcPosition + tileRowSize);
+ data.set(rowBytes, dataPosition);
+ srcPosition += tileRowSize;
+ dataPosition += imgRowSize;
+ }
+ }
+ this.buffer = data;
+ }
+ this.bufferLength = this.buffer.length;
+ this.eof = true;
+ };
+
+ return JpxStream;
+})();
+
+/**
+ * For JBIG2's we use a library to decode these images and
+ * the stream behaves like all the other DecodeStreams.
+ */
+var Jbig2Stream = (function Jbig2StreamClosure() {
+ function Jbig2Stream(stream, maybeLength, dict) {
+ this.stream = stream;
+ this.maybeLength = maybeLength;
+ this.dict = dict;
+
+ DecodeStream.call(this, maybeLength);
+ }
+
+ Jbig2Stream.prototype = Object.create(DecodeStream.prototype);
+
+ Object.defineProperty(Jbig2Stream.prototype, 'bytes', {
+ get: function Jbig2Stream_bytes() {
+ // If this.maybeLength is null, we'll get the entire stream.
+ return shadow(this, 'bytes', this.stream.getBytes(this.maybeLength));
+ },
+ configurable: true
+ });
+
+ Jbig2Stream.prototype.ensureBuffer = function Jbig2Stream_ensureBuffer(req) {
+ if (this.bufferLength) {
+ return;
+ }
+
+ var jbig2Image = new Jbig2Image();
+
+ var chunks = [], xref = this.dict.xref;
+ var decodeParams = xref.fetchIfRef(this.dict.get('DecodeParms'));
+
+ // According to the PDF specification, DecodeParms can be either
+ // a dictionary, or an array whose elements are dictionaries.
+ if (isArray(decodeParams)) {
+ if (decodeParams.length > 1) {
+ warn('JBIG2 - \'DecodeParms\' array with multiple elements ' +
+ 'not supported.');
+ }
+ decodeParams = xref.fetchIfRef(decodeParams[0]);
+ }
+ if (decodeParams && decodeParams.has('JBIG2Globals')) {
+ var globalsStream = decodeParams.get('JBIG2Globals');
+ var globals = globalsStream.getBytes();
+ chunks.push({data: globals, start: 0, end: globals.length});
+ }
+ chunks.push({data: this.bytes, start: 0, end: this.bytes.length});
+ var data = jbig2Image.parseChunks(chunks);
+ var dataLength = data.length;
+
+ // JBIG2 had black as 1 and white as 0, inverting the colors
+ for (var i = 0; i < dataLength; i++) {
+ data[i] ^= 0xFF;
+ }
+
+ this.buffer = data;
+ this.bufferLength = dataLength;
+ this.eof = true;
+ };
+
+ return Jbig2Stream;
+})();
+
+var DecryptStream = (function DecryptStreamClosure() {
+ function DecryptStream(str, maybeLength, decrypt) {
+ this.str = str;
+ this.dict = str.dict;
+ this.decrypt = decrypt;
+ this.nextChunk = null;
+ this.initialized = false;
+
+ DecodeStream.call(this, maybeLength);
+ }
+
+ var chunkSize = 512;
+
+ DecryptStream.prototype = Object.create(DecodeStream.prototype);
+
+ DecryptStream.prototype.readBlock = function DecryptStream_readBlock() {
+ var chunk;
+ if (this.initialized) {
+ chunk = this.nextChunk;
+ } else {
+ chunk = this.str.getBytes(chunkSize);
+ this.initialized = true;
+ }
+ if (!chunk || chunk.length === 0) {
+ this.eof = true;
+ return;
+ }
+ this.nextChunk = this.str.getBytes(chunkSize);
+ var hasMoreData = this.nextChunk && this.nextChunk.length > 0;
+
+ var decrypt = this.decrypt;
+ chunk = decrypt(chunk, !hasMoreData);
+
+ var bufferLength = this.bufferLength;
+ var i, n = chunk.length;
+ var buffer = this.ensureBuffer(bufferLength + n);
+ for (i = 0; i < n; i++) {
+ buffer[bufferLength++] = chunk[i];
+ }
+ this.bufferLength = bufferLength;
+ };
+
+ return DecryptStream;
+})();
+
+var Ascii85Stream = (function Ascii85StreamClosure() {
+ function Ascii85Stream(str, maybeLength) {
+ this.str = str;
+ this.dict = str.dict;
+ this.input = new Uint8Array(5);
+
+ // Most streams increase in size when decoded, but Ascii85 streams
+ // typically shrink by ~20%.
+ if (maybeLength) {
+ maybeLength = 0.8 * maybeLength;
+ }
+ DecodeStream.call(this, maybeLength);
+ }
+
+ Ascii85Stream.prototype = Object.create(DecodeStream.prototype);
+
+ Ascii85Stream.prototype.readBlock = function Ascii85Stream_readBlock() {
+ var TILDA_CHAR = 0x7E; // '~'
+ var Z_LOWER_CHAR = 0x7A; // 'z'
+ var EOF = -1;
+
+ var str = this.str;
+
+ var c = str.getByte();
+ while (Lexer.isSpace(c)) {
+ c = str.getByte();
+ }
+
+ if (c === EOF || c === TILDA_CHAR) {
+ this.eof = true;
+ return;
+ }
+
+ var bufferLength = this.bufferLength, buffer;
+ var i;
+
+ // special code for z
+ if (c === Z_LOWER_CHAR) {
+ buffer = this.ensureBuffer(bufferLength + 4);
+ for (i = 0; i < 4; ++i) {
+ buffer[bufferLength + i] = 0;
+ }
+ this.bufferLength += 4;
+ } else {
+ var input = this.input;
+ input[0] = c;
+ for (i = 1; i < 5; ++i) {
+ c = str.getByte();
+ while (Lexer.isSpace(c)) {
+ c = str.getByte();
+ }
+
+ input[i] = c;
+
+ if (c === EOF || c === TILDA_CHAR) {
+ break;
+ }
+ }
+ buffer = this.ensureBuffer(bufferLength + i - 1);
+ this.bufferLength += i - 1;
+
+ // partial ending;
+ if (i < 5) {
+ for (; i < 5; ++i) {
+ input[i] = 0x21 + 84;
+ }
+ this.eof = true;
+ }
+ var t = 0;
+ for (i = 0; i < 5; ++i) {
+ t = t * 85 + (input[i] - 0x21);
+ }
+
+ for (i = 3; i >= 0; --i) {
+ buffer[bufferLength + i] = t & 0xFF;
+ t >>= 8;
+ }
+ }
+ };
+
+ return Ascii85Stream;
+})();
+
+var AsciiHexStream = (function AsciiHexStreamClosure() {
+ function AsciiHexStream(str, maybeLength) {
+ this.str = str;
+ this.dict = str.dict;
+
+ this.firstDigit = -1;
+
+ // Most streams increase in size when decoded, but AsciiHex streams shrink
+ // by 50%.
+ if (maybeLength) {
+ maybeLength = 0.5 * maybeLength;
+ }
+ DecodeStream.call(this, maybeLength);
+ }
+
+ AsciiHexStream.prototype = Object.create(DecodeStream.prototype);
+
+ AsciiHexStream.prototype.readBlock = function AsciiHexStream_readBlock() {
+ var UPSTREAM_BLOCK_SIZE = 8000;
+ var bytes = this.str.getBytes(UPSTREAM_BLOCK_SIZE);
+ if (!bytes.length) {
+ this.eof = true;
+ return;
+ }
+
+ var maxDecodeLength = (bytes.length + 1) >> 1;
+ var buffer = this.ensureBuffer(this.bufferLength + maxDecodeLength);
+ var bufferLength = this.bufferLength;
+
+ var firstDigit = this.firstDigit;
+ for (var i = 0, ii = bytes.length; i < ii; i++) {
+ var ch = bytes[i], digit;
+ if (ch >= 0x30 && ch <= 0x39) { // '0'-'9'
+ digit = ch & 0x0F;
+ } else if ((ch >= 0x41 && ch <= 0x46) || (ch >= 0x61 && ch <= 0x66)) {
+ // 'A'-'Z', 'a'-'z'
+ digit = (ch & 0x0F) + 9;
+ } else if (ch === 0x3E) { // '>'
+ this.eof = true;
+ break;
+ } else { // probably whitespace
+ continue; // ignoring
+ }
+ if (firstDigit < 0) {
+ firstDigit = digit;
+ } else {
+ buffer[bufferLength++] = (firstDigit << 4) | digit;
+ firstDigit = -1;
+ }
+ }
+ if (firstDigit >= 0 && this.eof) {
+ // incomplete byte
+ buffer[bufferLength++] = (firstDigit << 4);
+ firstDigit = -1;
+ }
+ this.firstDigit = firstDigit;
+ this.bufferLength = bufferLength;
+ };
+
+ return AsciiHexStream;
+})();
+
+var RunLengthStream = (function RunLengthStreamClosure() {
+ function RunLengthStream(str, maybeLength) {
+ this.str = str;
+ this.dict = str.dict;
+
+ DecodeStream.call(this, maybeLength);
+ }
+
+ RunLengthStream.prototype = Object.create(DecodeStream.prototype);
+
+ RunLengthStream.prototype.readBlock = function RunLengthStream_readBlock() {
+ // The repeatHeader has following format. The first byte defines type of run
+ // and amount of bytes to repeat/copy: n = 0 through 127 - copy next n bytes
+ // (in addition to the second byte from the header), n = 129 through 255 -
+ // duplicate the second byte from the header (257 - n) times, n = 128 - end.
+ var repeatHeader = this.str.getBytes(2);
+ if (!repeatHeader || repeatHeader.length < 2 || repeatHeader[0] === 128) {
+ this.eof = true;
+ return;
+ }
+
+ var buffer;
+ var bufferLength = this.bufferLength;
+ var n = repeatHeader[0];
+ if (n < 128) {
+ // copy n bytes
+ buffer = this.ensureBuffer(bufferLength + n + 1);
+ buffer[bufferLength++] = repeatHeader[1];
+ if (n > 0) {
+ var source = this.str.getBytes(n);
+ buffer.set(source, bufferLength);
+ bufferLength += n;
+ }
+ } else {
+ n = 257 - n;
+ var b = repeatHeader[1];
+ buffer = this.ensureBuffer(bufferLength + n + 1);
+ for (var i = 0; i < n; i++) {
+ buffer[bufferLength++] = b;
+ }
+ }
+ this.bufferLength = bufferLength;
+ };
+
+ return RunLengthStream;
+})();
+
+var CCITTFaxStream = (function CCITTFaxStreamClosure() {
+
+ var ccittEOL = -2;
+ var twoDimPass = 0;
+ var twoDimHoriz = 1;
+ var twoDimVert0 = 2;
+ var twoDimVertR1 = 3;
+ var twoDimVertL1 = 4;
+ var twoDimVertR2 = 5;
+ var twoDimVertL2 = 6;
+ var twoDimVertR3 = 7;
+ var twoDimVertL3 = 8;
+
+ var twoDimTable = [
+ [-1, -1], [-1, -1], // 000000x
+ [7, twoDimVertL3], // 0000010
+ [7, twoDimVertR3], // 0000011
+ [6, twoDimVertL2], [6, twoDimVertL2], // 000010x
+ [6, twoDimVertR2], [6, twoDimVertR2], // 000011x
+ [4, twoDimPass], [4, twoDimPass], // 0001xxx
+ [4, twoDimPass], [4, twoDimPass],
+ [4, twoDimPass], [4, twoDimPass],
+ [4, twoDimPass], [4, twoDimPass],
+ [3, twoDimHoriz], [3, twoDimHoriz], // 001xxxx
+ [3, twoDimHoriz], [3, twoDimHoriz],
+ [3, twoDimHoriz], [3, twoDimHoriz],
+ [3, twoDimHoriz], [3, twoDimHoriz],
+ [3, twoDimHoriz], [3, twoDimHoriz],
+ [3, twoDimHoriz], [3, twoDimHoriz],
+ [3, twoDimHoriz], [3, twoDimHoriz],
+ [3, twoDimHoriz], [3, twoDimHoriz],
+ [3, twoDimVertL1], [3, twoDimVertL1], // 010xxxx
+ [3, twoDimVertL1], [3, twoDimVertL1],
+ [3, twoDimVertL1], [3, twoDimVertL1],
+ [3, twoDimVertL1], [3, twoDimVertL1],
+ [3, twoDimVertL1], [3, twoDimVertL1],
+ [3, twoDimVertL1], [3, twoDimVertL1],
+ [3, twoDimVertL1], [3, twoDimVertL1],
+ [3, twoDimVertL1], [3, twoDimVertL1],
+ [3, twoDimVertR1], [3, twoDimVertR1], // 011xxxx
+ [3, twoDimVertR1], [3, twoDimVertR1],
+ [3, twoDimVertR1], [3, twoDimVertR1],
+ [3, twoDimVertR1], [3, twoDimVertR1],
+ [3, twoDimVertR1], [3, twoDimVertR1],
+ [3, twoDimVertR1], [3, twoDimVertR1],
+ [3, twoDimVertR1], [3, twoDimVertR1],
+ [3, twoDimVertR1], [3, twoDimVertR1],
+ [1, twoDimVert0], [1, twoDimVert0], // 1xxxxxx
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0],
+ [1, twoDimVert0], [1, twoDimVert0]
+ ];
+
+ var whiteTable1 = [
+ [-1, -1], // 00000
+ [12, ccittEOL], // 00001
+ [-1, -1], [-1, -1], // 0001x
+ [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 001xx
+ [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 010xx
+ [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 011xx
+ [11, 1792], [11, 1792], // 1000x
+ [12, 1984], // 10010
+ [12, 2048], // 10011
+ [12, 2112], // 10100
+ [12, 2176], // 10101
+ [12, 2240], // 10110
+ [12, 2304], // 10111
+ [11, 1856], [11, 1856], // 1100x
+ [11, 1920], [11, 1920], // 1101x
+ [12, 2368], // 11100
+ [12, 2432], // 11101
+ [12, 2496], // 11110
+ [12, 2560] // 11111
+ ];
+
+ var whiteTable2 = [
+ [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 0000000xx
+ [8, 29], [8, 29], // 00000010x
+ [8, 30], [8, 30], // 00000011x
+ [8, 45], [8, 45], // 00000100x
+ [8, 46], [8, 46], // 00000101x
+ [7, 22], [7, 22], [7, 22], [7, 22], // 0000011xx
+ [7, 23], [7, 23], [7, 23], [7, 23], // 0000100xx
+ [8, 47], [8, 47], // 00001010x
+ [8, 48], [8, 48], // 00001011x
+ [6, 13], [6, 13], [6, 13], [6, 13], // 000011xxx
+ [6, 13], [6, 13], [6, 13], [6, 13],
+ [7, 20], [7, 20], [7, 20], [7, 20], // 0001000xx
+ [8, 33], [8, 33], // 00010010x
+ [8, 34], [8, 34], // 00010011x
+ [8, 35], [8, 35], // 00010100x
+ [8, 36], [8, 36], // 00010101x
+ [8, 37], [8, 37], // 00010110x
+ [8, 38], [8, 38], // 00010111x
+ [7, 19], [7, 19], [7, 19], [7, 19], // 0001100xx
+ [8, 31], [8, 31], // 00011010x
+ [8, 32], [8, 32], // 00011011x
+ [6, 1], [6, 1], [6, 1], [6, 1], // 000111xxx
+ [6, 1], [6, 1], [6, 1], [6, 1],
+ [6, 12], [6, 12], [6, 12], [6, 12], // 001000xxx
+ [6, 12], [6, 12], [6, 12], [6, 12],
+ [8, 53], [8, 53], // 00100100x
+ [8, 54], [8, 54], // 00100101x
+ [7, 26], [7, 26], [7, 26], [7, 26], // 0010011xx
+ [8, 39], [8, 39], // 00101000x
+ [8, 40], [8, 40], // 00101001x
+ [8, 41], [8, 41], // 00101010x
+ [8, 42], [8, 42], // 00101011x
+ [8, 43], [8, 43], // 00101100x
+ [8, 44], [8, 44], // 00101101x
+ [7, 21], [7, 21], [7, 21], [7, 21], // 0010111xx
+ [7, 28], [7, 28], [7, 28], [7, 28], // 0011000xx
+ [8, 61], [8, 61], // 00110010x
+ [8, 62], [8, 62], // 00110011x
+ [8, 63], [8, 63], // 00110100x
+ [8, 0], [8, 0], // 00110101x
+ [8, 320], [8, 320], // 00110110x
+ [8, 384], [8, 384], // 00110111x
+ [5, 10], [5, 10], [5, 10], [5, 10], // 00111xxxx
+ [5, 10], [5, 10], [5, 10], [5, 10],
+ [5, 10], [5, 10], [5, 10], [5, 10],
+ [5, 10], [5, 10], [5, 10], [5, 10],
+ [5, 11], [5, 11], [5, 11], [5, 11], // 01000xxxx
+ [5, 11], [5, 11], [5, 11], [5, 11],
+ [5, 11], [5, 11], [5, 11], [5, 11],
+ [5, 11], [5, 11], [5, 11], [5, 11],
+ [7, 27], [7, 27], [7, 27], [7, 27], // 0100100xx
+ [8, 59], [8, 59], // 01001010x
+ [8, 60], [8, 60], // 01001011x
+ [9, 1472], // 010011000
+ [9, 1536], // 010011001
+ [9, 1600], // 010011010
+ [9, 1728], // 010011011
+ [7, 18], [7, 18], [7, 18], [7, 18], // 0100111xx
+ [7, 24], [7, 24], [7, 24], [7, 24], // 0101000xx
+ [8, 49], [8, 49], // 01010010x
+ [8, 50], [8, 50], // 01010011x
+ [8, 51], [8, 51], // 01010100x
+ [8, 52], [8, 52], // 01010101x
+ [7, 25], [7, 25], [7, 25], [7, 25], // 0101011xx
+ [8, 55], [8, 55], // 01011000x
+ [8, 56], [8, 56], // 01011001x
+ [8, 57], [8, 57], // 01011010x
+ [8, 58], [8, 58], // 01011011x
+ [6, 192], [6, 192], [6, 192], [6, 192], // 010111xxx
+ [6, 192], [6, 192], [6, 192], [6, 192],
+ [6, 1664], [6, 1664], [6, 1664], [6, 1664], // 011000xxx
+ [6, 1664], [6, 1664], [6, 1664], [6, 1664],
+ [8, 448], [8, 448], // 01100100x
+ [8, 512], [8, 512], // 01100101x
+ [9, 704], // 011001100
+ [9, 768], // 011001101
+ [8, 640], [8, 640], // 01100111x
+ [8, 576], [8, 576], // 01101000x
+ [9, 832], // 011010010
+ [9, 896], // 011010011
+ [9, 960], // 011010100
+ [9, 1024], // 011010101
+ [9, 1088], // 011010110
+ [9, 1152], // 011010111
+ [9, 1216], // 011011000
+ [9, 1280], // 011011001
+ [9, 1344], // 011011010
+ [9, 1408], // 011011011
+ [7, 256], [7, 256], [7, 256], [7, 256], // 0110111xx
+ [4, 2], [4, 2], [4, 2], [4, 2], // 0111xxxxx
+ [4, 2], [4, 2], [4, 2], [4, 2],
+ [4, 2], [4, 2], [4, 2], [4, 2],
+ [4, 2], [4, 2], [4, 2], [4, 2],
+ [4, 2], [4, 2], [4, 2], [4, 2],
+ [4, 2], [4, 2], [4, 2], [4, 2],
+ [4, 2], [4, 2], [4, 2], [4, 2],
+ [4, 2], [4, 2], [4, 2], [4, 2],
+ [4, 3], [4, 3], [4, 3], [4, 3], // 1000xxxxx
+ [4, 3], [4, 3], [4, 3], [4, 3],
+ [4, 3], [4, 3], [4, 3], [4, 3],
+ [4, 3], [4, 3], [4, 3], [4, 3],
+ [4, 3], [4, 3], [4, 3], [4, 3],
+ [4, 3], [4, 3], [4, 3], [4, 3],
+ [4, 3], [4, 3], [4, 3], [4, 3],
+ [4, 3], [4, 3], [4, 3], [4, 3],
+ [5, 128], [5, 128], [5, 128], [5, 128], // 10010xxxx
+ [5, 128], [5, 128], [5, 128], [5, 128],
+ [5, 128], [5, 128], [5, 128], [5, 128],
+ [5, 128], [5, 128], [5, 128], [5, 128],
+ [5, 8], [5, 8], [5, 8], [5, 8], // 10011xxxx
+ [5, 8], [5, 8], [5, 8], [5, 8],
+ [5, 8], [5, 8], [5, 8], [5, 8],
+ [5, 8], [5, 8], [5, 8], [5, 8],
+ [5, 9], [5, 9], [5, 9], [5, 9], // 10100xxxx
+ [5, 9], [5, 9], [5, 9], [5, 9],
+ [5, 9], [5, 9], [5, 9], [5, 9],
+ [5, 9], [5, 9], [5, 9], [5, 9],
+ [6, 16], [6, 16], [6, 16], [6, 16], // 101010xxx
+ [6, 16], [6, 16], [6, 16], [6, 16],
+ [6, 17], [6, 17], [6, 17], [6, 17], // 101011xxx
+ [6, 17], [6, 17], [6, 17], [6, 17],
+ [4, 4], [4, 4], [4, 4], [4, 4], // 1011xxxxx
+ [4, 4], [4, 4], [4, 4], [4, 4],
+ [4, 4], [4, 4], [4, 4], [4, 4],
+ [4, 4], [4, 4], [4, 4], [4, 4],
+ [4, 4], [4, 4], [4, 4], [4, 4],
+ [4, 4], [4, 4], [4, 4], [4, 4],
+ [4, 4], [4, 4], [4, 4], [4, 4],
+ [4, 4], [4, 4], [4, 4], [4, 4],
+ [4, 5], [4, 5], [4, 5], [4, 5], // 1100xxxxx
+ [4, 5], [4, 5], [4, 5], [4, 5],
+ [4, 5], [4, 5], [4, 5], [4, 5],
+ [4, 5], [4, 5], [4, 5], [4, 5],
+ [4, 5], [4, 5], [4, 5], [4, 5],
+ [4, 5], [4, 5], [4, 5], [4, 5],
+ [4, 5], [4, 5], [4, 5], [4, 5],
+ [4, 5], [4, 5], [4, 5], [4, 5],
+ [6, 14], [6, 14], [6, 14], [6, 14], // 110100xxx
+ [6, 14], [6, 14], [6, 14], [6, 14],
+ [6, 15], [6, 15], [6, 15], [6, 15], // 110101xxx
+ [6, 15], [6, 15], [6, 15], [6, 15],
+ [5, 64], [5, 64], [5, 64], [5, 64], // 11011xxxx
+ [5, 64], [5, 64], [5, 64], [5, 64],
+ [5, 64], [5, 64], [5, 64], [5, 64],
+ [5, 64], [5, 64], [5, 64], [5, 64],
+ [4, 6], [4, 6], [4, 6], [4, 6], // 1110xxxxx
+ [4, 6], [4, 6], [4, 6], [4, 6],
+ [4, 6], [4, 6], [4, 6], [4, 6],
+ [4, 6], [4, 6], [4, 6], [4, 6],
+ [4, 6], [4, 6], [4, 6], [4, 6],
+ [4, 6], [4, 6], [4, 6], [4, 6],
+ [4, 6], [4, 6], [4, 6], [4, 6],
+ [4, 6], [4, 6], [4, 6], [4, 6],
+ [4, 7], [4, 7], [4, 7], [4, 7], // 1111xxxxx
+ [4, 7], [4, 7], [4, 7], [4, 7],
+ [4, 7], [4, 7], [4, 7], [4, 7],
+ [4, 7], [4, 7], [4, 7], [4, 7],
+ [4, 7], [4, 7], [4, 7], [4, 7],
+ [4, 7], [4, 7], [4, 7], [4, 7],
+ [4, 7], [4, 7], [4, 7], [4, 7],
+ [4, 7], [4, 7], [4, 7], [4, 7]
+ ];
+
+ var blackTable1 = [
+ [-1, -1], [-1, -1], // 000000000000x
+ [12, ccittEOL], [12, ccittEOL], // 000000000001x
+ [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 00000000001xx
+ [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 00000000010xx
+ [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 00000000011xx
+ [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 00000000100xx
+ [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 00000000101xx
+ [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 00000000110xx
+ [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 00000000111xx
+ [11, 1792], [11, 1792], [11, 1792], [11, 1792], // 00000001000xx
+ [12, 1984], [12, 1984], // 000000010010x
+ [12, 2048], [12, 2048], // 000000010011x
+ [12, 2112], [12, 2112], // 000000010100x
+ [12, 2176], [12, 2176], // 000000010101x
+ [12, 2240], [12, 2240], // 000000010110x
+ [12, 2304], [12, 2304], // 000000010111x
+ [11, 1856], [11, 1856], [11, 1856], [11, 1856], // 00000001100xx
+ [11, 1920], [11, 1920], [11, 1920], [11, 1920], // 00000001101xx
+ [12, 2368], [12, 2368], // 000000011100x
+ [12, 2432], [12, 2432], // 000000011101x
+ [12, 2496], [12, 2496], // 000000011110x
+ [12, 2560], [12, 2560], // 000000011111x
+ [10, 18], [10, 18], [10, 18], [10, 18], // 0000001000xxx
+ [10, 18], [10, 18], [10, 18], [10, 18],
+ [12, 52], [12, 52], // 000000100100x
+ [13, 640], // 0000001001010
+ [13, 704], // 0000001001011
+ [13, 768], // 0000001001100
+ [13, 832], // 0000001001101
+ [12, 55], [12, 55], // 000000100111x
+ [12, 56], [12, 56], // 000000101000x
+ [13, 1280], // 0000001010010
+ [13, 1344], // 0000001010011
+ [13, 1408], // 0000001010100
+ [13, 1472], // 0000001010101
+ [12, 59], [12, 59], // 000000101011x
+ [12, 60], [12, 60], // 000000101100x
+ [13, 1536], // 0000001011010
+ [13, 1600], // 0000001011011
+ [11, 24], [11, 24], [11, 24], [11, 24], // 00000010111xx
+ [11, 25], [11, 25], [11, 25], [11, 25], // 00000011000xx
+ [13, 1664], // 0000001100100
+ [13, 1728], // 0000001100101
+ [12, 320], [12, 320], // 000000110011x
+ [12, 384], [12, 384], // 000000110100x
+ [12, 448], [12, 448], // 000000110101x
+ [13, 512], // 0000001101100
+ [13, 576], // 0000001101101
+ [12, 53], [12, 53], // 000000110111x
+ [12, 54], [12, 54], // 000000111000x
+ [13, 896], // 0000001110010
+ [13, 960], // 0000001110011
+ [13, 1024], // 0000001110100
+ [13, 1088], // 0000001110101
+ [13, 1152], // 0000001110110
+ [13, 1216], // 0000001110111
+ [10, 64], [10, 64], [10, 64], [10, 64], // 0000001111xxx
+ [10, 64], [10, 64], [10, 64], [10, 64]
+ ];
+
+ var blackTable2 = [
+ [8, 13], [8, 13], [8, 13], [8, 13], // 00000100xxxx
+ [8, 13], [8, 13], [8, 13], [8, 13],
+ [8, 13], [8, 13], [8, 13], [8, 13],
+ [8, 13], [8, 13], [8, 13], [8, 13],
+ [11, 23], [11, 23], // 00000101000x
+ [12, 50], // 000001010010
+ [12, 51], // 000001010011
+ [12, 44], // 000001010100
+ [12, 45], // 000001010101
+ [12, 46], // 000001010110
+ [12, 47], // 000001010111
+ [12, 57], // 000001011000
+ [12, 58], // 000001011001
+ [12, 61], // 000001011010
+ [12, 256], // 000001011011
+ [10, 16], [10, 16], [10, 16], [10, 16], // 0000010111xx
+ [10, 17], [10, 17], [10, 17], [10, 17], // 0000011000xx
+ [12, 48], // 000001100100
+ [12, 49], // 000001100101
+ [12, 62], // 000001100110
+ [12, 63], // 000001100111
+ [12, 30], // 000001101000
+ [12, 31], // 000001101001
+ [12, 32], // 000001101010
+ [12, 33], // 000001101011
+ [12, 40], // 000001101100
+ [12, 41], // 000001101101
+ [11, 22], [11, 22], // 00000110111x
+ [8, 14], [8, 14], [8, 14], [8, 14], // 00000111xxxx
+ [8, 14], [8, 14], [8, 14], [8, 14],
+ [8, 14], [8, 14], [8, 14], [8, 14],
+ [8, 14], [8, 14], [8, 14], [8, 14],
+ [7, 10], [7, 10], [7, 10], [7, 10], // 0000100xxxxx
+ [7, 10], [7, 10], [7, 10], [7, 10],
+ [7, 10], [7, 10], [7, 10], [7, 10],
+ [7, 10], [7, 10], [7, 10], [7, 10],
+ [7, 10], [7, 10], [7, 10], [7, 10],
+ [7, 10], [7, 10], [7, 10], [7, 10],
+ [7, 10], [7, 10], [7, 10], [7, 10],
+ [7, 10], [7, 10], [7, 10], [7, 10],
+ [7, 11], [7, 11], [7, 11], [7, 11], // 0000101xxxxx
+ [7, 11], [7, 11], [7, 11], [7, 11],
+ [7, 11], [7, 11], [7, 11], [7, 11],
+ [7, 11], [7, 11], [7, 11], [7, 11],
+ [7, 11], [7, 11], [7, 11], [7, 11],
+ [7, 11], [7, 11], [7, 11], [7, 11],
+ [7, 11], [7, 11], [7, 11], [7, 11],
+ [7, 11], [7, 11], [7, 11], [7, 11],
+ [9, 15], [9, 15], [9, 15], [9, 15], // 000011000xxx
+ [9, 15], [9, 15], [9, 15], [9, 15],
+ [12, 128], // 000011001000
+ [12, 192], // 000011001001
+ [12, 26], // 000011001010
+ [12, 27], // 000011001011
+ [12, 28], // 000011001100
+ [12, 29], // 000011001101
+ [11, 19], [11, 19], // 00001100111x
+ [11, 20], [11, 20], // 00001101000x
+ [12, 34], // 000011010010
+ [12, 35], // 000011010011
+ [12, 36], // 000011010100
+ [12, 37], // 000011010101
+ [12, 38], // 000011010110
+ [12, 39], // 000011010111
+ [11, 21], [11, 21], // 00001101100x
+ [12, 42], // 000011011010
+ [12, 43], // 000011011011
+ [10, 0], [10, 0], [10, 0], [10, 0], // 0000110111xx
+ [7, 12], [7, 12], [7, 12], [7, 12], // 0000111xxxxx
+ [7, 12], [7, 12], [7, 12], [7, 12],
+ [7, 12], [7, 12], [7, 12], [7, 12],
+ [7, 12], [7, 12], [7, 12], [7, 12],
+ [7, 12], [7, 12], [7, 12], [7, 12],
+ [7, 12], [7, 12], [7, 12], [7, 12],
+ [7, 12], [7, 12], [7, 12], [7, 12],
+ [7, 12], [7, 12], [7, 12], [7, 12]
+ ];
+
+ var blackTable3 = [
+ [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 0000xx
+ [6, 9], // 000100
+ [6, 8], // 000101
+ [5, 7], [5, 7], // 00011x
+ [4, 6], [4, 6], [4, 6], [4, 6], // 0010xx
+ [4, 5], [4, 5], [4, 5], [4, 5], // 0011xx
+ [3, 1], [3, 1], [3, 1], [3, 1], // 010xxx
+ [3, 1], [3, 1], [3, 1], [3, 1],
+ [3, 4], [3, 4], [3, 4], [3, 4], // 011xxx
+ [3, 4], [3, 4], [3, 4], [3, 4],
+ [2, 3], [2, 3], [2, 3], [2, 3], // 10xxxx
+ [2, 3], [2, 3], [2, 3], [2, 3],
+ [2, 3], [2, 3], [2, 3], [2, 3],
+ [2, 3], [2, 3], [2, 3], [2, 3],
+ [2, 2], [2, 2], [2, 2], [2, 2], // 11xxxx
+ [2, 2], [2, 2], [2, 2], [2, 2],
+ [2, 2], [2, 2], [2, 2], [2, 2],
+ [2, 2], [2, 2], [2, 2], [2, 2]
+ ];
+
+ function CCITTFaxStream(str, maybeLength, params) {
+ this.str = str;
+ this.dict = str.dict;
+
+ params = params || Dict.empty;
+
+ this.encoding = params.get('K') || 0;
+ this.eoline = params.get('EndOfLine') || false;
+ this.byteAlign = params.get('EncodedByteAlign') || false;
+ this.columns = params.get('Columns') || 1728;
+ this.rows = params.get('Rows') || 0;
+ var eoblock = params.get('EndOfBlock');
+ if (eoblock === null || eoblock === undefined) {
+ eoblock = true;
+ }
+ this.eoblock = eoblock;
+ this.black = params.get('BlackIs1') || false;
+
+ this.codingLine = new Uint32Array(this.columns + 1);
+ this.refLine = new Uint32Array(this.columns + 2);
+
+ this.codingLine[0] = this.columns;
+ this.codingPos = 0;
+
+ this.row = 0;
+ this.nextLine2D = this.encoding < 0;
+ this.inputBits = 0;
+ this.inputBuf = 0;
+ this.outputBits = 0;
+
+ var code1;
+ while ((code1 = this.lookBits(12)) === 0) {
+ this.eatBits(1);
+ }
+ if (code1 === 1) {
+ this.eatBits(12);
+ }
+ if (this.encoding > 0) {
+ this.nextLine2D = !this.lookBits(1);
+ this.eatBits(1);
+ }
+
+ DecodeStream.call(this, maybeLength);
+ }
+
+ CCITTFaxStream.prototype = Object.create(DecodeStream.prototype);
+
+ CCITTFaxStream.prototype.readBlock = function CCITTFaxStream_readBlock() {
+ while (!this.eof) {
+ var c = this.lookChar();
+ this.ensureBuffer(this.bufferLength + 1);
+ this.buffer[this.bufferLength++] = c;
+ }
+ };
+
+ CCITTFaxStream.prototype.addPixels =
+ function ccittFaxStreamAddPixels(a1, blackPixels) {
+ var codingLine = this.codingLine;
+ var codingPos = this.codingPos;
+
+ if (a1 > codingLine[codingPos]) {
+ if (a1 > this.columns) {
+ info('row is wrong length');
+ this.err = true;
+ a1 = this.columns;
+ }
+ if ((codingPos & 1) ^ blackPixels) {
+ ++codingPos;
+ }
+
+ codingLine[codingPos] = a1;
+ }
+ this.codingPos = codingPos;
+ };
+
+ CCITTFaxStream.prototype.addPixelsNeg =
+ function ccittFaxStreamAddPixelsNeg(a1, blackPixels) {
+ var codingLine = this.codingLine;
+ var codingPos = this.codingPos;
+
+ if (a1 > codingLine[codingPos]) {
+ if (a1 > this.columns) {
+ info('row is wrong length');
+ this.err = true;
+ a1 = this.columns;
+ }
+ if ((codingPos & 1) ^ blackPixels) {
+ ++codingPos;
+ }
+
+ codingLine[codingPos] = a1;
+ } else if (a1 < codingLine[codingPos]) {
+ if (a1 < 0) {
+ info('invalid code');
+ this.err = true;
+ a1 = 0;
+ }
+ while (codingPos > 0 && a1 < codingLine[codingPos - 1]) {
+ --codingPos;
+ }
+ codingLine[codingPos] = a1;
+ }
+
+ this.codingPos = codingPos;
+ };
+
+ CCITTFaxStream.prototype.lookChar = function CCITTFaxStream_lookChar() {
+ var refLine = this.refLine;
+ var codingLine = this.codingLine;
+ var columns = this.columns;
+
+ var refPos, blackPixels, bits, i;
+
+ if (this.outputBits === 0) {
+ if (this.eof) {
+ return null;
+ }
+ this.err = false;
+
+ var code1, code2, code3;
+ if (this.nextLine2D) {
+ for (i = 0; codingLine[i] < columns; ++i) {
+ refLine[i] = codingLine[i];
+ }
+ refLine[i++] = columns;
+ refLine[i] = columns;
+ codingLine[0] = 0;
+ this.codingPos = 0;
+ refPos = 0;
+ blackPixels = 0;
+
+ while (codingLine[this.codingPos] < columns) {
+ code1 = this.getTwoDimCode();
+ switch (code1) {
+ case twoDimPass:
+ this.addPixels(refLine[refPos + 1], blackPixels);
+ if (refLine[refPos + 1] < columns) {
+ refPos += 2;
+ }
+ break;
+ case twoDimHoriz:
+ code1 = code2 = 0;
+ if (blackPixels) {
+ do {
+ code1 += (code3 = this.getBlackCode());
+ } while (code3 >= 64);
+ do {
+ code2 += (code3 = this.getWhiteCode());
+ } while (code3 >= 64);
+ } else {
+ do {
+ code1 += (code3 = this.getWhiteCode());
+ } while (code3 >= 64);
+ do {
+ code2 += (code3 = this.getBlackCode());
+ } while (code3 >= 64);
+ }
+ this.addPixels(codingLine[this.codingPos] +
+ code1, blackPixels);
+ if (codingLine[this.codingPos] < columns) {
+ this.addPixels(codingLine[this.codingPos] + code2,
+ blackPixels ^ 1);
+ }
+ while (refLine[refPos] <= codingLine[this.codingPos] &&
+ refLine[refPos] < columns) {
+ refPos += 2;
+ }
+ break;
+ case twoDimVertR3:
+ this.addPixels(refLine[refPos] + 3, blackPixels);
+ blackPixels ^= 1;
+ if (codingLine[this.codingPos] < columns) {
+ ++refPos;
+ while (refLine[refPos] <= codingLine[this.codingPos] &&
+ refLine[refPos] < columns) {
+ refPos += 2;
+ }
+ }
+ break;
+ case twoDimVertR2:
+ this.addPixels(refLine[refPos] + 2, blackPixels);
+ blackPixels ^= 1;
+ if (codingLine[this.codingPos] < columns) {
+ ++refPos;
+ while (refLine[refPos] <= codingLine[this.codingPos] &&
+ refLine[refPos] < columns) {
+ refPos += 2;
+ }
+ }
+ break;
+ case twoDimVertR1:
+ this.addPixels(refLine[refPos] + 1, blackPixels);
+ blackPixels ^= 1;
+ if (codingLine[this.codingPos] < columns) {
+ ++refPos;
+ while (refLine[refPos] <= codingLine[this.codingPos] &&
+ refLine[refPos] < columns) {
+ refPos += 2;
+ }
+ }
+ break;
+ case twoDimVert0:
+ this.addPixels(refLine[refPos], blackPixels);
+ blackPixels ^= 1;
+ if (codingLine[this.codingPos] < columns) {
+ ++refPos;
+ while (refLine[refPos] <= codingLine[this.codingPos] &&
+ refLine[refPos] < columns) {
+ refPos += 2;
+ }
+ }
+ break;
+ case twoDimVertL3:
+ this.addPixelsNeg(refLine[refPos] - 3, blackPixels);
+ blackPixels ^= 1;
+ if (codingLine[this.codingPos] < columns) {
+ if (refPos > 0) {
+ --refPos;
+ } else {
+ ++refPos;
+ }
+ while (refLine[refPos] <= codingLine[this.codingPos] &&
+ refLine[refPos] < columns) {
+ refPos += 2;
+ }
+ }
+ break;
+ case twoDimVertL2:
+ this.addPixelsNeg(refLine[refPos] - 2, blackPixels);
+ blackPixels ^= 1;
+ if (codingLine[this.codingPos] < columns) {
+ if (refPos > 0) {
+ --refPos;
+ } else {
+ ++refPos;
+ }
+ while (refLine[refPos] <= codingLine[this.codingPos] &&
+ refLine[refPos] < columns) {
+ refPos += 2;
+ }
+ }
+ break;
+ case twoDimVertL1:
+ this.addPixelsNeg(refLine[refPos] - 1, blackPixels);
+ blackPixels ^= 1;
+ if (codingLine[this.codingPos] < columns) {
+ if (refPos > 0) {
+ --refPos;
+ } else {
+ ++refPos;
+ }
+ while (refLine[refPos] <= codingLine[this.codingPos] &&
+ refLine[refPos] < columns) {
+ refPos += 2;
+ }
+ }
+ break;
+ case EOF:
+ this.addPixels(columns, 0);
+ this.eof = true;
+ break;
+ default:
+ info('bad 2d code');
+ this.addPixels(columns, 0);
+ this.err = true;
+ }
+ }
+ } else {
+ codingLine[0] = 0;
+ this.codingPos = 0;
+ blackPixels = 0;
+ while (codingLine[this.codingPos] < columns) {
+ code1 = 0;
+ if (blackPixels) {
+ do {
+ code1 += (code3 = this.getBlackCode());
+ } while (code3 >= 64);
+ } else {
+ do {
+ code1 += (code3 = this.getWhiteCode());
+ } while (code3 >= 64);
+ }
+ this.addPixels(codingLine[this.codingPos] + code1, blackPixels);
+ blackPixels ^= 1;
+ }
+ }
+
+ var gotEOL = false;
+
+ if (this.byteAlign) {
+ this.inputBits &= ~7;
+ }
+
+ if (!this.eoblock && this.row === this.rows - 1) {
+ this.eof = true;
+ } else {
+ code1 = this.lookBits(12);
+ if (this.eoline) {
+ while (code1 !== EOF && code1 !== 1) {
+ this.eatBits(1);
+ code1 = this.lookBits(12);
+ }
+ } else {
+ while (code1 === 0) {
+ this.eatBits(1);
+ code1 = this.lookBits(12);
+ }
+ }
+ if (code1 === 1) {
+ this.eatBits(12);
+ gotEOL = true;
+ } else if (code1 === EOF) {
+ this.eof = true;
+ }
+ }
+
+ if (!this.eof && this.encoding > 0) {
+ this.nextLine2D = !this.lookBits(1);
+ this.eatBits(1);
+ }
+
+ if (this.eoblock && gotEOL && this.byteAlign) {
+ code1 = this.lookBits(12);
+ if (code1 === 1) {
+ this.eatBits(12);
+ if (this.encoding > 0) {
+ this.lookBits(1);
+ this.eatBits(1);
+ }
+ if (this.encoding >= 0) {
+ for (i = 0; i < 4; ++i) {
+ code1 = this.lookBits(12);
+ if (code1 !== 1) {
+ info('bad rtc code: ' + code1);
+ }
+ this.eatBits(12);
+ if (this.encoding > 0) {
+ this.lookBits(1);
+ this.eatBits(1);
+ }
+ }
+ }
+ this.eof = true;
+ }
+ } else if (this.err && this.eoline) {
+ while (true) {
+ code1 = this.lookBits(13);
+ if (code1 === EOF) {
+ this.eof = true;
+ return null;
+ }
+ if ((code1 >> 1) === 1) {
+ break;
+ }
+ this.eatBits(1);
+ }
+ this.eatBits(12);
+ if (this.encoding > 0) {
+ this.eatBits(1);
+ this.nextLine2D = !(code1 & 1);
+ }
+ }
+
+ if (codingLine[0] > 0) {
+ this.outputBits = codingLine[this.codingPos = 0];
+ } else {
+ this.outputBits = codingLine[this.codingPos = 1];
+ }
+ this.row++;
+ }
+
+ var c;
+ if (this.outputBits >= 8) {
+ c = (this.codingPos & 1) ? 0 : 0xFF;
+ this.outputBits -= 8;
+ if (this.outputBits === 0 && codingLine[this.codingPos] < columns) {
+ this.codingPos++;
+ this.outputBits = (codingLine[this.codingPos] -
+ codingLine[this.codingPos - 1]);
+ }
+ } else {
+ bits = 8;
+ c = 0;
+ do {
+ if (this.outputBits > bits) {
+ c <<= bits;
+ if (!(this.codingPos & 1)) {
+ c |= 0xFF >> (8 - bits);
+ }
+ this.outputBits -= bits;
+ bits = 0;
+ } else {
+ c <<= this.outputBits;
+ if (!(this.codingPos & 1)) {
+ c |= 0xFF >> (8 - this.outputBits);
+ }
+ bits -= this.outputBits;
+ this.outputBits = 0;
+ if (codingLine[this.codingPos] < columns) {
+ this.codingPos++;
+ this.outputBits = (codingLine[this.codingPos] -
+ codingLine[this.codingPos - 1]);
+ } else if (bits > 0) {
+ c <<= bits;
+ bits = 0;
+ }
+ }
+ } while (bits);
+ }
+ if (this.black) {
+ c ^= 0xFF;
+ }
+ return c;
+ };
+
+ // This functions returns the code found from the table.
+ // The start and end parameters set the boundaries for searching the table.
+ // The limit parameter is optional. Function returns an array with three
+ // values. The first array element indicates whether a valid code is being
+ // returned. The second array element is the actual code. The third array
+ // element indicates whether EOF was reached.
+ CCITTFaxStream.prototype.findTableCode =
+ function ccittFaxStreamFindTableCode(start, end, table, limit) {
+
+ var limitValue = limit || 0;
+ for (var i = start; i <= end; ++i) {
+ var code = this.lookBits(i);
+ if (code === EOF) {
+ return [true, 1, false];
+ }
+ if (i < end) {
+ code <<= end - i;
+ }
+ if (!limitValue || code >= limitValue) {
+ var p = table[code - limitValue];
+ if (p[0] === i) {
+ this.eatBits(i);
+ return [true, p[1], true];
+ }
+ }
+ }
+ return [false, 0, false];
+ };
+
+ CCITTFaxStream.prototype.getTwoDimCode =
+ function ccittFaxStreamGetTwoDimCode() {
+
+ var code = 0;
+ var p;
+ if (this.eoblock) {
+ code = this.lookBits(7);
+ p = twoDimTable[code];
+ if (p && p[0] > 0) {
+ this.eatBits(p[0]);
+ return p[1];
+ }
+ } else {
+ var result = this.findTableCode(1, 7, twoDimTable);
+ if (result[0] && result[2]) {
+ return result[1];
+ }
+ }
+ info('Bad two dim code');
+ return EOF;
+ };
+
+ CCITTFaxStream.prototype.getWhiteCode =
+ function ccittFaxStreamGetWhiteCode() {
+
+ var code = 0;
+ var p;
+ if (this.eoblock) {
+ code = this.lookBits(12);
+ if (code === EOF) {
+ return 1;
+ }
+
+ if ((code >> 5) === 0) {
+ p = whiteTable1[code];
+ } else {
+ p = whiteTable2[code >> 3];
+ }
+
+ if (p[0] > 0) {
+ this.eatBits(p[0]);
+ return p[1];
+ }
+ } else {
+ var result = this.findTableCode(1, 9, whiteTable2);
+ if (result[0]) {
+ return result[1];
+ }
+
+ result = this.findTableCode(11, 12, whiteTable1);
+ if (result[0]) {
+ return result[1];
+ }
+ }
+ info('bad white code');
+ this.eatBits(1);
+ return 1;
+ };
+
+ CCITTFaxStream.prototype.getBlackCode =
+ function ccittFaxStreamGetBlackCode() {
+
+ var code, p;
+ if (this.eoblock) {
+ code = this.lookBits(13);
+ if (code === EOF) {
+ return 1;
+ }
+ if ((code >> 7) === 0) {
+ p = blackTable1[code];
+ } else if ((code >> 9) === 0 && (code >> 7) !== 0) {
+ p = blackTable2[(code >> 1) - 64];
+ } else {
+ p = blackTable3[code >> 7];
+ }
+
+ if (p[0] > 0) {
+ this.eatBits(p[0]);
+ return p[1];
+ }
+ } else {
+ var result = this.findTableCode(2, 6, blackTable3);
+ if (result[0]) {
+ return result[1];
+ }
+
+ result = this.findTableCode(7, 12, blackTable2, 64);
+ if (result[0]) {
+ return result[1];
+ }
+
+ result = this.findTableCode(10, 13, blackTable1);
+ if (result[0]) {
+ return result[1];
+ }
+ }
+ info('bad black code');
+ this.eatBits(1);
+ return 1;
+ };
+
+ CCITTFaxStream.prototype.lookBits = function CCITTFaxStream_lookBits(n) {
+ var c;
+ while (this.inputBits < n) {
+ if ((c = this.str.getByte()) === -1) {
+ if (this.inputBits === 0) {
+ return EOF;
+ }
+ return ((this.inputBuf << (n - this.inputBits)) &
+ (0xFFFF >> (16 - n)));
+ }
+ this.inputBuf = (this.inputBuf << 8) + c;
+ this.inputBits += 8;
+ }
+ return (this.inputBuf >> (this.inputBits - n)) & (0xFFFF >> (16 - n));
+ };
+
+ CCITTFaxStream.prototype.eatBits = function CCITTFaxStream_eatBits(n) {
+ if ((this.inputBits -= n) < 0) {
+ this.inputBits = 0;
+ }
+ };
+
+ return CCITTFaxStream;
+})();
+
+var LZWStream = (function LZWStreamClosure() {
+ function LZWStream(str, maybeLength, earlyChange) {
+ this.str = str;
+ this.dict = str.dict;
+ this.cachedData = 0;
+ this.bitsCached = 0;
+
+ var maxLzwDictionarySize = 4096;
+ var lzwState = {
+ earlyChange: earlyChange,
+ codeLength: 9,
+ nextCode: 258,
+ dictionaryValues: new Uint8Array(maxLzwDictionarySize),
+ dictionaryLengths: new Uint16Array(maxLzwDictionarySize),
+ dictionaryPrevCodes: new Uint16Array(maxLzwDictionarySize),
+ currentSequence: new Uint8Array(maxLzwDictionarySize),
+ currentSequenceLength: 0
+ };
+ for (var i = 0; i < 256; ++i) {
+ lzwState.dictionaryValues[i] = i;
+ lzwState.dictionaryLengths[i] = 1;
+ }
+ this.lzwState = lzwState;
+
+ DecodeStream.call(this, maybeLength);
+ }
+
+ LZWStream.prototype = Object.create(DecodeStream.prototype);
+
+ LZWStream.prototype.readBits = function LZWStream_readBits(n) {
+ var bitsCached = this.bitsCached;
+ var cachedData = this.cachedData;
+ while (bitsCached < n) {
+ var c = this.str.getByte();
+ if (c === -1) {
+ this.eof = true;
+ return null;
+ }
+ cachedData = (cachedData << 8) | c;
+ bitsCached += 8;
+ }
+ this.bitsCached = (bitsCached -= n);
+ this.cachedData = cachedData;
+ this.lastCode = null;
+ return (cachedData >>> bitsCached) & ((1 << n) - 1);
+ };
+
+ LZWStream.prototype.readBlock = function LZWStream_readBlock() {
+ var blockSize = 512;
+ var estimatedDecodedSize = blockSize * 2, decodedSizeDelta = blockSize;
+ var i, j, q;
+
+ var lzwState = this.lzwState;
+ if (!lzwState) {
+ return; // eof was found
+ }
+
+ var earlyChange = lzwState.earlyChange;
+ var nextCode = lzwState.nextCode;
+ var dictionaryValues = lzwState.dictionaryValues;
+ var dictionaryLengths = lzwState.dictionaryLengths;
+ var dictionaryPrevCodes = lzwState.dictionaryPrevCodes;
+ var codeLength = lzwState.codeLength;
+ var prevCode = lzwState.prevCode;
+ var currentSequence = lzwState.currentSequence;
+ var currentSequenceLength = lzwState.currentSequenceLength;
+
+ var decodedLength = 0;
+ var currentBufferLength = this.bufferLength;
+ var buffer = this.ensureBuffer(this.bufferLength + estimatedDecodedSize);
+
+ for (i = 0; i < blockSize; i++) {
+ var code = this.readBits(codeLength);
+ var hasPrev = currentSequenceLength > 0;
+ if (code < 256) {
+ currentSequence[0] = code;
+ currentSequenceLength = 1;
+ } else if (code >= 258) {
+ if (code < nextCode) {
+ currentSequenceLength = dictionaryLengths[code];
+ for (j = currentSequenceLength - 1, q = code; j >= 0; j--) {
+ currentSequence[j] = dictionaryValues[q];
+ q = dictionaryPrevCodes[q];
+ }
+ } else {
+ currentSequence[currentSequenceLength++] = currentSequence[0];
+ }
+ } else if (code === 256) {
+ codeLength = 9;
+ nextCode = 258;
+ currentSequenceLength = 0;
+ continue;
+ } else {
+ this.eof = true;
+ delete this.lzwState;
+ break;
+ }
+
+ if (hasPrev) {
+ dictionaryPrevCodes[nextCode] = prevCode;
+ dictionaryLengths[nextCode] = dictionaryLengths[prevCode] + 1;
+ dictionaryValues[nextCode] = currentSequence[0];
+ nextCode++;
+ codeLength = (nextCode + earlyChange) & (nextCode + earlyChange - 1) ?
+ codeLength : Math.min(Math.log(nextCode + earlyChange) /
+ 0.6931471805599453 + 1, 12) | 0;
+ }
+ prevCode = code;
+
+ decodedLength += currentSequenceLength;
+ if (estimatedDecodedSize < decodedLength) {
+ do {
+ estimatedDecodedSize += decodedSizeDelta;
+ } while (estimatedDecodedSize < decodedLength);
+ buffer = this.ensureBuffer(this.bufferLength + estimatedDecodedSize);
+ }
+ for (j = 0; j < currentSequenceLength; j++) {
+ buffer[currentBufferLength++] = currentSequence[j];
+ }
+ }
+ lzwState.nextCode = nextCode;
+ lzwState.codeLength = codeLength;
+ lzwState.prevCode = prevCode;
+ lzwState.currentSequenceLength = currentSequenceLength;
+
+ this.bufferLength = currentBufferLength;
+ };
+
+ return LZWStream;
+})();
+
+var NullStream = (function NullStreamClosure() {
+ function NullStream() {
+ Stream.call(this, new Uint8Array(0));
+ }
+
+ NullStream.prototype = Stream.prototype;
+
+ return NullStream;
+})();
+
+
+var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
+ setup: function wphSetup(handler) {
+ var pdfManager;
+
+ function loadDocument(recoveryMode) {
+ var loadDocumentCapability = createPromiseCapability();
+
+ var parseSuccess = function parseSuccess() {
+ var numPagesPromise = pdfManager.ensureDoc('numPages');
+ var fingerprintPromise = pdfManager.ensureDoc('fingerprint');
+ var encryptedPromise = pdfManager.ensureXRef('encrypt');
+ Promise.all([numPagesPromise, fingerprintPromise,
+ encryptedPromise]).then(function onDocReady(results) {
+ var doc = {
+ numPages: results[0],
+ fingerprint: results[1],
+ encrypted: !!results[2],
+ };
+ loadDocumentCapability.resolve(doc);
+ },
+ parseFailure);
+ };
+
+ var parseFailure = function parseFailure(e) {
+ loadDocumentCapability.reject(e);
+ };
+
+ pdfManager.ensureDoc('checkHeader', []).then(function() {
+ pdfManager.ensureDoc('parseStartXRef', []).then(function() {
+ pdfManager.ensureDoc('parse', [recoveryMode]).then(
+ parseSuccess, parseFailure);
+ }, parseFailure);
+ }, parseFailure);
+
+ return loadDocumentCapability.promise;
+ }
+
+ function getPdfManager(data) {
+ var pdfManagerCapability = createPromiseCapability();
+
+ var source = data.source;
+ var disableRange = data.disableRange;
+ if (source.data) {
+ try {
+ pdfManager = new LocalPdfManager(source.data, source.password);
+ pdfManagerCapability.resolve();
+ } catch (ex) {
+ pdfManagerCapability.reject(ex);
+ }
+ return pdfManagerCapability.promise;
+ } else if (source.chunkedViewerLoading) {
+ try {
+ pdfManager = new NetworkPdfManager(source, handler);
+ pdfManagerCapability.resolve();
+ } catch (ex) {
+ pdfManagerCapability.reject(ex);
+ }
+ return pdfManagerCapability.promise;
+ }
+
+ var networkManager = new NetworkManager(source.url, {
+ httpHeaders: source.httpHeaders,
+ withCredentials: source.withCredentials
+ });
+ var cachedChunks = [];
+ var fullRequestXhrId = networkManager.requestFull({
+ onHeadersReceived: function onHeadersReceived() {
+ if (disableRange) {
+ return;
+ }
+
+ var fullRequestXhr = networkManager.getRequestXhr(fullRequestXhrId);
+ if (fullRequestXhr.getResponseHeader('Accept-Ranges') !== 'bytes') {
+ return;
+ }
+
+ var contentEncoding =
+ fullRequestXhr.getResponseHeader('Content-Encoding') || 'identity';
+ if (contentEncoding !== 'identity') {
+ return;
+ }
+
+ var length = fullRequestXhr.getResponseHeader('Content-Length');
+ length = parseInt(length, 10);
+ if (!isInt(length)) {
+ return;
+ }
+ source.length = length;
+ if (length <= 2 * RANGE_CHUNK_SIZE) {
+ // The file size is smaller than the size of two chunks, so it does
+ // not make any sense to abort the request and retry with a range
+ // request.
+ return;
+ }
+
+ if (networkManager.isStreamingRequest(fullRequestXhrId)) {
+ // We can continue fetching when progressive loading is enabled,
+ // and we don't need the autoFetch feature.
+ source.disableAutoFetch = true;
+ } else {
+ // NOTE: by cancelling the full request, and then issuing range
+ // requests, there will be an issue for sites where you can only
+ // request the pdf once. However, if this is the case, then the
+ // server should not be returning that it can support range
+ // requests.
+ networkManager.abortRequest(fullRequestXhrId);
+ }
+
+ try {
+ pdfManager = new NetworkPdfManager(source, handler);
+ pdfManagerCapability.resolve(pdfManager);
+ } catch (ex) {
+ pdfManagerCapability.reject(ex);
+ }
+ },
+
+ onProgressiveData: source.disableStream ? null :
+ function onProgressiveData(chunk) {
+ if (!pdfManager) {
+ cachedChunks.push(chunk);
+ return;
+ }
+ pdfManager.sendProgressiveData(chunk);
+ },
+
+ onDone: function onDone(args) {
+ if (pdfManager) {
+ return; // already processed
+ }
+
+ var pdfFile;
+ if (args === null) {
+ // TODO add some streaming manager, e.g. for unknown length files.
+ // The data was returned in the onProgressiveData, combining...
+ var pdfFileLength = 0, pos = 0;
+ cachedChunks.forEach(function (chunk) {
+ pdfFileLength += chunk.byteLength;
+ });
+ if (source.length && pdfFileLength !== source.length) {
+ warn('reported HTTP length is different from actual');
+ }
+ var pdfFileArray = new Uint8Array(pdfFileLength);
+ cachedChunks.forEach(function (chunk) {
+ pdfFileArray.set(new Uint8Array(chunk), pos);
+ pos += chunk.byteLength;
+ });
+ pdfFile = pdfFileArray.buffer;
+ } else {
+ pdfFile = args.chunk;
+ }
+
+ // the data is array, instantiating directly from it
+ try {
+ pdfManager = new LocalPdfManager(pdfFile, source.password);
+ pdfManagerCapability.resolve();
+ } catch (ex) {
+ pdfManagerCapability.reject(ex);
+ }
+ },
+
+ onError: function onError(status) {
+ var exception;
+ if (status === 404) {
+ exception = new MissingPDFException('Missing PDF "' +
+ source.url + '".');
+ handler.send('MissingPDF', exception);
+ } else {
+ exception = new UnexpectedResponseException(
+ 'Unexpected server response (' + status +
+ ') while retrieving PDF "' + source.url + '".', status);
+ handler.send('UnexpectedResponse', exception);
+ }
+ },
+
+ onProgress: function onProgress(evt) {
+ handler.send('DocProgress', {
+ loaded: evt.loaded,
+ total: evt.lengthComputable ? evt.total : source.length
+ });
+ }
+ });
+
+ return pdfManagerCapability.promise;
+ }
+
+ handler.on('test', function wphSetupTest(data) {
+ // check if Uint8Array can be sent to worker
+ if (!(data instanceof Uint8Array)) {
+ handler.send('test', false);
+ return;
+ }
+ // making sure postMessage transfers are working
+ var supportTransfers = data[0] === 255;
+ handler.postMessageTransfers = supportTransfers;
+ // check if the response property is supported by xhr
+ var xhr = new XMLHttpRequest();
+ var responseExists = 'response' in xhr;
+ // check if the property is actually implemented
+ try {
+ var dummy = xhr.responseType;
+ } catch (e) {
+ responseExists = false;
+ }
+ if (!responseExists) {
+ handler.send('test', false);
+ return;
+ }
+ handler.send('test', {
+ supportTypedArray: true,
+ supportTransfers: supportTransfers
+ });
+ });
+
+ handler.on('GetDocRequest', function wphSetupDoc(data) {
+
+ var onSuccess = function(doc) {
+ handler.send('GetDoc', { pdfInfo: doc });
+ };
+
+ var onFailure = function(e) {
+ if (e instanceof PasswordException) {
+ if (e.code === PasswordResponses.NEED_PASSWORD) {
+ handler.send('NeedPassword', e);
+ } else if (e.code === PasswordResponses.INCORRECT_PASSWORD) {
+ handler.send('IncorrectPassword', e);
+ }
+ } else if (e instanceof InvalidPDFException) {
+ handler.send('InvalidPDF', e);
+ } else if (e instanceof MissingPDFException) {
+ handler.send('MissingPDF', e);
+ } else if (e instanceof UnexpectedResponseException) {
+ handler.send('UnexpectedResponse', e);
+ } else {
+ handler.send('UnknownError',
+ new UnknownErrorException(e.message, e.toString()));
+ }
+ };
+
+ PDFJS.maxImageSize = data.maxImageSize === undefined ?
+ -1 : data.maxImageSize;
+ PDFJS.disableFontFace = data.disableFontFace;
+ PDFJS.disableCreateObjectURL = data.disableCreateObjectURL;
+ PDFJS.verbosity = data.verbosity;
+ PDFJS.cMapUrl = data.cMapUrl === undefined ?
+ null : data.cMapUrl;
+ PDFJS.cMapPacked = data.cMapPacked === true;
+
+ getPdfManager(data).then(function () {
+ handler.send('PDFManagerReady', null);
+ pdfManager.onLoadedStream().then(function(stream) {
+ handler.send('DataLoaded', { length: stream.bytes.byteLength });
+ });
+ }).then(function pdfManagerReady() {
+ loadDocument(false).then(onSuccess, function loadFailure(ex) {
+ // Try again with recoveryMode == true
+ if (!(ex instanceof XRefParseException)) {
+ if (ex instanceof PasswordException) {
+ // after password exception prepare to receive a new password
+ // to repeat loading
+ pdfManager.passwordChanged().then(pdfManagerReady);
+ }
+
+ onFailure(ex);
+ return;
+ }
+
+ pdfManager.requestLoadedStream();
+ pdfManager.onLoadedStream().then(function() {
+ loadDocument(true).then(onSuccess, onFailure);
+ });
+ }, onFailure);
+ }, onFailure);
+ });
+
+ handler.on('GetPage', function wphSetupGetPage(data) {
+ return pdfManager.getPage(data.pageIndex).then(function(page) {
+ var rotatePromise = pdfManager.ensure(page, 'rotate');
+ var refPromise = pdfManager.ensure(page, 'ref');
+ var viewPromise = pdfManager.ensure(page, 'view');
+
+ return Promise.all([rotatePromise, refPromise, viewPromise]).then(
+ function(results) {
+ return {
+ rotate: results[0],
+ ref: results[1],
+ view: results[2]
+ };
+ });
+ });
+ });
+
+ handler.on('GetPageIndex', function wphSetupGetPageIndex(data) {
+ var ref = new Ref(data.ref.num, data.ref.gen);
+ var catalog = pdfManager.pdfDocument.catalog;
+ return catalog.getPageIndex(ref);
+ });
+
+ handler.on('GetDestinations',
+ function wphSetupGetDestinations(data) {
+ return pdfManager.ensureCatalog('destinations');
+ }
+ );
+
+ handler.on('GetDestination',
+ function wphSetupGetDestination(data) {
+ return pdfManager.ensureCatalog('getDestination', [ data.id ]);
+ }
+ );
+
+ handler.on('GetAttachments',
+ function wphSetupGetAttachments(data) {
+ return pdfManager.ensureCatalog('attachments');
+ }
+ );
+
+ handler.on('GetJavaScript',
+ function wphSetupGetJavaScript(data) {
+ return pdfManager.ensureCatalog('javaScript');
+ }
+ );
+
+ handler.on('GetOutline',
+ function wphSetupGetOutline(data) {
+ return pdfManager.ensureCatalog('documentOutline');
+ }
+ );
+
+ handler.on('GetMetadata',
+ function wphSetupGetMetadata(data) {
+ return Promise.all([pdfManager.ensureDoc('documentInfo'),
+ pdfManager.ensureCatalog('metadata')]);
+ }
+ );
+
+ handler.on('GetData', function wphSetupGetData(data) {
+ pdfManager.requestLoadedStream();
+ return pdfManager.onLoadedStream().then(function(stream) {
+ return stream.bytes;
+ });
+ });
+
+ handler.on('GetStats',
+ function wphSetupGetStats(data) {
+ return pdfManager.pdfDocument.xref.stats;
+ }
+ );
+
+ handler.on('UpdatePassword', function wphSetupUpdatePassword(data) {
+ pdfManager.updatePassword(data);
+ });
+
+ handler.on('GetAnnotations', function wphSetupGetAnnotations(data) {
+ return pdfManager.getPage(data.pageIndex).then(function(page) {
+ return pdfManager.ensure(page, 'getAnnotationsData', []);
+ });
+ });
+
+ handler.on('RenderPageRequest', function wphSetupRenderPage(data) {
+ pdfManager.getPage(data.pageIndex).then(function(page) {
+
+ var pageNum = data.pageIndex + 1;
+ var start = Date.now();
+ // Pre compile the pdf page and fetch the fonts/images.
+ page.getOperatorList(handler, data.intent).then(function(operatorList) {
+
+ info('page=' + pageNum + ' - getOperatorList: time=' +
+ (Date.now() - start) + 'ms, len=' + operatorList.fnArray.length);
+
+ }, function(e) {
+
+ var minimumStackMessage =
+ 'worker.js: while trying to getPage() and getOperatorList()';
+
+ var wrappedException;
+
+ // Turn the error into an obj that can be serialized
+ if (typeof e === 'string') {
+ wrappedException = {
+ message: e,
+ stack: minimumStackMessage
+ };
+ } else if (typeof e === 'object') {
+ wrappedException = {
+ message: e.message || e.toString(),
+ stack: e.stack || minimumStackMessage
+ };
+ } else {
+ wrappedException = {
+ message: 'Unknown exception type: ' + (typeof e),
+ stack: minimumStackMessage
+ };
+ }
+
+ handler.send('PageError', {
+ pageNum: pageNum,
+ error: wrappedException,
+ intent: data.intent
+ });
+ });
+ });
+ }, this);
+
+ handler.on('GetTextContent', function wphExtractText(data) {
+ return pdfManager.getPage(data.pageIndex).then(function(page) {
+ var pageNum = data.pageIndex + 1;
+ var start = Date.now();
+ return page.extractTextContent().then(function(textContent) {
+ info('text indexing: page=' + pageNum + ' - time=' +
+ (Date.now() - start) + 'ms');
+ return textContent;
+ });
+ });
+ });
+
+ handler.on('Cleanup', function wphCleanup(data) {
+ return pdfManager.cleanup();
+ });
+
+ handler.on('Terminate', function wphTerminate(data) {
+ pdfManager.terminate();
+ });
+ }
+};
+
+var consoleTimer = {};
+
+var workerConsole = {
+ log: function log() {
+ var args = Array.prototype.slice.call(arguments);
+ globalScope.postMessage({
+ action: 'console_log',
+ data: args
+ });
+ },
+
+ error: function error() {
+ var args = Array.prototype.slice.call(arguments);
+ globalScope.postMessage({
+ action: 'console_error',
+ data: args
+ });
+ throw 'pdf.js execution error';
+ },
+
+ time: function time(name) {
+ consoleTimer[name] = Date.now();
+ },
+
+ timeEnd: function timeEnd(name) {
+ var time = consoleTimer[name];
+ if (!time) {
+ error('Unknown timer name ' + name);
+ }
+ this.log('Timer:', name, Date.now() - time);
+ }
+};
+
+
+// Worker thread?
+if (typeof window === 'undefined') {
+ if (!('console' in globalScope)) {
+ globalScope.console = workerConsole;
+ }
+
+ // Listen for unsupported features so we can pass them on to the main thread.
+ PDFJS.UnsupportedManager.listen(function (msg) {
+ globalScope.postMessage({
+ action: '_unsupported_feature',
+ data: msg
+ });
+ });
+
+ var handler = new MessageHandler('worker_processor', this);
+ WorkerMessageHandler.setup(handler);
+}
+
+
+/* This class implements the QM Coder decoding as defined in
+ * JPEG 2000 Part I Final Committee Draft Version 1.0
+ * Annex C.3 Arithmetic decoding procedure
+ * available at http://www.jpeg.org/public/fcd15444-1.pdf
+ *
+ * The arithmetic decoder is used in conjunction with context models to decode
+ * JPEG2000 and JBIG2 streams.
+ */
+var ArithmeticDecoder = (function ArithmeticDecoderClosure() {
+ // Table C-2
+ var QeTable = [
+ {qe: 0x5601, nmps: 1, nlps: 1, switchFlag: 1},
+ {qe: 0x3401, nmps: 2, nlps: 6, switchFlag: 0},
+ {qe: 0x1801, nmps: 3, nlps: 9, switchFlag: 0},
+ {qe: 0x0AC1, nmps: 4, nlps: 12, switchFlag: 0},
+ {qe: 0x0521, nmps: 5, nlps: 29, switchFlag: 0},
+ {qe: 0x0221, nmps: 38, nlps: 33, switchFlag: 0},
+ {qe: 0x5601, nmps: 7, nlps: 6, switchFlag: 1},
+ {qe: 0x5401, nmps: 8, nlps: 14, switchFlag: 0},
+ {qe: 0x4801, nmps: 9, nlps: 14, switchFlag: 0},
+ {qe: 0x3801, nmps: 10, nlps: 14, switchFlag: 0},
+ {qe: 0x3001, nmps: 11, nlps: 17, switchFlag: 0},
+ {qe: 0x2401, nmps: 12, nlps: 18, switchFlag: 0},
+ {qe: 0x1C01, nmps: 13, nlps: 20, switchFlag: 0},
+ {qe: 0x1601, nmps: 29, nlps: 21, switchFlag: 0},
+ {qe: 0x5601, nmps: 15, nlps: 14, switchFlag: 1},
+ {qe: 0x5401, nmps: 16, nlps: 14, switchFlag: 0},
+ {qe: 0x5101, nmps: 17, nlps: 15, switchFlag: 0},
+ {qe: 0x4801, nmps: 18, nlps: 16, switchFlag: 0},
+ {qe: 0x3801, nmps: 19, nlps: 17, switchFlag: 0},
+ {qe: 0x3401, nmps: 20, nlps: 18, switchFlag: 0},
+ {qe: 0x3001, nmps: 21, nlps: 19, switchFlag: 0},
+ {qe: 0x2801, nmps: 22, nlps: 19, switchFlag: 0},
+ {qe: 0x2401, nmps: 23, nlps: 20, switchFlag: 0},
+ {qe: 0x2201, nmps: 24, nlps: 21, switchFlag: 0},
+ {qe: 0x1C01, nmps: 25, nlps: 22, switchFlag: 0},
+ {qe: 0x1801, nmps: 26, nlps: 23, switchFlag: 0},
+ {qe: 0x1601, nmps: 27, nlps: 24, switchFlag: 0},
+ {qe: 0x1401, nmps: 28, nlps: 25, switchFlag: 0},
+ {qe: 0x1201, nmps: 29, nlps: 26, switchFlag: 0},
+ {qe: 0x1101, nmps: 30, nlps: 27, switchFlag: 0},
+ {qe: 0x0AC1, nmps: 31, nlps: 28, switchFlag: 0},
+ {qe: 0x09C1, nmps: 32, nlps: 29, switchFlag: 0},
+ {qe: 0x08A1, nmps: 33, nlps: 30, switchFlag: 0},
+ {qe: 0x0521, nmps: 34, nlps: 31, switchFlag: 0},
+ {qe: 0x0441, nmps: 35, nlps: 32, switchFlag: 0},
+ {qe: 0x02A1, nmps: 36, nlps: 33, switchFlag: 0},
+ {qe: 0x0221, nmps: 37, nlps: 34, switchFlag: 0},
+ {qe: 0x0141, nmps: 38, nlps: 35, switchFlag: 0},
+ {qe: 0x0111, nmps: 39, nlps: 36, switchFlag: 0},
+ {qe: 0x0085, nmps: 40, nlps: 37, switchFlag: 0},
+ {qe: 0x0049, nmps: 41, nlps: 38, switchFlag: 0},
+ {qe: 0x0025, nmps: 42, nlps: 39, switchFlag: 0},
+ {qe: 0x0015, nmps: 43, nlps: 40, switchFlag: 0},
+ {qe: 0x0009, nmps: 44, nlps: 41, switchFlag: 0},
+ {qe: 0x0005, nmps: 45, nlps: 42, switchFlag: 0},
+ {qe: 0x0001, nmps: 45, nlps: 43, switchFlag: 0},
+ {qe: 0x5601, nmps: 46, nlps: 46, switchFlag: 0}
+ ];
+
+ // C.3.5 Initialisation of the decoder (INITDEC)
+ function ArithmeticDecoder(data, start, end) {
+ this.data = data;
+ this.bp = start;
+ this.dataEnd = end;
+
+ this.chigh = data[start];
+ this.clow = 0;
+
+ this.byteIn();
+
+ this.chigh = ((this.chigh << 7) & 0xFFFF) | ((this.clow >> 9) & 0x7F);
+ this.clow = (this.clow << 7) & 0xFFFF;
+ this.ct -= 7;
+ this.a = 0x8000;
+ }
+
+ ArithmeticDecoder.prototype = {
+ // C.3.4 Compressed data input (BYTEIN)
+ byteIn: function ArithmeticDecoder_byteIn() {
+ var data = this.data;
+ var bp = this.bp;
+ if (data[bp] === 0xFF) {
+ var b1 = data[bp + 1];
+ if (b1 > 0x8F) {
+ this.clow += 0xFF00;
+ this.ct = 8;
+ } else {
+ bp++;
+ this.clow += (data[bp] << 9);
+ this.ct = 7;
+ this.bp = bp;
+ }
+ } else {
+ bp++;
+ this.clow += bp < this.dataEnd ? (data[bp] << 8) : 0xFF00;
+ this.ct = 8;
+ this.bp = bp;
+ }
+ if (this.clow > 0xFFFF) {
+ this.chigh += (this.clow >> 16);
+ this.clow &= 0xFFFF;
+ }
+ },
+ // C.3.2 Decoding a decision (DECODE)
+ readBit: function ArithmeticDecoder_readBit(contexts, pos) {
+ // contexts are packed into 1 byte:
+ // highest 7 bits carry cx.index, lowest bit carries cx.mps
+ var cx_index = contexts[pos] >> 1, cx_mps = contexts[pos] & 1;
+ var qeTableIcx = QeTable[cx_index];
+ var qeIcx = qeTableIcx.qe;
+ var d;
+ var a = this.a - qeIcx;
+
+ if (this.chigh < qeIcx) {
+ // exchangeLps
+ if (a < qeIcx) {
+ a = qeIcx;
+ d = cx_mps;
+ cx_index = qeTableIcx.nmps;
+ } else {
+ a = qeIcx;
+ d = 1 ^ cx_mps;
+ if (qeTableIcx.switchFlag === 1) {
+ cx_mps = d;
+ }
+ cx_index = qeTableIcx.nlps;
+ }
+ } else {
+ this.chigh -= qeIcx;
+ if ((a & 0x8000) !== 0) {
+ this.a = a;
+ return cx_mps;
+ }
+ // exchangeMps
+ if (a < qeIcx) {
+ d = 1 ^ cx_mps;
+ if (qeTableIcx.switchFlag === 1) {
+ cx_mps = d;
+ }
+ cx_index = qeTableIcx.nlps;
+ } else {
+ d = cx_mps;
+ cx_index = qeTableIcx.nmps;
+ }
+ }
+ // C.3.3 renormD;
+ do {
+ if (this.ct === 0) {
+ this.byteIn();
+ }
+
+ a <<= 1;
+ this.chigh = ((this.chigh << 1) & 0xFFFF) | ((this.clow >> 15) & 1);
+ this.clow = (this.clow << 1) & 0xFFFF;
+ this.ct--;
+ } while ((a & 0x8000) === 0);
+ this.a = a;
+
+ contexts[pos] = cx_index << 1 | cx_mps;
+ return d;
+ }
+ };
+
+ return ArithmeticDecoder;
+})();
+
+
+var JpegImage = (function jpegImage() {
+ var dctZigZag = new Uint8Array([
+ 0,
+ 1, 8,
+ 16, 9, 2,
+ 3, 10, 17, 24,
+ 32, 25, 18, 11, 4,
+ 5, 12, 19, 26, 33, 40,
+ 48, 41, 34, 27, 20, 13, 6,
+ 7, 14, 21, 28, 35, 42, 49, 56,
+ 57, 50, 43, 36, 29, 22, 15,
+ 23, 30, 37, 44, 51, 58,
+ 59, 52, 45, 38, 31,
+ 39, 46, 53, 60,
+ 61, 54, 47,
+ 55, 62,
+ 63
+ ]);
+
+ var dctCos1 = 4017; // cos(pi/16)
+ var dctSin1 = 799; // sin(pi/16)
+ var dctCos3 = 3406; // cos(3*pi/16)
+ var dctSin3 = 2276; // sin(3*pi/16)
+ var dctCos6 = 1567; // cos(6*pi/16)
+ var dctSin6 = 3784; // sin(6*pi/16)
+ var dctSqrt2 = 5793; // sqrt(2)
+ var dctSqrt1d2 = 2896; // sqrt(2) / 2
+
+ function constructor() {
+ }
+
+ function buildHuffmanTable(codeLengths, values) {
+ var k = 0, code = [], i, j, length = 16;
+ while (length > 0 && !codeLengths[length - 1]) {
+ length--;
+ }
+ code.push({children: [], index: 0});
+ var p = code[0], q;
+ for (i = 0; i < length; i++) {
+ for (j = 0; j < codeLengths[i]; j++) {
+ p = code.pop();
+ p.children[p.index] = values[k];
+ while (p.index > 0) {
+ p = code.pop();
+ }
+ p.index++;
+ code.push(p);
+ while (code.length <= i) {
+ code.push(q = {children: [], index: 0});
+ p.children[p.index] = q.children;
+ p = q;
+ }
+ k++;
+ }
+ if (i + 1 < length) {
+ // p here points to last code
+ code.push(q = {children: [], index: 0});
+ p.children[p.index] = q.children;
+ p = q;
+ }
+ }
+ return code[0].children;
+ }
+
+ function getBlockBufferOffset(component, row, col) {
+ return 64 * ((component.blocksPerLine + 1) * row + col);
+ }
+
+ function decodeScan(data, offset, frame, components, resetInterval,
+ spectralStart, spectralEnd, successivePrev, successive) {
+ var precision = frame.precision;
+ var samplesPerLine = frame.samplesPerLine;
+ var scanLines = frame.scanLines;
+ var mcusPerLine = frame.mcusPerLine;
+ var progressive = frame.progressive;
+ var maxH = frame.maxH, maxV = frame.maxV;
+
+ var startOffset = offset, bitsData = 0, bitsCount = 0;
+
+ function readBit() {
+ if (bitsCount > 0) {
+ bitsCount--;
+ return (bitsData >> bitsCount) & 1;
+ }
+ bitsData = data[offset++];
+ if (bitsData === 0xFF) {
+ var nextByte = data[offset++];
+ if (nextByte) {
+ throw 'unexpected marker: ' +
+ ((bitsData << 8) | nextByte).toString(16);
+ }
+ // unstuff 0
+ }
+ bitsCount = 7;
+ return bitsData >>> 7;
+ }
+
+ function decodeHuffman(tree) {
+ var node = tree;
+ while (true) {
+ node = node[readBit()];
+ if (typeof node === 'number') {
+ return node;
+ }
+ if (typeof node !== 'object') {
+ throw 'invalid huffman sequence';
+ }
+ }
+ }
+
+ function receive(length) {
+ var n = 0;
+ while (length > 0) {
+ n = (n << 1) | readBit();
+ length--;
+ }
+ return n;
+ }
+
+ function receiveAndExtend(length) {
+ if (length === 1) {
+ return readBit() === 1 ? 1 : -1;
+ }
+ var n = receive(length);
+ if (n >= 1 << (length - 1)) {
+ return n;
+ }
+ return n + (-1 << length) + 1;
+ }
+
+ function decodeBaseline(component, offset) {
+ var t = decodeHuffman(component.huffmanTableDC);
+ var diff = t === 0 ? 0 : receiveAndExtend(t);
+ component.blockData[offset] = (component.pred += diff);
+ var k = 1;
+ while (k < 64) {
+ var rs = decodeHuffman(component.huffmanTableAC);
+ var s = rs & 15, r = rs >> 4;
+ if (s === 0) {
+ if (r < 15) {
+ break;
+ }
+ k += 16;
+ continue;
+ }
+ k += r;
+ var z = dctZigZag[k];
+ component.blockData[offset + z] = receiveAndExtend(s);
+ k++;
+ }
+ }
+
+ function decodeDCFirst(component, offset) {
+ var t = decodeHuffman(component.huffmanTableDC);
+ var diff = t === 0 ? 0 : (receiveAndExtend(t) << successive);
+ component.blockData[offset] = (component.pred += diff);
+ }
+
+ function decodeDCSuccessive(component, offset) {
+ component.blockData[offset] |= readBit() << successive;
+ }
+
+ var eobrun = 0;
+ function decodeACFirst(component, offset) {
+ if (eobrun > 0) {
+ eobrun--;
+ return;
+ }
+ var k = spectralStart, e = spectralEnd;
+ while (k <= e) {
+ var rs = decodeHuffman(component.huffmanTableAC);
+ var s = rs & 15, r = rs >> 4;
+ if (s === 0) {
+ if (r < 15) {
+ eobrun = receive(r) + (1 << r) - 1;
+ break;
+ }
+ k += 16;
+ continue;
+ }
+ k += r;
+ var z = dctZigZag[k];
+ component.blockData[offset + z] =
+ receiveAndExtend(s) * (1 << successive);
+ k++;
+ }
+ }
+
+ var successiveACState = 0, successiveACNextValue;
+ function decodeACSuccessive(component, offset) {
+ var k = spectralStart;
+ var e = spectralEnd;
+ var r = 0;
+ var s;
+ var rs;
+ while (k <= e) {
+ var z = dctZigZag[k];
+ switch (successiveACState) {
+ case 0: // initial state
+ rs = decodeHuffman(component.huffmanTableAC);
+ s = rs & 15;
+ r = rs >> 4;
+ if (s === 0) {
+ if (r < 15) {
+ eobrun = receive(r) + (1 << r);
+ successiveACState = 4;
+ } else {
+ r = 16;
+ successiveACState = 1;
+ }
+ } else {
+ if (s !== 1) {
+ throw 'invalid ACn encoding';
+ }
+ successiveACNextValue = receiveAndExtend(s);
+ successiveACState = r ? 2 : 3;
+ }
+ continue;
+ case 1: // skipping r zero items
+ case 2:
+ if (component.blockData[offset + z]) {
+ component.blockData[offset + z] += (readBit() << successive);
+ } else {
+ r--;
+ if (r === 0) {
+ successiveACState = successiveACState === 2 ? 3 : 0;
+ }
+ }
+ break;
+ case 3: // set value for a zero item
+ if (component.blockData[offset + z]) {
+ component.blockData[offset + z] += (readBit() << successive);
+ } else {
+ component.blockData[offset + z] =
+ successiveACNextValue << successive;
+ successiveACState = 0;
+ }
+ break;
+ case 4: // eob
+ if (component.blockData[offset + z]) {
+ component.blockData[offset + z] += (readBit() << successive);
+ }
+ break;
+ }
+ k++;
+ }
+ if (successiveACState === 4) {
+ eobrun--;
+ if (eobrun === 0) {
+ successiveACState = 0;
+ }
+ }
+ }
+
+ function decodeMcu(component, decode, mcu, row, col) {
+ var mcuRow = (mcu / mcusPerLine) | 0;
+ var mcuCol = mcu % mcusPerLine;
+ var blockRow = mcuRow * component.v + row;
+ var blockCol = mcuCol * component.h + col;
+ var offset = getBlockBufferOffset(component, blockRow, blockCol);
+ decode(component, offset);
+ }
+
+ function decodeBlock(component, decode, mcu) {
+ var blockRow = (mcu / component.blocksPerLine) | 0;
+ var blockCol = mcu % component.blocksPerLine;
+ var offset = getBlockBufferOffset(component, blockRow, blockCol);
+ decode(component, offset);
+ }
+
+ var componentsLength = components.length;
+ var component, i, j, k, n;
+ var decodeFn;
+ if (progressive) {
+ if (spectralStart === 0) {
+ decodeFn = successivePrev === 0 ? decodeDCFirst : decodeDCSuccessive;
+ } else {
+ decodeFn = successivePrev === 0 ? decodeACFirst : decodeACSuccessive;
+ }
+ } else {
+ decodeFn = decodeBaseline;
+ }
+
+ var mcu = 0, marker;
+ var mcuExpected;
+ if (componentsLength === 1) {
+ mcuExpected = components[0].blocksPerLine * components[0].blocksPerColumn;
+ } else {
+ mcuExpected = mcusPerLine * frame.mcusPerColumn;
+ }
+ if (!resetInterval) {
+ resetInterval = mcuExpected;
+ }
+
+ var h, v;
+ while (mcu < mcuExpected) {
+ // reset interval stuff
+ for (i = 0; i < componentsLength; i++) {
+ components[i].pred = 0;
+ }
+ eobrun = 0;
+
+ if (componentsLength === 1) {
+ component = components[0];
+ for (n = 0; n < resetInterval; n++) {
+ decodeBlock(component, decodeFn, mcu);
+ mcu++;
+ }
+ } else {
+ for (n = 0; n < resetInterval; n++) {
+ for (i = 0; i < componentsLength; i++) {
+ component = components[i];
+ h = component.h;
+ v = component.v;
+ for (j = 0; j < v; j++) {
+ for (k = 0; k < h; k++) {
+ decodeMcu(component, decodeFn, mcu, j, k);
+ }
+ }
+ }
+ mcu++;
+ }
+ }
+
+ // find marker
+ bitsCount = 0;
+ marker = (data[offset] << 8) | data[offset + 1];
+ if (marker <= 0xFF00) {
+ throw 'marker was not found';
+ }
+
+ if (marker >= 0xFFD0 && marker <= 0xFFD7) { // RSTx
+ offset += 2;
+ } else {
+ break;
+ }
+ }
+
+ return offset - startOffset;
+ }
+
+ // A port of poppler's IDCT method which in turn is taken from:
+ // Christoph Loeffler, Adriaan Ligtenberg, George S. Moschytz,
+ // 'Practical Fast 1-D DCT Algorithms with 11 Multiplications',
+ // IEEE Intl. Conf. on Acoustics, Speech & Signal Processing, 1989,
+ // 988-991.
+ function quantizeAndInverse(component, blockBufferOffset, p) {
+ var qt = component.quantizationTable, blockData = component.blockData;
+ var v0, v1, v2, v3, v4, v5, v6, v7;
+ var p0, p1, p2, p3, p4, p5, p6, p7;
+ var t;
+
+ // inverse DCT on rows
+ for (var row = 0; row < 64; row += 8) {
+ // gather block data
+ p0 = blockData[blockBufferOffset + row];
+ p1 = blockData[blockBufferOffset + row + 1];
+ p2 = blockData[blockBufferOffset + row + 2];
+ p3 = blockData[blockBufferOffset + row + 3];
+ p4 = blockData[blockBufferOffset + row + 4];
+ p5 = blockData[blockBufferOffset + row + 5];
+ p6 = blockData[blockBufferOffset + row + 6];
+ p7 = blockData[blockBufferOffset + row + 7];
+
+ // dequant p0
+ p0 *= qt[row];
+
+ // check for all-zero AC coefficients
+ if ((p1 | p2 | p3 | p4 | p5 | p6 | p7) === 0) {
+ t = (dctSqrt2 * p0 + 512) >> 10;
+ p[row] = t;
+ p[row + 1] = t;
+ p[row + 2] = t;
+ p[row + 3] = t;
+ p[row + 4] = t;
+ p[row + 5] = t;
+ p[row + 6] = t;
+ p[row + 7] = t;
+ continue;
+ }
+ // dequant p1 ... p7
+ p1 *= qt[row + 1];
+ p2 *= qt[row + 2];
+ p3 *= qt[row + 3];
+ p4 *= qt[row + 4];
+ p5 *= qt[row + 5];
+ p6 *= qt[row + 6];
+ p7 *= qt[row + 7];
+
+ // stage 4
+ v0 = (dctSqrt2 * p0 + 128) >> 8;
+ v1 = (dctSqrt2 * p4 + 128) >> 8;
+ v2 = p2;
+ v3 = p6;
+ v4 = (dctSqrt1d2 * (p1 - p7) + 128) >> 8;
+ v7 = (dctSqrt1d2 * (p1 + p7) + 128) >> 8;
+ v5 = p3 << 4;
+ v6 = p5 << 4;
+
+ // stage 3
+ v0 = (v0 + v1 + 1) >> 1;
+ v1 = v0 - v1;
+ t = (v2 * dctSin6 + v3 * dctCos6 + 128) >> 8;
+ v2 = (v2 * dctCos6 - v3 * dctSin6 + 128) >> 8;
+ v3 = t;
+ v4 = (v4 + v6 + 1) >> 1;
+ v6 = v4 - v6;
+ v7 = (v7 + v5 + 1) >> 1;
+ v5 = v7 - v5;
+
+ // stage 2
+ v0 = (v0 + v3 + 1) >> 1;
+ v3 = v0 - v3;
+ v1 = (v1 + v2 + 1) >> 1;
+ v2 = v1 - v2;
+ t = (v4 * dctSin3 + v7 * dctCos3 + 2048) >> 12;
+ v4 = (v4 * dctCos3 - v7 * dctSin3 + 2048) >> 12;
+ v7 = t;
+ t = (v5 * dctSin1 + v6 * dctCos1 + 2048) >> 12;
+ v5 = (v5 * dctCos1 - v6 * dctSin1 + 2048) >> 12;
+ v6 = t;
+
+ // stage 1
+ p[row] = v0 + v7;
+ p[row + 7] = v0 - v7;
+ p[row + 1] = v1 + v6;
+ p[row + 6] = v1 - v6;
+ p[row + 2] = v2 + v5;
+ p[row + 5] = v2 - v5;
+ p[row + 3] = v3 + v4;
+ p[row + 4] = v3 - v4;
+ }
+
+ // inverse DCT on columns
+ for (var col = 0; col < 8; ++col) {
+ p0 = p[col];
+ p1 = p[col + 8];
+ p2 = p[col + 16];
+ p3 = p[col + 24];
+ p4 = p[col + 32];
+ p5 = p[col + 40];
+ p6 = p[col + 48];
+ p7 = p[col + 56];
+
+ // check for all-zero AC coefficients
+ if ((p1 | p2 | p3 | p4 | p5 | p6 | p7) === 0) {
+ t = (dctSqrt2 * p0 + 8192) >> 14;
+ // convert to 8 bit
+ t = (t < -2040) ? 0 : (t >= 2024) ? 255 : (t + 2056) >> 4;
+ blockData[blockBufferOffset + col] = t;
+ blockData[blockBufferOffset + col + 8] = t;
+ blockData[blockBufferOffset + col + 16] = t;
+ blockData[blockBufferOffset + col + 24] = t;
+ blockData[blockBufferOffset + col + 32] = t;
+ blockData[blockBufferOffset + col + 40] = t;
+ blockData[blockBufferOffset + col + 48] = t;
+ blockData[blockBufferOffset + col + 56] = t;
+ continue;
+ }
+
+ // stage 4
+ v0 = (dctSqrt2 * p0 + 2048) >> 12;
+ v1 = (dctSqrt2 * p4 + 2048) >> 12;
+ v2 = p2;
+ v3 = p6;
+ v4 = (dctSqrt1d2 * (p1 - p7) + 2048) >> 12;
+ v7 = (dctSqrt1d2 * (p1 + p7) + 2048) >> 12;
+ v5 = p3;
+ v6 = p5;
+
+ // stage 3
+ // Shift v0 by 128.5 << 5 here, so we don't need to shift p0...p7 when
+ // converting to UInt8 range later.
+ v0 = ((v0 + v1 + 1) >> 1) + 4112;
+ v1 = v0 - v1;
+ t = (v2 * dctSin6 + v3 * dctCos6 + 2048) >> 12;
+ v2 = (v2 * dctCos6 - v3 * dctSin6 + 2048) >> 12;
+ v3 = t;
+ v4 = (v4 + v6 + 1) >> 1;
+ v6 = v4 - v6;
+ v7 = (v7 + v5 + 1) >> 1;
+ v5 = v7 - v5;
+
+ // stage 2
+ v0 = (v0 + v3 + 1) >> 1;
+ v3 = v0 - v3;
+ v1 = (v1 + v2 + 1) >> 1;
+ v2 = v1 - v2;
+ t = (v4 * dctSin3 + v7 * dctCos3 + 2048) >> 12;
+ v4 = (v4 * dctCos3 - v7 * dctSin3 + 2048) >> 12;
+ v7 = t;
+ t = (v5 * dctSin1 + v6 * dctCos1 + 2048) >> 12;
+ v5 = (v5 * dctCos1 - v6 * dctSin1 + 2048) >> 12;
+ v6 = t;
+
+ // stage 1
+ p0 = v0 + v7;
+ p7 = v0 - v7;
+ p1 = v1 + v6;
+ p6 = v1 - v6;
+ p2 = v2 + v5;
+ p5 = v2 - v5;
+ p3 = v3 + v4;
+ p4 = v3 - v4;
+
+ // convert to 8-bit integers
+ p0 = (p0 < 16) ? 0 : (p0 >= 4080) ? 255 : p0 >> 4;
+ p1 = (p1 < 16) ? 0 : (p1 >= 4080) ? 255 : p1 >> 4;
+ p2 = (p2 < 16) ? 0 : (p2 >= 4080) ? 255 : p2 >> 4;
+ p3 = (p3 < 16) ? 0 : (p3 >= 4080) ? 255 : p3 >> 4;
+ p4 = (p4 < 16) ? 0 : (p4 >= 4080) ? 255 : p4 >> 4;
+ p5 = (p5 < 16) ? 0 : (p5 >= 4080) ? 255 : p5 >> 4;
+ p6 = (p6 < 16) ? 0 : (p6 >= 4080) ? 255 : p6 >> 4;
+ p7 = (p7 < 16) ? 0 : (p7 >= 4080) ? 255 : p7 >> 4;
+
+ // store block data
+ blockData[blockBufferOffset + col] = p0;
+ blockData[blockBufferOffset + col + 8] = p1;
+ blockData[blockBufferOffset + col + 16] = p2;
+ blockData[blockBufferOffset + col + 24] = p3;
+ blockData[blockBufferOffset + col + 32] = p4;
+ blockData[blockBufferOffset + col + 40] = p5;
+ blockData[blockBufferOffset + col + 48] = p6;
+ blockData[blockBufferOffset + col + 56] = p7;
+ }
+ }
+
+ function buildComponentData(frame, component) {
+ var blocksPerLine = component.blocksPerLine;
+ var blocksPerColumn = component.blocksPerColumn;
+ var computationBuffer = new Int16Array(64);
+
+ for (var blockRow = 0; blockRow < blocksPerColumn; blockRow++) {
+ for (var blockCol = 0; blockCol < blocksPerLine; blockCol++) {
+ var offset = getBlockBufferOffset(component, blockRow, blockCol);
+ quantizeAndInverse(component, offset, computationBuffer);
+ }
+ }
+ return component.blockData;
+ }
+
+ function clamp0to255(a) {
+ return a <= 0 ? 0 : a >= 255 ? 255 : a;
+ }
+
+ constructor.prototype = {
+ parse: function parse(data) {
+
+ function readUint16() {
+ var value = (data[offset] << 8) | data[offset + 1];
+ offset += 2;
+ return value;
+ }
+
+ function readDataBlock() {
+ var length = readUint16();
+ var array = data.subarray(offset, offset + length - 2);
+ offset += array.length;
+ return array;
+ }
+
+ function prepareComponents(frame) {
+ var mcusPerLine = Math.ceil(frame.samplesPerLine / 8 / frame.maxH);
+ var mcusPerColumn = Math.ceil(frame.scanLines / 8 / frame.maxV);
+ for (var i = 0; i < frame.components.length; i++) {
+ component = frame.components[i];
+ var blocksPerLine = Math.ceil(Math.ceil(frame.samplesPerLine / 8) *
+ component.h / frame.maxH);
+ var blocksPerColumn = Math.ceil(Math.ceil(frame.scanLines / 8) *
+ component.v / frame.maxV);
+ var blocksPerLineForMcu = mcusPerLine * component.h;
+ var blocksPerColumnForMcu = mcusPerColumn * component.v;
+
+ var blocksBufferSize = 64 * blocksPerColumnForMcu *
+ (blocksPerLineForMcu + 1);
+ component.blockData = new Int16Array(blocksBufferSize);
+ component.blocksPerLine = blocksPerLine;
+ component.blocksPerColumn = blocksPerColumn;
+ }
+ frame.mcusPerLine = mcusPerLine;
+ frame.mcusPerColumn = mcusPerColumn;
+ }
+
+ var offset = 0, length = data.length;
+ var jfif = null;
+ var adobe = null;
+ var pixels = null;
+ var frame, resetInterval;
+ var quantizationTables = [];
+ var huffmanTablesAC = [], huffmanTablesDC = [];
+ var fileMarker = readUint16();
+ if (fileMarker !== 0xFFD8) { // SOI (Start of Image)
+ throw 'SOI not found';
+ }
+
+ fileMarker = readUint16();
+ while (fileMarker !== 0xFFD9) { // EOI (End of image)
+ var i, j, l;
+ switch(fileMarker) {
+ case 0xFFE0: // APP0 (Application Specific)
+ case 0xFFE1: // APP1
+ case 0xFFE2: // APP2
+ case 0xFFE3: // APP3
+ case 0xFFE4: // APP4
+ case 0xFFE5: // APP5
+ case 0xFFE6: // APP6
+ case 0xFFE7: // APP7
+ case 0xFFE8: // APP8
+ case 0xFFE9: // APP9
+ case 0xFFEA: // APP10
+ case 0xFFEB: // APP11
+ case 0xFFEC: // APP12
+ case 0xFFED: // APP13
+ case 0xFFEE: // APP14
+ case 0xFFEF: // APP15
+ case 0xFFFE: // COM (Comment)
+ var appData = readDataBlock();
+
+ if (fileMarker === 0xFFE0) {
+ if (appData[0] === 0x4A && appData[1] === 0x46 &&
+ appData[2] === 0x49 && appData[3] === 0x46 &&
+ appData[4] === 0) { // 'JFIF\x00'
+ jfif = {
+ version: { major: appData[5], minor: appData[6] },
+ densityUnits: appData[7],
+ xDensity: (appData[8] << 8) | appData[9],
+ yDensity: (appData[10] << 8) | appData[11],
+ thumbWidth: appData[12],
+ thumbHeight: appData[13],
+ thumbData: appData.subarray(14, 14 +
+ 3 * appData[12] * appData[13])
+ };
+ }
+ }
+ // TODO APP1 - Exif
+ if (fileMarker === 0xFFEE) {
+ if (appData[0] === 0x41 && appData[1] === 0x64 &&
+ appData[2] === 0x6F && appData[3] === 0x62 &&
+ appData[4] === 0x65) { // 'Adobe'
+ adobe = {
+ version: (appData[5] << 8) | appData[6],
+ flags0: (appData[7] << 8) | appData[8],
+ flags1: (appData[9] << 8) | appData[10],
+ transformCode: appData[11]
+ };
+ }
+ }
+ break;
+
+ case 0xFFDB: // DQT (Define Quantization Tables)
+ var quantizationTablesLength = readUint16();
+ var quantizationTablesEnd = quantizationTablesLength + offset - 2;
+ var z;
+ while (offset < quantizationTablesEnd) {
+ var quantizationTableSpec = data[offset++];
+ var tableData = new Uint16Array(64);
+ if ((quantizationTableSpec >> 4) === 0) { // 8 bit values
+ for (j = 0; j < 64; j++) {
+ z = dctZigZag[j];
+ tableData[z] = data[offset++];
+ }
+ } else if ((quantizationTableSpec >> 4) === 1) { //16 bit
+ for (j = 0; j < 64; j++) {
+ z = dctZigZag[j];
+ tableData[z] = readUint16();
+ }
+ } else {
+ throw 'DQT: invalid table spec';
+ }
+ quantizationTables[quantizationTableSpec & 15] = tableData;
+ }
+ break;
+
+ case 0xFFC0: // SOF0 (Start of Frame, Baseline DCT)
+ case 0xFFC1: // SOF1 (Start of Frame, Extended DCT)
+ case 0xFFC2: // SOF2 (Start of Frame, Progressive DCT)
+ if (frame) {
+ throw 'Only single frame JPEGs supported';
+ }
+ readUint16(); // skip data length
+ frame = {};
+ frame.extended = (fileMarker === 0xFFC1);
+ frame.progressive = (fileMarker === 0xFFC2);
+ frame.precision = data[offset++];
+ frame.scanLines = readUint16();
+ frame.samplesPerLine = readUint16();
+ frame.components = [];
+ frame.componentIds = {};
+ var componentsCount = data[offset++], componentId;
+ var maxH = 0, maxV = 0;
+ for (i = 0; i < componentsCount; i++) {
+ componentId = data[offset];
+ var h = data[offset + 1] >> 4;
+ var v = data[offset + 1] & 15;
+ if (maxH < h) {
+ maxH = h;
+ }
+ if (maxV < v) {
+ maxV = v;
+ }
+ var qId = data[offset + 2];
+ l = frame.components.push({
+ h: h,
+ v: v,
+ quantizationTable: quantizationTables[qId]
+ });
+ frame.componentIds[componentId] = l - 1;
+ offset += 3;
+ }
+ frame.maxH = maxH;
+ frame.maxV = maxV;
+ prepareComponents(frame);
+ break;
+
+ case 0xFFC4: // DHT (Define Huffman Tables)
+ var huffmanLength = readUint16();
+ for (i = 2; i < huffmanLength;) {
+ var huffmanTableSpec = data[offset++];
+ var codeLengths = new Uint8Array(16);
+ var codeLengthSum = 0;
+ for (j = 0; j < 16; j++, offset++) {
+ codeLengthSum += (codeLengths[j] = data[offset]);
+ }
+ var huffmanValues = new Uint8Array(codeLengthSum);
+ for (j = 0; j < codeLengthSum; j++, offset++) {
+ huffmanValues[j] = data[offset];
+ }
+ i += 17 + codeLengthSum;
+
+ ((huffmanTableSpec >> 4) === 0 ?
+ huffmanTablesDC : huffmanTablesAC)[huffmanTableSpec & 15] =
+ buildHuffmanTable(codeLengths, huffmanValues);
+ }
+ break;
+
+ case 0xFFDD: // DRI (Define Restart Interval)
+ readUint16(); // skip data length
+ resetInterval = readUint16();
+ break;
+
+ case 0xFFDA: // SOS (Start of Scan)
+ var scanLength = readUint16();
+ var selectorsCount = data[offset++];
+ var components = [], component;
+ for (i = 0; i < selectorsCount; i++) {
+ var componentIndex = frame.componentIds[data[offset++]];
+ component = frame.components[componentIndex];
+ var tableSpec = data[offset++];
+ component.huffmanTableDC = huffmanTablesDC[tableSpec >> 4];
+ component.huffmanTableAC = huffmanTablesAC[tableSpec & 15];
+ components.push(component);
+ }
+ var spectralStart = data[offset++];
+ var spectralEnd = data[offset++];
+ var successiveApproximation = data[offset++];
+ var processed = decodeScan(data, offset,
+ frame, components, resetInterval,
+ spectralStart, spectralEnd,
+ successiveApproximation >> 4, successiveApproximation & 15);
+ offset += processed;
+ break;
+
+ case 0xFFFF: // Fill bytes
+ if (data[offset] !== 0xFF) { // Avoid skipping a valid marker.
+ offset--;
+ }
+ break;
+
+ default:
+ if (data[offset - 3] === 0xFF &&
+ data[offset - 2] >= 0xC0 && data[offset - 2] <= 0xFE) {
+ // could be incorrect encoding -- last 0xFF byte of the previous
+ // block was eaten by the encoder
+ offset -= 3;
+ break;
+ }
+ throw 'unknown JPEG marker ' + fileMarker.toString(16);
+ }
+ fileMarker = readUint16();
+ }
+
+ this.width = frame.samplesPerLine;
+ this.height = frame.scanLines;
+ this.jfif = jfif;
+ this.adobe = adobe;
+ this.components = [];
+ for (i = 0; i < frame.components.length; i++) {
+ component = frame.components[i];
+ this.components.push({
+ output: buildComponentData(frame, component),
+ scaleX: component.h / frame.maxH,
+ scaleY: component.v / frame.maxV,
+ blocksPerLine: component.blocksPerLine,
+ blocksPerColumn: component.blocksPerColumn
+ });
+ }
+ this.numComponents = this.components.length;
+ },
+
+ _getLinearizedBlockData: function getLinearizedBlockData(width, height) {
+ var scaleX = this.width / width, scaleY = this.height / height;
+
+ var component, componentScaleX, componentScaleY, blocksPerScanline;
+ var x, y, i, j, k;
+ var index;
+ var offset = 0;
+ var output;
+ var numComponents = this.components.length;
+ var dataLength = width * height * numComponents;
+ var data = new Uint8Array(dataLength);
+ var xScaleBlockOffset = new Uint32Array(width);
+ var mask3LSB = 0xfffffff8; // used to clear the 3 LSBs
+
+ for (i = 0; i < numComponents; i++) {
+ component = this.components[i];
+ componentScaleX = component.scaleX * scaleX;
+ componentScaleY = component.scaleY * scaleY;
+ offset = i;
+ output = component.output;
+ blocksPerScanline = (component.blocksPerLine + 1) << 3;
+ // precalculate the xScaleBlockOffset
+ for (x = 0; x < width; x++) {
+ j = 0 | (x * componentScaleX);
+ xScaleBlockOffset[x] = ((j & mask3LSB) << 3) | (j & 7);
+ }
+ // linearize the blocks of the component
+ for (y = 0; y < height; y++) {
+ j = 0 | (y * componentScaleY);
+ index = blocksPerScanline * (j & mask3LSB) | ((j & 7) << 3);
+ for (x = 0; x < width; x++) {
+ data[offset] = output[index + xScaleBlockOffset[x]];
+ offset += numComponents;
+ }
+ }
+ }
+
+ // decodeTransform contains pairs of multiplier (-256..256) and additive
+ var transform = this.decodeTransform;
+ if (transform) {
+ for (i = 0; i < dataLength;) {
+ for (j = 0, k = 0; j < numComponents; j++, i++, k += 2) {
+ data[i] = ((data[i] * transform[k]) >> 8) + transform[k + 1];
+ }
+ }
+ }
+ return data;
+ },
+
+ _isColorConversionNeeded: function isColorConversionNeeded() {
+ if (this.adobe && this.adobe.transformCode) {
+ // The adobe transform marker overrides any previous setting
+ return true;
+ } else if (this.numComponents === 3) {
+ return true;
+ } else {
+ return false;
+ }
+ },
+
+ _convertYccToRgb: function convertYccToRgb(data) {
+ var Y, Cb, Cr;
+ for (var i = 0, length = data.length; i < length; i += 3) {
+ Y = data[i ];
+ Cb = data[i + 1];
+ Cr = data[i + 2];
+ data[i ] = clamp0to255(Y - 179.456 + 1.402 * Cr);
+ data[i + 1] = clamp0to255(Y + 135.459 - 0.344 * Cb - 0.714 * Cr);
+ data[i + 2] = clamp0to255(Y - 226.816 + 1.772 * Cb);
+ }
+ return data;
+ },
+
+ _convertYcckToRgb: function convertYcckToRgb(data) {
+ var Y, Cb, Cr, k;
+ var offset = 0;
+ for (var i = 0, length = data.length; i < length; i += 4) {
+ Y = data[i];
+ Cb = data[i + 1];
+ Cr = data[i + 2];
+ k = data[i + 3];
+
+ var r = -122.67195406894 +
+ Cb * (-6.60635669420364e-5 * Cb + 0.000437130475926232 * Cr -
+ 5.4080610064599e-5 * Y + 0.00048449797120281 * k -
+ 0.154362151871126) +
+ Cr * (-0.000957964378445773 * Cr + 0.000817076911346625 * Y -
+ 0.00477271405408747 * k + 1.53380253221734) +
+ Y * (0.000961250184130688 * Y - 0.00266257332283933 * k +
+ 0.48357088451265) +
+ k * (-0.000336197177618394 * k + 0.484791561490776);
+
+ var g = 107.268039397724 +
+ Cb * (2.19927104525741e-5 * Cb - 0.000640992018297945 * Cr +
+ 0.000659397001245577 * Y + 0.000426105652938837 * k -
+ 0.176491792462875) +
+ Cr * (-0.000778269941513683 * Cr + 0.00130872261408275 * Y +
+ 0.000770482631801132 * k - 0.151051492775562) +
+ Y * (0.00126935368114843 * Y - 0.00265090189010898 * k +
+ 0.25802910206845) +
+ k * (-0.000318913117588328 * k - 0.213742400323665);
+
+ var b = -20.810012546947 +
+ Cb * (-0.000570115196973677 * Cb - 2.63409051004589e-5 * Cr +
+ 0.0020741088115012 * Y - 0.00288260236853442 * k +
+ 0.814272968359295) +
+ Cr * (-1.53496057440975e-5 * Cr - 0.000132689043961446 * Y +
+ 0.000560833691242812 * k - 0.195152027534049) +
+ Y * (0.00174418132927582 * Y - 0.00255243321439347 * k +
+ 0.116935020465145) +
+ k * (-0.000343531996510555 * k + 0.24165260232407);
+
+ data[offset++] = clamp0to255(r);
+ data[offset++] = clamp0to255(g);
+ data[offset++] = clamp0to255(b);
+ }
+ return data;
+ },
+
+ _convertYcckToCmyk: function convertYcckToCmyk(data) {
+ var Y, Cb, Cr;
+ for (var i = 0, length = data.length; i < length; i += 4) {
+ Y = data[i];
+ Cb = data[i + 1];
+ Cr = data[i + 2];
+ data[i ] = clamp0to255(434.456 - Y - 1.402 * Cr);
+ data[i + 1] = clamp0to255(119.541 - Y + 0.344 * Cb + 0.714 * Cr);
+ data[i + 2] = clamp0to255(481.816 - Y - 1.772 * Cb);
+ // K in data[i + 3] is unchanged
+ }
+ return data;
+ },
+
+ _convertCmykToRgb: function convertCmykToRgb(data) {
+ var c, m, y, k;
+ var offset = 0;
+ var min = -255 * 255 * 255;
+ var scale = 1 / 255 / 255;
+ for (var i = 0, length = data.length; i < length; i += 4) {
+ c = data[i];
+ m = data[i + 1];
+ y = data[i + 2];
+ k = data[i + 3];
+
+ var r =
+ c * (-4.387332384609988 * c + 54.48615194189176 * m +
+ 18.82290502165302 * y + 212.25662451639585 * k -
+ 72734.4411664936) +
+ m * (1.7149763477362134 * m - 5.6096736904047315 * y -
+ 17.873870861415444 * k - 1401.7366389350734) +
+ y * (-2.5217340131683033 * y - 21.248923337353073 * k +
+ 4465.541406466231) -
+ k * (21.86122147463605 * k + 48317.86113160301);
+ var g =
+ c * (8.841041422036149 * c + 60.118027045597366 * m +
+ 6.871425592049007 * y + 31.159100130055922 * k -
+ 20220.756542821975) +
+ m * (-15.310361306967817 * m + 17.575251261109482 * y +
+ 131.35250912493976 * k - 48691.05921601825) +
+ y * (4.444339102852739 * y + 9.8632861493405 * k -
+ 6341.191035517494) -
+ k * (20.737325471181034 * k + 47890.15695978492);
+ var b =
+ c * (0.8842522430003296 * c + 8.078677503112928 * m +
+ 30.89978309703729 * y - 0.23883238689178934 * k -
+ 3616.812083916688) +
+ m * (10.49593273432072 * m + 63.02378494754052 * y +
+ 50.606957656360734 * k - 28620.90484698408) +
+ y * (0.03296041114873217 * y + 115.60384449646641 * k -
+ 49363.43385999684) -
+ k * (22.33816807309886 * k + 45932.16563550634);
+
+ data[offset++] = r >= 0 ? 255 : r <= min ? 0 : 255 + r * scale | 0;
+ data[offset++] = g >= 0 ? 255 : g <= min ? 0 : 255 + g * scale | 0;
+ data[offset++] = b >= 0 ? 255 : b <= min ? 0 : 255 + b * scale | 0;
+ }
+ return data;
+ },
+
+ getData: function getData(width, height, forceRGBoutput) {
+ if (this.numComponents > 4) {
+ throw 'Unsupported color mode';
+ }
+ // type of data: Uint8Array(width * height * numComponents)
+ var data = this._getLinearizedBlockData(width, height);
+
+ if (this.numComponents === 3) {
+ return this._convertYccToRgb(data);
+ } else if (this.numComponents === 4) {
+ if (this._isColorConversionNeeded()) {
+ if (forceRGBoutput) {
+ return this._convertYcckToRgb(data);
+ } else {
+ return this._convertYcckToCmyk(data);
+ }
+ } else if (forceRGBoutput) {
+ return this._convertCmykToRgb(data);
+ }
+ }
+ return data;
+ }
+ };
+
+ return constructor;
+})();
+
+
+var JpxImage = (function JpxImageClosure() {
+ // Table E.1
+ var SubbandsGainLog2 = {
+ 'LL': 0,
+ 'LH': 1,
+ 'HL': 1,
+ 'HH': 2
+ };
+ function JpxImage() {
+ this.failOnCorruptedImage = false;
+ }
+ JpxImage.prototype = {
+ parse: function JpxImage_parse(data) {
+
+ var head = readUint16(data, 0);
+ // No box header, immediate start of codestream (SOC)
+ if (head === 0xFF4F) {
+ this.parseCodestream(data, 0, data.length);
+ return;
+ }
+
+ var position = 0, length = data.length;
+ while (position < length) {
+ var headerSize = 8;
+ var lbox = readUint32(data, position);
+ var tbox = readUint32(data, position + 4);
+ position += headerSize;
+ if (lbox === 1) {
+ // XLBox: read UInt64 according to spec.
+ // JavaScript's int precision of 53 bit should be sufficient here.
+ lbox = readUint32(data, position) * 4294967296 +
+ readUint32(data, position + 4);
+ position += 8;
+ headerSize += 8;
+ }
+ if (lbox === 0) {
+ lbox = length - position + headerSize;
+ }
+ if (lbox < headerSize) {
+ throw new Error('JPX Error: Invalid box field size');
+ }
+ var dataLength = lbox - headerSize;
+ var jumpDataLength = true;
+ switch (tbox) {
+ case 0x6A703268: // 'jp2h'
+ jumpDataLength = false; // parsing child boxes
+ break;
+ case 0x636F6C72: // 'colr'
+ // Colorspaces are not used, the CS from the PDF is used.
+ var method = data[position];
+ var precedence = data[position + 1];
+ var approximation = data[position + 2];
+ if (method === 1) {
+ // enumerated colorspace
+ var colorspace = readUint32(data, position + 3);
+ switch (colorspace) {
+ case 16: // this indicates a sRGB colorspace
+ case 17: // this indicates a grayscale colorspace
+ case 18: // this indicates a YUV colorspace
+ break;
+ default:
+ warn('Unknown colorspace ' + colorspace);
+ break;
+ }
+ } else if (method === 2) {
+ info('ICC profile not supported');
+ }
+ break;
+ case 0x6A703263: // 'jp2c'
+ this.parseCodestream(data, position, position + dataLength);
+ break;
+ case 0x6A502020: // 'jP\024\024'
+ if (0x0d0a870a !== readUint32(data, position)) {
+ warn('Invalid JP2 signature');
+ }
+ break;
+ // The following header types are valid but currently not used:
+ case 0x6A501A1A: // 'jP\032\032'
+ case 0x66747970: // 'ftyp'
+ case 0x72726571: // 'rreq'
+ case 0x72657320: // 'res '
+ case 0x69686472: // 'ihdr'
+ break;
+ default:
+ var headerType = String.fromCharCode((tbox >> 24) & 0xFF,
+ (tbox >> 16) & 0xFF,
+ (tbox >> 8) & 0xFF,
+ tbox & 0xFF);
+ warn('Unsupported header type ' + tbox + ' (' + headerType + ')');
+ break;
+ }
+ if (jumpDataLength) {
+ position += dataLength;
+ }
+ }
+ },
+ parseImageProperties: function JpxImage_parseImageProperties(stream) {
+ var newByte = stream.getByte();
+ while (newByte >= 0) {
+ var oldByte = newByte;
+ newByte = stream.getByte();
+ var code = (oldByte << 8) | newByte;
+ // Image and tile size (SIZ)
+ if (code === 0xFF51) {
+ stream.skip(4);
+ var Xsiz = stream.getInt32() >>> 0; // Byte 4
+ var Ysiz = stream.getInt32() >>> 0; // Byte 8
+ var XOsiz = stream.getInt32() >>> 0; // Byte 12
+ var YOsiz = stream.getInt32() >>> 0; // Byte 16
+ stream.skip(16);
+ var Csiz = stream.getUint16(); // Byte 36
+ this.width = Xsiz - XOsiz;
+ this.height = Ysiz - YOsiz;
+ this.componentsCount = Csiz;
+ // Results are always returned as Uint8Arrays
+ this.bitsPerComponent = 8;
+ return;
+ }
+ }
+ throw new Error('JPX Error: No size marker found in JPX stream');
+ },
+ parseCodestream: function JpxImage_parseCodestream(data, start, end) {
+ var context = {};
+ try {
+ var doNotRecover = false;
+ var position = start;
+ while (position + 1 < end) {
+ var code = readUint16(data, position);
+ position += 2;
+
+ var length = 0, j, sqcd, spqcds, spqcdSize, scalarExpounded, tile;
+ switch (code) {
+ case 0xFF4F: // Start of codestream (SOC)
+ context.mainHeader = true;
+ break;
+ case 0xFFD9: // End of codestream (EOC)
+ break;
+ case 0xFF51: // Image and tile size (SIZ)
+ length = readUint16(data, position);
+ var siz = {};
+ siz.Xsiz = readUint32(data, position + 4);
+ siz.Ysiz = readUint32(data, position + 8);
+ siz.XOsiz = readUint32(data, position + 12);
+ siz.YOsiz = readUint32(data, position + 16);
+ siz.XTsiz = readUint32(data, position + 20);
+ siz.YTsiz = readUint32(data, position + 24);
+ siz.XTOsiz = readUint32(data, position + 28);
+ siz.YTOsiz = readUint32(data, position + 32);
+ var componentsCount = readUint16(data, position + 36);
+ siz.Csiz = componentsCount;
+ var components = [];
+ j = position + 38;
+ for (var i = 0; i < componentsCount; i++) {
+ var component = {
+ precision: (data[j] & 0x7F) + 1,
+ isSigned: !!(data[j] & 0x80),
+ XRsiz: data[j + 1],
+ YRsiz: data[j + 1]
+ };
+ calculateComponentDimensions(component, siz);
+ components.push(component);
+ }
+ context.SIZ = siz;
+ context.components = components;
+ calculateTileGrids(context, components);
+ context.QCC = [];
+ context.COC = [];
+ break;
+ case 0xFF5C: // Quantization default (QCD)
+ length = readUint16(data, position);
+ var qcd = {};
+ j = position + 2;
+ sqcd = data[j++];
+ switch (sqcd & 0x1F) {
+ case 0:
+ spqcdSize = 8;
+ scalarExpounded = true;
+ break;
+ case 1:
+ spqcdSize = 16;
+ scalarExpounded = false;
+ break;
+ case 2:
+ spqcdSize = 16;
+ scalarExpounded = true;
+ break;
+ default:
+ throw new Error('JPX Error: Invalid SQcd value ' + sqcd);
+ }
+ qcd.noQuantization = (spqcdSize === 8);
+ qcd.scalarExpounded = scalarExpounded;
+ qcd.guardBits = sqcd >> 5;
+ spqcds = [];
+ while (j < length + position) {
+ var spqcd = {};
+ if (spqcdSize === 8) {
+ spqcd.epsilon = data[j++] >> 3;
+ spqcd.mu = 0;
+ } else {
+ spqcd.epsilon = data[j] >> 3;
+ spqcd.mu = ((data[j] & 0x7) << 8) | data[j + 1];
+ j += 2;
+ }
+ spqcds.push(spqcd);
+ }
+ qcd.SPqcds = spqcds;
+ if (context.mainHeader) {
+ context.QCD = qcd;
+ } else {
+ context.currentTile.QCD = qcd;
+ context.currentTile.QCC = [];
+ }
+ break;
+ case 0xFF5D: // Quantization component (QCC)
+ length = readUint16(data, position);
+ var qcc = {};
+ j = position + 2;
+ var cqcc;
+ if (context.SIZ.Csiz < 257) {
+ cqcc = data[j++];
+ } else {
+ cqcc = readUint16(data, j);
+ j += 2;
+ }
+ sqcd = data[j++];
+ switch (sqcd & 0x1F) {
+ case 0:
+ spqcdSize = 8;
+ scalarExpounded = true;
+ break;
+ case 1:
+ spqcdSize = 16;
+ scalarExpounded = false;
+ break;
+ case 2:
+ spqcdSize = 16;
+ scalarExpounded = true;
+ break;
+ default:
+ throw new Error('JPX Error: Invalid SQcd value ' + sqcd);
+ }
+ qcc.noQuantization = (spqcdSize === 8);
+ qcc.scalarExpounded = scalarExpounded;
+ qcc.guardBits = sqcd >> 5;
+ spqcds = [];
+ while (j < (length + position)) {
+ spqcd = {};
+ if (spqcdSize === 8) {
+ spqcd.epsilon = data[j++] >> 3;
+ spqcd.mu = 0;
+ } else {
+ spqcd.epsilon = data[j] >> 3;
+ spqcd.mu = ((data[j] & 0x7) << 8) | data[j + 1];
+ j += 2;
+ }
+ spqcds.push(spqcd);
+ }
+ qcc.SPqcds = spqcds;
+ if (context.mainHeader) {
+ context.QCC[cqcc] = qcc;
+ } else {
+ context.currentTile.QCC[cqcc] = qcc;
+ }
+ break;
+ case 0xFF52: // Coding style default (COD)
+ length = readUint16(data, position);
+ var cod = {};
+ j = position + 2;
+ var scod = data[j++];
+ cod.entropyCoderWithCustomPrecincts = !!(scod & 1);
+ cod.sopMarkerUsed = !!(scod & 2);
+ cod.ephMarkerUsed = !!(scod & 4);
+ cod.progressionOrder = data[j++];
+ cod.layersCount = readUint16(data, j);
+ j += 2;
+ cod.multipleComponentTransform = data[j++];
+
+ cod.decompositionLevelsCount = data[j++];
+ cod.xcb = (data[j++] & 0xF) + 2;
+ cod.ycb = (data[j++] & 0xF) + 2;
+ var blockStyle = data[j++];
+ cod.selectiveArithmeticCodingBypass = !!(blockStyle & 1);
+ cod.resetContextProbabilities = !!(blockStyle & 2);
+ cod.terminationOnEachCodingPass = !!(blockStyle & 4);
+ cod.verticalyStripe = !!(blockStyle & 8);
+ cod.predictableTermination = !!(blockStyle & 16);
+ cod.segmentationSymbolUsed = !!(blockStyle & 32);
+ cod.reversibleTransformation = data[j++];
+ if (cod.entropyCoderWithCustomPrecincts) {
+ var precinctsSizes = [];
+ while (j < length + position) {
+ var precinctsSize = data[j++];
+ precinctsSizes.push({
+ PPx: precinctsSize & 0xF,
+ PPy: precinctsSize >> 4
+ });
+ }
+ cod.precinctsSizes = precinctsSizes;
+ }
+ var unsupported = [];
+ if (cod.selectiveArithmeticCodingBypass) {
+ unsupported.push('selectiveArithmeticCodingBypass');
+ }
+ if (cod.resetContextProbabilities) {
+ unsupported.push('resetContextProbabilities');
+ }
+ if (cod.terminationOnEachCodingPass) {
+ unsupported.push('terminationOnEachCodingPass');
+ }
+ if (cod.verticalyStripe) {
+ unsupported.push('verticalyStripe');
+ }
+ if (cod.predictableTermination) {
+ unsupported.push('predictableTermination');
+ }
+ if (unsupported.length > 0) {
+ doNotRecover = true;
+ throw new Error('JPX Error: Unsupported COD options (' +
+ unsupported.join(', ') + ')');
+ }
+ if (context.mainHeader) {
+ context.COD = cod;
+ } else {
+ context.currentTile.COD = cod;
+ context.currentTile.COC = [];
+ }
+ break;
+ case 0xFF90: // Start of tile-part (SOT)
+ length = readUint16(data, position);
+ tile = {};
+ tile.index = readUint16(data, position + 2);
+ tile.length = readUint32(data, position + 4);
+ tile.dataEnd = tile.length + position - 2;
+ tile.partIndex = data[position + 8];
+ tile.partsCount = data[position + 9];
+
+ context.mainHeader = false;
+ if (tile.partIndex === 0) {
+ // reset component specific settings
+ tile.COD = context.COD;
+ tile.COC = context.COC.slice(0); // clone of the global COC
+ tile.QCD = context.QCD;
+ tile.QCC = context.QCC.slice(0); // clone of the global COC
+ }
+ context.currentTile = tile;
+ break;
+ case 0xFF93: // Start of data (SOD)
+ tile = context.currentTile;
+ if (tile.partIndex === 0) {
+ initializeTile(context, tile.index);
+ buildPackets(context);
+ }
+
+ // moving to the end of the data
+ length = tile.dataEnd - position;
+ parseTilePackets(context, data, position, length);
+ break;
+ case 0xFF55: // Tile-part lengths, main header (TLM)
+ case 0xFF57: // Packet length, main header (PLM)
+ case 0xFF58: // Packet length, tile-part header (PLT)
+ case 0xFF64: // Comment (COM)
+ length = readUint16(data, position);
+ // skipping content
+ break;
+ case 0xFF53: // Coding style component (COC)
+ throw new Error('JPX Error: Codestream code 0xFF53 (COC) is ' +
+ 'not implemented');
+ default:
+ throw new Error('JPX Error: Unknown codestream code: ' +
+ code.toString(16));
+ }
+ position += length;
+ }
+ } catch (e) {
+ if (doNotRecover || this.failOnCorruptedImage) {
+ throw e;
+ } else {
+ warn('Trying to recover from ' + e.message);
+ }
+ }
+ this.tiles = transformComponents(context);
+ this.width = context.SIZ.Xsiz - context.SIZ.XOsiz;
+ this.height = context.SIZ.Ysiz - context.SIZ.YOsiz;
+ this.componentsCount = context.SIZ.Csiz;
+ }
+ };
+ function calculateComponentDimensions(component, siz) {
+ // Section B.2 Component mapping
+ component.x0 = Math.ceil(siz.XOsiz / component.XRsiz);
+ component.x1 = Math.ceil(siz.Xsiz / component.XRsiz);
+ component.y0 = Math.ceil(siz.YOsiz / component.YRsiz);
+ component.y1 = Math.ceil(siz.Ysiz / component.YRsiz);
+ component.width = component.x1 - component.x0;
+ component.height = component.y1 - component.y0;
+ }
+ function calculateTileGrids(context, components) {
+ var siz = context.SIZ;
+ // Section B.3 Division into tile and tile-components
+ var tile, tiles = [];
+ var numXtiles = Math.ceil((siz.Xsiz - siz.XTOsiz) / siz.XTsiz);
+ var numYtiles = Math.ceil((siz.Ysiz - siz.YTOsiz) / siz.YTsiz);
+ for (var q = 0; q < numYtiles; q++) {
+ for (var p = 0; p < numXtiles; p++) {
+ tile = {};
+ tile.tx0 = Math.max(siz.XTOsiz + p * siz.XTsiz, siz.XOsiz);
+ tile.ty0 = Math.max(siz.YTOsiz + q * siz.YTsiz, siz.YOsiz);
+ tile.tx1 = Math.min(siz.XTOsiz + (p + 1) * siz.XTsiz, siz.Xsiz);
+ tile.ty1 = Math.min(siz.YTOsiz + (q + 1) * siz.YTsiz, siz.Ysiz);
+ tile.width = tile.tx1 - tile.tx0;
+ tile.height = tile.ty1 - tile.ty0;
+ tile.components = [];
+ tiles.push(tile);
+ }
+ }
+ context.tiles = tiles;
+
+ var componentsCount = siz.Csiz;
+ for (var i = 0, ii = componentsCount; i < ii; i++) {
+ var component = components[i];
+ for (var j = 0, jj = tiles.length; j < jj; j++) {
+ var tileComponent = {};
+ tile = tiles[j];
+ tileComponent.tcx0 = Math.ceil(tile.tx0 / component.XRsiz);
+ tileComponent.tcy0 = Math.ceil(tile.ty0 / component.YRsiz);
+ tileComponent.tcx1 = Math.ceil(tile.tx1 / component.XRsiz);
+ tileComponent.tcy1 = Math.ceil(tile.ty1 / component.YRsiz);
+ tileComponent.width = tileComponent.tcx1 - tileComponent.tcx0;
+ tileComponent.height = tileComponent.tcy1 - tileComponent.tcy0;
+ tile.components[i] = tileComponent;
+ }
+ }
+ }
+ function getBlocksDimensions(context, component, r) {
+ var codOrCoc = component.codingStyleParameters;
+ var result = {};
+ if (!codOrCoc.entropyCoderWithCustomPrecincts) {
+ result.PPx = 15;
+ result.PPy = 15;
+ } else {
+ result.PPx = codOrCoc.precinctsSizes[r].PPx;
+ result.PPy = codOrCoc.precinctsSizes[r].PPy;
+ }
+ // calculate codeblock size as described in section B.7
+ result.xcb_ = (r > 0 ? Math.min(codOrCoc.xcb, result.PPx - 1) :
+ Math.min(codOrCoc.xcb, result.PPx));
+ result.ycb_ = (r > 0 ? Math.min(codOrCoc.ycb, result.PPy - 1) :
+ Math.min(codOrCoc.ycb, result.PPy));
+ return result;
+ }
+ function buildPrecincts(context, resolution, dimensions) {
+ // Section B.6 Division resolution to precincts
+ var precinctWidth = 1 << dimensions.PPx;
+ var precinctHeight = 1 << dimensions.PPy;
+ // Jasper introduces codeblock groups for mapping each subband codeblocks
+ // to precincts. Precinct partition divides a resolution according to width
+ // and height parameters. The subband that belongs to the resolution level
+ // has a different size than the level, unless it is the zero resolution.
+
+ // From Jasper documentation: jpeg2000.pdf, section K: Tier-2 coding:
+ // The precinct partitioning for a particular subband is derived from a
+ // partitioning of its parent LL band (i.e., the LL band at the next higher
+ // resolution level)... The LL band associated with each resolution level is
+ // divided into precincts... Each of the resulting precinct regions is then
+ // mapped into its child subbands (if any) at the next lower resolution
+ // level. This is accomplished by using the coordinate transformation
+ // (u, v) = (ceil(x/2), ceil(y/2)) where (x, y) and (u, v) are the
+ // coordinates of a point in the LL band and child subband, respectively.
+ var isZeroRes = resolution.resLevel === 0;
+ var precinctWidthInSubband = 1 << (dimensions.PPx + (isZeroRes ? 0 : -1));
+ var precinctHeightInSubband = 1 << (dimensions.PPy + (isZeroRes ? 0 : -1));
+ var numprecinctswide = (resolution.trx1 > resolution.trx0 ?
+ Math.ceil(resolution.trx1 / precinctWidth) -
+ Math.floor(resolution.trx0 / precinctWidth) : 0);
+ var numprecinctshigh = (resolution.try1 > resolution.try0 ?
+ Math.ceil(resolution.try1 / precinctHeight) -
+ Math.floor(resolution.try0 / precinctHeight) : 0);
+ var numprecincts = numprecinctswide * numprecinctshigh;
+
+ resolution.precinctParameters = {
+ precinctWidth: precinctWidth,
+ precinctHeight: precinctHeight,
+ numprecinctswide: numprecinctswide,
+ numprecinctshigh: numprecinctshigh,
+ numprecincts: numprecincts,
+ precinctWidthInSubband: precinctWidthInSubband,
+ precinctHeightInSubband: precinctHeightInSubband
+ };
+ }
+ function buildCodeblocks(context, subband, dimensions) {
+ // Section B.7 Division sub-band into code-blocks
+ var xcb_ = dimensions.xcb_;
+ var ycb_ = dimensions.ycb_;
+ var codeblockWidth = 1 << xcb_;
+ var codeblockHeight = 1 << ycb_;
+ var cbx0 = subband.tbx0 >> xcb_;
+ var cby0 = subband.tby0 >> ycb_;
+ var cbx1 = (subband.tbx1 + codeblockWidth - 1) >> xcb_;
+ var cby1 = (subband.tby1 + codeblockHeight - 1) >> ycb_;
+ var precinctParameters = subband.resolution.precinctParameters;
+ var codeblocks = [];
+ var precincts = [];
+ var i, j, codeblock, precinctNumber;
+ for (j = cby0; j < cby1; j++) {
+ for (i = cbx0; i < cbx1; i++) {
+ codeblock = {
+ cbx: i,
+ cby: j,
+ tbx0: codeblockWidth * i,
+ tby0: codeblockHeight * j,
+ tbx1: codeblockWidth * (i + 1),
+ tby1: codeblockHeight * (j + 1)
+ };
+
+ codeblock.tbx0_ = Math.max(subband.tbx0, codeblock.tbx0);
+ codeblock.tby0_ = Math.max(subband.tby0, codeblock.tby0);
+ codeblock.tbx1_ = Math.min(subband.tbx1, codeblock.tbx1);
+ codeblock.tby1_ = Math.min(subband.tby1, codeblock.tby1);
+
+ // Calculate precinct number for this codeblock, codeblock position
+ // should be relative to its subband, use actual dimension and position
+ // See comment about codeblock group width and height
+ var pi = Math.floor((codeblock.tbx0_ - subband.tbx0) /
+ precinctParameters.precinctWidthInSubband);
+ var pj = Math.floor((codeblock.tby0_ - subband.tby0) /
+ precinctParameters.precinctHeightInSubband);
+ precinctNumber = pi + (pj * precinctParameters.numprecinctswide);
+
+ codeblock.precinctNumber = precinctNumber;
+ codeblock.subbandType = subband.type;
+ codeblock.Lblock = 3;
+
+ if (codeblock.tbx1_ <= codeblock.tbx0_ ||
+ codeblock.tby1_ <= codeblock.tby0_) {
+ continue;
+ }
+ codeblocks.push(codeblock);
+ // building precinct for the sub-band
+ var precinct = precincts[precinctNumber];
+ if (precinct !== undefined) {
+ if (i < precinct.cbxMin) {
+ precinct.cbxMin = i;
+ } else if (i > precinct.cbxMax) {
+ precinct.cbxMax = i;
+ }
+ if (j < precinct.cbyMin) {
+ precinct.cbxMin = j;
+ } else if (j > precinct.cbyMax) {
+ precinct.cbyMax = j;
+ }
+ } else {
+ precincts[precinctNumber] = precinct = {
+ cbxMin: i,
+ cbyMin: j,
+ cbxMax: i,
+ cbyMax: j
+ };
+ }
+ codeblock.precinct = precinct;
+ }
+ }
+ subband.codeblockParameters = {
+ codeblockWidth: xcb_,
+ codeblockHeight: ycb_,
+ numcodeblockwide: cbx1 - cbx0 + 1,
+ numcodeblockhigh: cby1 - cby0 + 1
+ };
+ subband.codeblocks = codeblocks;
+ subband.precincts = precincts;
+ }
+ function createPacket(resolution, precinctNumber, layerNumber) {
+ var precinctCodeblocks = [];
+ // Section B.10.8 Order of info in packet
+ var subbands = resolution.subbands;
+ // sub-bands already ordered in 'LL', 'HL', 'LH', and 'HH' sequence
+ for (var i = 0, ii = subbands.length; i < ii; i++) {
+ var subband = subbands[i];
+ var codeblocks = subband.codeblocks;
+ for (var j = 0, jj = codeblocks.length; j < jj; j++) {
+ var codeblock = codeblocks[j];
+ if (codeblock.precinctNumber !== precinctNumber) {
+ continue;
+ }
+ precinctCodeblocks.push(codeblock);
+ }
+ }
+ return {
+ layerNumber: layerNumber,
+ codeblocks: precinctCodeblocks
+ };
+ }
+ function LayerResolutionComponentPositionIterator(context) {
+ var siz = context.SIZ;
+ var tileIndex = context.currentTile.index;
+ var tile = context.tiles[tileIndex];
+ var layersCount = tile.codingStyleDefaultParameters.layersCount;
+ var componentsCount = siz.Csiz;
+ var maxDecompositionLevelsCount = 0;
+ for (var q = 0; q < componentsCount; q++) {
+ maxDecompositionLevelsCount = Math.max(maxDecompositionLevelsCount,
+ tile.components[q].codingStyleParameters.decompositionLevelsCount);
+ }
+
+ var l = 0, r = 0, i = 0, k = 0;
+
+ this.nextPacket = function JpxImage_nextPacket() {
+ // Section B.12.1.1 Layer-resolution-component-position
+ for (; l < layersCount; l++) {
+ for (; r <= maxDecompositionLevelsCount; r++) {
+ for (; i < componentsCount; i++) {
+ var component = tile.components[i];
+ if (r > component.codingStyleParameters.decompositionLevelsCount) {
+ continue;
+ }
+
+ var resolution = component.resolutions[r];
+ var numprecincts = resolution.precinctParameters.numprecincts;
+ for (; k < numprecincts;) {
+ var packet = createPacket(resolution, k, l);
+ k++;
+ return packet;
+ }
+ k = 0;
+ }
+ i = 0;
+ }
+ r = 0;
+ }
+ throw new Error('JPX Error: Out of packets');
+ };
+ }
+ function ResolutionLayerComponentPositionIterator(context) {
+ var siz = context.SIZ;
+ var tileIndex = context.currentTile.index;
+ var tile = context.tiles[tileIndex];
+ var layersCount = tile.codingStyleDefaultParameters.layersCount;
+ var componentsCount = siz.Csiz;
+ var maxDecompositionLevelsCount = 0;
+ for (var q = 0; q < componentsCount; q++) {
+ maxDecompositionLevelsCount = Math.max(maxDecompositionLevelsCount,
+ tile.components[q].codingStyleParameters.decompositionLevelsCount);
+ }
+
+ var r = 0, l = 0, i = 0, k = 0;
+
+ this.nextPacket = function JpxImage_nextPacket() {
+ // Section B.12.1.2 Resolution-layer-component-position
+ for (; r <= maxDecompositionLevelsCount; r++) {
+ for (; l < layersCount; l++) {
+ for (; i < componentsCount; i++) {
+ var component = tile.components[i];
+ if (r > component.codingStyleParameters.decompositionLevelsCount) {
+ continue;
+ }
+
+ var resolution = component.resolutions[r];
+ var numprecincts = resolution.precinctParameters.numprecincts;
+ for (; k < numprecincts;) {
+ var packet = createPacket(resolution, k, l);
+ k++;
+ return packet;
+ }
+ k = 0;
+ }
+ i = 0;
+ }
+ l = 0;
+ }
+ throw new Error('JPX Error: Out of packets');
+ };
+ }
+ function ResolutionPositionComponentLayerIterator(context) {
+ var siz = context.SIZ;
+ var tileIndex = context.currentTile.index;
+ var tile = context.tiles[tileIndex];
+ var layersCount = tile.codingStyleDefaultParameters.layersCount;
+ var componentsCount = siz.Csiz;
+ var l, r, c, p;
+ var maxDecompositionLevelsCount = 0;
+ for (c = 0; c < componentsCount; c++) {
+ var component = tile.components[c];
+ maxDecompositionLevelsCount = Math.max(maxDecompositionLevelsCount,
+ component.codingStyleParameters.decompositionLevelsCount);
+ }
+ var maxNumPrecinctsInLevel = new Int32Array(
+ maxDecompositionLevelsCount + 1);
+ for (r = 0; r <= maxDecompositionLevelsCount; ++r) {
+ var maxNumPrecincts = 0;
+ for (c = 0; c < componentsCount; ++c) {
+ var resolutions = tile.components[c].resolutions;
+ if (r < resolutions.length) {
+ maxNumPrecincts = Math.max(maxNumPrecincts,
+ resolutions[r].precinctParameters.numprecincts);
+ }
+ }
+ maxNumPrecinctsInLevel[r] = maxNumPrecincts;
+ }
+ l = 0;
+ r = 0;
+ c = 0;
+ p = 0;
+
+ this.nextPacket = function JpxImage_nextPacket() {
+ // Section B.12.1.3 Resolution-position-component-layer
+ for (; r <= maxDecompositionLevelsCount; r++) {
+ for (; p < maxNumPrecinctsInLevel[r]; p++) {
+ for (; c < componentsCount; c++) {
+ var component = tile.components[c];
+ if (r > component.codingStyleParameters.decompositionLevelsCount) {
+ continue;
+ }
+ var resolution = component.resolutions[r];
+ var numprecincts = resolution.precinctParameters.numprecincts;
+ if (p >= numprecincts) {
+ continue;
+ }
+ for (; l < layersCount;) {
+ var packet = createPacket(resolution, p, l);
+ l++;
+ return packet;
+ }
+ l = 0;
+ }
+ c = 0;
+ }
+ p = 0;
+ }
+ throw new Error('JPX Error: Out of packets');
+ };
+ }
+ function PositionComponentResolutionLayerIterator(context) {
+ var siz = context.SIZ;
+ var tileIndex = context.currentTile.index;
+ var tile = context.tiles[tileIndex];
+ var layersCount = tile.codingStyleDefaultParameters.layersCount;
+ var componentsCount = siz.Csiz;
+ var precinctsSizes = getPrecinctSizesInImageScale(tile);
+ var precinctsIterationSizes = precinctsSizes;
+ var l = 0, r = 0, c = 0, px = 0, py = 0;
+
+ this.nextPacket = function JpxImage_nextPacket() {
+ // Section B.12.1.4 Position-component-resolution-layer
+ for (; py < precinctsIterationSizes.maxNumHigh; py++) {
+ for (; px < precinctsIterationSizes.maxNumWide; px++) {
+ for (; c < componentsCount; c++) {
+ var component = tile.components[c];
+ var decompositionLevelsCount =
+ component.codingStyleParameters.decompositionLevelsCount;
+ for (; r <= decompositionLevelsCount; r++) {
+ var resolution = component.resolutions[r];
+ var sizeInImageScale =
+ precinctsSizes.components[c].resolutions[r];
+ var k = getPrecinctIndexIfExist(
+ px,
+ py,
+ sizeInImageScale,
+ precinctsIterationSizes,
+ resolution);
+ if (k === null) {
+ continue;
+ }
+ for (; l < layersCount;) {
+ var packet = createPacket(resolution, k, l);
+ l++;
+ return packet;
+ }
+ l = 0;
+ }
+ r = 0;
+ }
+ c = 0;
+ }
+ px = 0;
+ }
+ throw new Error('JPX Error: Out of packets');
+ };
+ }
+ function ComponentPositionResolutionLayerIterator(context) {
+ var siz = context.SIZ;
+ var tileIndex = context.currentTile.index;
+ var tile = context.tiles[tileIndex];
+ var layersCount = tile.codingStyleDefaultParameters.layersCount;
+ var componentsCount = siz.Csiz;
+ var precinctsSizes = getPrecinctSizesInImageScale(tile);
+ var l = 0, r = 0, c = 0, px = 0, py = 0;
+
+ this.nextPacket = function JpxImage_nextPacket() {
+ // Section B.12.1.5 Component-position-resolution-layer
+ for (; c < componentsCount; ++c) {
+ var component = tile.components[c];
+ var precinctsIterationSizes = precinctsSizes.components[c];
+ var decompositionLevelsCount =
+ component.codingStyleParameters.decompositionLevelsCount;
+ for (; py < precinctsIterationSizes.maxNumHigh; py++) {
+ for (; px < precinctsIterationSizes.maxNumWide; px++) {
+ for (; r <= decompositionLevelsCount; r++) {
+ var resolution = component.resolutions[r];
+ var sizeInImageScale = precinctsIterationSizes.resolutions[r];
+ var k = getPrecinctIndexIfExist(
+ px,
+ py,
+ sizeInImageScale,
+ precinctsIterationSizes,
+ resolution);
+ if (k === null) {
+ continue;
+ }
+ for (; l < layersCount;) {
+ var packet = createPacket(resolution, k, l);
+ l++;
+ return packet;
+ }
+ l = 0;
+ }
+ r = 0;
+ }
+ px = 0;
+ }
+ py = 0;
+ }
+ throw new Error('JPX Error: Out of packets');
+ };
+ }
+ function getPrecinctIndexIfExist(
+ pxIndex, pyIndex, sizeInImageScale, precinctIterationSizes, resolution) {
+ var posX = pxIndex * precinctIterationSizes.minWidth;
+ var posY = pyIndex * precinctIterationSizes.minHeight;
+ if (posX % sizeInImageScale.width !== 0 ||
+ posY % sizeInImageScale.height !== 0) {
+ return null;
+ }
+ var startPrecinctRowIndex =
+ (posY / sizeInImageScale.width) *
+ resolution.precinctParameters.numprecinctswide;
+ return (posX / sizeInImageScale.height) + startPrecinctRowIndex;
+ }
+ function getPrecinctSizesInImageScale(tile) {
+ var componentsCount = tile.components.length;
+ var minWidth = Number.MAX_VALUE;
+ var minHeight = Number.MAX_VALUE;
+ var maxNumWide = 0;
+ var maxNumHigh = 0;
+ var sizePerComponent = new Array(componentsCount);
+ for (var c = 0; c < componentsCount; c++) {
+ var component = tile.components[c];
+ var decompositionLevelsCount =
+ component.codingStyleParameters.decompositionLevelsCount;
+ var sizePerResolution = new Array(decompositionLevelsCount + 1);
+ var minWidthCurrentComponent = Number.MAX_VALUE;
+ var minHeightCurrentComponent = Number.MAX_VALUE;
+ var maxNumWideCurrentComponent = 0;
+ var maxNumHighCurrentComponent = 0;
+ var scale = 1;
+ for (var r = decompositionLevelsCount; r >= 0; --r) {
+ var resolution = component.resolutions[r];
+ var widthCurrentResolution =
+ scale * resolution.precinctParameters.precinctWidth;
+ var heightCurrentResolution =
+ scale * resolution.precinctParameters.precinctHeight;
+ minWidthCurrentComponent = Math.min(
+ minWidthCurrentComponent,
+ widthCurrentResolution);
+ minHeightCurrentComponent = Math.min(
+ minHeightCurrentComponent,
+ heightCurrentResolution);
+ maxNumWideCurrentComponent = Math.max(maxNumWideCurrentComponent,
+ resolution.precinctParameters.numprecinctswide);
+ maxNumHighCurrentComponent = Math.max(maxNumHighCurrentComponent,
+ resolution.precinctParameters.numprecinctshigh);
+ sizePerResolution[r] = {
+ width: widthCurrentResolution,
+ height: heightCurrentResolution
+ };
+ scale <<= 1;
+ }
+ minWidth = Math.min(minWidth, minWidthCurrentComponent);
+ minHeight = Math.min(minHeight, minHeightCurrentComponent);
+ maxNumWide = Math.max(maxNumWide, maxNumWideCurrentComponent);
+ maxNumHigh = Math.max(maxNumHigh, maxNumHighCurrentComponent);
+ sizePerComponent[c] = {
+ resolutions: sizePerResolution,
+ minWidth: minWidthCurrentComponent,
+ minHeight: minHeightCurrentComponent,
+ maxNumWide: maxNumWideCurrentComponent,
+ maxNumHigh: maxNumHighCurrentComponent
+ };
+ }
+ return {
+ components: sizePerComponent,
+ minWidth: minWidth,
+ minHeight: minHeight,
+ maxNumWide: maxNumWide,
+ maxNumHigh: maxNumHigh
+ };
+ }
+ function buildPackets(context) {
+ var siz = context.SIZ;
+ var tileIndex = context.currentTile.index;
+ var tile = context.tiles[tileIndex];
+ var componentsCount = siz.Csiz;
+ // Creating resolutions and sub-bands for each component
+ for (var c = 0; c < componentsCount; c++) {
+ var component = tile.components[c];
+ var decompositionLevelsCount =
+ component.codingStyleParameters.decompositionLevelsCount;
+ // Section B.5 Resolution levels and sub-bands
+ var resolutions = [];
+ var subbands = [];
+ for (var r = 0; r <= decompositionLevelsCount; r++) {
+ var blocksDimensions = getBlocksDimensions(context, component, r);
+ var resolution = {};
+ var scale = 1 << (decompositionLevelsCount - r);
+ resolution.trx0 = Math.ceil(component.tcx0 / scale);
+ resolution.try0 = Math.ceil(component.tcy0 / scale);
+ resolution.trx1 = Math.ceil(component.tcx1 / scale);
+ resolution.try1 = Math.ceil(component.tcy1 / scale);
+ resolution.resLevel = r;
+ buildPrecincts(context, resolution, blocksDimensions);
+ resolutions.push(resolution);
+
+ var subband;
+ if (r === 0) {
+ // one sub-band (LL) with last decomposition
+ subband = {};
+ subband.type = 'LL';
+ subband.tbx0 = Math.ceil(component.tcx0 / scale);
+ subband.tby0 = Math.ceil(component.tcy0 / scale);
+ subband.tbx1 = Math.ceil(component.tcx1 / scale);
+ subband.tby1 = Math.ceil(component.tcy1 / scale);
+ subband.resolution = resolution;
+ buildCodeblocks(context, subband, blocksDimensions);
+ subbands.push(subband);
+ resolution.subbands = [subband];
+ } else {
+ var bscale = 1 << (decompositionLevelsCount - r + 1);
+ var resolutionSubbands = [];
+ // three sub-bands (HL, LH and HH) with rest of decompositions
+ subband = {};
+ subband.type = 'HL';
+ subband.tbx0 = Math.ceil(component.tcx0 / bscale - 0.5);
+ subband.tby0 = Math.ceil(component.tcy0 / bscale);
+ subband.tbx1 = Math.ceil(component.tcx1 / bscale - 0.5);
+ subband.tby1 = Math.ceil(component.tcy1 / bscale);
+ subband.resolution = resolution;
+ buildCodeblocks(context, subband, blocksDimensions);
+ subbands.push(subband);
+ resolutionSubbands.push(subband);
+
+ subband = {};
+ subband.type = 'LH';
+ subband.tbx0 = Math.ceil(component.tcx0 / bscale);
+ subband.tby0 = Math.ceil(component.tcy0 / bscale - 0.5);
+ subband.tbx1 = Math.ceil(component.tcx1 / bscale);
+ subband.tby1 = Math.ceil(component.tcy1 / bscale - 0.5);
+ subband.resolution = resolution;
+ buildCodeblocks(context, subband, blocksDimensions);
+ subbands.push(subband);
+ resolutionSubbands.push(subband);
+
+ subband = {};
+ subband.type = 'HH';
+ subband.tbx0 = Math.ceil(component.tcx0 / bscale - 0.5);
+ subband.tby0 = Math.ceil(component.tcy0 / bscale - 0.5);
+ subband.tbx1 = Math.ceil(component.tcx1 / bscale - 0.5);
+ subband.tby1 = Math.ceil(component.tcy1 / bscale - 0.5);
+ subband.resolution = resolution;
+ buildCodeblocks(context, subband, blocksDimensions);
+ subbands.push(subband);
+ resolutionSubbands.push(subband);
+
+ resolution.subbands = resolutionSubbands;
+ }
+ }
+ component.resolutions = resolutions;
+ component.subbands = subbands;
+ }
+ // Generate the packets sequence
+ var progressionOrder = tile.codingStyleDefaultParameters.progressionOrder;
+ switch (progressionOrder) {
+ case 0:
+ tile.packetsIterator =
+ new LayerResolutionComponentPositionIterator(context);
+ break;
+ case 1:
+ tile.packetsIterator =
+ new ResolutionLayerComponentPositionIterator(context);
+ break;
+ case 2:
+ tile.packetsIterator =
+ new ResolutionPositionComponentLayerIterator(context);
+ break;
+ case 3:
+ tile.packetsIterator =
+ new PositionComponentResolutionLayerIterator(context);
+ break;
+ case 4:
+ tile.packetsIterator =
+ new ComponentPositionResolutionLayerIterator(context);
+ break;
+ default:
+ throw new Error('JPX Error: Unsupported progression order ' +
+ progressionOrder);
+ }
+ }
+ function parseTilePackets(context, data, offset, dataLength) {
+ var position = 0;
+ var buffer, bufferSize = 0, skipNextBit = false;
+ function readBits(count) {
+ while (bufferSize < count) {
+ var b = data[offset + position];
+ position++;
+ if (skipNextBit) {
+ buffer = (buffer << 7) | b;
+ bufferSize += 7;
+ skipNextBit = false;
+ } else {
+ buffer = (buffer << 8) | b;
+ bufferSize += 8;
+ }
+ if (b === 0xFF) {
+ skipNextBit = true;
+ }
+ }
+ bufferSize -= count;
+ return (buffer >>> bufferSize) & ((1 << count) - 1);
+ }
+ function skipMarkerIfEqual(value) {
+ if (data[offset + position - 1] === 0xFF &&
+ data[offset + position] === value) {
+ skipBytes(1);
+ return true;
+ } else if (data[offset + position] === 0xFF &&
+ data[offset + position + 1] === value) {
+ skipBytes(2);
+ return true;
+ }
+ return false;
+ }
+ function skipBytes(count) {
+ position += count;
+ }
+ function alignToByte() {
+ bufferSize = 0;
+ if (skipNextBit) {
+ position++;
+ skipNextBit = false;
+ }
+ }
+ function readCodingpasses() {
+ if (readBits(1) === 0) {
+ return 1;
+ }
+ if (readBits(1) === 0) {
+ return 2;
+ }
+ var value = readBits(2);
+ if (value < 3) {
+ return value + 3;
+ }
+ value = readBits(5);
+ if (value < 31) {
+ return value + 6;
+ }
+ value = readBits(7);
+ return value + 37;
+ }
+ var tileIndex = context.currentTile.index;
+ var tile = context.tiles[tileIndex];
+ var sopMarkerUsed = context.COD.sopMarkerUsed;
+ var ephMarkerUsed = context.COD.ephMarkerUsed;
+ var packetsIterator = tile.packetsIterator;
+ while (position < dataLength) {
+ alignToByte();
+ if (sopMarkerUsed && skipMarkerIfEqual(0x91)) {
+ // Skip also marker segment length and packet sequence ID
+ skipBytes(4);
+ }
+ var packet = packetsIterator.nextPacket();
+ if (!readBits(1)) {
+ continue;
+ }
+ var layerNumber = packet.layerNumber;
+ var queue = [], codeblock;
+ for (var i = 0, ii = packet.codeblocks.length; i < ii; i++) {
+ codeblock = packet.codeblocks[i];
+ var precinct = codeblock.precinct;
+ var codeblockColumn = codeblock.cbx - precinct.cbxMin;
+ var codeblockRow = codeblock.cby - precinct.cbyMin;
+ var codeblockIncluded = false;
+ var firstTimeInclusion = false;
+ var valueReady;
+ if (codeblock['included'] !== undefined) {
+ codeblockIncluded = !!readBits(1);
+ } else {
+ // reading inclusion tree
+ precinct = codeblock.precinct;
+ var inclusionTree, zeroBitPlanesTree;
+ if (precinct['inclusionTree'] !== undefined) {
+ inclusionTree = precinct.inclusionTree;
+ } else {
+ // building inclusion and zero bit-planes trees
+ var width = precinct.cbxMax - precinct.cbxMin + 1;
+ var height = precinct.cbyMax - precinct.cbyMin + 1;
+ inclusionTree = new InclusionTree(width, height, layerNumber);
+ zeroBitPlanesTree = new TagTree(width, height);
+ precinct.inclusionTree = inclusionTree;
+ precinct.zeroBitPlanesTree = zeroBitPlanesTree;
+ }
+
+ if (inclusionTree.reset(codeblockColumn, codeblockRow, layerNumber)) {
+ while (true) {
+ if (readBits(1)) {
+ valueReady = !inclusionTree.nextLevel();
+ if (valueReady) {
+ codeblock.included = true;
+ codeblockIncluded = firstTimeInclusion = true;
+ break;
+ }
+ } else {
+ inclusionTree.incrementValue(layerNumber);
+ break;
+ }
+ }
+ }
+ }
+ if (!codeblockIncluded) {
+ continue;
+ }
+ if (firstTimeInclusion) {
+ zeroBitPlanesTree = precinct.zeroBitPlanesTree;
+ zeroBitPlanesTree.reset(codeblockColumn, codeblockRow);
+ while (true) {
+ if (readBits(1)) {
+ valueReady = !zeroBitPlanesTree.nextLevel();
+ if (valueReady) {
+ break;
+ }
+ } else {
+ zeroBitPlanesTree.incrementValue();
+ }
+ }
+ codeblock.zeroBitPlanes = zeroBitPlanesTree.value;
+ }
+ var codingpasses = readCodingpasses();
+ while (readBits(1)) {
+ codeblock.Lblock++;
+ }
+ var codingpassesLog2 = log2(codingpasses);
+ // rounding down log2
+ var bits = ((codingpasses < (1 << codingpassesLog2)) ?
+ codingpassesLog2 - 1 : codingpassesLog2) + codeblock.Lblock;
+ var codedDataLength = readBits(bits);
+ queue.push({
+ codeblock: codeblock,
+ codingpasses: codingpasses,
+ dataLength: codedDataLength
+ });
+ }
+ alignToByte();
+ if (ephMarkerUsed) {
+ skipMarkerIfEqual(0x92);
+ }
+ while (queue.length > 0) {
+ var packetItem = queue.shift();
+ codeblock = packetItem.codeblock;
+ if (codeblock['data'] === undefined) {
+ codeblock.data = [];
+ }
+ codeblock.data.push({
+ data: data,
+ start: offset + position,
+ end: offset + position + packetItem.dataLength,
+ codingpasses: packetItem.codingpasses
+ });
+ position += packetItem.dataLength;
+ }
+ }
+ return position;
+ }
+ function copyCoefficients(coefficients, levelWidth, levelHeight, subband,
+ delta, mb, reversible, segmentationSymbolUsed) {
+ var x0 = subband.tbx0;
+ var y0 = subband.tby0;
+ var width = subband.tbx1 - subband.tbx0;
+ var codeblocks = subband.codeblocks;
+ var right = subband.type.charAt(0) === 'H' ? 1 : 0;
+ var bottom = subband.type.charAt(1) === 'H' ? levelWidth : 0;
+
+ for (var i = 0, ii = codeblocks.length; i < ii; ++i) {
+ var codeblock = codeblocks[i];
+ var blockWidth = codeblock.tbx1_ - codeblock.tbx0_;
+ var blockHeight = codeblock.tby1_ - codeblock.tby0_;
+ if (blockWidth === 0 || blockHeight === 0) {
+ continue;
+ }
+ if (codeblock['data'] === undefined) {
+ continue;
+ }
+
+ var bitModel, currentCodingpassType;
+ bitModel = new BitModel(blockWidth, blockHeight, codeblock.subbandType,
+ codeblock.zeroBitPlanes, mb);
+ currentCodingpassType = 2; // first bit plane starts from cleanup
+
+ // collect data
+ var data = codeblock.data, totalLength = 0, codingpasses = 0;
+ var j, jj, dataItem;
+ for (j = 0, jj = data.length; j < jj; j++) {
+ dataItem = data[j];
+ totalLength += dataItem.end - dataItem.start;
+ codingpasses += dataItem.codingpasses;
+ }
+ var encodedData = new Uint8Array(totalLength);
+ var position = 0;
+ for (j = 0, jj = data.length; j < jj; j++) {
+ dataItem = data[j];
+ var chunk = dataItem.data.subarray(dataItem.start, dataItem.end);
+ encodedData.set(chunk, position);
+ position += chunk.length;
+ }
+ // decoding the item
+ var decoder = new ArithmeticDecoder(encodedData, 0, totalLength);
+ bitModel.setDecoder(decoder);
+
+ for (j = 0; j < codingpasses; j++) {
+ switch (currentCodingpassType) {
+ case 0:
+ bitModel.runSignificancePropogationPass();
+ break;
+ case 1:
+ bitModel.runMagnitudeRefinementPass();
+ break;
+ case 2:
+ bitModel.runCleanupPass();
+ if (segmentationSymbolUsed) {
+ bitModel.checkSegmentationSymbol();
+ }
+ break;
+ }
+ currentCodingpassType = (currentCodingpassType + 1) % 3;
+ }
+
+ var offset = (codeblock.tbx0_ - x0) + (codeblock.tby0_ - y0) * width;
+ var sign = bitModel.coefficentsSign;
+ var magnitude = bitModel.coefficentsMagnitude;
+ var bitsDecoded = bitModel.bitsDecoded;
+ var magnitudeCorrection = reversible ? 0 : 0.5;
+ var k, n, nb;
+ position = 0;
+ // Do the interleaving of Section F.3.3 here, so we do not need
+ // to copy later. LL level is not interleaved, just copied.
+ var interleave = (subband.type !== 'LL');
+ for (j = 0; j < blockHeight; j++) {
+ var row = (offset / width) | 0; // row in the non-interleaved subband
+ var levelOffset = 2 * row * (levelWidth - width) + right + bottom;
+ for (k = 0; k < blockWidth; k++) {
+ n = magnitude[position];
+ if (n !== 0) {
+ n = (n + magnitudeCorrection) * delta;
+ if (sign[position] !== 0) {
+ n = -n;
+ }
+ nb = bitsDecoded[position];
+ var pos = interleave ? (levelOffset + (offset << 1)) : offset;
+ if (reversible && (nb >= mb)) {
+ coefficients[pos] = n;
+ } else {
+ coefficients[pos] = n * (1 << (mb - nb));
+ }
+ }
+ offset++;
+ position++;
+ }
+ offset += width - blockWidth;
+ }
+ }
+ }
+ function transformTile(context, tile, c) {
+ var component = tile.components[c];
+ var codingStyleParameters = component.codingStyleParameters;
+ var quantizationParameters = component.quantizationParameters;
+ var decompositionLevelsCount =
+ codingStyleParameters.decompositionLevelsCount;
+ var spqcds = quantizationParameters.SPqcds;
+ var scalarExpounded = quantizationParameters.scalarExpounded;
+ var guardBits = quantizationParameters.guardBits;
+ var segmentationSymbolUsed = codingStyleParameters.segmentationSymbolUsed;
+ var precision = context.components[c].precision;
+
+ var reversible = codingStyleParameters.reversibleTransformation;
+ var transform = (reversible ? new ReversibleTransform() :
+ new IrreversibleTransform());
+
+ var subbandCoefficients = [];
+ var b = 0;
+ for (var i = 0; i <= decompositionLevelsCount; i++) {
+ var resolution = component.resolutions[i];
+
+ var width = resolution.trx1 - resolution.trx0;
+ var height = resolution.try1 - resolution.try0;
+ // Allocate space for the whole sublevel.
+ var coefficients = new Float32Array(width * height);
+
+ for (var j = 0, jj = resolution.subbands.length; j < jj; j++) {
+ var mu, epsilon;
+ if (!scalarExpounded) {
+ // formula E-5
+ mu = spqcds[0].mu;
+ epsilon = spqcds[0].epsilon + (i > 0 ? 1 - i : 0);
+ } else {
+ mu = spqcds[b].mu;
+ epsilon = spqcds[b].epsilon;
+ b++;
+ }
+
+ var subband = resolution.subbands[j];
+ var gainLog2 = SubbandsGainLog2[subband.type];
+
+ // calulate quantization coefficient (Section E.1.1.1)
+ var delta = (reversible ? 1 :
+ Math.pow(2, precision + gainLog2 - epsilon) * (1 + mu / 2048));
+ var mb = (guardBits + epsilon - 1);
+
+ // In the first resolution level, copyCoefficients will fill the
+ // whole array with coefficients. In the succeding passes,
+ // copyCoefficients will consecutively fill in the values that belong
+ // to the interleaved positions of the HL, LH, and HH coefficients.
+ // The LL coefficients will then be interleaved in Transform.iterate().
+ copyCoefficients(coefficients, width, height, subband, delta, mb,
+ reversible, segmentationSymbolUsed);
+ }
+ subbandCoefficients.push({
+ width: width,
+ height: height,
+ items: coefficients
+ });
+ }
+
+ var result = transform.calculate(subbandCoefficients,
+ component.tcx0, component.tcy0);
+ return {
+ left: component.tcx0,
+ top: component.tcy0,
+ width: result.width,
+ height: result.height,
+ items: result.items
+ };
+ }
+ function transformComponents(context) {
+ var siz = context.SIZ;
+ var components = context.components;
+ var componentsCount = siz.Csiz;
+ var resultImages = [];
+ for (var i = 0, ii = context.tiles.length; i < ii; i++) {
+ var tile = context.tiles[i];
+ var transformedTiles = [];
+ var c;
+ for (c = 0; c < componentsCount; c++) {
+ transformedTiles[c] = transformTile(context, tile, c);
+ }
+ var tile0 = transformedTiles[0];
+ var out = new Uint8Array(tile0.items.length * componentsCount);
+ var result = {
+ left: tile0.left,
+ top: tile0.top,
+ width: tile0.width,
+ height: tile0.height,
+ items: out
+ };
+
+ // Section G.2.2 Inverse multi component transform
+ var shift, offset, max, min, maxK;
+ var pos = 0, j, jj, y0, y1, y2, r, g, b, k, val;
+ if (tile.codingStyleDefaultParameters.multipleComponentTransform) {
+ var fourComponents = componentsCount === 4;
+ var y0items = transformedTiles[0].items;
+ var y1items = transformedTiles[1].items;
+ var y2items = transformedTiles[2].items;
+ var y3items = fourComponents ? transformedTiles[3].items : null;
+
+ // HACK: The multiple component transform formulas below assume that
+ // all components have the same precision. With this in mind, we
+ // compute shift and offset only once.
+ shift = components[0].precision - 8;
+ offset = (128 << shift) + 0.5;
+ max = 255 * (1 << shift);
+ maxK = max * 0.5;
+ min = -maxK;
+
+ var component0 = tile.components[0];
+ var alpha01 = componentsCount - 3;
+ jj = y0items.length;
+ if (!component0.codingStyleParameters.reversibleTransformation) {
+ // inverse irreversible multiple component transform
+ for (j = 0; j < jj; j++, pos += alpha01) {
+ y0 = y0items[j] + offset;
+ y1 = y1items[j];
+ y2 = y2items[j];
+ r = y0 + 1.402 * y2;
+ g = y0 - 0.34413 * y1 - 0.71414 * y2;
+ b = y0 + 1.772 * y1;
+ out[pos++] = r <= 0 ? 0 : r >= max ? 255 : r >> shift;
+ out[pos++] = g <= 0 ? 0 : g >= max ? 255 : g >> shift;
+ out[pos++] = b <= 0 ? 0 : b >= max ? 255 : b >> shift;
+ }
+ } else {
+ // inverse reversible multiple component transform
+ for (j = 0; j < jj; j++, pos += alpha01) {
+ y0 = y0items[j] + offset;
+ y1 = y1items[j];
+ y2 = y2items[j];
+ g = y0 - ((y2 + y1) >> 2);
+ r = g + y2;
+ b = g + y1;
+ out[pos++] = r <= 0 ? 0 : r >= max ? 255 : r >> shift;
+ out[pos++] = g <= 0 ? 0 : g >= max ? 255 : g >> shift;
+ out[pos++] = b <= 0 ? 0 : b >= max ? 255 : b >> shift;
+ }
+ }
+ if (fourComponents) {
+ for (j = 0, pos = 3; j < jj; j++, pos += 4) {
+ k = y3items[j];
+ out[pos] = k <= min ? 0 : k >= maxK ? 255 : (k + offset) >> shift;
+ }
+ }
+ } else { // no multi-component transform
+ for (c = 0; c < componentsCount; c++) {
+ var items = transformedTiles[c].items;
+ shift = components[c].precision - 8;
+ offset = (128 << shift) + 0.5;
+ max = (127.5 * (1 << shift));
+ min = -max;
+ for (pos = c, j = 0, jj = items.length; j < jj; j++) {
+ val = items[j];
+ out[pos] = val <= min ? 0 :
+ val >= max ? 255 : (val + offset) >> shift;
+ pos += componentsCount;
+ }
+ }
+ }
+ resultImages.push(result);
+ }
+ return resultImages;
+ }
+ function initializeTile(context, tileIndex) {
+ var siz = context.SIZ;
+ var componentsCount = siz.Csiz;
+ var tile = context.tiles[tileIndex];
+ for (var c = 0; c < componentsCount; c++) {
+ var component = tile.components[c];
+ var qcdOrQcc = (context.currentTile.QCC[c] !== undefined ?
+ context.currentTile.QCC[c] : context.currentTile.QCD);
+ component.quantizationParameters = qcdOrQcc;
+ var codOrCoc = (context.currentTile.COC[c] !== undefined ?
+ context.currentTile.COC[c] : context.currentTile.COD);
+ component.codingStyleParameters = codOrCoc;
+ }
+ tile.codingStyleDefaultParameters = context.currentTile.COD;
+ }
+
+ // Section B.10.2 Tag trees
+ var TagTree = (function TagTreeClosure() {
+ function TagTree(width, height) {
+ var levelsLength = log2(Math.max(width, height)) + 1;
+ this.levels = [];
+ for (var i = 0; i < levelsLength; i++) {
+ var level = {
+ width: width,
+ height: height,
+ items: []
+ };
+ this.levels.push(level);
+ width = Math.ceil(width / 2);
+ height = Math.ceil(height / 2);
+ }
+ }
+ TagTree.prototype = {
+ reset: function TagTree_reset(i, j) {
+ var currentLevel = 0, value = 0, level;
+ while (currentLevel < this.levels.length) {
+ level = this.levels[currentLevel];
+ var index = i + j * level.width;
+ if (level.items[index] !== undefined) {
+ value = level.items[index];
+ break;
+ }
+ level.index = index;
+ i >>= 1;
+ j >>= 1;
+ currentLevel++;
+ }
+ currentLevel--;
+ level = this.levels[currentLevel];
+ level.items[level.index] = value;
+ this.currentLevel = currentLevel;
+ delete this.value;
+ },
+ incrementValue: function TagTree_incrementValue() {
+ var level = this.levels[this.currentLevel];
+ level.items[level.index]++;
+ },
+ nextLevel: function TagTree_nextLevel() {
+ var currentLevel = this.currentLevel;
+ var level = this.levels[currentLevel];
+ var value = level.items[level.index];
+ currentLevel--;
+ if (currentLevel < 0) {
+ this.value = value;
+ return false;
+ }
+
+ this.currentLevel = currentLevel;
+ level = this.levels[currentLevel];
+ level.items[level.index] = value;
+ return true;
+ }
+ };
+ return TagTree;
+ })();
+
+ var InclusionTree = (function InclusionTreeClosure() {
+ function InclusionTree(width, height, defaultValue) {
+ var levelsLength = log2(Math.max(width, height)) + 1;
+ this.levels = [];
+ for (var i = 0; i < levelsLength; i++) {
+ var items = new Uint8Array(width * height);
+ for (var j = 0, jj = items.length; j < jj; j++) {
+ items[j] = defaultValue;
+ }
+
+ var level = {
+ width: width,
+ height: height,
+ items: items
+ };
+ this.levels.push(level);
+
+ width = Math.ceil(width / 2);
+ height = Math.ceil(height / 2);
+ }
+ }
+ InclusionTree.prototype = {
+ reset: function InclusionTree_reset(i, j, stopValue) {
+ var currentLevel = 0;
+ while (currentLevel < this.levels.length) {
+ var level = this.levels[currentLevel];
+ var index = i + j * level.width;
+ level.index = index;
+ var value = level.items[index];
+
+ if (value === 0xFF) {
+ break;
+ }
+
+ if (value > stopValue) {
+ this.currentLevel = currentLevel;
+ // already know about this one, propagating the value to top levels
+ this.propagateValues();
+ return false;
+ }
+
+ i >>= 1;
+ j >>= 1;
+ currentLevel++;
+ }
+ this.currentLevel = currentLevel - 1;
+ return true;
+ },
+ incrementValue: function InclusionTree_incrementValue(stopValue) {
+ var level = this.levels[this.currentLevel];
+ level.items[level.index] = stopValue + 1;
+ this.propagateValues();
+ },
+ propagateValues: function InclusionTree_propagateValues() {
+ var levelIndex = this.currentLevel;
+ var level = this.levels[levelIndex];
+ var currentValue = level.items[level.index];
+ while (--levelIndex >= 0) {
+ level = this.levels[levelIndex];
+ level.items[level.index] = currentValue;
+ }
+ },
+ nextLevel: function InclusionTree_nextLevel() {
+ var currentLevel = this.currentLevel;
+ var level = this.levels[currentLevel];
+ var value = level.items[level.index];
+ level.items[level.index] = 0xFF;
+ currentLevel--;
+ if (currentLevel < 0) {
+ return false;
+ }
+
+ this.currentLevel = currentLevel;
+ level = this.levels[currentLevel];
+ level.items[level.index] = value;
+ return true;
+ }
+ };
+ return InclusionTree;
+ })();
+
+ // Section D. Coefficient bit modeling
+ var BitModel = (function BitModelClosure() {
+ var UNIFORM_CONTEXT = 17;
+ var RUNLENGTH_CONTEXT = 18;
+ // Table D-1
+ // The index is binary presentation: 0dddvvhh, ddd - sum of Di (0..4),
+ // vv - sum of Vi (0..2), and hh - sum of Hi (0..2)
+ var LLAndLHContextsLabel = new Uint8Array([
+ 0, 5, 8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 1, 6, 8, 0, 3, 7, 8, 0, 4,
+ 7, 8, 0, 0, 0, 0, 0, 2, 6, 8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 2, 6,
+ 8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 2, 6, 8, 0, 3, 7, 8, 0, 4, 7, 8
+ ]);
+ var HLContextLabel = new Uint8Array([
+ 0, 3, 4, 0, 5, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 1, 3, 4, 0, 6, 7, 7, 0, 8,
+ 8, 8, 0, 0, 0, 0, 0, 2, 3, 4, 0, 6, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 2, 3,
+ 4, 0, 6, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 2, 3, 4, 0, 6, 7, 7, 0, 8, 8, 8
+ ]);
+ var HHContextLabel = new Uint8Array([
+ 0, 1, 2, 0, 1, 2, 2, 0, 2, 2, 2, 0, 0, 0, 0, 0, 3, 4, 5, 0, 4, 5, 5, 0, 5,
+ 5, 5, 0, 0, 0, 0, 0, 6, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 0, 0, 0, 0, 8, 8,
+ 8, 0, 8, 8, 8, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 8, 8, 8, 0, 8, 8, 8
+ ]);
+
+ function BitModel(width, height, subband, zeroBitPlanes, mb) {
+ this.width = width;
+ this.height = height;
+
+ this.contextLabelTable = (subband === 'HH' ? HHContextLabel :
+ (subband === 'HL' ? HLContextLabel : LLAndLHContextsLabel));
+
+ var coefficientCount = width * height;
+
+ // coefficients outside the encoding region treated as insignificant
+ // add border state cells for significanceState
+ this.neighborsSignificance = new Uint8Array(coefficientCount);
+ this.coefficentsSign = new Uint8Array(coefficientCount);
+ this.coefficentsMagnitude = mb > 14 ? new Uint32Array(coefficientCount) :
+ mb > 6 ? new Uint16Array(coefficientCount) :
+ new Uint8Array(coefficientCount);
+ this.processingFlags = new Uint8Array(coefficientCount);
+
+ var bitsDecoded = new Uint8Array(coefficientCount);
+ if (zeroBitPlanes !== 0) {
+ for (var i = 0; i < coefficientCount; i++) {
+ bitsDecoded[i] = zeroBitPlanes;
+ }
+ }
+ this.bitsDecoded = bitsDecoded;
+
+ this.reset();
+ }
+
+ BitModel.prototype = {
+ setDecoder: function BitModel_setDecoder(decoder) {
+ this.decoder = decoder;
+ },
+ reset: function BitModel_reset() {
+ // We have 17 contexts that are accessed via context labels,
+ // plus the uniform and runlength context.
+ this.contexts = new Int8Array(19);
+
+ // Contexts are packed into 1 byte:
+ // highest 7 bits carry the index, lowest bit carries mps
+ this.contexts[0] = (4 << 1) | 0;
+ this.contexts[UNIFORM_CONTEXT] = (46 << 1) | 0;
+ this.contexts[RUNLENGTH_CONTEXT] = (3 << 1) | 0;
+ },
+ setNeighborsSignificance:
+ function BitModel_setNeighborsSignificance(row, column, index) {
+ var neighborsSignificance = this.neighborsSignificance;
+ var width = this.width, height = this.height;
+ var left = (column > 0);
+ var right = (column + 1 < width);
+ var i;
+
+ if (row > 0) {
+ i = index - width;
+ if (left) {
+ neighborsSignificance[i - 1] += 0x10;
+ }
+ if (right) {
+ neighborsSignificance[i + 1] += 0x10;
+ }
+ neighborsSignificance[i] += 0x04;
+ }
+
+ if (row + 1 < height) {
+ i = index + width;
+ if (left) {
+ neighborsSignificance[i - 1] += 0x10;
+ }
+ if (right) {
+ neighborsSignificance[i + 1] += 0x10;
+ }
+ neighborsSignificance[i] += 0x04;
+ }
+
+ if (left) {
+ neighborsSignificance[index - 1] += 0x01;
+ }
+ if (right) {
+ neighborsSignificance[index + 1] += 0x01;
+ }
+ neighborsSignificance[index] |= 0x80;
+ },
+ runSignificancePropogationPass:
+ function BitModel_runSignificancePropogationPass() {
+ var decoder = this.decoder;
+ var width = this.width, height = this.height;
+ var coefficentsMagnitude = this.coefficentsMagnitude;
+ var coefficentsSign = this.coefficentsSign;
+ var neighborsSignificance = this.neighborsSignificance;
+ var processingFlags = this.processingFlags;
+ var contexts = this.contexts;
+ var labels = this.contextLabelTable;
+ var bitsDecoded = this.bitsDecoded;
+ var processedInverseMask = ~1;
+ var processedMask = 1;
+ var firstMagnitudeBitMask = 2;
+
+ for (var i0 = 0; i0 < height; i0 += 4) {
+ for (var j = 0; j < width; j++) {
+ var index = i0 * width + j;
+ for (var i1 = 0; i1 < 4; i1++, index += width) {
+ var i = i0 + i1;
+ if (i >= height) {
+ break;
+ }
+ // clear processed flag first
+ processingFlags[index] &= processedInverseMask;
+
+ if (coefficentsMagnitude[index] ||
+ !neighborsSignificance[index]) {
+ continue;
+ }
+
+ var contextLabel = labels[neighborsSignificance[index]];
+ var decision = decoder.readBit(contexts, contextLabel);
+ if (decision) {
+ var sign = this.decodeSignBit(i, j, index);
+ coefficentsSign[index] = sign;
+ coefficentsMagnitude[index] = 1;
+ this.setNeighborsSignificance(i, j, index);
+ processingFlags[index] |= firstMagnitudeBitMask;
+ }
+ bitsDecoded[index]++;
+ processingFlags[index] |= processedMask;
+ }
+ }
+ }
+ },
+ decodeSignBit: function BitModel_decodeSignBit(row, column, index) {
+ var width = this.width, height = this.height;
+ var coefficentsMagnitude = this.coefficentsMagnitude;
+ var coefficentsSign = this.coefficentsSign;
+ var contribution, sign0, sign1, significance1;
+ var contextLabel, decoded;
+
+ // calculate horizontal contribution
+ significance1 = (column > 0 && coefficentsMagnitude[index - 1] !== 0);
+ if (column + 1 < width && coefficentsMagnitude[index + 1] !== 0) {
+ sign1 = coefficentsSign[index + 1];
+ if (significance1) {
+ sign0 = coefficentsSign[index - 1];
+ contribution = 1 - sign1 - sign0;
+ } else {
+ contribution = 1 - sign1 - sign1;
+ }
+ } else if (significance1) {
+ sign0 = coefficentsSign[index - 1];
+ contribution = 1 - sign0 - sign0;
+ } else {
+ contribution = 0;
+ }
+ var horizontalContribution = 3 * contribution;
+
+ // calculate vertical contribution and combine with the horizontal
+ significance1 = (row > 0 && coefficentsMagnitude[index - width] !== 0);
+ if (row + 1 < height && coefficentsMagnitude[index + width] !== 0) {
+ sign1 = coefficentsSign[index + width];
+ if (significance1) {
+ sign0 = coefficentsSign[index - width];
+ contribution = 1 - sign1 - sign0 + horizontalContribution;
+ } else {
+ contribution = 1 - sign1 - sign1 + horizontalContribution;
+ }
+ } else if (significance1) {
+ sign0 = coefficentsSign[index - width];
+ contribution = 1 - sign0 - sign0 + horizontalContribution;
+ } else {
+ contribution = horizontalContribution;
+ }
+
+ if (contribution >= 0) {
+ contextLabel = 9 + contribution;
+ decoded = this.decoder.readBit(this.contexts, contextLabel);
+ } else {
+ contextLabel = 9 - contribution;
+ decoded = this.decoder.readBit(this.contexts, contextLabel) ^ 1;
+ }
+ return decoded;
+ },
+ runMagnitudeRefinementPass:
+ function BitModel_runMagnitudeRefinementPass() {
+ var decoder = this.decoder;
+ var width = this.width, height = this.height;
+ var coefficentsMagnitude = this.coefficentsMagnitude;
+ var neighborsSignificance = this.neighborsSignificance;
+ var contexts = this.contexts;
+ var bitsDecoded = this.bitsDecoded;
+ var processingFlags = this.processingFlags;
+ var processedMask = 1;
+ var firstMagnitudeBitMask = 2;
+ var length = width * height;
+ var width4 = width * 4;
+
+ for (var index0 = 0, indexNext; index0 < length; index0 = indexNext) {
+ indexNext = Math.min(length, index0 + width4);
+ for (var j = 0; j < width; j++) {
+ for (var index = index0 + j; index < indexNext; index += width) {
+
+ // significant but not those that have just become
+ if (!coefficentsMagnitude[index] ||
+ (processingFlags[index] & processedMask) !== 0) {
+ continue;
+ }
+
+ var contextLabel = 16;
+ if ((processingFlags[index] & firstMagnitudeBitMask) !== 0) {
+ processingFlags[index] ^= firstMagnitudeBitMask;
+ // first refinement
+ var significance = neighborsSignificance[index] & 127;
+ contextLabel = significance === 0 ? 15 : 14;
+ }
+
+ var bit = decoder.readBit(contexts, contextLabel);
+ coefficentsMagnitude[index] =
+ (coefficentsMagnitude[index] << 1) | bit;
+ bitsDecoded[index]++;
+ processingFlags[index] |= processedMask;
+ }
+ }
+ }
+ },
+ runCleanupPass: function BitModel_runCleanupPass() {
+ var decoder = this.decoder;
+ var width = this.width, height = this.height;
+ var neighborsSignificance = this.neighborsSignificance;
+ var coefficentsMagnitude = this.coefficentsMagnitude;
+ var coefficentsSign = this.coefficentsSign;
+ var contexts = this.contexts;
+ var labels = this.contextLabelTable;
+ var bitsDecoded = this.bitsDecoded;
+ var processingFlags = this.processingFlags;
+ var processedMask = 1;
+ var firstMagnitudeBitMask = 2;
+ var oneRowDown = width;
+ var twoRowsDown = width * 2;
+ var threeRowsDown = width * 3;
+ var iNext;
+ for (var i0 = 0; i0 < height; i0 = iNext) {
+ iNext = Math.min(i0 + 4, height);
+ var indexBase = i0 * width;
+ var checkAllEmpty = i0 + 3 < height;
+ for (var j = 0; j < width; j++) {
+ var index0 = indexBase + j;
+ // using the property: labels[neighborsSignificance[index]] === 0
+ // when neighborsSignificance[index] === 0
+ var allEmpty = (checkAllEmpty &&
+ processingFlags[index0] === 0 &&
+ processingFlags[index0 + oneRowDown] === 0 &&
+ processingFlags[index0 + twoRowsDown] === 0 &&
+ processingFlags[index0 + threeRowsDown] === 0 &&
+ neighborsSignificance[index0] === 0 &&
+ neighborsSignificance[index0 + oneRowDown] === 0 &&
+ neighborsSignificance[index0 + twoRowsDown] === 0 &&
+ neighborsSignificance[index0 + threeRowsDown] === 0);
+ var i1 = 0, index = index0;
+ var i = i0, sign;
+ if (allEmpty) {
+ var hasSignificantCoefficent =
+ decoder.readBit(contexts, RUNLENGTH_CONTEXT);
+ if (!hasSignificantCoefficent) {
+ bitsDecoded[index0]++;
+ bitsDecoded[index0 + oneRowDown]++;
+ bitsDecoded[index0 + twoRowsDown]++;
+ bitsDecoded[index0 + threeRowsDown]++;
+ continue; // next column
+ }
+ i1 = (decoder.readBit(contexts, UNIFORM_CONTEXT) << 1) |
+ decoder.readBit(contexts, UNIFORM_CONTEXT);
+ if (i1 !== 0) {
+ i = i0 + i1;
+ index += i1 * width;
+ }
+
+ sign = this.decodeSignBit(i, j, index);
+ coefficentsSign[index] = sign;
+ coefficentsMagnitude[index] = 1;
+ this.setNeighborsSignificance(i, j, index);
+ processingFlags[index] |= firstMagnitudeBitMask;
+
+ index = index0;
+ for (var i2 = i0; i2 <= i; i2++, index += width) {
+ bitsDecoded[index]++;
+ }
+
+ i1++;
+ }
+ for (i = i0 + i1; i < iNext; i++, index += width) {
+ if (coefficentsMagnitude[index] ||
+ (processingFlags[index] & processedMask) !== 0) {
+ continue;
+ }
+
+ var contextLabel = labels[neighborsSignificance[index]];
+ var decision = decoder.readBit(contexts, contextLabel);
+ if (decision === 1) {
+ sign = this.decodeSignBit(i, j, index);
+ coefficentsSign[index] = sign;
+ coefficentsMagnitude[index] = 1;
+ this.setNeighborsSignificance(i, j, index);
+ processingFlags[index] |= firstMagnitudeBitMask;
+ }
+ bitsDecoded[index]++;
+ }
+ }
+ }
+ },
+ checkSegmentationSymbol: function BitModel_checkSegmentationSymbol() {
+ var decoder = this.decoder;
+ var contexts = this.contexts;
+ var symbol = (decoder.readBit(contexts, UNIFORM_CONTEXT) << 3) |
+ (decoder.readBit(contexts, UNIFORM_CONTEXT) << 2) |
+ (decoder.readBit(contexts, UNIFORM_CONTEXT) << 1) |
+ decoder.readBit(contexts, UNIFORM_CONTEXT);
+ if (symbol !== 0xA) {
+ throw new Error('JPX Error: Invalid segmentation symbol');
+ }
+ }
+ };
+
+ return BitModel;
+ })();
+
+ // Section F, Discrete wavelet transformation
+ var Transform = (function TransformClosure() {
+ function Transform() {}
+
+ Transform.prototype.calculate =
+ function transformCalculate(subbands, u0, v0) {
+ var ll = subbands[0];
+ for (var i = 1, ii = subbands.length; i < ii; i++) {
+ ll = this.iterate(ll, subbands[i], u0, v0);
+ }
+ return ll;
+ };
+ Transform.prototype.extend = function extend(buffer, offset, size) {
+ // Section F.3.7 extending... using max extension of 4
+ var i1 = offset - 1, j1 = offset + 1;
+ var i2 = offset + size - 2, j2 = offset + size;
+ buffer[i1--] = buffer[j1++];
+ buffer[j2++] = buffer[i2--];
+ buffer[i1--] = buffer[j1++];
+ buffer[j2++] = buffer[i2--];
+ buffer[i1--] = buffer[j1++];
+ buffer[j2++] = buffer[i2--];
+ buffer[i1] = buffer[j1];
+ buffer[j2] = buffer[i2];
+ };
+ Transform.prototype.iterate = function Transform_iterate(ll, hl_lh_hh,
+ u0, v0) {
+ var llWidth = ll.width, llHeight = ll.height, llItems = ll.items;
+ var width = hl_lh_hh.width;
+ var height = hl_lh_hh.height;
+ var items = hl_lh_hh.items;
+ var i, j, k, l, u, v;
+
+ // Interleave LL according to Section F.3.3
+ for (k = 0, i = 0; i < llHeight; i++) {
+ l = i * 2 * width;
+ for (j = 0; j < llWidth; j++, k++, l += 2) {
+ items[l] = llItems[k];
+ }
+ }
+ // The LL band is not needed anymore.
+ llItems = ll.items = null;
+
+ var bufferPadding = 4;
+ var rowBuffer = new Float32Array(width + 2 * bufferPadding);
+
+ // Section F.3.4 HOR_SR
+ if (width === 1) {
+ // if width = 1, when u0 even keep items as is, when odd divide by 2
+ if ((u0 & 1) !== 0) {
+ for (v = 0, k = 0; v < height; v++, k += width) {
+ items[k] *= 0.5;
+ }
+ }
+ } else {
+ for (v = 0, k = 0; v < height; v++, k += width) {
+ rowBuffer.set(items.subarray(k, k + width), bufferPadding);
+
+ this.extend(rowBuffer, bufferPadding, width);
+ this.filter(rowBuffer, bufferPadding, width);
+
+ items.set(
+ rowBuffer.subarray(bufferPadding, bufferPadding + width),
+ k);
+ }
+ }
+
+ // Accesses to the items array can take long, because it may not fit into
+ // CPU cache and has to be fetched from main memory. Since subsequent
+ // accesses to the items array are not local when reading columns, we
+ // have a cache miss every time. To reduce cache misses, get up to
+ // 'numBuffers' items at a time and store them into the individual
+ // buffers. The colBuffers should be small enough to fit into CPU cache.
+ var numBuffers = 16;
+ var colBuffers = [];
+ for (i = 0; i < numBuffers; i++) {
+ colBuffers.push(new Float32Array(height + 2 * bufferPadding));
+ }
+ var b, currentBuffer = 0;
+ ll = bufferPadding + height;
+
+ // Section F.3.5 VER_SR
+ if (height === 1) {
+ // if height = 1, when v0 even keep items as is, when odd divide by 2
+ if ((v0 & 1) !== 0) {
+ for (u = 0; u < width; u++) {
+ items[u] *= 0.5;
+ }
+ }
+ } else {
+ for (u = 0; u < width; u++) {
+ // if we ran out of buffers, copy several image columns at once
+ if (currentBuffer === 0) {
+ numBuffers = Math.min(width - u, numBuffers);
+ for (k = u, l = bufferPadding; l < ll; k += width, l++) {
+ for (b = 0; b < numBuffers; b++) {
+ colBuffers[b][l] = items[k + b];
+ }
+ }
+ currentBuffer = numBuffers;
+ }
+
+ currentBuffer--;
+ var buffer = colBuffers[currentBuffer];
+ this.extend(buffer, bufferPadding, height);
+ this.filter(buffer, bufferPadding, height);
+
+ // If this is last buffer in this group of buffers, flush all buffers.
+ if (currentBuffer === 0) {
+ k = u - numBuffers + 1;
+ for (l = bufferPadding; l < ll; k += width, l++) {
+ for (b = 0; b < numBuffers; b++) {
+ items[k + b] = colBuffers[b][l];
+ }
+ }
+ }
+ }
+ }
+
+ return {
+ width: width,
+ height: height,
+ items: items
+ };
+ };
+ return Transform;
+ })();
+
+ // Section 3.8.2 Irreversible 9-7 filter
+ var IrreversibleTransform = (function IrreversibleTransformClosure() {
+ function IrreversibleTransform() {
+ Transform.call(this);
+ }
+
+ IrreversibleTransform.prototype = Object.create(Transform.prototype);
+ IrreversibleTransform.prototype.filter =
+ function irreversibleTransformFilter(x, offset, length) {
+ var len = length >> 1;
+ offset = offset | 0;
+ var j, n, current, next;
+
+ var alpha = -1.586134342059924;
+ var beta = -0.052980118572961;
+ var gamma = 0.882911075530934;
+ var delta = 0.443506852043971;
+ var K = 1.230174104914001;
+ var K_ = 1 / K;
+
+ // step 1 is combined with step 3
+
+ // step 2
+ j = offset - 3;
+ for (n = len + 4; n--; j += 2) {
+ x[j] *= K_;
+ }
+
+ // step 1 & 3
+ j = offset - 2;
+ current = delta * x[j -1];
+ for (n = len + 3; n--; j += 2) {
+ next = delta * x[j + 1];
+ x[j] = K * x[j] - current - next;
+ if (n--) {
+ j += 2;
+ current = delta * x[j + 1];
+ x[j] = K * x[j] - current - next;
+ } else {
+ break;
+ }
+ }
+
+ // step 4
+ j = offset - 1;
+ current = gamma * x[j - 1];
+ for (n = len + 2; n--; j += 2) {
+ next = gamma * x[j + 1];
+ x[j] -= current + next;
+ if (n--) {
+ j += 2;
+ current = gamma * x[j + 1];
+ x[j] -= current + next;
+ } else {
+ break;
+ }
+ }
+
+ // step 5
+ j = offset;
+ current = beta * x[j - 1];
+ for (n = len + 1; n--; j += 2) {
+ next = beta * x[j + 1];
+ x[j] -= current + next;
+ if (n--) {
+ j += 2;
+ current = beta * x[j + 1];
+ x[j] -= current + next;
+ } else {
+ break;
+ }
+ }
+
+ // step 6
+ if (len !== 0) {
+ j = offset + 1;
+ current = alpha * x[j - 1];
+ for (n = len; n--; j += 2) {
+ next = alpha * x[j + 1];
+ x[j] -= current + next;
+ if (n--) {
+ j += 2;
+ current = alpha * x[j + 1];
+ x[j] -= current + next;
+ } else {
+ break;
+ }
+ }
+ }
+ };
+
+ return IrreversibleTransform;
+ })();
+
+ // Section 3.8.1 Reversible 5-3 filter
+ var ReversibleTransform = (function ReversibleTransformClosure() {
+ function ReversibleTransform() {
+ Transform.call(this);
+ }
+
+ ReversibleTransform.prototype = Object.create(Transform.prototype);
+ ReversibleTransform.prototype.filter =
+ function reversibleTransformFilter(x, offset, length) {
+ var len = length >> 1;
+ offset = offset | 0;
+ var j, n;
+
+ for (j = offset, n = len + 1; n--; j += 2) {
+ x[j] -= (x[j - 1] + x[j + 1] + 2) >> 2;
+ }
+
+ for (j = offset + 1, n = len; n--; j += 2) {
+ x[j] += (x[j - 1] + x[j + 1]) >> 1;
+ }
+ };
+
+ return ReversibleTransform;
+ })();
+
+ return JpxImage;
+})();
+
+
+var Jbig2Image = (function Jbig2ImageClosure() {
+ // Utility data structures
+ function ContextCache() {}
+
+ ContextCache.prototype = {
+ getContexts: function(id) {
+ if (id in this) {
+ return this[id];
+ }
+ return (this[id] = new Int8Array(1 << 16));
+ }
+ };
+
+ function DecodingContext(data, start, end) {
+ this.data = data;
+ this.start = start;
+ this.end = end;
+ }
+
+ DecodingContext.prototype = {
+ get decoder() {
+ var decoder = new ArithmeticDecoder(this.data, this.start, this.end);
+ return shadow(this, 'decoder', decoder);
+ },
+ get contextCache() {
+ var cache = new ContextCache();
+ return shadow(this, 'contextCache', cache);
+ }
+ };
+
+ // Annex A. Arithmetic Integer Decoding Procedure
+ // A.2 Procedure for decoding values
+ function decodeInteger(contextCache, procedure, decoder) {
+ var contexts = contextCache.getContexts(procedure);
+ var prev = 1;
+
+ function readBits(length) {
+ var v = 0;
+ for (var i = 0; i < length; i++) {
+ var bit = decoder.readBit(contexts, prev);
+ prev = (prev < 256 ? (prev << 1) | bit :
+ (((prev << 1) | bit) & 511) | 256);
+ v = (v << 1) | bit;
+ }
+ return v >>> 0;
+ }
+
+ var sign = readBits(1);
+ var value = readBits(1) ?
+ (readBits(1) ?
+ (readBits(1) ?
+ (readBits(1) ?
+ (readBits(1) ?
+ (readBits(32) + 4436) :
+ readBits(12) + 340) :
+ readBits(8) + 84) :
+ readBits(6) + 20) :
+ readBits(4) + 4) :
+ readBits(2);
+ return (sign === 0 ? value : (value > 0 ? -value : null));
+ }
+
+ // A.3 The IAID decoding procedure
+ function decodeIAID(contextCache, decoder, codeLength) {
+ var contexts = contextCache.getContexts('IAID');
+
+ var prev = 1;
+ for (var i = 0; i < codeLength; i++) {
+ var bit = decoder.readBit(contexts, prev);
+ prev = (prev << 1) | bit;
+ }
+ if (codeLength < 31) {
+ return prev & ((1 << codeLength) - 1);
+ }
+ return prev & 0x7FFFFFFF;
+ }
+
+ // 7.3 Segment types
+ var SegmentTypes = [
+ 'SymbolDictionary', null, null, null, 'IntermediateTextRegion', null,
+ 'ImmediateTextRegion', 'ImmediateLosslessTextRegion', null, null, null,
+ null, null, null, null, null, 'patternDictionary', null, null, null,
+ 'IntermediateHalftoneRegion', null, 'ImmediateHalftoneRegion',
+ 'ImmediateLosslessHalftoneRegion', null, null, null, null, null, null, null,
+ null, null, null, null, null, 'IntermediateGenericRegion', null,
+ 'ImmediateGenericRegion', 'ImmediateLosslessGenericRegion',
+ 'IntermediateGenericRefinementRegion', null,
+ 'ImmediateGenericRefinementRegion',
+ 'ImmediateLosslessGenericRefinementRegion', null, null, null, null,
+ 'PageInformation', 'EndOfPage', 'EndOfStripe', 'EndOfFile', 'Profiles',
+ 'Tables', null, null, null, null, null, null, null, null,
+ 'Extension'
+ ];
+
+ var CodingTemplates = [
+ [{x: -1, y: -2}, {x: 0, y: -2}, {x: 1, y: -2}, {x: -2, y: -1},
+ {x: -1, y: -1}, {x: 0, y: -1}, {x: 1, y: -1}, {x: 2, y: -1},
+ {x: -4, y: 0}, {x: -3, y: 0}, {x: -2, y: 0}, {x: -1, y: 0}],
+ [{x: -1, y: -2}, {x: 0, y: -2}, {x: 1, y: -2}, {x: 2, y: -2},
+ {x: -2, y: -1}, {x: -1, y: -1}, {x: 0, y: -1}, {x: 1, y: -1},
+ {x: 2, y: -1}, {x: -3, y: 0}, {x: -2, y: 0}, {x: -1, y: 0}],
+ [{x: -1, y: -2}, {x: 0, y: -2}, {x: 1, y: -2}, {x: -2, y: -1},
+ {x: -1, y: -1}, {x: 0, y: -1}, {x: 1, y: -1}, {x: -2, y: 0},
+ {x: -1, y: 0}],
+ [{x: -3, y: -1}, {x: -2, y: -1}, {x: -1, y: -1}, {x: 0, y: -1},
+ {x: 1, y: -1}, {x: -4, y: 0}, {x: -3, y: 0}, {x: -2, y: 0}, {x: -1, y: 0}]
+ ];
+
+ var RefinementTemplates = [
+ {
+ coding: [{x: 0, y: -1}, {x: 1, y: -1}, {x: -1, y: 0}],
+ reference: [{x: 0, y: -1}, {x: 1, y: -1}, {x: -1, y: 0}, {x: 0, y: 0},
+ {x: 1, y: 0}, {x: -1, y: 1}, {x: 0, y: 1}, {x: 1, y: 1}]
+ },
+ {
+ coding: [{x: -1, y: -1}, {x: 0, y: -1}, {x: 1, y: -1}, {x: -1, y: 0}],
+ reference: [{x: 0, y: -1}, {x: -1, y: 0}, {x: 0, y: 0}, {x: 1, y: 0},
+ {x: 0, y: 1}, {x: 1, y: 1}]
+ }
+ ];
+
+ // See 6.2.5.7 Decoding the bitmap.
+ var ReusedContexts = [
+ 0x9B25, // 10011 0110010 0101
+ 0x0795, // 0011 110010 101
+ 0x00E5, // 001 11001 01
+ 0x0195 // 011001 0101
+ ];
+
+ var RefinementReusedContexts = [
+ 0x0020, // '000' + '0' (coding) + '00010000' + '0' (reference)
+ 0x0008 // '0000' + '001000'
+ ];
+
+ function decodeBitmapTemplate0(width, height, decodingContext) {
+ var decoder = decodingContext.decoder;
+ var contexts = decodingContext.contextCache.getContexts('GB');
+ var contextLabel, i, j, pixel, row, row1, row2, bitmap = [];
+
+ // ...ooooo....
+ // ..ooooooo... Context template for current pixel (X)
+ // .ooooX...... (concatenate values of 'o'-pixels to get contextLabel)
+ var OLD_PIXEL_MASK = 0x7BF7; // 01111 0111111 0111
+
+ for (i = 0; i < height; i++) {
+ row = bitmap[i] = new Uint8Array(width);
+ row1 = (i < 1) ? row : bitmap[i - 1];
+ row2 = (i < 2) ? row : bitmap[i - 2];
+
+ // At the beginning of each row:
+ // Fill contextLabel with pixels that are above/right of (X)
+ contextLabel = (row2[0] << 13) | (row2[1] << 12) | (row2[2] << 11) |
+ (row1[0] << 7) | (row1[1] << 6) | (row1[2] << 5) |
+ (row1[3] << 4);
+
+ for (j = 0; j < width; j++) {
+ row[j] = pixel = decoder.readBit(contexts, contextLabel);
+
+ // At each pixel: Clear contextLabel pixels that are shifted
+ // out of the context, then add new ones.
+ contextLabel = ((contextLabel & OLD_PIXEL_MASK) << 1) |
+ (j + 3 < width ? row2[j + 3] << 11 : 0) |
+ (j + 4 < width ? row1[j + 4] << 4 : 0) | pixel;
+ }
+ }
+
+ return bitmap;
+ }
+
+ // 6.2 Generic Region Decoding Procedure
+ function decodeBitmap(mmr, width, height, templateIndex, prediction, skip, at,
+ decodingContext) {
+ if (mmr) {
+ error('JBIG2 error: MMR encoding is not supported');
+ }
+
+ // Use optimized version for the most common case
+ if (templateIndex === 0 && !skip && !prediction && at.length === 4 &&
+ at[0].x === 3 && at[0].y === -1 && at[1].x === -3 && at[1].y === -1 &&
+ at[2].x === 2 && at[2].y === -2 && at[3].x === -2 && at[3].y === -2) {
+ return decodeBitmapTemplate0(width, height, decodingContext);
+ }
+
+ var useskip = !!skip;
+ var template = CodingTemplates[templateIndex].concat(at);
+
+ // Sorting is non-standard, and it is not required. But sorting increases
+ // the number of template bits that can be reused from the previous
+ // contextLabel in the main loop.
+ template.sort(function (a, b) {
+ return (a.y - b.y) || (a.x - b.x);
+ });
+
+ var templateLength = template.length;
+ var templateX = new Int8Array(templateLength);
+ var templateY = new Int8Array(templateLength);
+ var changingTemplateEntries = [];
+ var reuseMask = 0, minX = 0, maxX = 0, minY = 0;
+ var c, k;
+
+ for (k = 0; k < templateLength; k++) {
+ templateX[k] = template[k].x;
+ templateY[k] = template[k].y;
+ minX = Math.min(minX, template[k].x);
+ maxX = Math.max(maxX, template[k].x);
+ minY = Math.min(minY, template[k].y);
+ // Check if the template pixel appears in two consecutive context labels,
+ // so it can be reused. Otherwise, we add it to the list of changing
+ // template entries.
+ if (k < templateLength - 1 &&
+ template[k].y === template[k + 1].y &&
+ template[k].x === template[k + 1].x - 1) {
+ reuseMask |= 1 << (templateLength - 1 - k);
+ } else {
+ changingTemplateEntries.push(k);
+ }
+ }
+ var changingEntriesLength = changingTemplateEntries.length;
+
+ var changingTemplateX = new Int8Array(changingEntriesLength);
+ var changingTemplateY = new Int8Array(changingEntriesLength);
+ var changingTemplateBit = new Uint16Array(changingEntriesLength);
+ for (c = 0; c < changingEntriesLength; c++) {
+ k = changingTemplateEntries[c];
+ changingTemplateX[c] = template[k].x;
+ changingTemplateY[c] = template[k].y;
+ changingTemplateBit[c] = 1 << (templateLength - 1 - k);
+ }
+
+ // Get the safe bounding box edges from the width, height, minX, maxX, minY
+ var sbb_left = -minX;
+ var sbb_top = -minY;
+ var sbb_right = width - maxX;
+
+ var pseudoPixelContext = ReusedContexts[templateIndex];
+ var row = new Uint8Array(width);
+ var bitmap = [];
+
+ var decoder = decodingContext.decoder;
+ var contexts = decodingContext.contextCache.getContexts('GB');
+
+ var ltp = 0, j, i0, j0, contextLabel = 0, bit, shift;
+ for (var i = 0; i < height; i++) {
+ if (prediction) {
+ var sltp = decoder.readBit(contexts, pseudoPixelContext);
+ ltp ^= sltp;
+ if (ltp) {
+ bitmap.push(row); // duplicate previous row
+ continue;
+ }
+ }
+ row = new Uint8Array(row);
+ bitmap.push(row);
+ for (j = 0; j < width; j++) {
+ if (useskip && skip[i][j]) {
+ row[j] = 0;
+ continue;
+ }
+ // Are we in the middle of a scanline, so we can reuse contextLabel
+ // bits?
+ if (j >= sbb_left && j < sbb_right && i >= sbb_top) {
+ // If yes, we can just shift the bits that are reusable and only
+ // fetch the remaining ones.
+ contextLabel = (contextLabel << 1) & reuseMask;
+ for (k = 0; k < changingEntriesLength; k++) {
+ i0 = i + changingTemplateY[k];
+ j0 = j + changingTemplateX[k];
+ bit = bitmap[i0][j0];
+ if (bit) {
+ bit = changingTemplateBit[k];
+ contextLabel |= bit;
+ }
+ }
+ } else {
+ // compute the contextLabel from scratch
+ contextLabel = 0;
+ shift = templateLength - 1;
+ for (k = 0; k < templateLength; k++, shift--) {
+ j0 = j + templateX[k];
+ if (j0 >= 0 && j0 < width) {
+ i0 = i + templateY[k];
+ if (i0 >= 0) {
+ bit = bitmap[i0][j0];
+ if (bit) {
+ contextLabel |= bit << shift;
+ }
+ }
+ }
+ }
+ }
+ var pixel = decoder.readBit(contexts, contextLabel);
+ row[j] = pixel;
+ }
+ }
+ return bitmap;
+ }
+
+ // 6.3.2 Generic Refinement Region Decoding Procedure
+ function decodeRefinement(width, height, templateIndex, referenceBitmap,
+ offsetX, offsetY, prediction, at,
+ decodingContext) {
+ var codingTemplate = RefinementTemplates[templateIndex].coding;
+ if (templateIndex === 0) {
+ codingTemplate = codingTemplate.concat([at[0]]);
+ }
+ var codingTemplateLength = codingTemplate.length;
+ var codingTemplateX = new Int32Array(codingTemplateLength);
+ var codingTemplateY = new Int32Array(codingTemplateLength);
+ var k;
+ for (k = 0; k < codingTemplateLength; k++) {
+ codingTemplateX[k] = codingTemplate[k].x;
+ codingTemplateY[k] = codingTemplate[k].y;
+ }
+
+ var referenceTemplate = RefinementTemplates[templateIndex].reference;
+ if (templateIndex === 0) {
+ referenceTemplate = referenceTemplate.concat([at[1]]);
+ }
+ var referenceTemplateLength = referenceTemplate.length;
+ var referenceTemplateX = new Int32Array(referenceTemplateLength);
+ var referenceTemplateY = new Int32Array(referenceTemplateLength);
+ for (k = 0; k < referenceTemplateLength; k++) {
+ referenceTemplateX[k] = referenceTemplate[k].x;
+ referenceTemplateY[k] = referenceTemplate[k].y;
+ }
+ var referenceWidth = referenceBitmap[0].length;
+ var referenceHeight = referenceBitmap.length;
+
+ var pseudoPixelContext = RefinementReusedContexts[templateIndex];
+ var bitmap = [];
+
+ var decoder = decodingContext.decoder;
+ var contexts = decodingContext.contextCache.getContexts('GR');
+
+ var ltp = 0;
+ for (var i = 0; i < height; i++) {
+ if (prediction) {
+ var sltp = decoder.readBit(contexts, pseudoPixelContext);
+ ltp ^= sltp;
+ if (ltp) {
+ error('JBIG2 error: prediction is not supported');
+ }
+ }
+ var row = new Uint8Array(width);
+ bitmap.push(row);
+ for (var j = 0; j < width; j++) {
+ var i0, j0;
+ var contextLabel = 0;
+ for (k = 0; k < codingTemplateLength; k++) {
+ i0 = i + codingTemplateY[k];
+ j0 = j + codingTemplateX[k];
+ if (i0 < 0 || j0 < 0 || j0 >= width) {
+ contextLabel <<= 1; // out of bound pixel
+ } else {
+ contextLabel = (contextLabel << 1) | bitmap[i0][j0];
+ }
+ }
+ for (k = 0; k < referenceTemplateLength; k++) {
+ i0 = i + referenceTemplateY[k] + offsetY;
+ j0 = j + referenceTemplateX[k] + offsetX;
+ if (i0 < 0 || i0 >= referenceHeight || j0 < 0 ||
+ j0 >= referenceWidth) {
+ contextLabel <<= 1; // out of bound pixel
+ } else {
+ contextLabel = (contextLabel << 1) | referenceBitmap[i0][j0];
+ }
+ }
+ var pixel = decoder.readBit(contexts, contextLabel);
+ row[j] = pixel;
+ }
+ }
+
+ return bitmap;
+ }
+
+ // 6.5.5 Decoding the symbol dictionary
+ function decodeSymbolDictionary(huffman, refinement, symbols,
+ numberOfNewSymbols, numberOfExportedSymbols,
+ huffmanTables, templateIndex, at,
+ refinementTemplateIndex, refinementAt,
+ decodingContext) {
+ if (huffman) {
+ error('JBIG2 error: huffman is not supported');
+ }
+
+ var newSymbols = [];
+ var currentHeight = 0;
+ var symbolCodeLength = log2(symbols.length + numberOfNewSymbols);
+
+ var decoder = decodingContext.decoder;
+ var contextCache = decodingContext.contextCache;
+
+ while (newSymbols.length < numberOfNewSymbols) {
+ var deltaHeight = decodeInteger(contextCache, 'IADH', decoder); // 6.5.6
+ currentHeight += deltaHeight;
+ var currentWidth = 0;
+ var totalWidth = 0;
+ while (true) {
+ var deltaWidth = decodeInteger(contextCache, 'IADW', decoder); // 6.5.7
+ if (deltaWidth === null) {
+ break; // OOB
+ }
+ currentWidth += deltaWidth;
+ totalWidth += currentWidth;
+ var bitmap;
+ if (refinement) {
+ // 6.5.8.2 Refinement/aggregate-coded symbol bitmap
+ var numberOfInstances = decodeInteger(contextCache, 'IAAI', decoder);
+ if (numberOfInstances > 1) {
+ bitmap = decodeTextRegion(huffman, refinement,
+ currentWidth, currentHeight, 0,
+ numberOfInstances, 1, //strip size
+ symbols.concat(newSymbols),
+ symbolCodeLength,
+ 0, //transposed
+ 0, //ds offset
+ 1, //top left 7.4.3.1.1
+ 0, //OR operator
+ huffmanTables,
+ refinementTemplateIndex, refinementAt,
+ decodingContext);
+ } else {
+ var symbolId = decodeIAID(contextCache, decoder, symbolCodeLength);
+ var rdx = decodeInteger(contextCache, 'IARDX', decoder); // 6.4.11.3
+ var rdy = decodeInteger(contextCache, 'IARDY', decoder); // 6.4.11.4
+ var symbol = (symbolId < symbols.length ? symbols[symbolId] :
+ newSymbols[symbolId - symbols.length]);
+ bitmap = decodeRefinement(currentWidth, currentHeight,
+ refinementTemplateIndex, symbol, rdx, rdy, false, refinementAt,
+ decodingContext);
+ }
+ } else {
+ // 6.5.8.1 Direct-coded symbol bitmap
+ bitmap = decodeBitmap(false, currentWidth, currentHeight,
+ templateIndex, false, null, at, decodingContext);
+ }
+ newSymbols.push(bitmap);
+ }
+ }
+ // 6.5.10 Exported symbols
+ var exportedSymbols = [];
+ var flags = [], currentFlag = false;
+ var totalSymbolsLength = symbols.length + numberOfNewSymbols;
+ while (flags.length < totalSymbolsLength) {
+ var runLength = decodeInteger(contextCache, 'IAEX', decoder);
+ while (runLength--) {
+ flags.push(currentFlag);
+ }
+ currentFlag = !currentFlag;
+ }
+ for (var i = 0, ii = symbols.length; i < ii; i++) {
+ if (flags[i]) {
+ exportedSymbols.push(symbols[i]);
+ }
+ }
+ for (var j = 0; j < numberOfNewSymbols; i++, j++) {
+ if (flags[i]) {
+ exportedSymbols.push(newSymbols[j]);
+ }
+ }
+ return exportedSymbols;
+ }
+
+ function decodeTextRegion(huffman, refinement, width, height,
+ defaultPixelValue, numberOfSymbolInstances,
+ stripSize, inputSymbols, symbolCodeLength,
+ transposed, dsOffset, referenceCorner,
+ combinationOperator, huffmanTables,
+ refinementTemplateIndex, refinementAt,
+ decodingContext) {
+ if (huffman) {
+ error('JBIG2 error: huffman is not supported');
+ }
+
+ // Prepare bitmap
+ var bitmap = [];
+ var i, row;
+ for (i = 0; i < height; i++) {
+ row = new Uint8Array(width);
+ if (defaultPixelValue) {
+ for (var j = 0; j < width; j++) {
+ row[j] = defaultPixelValue;
+ }
+ }
+ bitmap.push(row);
+ }
+
+ var decoder = decodingContext.decoder;
+ var contextCache = decodingContext.contextCache;
+ var stripT = -decodeInteger(contextCache, 'IADT', decoder); // 6.4.6
+ var firstS = 0;
+ i = 0;
+ while (i < numberOfSymbolInstances) {
+ var deltaT = decodeInteger(contextCache, 'IADT', decoder); // 6.4.6
+ stripT += deltaT;
+
+ var deltaFirstS = decodeInteger(contextCache, 'IAFS', decoder); // 6.4.7
+ firstS += deltaFirstS;
+ var currentS = firstS;
+ do {
+ var currentT = (stripSize === 1 ? 0 :
+ decodeInteger(contextCache, 'IAIT', decoder)); // 6.4.9
+ var t = stripSize * stripT + currentT;
+ var symbolId = decodeIAID(contextCache, decoder, symbolCodeLength);
+ var applyRefinement = (refinement &&
+ decodeInteger(contextCache, 'IARI', decoder));
+ var symbolBitmap = inputSymbols[symbolId];
+ var symbolWidth = symbolBitmap[0].length;
+ var symbolHeight = symbolBitmap.length;
+ if (applyRefinement) {
+ var rdw = decodeInteger(contextCache, 'IARDW', decoder); // 6.4.11.1
+ var rdh = decodeInteger(contextCache, 'IARDH', decoder); // 6.4.11.2
+ var rdx = decodeInteger(contextCache, 'IARDX', decoder); // 6.4.11.3
+ var rdy = decodeInteger(contextCache, 'IARDY', decoder); // 6.4.11.4
+ symbolWidth += rdw;
+ symbolHeight += rdh;
+ symbolBitmap = decodeRefinement(symbolWidth, symbolHeight,
+ refinementTemplateIndex, symbolBitmap, (rdw >> 1) + rdx,
+ (rdh >> 1) + rdy, false, refinementAt,
+ decodingContext);
+ }
+ var offsetT = t - ((referenceCorner & 1) ? 0 : symbolHeight);
+ var offsetS = currentS - ((referenceCorner & 2) ? symbolWidth : 0);
+ var s2, t2, symbolRow;
+ if (transposed) {
+ // Place Symbol Bitmap from T1,S1
+ for (s2 = 0; s2 < symbolHeight; s2++) {
+ row = bitmap[offsetS + s2];
+ if (!row) {
+ continue;
+ }
+ symbolRow = symbolBitmap[s2];
+ // To ignore Parts of Symbol bitmap which goes
+ // outside bitmap region
+ var maxWidth = Math.min(width - offsetT, symbolWidth);
+ switch (combinationOperator) {
+ case 0: // OR
+ for (t2 = 0; t2 < maxWidth; t2++) {
+ row[offsetT + t2] |= symbolRow[t2];
+ }
+ break;
+ case 2: // XOR
+ for (t2 = 0; t2 < maxWidth; t2++) {
+ row[offsetT + t2] ^= symbolRow[t2];
+ }
+ break;
+ default:
+ error('JBIG2 error: operator ' + combinationOperator +
+ ' is not supported');
+ }
+ }
+ currentS += symbolHeight - 1;
+ } else {
+ for (t2 = 0; t2 < symbolHeight; t2++) {
+ row = bitmap[offsetT + t2];
+ if (!row) {
+ continue;
+ }
+ symbolRow = symbolBitmap[t2];
+ switch (combinationOperator) {
+ case 0: // OR
+ for (s2 = 0; s2 < symbolWidth; s2++) {
+ row[offsetS + s2] |= symbolRow[s2];
+ }
+ break;
+ case 2: // XOR
+ for (s2 = 0; s2 < symbolWidth; s2++) {
+ row[offsetS + s2] ^= symbolRow[s2];
+ }
+ break;
+ default:
+ error('JBIG2 error: operator ' + combinationOperator +
+ ' is not supported');
+ }
+ }
+ currentS += symbolWidth - 1;
+ }
+ i++;
+ var deltaS = decodeInteger(contextCache, 'IADS', decoder); // 6.4.8
+ if (deltaS === null) {
+ break; // OOB
+ }
+ currentS += deltaS + dsOffset;
+ } while (true);
+ }
+ return bitmap;
+ }
+
+ function readSegmentHeader(data, start) {
+ var segmentHeader = {};
+ segmentHeader.number = readUint32(data, start);
+ var flags = data[start + 4];
+ var segmentType = flags & 0x3F;
+ if (!SegmentTypes[segmentType]) {
+ error('JBIG2 error: invalid segment type: ' + segmentType);
+ }
+ segmentHeader.type = segmentType;
+ segmentHeader.typeName = SegmentTypes[segmentType];
+ segmentHeader.deferredNonRetain = !!(flags & 0x80);
+
+ var pageAssociationFieldSize = !!(flags & 0x40);
+ var referredFlags = data[start + 5];
+ var referredToCount = (referredFlags >> 5) & 7;
+ var retainBits = [referredFlags & 31];
+ var position = start + 6;
+ if (referredFlags === 7) {
+ referredToCount = readUint32(data, position - 1) & 0x1FFFFFFF;
+ position += 3;
+ var bytes = (referredToCount + 7) >> 3;
+ retainBits[0] = data[position++];
+ while (--bytes > 0) {
+ retainBits.push(data[position++]);
+ }
+ } else if (referredFlags === 5 || referredFlags === 6) {
+ error('JBIG2 error: invalid referred-to flags');
+ }
+
+ segmentHeader.retainBits = retainBits;
+ var referredToSegmentNumberSize = (segmentHeader.number <= 256 ? 1 :
+ (segmentHeader.number <= 65536 ? 2 : 4));
+ var referredTo = [];
+ var i, ii;
+ for (i = 0; i < referredToCount; i++) {
+ var number = (referredToSegmentNumberSize === 1 ? data[position] :
+ (referredToSegmentNumberSize === 2 ? readUint16(data, position) :
+ readUint32(data, position)));
+ referredTo.push(number);
+ position += referredToSegmentNumberSize;
+ }
+ segmentHeader.referredTo = referredTo;
+ if (!pageAssociationFieldSize) {
+ segmentHeader.pageAssociation = data[position++];
+ } else {
+ segmentHeader.pageAssociation = readUint32(data, position);
+ position += 4;
+ }
+ segmentHeader.length = readUint32(data, position);
+ position += 4;
+
+ if (segmentHeader.length === 0xFFFFFFFF) {
+ // 7.2.7 Segment data length, unknown segment length
+ if (segmentType === 38) { // ImmediateGenericRegion
+ var genericRegionInfo = readRegionSegmentInformation(data, position);
+ var genericRegionSegmentFlags = data[position +
+ RegionSegmentInformationFieldLength];
+ var genericRegionMmr = !!(genericRegionSegmentFlags & 1);
+ // searching for the segment end
+ var searchPatternLength = 6;
+ var searchPattern = new Uint8Array(searchPatternLength);
+ if (!genericRegionMmr) {
+ searchPattern[0] = 0xFF;
+ searchPattern[1] = 0xAC;
+ }
+ searchPattern[2] = (genericRegionInfo.height >>> 24) & 0xFF;
+ searchPattern[3] = (genericRegionInfo.height >> 16) & 0xFF;
+ searchPattern[4] = (genericRegionInfo.height >> 8) & 0xFF;
+ searchPattern[5] = genericRegionInfo.height & 0xFF;
+ for (i = position, ii = data.length; i < ii; i++) {
+ var j = 0;
+ while (j < searchPatternLength && searchPattern[j] === data[i + j]) {
+ j++;
+ }
+ if (j === searchPatternLength) {
+ segmentHeader.length = i + searchPatternLength;
+ break;
+ }
+ }
+ if (segmentHeader.length === 0xFFFFFFFF) {
+ error('JBIG2 error: segment end was not found');
+ }
+ } else {
+ error('JBIG2 error: invalid unknown segment length');
+ }
+ }
+ segmentHeader.headerEnd = position;
+ return segmentHeader;
+ }
+
+ function readSegments(header, data, start, end) {
+ var segments = [];
+ var position = start;
+ while (position < end) {
+ var segmentHeader = readSegmentHeader(data, position);
+ position = segmentHeader.headerEnd;
+ var segment = {
+ header: segmentHeader,
+ data: data
+ };
+ if (!header.randomAccess) {
+ segment.start = position;
+ position += segmentHeader.length;
+ segment.end = position;
+ }
+ segments.push(segment);
+ if (segmentHeader.type === 51) {
+ break; // end of file is found
+ }
+ }
+ if (header.randomAccess) {
+ for (var i = 0, ii = segments.length; i < ii; i++) {
+ segments[i].start = position;
+ position += segments[i].header.length;
+ segments[i].end = position;
+ }
+ }
+ return segments;
+ }
+
+ // 7.4.1 Region segment information field
+ function readRegionSegmentInformation(data, start) {
+ return {
+ width: readUint32(data, start),
+ height: readUint32(data, start + 4),
+ x: readUint32(data, start + 8),
+ y: readUint32(data, start + 12),
+ combinationOperator: data[start + 16] & 7
+ };
+ }
+ var RegionSegmentInformationFieldLength = 17;
+
+ function processSegment(segment, visitor) {
+ var header = segment.header;
+
+ var data = segment.data, position = segment.start, end = segment.end;
+ var args, at, i, atLength;
+ switch (header.type) {
+ case 0: // SymbolDictionary
+ // 7.4.2 Symbol dictionary segment syntax
+ var dictionary = {};
+ var dictionaryFlags = readUint16(data, position); // 7.4.2.1.1
+ dictionary.huffman = !!(dictionaryFlags & 1);
+ dictionary.refinement = !!(dictionaryFlags & 2);
+ dictionary.huffmanDHSelector = (dictionaryFlags >> 2) & 3;
+ dictionary.huffmanDWSelector = (dictionaryFlags >> 4) & 3;
+ dictionary.bitmapSizeSelector = (dictionaryFlags >> 6) & 1;
+ dictionary.aggregationInstancesSelector = (dictionaryFlags >> 7) & 1;
+ dictionary.bitmapCodingContextUsed = !!(dictionaryFlags & 256);
+ dictionary.bitmapCodingContextRetained = !!(dictionaryFlags & 512);
+ dictionary.template = (dictionaryFlags >> 10) & 3;
+ dictionary.refinementTemplate = (dictionaryFlags >> 12) & 1;
+ position += 2;
+ if (!dictionary.huffman) {
+ atLength = dictionary.template === 0 ? 4 : 1;
+ at = [];
+ for (i = 0; i < atLength; i++) {
+ at.push({
+ x: readInt8(data, position),
+ y: readInt8(data, position + 1)
+ });
+ position += 2;
+ }
+ dictionary.at = at;
+ }
+ if (dictionary.refinement && !dictionary.refinementTemplate) {
+ at = [];
+ for (i = 0; i < 2; i++) {
+ at.push({
+ x: readInt8(data, position),
+ y: readInt8(data, position + 1)
+ });
+ position += 2;
+ }
+ dictionary.refinementAt = at;
+ }
+ dictionary.numberOfExportedSymbols = readUint32(data, position);
+ position += 4;
+ dictionary.numberOfNewSymbols = readUint32(data, position);
+ position += 4;
+ args = [dictionary, header.number, header.referredTo,
+ data, position, end];
+ break;
+ case 6: // ImmediateTextRegion
+ case 7: // ImmediateLosslessTextRegion
+ var textRegion = {};
+ textRegion.info = readRegionSegmentInformation(data, position);
+ position += RegionSegmentInformationFieldLength;
+ var textRegionSegmentFlags = readUint16(data, position);
+ position += 2;
+ textRegion.huffman = !!(textRegionSegmentFlags & 1);
+ textRegion.refinement = !!(textRegionSegmentFlags & 2);
+ textRegion.stripSize = 1 << ((textRegionSegmentFlags >> 2) & 3);
+ textRegion.referenceCorner = (textRegionSegmentFlags >> 4) & 3;
+ textRegion.transposed = !!(textRegionSegmentFlags & 64);
+ textRegion.combinationOperator = (textRegionSegmentFlags >> 7) & 3;
+ textRegion.defaultPixelValue = (textRegionSegmentFlags >> 9) & 1;
+ textRegion.dsOffset = (textRegionSegmentFlags << 17) >> 27;
+ textRegion.refinementTemplate = (textRegionSegmentFlags >> 15) & 1;
+ if (textRegion.huffman) {
+ var textRegionHuffmanFlags = readUint16(data, position);
+ position += 2;
+ textRegion.huffmanFS = (textRegionHuffmanFlags) & 3;
+ textRegion.huffmanDS = (textRegionHuffmanFlags >> 2) & 3;
+ textRegion.huffmanDT = (textRegionHuffmanFlags >> 4) & 3;
+ textRegion.huffmanRefinementDW = (textRegionHuffmanFlags >> 6) & 3;
+ textRegion.huffmanRefinementDH = (textRegionHuffmanFlags >> 8) & 3;
+ textRegion.huffmanRefinementDX = (textRegionHuffmanFlags >> 10) & 3;
+ textRegion.huffmanRefinementDY = (textRegionHuffmanFlags >> 12) & 3;
+ textRegion.huffmanRefinementSizeSelector =
+ !!(textRegionHuffmanFlags & 14);
+ }
+ if (textRegion.refinement && !textRegion.refinementTemplate) {
+ at = [];
+ for (i = 0; i < 2; i++) {
+ at.push({
+ x: readInt8(data, position),
+ y: readInt8(data, position + 1)
+ });
+ position += 2;
+ }
+ textRegion.refinementAt = at;
+ }
+ textRegion.numberOfSymbolInstances = readUint32(data, position);
+ position += 4;
+ // TODO 7.4.3.1.7 Symbol ID Huffman table decoding
+ if (textRegion.huffman) {
+ error('JBIG2 error: huffman is not supported');
+ }
+ args = [textRegion, header.referredTo, data, position, end];
+ break;
+ case 38: // ImmediateGenericRegion
+ case 39: // ImmediateLosslessGenericRegion
+ var genericRegion = {};
+ genericRegion.info = readRegionSegmentInformation(data, position);
+ position += RegionSegmentInformationFieldLength;
+ var genericRegionSegmentFlags = data[position++];
+ genericRegion.mmr = !!(genericRegionSegmentFlags & 1);
+ genericRegion.template = (genericRegionSegmentFlags >> 1) & 3;
+ genericRegion.prediction = !!(genericRegionSegmentFlags & 8);
+ if (!genericRegion.mmr) {
+ atLength = genericRegion.template === 0 ? 4 : 1;
+ at = [];
+ for (i = 0; i < atLength; i++) {
+ at.push({
+ x: readInt8(data, position),
+ y: readInt8(data, position + 1)
+ });
+ position += 2;
+ }
+ genericRegion.at = at;
+ }
+ args = [genericRegion, data, position, end];
+ break;
+ case 48: // PageInformation
+ var pageInfo = {
+ width: readUint32(data, position),
+ height: readUint32(data, position + 4),
+ resolutionX: readUint32(data, position + 8),
+ resolutionY: readUint32(data, position + 12)
+ };
+ if (pageInfo.height === 0xFFFFFFFF) {
+ delete pageInfo.height;
+ }
+ var pageSegmentFlags = data[position + 16];
+ var pageStripingInformatiom = readUint16(data, position + 17);
+ pageInfo.lossless = !!(pageSegmentFlags & 1);
+ pageInfo.refinement = !!(pageSegmentFlags & 2);
+ pageInfo.defaultPixelValue = (pageSegmentFlags >> 2) & 1;
+ pageInfo.combinationOperator = (pageSegmentFlags >> 3) & 3;
+ pageInfo.requiresBuffer = !!(pageSegmentFlags & 32);
+ pageInfo.combinationOperatorOverride = !!(pageSegmentFlags & 64);
+ args = [pageInfo];
+ break;
+ case 49: // EndOfPage
+ break;
+ case 50: // EndOfStripe
+ break;
+ case 51: // EndOfFile
+ break;
+ case 62: // 7.4.15 defines 2 extension types which
+ // are comments and can be ignored.
+ break;
+ default:
+ error('JBIG2 error: segment type ' + header.typeName + '(' +
+ header.type + ') is not implemented');
+ }
+ var callbackName = 'on' + header.typeName;
+ if (callbackName in visitor) {
+ visitor[callbackName].apply(visitor, args);
+ }
+ }
+
+ function processSegments(segments, visitor) {
+ for (var i = 0, ii = segments.length; i < ii; i++) {
+ processSegment(segments[i], visitor);
+ }
+ }
+
+ function parseJbig2(data, start, end) {
+ var position = start;
+ if (data[position] !== 0x97 || data[position + 1] !== 0x4A ||
+ data[position + 2] !== 0x42 || data[position + 3] !== 0x32 ||
+ data[position + 4] !== 0x0D || data[position + 5] !== 0x0A ||
+ data[position + 6] !== 0x1A || data[position + 7] !== 0x0A) {
+ error('JBIG2 error: invalid header');
+ }
+ var header = {};
+ position += 8;
+ var flags = data[position++];
+ header.randomAccess = !(flags & 1);
+ if (!(flags & 2)) {
+ header.numberOfPages = readUint32(data, position);
+ position += 4;
+ }
+ var segments = readSegments(header, data, position, end);
+ error('Not implemented');
+ // processSegments(segments, new SimpleSegmentVisitor());
+ }
+
+ function parseJbig2Chunks(chunks) {
+ var visitor = new SimpleSegmentVisitor();
+ for (var i = 0, ii = chunks.length; i < ii; i++) {
+ var chunk = chunks[i];
+ var segments = readSegments({}, chunk.data, chunk.start, chunk.end);
+ processSegments(segments, visitor);
+ }
+ return visitor.buffer;
+ }
+
+ function SimpleSegmentVisitor() {}
+
+ SimpleSegmentVisitor.prototype = {
+ onPageInformation: function SimpleSegmentVisitor_onPageInformation(info) {
+ this.currentPageInfo = info;
+ var rowSize = (info.width + 7) >> 3;
+ var buffer = new Uint8Array(rowSize * info.height);
+ // The contents of ArrayBuffers are initialized to 0.
+ // Fill the buffer with 0xFF only if info.defaultPixelValue is set
+ if (info.defaultPixelValue) {
+ for (var i = 0, ii = buffer.length; i < ii; i++) {
+ buffer[i] = 0xFF;
+ }
+ }
+ this.buffer = buffer;
+ },
+ drawBitmap: function SimpleSegmentVisitor_drawBitmap(regionInfo, bitmap) {
+ var pageInfo = this.currentPageInfo;
+ var width = regionInfo.width, height = regionInfo.height;
+ var rowSize = (pageInfo.width + 7) >> 3;
+ var combinationOperator = pageInfo.combinationOperatorOverride ?
+ regionInfo.combinationOperator : pageInfo.combinationOperator;
+ var buffer = this.buffer;
+ var mask0 = 128 >> (regionInfo.x & 7);
+ var offset0 = regionInfo.y * rowSize + (regionInfo.x >> 3);
+ var i, j, mask, offset;
+ switch (combinationOperator) {
+ case 0: // OR
+ for (i = 0; i < height; i++) {
+ mask = mask0;
+ offset = offset0;
+ for (j = 0; j < width; j++) {
+ if (bitmap[i][j]) {
+ buffer[offset] |= mask;
+ }
+ mask >>= 1;
+ if (!mask) {
+ mask = 128;
+ offset++;
+ }
+ }
+ offset0 += rowSize;
+ }
+ break;
+ case 2: // XOR
+ for (i = 0; i < height; i++) {
+ mask = mask0;
+ offset = offset0;
+ for (j = 0; j < width; j++) {
+ if (bitmap[i][j]) {
+ buffer[offset] ^= mask;
+ }
+ mask >>= 1;
+ if (!mask) {
+ mask = 128;
+ offset++;
+ }
+ }
+ offset0 += rowSize;
+ }
+ break;
+ default:
+ error('JBIG2 error: operator ' + combinationOperator +
+ ' is not supported');
+ }
+ },
+ onImmediateGenericRegion:
+ function SimpleSegmentVisitor_onImmediateGenericRegion(region, data,
+ start, end) {
+ var regionInfo = region.info;
+ var decodingContext = new DecodingContext(data, start, end);
+ var bitmap = decodeBitmap(region.mmr, regionInfo.width, regionInfo.height,
+ region.template, region.prediction, null,
+ region.at, decodingContext);
+ this.drawBitmap(regionInfo, bitmap);
+ },
+ onImmediateLosslessGenericRegion:
+ function SimpleSegmentVisitor_onImmediateLosslessGenericRegion() {
+ this.onImmediateGenericRegion.apply(this, arguments);
+ },
+ onSymbolDictionary:
+ function SimpleSegmentVisitor_onSymbolDictionary(dictionary,
+ currentSegment,
+ referredSegments,
+ data, start, end) {
+ var huffmanTables;
+ if (dictionary.huffman) {
+ error('JBIG2 error: huffman is not supported');
+ }
+
+ // Combines exported symbols from all referred segments
+ var symbols = this.symbols;
+ if (!symbols) {
+ this.symbols = symbols = {};
+ }
+
+ var inputSymbols = [];
+ for (var i = 0, ii = referredSegments.length; i < ii; i++) {
+ inputSymbols = inputSymbols.concat(symbols[referredSegments[i]]);
+ }
+
+ var decodingContext = new DecodingContext(data, start, end);
+ symbols[currentSegment] = decodeSymbolDictionary(dictionary.huffman,
+ dictionary.refinement, inputSymbols, dictionary.numberOfNewSymbols,
+ dictionary.numberOfExportedSymbols, huffmanTables,
+ dictionary.template, dictionary.at,
+ dictionary.refinementTemplate, dictionary.refinementAt,
+ decodingContext);
+ },
+ onImmediateTextRegion:
+ function SimpleSegmentVisitor_onImmediateTextRegion(region,
+ referredSegments,
+ data, start, end) {
+ var regionInfo = region.info;
+ var huffmanTables;
+
+ // Combines exported symbols from all referred segments
+ var symbols = this.symbols;
+ var inputSymbols = [];
+ for (var i = 0, ii = referredSegments.length; i < ii; i++) {
+ inputSymbols = inputSymbols.concat(symbols[referredSegments[i]]);
+ }
+ var symbolCodeLength = log2(inputSymbols.length);
+
+ var decodingContext = new DecodingContext(data, start, end);
+ var bitmap = decodeTextRegion(region.huffman, region.refinement,
+ regionInfo.width, regionInfo.height, region.defaultPixelValue,
+ region.numberOfSymbolInstances, region.stripSize, inputSymbols,
+ symbolCodeLength, region.transposed, region.dsOffset,
+ region.referenceCorner, region.combinationOperator, huffmanTables,
+ region.refinementTemplate, region.refinementAt, decodingContext);
+ this.drawBitmap(regionInfo, bitmap);
+ },
+ onImmediateLosslessTextRegion:
+ function SimpleSegmentVisitor_onImmediateLosslessTextRegion() {
+ this.onImmediateTextRegion.apply(this, arguments);
+ }
+ };
+
+ function Jbig2Image() {}
+
+ Jbig2Image.prototype = {
+ parseChunks: function Jbig2Image_parseChunks(chunks) {
+ return parseJbig2Chunks(chunks);
+ }
+ };
+
+ return Jbig2Image;
+})();
+
+
+var bidi = PDFJS.bidi = (function bidiClosure() {
+ // Character types for symbols from 0000 to 00FF.
+ var baseTypes = [
+ 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'S', 'B', 'S', 'WS',
+ 'B', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN',
+ 'BN', 'BN', 'B', 'B', 'B', 'S', 'WS', 'ON', 'ON', 'ET', 'ET', 'ET', 'ON',
+ 'ON', 'ON', 'ON', 'ON', 'ON', 'CS', 'ON', 'CS', 'ON', 'EN', 'EN', 'EN',
+ 'EN', 'EN', 'EN', 'EN', 'EN', 'EN', 'EN', 'ON', 'ON', 'ON', 'ON', 'ON',
+ 'ON', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
+ 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'ON', 'ON',
+ 'ON', 'ON', 'ON', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
+ 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
+ 'L', 'ON', 'ON', 'ON', 'ON', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'B', 'BN',
+ 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN',
+ 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN',
+ 'BN', 'CS', 'ON', 'ET', 'ET', 'ET', 'ET', 'ON', 'ON', 'ON', 'ON', 'L', 'ON',
+ 'ON', 'ON', 'ON', 'ON', 'ET', 'ET', 'EN', 'EN', 'ON', 'L', 'ON', 'ON', 'ON',
+ 'EN', 'L', 'ON', 'ON', 'ON', 'ON', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
+ 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
+ 'L', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
+ 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
+ 'L', 'L', 'L', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L'
+ ];
+
+ // Character types for symbols from 0600 to 06FF
+ var arabicTypes = [
+ 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
+ 'CS', 'AL', 'ON', 'ON', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'AL',
+ 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
+ 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
+ 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
+ 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
+ 'AL', 'AL', 'AL', 'AL', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM',
+ 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'AL', 'AL', 'AL', 'AL',
+ 'AL', 'AL', 'AL', 'AN', 'AN', 'AN', 'AN', 'AN', 'AN', 'AN', 'AN', 'AN',
+ 'AN', 'ET', 'AN', 'AN', 'AL', 'AL', 'AL', 'NSM', 'AL', 'AL', 'AL', 'AL',
+ 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
+ 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
+ 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
+ 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
+ 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
+ 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
+ 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
+ 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
+ 'AL', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM',
+ 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'ON', 'NSM',
+ 'NSM', 'NSM', 'NSM', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
+ 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL'
+ ];
+
+ function isOdd(i) {
+ return (i & 1) !== 0;
+ }
+
+ function isEven(i) {
+ return (i & 1) === 0;
+ }
+
+ function findUnequal(arr, start, value) {
+ for (var j = start, jj = arr.length; j < jj; ++j) {
+ if (arr[j] !== value) {
+ return j;
+ }
+ }
+ return j;
+ }
+
+ function setValues(arr, start, end, value) {
+ for (var j = start; j < end; ++j) {
+ arr[j] = value;
+ }
+ }
+
+ function reverseValues(arr, start, end) {
+ for (var i = start, j = end - 1; i < j; ++i, --j) {
+ var temp = arr[i];
+ arr[i] = arr[j];
+ arr[j] = temp;
+ }
+ }
+
+ function createBidiText(str, isLTR, vertical) {
+ return {
+ str: str,
+ dir: (vertical ? 'ttb' : (isLTR ? 'ltr' : 'rtl'))
+ };
+ }
+
+ // These are used in bidi(), which is called frequently. We re-use them on
+ // each call to avoid unnecessary allocations.
+ var chars = [];
+ var types = [];
+
+ function bidi(str, startLevel, vertical) {
+ var isLTR = true;
+ var strLength = str.length;
+ if (strLength === 0 || vertical) {
+ return createBidiText(str, isLTR, vertical);
+ }
+
+ // Get types and fill arrays
+ chars.length = strLength;
+ types.length = strLength;
+ var numBidi = 0;
+
+ var i, ii;
+ for (i = 0; i < strLength; ++i) {
+ chars[i] = str.charAt(i);
+
+ var charCode = str.charCodeAt(i);
+ var charType = 'L';
+ if (charCode <= 0x00ff) {
+ charType = baseTypes[charCode];
+ } else if (0x0590 <= charCode && charCode <= 0x05f4) {
+ charType = 'R';
+ } else if (0x0600 <= charCode && charCode <= 0x06ff) {
+ charType = arabicTypes[charCode & 0xff];
+ } else if (0x0700 <= charCode && charCode <= 0x08AC) {
+ charType = 'AL';
+ }
+ if (charType === 'R' || charType === 'AL' || charType === 'AN') {
+ numBidi++;
+ }
+ types[i] = charType;
+ }
+
+ // Detect the bidi method
+ // - If there are no rtl characters then no bidi needed
+ // - If less than 30% chars are rtl then string is primarily ltr
+ // - If more than 30% chars are rtl then string is primarily rtl
+ if (numBidi === 0) {
+ isLTR = true;
+ return createBidiText(str, isLTR);
+ }
+
+ if (startLevel === -1) {
+ if ((strLength / numBidi) < 0.3) {
+ isLTR = true;
+ startLevel = 0;
+ } else {
+ isLTR = false;
+ startLevel = 1;
+ }
+ }
+
+ var levels = [];
+ for (i = 0; i < strLength; ++i) {
+ levels[i] = startLevel;
+ }
+
+ /*
+ X1-X10: skip most of this, since we are NOT doing the embeddings.
+ */
+ var e = (isOdd(startLevel) ? 'R' : 'L');
+ var sor = e;
+ var eor = sor;
+
+ /*
+ W1. Examine each non-spacing mark (NSM) in the level run, and change the
+ type of the NSM to the type of the previous character. If the NSM is at the
+ start of the level run, it will get the type of sor.
+ */
+ var lastType = sor;
+ for (i = 0; i < strLength; ++i) {
+ if (types[i] === 'NSM') {
+ types[i] = lastType;
+ } else {
+ lastType = types[i];
+ }
+ }
+
+ /*
+ W2. Search backwards from each instance of a European number until the
+ first strong type (R, L, AL, or sor) is found. If an AL is found, change
+ the type of the European number to Arabic number.
+ */
+ lastType = sor;
+ var t;
+ for (i = 0; i < strLength; ++i) {
+ t = types[i];
+ if (t === 'EN') {
+ types[i] = (lastType === 'AL') ? 'AN' : 'EN';
+ } else if (t === 'R' || t === 'L' || t === 'AL') {
+ lastType = t;
+ }
+ }
+
+ /*
+ W3. Change all ALs to R.
+ */
+ for (i = 0; i < strLength; ++i) {
+ t = types[i];
+ if (t === 'AL') {
+ types[i] = 'R';
+ }
+ }
+
+ /*
+ W4. A single European separator between two European numbers changes to a
+ European number. A single common separator between two numbers of the same
+ type changes to that type:
+ */
+ for (i = 1; i < strLength - 1; ++i) {
+ if (types[i] === 'ES' && types[i - 1] === 'EN' && types[i + 1] === 'EN') {
+ types[i] = 'EN';
+ }
+ if (types[i] === 'CS' &&
+ (types[i - 1] === 'EN' || types[i - 1] === 'AN') &&
+ types[i + 1] === types[i - 1]) {
+ types[i] = types[i - 1];
+ }
+ }
+
+ /*
+ W5. A sequence of European terminators adjacent to European numbers changes
+ to all European numbers:
+ */
+ for (i = 0; i < strLength; ++i) {
+ if (types[i] === 'EN') {
+ // do before
+ var j;
+ for (j = i - 1; j >= 0; --j) {
+ if (types[j] !== 'ET') {
+ break;
+ }
+ types[j] = 'EN';
+ }
+ // do after
+ for (j = i + 1; j < strLength; --j) {
+ if (types[j] !== 'ET') {
+ break;
+ }
+ types[j] = 'EN';
+ }
+ }
+ }
+
+ /*
+ W6. Otherwise, separators and terminators change to Other Neutral:
+ */
+ for (i = 0; i < strLength; ++i) {
+ t = types[i];
+ if (t === 'WS' || t === 'ES' || t === 'ET' || t === 'CS') {
+ types[i] = 'ON';
+ }
+ }
+
+ /*
+ W7. Search backwards from each instance of a European number until the
+ first strong type (R, L, or sor) is found. If an L is found, then change
+ the type of the European number to L.
+ */
+ lastType = sor;
+ for (i = 0; i < strLength; ++i) {
+ t = types[i];
+ if (t === 'EN') {
+ types[i] = ((lastType === 'L') ? 'L' : 'EN');
+ } else if (t === 'R' || t === 'L') {
+ lastType = t;
+ }
+ }
+
+ /*
+ N1. A sequence of neutrals takes the direction of the surrounding strong
+ text if the text on both sides has the same direction. European and Arabic
+ numbers are treated as though they were R. Start-of-level-run (sor) and
+ end-of-level-run (eor) are used at level run boundaries.
+ */
+ for (i = 0; i < strLength; ++i) {
+ if (types[i] === 'ON') {
+ var end = findUnequal(types, i + 1, 'ON');
+ var before = sor;
+ if (i > 0) {
+ before = types[i - 1];
+ }
+
+ var after = eor;
+ if (end + 1 < strLength) {
+ after = types[end + 1];
+ }
+ if (before !== 'L') {
+ before = 'R';
+ }
+ if (after !== 'L') {
+ after = 'R';
+ }
+ if (before === after) {
+ setValues(types, i, end, before);
+ }
+ i = end - 1; // reset to end (-1 so next iteration is ok)
+ }
+ }
+
+ /*
+ N2. Any remaining neutrals take the embedding direction.
+ */
+ for (i = 0; i < strLength; ++i) {
+ if (types[i] === 'ON') {
+ types[i] = e;
+ }
+ }
+
+ /*
+ I1. For all characters with an even (left-to-right) embedding direction,
+ those of type R go up one level and those of type AN or EN go up two
+ levels.
+ I2. For all characters with an odd (right-to-left) embedding direction,
+ those of type L, EN or AN go up one level.
+ */
+ for (i = 0; i < strLength; ++i) {
+ t = types[i];
+ if (isEven(levels[i])) {
+ if (t === 'R') {
+ levels[i] += 1;
+ } else if (t === 'AN' || t === 'EN') {
+ levels[i] += 2;
+ }
+ } else { // isOdd
+ if (t === 'L' || t === 'AN' || t === 'EN') {
+ levels[i] += 1;
+ }
+ }
+ }
+
+ /*
+ L1. On each line, reset the embedding level of the following characters to
+ the paragraph embedding level:
+
+ segment separators,
+ paragraph separators,
+ any sequence of whitespace characters preceding a segment separator or
+ paragraph separator, and any sequence of white space characters at the end
+ of the line.
+ */
+
+ // don't bother as text is only single line
+
+ /*
+ L2. From the highest level found in the text to the lowest odd level on
+ each line, reverse any contiguous sequence of characters that are at that
+ level or higher.
+ */
+
+ // find highest level & lowest odd level
+ var highestLevel = -1;
+ var lowestOddLevel = 99;
+ var level;
+ for (i = 0, ii = levels.length; i < ii; ++i) {
+ level = levels[i];
+ if (highestLevel < level) {
+ highestLevel = level;
+ }
+ if (lowestOddLevel > level && isOdd(level)) {
+ lowestOddLevel = level;
+ }
+ }
+
+ // now reverse between those limits
+ for (level = highestLevel; level >= lowestOddLevel; --level) {
+ // find segments to reverse
+ var start = -1;
+ for (i = 0, ii = levels.length; i < ii; ++i) {
+ if (levels[i] < level) {
+ if (start >= 0) {
+ reverseValues(chars, start, i);
+ start = -1;
+ }
+ } else if (start < 0) {
+ start = i;
+ }
+ }
+ if (start >= 0) {
+ reverseValues(chars, start, levels.length);
+ }
+ }
+
+ /*
+ L3. Combining marks applied to a right-to-left base character will at this
+ point precede their base character. If the rendering engine expects them to
+ follow the base characters in the final display process, then the ordering
+ of the marks and the base character must be reversed.
+ */
+
+ // don't bother for now
+
+ /*
+ L4. A character that possesses the mirrored property as specified by
+ Section 4.7, Mirrored, must be depicted by a mirrored glyph if the resolved
+ directionality of that character is R.
+ */
+
+ // don't mirror as characters are already mirrored in the pdf
+
+ // Finally, return string
+ var result = '';
+ for (i = 0, ii = chars.length; i < ii; ++i) {
+ var ch = chars[i];
+ if (ch !== '<' && ch !== '>') {
+ result += ch;
+ }
+ }
+ return createBidiText(result, isLTR);
+ }
+
+ return bidi;
+})();
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+/* Copyright 2014 Opera Software ASA
+ *
+ * Licensed 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.
+ *
+ *
+ * Based on https://code.google.com/p/smhasher/wiki/MurmurHash3.
+ * Hashes roughly 100 KB per millisecond on i7 3.4 GHz.
+ */
+/* globals Uint32ArrayView */
+
+'use strict';
+
+var MurmurHash3_64 = (function MurmurHash3_64Closure (seed) {
+ // Workaround for missing math precison in JS.
+ var MASK_HIGH = 0xffff0000;
+ var MASK_LOW = 0xffff;
+
+ function MurmurHash3_64 (seed) {
+ var SEED = 0xc3d2e1f0;
+ this.h1 = seed ? seed & 0xffffffff : SEED;
+ this.h2 = seed ? seed & 0xffffffff : SEED;
+ }
+
+ var alwaysUseUint32ArrayView = false;
+ // old webkits have issues with non-aligned arrays
+ try {
+ new Uint32Array(new Uint8Array(5).buffer, 0, 1);
+ } catch (e) {
+ alwaysUseUint32ArrayView = true;
+ }
+
+ MurmurHash3_64.prototype = {
+ update: function MurmurHash3_64_update(input) {
+ var useUint32ArrayView = alwaysUseUint32ArrayView;
+ var i;
+ if (typeof input === 'string') {
+ var data = new Uint8Array(input.length * 2);
+ var length = 0;
+ for (i = 0; i < input.length; i++) {
+ var code = input.charCodeAt(i);
+ if (code <= 0xff) {
+ data[length++] = code;
+ }
+ else {
+ data[length++] = code >>> 8;
+ data[length++] = code & 0xff;
+ }
+ }
+ } else if (input instanceof Uint8Array) {
+ data = input;
+ length = data.length;
+ } else if (typeof input === 'object' && ('length' in input)) {
+ // processing regular arrays as well, e.g. for IE9
+ data = input;
+ length = data.length;
+ useUint32ArrayView = true;
+ } else {
+ throw new Error('Wrong data format in MurmurHash3_64_update. ' +
+ 'Input must be a string or array.');
+ }
+
+ var blockCounts = length >> 2;
+ var tailLength = length - blockCounts * 4;
+ // we don't care about endianness here
+ var dataUint32 = useUint32ArrayView ?
+ new Uint32ArrayView(data, blockCounts) :
+ new Uint32Array(data.buffer, 0, blockCounts);
+ var k1 = 0;
+ var k2 = 0;
+ var h1 = this.h1;
+ var h2 = this.h2;
+ var C1 = 0xcc9e2d51;
+ var C2 = 0x1b873593;
+ var C1_LOW = C1 & MASK_LOW;
+ var C2_LOW = C2 & MASK_LOW;
+
+ for (i = 0; i < blockCounts; i++) {
+ if (i & 1) {
+ k1 = dataUint32[i];
+ k1 = (k1 * C1 & MASK_HIGH) | (k1 * C1_LOW & MASK_LOW);
+ k1 = k1 << 15 | k1 >>> 17;
+ k1 = (k1 * C2 & MASK_HIGH) | (k1 * C2_LOW & MASK_LOW);
+ h1 ^= k1;
+ h1 = h1 << 13 | h1 >>> 19;
+ h1 = h1 * 5 + 0xe6546b64;
+ } else {
+ k2 = dataUint32[i];
+ k2 = (k2 * C1 & MASK_HIGH) | (k2 * C1_LOW & MASK_LOW);
+ k2 = k2 << 15 | k2 >>> 17;
+ k2 = (k2 * C2 & MASK_HIGH) | (k2 * C2_LOW & MASK_LOW);
+ h2 ^= k2;
+ h2 = h2 << 13 | h2 >>> 19;
+ h2 = h2 * 5 + 0xe6546b64;
+ }
+ }
+
+ k1 = 0;
+
+ switch (tailLength) {
+ case 3:
+ k1 ^= data[blockCounts * 4 + 2] << 16;
+ /* falls through */
+ case 2:
+ k1 ^= data[blockCounts * 4 + 1] << 8;
+ /* falls through */
+ case 1:
+ k1 ^= data[blockCounts * 4];
+ /* falls through */
+ k1 = (k1 * C1 & MASK_HIGH) | (k1 * C1_LOW & MASK_LOW);
+ k1 = k1 << 15 | k1 >>> 17;
+ k1 = (k1 * C2 & MASK_HIGH) | (k1 * C2_LOW & MASK_LOW);
+ if (blockCounts & 1) {
+ h1 ^= k1;
+ } else {
+ h2 ^= k1;
+ }
+ }
+
+ this.h1 = h1;
+ this.h2 = h2;
+ return this;
+ },
+
+ hexdigest: function MurmurHash3_64_hexdigest () {
+ var h1 = this.h1;
+ var h2 = this.h2;
+
+ h1 ^= h2 >>> 1;
+ h1 = (h1 * 0xed558ccd & MASK_HIGH) | (h1 * 0x8ccd & MASK_LOW);
+ h2 = (h2 * 0xff51afd7 & MASK_HIGH) |
+ (((h2 << 16 | h1 >>> 16) * 0xafd7ed55 & MASK_HIGH) >>> 16);
+ h1 ^= h2 >>> 1;
+ h1 = (h1 * 0x1a85ec53 & MASK_HIGH) | (h1 * 0xec53 & MASK_LOW);
+ h2 = (h2 * 0xc4ceb9fe & MASK_HIGH) |
+ (((h2 << 16 | h1 >>> 16) * 0xb9fe1a85 & MASK_HIGH) >>> 16);
+ h1 ^= h2 >>> 1;
+
+ for (var i = 0, arr = [h1, h2], str = ''; i < arr.length; i++) {
+ var hex = (arr[i] >>> 0).toString(16);
+ while (hex.length < 8) {
+ hex = '0' + hex;
+ }
+ str += hex;
+ }
+
+ return str;
+ }
+ };
+
+ return MurmurHash3_64;
+})();
+
+
+}).call((typeof window === 'undefined') ? this : window);
+
+if (!PDFJS.workerSrc && typeof document !== 'undefined') {
+ // workerSrc is not set -- using last script url to define default location
+ PDFJS.workerSrc = (function () {
+ 'use strict';
+ var scriptTagContainer = document.body ||
+ document.getElementsByTagName('head')[0];
+ var pdfjsSrc = scriptTagContainer.lastChild.src;
+ return pdfjsSrc && pdfjsSrc.replace(/\.js$/i, '.worker.js');
+ })();
+}
+
+
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78-EUC-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78-EUC-H.bcmap
new file mode 100644
index 0000000..2655fc7
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78-EUC-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78-EUC-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78-EUC-V.bcmap
new file mode 100644
index 0000000..f1ed853
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78-EUC-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78-H.bcmap
new file mode 100644
index 0000000..39e89d3
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78-RKSJ-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78-RKSJ-H.bcmap
new file mode 100644
index 0000000..e4167cb
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78-RKSJ-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78-RKSJ-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78-RKSJ-V.bcmap
new file mode 100644
index 0000000..50b1646
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78-RKSJ-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78-V.bcmap
new file mode 100644
index 0000000..d7af99b
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78ms-RKSJ-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78ms-RKSJ-H.bcmap
new file mode 100644
index 0000000..37077d0
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78ms-RKSJ-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78ms-RKSJ-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78ms-RKSJ-V.bcmap
new file mode 100644
index 0000000..acf2323
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/78ms-RKSJ-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/83pv-RKSJ-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/83pv-RKSJ-H.bcmap
new file mode 100644
index 0000000..2359bc5
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/83pv-RKSJ-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/90ms-RKSJ-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/90ms-RKSJ-H.bcmap
new file mode 100644
index 0000000..af82938
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/90ms-RKSJ-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/90ms-RKSJ-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/90ms-RKSJ-V.bcmap
new file mode 100644
index 0000000..780549d
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/90ms-RKSJ-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/90msp-RKSJ-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/90msp-RKSJ-H.bcmap
new file mode 100644
index 0000000..bfd3119
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/90msp-RKSJ-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/90msp-RKSJ-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/90msp-RKSJ-V.bcmap
new file mode 100644
index 0000000..25ef14a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/90msp-RKSJ-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/90pv-RKSJ-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/90pv-RKSJ-H.bcmap
new file mode 100644
index 0000000..02f713b
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/90pv-RKSJ-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/90pv-RKSJ-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/90pv-RKSJ-V.bcmap
new file mode 100644
index 0000000..d08e0cc
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/90pv-RKSJ-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Add-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Add-H.bcmap
new file mode 100644
index 0000000..59442ac
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Add-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Add-RKSJ-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Add-RKSJ-H.bcmap
new file mode 100644
index 0000000..a3065e4
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Add-RKSJ-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Add-RKSJ-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Add-RKSJ-V.bcmap
new file mode 100644
index 0000000..040014c
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Add-RKSJ-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Add-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Add-V.bcmap
new file mode 100644
index 0000000..2f816d3
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Add-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-0.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-0.bcmap
new file mode 100644
index 0000000..88ec04a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-0.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-1.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-1.bcmap
new file mode 100644
index 0000000..03a5014
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-1.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-2.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-2.bcmap
new file mode 100644
index 0000000..2aa9514
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-2.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-3.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-3.bcmap
new file mode 100644
index 0000000..86d8b8c
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-3.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-4.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-4.bcmap
new file mode 100644
index 0000000..f50fc6c
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-4.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-5.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-5.bcmap
new file mode 100644
index 0000000..6caf4a8
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-5.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-6.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-6.bcmap
new file mode 100644
index 0000000..b77fb07
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-6.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-UCS2.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-UCS2.bcmap
new file mode 100644
index 0000000..69d79a2
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-UCS2.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-0.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-0.bcmap
new file mode 100644
index 0000000..3610108
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-0.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-1.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-1.bcmap
new file mode 100644
index 0000000..707bb10
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-1.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-2.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-2.bcmap
new file mode 100644
index 0000000..f7648cc
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-2.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-3.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-3.bcmap
new file mode 100644
index 0000000..8521458
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-3.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-4.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-4.bcmap
new file mode 100644
index 0000000..e40c63a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-4.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-5.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-5.bcmap
new file mode 100644
index 0000000..d7623b5
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-5.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-UCS2.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-UCS2.bcmap
new file mode 100644
index 0000000..7586525
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-GB1-UCS2.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-0.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-0.bcmap
new file mode 100644
index 0000000..f0e94ec
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-0.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-1.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-1.bcmap
new file mode 100644
index 0000000..dad42c5
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-1.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-2.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-2.bcmap
new file mode 100644
index 0000000..090819a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-2.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-3.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-3.bcmap
new file mode 100644
index 0000000..087dfc1
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-3.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-4.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-4.bcmap
new file mode 100644
index 0000000..46aa9bf
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-4.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-5.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-5.bcmap
new file mode 100644
index 0000000..5b4b65c
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-5.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-6.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-6.bcmap
new file mode 100644
index 0000000..e77d699
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-6.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-UCS2.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-UCS2.bcmap
new file mode 100644
index 0000000..128a141
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-UCS2.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-0.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-0.bcmap
new file mode 100644
index 0000000..cef1a99
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-0.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-1.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-1.bcmap
new file mode 100644
index 0000000..11ffa36
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-1.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-2.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-2.bcmap
new file mode 100644
index 0000000..3172308
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-2.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-UCS2.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-UCS2.bcmap
new file mode 100644
index 0000000..f3371c0
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-UCS2.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/B5-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/B5-H.bcmap
new file mode 100644
index 0000000..beb4d22
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/B5-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/B5-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/B5-V.bcmap
new file mode 100644
index 0000000..2d4f87d
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/B5-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/B5pc-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/B5pc-H.bcmap
new file mode 100644
index 0000000..ce00131
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/B5pc-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/B5pc-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/B5pc-V.bcmap
new file mode 100644
index 0000000..73b99ff
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/B5pc-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS-EUC-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS-EUC-H.bcmap
new file mode 100644
index 0000000..61d1d0c
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS-EUC-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS-EUC-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS-EUC-V.bcmap
new file mode 100644
index 0000000..1a393a5
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS-EUC-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS1-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS1-H.bcmap
new file mode 100644
index 0000000..f738e21
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS1-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS1-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS1-V.bcmap
new file mode 100644
index 0000000..9c3169f
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS1-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS2-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS2-H.bcmap
new file mode 100644
index 0000000..c89b352
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS2-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS2-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS2-V.bcmap
new file mode 100644
index 0000000..7588cec
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/CNS2-V.bcmap
@@ -0,0 +1,3 @@
+�RCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSE�CNS2-H
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/ETHK-B5-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/ETHK-B5-H.bcmap
new file mode 100644
index 0000000..cb29415
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/ETHK-B5-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/ETHK-B5-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/ETHK-B5-V.bcmap
new file mode 100644
index 0000000..f09aec6
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/ETHK-B5-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/ETen-B5-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/ETen-B5-H.bcmap
new file mode 100644
index 0000000..c2d7746
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/ETen-B5-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/ETen-B5-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/ETen-B5-V.bcmap
new file mode 100644
index 0000000..89bff15
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/ETen-B5-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/ETenms-B5-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/ETenms-B5-H.bcmap
new file mode 100644
index 0000000..a7d69db
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/ETenms-B5-H.bcmap
@@ -0,0 +1,3 @@
+�RCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSE� ETen-B5-H` ^
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/ETenms-B5-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/ETenms-B5-V.bcmap
new file mode 100644
index 0000000..adc5d61
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/ETenms-B5-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/EUC-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/EUC-H.bcmap
new file mode 100644
index 0000000..e92ea5b
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/EUC-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/EUC-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/EUC-V.bcmap
new file mode 100644
index 0000000..7a7c183
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/EUC-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Ext-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Ext-H.bcmap
new file mode 100644
index 0000000..3b5cde4
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Ext-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Ext-RKSJ-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Ext-RKSJ-H.bcmap
new file mode 100644
index 0000000..ea4d2d9
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Ext-RKSJ-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Ext-RKSJ-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Ext-RKSJ-V.bcmap
new file mode 100644
index 0000000..3457c27
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Ext-RKSJ-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Ext-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Ext-V.bcmap
new file mode 100644
index 0000000..4999ca4
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Ext-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GB-EUC-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GB-EUC-H.bcmap
new file mode 100644
index 0000000..e39908b
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GB-EUC-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GB-EUC-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GB-EUC-V.bcmap
new file mode 100644
index 0000000..d5be544
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GB-EUC-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GB-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GB-H.bcmap
new file mode 100644
index 0000000..39189c5
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GB-H.bcmap
@@ -0,0 +1,4 @@
+�RCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSE!!��]aX!!]`�21�> �p �z�$]��"R�d�-U�7�*�
4�%�+ �Z �{�/ � %�<�9K�b�1]�.�" � �`]�,�"]�
+�"]�h�"]�F�"]�$�"]��"]�`�"]�>�"]� �"]�z�"]�X�"]�6�"]��"]�r�"]�P�"]�.�"]� �"]�j�"]�H�"]�&�"]��"]�b�"]�@�"]� �"]�|�"]�Z�"]�8�"]��"]�t�"]�R�"]�0�"]��"]�l�"]�J�"]�(�"]��"]�d�"]�B�"]� �"X�~�']�W�"]�5�"]��"]�q�"]�O�"]�-�"]� �"]�i�"]�G�"]�%�"]��"]�a�"]�?�"]� �"]�{�"]�Y�"]�7�"]��"]�s�"]�Q�"]�/�"]�
�"]�k�"]�I�"]�'�"]��"]�c�"]�A�"]� �"]�}�"]�[�"]�9
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GB-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GB-V.bcmap
new file mode 100644
index 0000000..3108345
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GB-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBK-EUC-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBK-EUC-H.bcmap
new file mode 100644
index 0000000..05fff7e
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBK-EUC-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBK-EUC-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBK-EUC-V.bcmap
new file mode 100644
index 0000000..0cdf6be
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBK-EUC-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBK2K-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBK2K-H.bcmap
new file mode 100644
index 0000000..46f6ba5
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBK2K-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBK2K-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBK2K-V.bcmap
new file mode 100644
index 0000000..d9a9479
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBK2K-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBKp-EUC-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBKp-EUC-H.bcmap
new file mode 100644
index 0000000..5cb0af6
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBKp-EUC-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBKp-EUC-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBKp-EUC-V.bcmap
new file mode 100644
index 0000000..bca93b8
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBKp-EUC-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBT-EUC-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBT-EUC-H.bcmap
new file mode 100644
index 0000000..4b4e2d3
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBT-EUC-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBT-EUC-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBT-EUC-V.bcmap
new file mode 100644
index 0000000..38f7066
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBT-EUC-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBT-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBT-H.bcmap
new file mode 100644
index 0000000..8437ac3
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBT-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBT-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBT-V.bcmap
new file mode 100644
index 0000000..697ab4a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBT-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBTpc-EUC-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBTpc-EUC-H.bcmap
new file mode 100644
index 0000000..f6e50e8
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBTpc-EUC-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBTpc-EUC-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBTpc-EUC-V.bcmap
new file mode 100644
index 0000000..6c0d71a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBTpc-EUC-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBpc-EUC-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBpc-EUC-H.bcmap
new file mode 100644
index 0000000..c9edf67
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBpc-EUC-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBpc-EUC-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBpc-EUC-V.bcmap
new file mode 100644
index 0000000..31450c9
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/GBpc-EUC-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/H.bcmap
new file mode 100644
index 0000000..7b24ea4
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKdla-B5-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKdla-B5-H.bcmap
new file mode 100644
index 0000000..7d30c05
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKdla-B5-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKdla-B5-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKdla-B5-V.bcmap
new file mode 100644
index 0000000..7894694
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKdla-B5-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKdlb-B5-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKdlb-B5-H.bcmap
new file mode 100644
index 0000000..d829a23
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKdlb-B5-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKdlb-B5-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKdlb-B5-V.bcmap
new file mode 100644
index 0000000..2b572b5
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKdlb-B5-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKgccs-B5-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKgccs-B5-H.bcmap
new file mode 100644
index 0000000..971a4f2
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKgccs-B5-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKgccs-B5-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKgccs-B5-V.bcmap
new file mode 100644
index 0000000..d353ca2
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKgccs-B5-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKm314-B5-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKm314-B5-H.bcmap
new file mode 100644
index 0000000..576dc01
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKm314-B5-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKm314-B5-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKm314-B5-V.bcmap
new file mode 100644
index 0000000..0e96d0e
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKm314-B5-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKm471-B5-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKm471-B5-H.bcmap
new file mode 100644
index 0000000..11d170c
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKm471-B5-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKm471-B5-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKm471-B5-V.bcmap
new file mode 100644
index 0000000..54959bf
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKm471-B5-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKscs-B5-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKscs-B5-H.bcmap
new file mode 100644
index 0000000..6ef7857
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKscs-B5-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKscs-B5-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKscs-B5-V.bcmap
new file mode 100644
index 0000000..1fb2fa2
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/HKscs-B5-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Hankaku.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Hankaku.bcmap
new file mode 100644
index 0000000..4b8ec7f
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Hankaku.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Hiragana.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Hiragana.bcmap
new file mode 100644
index 0000000..17e983e
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Hiragana.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-EUC-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-EUC-H.bcmap
new file mode 100644
index 0000000..a45c65f
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-EUC-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-EUC-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-EUC-V.bcmap
new file mode 100644
index 0000000..0e7b21f
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-EUC-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-H.bcmap
new file mode 100644
index 0000000..b9b22b6
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-Johab-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-Johab-H.bcmap
new file mode 100644
index 0000000..2531ffc
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-Johab-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-Johab-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-Johab-V.bcmap
new file mode 100644
index 0000000..367ceb2
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-Johab-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-V.bcmap
new file mode 100644
index 0000000..6ae2f0b
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSC-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCms-UHC-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCms-UHC-H.bcmap
new file mode 100644
index 0000000..a8d4240
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCms-UHC-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCms-UHC-HW-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCms-UHC-HW-H.bcmap
new file mode 100644
index 0000000..8b4ae18
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCms-UHC-HW-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCms-UHC-HW-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCms-UHC-HW-V.bcmap
new file mode 100644
index 0000000..b655dbc
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCms-UHC-HW-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCms-UHC-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCms-UHC-V.bcmap
new file mode 100644
index 0000000..21f97f6
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCms-UHC-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCpc-EUC-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCpc-EUC-H.bcmap
new file mode 100644
index 0000000..e06f361
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCpc-EUC-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCpc-EUC-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCpc-EUC-V.bcmap
new file mode 100644
index 0000000..f3c9113
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/KSCpc-EUC-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Katakana.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Katakana.bcmap
new file mode 100644
index 0000000..524303c
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Katakana.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/LICENSE b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/LICENSE
new file mode 100644
index 0000000..b1ad168
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/LICENSE
@@ -0,0 +1,36 @@
+%%Copyright: -----------------------------------------------------------
+%%Copyright: Copyright 1990-2009 Adobe Systems Incorporated.
+%%Copyright: All rights reserved.
+%%Copyright:
+%%Copyright: Redistribution and use in source and binary forms, with or
+%%Copyright: without modification, are permitted provided that the
+%%Copyright: following conditions are met:
+%%Copyright:
+%%Copyright: Redistributions of source code must retain the above
+%%Copyright: copyright notice, this list of conditions and the following
+%%Copyright: disclaimer.
+%%Copyright:
+%%Copyright: Redistributions in binary form must reproduce the above
+%%Copyright: copyright notice, this list of conditions and the following
+%%Copyright: disclaimer in the documentation and/or other materials
+%%Copyright: provided with the distribution.
+%%Copyright:
+%%Copyright: Neither the name of Adobe Systems Incorporated nor the names
+%%Copyright: of its contributors may be used to endorse or promote
+%%Copyright: products derived from this software without specific prior
+%%Copyright: written permission.
+%%Copyright:
+%%Copyright: THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+%%Copyright: CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+%%Copyright: INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+%%Copyright: MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+%%Copyright: DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+%%Copyright: CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+%%Copyright: SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+%%Copyright: NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+%%Copyright: LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+%%Copyright: HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+%%Copyright: CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+%%Copyright: OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+%%Copyright: SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+%%Copyright: -----------------------------------------------------------
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/NWP-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/NWP-H.bcmap
new file mode 100644
index 0000000..afc5e4b
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/NWP-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/NWP-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/NWP-V.bcmap
new file mode 100644
index 0000000..bb5785e
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/NWP-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/RKSJ-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/RKSJ-H.bcmap
new file mode 100644
index 0000000..fb8d298
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/RKSJ-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/RKSJ-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/RKSJ-V.bcmap
new file mode 100644
index 0000000..a2555a6
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/RKSJ-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Roman.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Roman.bcmap
new file mode 100644
index 0000000..f896dcf
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/Roman.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UCS2-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UCS2-H.bcmap
new file mode 100644
index 0000000..d5db27c
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UCS2-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UCS2-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UCS2-V.bcmap
new file mode 100644
index 0000000..1dc9b7a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UCS2-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF16-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF16-H.bcmap
new file mode 100644
index 0000000..961afef
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF16-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF16-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF16-V.bcmap
new file mode 100644
index 0000000..df0cffe
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF16-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF32-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF32-H.bcmap
new file mode 100644
index 0000000..1ab18a1
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF32-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF32-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF32-V.bcmap
new file mode 100644
index 0000000..ad14662
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF32-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF8-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF8-H.bcmap
new file mode 100644
index 0000000..83c6bd7
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF8-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF8-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF8-V.bcmap
new file mode 100644
index 0000000..22a27e4
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniCNS-UTF8-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UCS2-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UCS2-H.bcmap
new file mode 100644
index 0000000..5bd6228
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UCS2-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UCS2-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UCS2-V.bcmap
new file mode 100644
index 0000000..53c534b
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UCS2-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF16-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF16-H.bcmap
new file mode 100644
index 0000000..b95045b
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF16-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF16-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF16-V.bcmap
new file mode 100644
index 0000000..51f023e
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF16-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF32-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF32-H.bcmap
new file mode 100644
index 0000000..f0dbd14
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF32-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF32-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF32-V.bcmap
new file mode 100644
index 0000000..ce9c30a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF32-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF8-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF8-H.bcmap
new file mode 100644
index 0000000..982ca46
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF8-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF8-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF8-V.bcmap
new file mode 100644
index 0000000..f78020d
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniGB-UTF8-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-H.bcmap
new file mode 100644
index 0000000..7daf56a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-HW-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-HW-H.bcmap
new file mode 100644
index 0000000..ac9975c
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-HW-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-HW-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-HW-V.bcmap
new file mode 100644
index 0000000..3da0a1c
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-HW-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-V.bcmap
new file mode 100644
index 0000000..c50b9dd
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF16-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF16-H.bcmap
new file mode 100644
index 0000000..6761344
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF16-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF16-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF16-V.bcmap
new file mode 100644
index 0000000..70bf90c
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF16-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF32-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF32-H.bcmap
new file mode 100644
index 0000000..7a83d53
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF32-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF32-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF32-V.bcmap
new file mode 100644
index 0000000..7a87135
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF32-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF8-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF8-H.bcmap
new file mode 100644
index 0000000..9f0334c
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF8-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF8-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF8-V.bcmap
new file mode 100644
index 0000000..808a94f
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS-UTF8-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF16-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF16-H.bcmap
new file mode 100644
index 0000000..d768bf8
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF16-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF16-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF16-V.bcmap
new file mode 100644
index 0000000..3d5bf6f
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF16-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF32-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF32-H.bcmap
new file mode 100644
index 0000000..09eee10
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF32-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF32-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF32-V.bcmap
new file mode 100644
index 0000000..6c54600
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF32-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF8-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF8-H.bcmap
new file mode 100644
index 0000000..1b1a64f
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF8-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF8-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF8-V.bcmap
new file mode 100644
index 0000000..994aa9e
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF8-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISPro-UCS2-HW-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISPro-UCS2-HW-V.bcmap
new file mode 100644
index 0000000..643f921
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISPro-UCS2-HW-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISPro-UCS2-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISPro-UCS2-V.bcmap
new file mode 100644
index 0000000..c148f67
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISPro-UCS2-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISPro-UTF8-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISPro-UTF8-V.bcmap
new file mode 100644
index 0000000..1849d80
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISPro-UTF8-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISX0213-UTF32-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISX0213-UTF32-H.bcmap
new file mode 100644
index 0000000..a83a677
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISX0213-UTF32-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISX0213-UTF32-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISX0213-UTF32-V.bcmap
new file mode 100644
index 0000000..f527248
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISX0213-UTF32-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISX02132004-UTF32-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISX02132004-UTF32-H.bcmap
new file mode 100644
index 0000000..e1a988d
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISX02132004-UTF32-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISX02132004-UTF32-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISX02132004-UTF32-V.bcmap
new file mode 100644
index 0000000..47e054a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniJISX02132004-UTF32-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UCS2-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UCS2-H.bcmap
new file mode 100644
index 0000000..b5b9485
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UCS2-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UCS2-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UCS2-V.bcmap
new file mode 100644
index 0000000..026adca
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UCS2-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF16-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF16-H.bcmap
new file mode 100644
index 0000000..fd4e66e
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF16-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF16-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF16-V.bcmap
new file mode 100644
index 0000000..075efb7
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF16-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF32-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF32-H.bcmap
new file mode 100644
index 0000000..769d214
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF32-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF32-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF32-V.bcmap
new file mode 100644
index 0000000..bdab208
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF32-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF8-H.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF8-H.bcmap
new file mode 100644
index 0000000..6ff8674
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF8-H.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF8-V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF8-V.bcmap
new file mode 100644
index 0000000..8dfa76a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/UniKS-UTF8-V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/V.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/V.bcmap
new file mode 100644
index 0000000..fdec990
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/V.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/WP-Symbol.bcmap b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/WP-Symbol.bcmap
new file mode 100644
index 0000000..46729bb
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/cmaps/WP-Symbol.bcmap
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/compatibility.js b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/compatibility.js
new file mode 100644
index 0000000..06f54bf
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/compatibility.js
@@ -0,0 +1,577 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+/* Copyright 2012 Mozilla Foundation
+ *
+ * Licensed 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.
+ */
+/* globals VBArray, PDFJS */
+
+'use strict';
+
+// Initializing PDFJS global object here, it case if we need to change/disable
+// some PDF.js features, e.g. range requests
+if (typeof PDFJS === 'undefined') {
+ (typeof window !== 'undefined' ? window : this).PDFJS = {};
+}
+
+// Checking if the typed arrays are supported
+// Support: iOS<6.0 (subarray), IE<10, Android<4.0
+(function checkTypedArrayCompatibility() {
+ if (typeof Uint8Array !== 'undefined') {
+ // Support: iOS<6.0
+ if (typeof Uint8Array.prototype.subarray === 'undefined') {
+ Uint8Array.prototype.subarray = function subarray(start, end) {
+ return new Uint8Array(this.slice(start, end));
+ };
+ Float32Array.prototype.subarray = function subarray(start, end) {
+ return new Float32Array(this.slice(start, end));
+ };
+ }
+
+ // Support: Android<4.1
+ if (typeof Float64Array === 'undefined') {
+ window.Float64Array = Float32Array;
+ }
+ return;
+ }
+
+ function subarray(start, end) {
+ return new TypedArray(this.slice(start, end));
+ }
+
+ function setArrayOffset(array, offset) {
+ if (arguments.length < 2) {
+ offset = 0;
+ }
+ for (var i = 0, n = array.length; i < n; ++i, ++offset) {
+ this[offset] = array[i] & 0xFF;
+ }
+ }
+
+ function TypedArray(arg1) {
+ var result, i, n;
+ if (typeof arg1 === 'number') {
+ result = [];
+ for (i = 0; i < arg1; ++i) {
+ result[i] = 0;
+ }
+ } else if ('slice' in arg1) {
+ result = arg1.slice(0);
+ } else {
+ result = [];
+ for (i = 0, n = arg1.length; i < n; ++i) {
+ result[i] = arg1[i];
+ }
+ }
+
+ result.subarray = subarray;
+ result.buffer = result;
+ result.byteLength = result.length;
+ result.set = setArrayOffset;
+
+ if (typeof arg1 === 'object' && arg1.buffer) {
+ result.buffer = arg1.buffer;
+ }
+ return result;
+ }
+
+ window.Uint8Array = TypedArray;
+ window.Int8Array = TypedArray;
+
+ // we don't need support for set, byteLength for 32-bit array
+ // so we can use the TypedArray as well
+ window.Uint32Array = TypedArray;
+ window.Int32Array = TypedArray;
+ window.Uint16Array = TypedArray;
+ window.Float32Array = TypedArray;
+ window.Float64Array = TypedArray;
+})();
+
+// URL = URL || webkitURL
+// Support: Safari<7, Android 4.2+
+(function normalizeURLObject() {
+ if (!window.URL) {
+ window.URL = window.webkitURL;
+ }
+})();
+
+// Object.defineProperty()?
+// Support: Android<4.0, Safari<5.1
+(function checkObjectDefinePropertyCompatibility() {
+ if (typeof Object.defineProperty !== 'undefined') {
+ var definePropertyPossible = true;
+ try {
+ // some browsers (e.g. safari) cannot use defineProperty() on DOM objects
+ // and thus the native version is not sufficient
+ Object.defineProperty(new Image(), 'id', { value: 'test' });
+ // ... another test for android gb browser for non-DOM objects
+ var Test = function Test() {};
+ Test.prototype = { get id() { } };
+ Object.defineProperty(new Test(), 'id',
+ { value: '', configurable: true, enumerable: true, writable: false });
+ } catch (e) {
+ definePropertyPossible = false;
+ }
+ if (definePropertyPossible) {
+ return;
+ }
+ }
+
+ Object.defineProperty = function objectDefineProperty(obj, name, def) {
+ delete obj[name];
+ if ('get' in def) {
+ obj.__defineGetter__(name, def['get']);
+ }
+ if ('set' in def) {
+ obj.__defineSetter__(name, def['set']);
+ }
+ if ('value' in def) {
+ obj.__defineSetter__(name, function objectDefinePropertySetter(value) {
+ this.__defineGetter__(name, function objectDefinePropertyGetter() {
+ return value;
+ });
+ return value;
+ });
+ obj[name] = def.value;
+ }
+ };
+})();
+
+
+// No XMLHttpRequest#response?
+// Support: IE<11, Android <4.0
+(function checkXMLHttpRequestResponseCompatibility() {
+ var xhrPrototype = XMLHttpRequest.prototype;
+ var xhr = new XMLHttpRequest();
+ if (!('overrideMimeType' in xhr)) {
+ // IE10 might have response, but not overrideMimeType
+ // Support: IE10
+ Object.defineProperty(xhrPrototype, 'overrideMimeType', {
+ value: function xmlHttpRequestOverrideMimeType(mimeType) {}
+ });
+ }
+ if ('responseType' in xhr) {
+ return;
+ }
+
+ // The worker will be using XHR, so we can save time and disable worker.
+ PDFJS.disableWorker = true;
+
+ Object.defineProperty(xhrPrototype, 'responseType', {
+ get: function xmlHttpRequestGetResponseType() {
+ return this._responseType || 'text';
+ },
+ set: function xmlHttpRequestSetResponseType(value) {
+ if (value === 'text' || value === 'arraybuffer') {
+ this._responseType = value;
+ if (value === 'arraybuffer' &&
+ typeof this.overrideMimeType === 'function') {
+ this.overrideMimeType('text/plain; charset=x-user-defined');
+ }
+ }
+ }
+ });
+
+ // Support: IE9
+ if (typeof VBArray !== 'undefined') {
+ Object.defineProperty(xhrPrototype, 'response', {
+ get: function xmlHttpRequestResponseGet() {
+ if (this.responseType === 'arraybuffer') {
+ return new Uint8Array(new VBArray(this.responseBody).toArray());
+ } else {
+ return this.responseText;
+ }
+ }
+ });
+ return;
+ }
+
+ Object.defineProperty(xhrPrototype, 'response', {
+ get: function xmlHttpRequestResponseGet() {
+ if (this.responseType !== 'arraybuffer') {
+ return this.responseText;
+ }
+ var text = this.responseText;
+ var i, n = text.length;
+ var result = new Uint8Array(n);
+ for (i = 0; i < n; ++i) {
+ result[i] = text.charCodeAt(i) & 0xFF;
+ }
+ return result.buffer;
+ }
+ });
+})();
+
+// window.btoa (base64 encode function) ?
+// Support: IE<10
+(function checkWindowBtoaCompatibility() {
+ if ('btoa' in window) {
+ return;
+ }
+
+ var digits =
+ 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+
+ window.btoa = function windowBtoa(chars) {
+ var buffer = '';
+ var i, n;
+ for (i = 0, n = chars.length; i < n; i += 3) {
+ var b1 = chars.charCodeAt(i) & 0xFF;
+ var b2 = chars.charCodeAt(i + 1) & 0xFF;
+ var b3 = chars.charCodeAt(i + 2) & 0xFF;
+ var d1 = b1 >> 2, d2 = ((b1 & 3) << 4) | (b2 >> 4);
+ var d3 = i + 1 < n ? ((b2 & 0xF) << 2) | (b3 >> 6) : 64;
+ var d4 = i + 2 < n ? (b3 & 0x3F) : 64;
+ buffer += (digits.charAt(d1) + digits.charAt(d2) +
+ digits.charAt(d3) + digits.charAt(d4));
+ }
+ return buffer;
+ };
+})();
+
+// window.atob (base64 encode function)?
+// Support: IE<10
+(function checkWindowAtobCompatibility() {
+ if ('atob' in window) {
+ return;
+ }
+
+ // https://github.com/davidchambers/Base64.js
+ var digits =
+ 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+ window.atob = function (input) {
+ input = input.replace(/=+$/, '');
+ if (input.length % 4 === 1) {
+ throw new Error('bad atob input');
+ }
+ for (
+ // initialize result and counters
+ var bc = 0, bs, buffer, idx = 0, output = '';
+ // get next character
+ buffer = input.charAt(idx++);
+ // character found in table?
+ // initialize bit storage and add its ascii value
+ ~buffer && (bs = bc % 4 ? bs * 64 + buffer : buffer,
+ // and if not first of each 4 characters,
+ // convert the first 8 bits to one ascii character
+ bc++ % 4) ? output += String.fromCharCode(255 & bs >> (-2 * bc & 6)) : 0
+ ) {
+ // try to find character in table (0-63, not found => -1)
+ buffer = digits.indexOf(buffer);
+ }
+ return output;
+ };
+})();
+
+// Function.prototype.bind?
+// Support: Android<4.0, iOS<6.0
+(function checkFunctionPrototypeBindCompatibility() {
+ if (typeof Function.prototype.bind !== 'undefined') {
+ return;
+ }
+
+ Function.prototype.bind = function functionPrototypeBind(obj) {
+ var fn = this, headArgs = Array.prototype.slice.call(arguments, 1);
+ var bound = function functionPrototypeBindBound() {
+ var args = headArgs.concat(Array.prototype.slice.call(arguments));
+ return fn.apply(obj, args);
+ };
+ return bound;
+ };
+})();
+
+// HTMLElement dataset property
+// Support: IE<11, Safari<5.1, Android<4.0
+(function checkDatasetProperty() {
+ var div = document.createElement('div');
+ if ('dataset' in div) {
+ return; // dataset property exists
+ }
+
+ Object.defineProperty(HTMLElement.prototype, 'dataset', {
+ get: function() {
+ if (this._dataset) {
+ return this._dataset;
+ }
+
+ var dataset = {};
+ for (var j = 0, jj = this.attributes.length; j < jj; j++) {
+ var attribute = this.attributes[j];
+ if (attribute.name.substring(0, 5) !== 'data-') {
+ continue;
+ }
+ var key = attribute.name.substring(5).replace(/\-([a-z])/g,
+ function(all, ch) {
+ return ch.toUpperCase();
+ });
+ dataset[key] = attribute.value;
+ }
+
+ Object.defineProperty(this, '_dataset', {
+ value: dataset,
+ writable: false,
+ enumerable: false
+ });
+ return dataset;
+ },
+ enumerable: true
+ });
+})();
+
+// HTMLElement classList property
+// Support: IE<10, Android<4.0, iOS<5.0
+(function checkClassListProperty() {
+ var div = document.createElement('div');
+ if ('classList' in div) {
+ return; // classList property exists
+ }
+
+ function changeList(element, itemName, add, remove) {
+ var s = element.className || '';
+ var list = s.split(/\s+/g);
+ if (list[0] === '') {
+ list.shift();
+ }
+ var index = list.indexOf(itemName);
+ if (index < 0 && add) {
+ list.push(itemName);
+ }
+ if (index >= 0 && remove) {
+ list.splice(index, 1);
+ }
+ element.className = list.join(' ');
+ return (index >= 0);
+ }
+
+ var classListPrototype = {
+ add: function(name) {
+ changeList(this.element, name, true, false);
+ },
+ contains: function(name) {
+ return changeList(this.element, name, false, false);
+ },
+ remove: function(name) {
+ changeList(this.element, name, false, true);
+ },
+ toggle: function(name) {
+ changeList(this.element, name, true, true);
+ }
+ };
+
+ Object.defineProperty(HTMLElement.prototype, 'classList', {
+ get: function() {
+ if (this._classList) {
+ return this._classList;
+ }
+
+ var classList = Object.create(classListPrototype, {
+ element: {
+ value: this,
+ writable: false,
+ enumerable: true
+ }
+ });
+ Object.defineProperty(this, '_classList', {
+ value: classList,
+ writable: false,
+ enumerable: false
+ });
+ return classList;
+ },
+ enumerable: true
+ });
+})();
+
+// Check console compatibility
+// In older IE versions the console object is not available
+// unless console is open.
+// Support: IE<10
+(function checkConsoleCompatibility() {
+ if (!('console' in window)) {
+ window.console = {
+ log: function() {},
+ error: function() {},
+ warn: function() {}
+ };
+ } else if (!('bind' in console.log)) {
+ // native functions in IE9 might not have bind
+ console.log = (function(fn) {
+ return function(msg) { return fn(msg); };
+ })(console.log);
+ console.error = (function(fn) {
+ return function(msg) { return fn(msg); };
+ })(console.error);
+ console.warn = (function(fn) {
+ return function(msg) { return fn(msg); };
+ })(console.warn);
+ }
+})();
+
+// Check onclick compatibility in Opera
+// Support: Opera<15
+(function checkOnClickCompatibility() {
+ // workaround for reported Opera bug DSK-354448:
+ // onclick fires on disabled buttons with opaque content
+ function ignoreIfTargetDisabled(event) {
+ if (isDisabled(event.target)) {
+ event.stopPropagation();
+ }
+ }
+ function isDisabled(node) {
+ return node.disabled || (node.parentNode && isDisabled(node.parentNode));
+ }
+ if (navigator.userAgent.indexOf('Opera') !== -1) {
+ // use browser detection since we cannot feature-check this bug
+ document.addEventListener('click', ignoreIfTargetDisabled, true);
+ }
+})();
+
+// Checks if possible to use URL.createObjectURL()
+// Support: IE
+(function checkOnBlobSupport() {
+ // sometimes IE loosing the data created with createObjectURL(), see #3977
+ if (navigator.userAgent.indexOf('Trident') >= 0) {
+ PDFJS.disableCreateObjectURL = true;
+ }
+})();
+
+// Checks if navigator.language is supported
+(function checkNavigatorLanguage() {
+ if ('language' in navigator) {
+ return;
+ }
+ PDFJS.locale = navigator.userLanguage || 'en-US';
+})();
+
+(function checkRangeRequests() {
+ // Safari has issues with cached range requests see:
+ // https://github.com/mozilla/pdf.js/issues/3260
+ // Last tested with version 6.0.4.
+ // Support: Safari 6.0+
+ var isSafari = Object.prototype.toString.call(
+ window.HTMLElement).indexOf('Constructor') > 0;
+
+ // Older versions of Android (pre 3.0) has issues with range requests, see:
+ // https://github.com/mozilla/pdf.js/issues/3381.
+ // Make sure that we only match webkit-based Android browsers,
+ // since Firefox/Fennec works as expected.
+ // Support: Android<3.0
+ var regex = /Android\s[0-2][^\d]/;
+ var isOldAndroid = regex.test(navigator.userAgent);
+
+ // Range requests are broken in Chrome 39 and 40, https://crbug.com/442318
+ var isChromeWithRangeBug = /Chrome\/(39|40)\./.test(navigator.userAgent);
+
+ if (isSafari || isOldAndroid || isChromeWithRangeBug) {
+ PDFJS.disableRange = true;
+ PDFJS.disableStream = true;
+ }
+})();
+
+// Check if the browser supports manipulation of the history.
+// Support: IE<10, Android<4.2
+(function checkHistoryManipulation() {
+ // Android 2.x has so buggy pushState support that it was removed in
+ // Android 3.0 and restored as late as in Android 4.2.
+ // Support: Android 2.x
+ if (!history.pushState || navigator.userAgent.indexOf('Android 2.') >= 0) {
+ PDFJS.disableHistory = true;
+ }
+})();
+
+// Support: IE<11, Chrome<21, Android<4.4, Safari<6
+(function checkSetPresenceInImageData() {
+ // IE < 11 will use window.CanvasPixelArray which lacks set function.
+ if (window.CanvasPixelArray) {
+ if (typeof window.CanvasPixelArray.prototype.set !== 'function') {
+ window.CanvasPixelArray.prototype.set = function(arr) {
+ for (var i = 0, ii = this.length; i < ii; i++) {
+ this[i] = arr[i];
+ }
+ };
+ }
+ } else {
+ // Old Chrome and Android use an inaccessible CanvasPixelArray prototype.
+ // Because we cannot feature detect it, we rely on user agent parsing.
+ var polyfill = false, versionMatch;
+ if (navigator.userAgent.indexOf('Chrom') >= 0) {
+ versionMatch = navigator.userAgent.match(/Chrom(e|ium)\/([0-9]+)\./);
+ // Chrome < 21 lacks the set function.
+ polyfill = versionMatch && parseInt(versionMatch[2]) < 21;
+ } else if (navigator.userAgent.indexOf('Android') >= 0) {
+ // Android < 4.4 lacks the set function.
+ // Android >= 4.4 will contain Chrome in the user agent,
+ // thus pass the Chrome check above and not reach this block.
+ polyfill = /Android\s[0-4][^\d]/g.test(navigator.userAgent);
+ } else if (navigator.userAgent.indexOf('Safari') >= 0) {
+ versionMatch = navigator.userAgent.
+ match(/Version\/([0-9]+)\.([0-9]+)\.([0-9]+) Safari\//);
+ // Safari < 6 lacks the set function.
+ polyfill = versionMatch && parseInt(versionMatch[1]) < 6;
+ }
+
+ if (polyfill) {
+ var contextPrototype = window.CanvasRenderingContext2D.prototype;
+ contextPrototype._createImageData = contextPrototype.createImageData;
+ contextPrototype.createImageData = function(w, h) {
+ var imageData = this._createImageData(w, h);
+ imageData.data.set = function(arr) {
+ for (var i = 0, ii = this.length; i < ii; i++) {
+ this[i] = arr[i];
+ }
+ };
+ return imageData;
+ };
+ }
+ }
+})();
+
+// Support: IE<10, Android<4.0, iOS
+(function checkRequestAnimationFrame() {
+ function fakeRequestAnimationFrame(callback) {
+ window.setTimeout(callback, 20);
+ }
+
+ var isIOS = /(iPad|iPhone|iPod)/g.test(navigator.userAgent);
+ if (isIOS) {
+ // requestAnimationFrame on iOS is broken, replacing with fake one.
+ window.requestAnimationFrame = fakeRequestAnimationFrame;
+ return;
+ }
+ if ('requestAnimationFrame' in window) {
+ return;
+ }
+ window.requestAnimationFrame =
+ window.mozRequestAnimationFrame ||
+ window.webkitRequestAnimationFrame ||
+ fakeRequestAnimationFrame;
+})();
+
+(function checkCanvasSizeLimitation() {
+ var isIOS = /(iPad|iPhone|iPod)/g.test(navigator.userAgent);
+ var isAndroid = /Android/g.test(navigator.userAgent);
+ if (isIOS || isAndroid) {
+ // 5MP
+ PDFJS.maxCanvasPixels = 5242880;
+ }
+})();
+
+// Disable fullscreen support for certain problematic configurations.
+// Support: IE11+ (when embedded).
+(function checkFullscreenSupport() {
+ var isEmbeddedIE = (navigator.userAgent.indexOf('Trident') >= 0 &&
+ window.parent !== window);
+ if (isEmbeddedIE) {
+ PDFJS.disableFullscreen = true;
+ }
+})();
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/compressed.tracemonkey-pldi-09.pdf b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/compressed.tracemonkey-pldi-09.pdf
new file mode 100644
index 0000000..6557018
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/compressed.tracemonkey-pldi-09.pdf
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/debugger.js b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/debugger.js
new file mode 100644
index 0000000..046fd34
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/debugger.js
@@ -0,0 +1,620 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+/* Copyright 2012 Mozilla Foundation
+ *
+ * Licensed 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.
+ */
+/* globals PDFJS */
+
+'use strict';
+
+var FontInspector = (function FontInspectorClosure() {
+ var fonts;
+ var active = false;
+ var fontAttribute = 'data-font-name';
+ function removeSelection() {
+ var divs = document.querySelectorAll('div[' + fontAttribute + ']');
+ for (var i = 0, ii = divs.length; i < ii; ++i) {
+ var div = divs[i];
+ div.className = '';
+ }
+ }
+ function resetSelection() {
+ var divs = document.querySelectorAll('div[' + fontAttribute + ']');
+ for (var i = 0, ii = divs.length; i < ii; ++i) {
+ var div = divs[i];
+ div.className = 'debuggerHideText';
+ }
+ }
+ function selectFont(fontName, show) {
+ var divs = document.querySelectorAll('div[' + fontAttribute + '=' +
+ fontName + ']');
+ for (var i = 0, ii = divs.length; i < ii; ++i) {
+ var div = divs[i];
+ div.className = show ? 'debuggerShowText' : 'debuggerHideText';
+ }
+ }
+ function textLayerClick(e) {
+ if (!e.target.dataset.fontName ||
+ e.target.tagName.toUpperCase() !== 'DIV') {
+ return;
+ }
+ var fontName = e.target.dataset.fontName;
+ var selects = document.getElementsByTagName('input');
+ for (var i = 0; i < selects.length; ++i) {
+ var select = selects[i];
+ if (select.dataset.fontName !== fontName) {
+ continue;
+ }
+ select.checked = !select.checked;
+ selectFont(fontName, select.checked);
+ select.scrollIntoView();
+ }
+ }
+ return {
+ // Properties/functions needed by PDFBug.
+ id: 'FontInspector',
+ name: 'Font Inspector',
+ panel: null,
+ manager: null,
+ init: function init() {
+ var panel = this.panel;
+ panel.setAttribute('style', 'padding: 5px;');
+ var tmp = document.createElement('button');
+ tmp.addEventListener('click', resetSelection);
+ tmp.textContent = 'Refresh';
+ panel.appendChild(tmp);
+
+ fonts = document.createElement('div');
+ panel.appendChild(fonts);
+ },
+ cleanup: function cleanup() {
+ fonts.textContent = '';
+ },
+ enabled: false,
+ get active() {
+ return active;
+ },
+ set active(value) {
+ active = value;
+ if (active) {
+ document.body.addEventListener('click', textLayerClick, true);
+ resetSelection();
+ } else {
+ document.body.removeEventListener('click', textLayerClick, true);
+ removeSelection();
+ }
+ },
+ // FontInspector specific functions.
+ fontAdded: function fontAdded(fontObj, url) {
+ function properties(obj, list) {
+ var moreInfo = document.createElement('table');
+ for (var i = 0; i < list.length; i++) {
+ var tr = document.createElement('tr');
+ var td1 = document.createElement('td');
+ td1.textContent = list[i];
+ tr.appendChild(td1);
+ var td2 = document.createElement('td');
+ td2.textContent = obj[list[i]].toString();
+ tr.appendChild(td2);
+ moreInfo.appendChild(tr);
+ }
+ return moreInfo;
+ }
+ var moreInfo = properties(fontObj, ['name', 'type']);
+ var fontName = fontObj.loadedName;
+ var font = document.createElement('div');
+ var name = document.createElement('span');
+ name.textContent = fontName;
+ var download = document.createElement('a');
+ if (url) {
+ url = /url\(['"]?([^\)"']+)/.exec(url);
+ download.href = url[1];
+ } else if (fontObj.data) {
+ url = URL.createObjectURL(new Blob([fontObj.data], {
+ type: fontObj.mimeType
+ }));
+ download.href = url;
+ }
+ download.textContent = 'Download';
+ var logIt = document.createElement('a');
+ logIt.href = '';
+ logIt.textContent = 'Log';
+ logIt.addEventListener('click', function(event) {
+ event.preventDefault();
+ console.log(fontObj);
+ });
+ var select = document.createElement('input');
+ select.setAttribute('type', 'checkbox');
+ select.dataset.fontName = fontName;
+ select.addEventListener('click', (function(select, fontName) {
+ return (function() {
+ selectFont(fontName, select.checked);
+ });
+ })(select, fontName));
+ font.appendChild(select);
+ font.appendChild(name);
+ font.appendChild(document.createTextNode(' '));
+ font.appendChild(download);
+ font.appendChild(document.createTextNode(' '));
+ font.appendChild(logIt);
+ font.appendChild(moreInfo);
+ fonts.appendChild(font);
+ // Somewhat of a hack, should probably add a hook for when the text layer
+ // is done rendering.
+ setTimeout(function() {
+ if (this.active) {
+ resetSelection();
+ }
+ }.bind(this), 2000);
+ }
+ };
+})();
+
+// Manages all the page steppers.
+var StepperManager = (function StepperManagerClosure() {
+ var steppers = [];
+ var stepperDiv = null;
+ var stepperControls = null;
+ var stepperChooser = null;
+ var breakPoints = {};
+ return {
+ // Properties/functions needed by PDFBug.
+ id: 'Stepper',
+ name: 'Stepper',
+ panel: null,
+ manager: null,
+ init: function init() {
+ var self = this;
+ this.panel.setAttribute('style', 'padding: 5px;');
+ stepperControls = document.createElement('div');
+ stepperChooser = document.createElement('select');
+ stepperChooser.addEventListener('change', function(event) {
+ self.selectStepper(this.value);
+ });
+ stepperControls.appendChild(stepperChooser);
+ stepperDiv = document.createElement('div');
+ this.panel.appendChild(stepperControls);
+ this.panel.appendChild(stepperDiv);
+ if (sessionStorage.getItem('pdfjsBreakPoints')) {
+ breakPoints = JSON.parse(sessionStorage.getItem('pdfjsBreakPoints'));
+ }
+ },
+ cleanup: function cleanup() {
+ stepperChooser.textContent = '';
+ stepperDiv.textContent = '';
+ steppers = [];
+ },
+ enabled: false,
+ active: false,
+ // Stepper specific functions.
+ create: function create(pageIndex) {
+ var debug = document.createElement('div');
+ debug.id = 'stepper' + pageIndex;
+ debug.setAttribute('hidden', true);
+ debug.className = 'stepper';
+ stepperDiv.appendChild(debug);
+ var b = document.createElement('option');
+ b.textContent = 'Page ' + (pageIndex + 1);
+ b.value = pageIndex;
+ stepperChooser.appendChild(b);
+ var initBreakPoints = breakPoints[pageIndex] || [];
+ var stepper = new Stepper(debug, pageIndex, initBreakPoints);
+ steppers.push(stepper);
+ if (steppers.length === 1) {
+ this.selectStepper(pageIndex, false);
+ }
+ return stepper;
+ },
+ selectStepper: function selectStepper(pageIndex, selectPanel) {
+ var i;
+ pageIndex = pageIndex | 0;
+ if (selectPanel) {
+ this.manager.selectPanel(this);
+ }
+ for (i = 0; i < steppers.length; ++i) {
+ var stepper = steppers[i];
+ if (stepper.pageIndex === pageIndex) {
+ stepper.panel.removeAttribute('hidden');
+ } else {
+ stepper.panel.setAttribute('hidden', true);
+ }
+ }
+ var options = stepperChooser.options;
+ for (i = 0; i < options.length; ++i) {
+ var option = options[i];
+ option.selected = (option.value | 0) === pageIndex;
+ }
+ },
+ saveBreakPoints: function saveBreakPoints(pageIndex, bps) {
+ breakPoints[pageIndex] = bps;
+ sessionStorage.setItem('pdfjsBreakPoints', JSON.stringify(breakPoints));
+ }
+ };
+})();
+
+// The stepper for each page's IRQueue.
+var Stepper = (function StepperClosure() {
+ // Shorter way to create element and optionally set textContent.
+ function c(tag, textContent) {
+ var d = document.createElement(tag);
+ if (textContent) {
+ d.textContent = textContent;
+ }
+ return d;
+ }
+
+ var opMap = null;
+
+ function simplifyArgs(args) {
+ if (typeof args === 'string') {
+ var MAX_STRING_LENGTH = 75;
+ return args.length <= MAX_STRING_LENGTH ? args :
+ args.substr(0, MAX_STRING_LENGTH) + '...';
+ }
+ if (typeof args !== 'object' || args === null) {
+ return args;
+ }
+ if ('length' in args) { // array
+ var simpleArgs = [], i, ii;
+ var MAX_ITEMS = 10;
+ for (i = 0, ii = Math.min(MAX_ITEMS, args.length); i < ii; i++) {
+ simpleArgs.push(simplifyArgs(args[i]));
+ }
+ if (i < args.length) {
+ simpleArgs.push('...');
+ }
+ return simpleArgs;
+ }
+ var simpleObj = {};
+ for (var key in args) {
+ simpleObj[key] = simplifyArgs(args[key]);
+ }
+ return simpleObj;
+ }
+
+ function Stepper(panel, pageIndex, initialBreakPoints) {
+ this.panel = panel;
+ this.breakPoint = 0;
+ this.nextBreakPoint = null;
+ this.pageIndex = pageIndex;
+ this.breakPoints = initialBreakPoints;
+ this.currentIdx = -1;
+ this.operatorListIdx = 0;
+ }
+ Stepper.prototype = {
+ init: function init() {
+ var panel = this.panel;
+ var content = c('div', 'c=continue, s=step');
+ var table = c('table');
+ content.appendChild(table);
+ table.cellSpacing = 0;
+ var headerRow = c('tr');
+ table.appendChild(headerRow);
+ headerRow.appendChild(c('th', 'Break'));
+ headerRow.appendChild(c('th', 'Idx'));
+ headerRow.appendChild(c('th', 'fn'));
+ headerRow.appendChild(c('th', 'args'));
+ panel.appendChild(content);
+ this.table = table;
+ if (!opMap) {
+ opMap = Object.create(null);
+ for (var key in PDFJS.OPS) {
+ opMap[PDFJS.OPS[key]] = key;
+ }
+ }
+ },
+ updateOperatorList: function updateOperatorList(operatorList) {
+ var self = this;
+
+ function cboxOnClick() {
+ var x = +this.dataset.idx;
+ if (this.checked) {
+ self.breakPoints.push(x);
+ } else {
+ self.breakPoints.splice(self.breakPoints.indexOf(x), 1);
+ }
+ StepperManager.saveBreakPoints(self.pageIndex, self.breakPoints);
+ }
+
+ var MAX_OPERATORS_COUNT = 15000;
+ if (this.operatorListIdx > MAX_OPERATORS_COUNT) {
+ return;
+ }
+
+ var chunk = document.createDocumentFragment();
+ var operatorsToDisplay = Math.min(MAX_OPERATORS_COUNT,
+ operatorList.fnArray.length);
+ for (var i = this.operatorListIdx; i < operatorsToDisplay; i++) {
+ var line = c('tr');
+ line.className = 'line';
+ line.dataset.idx = i;
+ chunk.appendChild(line);
+ var checked = this.breakPoints.indexOf(i) !== -1;
+ var args = operatorList.argsArray[i] || [];
+
+ var breakCell = c('td');
+ var cbox = c('input');
+ cbox.type = 'checkbox';
+ cbox.className = 'points';
+ cbox.checked = checked;
+ cbox.dataset.idx = i;
+ cbox.onclick = cboxOnClick;
+
+ breakCell.appendChild(cbox);
+ line.appendChild(breakCell);
+ line.appendChild(c('td', i.toString()));
+ var fn = opMap[operatorList.fnArray[i]];
+ var decArgs = args;
+ if (fn === 'showText') {
+ var glyphs = args[0];
+ var newArgs = [];
+ var str = [];
+ for (var j = 0; j < glyphs.length; j++) {
+ var glyph = glyphs[j];
+ if (typeof glyph === 'object' && glyph !== null) {
+ str.push(glyph.fontChar);
+ } else {
+ if (str.length > 0) {
+ newArgs.push(str.join(''));
+ str = [];
+ }
+ newArgs.push(glyph); // null or number
+ }
+ }
+ if (str.length > 0) {
+ newArgs.push(str.join(''));
+ }
+ decArgs = [newArgs];
+ }
+ line.appendChild(c('td', fn));
+ line.appendChild(c('td', JSON.stringify(simplifyArgs(decArgs))));
+ }
+ if (operatorsToDisplay < operatorList.fnArray.length) {
+ line = c('tr');
+ var lastCell = c('td', '...');
+ lastCell.colspan = 4;
+ chunk.appendChild(lastCell);
+ }
+ this.operatorListIdx = operatorList.fnArray.length;
+ this.table.appendChild(chunk);
+ },
+ getNextBreakPoint: function getNextBreakPoint() {
+ this.breakPoints.sort(function(a, b) { return a - b; });
+ for (var i = 0; i < this.breakPoints.length; i++) {
+ if (this.breakPoints[i] > this.currentIdx) {
+ return this.breakPoints[i];
+ }
+ }
+ return null;
+ },
+ breakIt: function breakIt(idx, callback) {
+ StepperManager.selectStepper(this.pageIndex, true);
+ var self = this;
+ var dom = document;
+ self.currentIdx = idx;
+ var listener = function(e) {
+ switch (e.keyCode) {
+ case 83: // step
+ dom.removeEventListener('keydown', listener, false);
+ self.nextBreakPoint = self.currentIdx + 1;
+ self.goTo(-1);
+ callback();
+ break;
+ case 67: // continue
+ dom.removeEventListener('keydown', listener, false);
+ var breakPoint = self.getNextBreakPoint();
+ self.nextBreakPoint = breakPoint;
+ self.goTo(-1);
+ callback();
+ break;
+ }
+ };
+ dom.addEventListener('keydown', listener, false);
+ self.goTo(idx);
+ },
+ goTo: function goTo(idx) {
+ var allRows = this.panel.getElementsByClassName('line');
+ for (var x = 0, xx = allRows.length; x < xx; ++x) {
+ var row = allRows[x];
+ if ((row.dataset.idx | 0) === idx) {
+ row.style.backgroundColor = 'rgb(251,250,207)';
+ row.scrollIntoView();
+ } else {
+ row.style.backgroundColor = null;
+ }
+ }
+ }
+ };
+ return Stepper;
+})();
+
+var Stats = (function Stats() {
+ var stats = [];
+ function clear(node) {
+ while (node.hasChildNodes()) {
+ node.removeChild(node.lastChild);
+ }
+ }
+ function getStatIndex(pageNumber) {
+ for (var i = 0, ii = stats.length; i < ii; ++i) {
+ if (stats[i].pageNumber === pageNumber) {
+ return i;
+ }
+ }
+ return false;
+ }
+ return {
+ // Properties/functions needed by PDFBug.
+ id: 'Stats',
+ name: 'Stats',
+ panel: null,
+ manager: null,
+ init: function init() {
+ this.panel.setAttribute('style', 'padding: 5px;');
+ PDFJS.enableStats = true;
+ },
+ enabled: false,
+ active: false,
+ // Stats specific functions.
+ add: function(pageNumber, stat) {
+ if (!stat) {
+ return;
+ }
+ var statsIndex = getStatIndex(pageNumber);
+ if (statsIndex !== false) {
+ var b = stats[statsIndex];
+ this.panel.removeChild(b.div);
+ stats.splice(statsIndex, 1);
+ }
+ var wrapper = document.createElement('div');
+ wrapper.className = 'stats';
+ var title = document.createElement('div');
+ title.className = 'title';
+ title.textContent = 'Page: ' + pageNumber;
+ var statsDiv = document.createElement('div');
+ statsDiv.textContent = stat.toString();
+ wrapper.appendChild(title);
+ wrapper.appendChild(statsDiv);
+ stats.push({ pageNumber: pageNumber, div: wrapper });
+ stats.sort(function(a, b) { return a.pageNumber - b.pageNumber; });
+ clear(this.panel);
+ for (var i = 0, ii = stats.length; i < ii; ++i) {
+ this.panel.appendChild(stats[i].div);
+ }
+ },
+ cleanup: function () {
+ stats = [];
+ clear(this.panel);
+ }
+ };
+})();
+
+// Manages all the debugging tools.
+var PDFBug = (function PDFBugClosure() {
+ var panelWidth = 300;
+ var buttons = [];
+ var activePanel = null;
+
+ return {
+ tools: [
+ FontInspector,
+ StepperManager,
+ Stats
+ ],
+ enable: function(ids) {
+ var all = false, tools = this.tools;
+ if (ids.length === 1 && ids[0] === 'all') {
+ all = true;
+ }
+ for (var i = 0; i < tools.length; ++i) {
+ var tool = tools[i];
+ if (all || ids.indexOf(tool.id) !== -1) {
+ tool.enabled = true;
+ }
+ }
+ if (!all) {
+ // Sort the tools by the order they are enabled.
+ tools.sort(function(a, b) {
+ var indexA = ids.indexOf(a.id);
+ indexA = indexA < 0 ? tools.length : indexA;
+ var indexB = ids.indexOf(b.id);
+ indexB = indexB < 0 ? tools.length : indexB;
+ return indexA - indexB;
+ });
+ }
+ },
+ init: function init() {
+ /*
+ * Basic Layout:
+ * PDFBug
+ * Controls
+ * Panels
+ * Panel
+ * Panel
+ * ...
+ */
+ var ui = document.createElement('div');
+ ui.id = 'PDFBug';
+
+ var controls = document.createElement('div');
+ controls.setAttribute('class', 'controls');
+ ui.appendChild(controls);
+
+ var panels = document.createElement('div');
+ panels.setAttribute('class', 'panels');
+ ui.appendChild(panels);
+
+ var container = document.getElementById('viewerContainer');
+ container.appendChild(ui);
+ container.style.right = panelWidth + 'px';
+
+ // Initialize all the debugging tools.
+ var tools = this.tools;
+ var self = this;
+ for (var i = 0; i < tools.length; ++i) {
+ var tool = tools[i];
+ var panel = document.createElement('div');
+ var panelButton = document.createElement('button');
+ panelButton.textContent = tool.name;
+ panelButton.addEventListener('click', (function(selected) {
+ return function(event) {
+ event.preventDefault();
+ self.selectPanel(selected);
+ };
+ })(i));
+ controls.appendChild(panelButton);
+ panels.appendChild(panel);
+ tool.panel = panel;
+ tool.manager = this;
+ if (tool.enabled) {
+ tool.init();
+ } else {
+ panel.textContent = tool.name + ' is disabled. To enable add ' +
+ ' "' + tool.id + '" to the pdfBug parameter ' +
+ 'and refresh (seperate multiple by commas).';
+ }
+ buttons.push(panelButton);
+ }
+ this.selectPanel(0);
+ },
+ cleanup: function cleanup() {
+ for (var i = 0, ii = this.tools.length; i < ii; i++) {
+ if (this.tools[i].enabled) {
+ this.tools[i].cleanup();
+ }
+ }
+ },
+ selectPanel: function selectPanel(index) {
+ if (typeof index !== 'number') {
+ index = this.tools.indexOf(index);
+ }
+ if (index === activePanel) {
+ return;
+ }
+ activePanel = index;
+ var tools = this.tools;
+ for (var j = 0; j < tools.length; ++j) {
+ if (j === index) {
+ buttons[j].setAttribute('class', 'active');
+ tools[j].active = true;
+ tools[j].panel.removeAttribute('hidden');
+ } else {
+ buttons[j].setAttribute('class', '');
+ tools[j].active = false;
+ tools[j].panel.setAttribute('hidden', 'true');
+ }
+ }
+ }
+ };
+})();
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-check.svg b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-check.svg
new file mode 100644
index 0000000..71cd16d
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-check.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns="http://www.w3.org/2000/svg"
+ width="40"
+ height="40"
+ viewBox="0 0 40 40">
+ <path
+ d="M 1.5006714,23.536225 6.8925879,18.994244 14.585721,26.037937 34.019683,4.5410479 38.499329,9.2235032 14.585721,35.458952 z"
+ id="path4"
+ style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:1.25402856;stroke-opacity:1" />
+</svg>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-comment.svg b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-comment.svg
new file mode 100644
index 0000000..86f1f17
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-comment.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns="http://www.w3.org/2000/svg"
+ height="40"
+ width="40"
+ viewBox="0 0 40 40">
+ <rect
+ style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ width="33.76017"
+ height="33.76017"
+ x="3.119915"
+ y="3.119915" />
+ <path
+ d="m 20.677967,8.54499 c -7.342801,0 -13.295293,4.954293 -13.295293,11.065751 0,2.088793 0.3647173,3.484376 1.575539,5.150563 L 6.0267418,31.45501 13.560595,29.011117 c 2.221262,1.387962 4.125932,1.665377 7.117372,1.665377 7.3428,0 13.295291,-4.954295 13.295291,-11.065753 0,-6.111458 -5.952491,-11.065751 -13.295291,-11.065751 z"
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.93031836;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+</svg>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-help.svg b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-help.svg
new file mode 100644
index 0000000..00938fe
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-help.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns="http://www.w3.org/2000/svg"
+ width="40"
+ height="40"
+ viewBox="0 0 40 40">
+ <g
+ transform="translate(0,-60)"
+ id="layer1">
+ <rect
+ width="36.460953"
+ height="34.805603"
+ x="1.7695236"
+ y="62.597198"
+ style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.30826771;stroke-opacity:1" />
+ <g
+ transform="matrix(0.88763677,0,0,0.88763677,2.2472646,8.9890584)">
+ <path
+ d="M 20,64.526342 C 11.454135,64.526342 4.5263421,71.454135 4.5263421,80 4.5263421,88.545865 11.454135,95.473658 20,95.473658 28.545865,95.473658 35.473658,88.545865 35.473658,80 35.473658,71.454135 28.545865,64.526342 20,64.526342 z m -0.408738,9.488564 c 3.527079,0 6.393832,2.84061 6.393832,6.335441 0,3.494831 -2.866753,6.335441 -6.393832,6.335441 -3.527079,0 -6.393832,-2.84061 -6.393832,-6.335441 0,-3.494831 2.866753,-6.335441 6.393832,-6.335441 z"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.02768445;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <path
+ d="m 7.2335209,71.819938 4.9702591,4.161823 c -1.679956,2.581606 -1.443939,6.069592 0.159325,8.677725 l -5.1263071,3.424463 c 0.67516,1.231452 3.0166401,3.547686 4.2331971,4.194757 l 3.907728,-4.567277 c 2.541952,1.45975 5.730694,1.392161 8.438683,-0.12614 l 3.469517,6.108336 c 1.129779,-0.44367 4.742234,-3.449633 5.416358,-5.003859 l -5.46204,-4.415541 c 1.44319,-2.424098 1.651175,-5.267515 0.557303,-7.748623 l 5.903195,-3.833951 C 33.14257,71.704996 30.616217,69.018606 29.02952,67.99296 l -4.118813,4.981678 C 22.411934,71.205099 18.900853,70.937534 16.041319,72.32916 l -3.595408,-5.322091 c -1.345962,0.579488 -4.1293881,2.921233 -5.2123901,4.812869 z m 8.1010311,3.426672 c 2.75284,-2.446266 6.769149,-2.144694 9.048998,0.420874 2.279848,2.56557 2.113919,6.596919 -0.638924,9.043185 -2.752841,2.446267 -6.775754,2.13726 -9.055604,-0.428308 -2.279851,-2.565568 -2.107313,-6.589485 0.64553,-9.035751 z"
+ style="fill:#000000;fill-opacity:1;stroke:none" />
+ </g>
+ </g>
+</svg>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-insert.svg b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-insert.svg
new file mode 100644
index 0000000..519ef68
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-insert.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns="http://www.w3.org/2000/svg"
+ width="64"
+ height="64"
+ viewBox="0 0 64 64">
+ <path
+ d="M 32.003143,1.4044602 57.432701,62.632577 6.5672991,62.627924 z"
+ style="fill:#ffff00;fill-opacity:0.94117647;fill-rule:nonzero;stroke:#000000;stroke-width:1.00493038;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+</svg>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-key.svg b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-key.svg
new file mode 100644
index 0000000..8d09d53
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-key.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns="http://www.w3.org/2000/svg"
+ width="64"
+ height="64"
+ viewBox="0 0 64 64">
+ <path
+ d="M 25.470843,9.4933766 C 25.30219,12.141818 30.139101,14.445969 34.704831,13.529144 40.62635,12.541995 41.398833,7.3856498 35.97505,5.777863 31.400921,4.1549155 25.157674,6.5445892 25.470843,9.4933766 z M 4.5246282,17.652051 C 4.068249,11.832873 9.2742983,5.9270407 18.437379,3.0977088 29.751911,-0.87185184 45.495663,1.4008022 53.603953,7.1104009 c 9.275765,6.1889221 7.158128,16.2079421 -3.171076,21.5939521 -1.784316,1.635815 -6.380222,1.21421 -7.068351,3.186186 -1.04003,0.972427 -1.288046,2.050158 -1.232864,3.168203 1.015111,2.000108 -3.831548,1.633216 -3.270553,3.759574 0.589477,5.264544 -0.179276,10.53738 -0.362842,15.806257 -0.492006,2.184998 1.163456,4.574232 -0.734888,6.610642 -2.482919,2.325184 -7.30604,2.189143 -9.193497,-0.274767 -2.733688,-1.740626 -8.254447,-3.615254 -6.104247,-6.339626 3.468112,-1.708686 -2.116197,-3.449897 0.431242,-5.080274 5.058402,-1.39256 -2.393215,-2.304318 -0.146889,-4.334645 3.069198,-0.977415 2.056986,-2.518352 -0.219121,-3.540397 1.876567,-1.807151 1.484149,-4.868919 -2.565455,-5.942205 0.150866,-1.805474 2.905737,-4.136876 -1.679967,-5.20493 C 10.260902,27.882167 4.6872697,22.95045 4.5245945,17.652051 z"
+ id="path604"
+ style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:1.72665179;stroke-opacity:1" />
+</svg>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-newparagraph.svg b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-newparagraph.svg
new file mode 100644
index 0000000..38d2497
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-newparagraph.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns="http://www.w3.org/2000/svg"
+ width="64"
+ height="64"
+ viewBox="0 0 64 64">
+ <path
+ d="M 32.003143,10.913072 57.432701,53.086929 6.567299,53.083723 z"
+ id="path2985"
+ style="fill:#ffff00;fill-opacity:0.94117647;fill-rule:nonzero;stroke:#000000;stroke-width:0.83403099;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+</svg>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-noicon.svg b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-noicon.svg
new file mode 100644
index 0000000..c07d108
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-noicon.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns="http://www.w3.org/2000/svg"
+ width="40"
+ height="40"
+ viewBox="0 0 40 40">
+</svg>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-note.svg b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-note.svg
new file mode 100644
index 0000000..7017365
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-note.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns="http://www.w3.org/2000/svg"
+ width="40"
+ height="40"
+ viewBox="0 0 40 40">
+ <rect
+ width="36.075428"
+ height="31.096582"
+ x="1.962286"
+ y="4.4517088"
+ id="rect4"
+ style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.23004246;stroke-opacity:1" />
+ <rect
+ width="27.96859"
+ height="1.5012145"
+ x="6.0157046"
+ y="10.285"
+ id="rect6"
+ style="fill:#000000;fill-opacity:1;stroke:none" />
+ <rect
+ width="27.96859"
+ height="0.85783684"
+ x="6.0157056"
+ y="23.21689"
+ id="rect8"
+ style="fill:#000000;fill-opacity:1;stroke:none" />
+ <rect
+ width="27.96859"
+ height="0.85783684"
+ x="5.8130345"
+ y="28.964394"
+ id="rect10"
+ style="fill:#000000;fill-opacity:1;stroke:none" />
+ <rect
+ width="27.96859"
+ height="0.85783684"
+ x="6.0157046"
+ y="17.426493"
+ id="rect12"
+ style="fill:#000000;fill-opacity:1;stroke:none" />
+</svg>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-paragraph.svg b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-paragraph.svg
new file mode 100644
index 0000000..6ae5212
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/annotation-paragraph.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns="http://www.w3.org/2000/svg"
+ width="40"
+ height="40"
+ viewBox="0 0 40 40">
+ <rect
+ width="33.76017"
+ height="33.76017"
+ x="3.119915"
+ y="3.119915"
+ style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <path
+ d="m 17.692678,34.50206 0,-16.182224 c -1.930515,-0.103225 -3.455824,-0.730383 -4.57593,-1.881473 -1.12011,-1.151067 -1.680164,-2.619596 -1.680164,-4.405591 0,-1.992435 0.621995,-3.5796849 1.865988,-4.7617553 1.243989,-1.1820288 3.06352,-1.7730536 5.458598,-1.7730764 l 9.802246,0 0,2.6789711 -2.229895,0 0,26.3251486 -2.632515,0 0,-26.3251486 -3.45324,0 0,26.3251486 z"
+ style="font-size:29.42051125px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.07795751;stroke-opacity:1;font-family:Arial;-inkscape-font-specification:Arial" />
+</svg>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-next-rtl.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-next-rtl.png
new file mode 100644
index 0000000..bef0274
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-next-rtl.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-next-rtl@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-next-rtl@2x.png
new file mode 100644
index 0000000..1da6dc9
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-next-rtl@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-next.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-next.png
new file mode 100644
index 0000000..de1d0fc
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-next.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-next@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-next@2x.png
new file mode 100644
index 0000000..0250307
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-next@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-previous-rtl.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-previous-rtl.png
new file mode 100644
index 0000000..de1d0fc
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-previous-rtl.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-previous-rtl@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-previous-rtl@2x.png
new file mode 100644
index 0000000..0250307
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-previous-rtl@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-previous.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-previous.png
new file mode 100644
index 0000000..bef0274
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-previous.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-previous@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-previous@2x.png
new file mode 100644
index 0000000..1da6dc9
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/findbarButton-previous@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/grab.cur b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/grab.cur
new file mode 100644
index 0000000..db7ad5a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/grab.cur
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/grabbing.cur b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/grabbing.cur
new file mode 100644
index 0000000..e0dfd04
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/grabbing.cur
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/loading-icon.gif b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/loading-icon.gif
new file mode 100644
index 0000000..1c72ebb
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/loading-icon.gif
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/loading-small.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/loading-small.png
new file mode 100644
index 0000000..8831a80
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/loading-small.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/loading-small@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/loading-small@2x.png
new file mode 100644
index 0000000..b25b445
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/loading-small@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-documentProperties.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-documentProperties.png
new file mode 100644
index 0000000..40925e2
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-documentProperties.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-documentProperties@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-documentProperties@2x.png
new file mode 100644
index 0000000..adb240e
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-documentProperties@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-firstPage.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-firstPage.png
new file mode 100644
index 0000000..e68846a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-firstPage.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-firstPage@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-firstPage@2x.png
new file mode 100644
index 0000000..3ad8af5
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-firstPage@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-handTool.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-handTool.png
new file mode 100644
index 0000000..cb85a84
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-handTool.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-handTool@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-handTool@2x.png
new file mode 100644
index 0000000..5c13f77
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-handTool@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-lastPage.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-lastPage.png
new file mode 100644
index 0000000..be763e0
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-lastPage.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-lastPage@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-lastPage@2x.png
new file mode 100644
index 0000000..8570984
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-lastPage@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCcw.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCcw.png
new file mode 100644
index 0000000..675d6da
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCcw.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCcw@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCcw@2x.png
new file mode 100644
index 0000000..b9e7431
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCcw@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCw.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCw.png
new file mode 100644
index 0000000..e1c7598
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCw.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCw@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCw@2x.png
new file mode 100644
index 0000000..cb257b4
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCw@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/shadow.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/shadow.png
new file mode 100644
index 0000000..31d3bdb
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/shadow.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/texture.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/texture.png
new file mode 100644
index 0000000..eb5ccb5
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/texture.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-bookmark.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-bookmark.png
new file mode 100644
index 0000000..a187be6
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-bookmark.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-bookmark@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-bookmark@2x.png
new file mode 100644
index 0000000..4efbaa6
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-bookmark@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-download.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-download.png
new file mode 100644
index 0000000..eaab35f
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-download.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-download@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-download@2x.png
new file mode 100644
index 0000000..896face
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-download@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-menuArrows.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-menuArrows.png
new file mode 100644
index 0000000..306eb43
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-menuArrows.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-menuArrows@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-menuArrows@2x.png
new file mode 100644
index 0000000..f7570bc
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-menuArrows@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-openFile.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-openFile.png
new file mode 100644
index 0000000..b5cf1bd
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-openFile.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-openFile@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-openFile@2x.png
new file mode 100644
index 0000000..91ab765
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-openFile@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageDown-rtl.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageDown-rtl.png
new file mode 100644
index 0000000..1957f79
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageDown-rtl.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageDown-rtl@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageDown-rtl@2x.png
new file mode 100644
index 0000000..16ebcb8
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageDown-rtl@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageDown.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageDown.png
new file mode 100644
index 0000000..8219ecf
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageDown.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageDown@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageDown@2x.png
new file mode 100644
index 0000000..758c01d
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageDown@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageUp-rtl.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageUp-rtl.png
new file mode 100644
index 0000000..98e7ce4
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageUp-rtl.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageUp-rtl@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageUp-rtl@2x.png
new file mode 100644
index 0000000..a01b023
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageUp-rtl@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageUp.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageUp.png
new file mode 100644
index 0000000..fb9daa3
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageUp.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageUp@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageUp@2x.png
new file mode 100644
index 0000000..a5cfd75
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-pageUp@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-presentationMode.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-presentationMode.png
new file mode 100644
index 0000000..3ac2124
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-presentationMode.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-presentationMode@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-presentationMode@2x.png
new file mode 100644
index 0000000..cada9e7
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-presentationMode@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-print.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-print.png
new file mode 100644
index 0000000..51275e5
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-print.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-print@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-print@2x.png
new file mode 100644
index 0000000..53d18da
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-print@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-search.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-search.png
new file mode 100644
index 0000000..f9b7557
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-search.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-search@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-search@2x.png
new file mode 100644
index 0000000..456b133
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-search@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle-rtl.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle-rtl.png
new file mode 100644
index 0000000..8437095
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle-rtl.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.png
new file mode 100644
index 0000000..9d9bfa4
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle.png
new file mode 100644
index 0000000..1f90f83
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle@2x.png
new file mode 100644
index 0000000..b066fe5
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle-rtl.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle-rtl.png
new file mode 100644
index 0000000..6f85ec0
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle-rtl.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle-rtl@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle-rtl@2x.png
new file mode 100644
index 0000000..291e006
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle-rtl@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle.png
new file mode 100644
index 0000000..025dc90
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle@2x.png
new file mode 100644
index 0000000..7f834df
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewAttachments.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewAttachments.png
new file mode 100644
index 0000000..fcd0b26
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewAttachments.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewAttachments@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewAttachments@2x.png
new file mode 100644
index 0000000..b979e52
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewAttachments@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewOutline-rtl.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewOutline-rtl.png
new file mode 100644
index 0000000..aaa9430
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewOutline-rtl.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewOutline-rtl@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewOutline-rtl@2x.png
new file mode 100644
index 0000000..3410f70
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewOutline-rtl@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewOutline.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewOutline.png
new file mode 100644
index 0000000..976365a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewOutline.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewOutline@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewOutline@2x.png
new file mode 100644
index 0000000..b6a197f
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewOutline@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewThumbnail.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewThumbnail.png
new file mode 100644
index 0000000..584ba55
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewThumbnail.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewThumbnail@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewThumbnail@2x.png
new file mode 100644
index 0000000..fb7db93
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-viewThumbnail@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-zoomIn.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-zoomIn.png
new file mode 100644
index 0000000..513d081
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-zoomIn.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-zoomIn@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-zoomIn@2x.png
new file mode 100644
index 0000000..d5d49d5
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-zoomIn@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-zoomOut.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-zoomOut.png
new file mode 100644
index 0000000..156c26b
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-zoomOut.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-zoomOut@2x.png b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-zoomOut@2x.png
new file mode 100644
index 0000000..959e191
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/images/toolbarButton-zoomOut@2x.png
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/l10n.js b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/l10n.js
new file mode 100644
index 0000000..3d5ecff
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/l10n.js
@@ -0,0 +1,1033 @@
+/**
+ * Copyright (c) 2011-2013 Fabien Cazenave, Mozilla.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+/*
+ Additional modifications for PDF.js project:
+ - Disables language initialization on page loading;
+ - Removes consoleWarn and consoleLog and use console.log/warn directly.
+ - Removes window._ assignment.
+ - Remove compatibility code for OldIE.
+*/
+
+/*jshint browser: true, devel: true, es5: true, globalstrict: true */
+'use strict';
+
+document.webL10n = (function(window, document, undefined) {
+ var gL10nData = {};
+ var gTextData = '';
+ var gTextProp = 'textContent';
+ var gLanguage = '';
+ var gMacros = {};
+ var gReadyState = 'loading';
+
+
+ /**
+ * Synchronously loading l10n resources significantly minimizes flickering
+ * from displaying the app with non-localized strings and then updating the
+ * strings. Although this will block all script execution on this page, we
+ * expect that the l10n resources are available locally on flash-storage.
+ *
+ * As synchronous XHR is generally considered as a bad idea, we're still
+ * loading l10n resources asynchronously -- but we keep this in a setting,
+ * just in case... and applications using this library should hide their
+ * content until the `localized' event happens.
+ */
+
+ var gAsyncResourceLoading = true; // read-only
+
+
+ /**
+ * DOM helpers for the so-called "HTML API".
+ *
+ * These functions are written for modern browsers. For old versions of IE,
+ * they're overridden in the 'startup' section at the end of this file.
+ */
+
+ function getL10nResourceLinks() {
+ return document.querySelectorAll('link[type="application/l10n"]');
+ }
+
+ function getL10nDictionary() {
+ var script = document.querySelector('script[type="application/l10n"]');
+ // TODO: support multiple and external JSON dictionaries
+ return script ? JSON.parse(script.innerHTML) : null;
+ }
+
+ function getTranslatableChildren(element) {
+ return element ? element.querySelectorAll('*[data-l10n-id]') : [];
+ }
+
+ function getL10nAttributes(element) {
+ if (!element)
+ return {};
+
+ var l10nId = element.getAttribute('data-l10n-id');
+ var l10nArgs = element.getAttribute('data-l10n-args');
+ var args = {};
+ if (l10nArgs) {
+ try {
+ args = JSON.parse(l10nArgs);
+ } catch (e) {
+ console.warn('could not parse arguments for #' + l10nId);
+ }
+ }
+ return { id: l10nId, args: args };
+ }
+
+ function fireL10nReadyEvent(lang) {
+ var evtObject = document.createEvent('Event');
+ evtObject.initEvent('localized', true, false);
+ evtObject.language = lang;
+ document.dispatchEvent(evtObject);
+ }
+
+ function xhrLoadText(url, onSuccess, onFailure) {
+ onSuccess = onSuccess || function _onSuccess(data) {};
+ onFailure = onFailure || function _onFailure() {
+ console.warn(url + ' not found.');
+ };
+
+ var xhr = new XMLHttpRequest();
+ xhr.open('GET', url, gAsyncResourceLoading);
+ if (xhr.overrideMimeType) {
+ xhr.overrideMimeType('text/plain; charset=utf-8');
+ }
+ xhr.onreadystatechange = function() {
+ if (xhr.readyState == 4) {
+ if (xhr.status == 200 || xhr.status === 0) {
+ onSuccess(xhr.responseText);
+ } else {
+ onFailure();
+ }
+ }
+ };
+ xhr.onerror = onFailure;
+ xhr.ontimeout = onFailure;
+
+ // in Firefox OS with the app:// protocol, trying to XHR a non-existing
+ // URL will raise an exception here -- hence this ugly try...catch.
+ try {
+ xhr.send(null);
+ } catch (e) {
+ onFailure();
+ }
+ }
+
+
+ /**
+ * l10n resource parser:
+ * - reads (async XHR) the l10n resource matching `lang';
+ * - imports linked resources (synchronously) when specified;
+ * - parses the text data (fills `gL10nData' and `gTextData');
+ * - triggers success/failure callbacks when done.
+ *
+ * @param {string} href
+ * URL of the l10n resource to parse.
+ *
+ * @param {string} lang
+ * locale (language) to parse. Must be a lowercase string.
+ *
+ * @param {Function} successCallback
+ * triggered when the l10n resource has been successully parsed.
+ *
+ * @param {Function} failureCallback
+ * triggered when the an error has occured.
+ *
+ * @return {void}
+ * uses the following global variables: gL10nData, gTextData, gTextProp.
+ */
+
+ function parseResource(href, lang, successCallback, failureCallback) {
+ var baseURL = href.replace(/[^\/]*$/, '') || './';
+
+ // handle escaped characters (backslashes) in a string
+ function evalString(text) {
+ if (text.lastIndexOf('\\') < 0)
+ return text;
+ return text.replace(/\\\\/g, '\\')
+ .replace(/\\n/g, '\n')
+ .replace(/\\r/g, '\r')
+ .replace(/\\t/g, '\t')
+ .replace(/\\b/g, '\b')
+ .replace(/\\f/g, '\f')
+ .replace(/\\{/g, '{')
+ .replace(/\\}/g, '}')
+ .replace(/\\"/g, '"')
+ .replace(/\\'/g, "'");
+ }
+
+ // parse *.properties text data into an l10n dictionary
+ // If gAsyncResourceLoading is false, then the callback will be called
+ // synchronously. Otherwise it is called asynchronously.
+ function parseProperties(text, parsedPropertiesCallback) {
+ var dictionary = {};
+
+ // token expressions
+ var reBlank = /^\s*|\s*$/;
+ var reComment = /^\s*#|^\s*$/;
+ var reSection = /^\s*\[(.*)\]\s*$/;
+ var reImport = /^\s*@import\s+url\((.*)\)\s*$/i;
+ var reSplit = /^([^=\s]*)\s*=\s*(.+)$/; // TODO: escape EOLs with '\'
+
+ // parse the *.properties file into an associative array
+ function parseRawLines(rawText, extendedSyntax, parsedRawLinesCallback) {
+ var entries = rawText.replace(reBlank, '').split(/[\r\n]+/);
+ var currentLang = '*';
+ var genericLang = lang.split('-', 1)[0];
+ var skipLang = false;
+ var match = '';
+
+ function nextEntry() {
+ // Use infinite loop instead of recursion to avoid reaching the
+ // maximum recursion limit for content with many lines.
+ while (true) {
+ if (!entries.length) {
+ parsedRawLinesCallback();
+ return;
+ }
+ var line = entries.shift();
+
+ // comment or blank line?
+ if (reComment.test(line))
+ continue;
+
+ // the extended syntax supports [lang] sections and @import rules
+ if (extendedSyntax) {
+ match = reSection.exec(line);
+ if (match) { // section start?
+ // RFC 4646, section 4.4, "All comparisons MUST be performed
+ // in a case-insensitive manner."
+
+ currentLang = match[1].toLowerCase();
+ skipLang = (currentLang !== '*') &&
+ (currentLang !== lang) && (currentLang !== genericLang);
+ continue;
+ } else if (skipLang) {
+ continue;
+ }
+ match = reImport.exec(line);
+ if (match) { // @import rule?
+ loadImport(baseURL + match[1], nextEntry);
+ return;
+ }
+ }
+
+ // key-value pair
+ var tmp = line.match(reSplit);
+ if (tmp && tmp.length == 3) {
+ dictionary[tmp[1]] = evalString(tmp[2]);
+ }
+ }
+ }
+ nextEntry();
+ }
+
+ // import another *.properties file
+ function loadImport(url, callback) {
+ xhrLoadText(url, function(content) {
+ parseRawLines(content, false, callback); // don't allow recursive imports
+ }, null);
+ }
+
+ // fill the dictionary
+ parseRawLines(text, true, function() {
+ parsedPropertiesCallback(dictionary);
+ });
+ }
+
+ // load and parse l10n data (warning: global variables are used here)
+ xhrLoadText(href, function(response) {
+ gTextData += response; // mostly for debug
+
+ // parse *.properties text data into an l10n dictionary
+ parseProperties(response, function(data) {
+
+ // find attribute descriptions, if any
+ for (var key in data) {
+ var id, prop, index = key.lastIndexOf('.');
+ if (index > 0) { // an attribute has been specified
+ id = key.substring(0, index);
+ prop = key.substr(index + 1);
+ } else { // no attribute: assuming text content by default
+ id = key;
+ prop = gTextProp;
+ }
+ if (!gL10nData[id]) {
+ gL10nData[id] = {};
+ }
+ gL10nData[id][prop] = data[key];
+ }
+
+ // trigger callback
+ if (successCallback) {
+ successCallback();
+ }
+ });
+ }, failureCallback);
+ }
+
+ // load and parse all resources for the specified locale
+ function loadLocale(lang, callback) {
+ // RFC 4646, section 2.1 states that language tags have to be treated as
+ // case-insensitive. Convert to lowercase for case-insensitive comparisons.
+ if (lang) {
+ lang = lang.toLowerCase();
+ }
+
+ callback = callback || function _callback() {};
+
+ clear();
+ gLanguage = lang;
+
+ // check all <link type="application/l10n" href="..." /> nodes
+ // and load the resource files
+ var langLinks = getL10nResourceLinks();
+ var langCount = langLinks.length;
+ if (langCount === 0) {
+ // we might have a pre-compiled dictionary instead
+ var dict = getL10nDictionary();
+ if (dict && dict.locales && dict.default_locale) {
+ console.log('using the embedded JSON directory, early way out');
+ gL10nData = dict.locales[lang];
+ if (!gL10nData) {
+ var defaultLocale = dict.default_locale.toLowerCase();
+ for (var anyCaseLang in dict.locales) {
+ anyCaseLang = anyCaseLang.toLowerCase();
+ if (anyCaseLang === lang) {
+ gL10nData = dict.locales[lang];
+ break;
+ } else if (anyCaseLang === defaultLocale) {
+ gL10nData = dict.locales[defaultLocale];
+ }
+ }
+ }
+ callback();
+ } else {
+ console.log('no resource to load, early way out');
+ }
+ // early way out
+ fireL10nReadyEvent(lang);
+ gReadyState = 'complete';
+ return;
+ }
+
+ // start the callback when all resources are loaded
+ var onResourceLoaded = null;
+ var gResourceCount = 0;
+ onResourceLoaded = function() {
+ gResourceCount++;
+ if (gResourceCount >= langCount) {
+ callback();
+ fireL10nReadyEvent(lang);
+ gReadyState = 'complete';
+ }
+ };
+
+ // load all resource files
+ function L10nResourceLink(link) {
+ var href = link.href;
+ // Note: If |gAsyncResourceLoading| is false, then the following callbacks
+ // are synchronously called.
+ this.load = function(lang, callback) {
+ parseResource(href, lang, callback, function() {
+ console.warn(href + ' not found.');
+ // lang not found, used default resource instead
+ console.warn('"' + lang + '" resource not found');
+ gLanguage = '';
+ // Resource not loaded, but we still need to call the callback.
+ callback();
+ });
+ };
+ }
+
+ for (var i = 0; i < langCount; i++) {
+ var resource = new L10nResourceLink(langLinks[i]);
+ resource.load(lang, onResourceLoaded);
+ }
+ }
+
+ // clear all l10n data
+ function clear() {
+ gL10nData = {};
+ gTextData = '';
+ gLanguage = '';
+ // TODO: clear all non predefined macros.
+ // There's no such macro /yet/ but we're planning to have some...
+ }
+
+
+ /**
+ * Get rules for plural forms (shared with JetPack), see:
+ * http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
+ * https://github.com/mozilla/addon-sdk/blob/master/python-lib/plural-rules-generator.p
+ *
+ * @param {string} lang
+ * locale (language) used.
+ *
+ * @return {Function}
+ * returns a function that gives the plural form name for a given integer:
+ * var fun = getPluralRules('en');
+ * fun(1) -> 'one'
+ * fun(0) -> 'other'
+ * fun(1000) -> 'other'.
+ */
+
+ function getPluralRules(lang) {
+ var locales2rules = {
+ 'af': 3,
+ 'ak': 4,
+ 'am': 4,
+ 'ar': 1,
+ 'asa': 3,
+ 'az': 0,
+ 'be': 11,
+ 'bem': 3,
+ 'bez': 3,
+ 'bg': 3,
+ 'bh': 4,
+ 'bm': 0,
+ 'bn': 3,
+ 'bo': 0,
+ 'br': 20,
+ 'brx': 3,
+ 'bs': 11,
+ 'ca': 3,
+ 'cgg': 3,
+ 'chr': 3,
+ 'cs': 12,
+ 'cy': 17,
+ 'da': 3,
+ 'de': 3,
+ 'dv': 3,
+ 'dz': 0,
+ 'ee': 3,
+ 'el': 3,
+ 'en': 3,
+ 'eo': 3,
+ 'es': 3,
+ 'et': 3,
+ 'eu': 3,
+ 'fa': 0,
+ 'ff': 5,
+ 'fi': 3,
+ 'fil': 4,
+ 'fo': 3,
+ 'fr': 5,
+ 'fur': 3,
+ 'fy': 3,
+ 'ga': 8,
+ 'gd': 24,
+ 'gl': 3,
+ 'gsw': 3,
+ 'gu': 3,
+ 'guw': 4,
+ 'gv': 23,
+ 'ha': 3,
+ 'haw': 3,
+ 'he': 2,
+ 'hi': 4,
+ 'hr': 11,
+ 'hu': 0,
+ 'id': 0,
+ 'ig': 0,
+ 'ii': 0,
+ 'is': 3,
+ 'it': 3,
+ 'iu': 7,
+ 'ja': 0,
+ 'jmc': 3,
+ 'jv': 0,
+ 'ka': 0,
+ 'kab': 5,
+ 'kaj': 3,
+ 'kcg': 3,
+ 'kde': 0,
+ 'kea': 0,
+ 'kk': 3,
+ 'kl': 3,
+ 'km': 0,
+ 'kn': 0,
+ 'ko': 0,
+ 'ksb': 3,
+ 'ksh': 21,
+ 'ku': 3,
+ 'kw': 7,
+ 'lag': 18,
+ 'lb': 3,
+ 'lg': 3,
+ 'ln': 4,
+ 'lo': 0,
+ 'lt': 10,
+ 'lv': 6,
+ 'mas': 3,
+ 'mg': 4,
+ 'mk': 16,
+ 'ml': 3,
+ 'mn': 3,
+ 'mo': 9,
+ 'mr': 3,
+ 'ms': 0,
+ 'mt': 15,
+ 'my': 0,
+ 'nah': 3,
+ 'naq': 7,
+ 'nb': 3,
+ 'nd': 3,
+ 'ne': 3,
+ 'nl': 3,
+ 'nn': 3,
+ 'no': 3,
+ 'nr': 3,
+ 'nso': 4,
+ 'ny': 3,
+ 'nyn': 3,
+ 'om': 3,
+ 'or': 3,
+ 'pa': 3,
+ 'pap': 3,
+ 'pl': 13,
+ 'ps': 3,
+ 'pt': 3,
+ 'rm': 3,
+ 'ro': 9,
+ 'rof': 3,
+ 'ru': 11,
+ 'rwk': 3,
+ 'sah': 0,
+ 'saq': 3,
+ 'se': 7,
+ 'seh': 3,
+ 'ses': 0,
+ 'sg': 0,
+ 'sh': 11,
+ 'shi': 19,
+ 'sk': 12,
+ 'sl': 14,
+ 'sma': 7,
+ 'smi': 7,
+ 'smj': 7,
+ 'smn': 7,
+ 'sms': 7,
+ 'sn': 3,
+ 'so': 3,
+ 'sq': 3,
+ 'sr': 11,
+ 'ss': 3,
+ 'ssy': 3,
+ 'st': 3,
+ 'sv': 3,
+ 'sw': 3,
+ 'syr': 3,
+ 'ta': 3,
+ 'te': 3,
+ 'teo': 3,
+ 'th': 0,
+ 'ti': 4,
+ 'tig': 3,
+ 'tk': 3,
+ 'tl': 4,
+ 'tn': 3,
+ 'to': 0,
+ 'tr': 0,
+ 'ts': 3,
+ 'tzm': 22,
+ 'uk': 11,
+ 'ur': 3,
+ 've': 3,
+ 'vi': 0,
+ 'vun': 3,
+ 'wa': 4,
+ 'wae': 3,
+ 'wo': 0,
+ 'xh': 3,
+ 'xog': 3,
+ 'yo': 0,
+ 'zh': 0,
+ 'zu': 3
+ };
+
+ // utility functions for plural rules methods
+ function isIn(n, list) {
+ return list.indexOf(n) !== -1;
+ }
+ function isBetween(n, start, end) {
+ return start <= n && n <= end;
+ }
+
+ // list of all plural rules methods:
+ // map an integer to the plural form name to use
+ var pluralRules = {
+ '0': function(n) {
+ return 'other';
+ },
+ '1': function(n) {
+ if ((isBetween((n % 100), 3, 10)))
+ return 'few';
+ if (n === 0)
+ return 'zero';
+ if ((isBetween((n % 100), 11, 99)))
+ return 'many';
+ if (n == 2)
+ return 'two';
+ if (n == 1)
+ return 'one';
+ return 'other';
+ },
+ '2': function(n) {
+ if (n !== 0 && (n % 10) === 0)
+ return 'many';
+ if (n == 2)
+ return 'two';
+ if (n == 1)
+ return 'one';
+ return 'other';
+ },
+ '3': function(n) {
+ if (n == 1)
+ return 'one';
+ return 'other';
+ },
+ '4': function(n) {
+ if ((isBetween(n, 0, 1)))
+ return 'one';
+ return 'other';
+ },
+ '5': function(n) {
+ if ((isBetween(n, 0, 2)) && n != 2)
+ return 'one';
+ return 'other';
+ },
+ '6': function(n) {
+ if (n === 0)
+ return 'zero';
+ if ((n % 10) == 1 && (n % 100) != 11)
+ return 'one';
+ return 'other';
+ },
+ '7': function(n) {
+ if (n == 2)
+ return 'two';
+ if (n == 1)
+ return 'one';
+ return 'other';
+ },
+ '8': function(n) {
+ if ((isBetween(n, 3, 6)))
+ return 'few';
+ if ((isBetween(n, 7, 10)))
+ return 'many';
+ if (n == 2)
+ return 'two';
+ if (n == 1)
+ return 'one';
+ return 'other';
+ },
+ '9': function(n) {
+ if (n === 0 || n != 1 && (isBetween((n % 100), 1, 19)))
+ return 'few';
+ if (n == 1)
+ return 'one';
+ return 'other';
+ },
+ '10': function(n) {
+ if ((isBetween((n % 10), 2, 9)) && !(isBetween((n % 100), 11, 19)))
+ return 'few';
+ if ((n % 10) == 1 && !(isBetween((n % 100), 11, 19)))
+ return 'one';
+ return 'other';
+ },
+ '11': function(n) {
+ if ((isBetween((n % 10), 2, 4)) && !(isBetween((n % 100), 12, 14)))
+ return 'few';
+ if ((n % 10) === 0 ||
+ (isBetween((n % 10), 5, 9)) ||
+ (isBetween((n % 100), 11, 14)))
+ return 'many';
+ if ((n % 10) == 1 && (n % 100) != 11)
+ return 'one';
+ return 'other';
+ },
+ '12': function(n) {
+ if ((isBetween(n, 2, 4)))
+ return 'few';
+ if (n == 1)
+ return 'one';
+ return 'other';
+ },
+ '13': function(n) {
+ if ((isBetween((n % 10), 2, 4)) && !(isBetween((n % 100), 12, 14)))
+ return 'few';
+ if (n != 1 && (isBetween((n % 10), 0, 1)) ||
+ (isBetween((n % 10), 5, 9)) ||
+ (isBetween((n % 100), 12, 14)))
+ return 'many';
+ if (n == 1)
+ return 'one';
+ return 'other';
+ },
+ '14': function(n) {
+ if ((isBetween((n % 100), 3, 4)))
+ return 'few';
+ if ((n % 100) == 2)
+ return 'two';
+ if ((n % 100) == 1)
+ return 'one';
+ return 'other';
+ },
+ '15': function(n) {
+ if (n === 0 || (isBetween((n % 100), 2, 10)))
+ return 'few';
+ if ((isBetween((n % 100), 11, 19)))
+ return 'many';
+ if (n == 1)
+ return 'one';
+ return 'other';
+ },
+ '16': function(n) {
+ if ((n % 10) == 1 && n != 11)
+ return 'one';
+ return 'other';
+ },
+ '17': function(n) {
+ if (n == 3)
+ return 'few';
+ if (n === 0)
+ return 'zero';
+ if (n == 6)
+ return 'many';
+ if (n == 2)
+ return 'two';
+ if (n == 1)
+ return 'one';
+ return 'other';
+ },
+ '18': function(n) {
+ if (n === 0)
+ return 'zero';
+ if ((isBetween(n, 0, 2)) && n !== 0 && n != 2)
+ return 'one';
+ return 'other';
+ },
+ '19': function(n) {
+ if ((isBetween(n, 2, 10)))
+ return 'few';
+ if ((isBetween(n, 0, 1)))
+ return 'one';
+ return 'other';
+ },
+ '20': function(n) {
+ if ((isBetween((n % 10), 3, 4) || ((n % 10) == 9)) && !(
+ isBetween((n % 100), 10, 19) ||
+ isBetween((n % 100), 70, 79) ||
+ isBetween((n % 100), 90, 99)
+ ))
+ return 'few';
+ if ((n % 1000000) === 0 && n !== 0)
+ return 'many';
+ if ((n % 10) == 2 && !isIn((n % 100), [12, 72, 92]))
+ return 'two';
+ if ((n % 10) == 1 && !isIn((n % 100), [11, 71, 91]))
+ return 'one';
+ return 'other';
+ },
+ '21': function(n) {
+ if (n === 0)
+ return 'zero';
+ if (n == 1)
+ return 'one';
+ return 'other';
+ },
+ '22': function(n) {
+ if ((isBetween(n, 0, 1)) || (isBetween(n, 11, 99)))
+ return 'one';
+ return 'other';
+ },
+ '23': function(n) {
+ if ((isBetween((n % 10), 1, 2)) || (n % 20) === 0)
+ return 'one';
+ return 'other';
+ },
+ '24': function(n) {
+ if ((isBetween(n, 3, 10) || isBetween(n, 13, 19)))
+ return 'few';
+ if (isIn(n, [2, 12]))
+ return 'two';
+ if (isIn(n, [1, 11]))
+ return 'one';
+ return 'other';
+ }
+ };
+
+ // return a function that gives the plural form name for a given integer
+ var index = locales2rules[lang.replace(/-.*$/, '')];
+ if (!(index in pluralRules)) {
+ console.warn('plural form unknown for [' + lang + ']');
+ return function() { return 'other'; };
+ }
+ return pluralRules[index];
+ }
+
+ // pre-defined 'plural' macro
+ gMacros.plural = function(str, param, key, prop) {
+ var n = parseFloat(param);
+ if (isNaN(n))
+ return str;
+
+ // TODO: support other properties (l20n still doesn't...)
+ if (prop != gTextProp)
+ return str;
+
+ // initialize _pluralRules
+ if (!gMacros._pluralRules) {
+ gMacros._pluralRules = getPluralRules(gLanguage);
+ }
+ var index = '[' + gMacros._pluralRules(n) + ']';
+
+ // try to find a [zero|one|two] key if it's defined
+ if (n === 0 && (key + '[zero]') in gL10nData) {
+ str = gL10nData[key + '[zero]'][prop];
+ } else if (n == 1 && (key + '[one]') in gL10nData) {
+ str = gL10nData[key + '[one]'][prop];
+ } else if (n == 2 && (key + '[two]') in gL10nData) {
+ str = gL10nData[key + '[two]'][prop];
+ } else if ((key + index) in gL10nData) {
+ str = gL10nData[key + index][prop];
+ } else if ((key + '[other]') in gL10nData) {
+ str = gL10nData[key + '[other]'][prop];
+ }
+
+ return str;
+ };
+
+
+ /**
+ * l10n dictionary functions
+ */
+
+ // fetch an l10n object, warn if not found, apply `args' if possible
+ function getL10nData(key, args, fallback) {
+ var data = gL10nData[key];
+ if (!data) {
+ console.warn('#' + key + ' is undefined.');
+ if (!fallback) {
+ return null;
+ }
+ data = fallback;
+ }
+
+ /** This is where l10n expressions should be processed.
+ * The plan is to support C-style expressions from the l20n project;
+ * until then, only two kinds of simple expressions are supported:
+ * {[ index ]} and {{ arguments }}.
+ */
+ var rv = {};
+ for (var prop in data) {
+ var str = data[prop];
+ str = substIndexes(str, args, key, prop);
+ str = substArguments(str, args, key);
+ rv[prop] = str;
+ }
+ return rv;
+ }
+
+ // replace {[macros]} with their values
+ function substIndexes(str, args, key, prop) {
+ var reIndex = /\{\[\s*([a-zA-Z]+)\(([a-zA-Z]+)\)\s*\]\}/;
+ var reMatch = reIndex.exec(str);
+ if (!reMatch || !reMatch.length)
+ return str;
+
+ // an index/macro has been found
+ // Note: at the moment, only one parameter is supported
+ var macroName = reMatch[1];
+ var paramName = reMatch[2];
+ var param;
+ if (args && paramName in args) {
+ param = args[paramName];
+ } else if (paramName in gL10nData) {
+ param = gL10nData[paramName];
+ }
+
+ // there's no macro parser yet: it has to be defined in gMacros
+ if (macroName in gMacros) {
+ var macro = gMacros[macroName];
+ str = macro(str, param, key, prop);
+ }
+ return str;
+ }
+
+ // replace {{arguments}} with their values
+ function substArguments(str, args, key) {
+ var reArgs = /\{\{\s*(.+?)\s*\}\}/g;
+ return str.replace(reArgs, function(matched_text, arg) {
+ if (args && arg in args) {
+ return args[arg];
+ }
+ if (arg in gL10nData) {
+ return gL10nData[arg];
+ }
+ console.log('argument {{' + arg + '}} for #' + key + ' is undefined.');
+ return matched_text;
+ });
+ }
+
+ // translate an HTML element
+ function translateElement(element) {
+ var l10n = getL10nAttributes(element);
+ if (!l10n.id)
+ return;
+
+ // get the related l10n object
+ var data = getL10nData(l10n.id, l10n.args);
+ if (!data) {
+ console.warn('#' + l10n.id + ' is undefined.');
+ return;
+ }
+
+ // translate element (TODO: security checks?)
+ if (data[gTextProp]) { // XXX
+ if (getChildElementCount(element) === 0) {
+ element[gTextProp] = data[gTextProp];
+ } else {
+ // this element has element children: replace the content of the first
+ // (non-empty) child textNode and clear other child textNodes
+ var children = element.childNodes;
+ var found = false;
+ for (var i = 0, l = children.length; i < l; i++) {
+ if (children[i].nodeType === 3 && /\S/.test(children[i].nodeValue)) {
+ if (found) {
+ children[i].nodeValue = '';
+ } else {
+ children[i].nodeValue = data[gTextProp];
+ found = true;
+ }
+ }
+ }
+ // if no (non-empty) textNode is found, insert a textNode before the
+ // first element child.
+ if (!found) {
+ var textNode = document.createTextNode(data[gTextProp]);
+ element.insertBefore(textNode, element.firstChild);
+ }
+ }
+ delete data[gTextProp];
+ }
+
+ for (var k in data) {
+ element[k] = data[k];
+ }
+ }
+
+ // webkit browsers don't currently support 'children' on SVG elements...
+ function getChildElementCount(element) {
+ if (element.children) {
+ return element.children.length;
+ }
+ if (typeof element.childElementCount !== 'undefined') {
+ return element.childElementCount;
+ }
+ var count = 0;
+ for (var i = 0; i < element.childNodes.length; i++) {
+ count += element.nodeType === 1 ? 1 : 0;
+ }
+ return count;
+ }
+
+ // translate an HTML subtree
+ function translateFragment(element) {
+ element = element || document.documentElement;
+
+ // check all translatable children (= w/ a `data-l10n-id' attribute)
+ var children = getTranslatableChildren(element);
+ var elementCount = children.length;
+ for (var i = 0; i < elementCount; i++) {
+ translateElement(children[i]);
+ }
+
+ // translate element itself if necessary
+ translateElement(element);
+ }
+
+ return {
+ // get a localized string
+ get: function(key, args, fallbackString) {
+ var index = key.lastIndexOf('.');
+ var prop = gTextProp;
+ if (index > 0) { // An attribute has been specified
+ prop = key.substr(index + 1);
+ key = key.substring(0, index);
+ }
+ var fallback;
+ if (fallbackString) {
+ fallback = {};
+ fallback[prop] = fallbackString;
+ }
+ var data = getL10nData(key, args, fallback);
+ if (data && prop in data) {
+ return data[prop];
+ }
+ return '{{' + key + '}}';
+ },
+
+ // debug
+ getData: function() { return gL10nData; },
+ getText: function() { return gTextData; },
+
+ // get|set the document language
+ getLanguage: function() { return gLanguage; },
+ setLanguage: function(lang, callback) {
+ loadLocale(lang, function() {
+ if (callback)
+ callback();
+ translateFragment();
+ });
+ },
+
+ // get the direction (ltr|rtl) of the current language
+ getDirection: function() {
+ // http://www.w3.org/International/questions/qa-scripts
+ // Arabic, Hebrew, Farsi, Pashto, Urdu
+ var rtlList = ['ar', 'he', 'fa', 'ps', 'ur'];
+ var shortCode = gLanguage.split('-', 1)[0];
+ return (rtlList.indexOf(shortCode) >= 0) ? 'rtl' : 'ltr';
+ },
+
+ // translate an element or document fragment
+ translate: translateFragment,
+
+ // this can be used to prevent race conditions
+ getReadyState: function() { return gReadyState; },
+ ready: function(callback) {
+ if (!callback) {
+ return;
+ } else if (gReadyState == 'complete' || gReadyState == 'interactive') {
+ window.setTimeout(function() {
+ callback();
+ });
+ } else if (document.addEventListener) {
+ document.addEventListener('localized', function once() {
+ document.removeEventListener('localized', once);
+ callback();
+ });
+ }
+ }
+ };
+}) (window, document);
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/locale/locale.properties b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/locale/locale.properties
new file mode 100644
index 0000000..9aded1b
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/locale/locale.properties
@@ -0,0 +1,312 @@
+[ach]
+@import url(ach/viewer.properties)
+
+[af]
+@import url(af/viewer.properties)
+
+[ak]
+@import url(ak/viewer.properties)
+
+[an]
+@import url(an/viewer.properties)
+
+[ar]
+@import url(ar/viewer.properties)
+
+[as]
+@import url(as/viewer.properties)
+
+[ast]
+@import url(ast/viewer.properties)
+
+[az]
+@import url(az/viewer.properties)
+
+[be]
+@import url(be/viewer.properties)
+
+[bg]
+@import url(bg/viewer.properties)
+
+[bn-BD]
+@import url(bn-BD/viewer.properties)
+
+[bn-IN]
+@import url(bn-IN/viewer.properties)
+
+[br]
+@import url(br/viewer.properties)
+
+[bs]
+@import url(bs/viewer.properties)
+
+[ca]
+@import url(ca/viewer.properties)
+
+[cs]
+@import url(cs/viewer.properties)
+
+[csb]
+@import url(csb/viewer.properties)
+
+[cy]
+@import url(cy/viewer.properties)
+
+[da]
+@import url(da/viewer.properties)
+
+[de]
+@import url(de/viewer.properties)
+
+[el]
+@import url(el/viewer.properties)
+
+[en-GB]
+@import url(en-GB/viewer.properties)
+
+[en-US]
+@import url(en-US/viewer.properties)
+
+[en-ZA]
+@import url(en-ZA/viewer.properties)
+
+[eo]
+@import url(eo/viewer.properties)
+
+[es-AR]
+@import url(es-AR/viewer.properties)
+
+[es-CL]
+@import url(es-CL/viewer.properties)
+
+[es-ES]
+@import url(es-ES/viewer.properties)
+
+[es-MX]
+@import url(es-MX/viewer.properties)
+
+[et]
+@import url(et/viewer.properties)
+
+[eu]
+@import url(eu/viewer.properties)
+
+[fa]
+@import url(fa/viewer.properties)
+
+[ff]
+@import url(ff/viewer.properties)
+
+[fi]
+@import url(fi/viewer.properties)
+
+[fr]
+@import url(fr/viewer.properties)
+
+[fy-NL]
+@import url(fy-NL/viewer.properties)
+
+[ga-IE]
+@import url(ga-IE/viewer.properties)
+
+[gd]
+@import url(gd/viewer.properties)
+
+[gl]
+@import url(gl/viewer.properties)
+
+[gu-IN]
+@import url(gu-IN/viewer.properties)
+
+[he]
+@import url(he/viewer.properties)
+
+[hi-IN]
+@import url(hi-IN/viewer.properties)
+
+[hr]
+@import url(hr/viewer.properties)
+
+[hu]
+@import url(hu/viewer.properties)
+
+[hy-AM]
+@import url(hy-AM/viewer.properties)
+
+[id]
+@import url(id/viewer.properties)
+
+[is]
+@import url(is/viewer.properties)
+
+[it]
+@import url(it/viewer.properties)
+
+[ja]
+@import url(ja/viewer.properties)
+
+[ka]
+@import url(ka/viewer.properties)
+
+[kk]
+@import url(kk/viewer.properties)
+
+[km]
+@import url(km/viewer.properties)
+
+[kn]
+@import url(kn/viewer.properties)
+
+[ko]
+@import url(ko/viewer.properties)
+
+[ku]
+@import url(ku/viewer.properties)
+
+[lg]
+@import url(lg/viewer.properties)
+
+[lij]
+@import url(lij/viewer.properties)
+
+[lt]
+@import url(lt/viewer.properties)
+
+[lv]
+@import url(lv/viewer.properties)
+
+[mai]
+@import url(mai/viewer.properties)
+
+[mk]
+@import url(mk/viewer.properties)
+
+[ml]
+@import url(ml/viewer.properties)
+
+[mn]
+@import url(mn/viewer.properties)
+
+[mr]
+@import url(mr/viewer.properties)
+
+[ms]
+@import url(ms/viewer.properties)
+
+[my]
+@import url(my/viewer.properties)
+
+[nb-NO]
+@import url(nb-NO/viewer.properties)
+
+[nl]
+@import url(nl/viewer.properties)
+
+[nn-NO]
+@import url(nn-NO/viewer.properties)
+
+[nso]
+@import url(nso/viewer.properties)
+
+[oc]
+@import url(oc/viewer.properties)
+
+[or]
+@import url(or/viewer.properties)
+
+[pa-IN]
+@import url(pa-IN/viewer.properties)
+
+[pl]
+@import url(pl/viewer.properties)
+
+[pt-BR]
+@import url(pt-BR/viewer.properties)
+
+[pt-PT]
+@import url(pt-PT/viewer.properties)
+
+[rm]
+@import url(rm/viewer.properties)
+
+[ro]
+@import url(ro/viewer.properties)
+
+[ru]
+@import url(ru/viewer.properties)
+
+[rw]
+@import url(rw/viewer.properties)
+
+[sah]
+@import url(sah/viewer.properties)
+
+[si]
+@import url(si/viewer.properties)
+
+[sk]
+@import url(sk/viewer.properties)
+
+[sl]
+@import url(sl/viewer.properties)
+
+[son]
+@import url(son/viewer.properties)
+
+[sq]
+@import url(sq/viewer.properties)
+
+[sr]
+@import url(sr/viewer.properties)
+
+[sv-SE]
+@import url(sv-SE/viewer.properties)
+
+[sw]
+@import url(sw/viewer.properties)
+
+[ta]
+@import url(ta/viewer.properties)
+
+[ta-LK]
+@import url(ta-LK/viewer.properties)
+
+[te]
+@import url(te/viewer.properties)
+
+[th]
+@import url(th/viewer.properties)
+
+[tl]
+@import url(tl/viewer.properties)
+
+[tn]
+@import url(tn/viewer.properties)
+
+[tr]
+@import url(tr/viewer.properties)
+
+[uk]
+@import url(uk/viewer.properties)
+
+[ur]
+@import url(ur/viewer.properties)
+
+[vi]
+@import url(vi/viewer.properties)
+
+[wo]
+@import url(wo/viewer.properties)
+
+[xh]
+@import url(xh/viewer.properties)
+
+[zh-CN]
+@import url(zh-CN/viewer.properties)
+
+[zh-TW]
+@import url(zh-TW/viewer.properties)
+
+[zu]
+@import url(zu/viewer.properties)
+
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/locale/zh-CN/viewer.properties b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/locale/zh-CN/viewer.properties
new file mode 100644
index 0000000..6ec25f7
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/locale/zh-CN/viewer.properties
@@ -0,0 +1,167 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed 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.
+
+# Main toolbar buttons (tooltips and alt text for images)
+previous.title=上一页
+previous_label=上一页
+next.title=下一页
+next_label=下一页
+
+# LOCALIZATION NOTE (page_label, page_of):
+# These strings are concatenated to form the "Page: X of Y" string.
+# Do not translate "{{pageCount}}", it will be substituted with a number
+# representing the total number of pages.
+page_label=页面：
+page_of=/ {{pageCount}}
+
+zoom_out.title=缩小
+zoom_out_label=缩小
+zoom_in.title=放大
+zoom_in_label=放大
+zoom.title=缩放
+presentation_mode.title=切换到演示模式
+presentation_mode_label=演示模式
+open_file.title=打开文件
+open_file_label=打开
+print.title=打印
+print_label=打印
+download.title=下载
+download_label=下载
+bookmark.title=当前视图（复制或在新窗口中打开）
+bookmark_label=当前视图
+
+# Secondary toolbar and context menu
+tools.title=工具
+tools_label=工具
+first_page.title=转到第一页
+first_page.label=转到第一页
+first_page_label=转到第一页
+last_page.title=转到最后一页
+last_page.label=转到最后一页
+last_page_label=转到最后一页
+page_rotate_cw.title=顺时针旋转
+page_rotate_cw.label=顺时针旋转
+page_rotate_cw_label=顺时针旋转
+page_rotate_ccw.title=逆时针旋转
+page_rotate_ccw.label=逆时针旋转
+page_rotate_ccw_label=逆时针旋转
+
+hand_tool_enable.title=启用手形工具
+hand_tool_enable_label=启用手形工具
+hand_tool_disable.title=禁用手形工具
+hand_tool_disable_label=禁用手形工具
+
+# Document properties dialog box
+document_properties.title=文档属性…
+document_properties_label=文档属性…
+document_properties_file_name=文件名:
+document_properties_file_size=文件大小:
+document_properties_kb={{size_kb}} KB ({{size_b}} 字节)
+document_properties_mb={{size_mb}} MB ({{size_b}} 字节)
+document_properties_title=标题:
+document_properties_author=作者:
+document_properties_subject=主题:
+document_properties_keywords=关键词:
+document_properties_creation_date=创建日期:
+document_properties_modification_date=修改日期:
+document_properties_date_string={{date}}, {{time}}
+document_properties_creator=创建者:
+document_properties_producer=PDF 制作者:
+document_properties_version=PDF 版本:
+document_properties_page_count=页数:
+document_properties_close=关闭
+
+# Tooltips and alt text for side panel toolbar buttons
+# (the _label strings are alt text for the buttons, the .title strings are
+# tooltips)
+toggle_sidebar.title=切换侧栏
+toggle_sidebar_label=切换侧栏
+outline.title=显示文档大纲
+outline_label=文档大纲
+attachments.title=显示附件
+attachments_label=附件
+thumbs.title=显示缩略图
+thumbs_label=缩略图
+findbar.title=在文档中查找
+findbar_label=查找
+
+# Thumbnails panel item (tooltip and alt text for images)
+# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
+# number.
+thumb_page_title=页码 {{page}}
+# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
+# number.
+thumb_page_canvas=页面 {{page}} 的缩略图
+
+# Find panel button title and messages
+find_label=查找：
+find_previous.title=查找词语上一次出现的位置
+find_previous_label=上一页
+find_next.title=查找词语后一次出现的位置
+find_next_label=下一页
+find_highlight=全部高亮显示
+find_match_case_label=区分大小写
+find_reached_top=到达文档开头，从末尾继续
+find_reached_bottom=到达文档末尾，从开头继续
+find_not_found=词语未找到
+
+# Error panel labels
+error_more_info=更多信息
+error_less_info=更少信息
+error_close=关闭
+# LOCALIZATION NOTE (error_version_info): "{{version}}" and "{{build}}" will be
+# replaced by the PDF.JS version and build ID.
+error_version_info=PDF.js v{{version}} (build: {{build}})
+# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
+# english string describing the error.
+error_message=信息：{{message}}
+# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
+# trace.
+error_stack=堆栈：{{stack}}
+# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
+error_file=文件：{{file}}
+# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
+error_line=行号：{{line}}
+rendering_error=渲染页面时发生错误。
+
+# Predefined zoom values
+page_scale_width=适合页宽
+page_scale_fit=适合页面
+page_scale_auto=自动缩放
+page_scale_actual=实际大小
+# LOCALIZATION NOTE (page_scale_percent): "{{scale}}" will be replaced by a
+# numerical scale value.
+page_scale_percent={{scale}}%
+
+# Loading indicator messages
+loading_error_indicator=错误
+loading_error=载入PDF时发生错误。
+invalid_file_error=无效或损坏的PDF文件。
+missing_file_error=缺少PDF文件。
+unexpected_response_error=意外的服务器响应。
+
+# LOCALIZATION NOTE (text_annotation_type.alt): This is used as a tooltip.
+# "{{type}}" will be replaced with an annotation type from a list defined in
+# the PDF spec (32000-1:2008 Table 169 – Annotation types).
+# Some common types are e.g.: "Check", "Text", "Comment", "Note"
+text_annotation_type.alt=[{{type}} 注解]
+password_label=输入密码以打开此 PDF 文件。
+password_invalid=密码无效。请重试。
+password_ok=确定
+password_cancel=取消
+
+printing_not_supported=警告：打印功能不完全支持此浏览器。
+printing_not_ready=警告：该 PDF 未完全加载以供打印。
+web_fonts_disabled=Web 字体已被禁用：无法使用嵌入的PDF字体。
+document_colors_disabled=不允许 PDF 文档使用自己的颜色：浏览器中“允许页面选择自己的颜色”的选项已停用。
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/viewer.css b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/viewer.css
new file mode 100644
index 0000000..a82150c
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/viewer.css
@@ -0,0 +1,1999 @@
+/* Copyright 2014 Mozilla Foundation
+ *
+ * Licensed 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.
+ */
+
+.textLayer {
+ position: absolute;
+ left: 0;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ overflow: hidden;
+ opacity: 0.2;
+}
+
+.textLayer > div {
+ color: transparent;
+ position: absolute;
+ white-space: pre;
+ cursor: text;
+ -webkit-transform-origin: 0% 0%;
+ -moz-transform-origin: 0% 0%;
+ -o-transform-origin: 0% 0%;
+ -ms-transform-origin: 0% 0%;
+ transform-origin: 0% 0%;
+}
+
+.textLayer .highlight {
+ margin: -1px;
+ padding: 1px;
+
+ background-color: rgb(180, 0, 170);
+ border-radius: 4px;
+}
+
+.textLayer .highlight.begin {
+ border-radius: 4px 0px 0px 4px;
+}
+
+.textLayer .highlight.end {
+ border-radius: 0px 4px 4px 0px;
+}
+
+.textLayer .highlight.middle {
+ border-radius: 0px;
+}
+
+.textLayer .highlight.selected {
+ background-color: rgb(0, 100, 0);
+}
+
+.textLayer ::selection { background: rgb(0,0,255); }
+.textLayer ::-moz-selection { background: rgb(0,0,255); }
+
+.pdfViewer .canvasWrapper {
+ overflow: hidden;
+}
+
+.pdfViewer .page {
+ direction: ltr;
+ width: 816px;
+ height: 1056px;
+ margin: 1px auto -8px auto;
+ position: relative;
+ overflow: visible;
+ border: 9px solid transparent;
+ background-clip: content-box;
+ border-image: url(images/shadow.png) 9 9 repeat;
+ background-color: white;
+}
+
+.pdfViewer.removePageBorders .page {
+ margin: 0px auto 10px auto;
+ border: none;
+}
+
+.pdfViewer .page canvas {
+ margin: 0;
+ display: block;
+}
+
+.pdfViewer .page .loadingIcon {
+ position: absolute;
+ display: block;
+ left: 0;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ background: url('images/loading-icon.gif') center no-repeat;
+}
+
+.pdfViewer .page .annotLink > a:hover {
+ opacity: 0.2;
+ background: #ff0;
+ box-shadow: 0px 2px 10px #ff0;
+}
+
+.pdfPresentationMode:-webkit-full-screen .pdfViewer .page {
+ margin-bottom: 100%;
+ border: 0;
+}
+
+.pdfPresentationMode:-moz-full-screen .pdfViewer .page {
+ margin-bottom: 100%;
+ border: 0;
+}
+
+.pdfPresentationMode:-ms-fullscreen .pdfViewer .page {
+ margin-bottom: 100% !important;
+ border: 0;
+}
+
+.pdfPresentationMode:fullscreen .pdfViewer .page {
+ margin-bottom: 100%;
+ border: 0;
+}
+
+.pdfViewer .page .annotText > img {
+ position: absolute;
+ cursor: pointer;
+}
+
+.pdfViewer .page .annotTextContentWrapper {
+ position: absolute;
+ width: 20em;
+}
+
+.pdfViewer .page .annotTextContent {
+ z-index: 200;
+ float: left;
+ max-width: 20em;
+ background-color: #FFFF99;
+ box-shadow: 0px 2px 5px #333;
+ border-radius: 2px;
+ padding: 0.6em;
+ cursor: pointer;
+}
+
+.pdfViewer .page .annotTextContent > h1 {
+ font-size: 1em;
+ border-bottom: 1px solid #000000;
+ padding-bottom: 0.2em;
+}
+
+.pdfViewer .page .annotTextContent > p {
+ padding-top: 0.2em;
+}
+
+.pdfViewer .page .annotLink > a {
+ position: absolute;
+ font-size: 1em;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+}
+
+.pdfViewer .page .annotLink > a /* -ms-a */ {
+ background: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAA\
+ LAAAAAABAAEAAAIBRAA7") 0 0 repeat;
+}
+
+* {
+ padding: 0;
+ margin: 0;
+}
+
+html {
+ height: 100%;
+ /* Font size is needed to make the activity bar the correct size. */
+ font-size: 10px;
+}
+
+body {
+ height: 100%;
+ background-color: #404040;
+ background-image: url(images/texture.png);
+}
+
+body,
+input,
+button,
+select {
+ font: message-box;
+ outline: none;
+}
+
+.hidden {
+ display: none !important;
+}
+[hidden] {
+ display: none !important;
+}
+
+#viewerContainer.pdfPresentationMode:-webkit-full-screen {
+ top: 0px;
+ border-top: 2px solid transparent;
+ background-color: #000;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ cursor: none;
+ -webkit-user-select: none;
+}
+
+#viewerContainer.pdfPresentationMode:-moz-full-screen {
+ top: 0px;
+ border-top: 2px solid transparent;
+ background-color: #000;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ cursor: none;
+ -moz-user-select: none;
+}
+
+#viewerContainer.pdfPresentationMode:-ms-fullscreen {
+ top: 0px !important;
+ border-top: 2px solid transparent;
+ width: 100%;
+ height: 100%;
+ overflow: hidden !important;
+ cursor: none;
+ -ms-user-select: none;
+}
+
+#viewerContainer.pdfPresentationMode:-ms-fullscreen::-ms-backdrop {
+ background-color: #000;
+}
+
+#viewerContainer.pdfPresentationMode:fullscreen {
+ top: 0px;
+ border-top: 2px solid transparent;
+ background-color: #000;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ cursor: none;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+}
+
+.pdfPresentationMode:-webkit-full-screen a:not(.internalLink) {
+ display: none;
+}
+
+.pdfPresentationMode:-moz-full-screen a:not(.internalLink) {
+ display: none;
+}
+
+.pdfPresentationMode:-ms-fullscreen a:not(.internalLink) {
+ display: none !important;
+}
+
+.pdfPresentationMode:fullscreen a:not(.internalLink) {
+ display: none;
+}
+
+.pdfPresentationMode:-webkit-full-screen .textLayer > div {
+ cursor: none;
+}
+
+.pdfPresentationMode:-moz-full-screen .textLayer > div {
+ cursor: none;
+}
+
+.pdfPresentationMode:-ms-fullscreen .textLayer > div {
+ cursor: none;
+}
+
+.pdfPresentationMode:fullscreen .textLayer > div {
+ cursor: none;
+}
+
+.pdfPresentationMode.pdfPresentationModeControls > *,
+.pdfPresentationMode.pdfPresentationModeControls .textLayer > div {
+ cursor: default;
+}
+
+/* outer/inner center provides horizontal center */
+.outerCenter {
+ pointer-events: none;
+ position: relative;
+}
+html[dir='ltr'] .outerCenter {
+ float: right;
+ right: 50%;
+}
+html[dir='rtl'] .outerCenter {
+ float: left;
+ left: 50%;
+}
+.innerCenter {
+ pointer-events: auto;
+ position: relative;
+}
+html[dir='ltr'] .innerCenter {
+ float: right;
+ right: -50%;
+}
+html[dir='rtl'] .innerCenter {
+ float: left;
+ left: -50%;
+}
+
+#outerContainer {
+ width: 100%;
+ height: 100%;
+ position: relative;
+}
+
+#sidebarContainer {
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ width: 200px;
+ visibility: hidden;
+ -webkit-transition-duration: 200ms;
+ -webkit-transition-timing-function: ease;
+ transition-duration: 200ms;
+ transition-timing-function: ease;
+
+}
+html[dir='ltr'] #sidebarContainer {
+ -webkit-transition-property: left;
+ transition-property: left;
+ left: -200px;
+}
+html[dir='rtl'] #sidebarContainer {
+ -webkit-transition-property: right;
+ transition-property: right;
+ right: -200px;
+}
+
+#outerContainer.sidebarMoving > #sidebarContainer,
+#outerContainer.sidebarOpen > #sidebarContainer {
+ visibility: visible;
+}
+html[dir='ltr'] #outerContainer.sidebarOpen > #sidebarContainer {
+ left: 0px;
+}
+html[dir='rtl'] #outerContainer.sidebarOpen > #sidebarContainer {
+ right: 0px;
+}
+
+#mainContainer {
+ position: absolute;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ min-width: 320px;
+ -webkit-transition-duration: 200ms;
+ -webkit-transition-timing-function: ease;
+ transition-duration: 200ms;
+ transition-timing-function: ease;
+}
+html[dir='ltr'] #outerContainer.sidebarOpen > #mainContainer {
+ -webkit-transition-property: left;
+ transition-property: left;
+ left: 200px;
+}
+html[dir='rtl'] #outerContainer.sidebarOpen > #mainContainer {
+ -webkit-transition-property: right;
+ transition-property: right;
+ right: 200px;
+}
+
+#sidebarContent {
+ top: 32px;
+ bottom: 0;
+ overflow: auto;
+ -webkit-overflow-scrolling: touch;
+ position: absolute;
+ width: 200px;
+ background-color: hsla(0,0%,0%,.1);
+}
+html[dir='ltr'] #sidebarContent {
+ left: 0;
+ box-shadow: inset -1px 0 0 hsla(0,0%,0%,.25);
+}
+html[dir='rtl'] #sidebarContent {
+ right: 0;
+ box-shadow: inset 1px 0 0 hsla(0,0%,0%,.25);
+}
+
+#viewerContainer {
+ overflow: auto;
+ -webkit-overflow-scrolling: touch;
+ position: absolute;
+ top: 32px;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ outline: none;
+}
+html[dir='ltr'] #viewerContainer {
+ box-shadow: inset 1px 0 0 hsla(0,0%,100%,.05);
+}
+html[dir='rtl'] #viewerContainer {
+ box-shadow: inset -1px 0 0 hsla(0,0%,100%,.05);
+}
+
+.toolbar {
+ position: relative;
+ left: 0;
+ right: 0;
+ z-index: 9999;
+ cursor: default;
+}
+
+#toolbarContainer {
+ width: 100%;
+}
+
+#toolbarSidebar {
+ width: 200px;
+ height: 32px;
+ background-color: #424242; /* fallback */
+ background-image: url(images/texture.png),
+ linear-gradient(hsla(0,0%,30%,.99), hsla(0,0%,25%,.95));
+}
+html[dir='ltr'] #toolbarSidebar {
+ box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.25),
+ inset 0 -1px 0 hsla(0,0%,100%,.05),
+ 0 1px 0 hsla(0,0%,0%,.15),
+ 0 0 1px hsla(0,0%,0%,.1);
+}
+html[dir='rtl'] #toolbarSidebar {
+ box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.25),
+ inset 0 1px 0 hsla(0,0%,100%,.05),
+ 0 1px 0 hsla(0,0%,0%,.15),
+ 0 0 1px hsla(0,0%,0%,.1);
+}
+
+#toolbarContainer, .findbar, .secondaryToolbar {
+ position: relative;
+ height: 32px;
+ background-color: #474747; /* fallback */
+ background-image: url(images/texture.png),
+ linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
+}
+html[dir='ltr'] #toolbarContainer, .findbar, .secondaryToolbar {
+ box-shadow: inset 1px 0 0 hsla(0,0%,100%,.08),
+ inset 0 1px 1px hsla(0,0%,0%,.15),
+ inset 0 -1px 0 hsla(0,0%,100%,.05),
+ 0 1px 0 hsla(0,0%,0%,.15),
+ 0 1px 1px hsla(0,0%,0%,.1);
+}
+html[dir='rtl'] #toolbarContainer, .findbar, .secondaryToolbar {
+ box-shadow: inset -1px 0 0 hsla(0,0%,100%,.08),
+ inset 0 1px 1px hsla(0,0%,0%,.15),
+ inset 0 -1px 0 hsla(0,0%,100%,.05),
+ 0 1px 0 hsla(0,0%,0%,.15),
+ 0 1px 1px hsla(0,0%,0%,.1);
+}
+
+#toolbarViewer {
+ height: 32px;
+}
+
+#loadingBar {
+ position: relative;
+ width: 100%;
+ height: 4px;
+ background-color: #333;
+ border-bottom: 1px solid #333;
+}
+
+#loadingBar .progress {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 0%;
+ height: 100%;
+ background-color: #ddd;
+ overflow: hidden;
+ -webkit-transition: width 200ms;
+ transition: width 200ms;
+}
+
+@-webkit-keyframes progressIndeterminate {
+ 0% { left: 0%; }
+ 50% { left: 100%; }
+ 100% { left: 100%; }
+}
+
+@keyframes progressIndeterminate {
+ 0% { left: 0%; }
+ 50% { left: 100%; }
+ 100% { left: 100%; }
+}
+
+#loadingBar .progress.indeterminate {
+ background-color: #999;
+ -webkit-transition: none;
+ transition: none;
+}
+
+#loadingBar .indeterminate .glimmer {
+ position: absolute;
+ top: 0;
+ left: 0;
+ height: 100%;
+ width: 50px;
+
+ background-image: linear-gradient(to right, #999 0%, #fff 50%, #999 100%);
+ background-size: 100% 100%;
+ background-repeat: no-repeat;
+
+ -webkit-animation: progressIndeterminate 2s linear infinite;
+ animation: progressIndeterminate 2s linear infinite;
+}
+
+.findbar, .secondaryToolbar {
+ top: 32px;
+ position: absolute;
+ z-index: 10000;
+ height: 32px;
+
+ min-width: 16px;
+ padding: 0px 6px 0px 6px;
+ margin: 4px 2px 4px 2px;
+ color: hsl(0,0%,85%);
+ font-size: 12px;
+ line-height: 14px;
+ text-align: left;
+ cursor: default;
+}
+
+html[dir='ltr'] .findbar {
+ left: 68px;
+}
+
+html[dir='rtl'] .findbar {
+ right: 68px;
+}
+
+.findbar label {
+ -webkit-user-select: none;
+ -moz-user-select: none;
+}
+
+#findInput[data-status="pending"] {
+ background-image: url(images/loading-small.png);
+ background-repeat: no-repeat;
+ background-position: right;
+}
+html[dir='rtl'] #findInput[data-status="pending"] {
+ background-position: left;
+}
+
+.secondaryToolbar {
+ padding: 6px;
+ height: auto;
+ z-index: 30000;
+}
+html[dir='ltr'] .secondaryToolbar {
+ right: 4px;
+}
+html[dir='rtl'] .secondaryToolbar {
+ left: 4px;
+}
+
+#secondaryToolbarButtonContainer {
+ max-width: 200px;
+ max-height: 400px;
+ overflow-y: auto;
+ -webkit-overflow-scrolling: touch;
+ margin-bottom: -4px;
+}
+
+.doorHanger,
+.doorHangerRight {
+ border: 1px solid hsla(0,0%,0%,.5);
+ border-radius: 2px;
+ box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+}
+.doorHanger:after, .doorHanger:before,
+.doorHangerRight:after, .doorHangerRight:before {
+ bottom: 100%;
+ border: solid transparent;
+ content: " ";
+ height: 0;
+ width: 0;
+ position: absolute;
+ pointer-events: none;
+}
+.doorHanger:after,
+.doorHangerRight:after {
+ border-bottom-color: hsla(0,0%,32%,.99);
+ border-width: 8px;
+}
+.doorHanger:before,
+.doorHangerRight:before {
+ border-bottom-color: hsla(0,0%,0%,.5);
+ border-width: 9px;
+}
+
+html[dir='ltr'] .doorHanger:after,
+html[dir='rtl'] .doorHangerRight:after {
+ left: 13px;
+ margin-left: -8px;
+}
+
+html[dir='ltr'] .doorHanger:before,
+html[dir='rtl'] .doorHangerRight:before {
+ left: 13px;
+ margin-left: -9px;
+}
+
+html[dir='rtl'] .doorHanger:after,
+html[dir='ltr'] .doorHangerRight:after {
+ right: 13px;
+ margin-right: -8px;
+}
+
+html[dir='rtl'] .doorHanger:before,
+html[dir='ltr'] .doorHangerRight:before {
+ right: 13px;
+ margin-right: -9px;
+}
+
+#findMsg {
+ font-style: italic;
+ color: #A6B7D0;
+}
+
+#findInput.notFound {
+ background-color: rgb(255, 102, 102);
+}
+
+html[dir='ltr'] #toolbarViewerLeft {
+ margin-left: -1px;
+}
+html[dir='rtl'] #toolbarViewerRight {
+ margin-right: -1px;
+}
+
+html[dir='ltr'] #toolbarViewerLeft,
+html[dir='rtl'] #toolbarViewerRight {
+ position: absolute;
+ top: 0;
+ left: 0;
+}
+html[dir='ltr'] #toolbarViewerRight,
+html[dir='rtl'] #toolbarViewerLeft {
+ position: absolute;
+ top: 0;
+ right: 0;
+}
+html[dir='ltr'] #toolbarViewerLeft > *,
+html[dir='ltr'] #toolbarViewerMiddle > *,
+html[dir='ltr'] #toolbarViewerRight > *,
+html[dir='ltr'] .findbar > * {
+ position: relative;
+ float: left;
+}
+html[dir='rtl'] #toolbarViewerLeft > *,
+html[dir='rtl'] #toolbarViewerMiddle > *,
+html[dir='rtl'] #toolbarViewerRight > *,
+html[dir='rtl'] .findbar > * {
+ position: relative;
+ float: right;
+}
+
+html[dir='ltr'] .splitToolbarButton {
+ margin: 3px 2px 4px 0;
+ display: inline-block;
+}
+html[dir='rtl'] .splitToolbarButton {
+ margin: 3px 0 4px 2px;
+ display: inline-block;
+}
+html[dir='ltr'] .splitToolbarButton > .toolbarButton {
+ border-radius: 0;
+ float: left;
+}
+html[dir='rtl'] .splitToolbarButton > .toolbarButton {
+ border-radius: 0;
+ float: right;
+}
+
+.toolbarButton,
+.secondaryToolbarButton,
+.overlayButton {
+ border: 0 none;
+ background: none;
+ width: 32px;
+ height: 25px;
+}
+
+.toolbarButton > span {
+ display: inline-block;
+ width: 0;
+ height: 0;
+ overflow: hidden;
+}
+
+.toolbarButton[disabled],
+.secondaryToolbarButton[disabled],
+.overlayButton[disabled] {
+ opacity: .5;
+}
+
+.toolbarButton.group {
+ margin-right: 0;
+}
+
+.splitToolbarButton.toggled .toolbarButton {
+ margin: 0;
+}
+
+.splitToolbarButton:hover > .toolbarButton,
+.splitToolbarButton:focus > .toolbarButton,
+.splitToolbarButton.toggled > .toolbarButton,
+.toolbarButton.textButton {
+ background-color: hsla(0,0%,0%,.12);
+ background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+ background-clip: padding-box;
+ border: 1px solid hsla(0,0%,0%,.35);
+ border-color: hsla(0,0%,0%,.32) hsla(0,0%,0%,.38) hsla(0,0%,0%,.42);
+ box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+ 0 0 1px hsla(0,0%,100%,.15) inset,
+ 0 1px 0 hsla(0,0%,100%,.05);
+ -webkit-transition-property: background-color, border-color, box-shadow;
+ -webkit-transition-duration: 150ms;
+ -webkit-transition-timing-function: ease;
+ transition-property: background-color, border-color, box-shadow;
+ transition-duration: 150ms;
+ transition-timing-function: ease;
+
+}
+.splitToolbarButton > .toolbarButton:hover,
+.splitToolbarButton > .toolbarButton:focus,
+.dropdownToolbarButton:hover,
+.overlayButton:hover,
+.toolbarButton.textButton:hover,
+.toolbarButton.textButton:focus {
+ background-color: hsla(0,0%,0%,.2);
+ box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+ 0 0 1px hsla(0,0%,100%,.15) inset,
+ 0 0 1px hsla(0,0%,0%,.05);
+ z-index: 199;
+}
+.splitToolbarButton > .toolbarButton {
+ position: relative;
+}
+html[dir='ltr'] .splitToolbarButton > .toolbarButton:first-child,
+html[dir='rtl'] .splitToolbarButton > .toolbarButton:last-child {
+ position: relative;
+ margin: 0;
+ margin-right: -1px;
+ border-top-left-radius: 2px;
+ border-bottom-left-radius: 2px;
+ border-right-color: transparent;
+}
+html[dir='ltr'] .splitToolbarButton > .toolbarButton:last-child,
+html[dir='rtl'] .splitToolbarButton > .toolbarButton:first-child {
+ position: relative;
+ margin: 0;
+ margin-left: -1px;
+ border-top-right-radius: 2px;
+ border-bottom-right-radius: 2px;
+ border-left-color: transparent;
+}
+.splitToolbarButtonSeparator {
+ padding: 8px 0;
+ width: 1px;
+ background-color: hsla(0,0%,0%,.5);
+ z-index: 99;
+ box-shadow: 0 0 0 1px hsla(0,0%,100%,.08);
+ display: inline-block;
+ margin: 5px 0;
+}
+html[dir='ltr'] .splitToolbarButtonSeparator {
+ float: left;
+}
+html[dir='rtl'] .splitToolbarButtonSeparator {
+ float: right;
+}
+.splitToolbarButton:hover > .splitToolbarButtonSeparator,
+.splitToolbarButton.toggled > .splitToolbarButtonSeparator {
+ padding: 12px 0;
+ margin: 1px 0;
+ box-shadow: 0 0 0 1px hsla(0,0%,100%,.03);
+ -webkit-transition-property: padding;
+ -webkit-transition-duration: 10ms;
+ -webkit-transition-timing-function: ease;
+ transition-property: padding;
+ transition-duration: 10ms;
+ transition-timing-function: ease;
+}
+
+.toolbarButton,
+.dropdownToolbarButton,
+.secondaryToolbarButton,
+.overlayButton {
+ min-width: 16px;
+ padding: 2px 6px 0;
+ border: 1px solid transparent;
+ border-radius: 2px;
+ color: hsla(0,0%,100%,.8);
+ font-size: 12px;
+ line-height: 14px;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ /* Opera does not support user-select, use <... unselectable="on"> instead */
+ cursor: default;
+ -webkit-transition-property: background-color, border-color, box-shadow;
+ -webkit-transition-duration: 150ms;
+ -webkit-transition-timing-function: ease;
+ transition-property: background-color, border-color, box-shadow;
+ transition-duration: 150ms;
+ transition-timing-function: ease;
+}
+
+html[dir='ltr'] .toolbarButton,
+html[dir='ltr'] .overlayButton,
+html[dir='ltr'] .dropdownToolbarButton {
+ margin: 3px 2px 4px 0;
+}
+html[dir='rtl'] .toolbarButton,
+html[dir='rtl'] .overlayButton,
+html[dir='rtl'] .dropdownToolbarButton {
+ margin: 3px 0 4px 2px;
+}
+
+.toolbarButton:hover,
+.toolbarButton:focus,
+.dropdownToolbarButton,
+.overlayButton,
+.secondaryToolbarButton:hover,
+.secondaryToolbarButton:focus {
+ background-color: hsla(0,0%,0%,.12);
+ background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+ background-clip: padding-box;
+ border: 1px solid hsla(0,0%,0%,.35);
+ border-color: hsla(0,0%,0%,.32) hsla(0,0%,0%,.38) hsla(0,0%,0%,.42);
+ box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+ 0 0 1px hsla(0,0%,100%,.15) inset,
+ 0 1px 0 hsla(0,0%,100%,.05);
+}
+
+.toolbarButton:hover:active,
+.overlayButton:hover:active,
+.dropdownToolbarButton:hover:active,
+.secondaryToolbarButton:hover:active {
+ background-color: hsla(0,0%,0%,.2);
+ background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+ border-color: hsla(0,0%,0%,.35) hsla(0,0%,0%,.4) hsla(0,0%,0%,.45);
+ box-shadow: 0 1px 1px hsla(0,0%,0%,.1) inset,
+ 0 0 1px hsla(0,0%,0%,.2) inset,
+ 0 1px 0 hsla(0,0%,100%,.05);
+ -webkit-transition-property: background-color, border-color, box-shadow;
+ -webkit-transition-duration: 10ms;
+ -webkit-transition-timing-function: linear;
+ transition-property: background-color, border-color, box-shadow;
+ transition-duration: 10ms;
+ transition-timing-function: linear;
+}
+
+.toolbarButton.toggled,
+.splitToolbarButton.toggled > .toolbarButton.toggled,
+.secondaryToolbarButton.toggled {
+ background-color: hsla(0,0%,0%,.3);
+ background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+ border-color: hsla(0,0%,0%,.4) hsla(0,0%,0%,.45) hsla(0,0%,0%,.5);
+ box-shadow: 0 1px 1px hsla(0,0%,0%,.1) inset,
+ 0 0 1px hsla(0,0%,0%,.2) inset,
+ 0 1px 0 hsla(0,0%,100%,.05);
+ -webkit-transition-property: background-color, border-color, box-shadow;
+ -webkit-transition-duration: 10ms;
+ -webkit-transition-timing-function: linear;
+ transition-property: background-color, border-color, box-shadow;
+ transition-duration: 10ms;
+ transition-timing-function: linear;
+}
+
+.toolbarButton.toggled:hover:active,
+.splitToolbarButton.toggled > .toolbarButton.toggled:hover:active,
+.secondaryToolbarButton.toggled:hover:active {
+ background-color: hsla(0,0%,0%,.4);
+ border-color: hsla(0,0%,0%,.4) hsla(0,0%,0%,.5) hsla(0,0%,0%,.55);
+ box-shadow: 0 1px 1px hsla(0,0%,0%,.2) inset,
+ 0 0 1px hsla(0,0%,0%,.3) inset,
+ 0 1px 0 hsla(0,0%,100%,.05);
+}
+
+.dropdownToolbarButton {
+ width: 120px;
+ max-width: 120px;
+ padding: 3px 2px 2px;
+ overflow: hidden;
+ background: url(images/toolbarButton-menuArrows.png) no-repeat;
+}
+html[dir='ltr'] .dropdownToolbarButton {
+ background-position: 95%;
+}
+html[dir='rtl'] .dropdownToolbarButton {
+ background-position: 5%;
+}
+
+.dropdownToolbarButton > select {
+ min-width: 140px;
+ font-size: 12px;
+ color: hsl(0,0%,95%);
+ margin: 0;
+ padding: 0;
+ border: none;
+ background: rgba(0,0,0,0); /* Opera does not support 'transparent' <select> background */
+}
+
+.dropdownToolbarButton > select > option {
+ background: hsl(0,0%,24%);
+}
+
+#customScaleOption {
+ display: none;
+}
+
+#pageWidthOption {
+ border-bottom: 1px rgba(255, 255, 255, .5) solid;
+}
+
+html[dir='ltr'] .splitToolbarButton:first-child,
+html[dir='ltr'] .toolbarButton:first-child,
+html[dir='rtl'] .splitToolbarButton:last-child,
+html[dir='rtl'] .toolbarButton:last-child {
+ margin-left: 4px;
+}
+html[dir='ltr'] .splitToolbarButton:last-child,
+html[dir='ltr'] .toolbarButton:last-child,
+html[dir='rtl'] .splitToolbarButton:first-child,
+html[dir='rtl'] .toolbarButton:first-child {
+ margin-right: 4px;
+}
+
+.toolbarButtonSpacer {
+ width: 30px;
+ display: inline-block;
+ height: 1px;
+}
+
+.toolbarButtonFlexibleSpacer {
+ -webkit-box-flex: 1;
+ -moz-box-flex: 1;
+ min-width: 30px;
+}
+
+html[dir='ltr'] #findPrevious {
+ margin-left: 3px;
+}
+html[dir='ltr'] #findNext {
+ margin-right: 3px;
+}
+
+html[dir='rtl'] #findPrevious {
+ margin-right: 3px;
+}
+html[dir='rtl'] #findNext {
+ margin-left: 3px;
+}
+
+.toolbarButton::before,
+.secondaryToolbarButton::before {
+ /* All matching images have a size of 16x16
+ * All relevant containers have a size of 32x25 */
+ position: absolute;
+ display: inline-block;
+ top: 4px;
+ left: 7px;
+}
+
+html[dir="ltr"] .secondaryToolbarButton::before {
+ left: 4px;
+}
+html[dir="rtl"] .secondaryToolbarButton::before {
+ right: 4px;
+}
+
+html[dir='ltr'] .toolbarButton#sidebarToggle::before {
+ content: url(images/toolbarButton-sidebarToggle.png);
+}
+html[dir='rtl'] .toolbarButton#sidebarToggle::before {
+ content: url(images/toolbarButton-sidebarToggle-rtl.png);
+}
+
+html[dir='ltr'] .toolbarButton#secondaryToolbarToggle::before {
+ content: url(images/toolbarButton-secondaryToolbarToggle.png);
+}
+html[dir='rtl'] .toolbarButton#secondaryToolbarToggle::before {
+ content: url(images/toolbarButton-secondaryToolbarToggle-rtl.png);
+}
+
+html[dir='ltr'] .toolbarButton.findPrevious::before {
+ content: url(images/findbarButton-previous.png);
+}
+html[dir='rtl'] .toolbarButton.findPrevious::before {
+ content: url(images/findbarButton-previous-rtl.png);
+}
+
+html[dir='ltr'] .toolbarButton.findNext::before {
+ content: url(images/findbarButton-next.png);
+}
+html[dir='rtl'] .toolbarButton.findNext::before {
+ content: url(images/findbarButton-next-rtl.png);
+}
+
+html[dir='ltr'] .toolbarButton.pageUp::before {
+ content: url(images/toolbarButton-pageUp.png);
+}
+html[dir='rtl'] .toolbarButton.pageUp::before {
+ content: url(images/toolbarButton-pageUp-rtl.png);
+}
+
+html[dir='ltr'] .toolbarButton.pageDown::before {
+ content: url(images/toolbarButton-pageDown.png);
+}
+html[dir='rtl'] .toolbarButton.pageDown::before {
+ content: url(images/toolbarButton-pageDown-rtl.png);
+}
+
+.toolbarButton.zoomOut::before {
+ content: url(images/toolbarButton-zoomOut.png);
+}
+
+.toolbarButton.zoomIn::before {
+ content: url(images/toolbarButton-zoomIn.png);
+}
+
+.toolbarButton.presentationMode::before,
+.secondaryToolbarButton.presentationMode::before {
+ content: url(images/toolbarButton-presentationMode.png);
+}
+
+.toolbarButton.print::before,
+.secondaryToolbarButton.print::before {
+ content: url(images/toolbarButton-print.png);
+}
+
+.toolbarButton.openFile::before,
+.secondaryToolbarButton.openFile::before {
+ content: url(images/toolbarButton-openFile.png);
+}
+
+.toolbarButton.download::before,
+.secondaryToolbarButton.download::before {
+ content: url(images/toolbarButton-download.png);
+}
+
+.toolbarButton.bookmark,
+.secondaryToolbarButton.bookmark {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ outline: none;
+ padding-top: 4px;
+ text-decoration: none;
+}
+.secondaryToolbarButton.bookmark {
+ padding-top: 5px;
+}
+
+.bookmark[href='#'] {
+ opacity: .5;
+ pointer-events: none;
+}
+
+.toolbarButton.bookmark::before,
+.secondaryToolbarButton.bookmark::before {
+ content: url(images/toolbarButton-bookmark.png);
+}
+
+#viewThumbnail.toolbarButton::before {
+ content: url(images/toolbarButton-viewThumbnail.png);
+}
+
+html[dir="ltr"] #viewOutline.toolbarButton::before {
+ content: url(images/toolbarButton-viewOutline.png);
+}
+html[dir="rtl"] #viewOutline.toolbarButton::before {
+ content: url(images/toolbarButton-viewOutline-rtl.png);
+}
+
+#viewAttachments.toolbarButton::before {
+ content: url(images/toolbarButton-viewAttachments.png);
+}
+
+#viewFind.toolbarButton::before {
+ content: url(images/toolbarButton-search.png);
+}
+
+.secondaryToolbarButton {
+ position: relative;
+ margin: 0 0 4px 0;
+ padding: 3px 0 1px 0;
+ height: auto;
+ min-height: 25px;
+ width: auto;
+ min-width: 100%;
+ white-space: normal;
+}
+html[dir="ltr"] .secondaryToolbarButton {
+ padding-left: 24px;
+ text-align: left;
+}
+html[dir="rtl"] .secondaryToolbarButton {
+ padding-right: 24px;
+ text-align: right;
+}
+html[dir="ltr"] .secondaryToolbarButton.bookmark {
+ padding-left: 27px;
+}
+html[dir="rtl"] .secondaryToolbarButton.bookmark {
+ padding-right: 27px;
+}
+
+html[dir="ltr"] .secondaryToolbarButton > span {
+ padding-right: 4px;
+}
+html[dir="rtl"] .secondaryToolbarButton > span {
+ padding-left: 4px;
+}
+
+.secondaryToolbarButton.firstPage::before {
+ content: url(images/secondaryToolbarButton-firstPage.png);
+}
+
+.secondaryToolbarButton.lastPage::before {
+ content: url(images/secondaryToolbarButton-lastPage.png);
+}
+
+.secondaryToolbarButton.rotateCcw::before {
+ content: url(images/secondaryToolbarButton-rotateCcw.png);
+}
+
+.secondaryToolbarButton.rotateCw::before {
+ content: url(images/secondaryToolbarButton-rotateCw.png);
+}
+
+.secondaryToolbarButton.handTool::before {
+ content: url(images/secondaryToolbarButton-handTool.png);
+}
+
+.secondaryToolbarButton.documentProperties::before {
+ content: url(images/secondaryToolbarButton-documentProperties.png);
+}
+
+.verticalToolbarSeparator {
+ display: block;
+ padding: 8px 0;
+ margin: 8px 4px;
+ width: 1px;
+ background-color: hsla(0,0%,0%,.5);
+ box-shadow: 0 0 0 1px hsla(0,0%,100%,.08);
+}
+html[dir='ltr'] .verticalToolbarSeparator {
+ margin-left: 2px;
+}
+html[dir='rtl'] .verticalToolbarSeparator {
+ margin-right: 2px;
+}
+
+.horizontalToolbarSeparator {
+ display: block;
+ margin: 0 0 4px 0;
+ height: 1px;
+ width: 100%;
+ background-color: hsla(0,0%,0%,.5);
+ box-shadow: 0 0 0 1px hsla(0,0%,100%,.08);
+}
+
+.toolbarField {
+ padding: 3px 6px;
+ margin: 4px 0 4px 0;
+ border: 1px solid transparent;
+ border-radius: 2px;
+ background-color: hsla(0,0%,100%,.09);
+ background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+ background-clip: padding-box;
+ border: 1px solid hsla(0,0%,0%,.35);
+ border-color: hsla(0,0%,0%,.32) hsla(0,0%,0%,.38) hsla(0,0%,0%,.42);
+ box-shadow: 0 1px 0 hsla(0,0%,0%,.05) inset,
+ 0 1px 0 hsla(0,0%,100%,.05);
+ color: hsl(0,0%,95%);
+ font-size: 12px;
+ line-height: 14px;
+ outline-style: none;
+ transition-property: background-color, border-color, box-shadow;
+ transition-duration: 150ms;
+ transition-timing-function: ease;
+}
+
+.toolbarField[type=checkbox] {
+ display: inline-block;
+ margin: 8px 0px;
+}
+
+.toolbarField.pageNumber {
+ -moz-appearance: textfield; /* hides the spinner in moz */
+ min-width: 16px;
+ text-align: right;
+ width: 40px;
+}
+
+.toolbarField.pageNumber.visiblePageIsLoading {
+ background-image: url(images/loading-small.png);
+ background-repeat: no-repeat;
+ background-position: 1px;
+}
+
+.toolbarField.pageNumber::-webkit-inner-spin-button,
+.toolbarField.pageNumber::-webkit-outer-spin-button {
+ -webkit-appearance: none;
+ margin: 0;
+}
+
+.toolbarField:hover {
+ background-color: hsla(0,0%,100%,.11);
+ border-color: hsla(0,0%,0%,.4) hsla(0,0%,0%,.43) hsla(0,0%,0%,.45);
+}
+
+.toolbarField:focus {
+ background-color: hsla(0,0%,100%,.15);
+ border-color: hsla(204,100%,65%,.8) hsla(204,100%,65%,.85) hsla(204,100%,65%,.9);
+}
+
+.toolbarLabel {
+ min-width: 16px;
+ padding: 3px 6px 3px 2px;
+ margin: 4px 2px 4px 0;
+ border: 1px solid transparent;
+ border-radius: 2px;
+ color: hsl(0,0%,85%);
+ font-size: 12px;
+ line-height: 14px;
+ text-align: left;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ cursor: default;
+}
+
+#thumbnailView {
+ position: absolute;
+ width: 120px;
+ top: 0;
+ bottom: 0;
+ padding: 10px 40px 0;
+ overflow: auto;
+ -webkit-overflow-scrolling: touch;
+}
+
+.thumbnail {
+ float: left;
+ margin-bottom: 5px;
+}
+
+#thumbnailView > a:last-of-type > .thumbnail {
+ margin-bottom: 10px;
+}
+
+#thumbnailView > a:last-of-type > .thumbnail:not([data-loaded]) {
+ margin-bottom: 9px;
+}
+
+.thumbnail:not([data-loaded]) {
+ border: 1px dashed rgba(255, 255, 255, 0.5);
+ margin: -1px -1px 4px -1px;
+}
+
+.thumbnailImage {
+ border: 1px solid transparent;
+ box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.5), 0 2px 8px rgba(0, 0, 0, 0.3);
+ opacity: 0.8;
+ z-index: 99;
+ background-color: white;
+ background-clip: content-box;
+}
+
+.thumbnailSelectionRing {
+ border-radius: 2px;
+ padding: 7px;
+}
+
+a:focus > .thumbnail > .thumbnailSelectionRing > .thumbnailImage,
+.thumbnail:hover > .thumbnailSelectionRing > .thumbnailImage {
+ opacity: .9;
+}
+
+a:focus > .thumbnail > .thumbnailSelectionRing,
+.thumbnail:hover > .thumbnailSelectionRing {
+ background-color: hsla(0,0%,100%,.15);
+ background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+ background-clip: padding-box;
+ box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+ 0 0 1px hsla(0,0%,100%,.2) inset,
+ 0 0 1px hsla(0,0%,0%,.2);
+ color: hsla(0,0%,100%,.9);
+}
+
+.thumbnail.selected > .thumbnailSelectionRing > .thumbnailImage {
+ box-shadow: 0 0 0 1px hsla(0,0%,0%,.5);
+ opacity: 1;
+}
+
+.thumbnail.selected > .thumbnailSelectionRing {
+ background-color: hsla(0,0%,100%,.3);
+ background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+ background-clip: padding-box;
+ box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+ 0 0 1px hsla(0,0%,100%,.1) inset,
+ 0 0 1px hsla(0,0%,0%,.2);
+ color: hsla(0,0%,100%,1);
+}
+
+#outlineView,
+#attachmentsView {
+ position: absolute;
+ width: 192px;
+ top: 0;
+ bottom: 0;
+ overflow: auto;
+ -webkit-overflow-scrolling: touch;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+}
+
+#outlineView {
+ padding: 4px 4px 0;
+}
+#attachmentsView {
+ padding: 3px 4px 0;
+}
+
+html[dir='ltr'] .outlineItem > .outlineItems {
+ margin-left: 20px;
+}
+
+html[dir='rtl'] .outlineItem > .outlineItems {
+ margin-right: 20px;
+}
+
+.outlineItem > a,
+.attachmentsItem > button {
+ text-decoration: none;
+ display: inline-block;
+ min-width: 95%;
+ height: auto;
+ margin-bottom: 1px;
+ border-radius: 2px;
+ color: hsla(0,0%,100%,.8);
+ font-size: 13px;
+ line-height: 15px;
+ -moz-user-select: none;
+ white-space: normal;
+}
+
+.attachmentsItem > button {
+ border: 0 none;
+ background: none;
+ cursor: pointer;
+ width: 100%;
+}
+
+html[dir='ltr'] .outlineItem > a {
+ padding: 2px 0 5px 10px;
+}
+html[dir='ltr'] .attachmentsItem > button {
+ padding: 2px 0 3px 7px;
+ text-align: left;
+}
+
+html[dir='rtl'] .outlineItem > a {
+ padding: 2px 10px 5px 0;
+}
+html[dir='rtl'] .attachmentsItem > button {
+ padding: 2px 7px 3px 0;
+ text-align: right;
+}
+
+.outlineItem > a:hover,
+.attachmentsItem > button:hover {
+ background-color: hsla(0,0%,100%,.02);
+ background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+ background-clip: padding-box;
+ box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+ 0 0 1px hsla(0,0%,100%,.2) inset,
+ 0 0 1px hsla(0,0%,0%,.2);
+ color: hsla(0,0%,100%,.9);
+}
+
+.outlineItem.selected {
+ background-color: hsla(0,0%,100%,.08);
+ background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+ background-clip: padding-box;
+ box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+ 0 0 1px hsla(0,0%,100%,.1) inset,
+ 0 0 1px hsla(0,0%,0%,.2);
+ color: hsla(0,0%,100%,1);
+}
+
+.noResults {
+ font-size: 12px;
+ color: hsla(0,0%,100%,.8);
+ font-style: italic;
+ cursor: default;
+}
+
+/* TODO: file FF bug to support ::-moz-selection:window-inactive
+ so we can override the opaque grey background when the window is inactive;
+ see https://bugzilla.mozilla.org/show_bug.cgi?id=706209 */
+::selection { background: rgba(0,0,255,0.3); }
+::-moz-selection { background: rgba(0,0,255,0.3); }
+
+#errorWrapper {
+ background: none repeat scroll 0 0 #FF5555;
+ color: white;
+ left: 0;
+ position: absolute;
+ right: 0;
+ z-index: 1000;
+ padding: 3px;
+ font-size: 0.8em;
+}
+.loadingInProgress #errorWrapper {
+ top: 37px;
+}
+
+#errorMessageLeft {
+ float: left;
+}
+
+#errorMessageRight {
+ float: right;
+}
+
+#errorMoreInfo {
+ background-color: #FFFFFF;
+ color: black;
+ padding: 3px;
+ margin: 3px;
+ width: 98%;
+}
+
+.overlayButton {
+ width: auto;
+ margin: 3px 4px 2px 4px !important;
+ padding: 2px 6px 3px 6px;
+}
+
+#overlayContainer {
+ display: table;
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ background-color: hsla(0,0%,0%,.2);
+ z-index: 40000;
+}
+#overlayContainer > * {
+ overflow: auto;
+ -webkit-overflow-scrolling: touch;
+}
+
+#overlayContainer > .container {
+ display: table-cell;
+ vertical-align: middle;
+ text-align: center;
+}
+
+#overlayContainer > .container > .dialog {
+ display: inline-block;
+ padding: 15px;
+ border-spacing: 4px;
+ color: hsl(0,0%,85%);
+ font-size: 12px;
+ line-height: 14px;
+ background-color: #474747; /* fallback */
+ background-image: url(images/texture.png),
+ linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
+ box-shadow: inset 1px 0 0 hsla(0,0%,100%,.08),
+ inset 0 1px 1px hsla(0,0%,0%,.15),
+ inset 0 -1px 0 hsla(0,0%,100%,.05),
+ 0 1px 0 hsla(0,0%,0%,.15),
+ 0 1px 1px hsla(0,0%,0%,.1);
+ border: 1px solid hsla(0,0%,0%,.5);
+ border-radius: 4px;
+ box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+}
+
+.dialog > .row {
+ display: table-row;
+}
+
+.dialog > .row > * {
+ display: table-cell;
+}
+
+.dialog .toolbarField {
+ margin: 5px 0;
+}
+
+.dialog .separator {
+ display: block;
+ margin: 4px 0 4px 0;
+ height: 1px;
+ width: 100%;
+ background-color: hsla(0,0%,0%,.5);
+ box-shadow: 0 0 0 1px hsla(0,0%,100%,.08);
+}
+
+.dialog .buttonRow {
+ text-align: center;
+ vertical-align: middle;
+}
+
+#passwordOverlay > .dialog {
+ text-align: center;
+}
+#passwordOverlay .toolbarField {
+ width: 200px;
+}
+
+#documentPropertiesOverlay > .dialog {
+ text-align: left;
+}
+#documentPropertiesOverlay .row > * {
+ min-width: 100px;
+}
+html[dir='ltr'] #documentPropertiesOverlay .row > * {
+ text-align: left;
+}
+html[dir='rtl'] #documentPropertiesOverlay .row > * {
+ text-align: right;
+}
+#documentPropertiesOverlay .row > span {
+ width: 125px;
+ word-wrap: break-word;
+}
+#documentPropertiesOverlay .row > p {
+ max-width: 225px;
+ word-wrap: break-word;
+}
+#documentPropertiesOverlay .buttonRow {
+ margin-top: 10px;
+}
+
+.clearBoth {
+ clear: both;
+}
+
+.fileInput {
+ background: white;
+ color: black;
+ margin-top: 5px;
+ visibility: hidden;
+ position: fixed;
+ right: 0;
+ top: 0;
+}
+
+#PDFBug {
+ background: none repeat scroll 0 0 white;
+ border: 1px solid #666666;
+ position: fixed;
+ top: 32px;
+ right: 0;
+ bottom: 0;
+ font-size: 10px;
+ padding: 0;
+ width: 300px;
+}
+#PDFBug .controls {
+ background:#EEEEEE;
+ border-bottom: 1px solid #666666;
+ padding: 3px;
+}
+#PDFBug .panels {
+ bottom: 0;
+ left: 0;
+ overflow: auto;
+ -webkit-overflow-scrolling: touch;
+ position: absolute;
+ right: 0;
+ top: 27px;
+}
+#PDFBug button.active {
+ font-weight: bold;
+}
+.debuggerShowText {
+ background: none repeat scroll 0 0 yellow;
+ color: blue;
+}
+.debuggerHideText:hover {
+ background: none repeat scroll 0 0 yellow;
+}
+#PDFBug .stats {
+ font-family: courier;
+ font-size: 10px;
+ white-space: pre;
+}
+#PDFBug .stats .title {
+ font-weight: bold;
+}
+#PDFBug table {
+ font-size: 10px;
+}
+
+#viewer.textLayer-visible .textLayer > div,
+#viewer.textLayer-hover .textLayer > div:hover {
+ background-color: white;
+ color: black;
+}
+
+#viewer.textLayer-shadow .textLayer > div {
+ background-color: rgba(255,255,255, .6);
+ color: black;
+}
+
+.grab-to-pan-grab {
+ cursor: url("images/grab.cur"), move !important;
+ cursor: -webkit-grab !important;
+ cursor: -moz-grab !important;
+ cursor: grab !important;
+}
+.grab-to-pan-grab *:not(input):not(textarea):not(button):not(select):not(:link) {
+ cursor: inherit !important;
+}
+.grab-to-pan-grab:active,
+.grab-to-pan-grabbing {
+ cursor: url("images/grabbing.cur"), move !important;
+ cursor: -webkit-grabbing !important;
+ cursor: -moz-grabbing !important;
+ cursor: grabbing !important;
+
+ position: fixed;
+ background: transparent;
+ display: block;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ overflow: hidden;
+ z-index: 50000; /* should be higher than anything else in PDF.js! */
+}
+
+@page {
+ margin: 0;
+}
+
+#printContainer {
+ display: none;
+}
+
+@media screen and (min-resolution: 2dppx) {
+ /* Rules for Retina screens */
+ .toolbarButton::before {
+ -webkit-transform: scale(0.5);
+ transform: scale(0.5);
+ top: -5px;
+ }
+
+ .secondaryToolbarButton::before {
+ -webkit-transform: scale(0.5);
+ transform: scale(0.5);
+ top: -4px;
+ }
+
+ html[dir='ltr'] .toolbarButton::before,
+ html[dir='rtl'] .toolbarButton::before {
+ left: -1px;
+ }
+
+ html[dir='ltr'] .secondaryToolbarButton::before {
+ left: -2px;
+ }
+ html[dir='rtl'] .secondaryToolbarButton::before {
+ left: 186px;
+ }
+
+ .toolbarField.pageNumber.visiblePageIsLoading,
+ #findInput[data-status="pending"] {
+ background-image: url(images/loading-small@2x.png);
+ background-size: 16px 17px;
+ }
+
+ .dropdownToolbarButton {
+ background: url(images/toolbarButton-menuArrows@2x.png) no-repeat;
+ background-size: 7px 16px;
+ }
+
+ html[dir='ltr'] .toolbarButton#sidebarToggle::before {
+ content: url(images/toolbarButton-sidebarToggle@2x.png);
+ }
+ html[dir='rtl'] .toolbarButton#sidebarToggle::before {
+ content: url(images/toolbarButton-sidebarToggle-rtl@2x.png);
+ }
+
+ html[dir='ltr'] .toolbarButton#secondaryToolbarToggle::before {
+ content: url(images/toolbarButton-secondaryToolbarToggle@2x.png);
+ }
+ html[dir='rtl'] .toolbarButton#secondaryToolbarToggle::before {
+ content: url(images/toolbarButton-secondaryToolbarToggle-rtl@2x.png);
+ }
+
+ html[dir='ltr'] .toolbarButton.findPrevious::before {
+ content: url(images/findbarButton-previous@2x.png);
+ }
+ html[dir='rtl'] .toolbarButton.findPrevious::before {
+ content: url(images/findbarButton-previous-rtl@2x.png);
+ }
+
+ html[dir='ltr'] .toolbarButton.findNext::before {
+ content: url(images/findbarButton-next@2x.png);
+ }
+ html[dir='rtl'] .toolbarButton.findNext::before {
+ content: url(images/findbarButton-next-rtl@2x.png);
+ }
+
+ html[dir='ltr'] .toolbarButton.pageUp::before {
+ content: url(images/toolbarButton-pageUp@2x.png);
+ }
+ html[dir='rtl'] .toolbarButton.pageUp::before {
+ content: url(images/toolbarButton-pageUp-rtl@2x.png);
+ }
+
+ html[dir='ltr'] .toolbarButton.pageDown::before {
+ content: url(images/toolbarButton-pageDown@2x.png);
+ }
+ html[dir='rtl'] .toolbarButton.pageDown::before {
+ content: url(images/toolbarButton-pageDown-rtl@2x.png);
+ }
+
+ .toolbarButton.zoomIn::before {
+ content: url(images/toolbarButton-zoomIn@2x.png);
+ }
+
+ .toolbarButton.zoomOut::before {
+ content: url(images/toolbarButton-zoomOut@2x.png);
+ }
+
+ .toolbarButton.presentationMode::before,
+ .secondaryToolbarButton.presentationMode::before {
+ content: url(images/toolbarButton-presentationMode@2x.png);
+ }
+
+ .toolbarButton.print::before,
+ .secondaryToolbarButton.print::before {
+ content: url(images/toolbarButton-print@2x.png);
+ }
+
+ .toolbarButton.openFile::before,
+ .secondaryToolbarButton.openFile::before {
+ content: url(images/toolbarButton-openFile@2x.png);
+ }
+
+ .toolbarButton.download::before,
+ .secondaryToolbarButton.download::before {
+ content: url(images/toolbarButton-download@2x.png);
+ }
+
+ .toolbarButton.bookmark::before,
+ .secondaryToolbarButton.bookmark::before {
+ content: url(images/toolbarButton-bookmark@2x.png);
+ }
+
+ #viewThumbnail.toolbarButton::before {
+ content: url(images/toolbarButton-viewThumbnail@2x.png);
+ }
+
+ html[dir="ltr"] #viewOutline.toolbarButton::before {
+ content: url(images/toolbarButton-viewOutline@2x.png);
+ }
+ html[dir="rtl"] #viewOutline.toolbarButton::before {
+ content: url(images/toolbarButton-viewOutline-rtl@2x.png);
+ }
+
+ #viewAttachments.toolbarButton::before {
+ content: url(images/toolbarButton-viewAttachments@2x.png);
+ }
+
+ #viewFind.toolbarButton::before {
+ content: url(images/toolbarButton-search@2x.png);
+ }
+
+ .secondaryToolbarButton.firstPage::before {
+ content: url(images/secondaryToolbarButton-firstPage@2x.png);
+ }
+
+ .secondaryToolbarButton.lastPage::before {
+ content: url(images/secondaryToolbarButton-lastPage@2x.png);
+ }
+
+ .secondaryToolbarButton.rotateCcw::before {
+ content: url(images/secondaryToolbarButton-rotateCcw@2x.png);
+ }
+
+ .secondaryToolbarButton.rotateCw::before {
+ content: url(images/secondaryToolbarButton-rotateCw@2x.png);
+ }
+
+ .secondaryToolbarButton.handTool::before {
+ content: url(images/secondaryToolbarButton-handTool@2x.png);
+ }
+
+ .secondaryToolbarButton.documentProperties::before {
+ content: url(images/secondaryToolbarButton-documentProperties@2x.png);
+ }
+}
+
+@media print {
+ /* General rules for printing. */
+ body {
+ background: transparent none;
+ }
+
+ /* Rules for browsers that don't support mozPrintCallback. */
+ #sidebarContainer, #secondaryToolbar, .toolbar, #loadingBox, #errorWrapper, .textLayer {
+ display: none;
+ }
+ #viewerContainer {
+ overflow: visible;
+ }
+
+ #mainContainer, #viewerContainer, .page, .page canvas {
+ position: static;
+ padding: 0;
+ margin: 0;
+ }
+
+ .page {
+ float: left;
+ display: none;
+ border: none;
+ box-shadow: none;
+ background-clip: content-box;
+ background-color: white;
+ }
+
+ .page[data-loaded] {
+ display: block;
+ }
+
+ .fileInput {
+ display: none;
+ }
+
+ /* Rules for browsers that support mozPrintCallback */
+ body[data-mozPrintCallback] #outerContainer {
+ display: none;
+ }
+ body[data-mozPrintCallback] #printContainer {
+ display: block;
+ }
+ /* wrapper around (scaled) print canvas elements */
+ #printContainer > div {
+ position: relative;
+ top: 0;
+ left: 0;
+ overflow: hidden;
+ }
+ #printContainer canvas {
+ display: block;
+ }
+}
+
+.visibleLargeView,
+.visibleMediumView,
+.visibleSmallView {
+ display: none;
+}
+
+@media all and (max-width: 960px) {
+ html[dir='ltr'] #outerContainer.sidebarMoving .outerCenter,
+ html[dir='ltr'] #outerContainer.sidebarOpen .outerCenter {
+ float: left;
+ left: 205px;
+ }
+ html[dir='rtl'] #outerContainer.sidebarMoving .outerCenter,
+ html[dir='rtl'] #outerContainer.sidebarOpen .outerCenter {
+ float: right;
+ right: 205px;
+ }
+}
+
+@media all and (max-width: 900px) {
+ .sidebarOpen .hiddenLargeView {
+ display: none;
+ }
+ .sidebarOpen .visibleLargeView {
+ display: inherit;
+ }
+}
+
+@media all and (max-width: 860px) {
+ .sidebarOpen .hiddenMediumView {
+ display: none;
+ }
+ .sidebarOpen .visibleMediumView {
+ display: inherit;
+ }
+}
+
+@media all and (max-width: 770px) {
+ #sidebarContainer {
+ top: 32px;
+ z-index: 100;
+ }
+ .loadingInProgress #sidebarContainer {
+ top: 37px;
+ }
+ #sidebarContent {
+ top: 32px;
+ background-color: hsla(0,0%,0%,.7);
+ }
+
+ html[dir='ltr'] #outerContainer.sidebarOpen > #mainContainer {
+ left: 0px;
+ }
+ html[dir='rtl'] #outerContainer.sidebarOpen > #mainContainer {
+ right: 0px;
+ }
+
+ html[dir='ltr'] .outerCenter {
+ float: left;
+ left: 205px;
+ }
+ html[dir='rtl'] .outerCenter {
+ float: right;
+ right: 205px;
+ }
+
+ #outerContainer .hiddenLargeView,
+ #outerContainer .hiddenMediumView {
+ display: inherit;
+ }
+ #outerContainer .visibleLargeView,
+ #outerContainer .visibleMediumView {
+ display: none;
+ }
+}
+
+@media all and (max-width: 700px) {
+ #outerContainer .hiddenLargeView {
+ display: none;
+ }
+ #outerContainer .visibleLargeView {
+ display: inherit;
+ }
+}
+
+@media all and (max-width: 660px) {
+ #outerContainer .hiddenMediumView {
+ display: none;
+ }
+ #outerContainer .visibleMediumView {
+ display: inherit;
+ }
+}
+
+@media all and (max-width: 600px) {
+ .hiddenSmallView {
+ display: none;
+ }
+ .visibleSmallView {
+ display: inherit;
+ }
+ html[dir='ltr'] #outerContainer.sidebarMoving .outerCenter,
+ html[dir='ltr'] #outerContainer.sidebarOpen .outerCenter,
+ html[dir='ltr'] .outerCenter {
+ left: 156px;
+ }
+ html[dir='rtl'] #outerContainer.sidebarMoving .outerCenter,
+ html[dir='rtl'] #outerContainer.sidebarOpen .outerCenter,
+ html[dir='rtl'] .outerCenter {
+ right: 156px;
+ }
+ .toolbarButtonSpacer {
+ width: 0;
+ }
+}
+
+@media all and (max-width: 510px) {
+ #scaleSelectContainer, #pageNumberLabel {
+ display: none;
+ }
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/viewer.html b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/viewer.html
new file mode 100644
index 0000000..8aad929
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/viewer.html
@@ -0,0 +1,418 @@
+<!DOCTYPE html>
+<!--
+Copyright 2012 Mozilla Foundation
+
+Licensed 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.
+
+Adobe CMap resources are covered by their own copyright and license:
+http://sourceforge.net/adobe/cmap/wiki/License/
+-->
+<html dir="ltr" mozdisallowselectionprint moznomarginboxes>
+ <head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <meta name="google" content="notranslate">
+ <title>PDF预览</title>
+
+
+ <link rel="stylesheet" href="viewer.css"/>
+
+ <script src="compatibility.js"></script>
+
+
+
+<!-- This snippet is used in production (included from viewer.html) -->
+<link rel="resource" type="application/l10n" href="locale/locale.properties"/>
+<script src="l10n.js"></script>
+<script src="../build/pdf.js"></script>
+
+
+
+ <script src="debugger.js"></script>
+ <script src="viewer.js"></script>
+
+ </head>
+
+ <body tabindex="1" class="loadingInProgress">
+ <div id="outerContainer">
+
+ <div id="sidebarContainer">
+ <div id="toolbarSidebar">
+ <div class="splitToolbarButton toggled">
+ <button id="viewThumbnail" class="toolbarButton group toggled" title="Show Thumbnails" tabindex="2" data-l10n-id="thumbs">
+ <span data-l10n-id="thumbs_label">Thumbnails</span>
+ </button>
+ <button id="viewOutline" class="toolbarButton group" title="Show Document Outline" tabindex="3" data-l10n-id="outline">
+ <span data-l10n-id="outline_label">Document Outline</span>
+ </button>
+ <button id="viewAttachments" class="toolbarButton group" title="Show Attachments" tabindex="4" data-l10n-id="attachments">
+ <span data-l10n-id="attachments_label">Attachments</span>
+ </button>
+ </div>
+ </div>
+ <div id="sidebarContent">
+ <div id="thumbnailView">
+ </div>
+ <div id="outlineView" class="hidden">
+ </div>
+ <div id="attachmentsView" class="hidden">
+ </div>
+ </div>
+ </div> <!-- sidebarContainer -->
+
+ <div id="mainContainer">
+ <div class="findbar hidden doorHanger hiddenSmallView" id="findbar">
+ <label for="findInput" class="toolbarLabel" data-l10n-id="find_label">Find:</label>
+ <input id="findInput" class="toolbarField" tabindex="91">
+ <div class="splitToolbarButton">
+ <button class="toolbarButton findPrevious" title="" id="findPrevious" tabindex="92" data-l10n-id="find_previous">
+ <span data-l10n-id="find_previous_label">Previous</span>
+ </button>
+ <div class="splitToolbarButtonSeparator"></div>
+ <button class="toolbarButton findNext" title="" id="findNext" tabindex="93" data-l10n-id="find_next">
+ <span data-l10n-id="find_next_label">Next</span>
+ </button>
+ </div>
+ <input type="checkbox" id="findHighlightAll" class="toolbarField">
+ <label for="findHighlightAll" class="toolbarLabel" tabindex="94" data-l10n-id="find_highlight">Highlight all</label>
+ <input type="checkbox" id="findMatchCase" class="toolbarField">
+ <label for="findMatchCase" class="toolbarLabel" tabindex="95" data-l10n-id="find_match_case_label">Match case</label>
+ <span id="findMsg" class="toolbarLabel"></span>
+ </div> <!-- findbar -->
+
+ <div id="secondaryToolbar" class="secondaryToolbar hidden doorHangerRight">
+ <div id="secondaryToolbarButtonContainer">
+ <button id="secondaryPresentationMode" class="secondaryToolbarButton presentationMode visibleLargeView" title="Switch to Presentation Mode" tabindex="51" data-l10n-id="presentation_mode">
+ <span data-l10n-id="presentation_mode_label">Presentation Mode</span>
+ </button>
+
+ <button id="secondaryOpenFile" class="secondaryToolbarButton openFile visibleLargeView" title="Open File" tabindex="52" data-l10n-id="open_file">
+ <span data-l10n-id="open_file_label">Open</span>
+ </button>
+
+ <button id="secondaryPrint" class="secondaryToolbarButton print visibleMediumView" title="Print" tabindex="53" data-l10n-id="print">
+ <span data-l10n-id="print_label">Print</span>
+ </button>
+
+ <button id="secondaryDownload" class="secondaryToolbarButton download visibleMediumView" title="Download" tabindex="54" data-l10n-id="download">
+ <span data-l10n-id="download_label">Download</span>
+ </button>
+
+ <a href="#" id="secondaryViewBookmark" class="secondaryToolbarButton bookmark visibleSmallView" title="Current view (copy or open in new window)" tabindex="55" data-l10n-id="bookmark">
+ <span data-l10n-id="bookmark_label">Current View</span>
+ </a>
+
+ <div class="horizontalToolbarSeparator visibleLargeView"></div>
+
+ <button id="firstPage" class="secondaryToolbarButton firstPage" title="Go to First Page" tabindex="56" data-l10n-id="first_page">
+ <span data-l10n-id="first_page_label">Go to First Page</span>
+ </button>
+ <button id="lastPage" class="secondaryToolbarButton lastPage" title="Go to Last Page" tabindex="57" data-l10n-id="last_page">
+ <span data-l10n-id="last_page_label">Go to Last Page</span>
+ </button>
+
+ <div class="horizontalToolbarSeparator"></div>
+
+ <button id="pageRotateCw" class="secondaryToolbarButton rotateCw" title="Rotate Clockwise" tabindex="58" data-l10n-id="page_rotate_cw">
+ <span data-l10n-id="page_rotate_cw_label">Rotate Clockwise</span>
+ </button>
+ <button id="pageRotateCcw" class="secondaryToolbarButton rotateCcw" title="Rotate Counterclockwise" tabindex="59" data-l10n-id="page_rotate_ccw">
+ <span data-l10n-id="page_rotate_ccw_label">Rotate Counterclockwise</span>
+ </button>
+
+ <div class="horizontalToolbarSeparator"></div>
+
+ <button id="toggleHandTool" class="secondaryToolbarButton handTool" title="Enable hand tool" tabindex="60" data-l10n-id="hand_tool_enable">
+ <span data-l10n-id="hand_tool_enable_label">Enable hand tool</span>
+ </button>
+
+ <div class="horizontalToolbarSeparator"></div>
+
+ <button id="documentProperties" class="secondaryToolbarButton documentProperties" title="Document Properties…" tabindex="61" data-l10n-id="document_properties">
+ <span data-l10n-id="document_properties_label">Document Properties…</span>
+ </button>
+ </div>
+ </div> <!-- secondaryToolbar -->
+
+ <div class="toolbar">
+ <div id="toolbarContainer">
+ <div id="toolbarViewer">
+ <div id="toolbarViewerLeft">
+ <button id="sidebarToggle" class="toolbarButton" title="Toggle Sidebar" tabindex="11" data-l10n-id="toggle_sidebar">
+ <span data-l10n-id="toggle_sidebar_label">Toggle Sidebar</span>
+ </button>
+ <div class="toolbarButtonSpacer"></div>
+ <button id="viewFind" class="toolbarButton group hiddenSmallView" title="Find in Document" tabindex="12" data-l10n-id="findbar">
+ <span data-l10n-id="findbar_label">Find</span>
+ </button>
+ <div class="splitToolbarButton">
+ <button class="toolbarButton pageUp" title="Previous Page" id="previous" tabindex="13" data-l10n-id="previous">
+ <span data-l10n-id="previous_label">Previous</span>
+ </button>
+ <div class="splitToolbarButtonSeparator"></div>
+ <button class="toolbarButton pageDown" title="Next Page" id="next" tabindex="14" data-l10n-id="next">
+ <span data-l10n-id="next_label">Next</span>
+ </button>
+ </div>
+ <label id="pageNumberLabel" class="toolbarLabel" for="pageNumber" data-l10n-id="page_label">Page: </label>
+ <input type="number" id="pageNumber" class="toolbarField pageNumber" value="1" size="4" min="1" tabindex="15">
+ <span id="numPages" class="toolbarLabel"></span>
+ </div>
+ <div id="toolbarViewerRight">
+ <button id="presentationMode" class="toolbarButton presentationMode hiddenLargeView" title="Switch to Presentation Mode" tabindex="31" data-l10n-id="presentation_mode">
+ <span data-l10n-id="presentation_mode_label">Presentation Mode</span>
+ </button>
+
+ <button id="openFile" class="toolbarButton openFile hiddenLargeView" title="Open File" tabindex="32" data-l10n-id="open_file">
+ <span data-l10n-id="open_file_label">Open</span>
+ </button>
+
+ <button id="print" class="toolbarButton print hiddenMediumView" title="Print" tabindex="33" data-l10n-id="print">
+ <span data-l10n-id="print_label">Print</span>
+ </button>
+
+ <button id="download" class="toolbarButton download hiddenMediumView" title="Download" tabindex="34" data-l10n-id="download">
+ <span data-l10n-id="download_label">Download</span>
+ </button>
+ <a href="#" id="viewBookmark" class="toolbarButton bookmark hiddenSmallView" title="Current view (copy or open in new window)" tabindex="35" data-l10n-id="bookmark">
+ <span data-l10n-id="bookmark_label">Current View</span>
+ </a>
+
+ <div class="verticalToolbarSeparator hiddenSmallView"></div>
+
+ <button id="secondaryToolbarToggle" class="toolbarButton" title="Tools" tabindex="36" data-l10n-id="tools">
+ <span data-l10n-id="tools_label">Tools</span>
+ </button>
+ </div>
+ <div class="outerCenter">
+ <div class="innerCenter" id="toolbarViewerMiddle">
+ <div class="splitToolbarButton">
+ <button id="zoomOut" class="toolbarButton zoomOut" title="Zoom Out" tabindex="21" data-l10n-id="zoom_out">
+ <span data-l10n-id="zoom_out_label">Zoom Out</span>
+ </button>
+ <div class="splitToolbarButtonSeparator"></div>
+ <button id="zoomIn" class="toolbarButton zoomIn" title="Zoom In" tabindex="22" data-l10n-id="zoom_in">
+ <span data-l10n-id="zoom_in_label">Zoom In</span>
+ </button>
+ </div>
+ <span id="scaleSelectContainer" class="dropdownToolbarButton">
+ <select id="scaleSelect" title="Zoom" tabindex="23" data-l10n-id="zoom">
+ <option id="pageAutoOption" title="" value="auto" selected="selected" data-l10n-id="page_scale_auto">Automatic Zoom</option>
+ <option id="pageActualOption" title="" value="page-actual" data-l10n-id="page_scale_actual">Actual Size</option>
+ <option id="pageFitOption" title="" value="page-fit" data-l10n-id="page_scale_fit">Fit Page</option>
+ <option id="pageWidthOption" title="" value="page-width" data-l10n-id="page_scale_width">Full Width</option>
+ <option id="customScaleOption" title="" value="custom"></option>
+ <option title="" value="0.5" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 50 }'>50%</option>
+ <option title="" value="0.75" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 75 }'>75%</option>
+ <option title="" value="1" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 100 }'>100%</option>
+ <option title="" value="1.25" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 125 }'>125%</option>
+ <option title="" value="1.5" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 150 }'>150%</option>
+ <option title="" value="2" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 200 }'>200%</option>
+ <option title="" value="3" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 300 }'>300%</option>
+ <option title="" value="4" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 400 }'>400%</option>
+ </select>
+ </span>
+ </div>
+ </div>
+ </div>
+ <div id="loadingBar">
+ <div class="progress">
+ <div class="glimmer">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <menu type="context" id="viewerContextMenu">
+ <menuitem id="contextFirstPage" label="First Page"
+ data-l10n-id="first_page"></menuitem>
+ <menuitem id="contextLastPage" label="Last Page"
+ data-l10n-id="last_page"></menuitem>
+ <menuitem id="contextPageRotateCw" label="Rotate Clockwise"
+ data-l10n-id="page_rotate_cw"></menuitem>
+ <menuitem id="contextPageRotateCcw" label="Rotate Counter-Clockwise"
+ data-l10n-id="page_rotate_ccw"></menuitem>
+ </menu>
+
+ <div id="viewerContainer" tabindex="0">
+ <div id="viewer" class="pdfViewer"></div>
+ </div>
+
+ <div id="errorWrapper" hidden='true'>
+ <div id="errorMessageLeft">
+ <span id="errorMessage"></span>
+ <button id="errorShowMore" data-l10n-id="error_more_info">
+ More Information
+ </button>
+ <button id="errorShowLess" data-l10n-id="error_less_info" hidden='true'>
+ Less Information
+ </button>
+ </div>
+ <div id="errorMessageRight">
+ <button id="errorClose" data-l10n-id="error_close">
+ Close
+ </button>
+ </div>
+ <div class="clearBoth"></div>
+ <textarea id="errorMoreInfo" hidden='true' readonly="readonly"></textarea>
+ </div>
+ </div> <!-- mainContainer -->
+
+ <div id="overlayContainer" class="hidden">
+ <div id="passwordOverlay" class="container hidden">
+ <div class="dialog">
+ <div class="row">
+ <p id="passwordText" data-l10n-id="password_label">Enter the password to open this PDF file:</p>
+ </div>
+ <div class="row">
+ <input type="password" id="password" class="toolbarField" />
+ </div>
+ <div class="buttonRow">
+ <button id="passwordCancel" class="overlayButton"><span data-l10n-id="password_cancel">Cancel</span></button>
+ <button id="passwordSubmit" class="overlayButton"><span data-l10n-id="password_ok">OK</span></button>
+ </div>
+ </div>
+ </div>
+ <div id="documentPropertiesOverlay" class="container hidden">
+ <div class="dialog">
+ <div class="row">
+ <span data-l10n-id="document_properties_file_name">File name:</span> <p id="fileNameField">-</p>
+ </div>
+ <div class="row">
+ <span data-l10n-id="document_properties_file_size">File size:</span> <p id="fileSizeField">-</p>
+ </div>
+ <div class="separator"></div>
+ <div class="row">
+ <span data-l10n-id="document_properties_title">Title:</span> <p id="titleField">-</p>
+ </div>
+ <div class="row">
+ <span data-l10n-id="document_properties_author">Author:</span> <p id="authorField">-</p>
+ </div>
+ <div class="row">
+ <span data-l10n-id="document_properties_subject">Subject:</span> <p id="subjectField">-</p>
+ </div>
+ <div class="row">
+ <span data-l10n-id="document_properties_keywords">Keywords:</span> <p id="keywordsField">-</p>
+ </div>
+ <div class="row">
+ <span data-l10n-id="document_properties_creation_date">Creation Date:</span> <p id="creationDateField">-</p>
+ </div>
+ <div class="row">
+ <span data-l10n-id="document_properties_modification_date">Modification Date:</span> <p id="modificationDateField">-</p>
+ </div>
+ <div class="row">
+ <span data-l10n-id="document_properties_creator">Creator:</span> <p id="creatorField">-</p>
+ </div>
+ <div class="separator"></div>
+ <div class="row">
+ <span data-l10n-id="document_properties_producer">PDF Producer:</span> <p id="producerField">-</p>
+ </div>
+ <div class="row">
+ <span data-l10n-id="document_properties_version">PDF Version:</span> <p id="versionField">-</p>
+ </div>
+ <div class="row">
+ <span data-l10n-id="document_properties_page_count">Page Count:</span> <p id="pageCountField">-</p>
+ </div>
+ <div class="buttonRow">
+ <button id="documentPropertiesClose" class="overlayButton"><span data-l10n-id="document_properties_close">Close</span></button>
+ </div>
+ </div>
+ </div>
+ </div> <!-- overlayContainer -->
+
+ </div> <!-- outerContainer -->
+ <div id="printContainer"></div>
+<div id="mozPrintCallback-shim" hidden>
+ <style>
+@media print {
+ #printContainer div {
+ page-break-after: always;
+ page-break-inside: avoid;
+ }
+}
+ </style>
+ <style scoped>
+#mozPrintCallback-shim {
+ position: fixed;
+ top: 0;
+ left: 0;
+ height: 100%;
+ width: 100%;
+ z-index: 9999999;
+
+ display: block;
+ text-align: center;
+ background-color: rgba(0, 0, 0, 0.5);
+}
+#mozPrintCallback-shim[hidden] {
+ display: none;
+}
+@media print {
+ #mozPrintCallback-shim {
+ display: none;
+ }
+}
+
+#mozPrintCallback-shim .mozPrintCallback-dialog-box {
+ display: inline-block;
+ margin: -50px auto 0;
+ position: relative;
+ top: 45%;
+ left: 0;
+ min-width: 220px;
+ max-width: 400px;
+
+ padding: 9px;
+
+ border: 1px solid hsla(0, 0%, 0%, .5);
+ border-radius: 2px;
+ box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+
+ background-color: #474747;
+
+ color: hsl(0, 0%, 85%);
+ font-size: 16px;
+ line-height: 20px;
+}
+#mozPrintCallback-shim .progress-row {
+ clear: both;
+ padding: 1em 0;
+}
+#mozPrintCallback-shim progress {
+ width: 100%;
+}
+#mozPrintCallback-shim .relative-progress {
+ clear: both;
+ float: right;
+}
+#mozPrintCallback-shim .progress-actions {
+ clear: both;
+}
+ </style>
+ <div class="mozPrintCallback-dialog-box">
+ <!-- TODO: Localise the following strings -->
+ Preparing document for printing...
+ <div class="progress-row">
+ <progress value="0" max="100"></progress>
+ <span class="relative-progress">0%</span>
+ </div>
+ <div class="progress-actions">
+ <input type="button" value="Cancel" class="mozPrintCallback-cancel">
+ </div>
+ </div>
+</div>
+
+ </body>
+</html>
+
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/viewer.js b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/viewer.js
new file mode 100644
index 0000000..7322208
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/generic/web/viewer.js
@@ -0,0 +1,7614 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+/* Copyright 2012 Mozilla Foundation
+ *
+ * Licensed 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.
+ */
+/* globals PDFJS, PDFBug, FirefoxCom, Stats, Cache, ProgressBar,
+ DownloadManager, getFileName, getPDFFileNameFromURL,
+ PDFHistory, Preferences, SidebarView, ViewHistory, Stats,
+ PDFThumbnailViewer, URL, noContextMenuHandler, SecondaryToolbar,
+ PasswordPrompt, PDFPresentationMode, HandTool, Promise,
+ PDFDocumentProperties, PDFOutlineView, PDFAttachmentView,
+ OverlayManager, PDFFindController, PDFFindBar, getVisibleElements,
+ watchScroll, PDFViewer, PDFRenderingQueue, PresentationModeState,
+ RenderingStates, DEFAULT_SCALE, UNKNOWN_SCALE,
+ IGNORE_CURRENT_POSITION_ON_ZOOM: true */
+
+'use strict';
+
+var DEFAULT_URL = 'compressed.tracemonkey-pldi-09.pdf';
+var DEFAULT_SCALE_DELTA = 1.1;
+var MIN_SCALE = 0.25;
+var MAX_SCALE = 10.0;
+var VIEW_HISTORY_MEMORY = 20;
+var SCALE_SELECT_CONTAINER_PADDING = 8;
+var SCALE_SELECT_PADDING = 22;
+var PAGE_NUMBER_LOADING_INDICATOR = 'visiblePageIsLoading';
+var DISABLE_AUTO_FETCH_LOADING_BAR_TIMEOUT = 5000;
+
+PDFJS.imageResourcesPath = './images/';
+ PDFJS.workerSrc = '../build/pdf.worker.js';
+ PDFJS.cMapUrl = '../web/cmaps/';
+ PDFJS.cMapPacked = true;
+
+var mozL10n = document.mozL10n || document.webL10n;
+
+
+var CSS_UNITS = 96.0 / 72.0;
+var DEFAULT_SCALE = 'auto';
+var UNKNOWN_SCALE = 0;
+var MAX_AUTO_SCALE = 1.25;
+var SCROLLBAR_PADDING = 40;
+var VERTICAL_PADDING = 5;
+
+// optimised CSS custom property getter/setter
+var CustomStyle = (function CustomStyleClosure() {
+
+ // As noted on: http://www.zachstronaut.com/posts/2009/02/17/
+ // animate-css-transforms-firefox-webkit.html
+ // in some versions of IE9 it is critical that ms appear in this list
+ // before Moz
+ var prefixes = ['ms', 'Moz', 'Webkit', 'O'];
+ var _cache = {};
+
+ function CustomStyle() {}
+
+ CustomStyle.getProp = function get(propName, element) {
+ // check cache only when no element is given
+ if (arguments.length === 1 && typeof _cache[propName] === 'string') {
+ return _cache[propName];
+ }
+
+ element = element || document.documentElement;
+ var style = element.style, prefixed, uPropName;
+
+ // test standard property first
+ if (typeof style[propName] === 'string') {
+ return (_cache[propName] = propName);
+ }
+
+ // capitalize
+ uPropName = propName.charAt(0).toUpperCase() + propName.slice(1);
+
+ // test vendor specific properties
+ for (var i = 0, l = prefixes.length; i < l; i++) {
+ prefixed = prefixes[i] + uPropName;
+ if (typeof style[prefixed] === 'string') {
+ return (_cache[propName] = prefixed);
+ }
+ }
+
+ //if all fails then set to undefined
+ return (_cache[propName] = 'undefined');
+ };
+
+ CustomStyle.setProp = function set(propName, element, str) {
+ var prop = this.getProp(propName);
+ if (prop !== 'undefined') {
+ element.style[prop] = str;
+ }
+ };
+
+ return CustomStyle;
+})();
+
+function getFileName(url) {
+ var anchor = url.indexOf('#');
+ var query = url.indexOf('?');
+ var end = Math.min(
+ anchor > 0 ? anchor : url.length,
+ query > 0 ? query : url.length);
+ return url.substring(url.lastIndexOf('/', end) + 1, end);
+}
+
+/**
+ * Returns scale factor for the canvas. It makes sense for the HiDPI displays.
+ * @return {Object} The object with horizontal (sx) and vertical (sy)
+ scales. The scaled property is set to false if scaling is
+ not required, true otherwise.
+ */
+function getOutputScale(ctx) {
+ var devicePixelRatio = window.devicePixelRatio || 1;
+ var backingStoreRatio = ctx.webkitBackingStorePixelRatio ||
+ ctx.mozBackingStorePixelRatio ||
+ ctx.msBackingStorePixelRatio ||
+ ctx.oBackingStorePixelRatio ||
+ ctx.backingStorePixelRatio || 1;
+ var pixelRatio = devicePixelRatio / backingStoreRatio;
+ return {
+ sx: pixelRatio,
+ sy: pixelRatio,
+ scaled: pixelRatio !== 1
+ };
+}
+
+/**
+ * Scrolls specified element into view of its parent.
+ * element {Object} The element to be visible.
+ * spot {Object} An object with optional top and left properties,
+ * specifying the offset from the top left edge.
+ */
+function scrollIntoView(element, spot) {
+ // Assuming offsetParent is available (it's not available when viewer is in
+ // hidden iframe or object). We have to scroll: if the offsetParent is not set
+ // producing the error. See also animationStartedClosure.
+ var parent = element.offsetParent;
+ var offsetY = element.offsetTop + element.clientTop;
+ var offsetX = element.offsetLeft + element.clientLeft;
+ if (!parent) {
+ console.error('offsetParent is not set -- cannot scroll');
+ return;
+ }
+ while (parent.clientHeight === parent.scrollHeight) {
+ if (parent.dataset._scaleY) {
+ offsetY /= parent.dataset._scaleY;
+ offsetX /= parent.dataset._scaleX;
+ }
+ offsetY += parent.offsetTop;
+ offsetX += parent.offsetLeft;
+ parent = parent.offsetParent;
+ if (!parent) {
+ return; // no need to scroll
+ }
+ }
+ if (spot) {
+ if (spot.top !== undefined) {
+ offsetY += spot.top;
+ }
+ if (spot.left !== undefined) {
+ offsetX += spot.left;
+ parent.scrollLeft = offsetX;
+ }
+ }
+ parent.scrollTop = offsetY;
+}
+
+/**
+ * Helper function to start monitoring the scroll event and converting them into
+ * PDF.js friendly one: with scroll debounce and scroll direction.
+ */
+function watchScroll(viewAreaElement, callback) {
+ var debounceScroll = function debounceScroll(evt) {
+ if (rAF) {
+ return;
+ }
+ // schedule an invocation of scroll for next animation frame.
+ rAF = window.requestAnimationFrame(function viewAreaElementScrolled() {
+ rAF = null;
+
+ var currentY = viewAreaElement.scrollTop;
+ var lastY = state.lastY;
+ if (currentY !== lastY) {
+ state.down = currentY > lastY;
+ }
+ state.lastY = currentY;
+ callback(state);
+ });
+ };
+
+ var state = {
+ down: true,
+ lastY: viewAreaElement.scrollTop,
+ _eventHandler: debounceScroll
+ };
+
+ var rAF = null;
+ viewAreaElement.addEventListener('scroll', debounceScroll, true);
+ return state;
+}
+
+/**
+ * Use binary search to find the index of the first item in a given array which
+ * passes a given condition. The items are expected to be sorted in the sense
+ * that if the condition is true for one item in the array, then it is also true
+ * for all following items.
+ *
+ * @returns {Number} Index of the first array element to pass the test,
+ * or |items.length| if no such element exists.
+ */
+function binarySearchFirstItem(items, condition) {
+ var minIndex = 0;
+ var maxIndex = items.length - 1;
+
+ if (items.length === 0 || !condition(items[maxIndex])) {
+ return items.length;
+ }
+ if (condition(items[minIndex])) {
+ return minIndex;
+ }
+
+ while (minIndex < maxIndex) {
+ var currentIndex = (minIndex + maxIndex) >> 1;
+ var currentItem = items[currentIndex];
+ if (condition(currentItem)) {
+ maxIndex = currentIndex;
+ } else {
+ minIndex = currentIndex + 1;
+ }
+ }
+ return minIndex; /* === maxIndex */
+}
+
+/**
+ * Generic helper to find out what elements are visible within a scroll pane.
+ */
+function getVisibleElements(scrollEl, views, sortByVisibility) {
+ var top = scrollEl.scrollTop, bottom = top + scrollEl.clientHeight;
+ var left = scrollEl.scrollLeft, right = left + scrollEl.clientWidth;
+
+ function isElementBottomBelowViewTop(view) {
+ var element = view.div;
+ var elementBottom =
+ element.offsetTop + element.clientTop + element.clientHeight;
+ return elementBottom > top;
+ }
+
+ var visible = [], view, element;
+ var currentHeight, viewHeight, hiddenHeight, percentHeight;
+ var currentWidth, viewWidth;
+ var firstVisibleElementInd = (views.length === 0) ? 0 :
+ binarySearchFirstItem(views, isElementBottomBelowViewTop);
+
+ for (var i = firstVisibleElementInd, ii = views.length; i < ii; i++) {
+ view = views[i];
+ element = view.div;
+ currentHeight = element.offsetTop + element.clientTop;
+ viewHeight = element.clientHeight;
+
+ if (currentHeight > bottom) {
+ break;
+ }
+
+ currentWidth = element.offsetLeft + element.clientLeft;
+ viewWidth = element.clientWidth;
+ if (currentWidth + viewWidth < left || currentWidth > right) {
+ continue;
+ }
+ hiddenHeight = Math.max(0, top - currentHeight) +
+ Math.max(0, currentHeight + viewHeight - bottom);
+ percentHeight = ((viewHeight - hiddenHeight) * 100 / viewHeight) | 0;
+
+ visible.push({
+ id: view.id,
+ x: currentWidth,
+ y: currentHeight,
+ view: view,
+ percent: percentHeight
+ });
+ }
+
+ var first = visible[0];
+ var last = visible[visible.length - 1];
+
+ if (sortByVisibility) {
+ visible.sort(function(a, b) {
+ var pc = a.percent - b.percent;
+ if (Math.abs(pc) > 0.001) {
+ return -pc;
+ }
+ return a.id - b.id; // ensure stability
+ });
+ }
+ return {first: first, last: last, views: visible};
+}
+
+/**
+ * Event handler to suppress context menu.
+ */
+function noContextMenuHandler(e) {
+ e.preventDefault();
+}
+
+/**
+ * Returns the filename or guessed filename from the url (see issue 3455).
+ * url {String} The original PDF location.
+ * @return {String} Guessed PDF file name.
+ */
+function getPDFFileNameFromURL(url) {
+ var reURI = /^(?:([^:]+:)?\/\/[^\/]+)?([^?#]*)(\?[^#]*)?(#.*)?$/;
+ // SCHEME HOST 1.PATH 2.QUERY 3.REF
+ // Pattern to get last matching NAME.pdf
+ var reFilename = /[^\/?#=]+\.pdf\b(?!.*\.pdf\b)/i;
+ var splitURI = reURI.exec(url);
+ var suggestedFilename = reFilename.exec(splitURI[1]) ||
+ reFilename.exec(splitURI[2]) ||
+ reFilename.exec(splitURI[3]);
+ if (suggestedFilename) {
+ suggestedFilename = suggestedFilename[0];
+ if (suggestedFilename.indexOf('%') !== -1) {
+ // URL-encoded %2Fpath%2Fto%2Ffile.pdf should be file.pdf
+ try {
+ suggestedFilename =
+ reFilename.exec(decodeURIComponent(suggestedFilename))[0];
+ } catch(e) { // Possible (extremely rare) errors:
+ // URIError "Malformed URI", e.g. for "%AA.pdf"
+ // TypeError "null has no properties", e.g. for "%2F.pdf"
+ }
+ }
+ }
+ return suggestedFilename || 'document.pdf';
+}
+
+var ProgressBar = (function ProgressBarClosure() {
+
+ function clamp(v, min, max) {
+ return Math.min(Math.max(v, min), max);
+ }
+
+ function ProgressBar(id, opts) {
+ this.visible = true;
+
+ // Fetch the sub-elements for later.
+ this.div = document.querySelector(id + ' .progress');
+
+ // Get the loading bar element, so it can be resized to fit the viewer.
+ this.bar = this.div.parentNode;
+
+ // Get options, with sensible defaults.
+ this.height = opts.height || 100;
+ this.width = opts.width || 100;
+ this.units = opts.units || '%';
+
+ // Initialize heights.
+ this.div.style.height = this.height + this.units;
+ this.percent = 0;
+ }
+
+ ProgressBar.prototype = {
+
+ updateBar: function ProgressBar_updateBar() {
+ if (this._indeterminate) {
+ this.div.classList.add('indeterminate');
+ this.div.style.width = this.width + this.units;
+ return;
+ }
+
+ this.div.classList.remove('indeterminate');
+ var progressSize = this.width * this._percent / 100;
+ this.div.style.width = progressSize + this.units;
+ },
+
+ get percent() {
+ return this._percent;
+ },
+
+ set percent(val) {
+ this._indeterminate = isNaN(val);
+ this._percent = clamp(val, 0, 100);
+ this.updateBar();
+ },
+
+ setWidth: function ProgressBar_setWidth(viewer) {
+ if (viewer) {
+ var container = viewer.parentNode;
+ var scrollbarWidth = container.offsetWidth - viewer.offsetWidth;
+ if (scrollbarWidth > 0) {
+ this.bar.setAttribute('style', 'width: calc(100% - ' +
+ scrollbarWidth + 'px);');
+ }
+ }
+ },
+
+ hide: function ProgressBar_hide() {
+ if (!this.visible) {
+ return;
+ }
+ this.visible = false;
+ this.bar.classList.add('hidden');
+ document.body.classList.remove('loadingInProgress');
+ },
+
+ show: function ProgressBar_show() {
+ if (this.visible) {
+ return;
+ }
+ this.visible = true;
+ document.body.classList.add('loadingInProgress');
+ this.bar.classList.remove('hidden');
+ }
+ };
+
+ return ProgressBar;
+})();
+
+
+
+var DEFAULT_PREFERENCES = {
+ showPreviousViewOnLoad: true,
+ defaultZoomValue: '',
+ sidebarViewOnLoad: 0,
+ enableHandToolOnLoad: false,
+ enableWebGL: false,
+ pdfBugEnabled: false,
+ disableRange: false,
+ disableStream: false,
+ disableAutoFetch: false,
+ disableFontFace: false,
+ disableTextLayer: false,
+ useOnlyCssZoom: false
+};
+
+
+var SidebarView = {
+ NONE: 0,
+ THUMBS: 1,
+ OUTLINE: 2,
+ ATTACHMENTS: 3
+};
+
+/**
+ * Preferences - Utility for storing persistent settings.
+ * Used for settings that should be applied to all opened documents,
+ * or every time the viewer is loaded.
+ */
+var Preferences = {
+ prefs: Object.create(DEFAULT_PREFERENCES),
+ isInitializedPromiseResolved: false,
+ initializedPromise: null,
+
+ /**
+ * Initialize and fetch the current preference values from storage.
+ * @return {Promise} A promise that is resolved when the preferences
+ * have been initialized.
+ */
+ initialize: function preferencesInitialize() {
+ return this.initializedPromise =
+ this._readFromStorage(DEFAULT_PREFERENCES).then(function(prefObj) {
+ this.isInitializedPromiseResolved = true;
+ if (prefObj) {
+ this.prefs = prefObj;
+ }
+ }.bind(this));
+ },
+
+ /**
+ * Stub function for writing preferences to storage.
+ * NOTE: This should be overridden by a build-specific function defined below.
+ * @param {Object} prefObj The preferences that should be written to storage.
+ * @return {Promise} A promise that is resolved when the preference values
+ * have been written.
+ */
+ _writeToStorage: function preferences_writeToStorage(prefObj) {
+ return Promise.resolve();
+ },
+
+ /**
+ * Stub function for reading preferences from storage.
+ * NOTE: This should be overridden by a build-specific function defined below.
+ * @param {Object} prefObj The preferences that should be read from storage.
+ * @return {Promise} A promise that is resolved with an {Object} containing
+ * the preferences that have been read.
+ */
+ _readFromStorage: function preferences_readFromStorage(prefObj) {
+ return Promise.resolve();
+ },
+
+ /**
+ * Reset the preferences to their default values and update storage.
+ * @return {Promise} A promise that is resolved when the preference values
+ * have been reset.
+ */
+ reset: function preferencesReset() {
+ return this.initializedPromise.then(function() {
+ this.prefs = Object.create(DEFAULT_PREFERENCES);
+ return this._writeToStorage(DEFAULT_PREFERENCES);
+ }.bind(this));
+ },
+
+ /**
+ * Replace the current preference values with the ones from storage.
+ * @return {Promise} A promise that is resolved when the preference values
+ * have been updated.
+ */
+ reload: function preferencesReload() {
+ return this.initializedPromise.then(function () {
+ this._readFromStorage(DEFAULT_PREFERENCES).then(function(prefObj) {
+ if (prefObj) {
+ this.prefs = prefObj;
+ }
+ }.bind(this));
+ }.bind(this));
+ },
+
+ /**
+ * Set the value of a preference.
+ * @param {string} name The name of the preference that should be changed.
+ * @param {boolean|number|string} value The new value of the preference.
+ * @return {Promise} A promise that is resolved when the value has been set,
+ * provided that the preference exists and the types match.
+ */
+ set: function preferencesSet(name, value) {
+ return this.initializedPromise.then(function () {
+ if (DEFAULT_PREFERENCES[name] === undefined) {
+ throw new Error('preferencesSet: \'' + name + '\' is undefined.');
+ } else if (value === undefined) {
+ throw new Error('preferencesSet: no value is specified.');
+ }
+ var valueType = typeof value;
+ var defaultType = typeof DEFAULT_PREFERENCES[name];
+
+ if (valueType !== defaultType) {
+ if (valueType === 'number' && defaultType === 'string') {
+ value = value.toString();
+ } else {
+ throw new Error('Preferences_set: \'' + value + '\' is a \"' +
+ valueType + '\", expected \"' + defaultType + '\".');
+ }
+ } else {
+ if (valueType === 'number' && (value | 0) !== value) {
+ throw new Error('Preferences_set: \'' + value +
+ '\' must be an \"integer\".');
+ }
+ }
+ this.prefs[name] = value;
+ return this._writeToStorage(this.prefs);
+ }.bind(this));
+ },
+
+ /**
+ * Get the value of a preference.
+ * @param {string} name The name of the preference whose value is requested.
+ * @return {Promise} A promise that is resolved with a {boolean|number|string}
+ * containing the value of the preference.
+ */
+ get: function preferencesGet(name) {
+ return this.initializedPromise.then(function () {
+ var defaultValue = DEFAULT_PREFERENCES[name];
+
+ if (defaultValue === undefined) {
+ throw new Error('preferencesGet: \'' + name + '\' is undefined.');
+ } else {
+ var prefValue = this.prefs[name];
+
+ if (prefValue !== undefined) {
+ return prefValue;
+ }
+ }
+ return defaultValue;
+ }.bind(this));
+ }
+};
+
+
+
+Preferences._writeToStorage = function (prefObj) {
+ return new Promise(function (resolve) {
+ localStorage.setItem('pdfjs.preferences', JSON.stringify(prefObj));
+ resolve();
+ });
+};
+
+Preferences._readFromStorage = function (prefObj) {
+ return new Promise(function (resolve) {
+ var readPrefs = JSON.parse(localStorage.getItem('pdfjs.preferences'));
+ resolve(readPrefs);
+ });
+};
+
+
+(function mozPrintCallbackPolyfillClosure() {
+ if ('mozPrintCallback' in document.createElement('canvas')) {
+ return;
+ }
+ // Cause positive result on feature-detection:
+ HTMLCanvasElement.prototype.mozPrintCallback = undefined;
+
+ var canvases; // During print task: non-live NodeList of <canvas> elements
+ var index; // Index of <canvas> element that is being processed
+
+ var print = window.print;
+ window.print = function print() {
+ if (canvases) {
+ console.warn('Ignored window.print() because of a pending print job.');
+ return;
+ }
+ try {
+ dispatchEvent('beforeprint');
+ } finally {
+ canvases = document.querySelectorAll('canvas');
+ index = -1;
+ next();
+ }
+ };
+
+ function dispatchEvent(eventType) {
+ var event = document.createEvent('CustomEvent');
+ event.initCustomEvent(eventType, false, false, 'custom');
+ window.dispatchEvent(event);
+ }
+
+ function next() {
+ if (!canvases) {
+ return; // Print task cancelled by user (state reset in abort())
+ }
+
+ renderProgress();
+ if (++index < canvases.length) {
+ var canvas = canvases[index];
+ if (typeof canvas.mozPrintCallback === 'function') {
+ canvas.mozPrintCallback({
+ context: canvas.getContext('2d'),
+ abort: abort,
+ done: next
+ });
+ } else {
+ next();
+ }
+ } else {
+ renderProgress();
+ print.call(window);
+ setTimeout(abort, 20); // Tidy-up
+ }
+ }
+
+ function abort() {
+ if (canvases) {
+ canvases = null;
+ renderProgress();
+ dispatchEvent('afterprint');
+ }
+ }
+
+ function renderProgress() {
+ var progressContainer = document.getElementById('mozPrintCallback-shim');
+ if (canvases) {
+ var progress = Math.round(100 * index / canvases.length);
+ var progressBar = progressContainer.querySelector('progress');
+ var progressPerc = progressContainer.querySelector('.relative-progress');
+ progressBar.value = progress;
+ progressPerc.textContent = progress + '%';
+ progressContainer.removeAttribute('hidden');
+ progressContainer.onclick = abort;
+ } else {
+ progressContainer.setAttribute('hidden', '');
+ }
+ }
+
+ var hasAttachEvent = !!document.attachEvent;
+
+ window.addEventListener('keydown', function(event) {
+ // Intercept Cmd/Ctrl + P in all browsers.
+ // Also intercept Cmd/Ctrl + Shift + P in Chrome and Opera
+ if (event.keyCode === 80/*P*/ && (event.ctrlKey || event.metaKey) &&
+ !event.altKey && (!event.shiftKey || window.chrome || window.opera)) {
+ window.print();
+ if (hasAttachEvent) {
+ // Only attachEvent can cancel Ctrl + P dialog in IE <=10
+ // attachEvent is gone in IE11, so the dialog will re-appear in IE11.
+ return;
+ }
+ event.preventDefault();
+ if (event.stopImmediatePropagation) {
+ event.stopImmediatePropagation();
+ } else {
+ event.stopPropagation();
+ }
+ return;
+ }
+ if (event.keyCode === 27 && canvases) { // Esc
+ abort();
+ }
+ }, true);
+ if (hasAttachEvent) {
+ document.attachEvent('onkeydown', function(event) {
+ event = event || window.event;
+ if (event.keyCode === 80/*P*/ && event.ctrlKey) {
+ event.keyCode = 0;
+ return false;
+ }
+ });
+ }
+
+ if ('onbeforeprint' in window) {
+ // Do not propagate before/afterprint events when they are not triggered
+ // from within this polyfill. (FF/IE).
+ var stopPropagationIfNeeded = function(event) {
+ if (event.detail !== 'custom' && event.stopImmediatePropagation) {
+ event.stopImmediatePropagation();
+ }
+ };
+ window.addEventListener('beforeprint', stopPropagationIfNeeded, false);
+ window.addEventListener('afterprint', stopPropagationIfNeeded, false);
+ }
+})();
+
+
+
+var DownloadManager = (function DownloadManagerClosure() {
+
+ function download(blobUrl, filename) {
+ var a = document.createElement('a');
+ if (a.click) {
+ // Use a.click() if available. Otherwise, Chrome might show
+ // "Unsafe JavaScript attempt to initiate a navigation change
+ // for frame with URL" and not open the PDF at all.
+ // Supported by (not mentioned = untested):
+ // - Firefox 6 - 19 (4- does not support a.click, 5 ignores a.click)
+ // - Chrome 19 - 26 (18- does not support a.click)
+ // - Opera 9 - 12.15
+ // - Internet Explorer 6 - 10
+ // - Safari 6 (5.1- does not support a.click)
+ a.href = blobUrl;
+ a.target = '_parent';
+ // Use a.download if available. This increases the likelihood that
+ // the file is downloaded instead of opened by another PDF plugin.
+ if ('download' in a) {
+ a.download = filename;
+ }
+ // <a> must be in the document for IE and recent Firefox versions.
+ // (otherwise .click() is ignored)
+ (document.body || document.documentElement).appendChild(a);
+ a.click();
+ a.parentNode.removeChild(a);
+ } else {
+ if (window.top === window &&
+ blobUrl.split('#')[0] === window.location.href.split('#')[0]) {
+ // If _parent == self, then opening an identical URL with different
+ // location hash will only cause a navigation, not a download.
+ var padCharacter = blobUrl.indexOf('?') === -1 ? '?' : '&';
+ blobUrl = blobUrl.replace(/#|$/, padCharacter + '$&');
+ }
+ window.open(blobUrl, '_parent');
+ }
+ }
+
+ function DownloadManager() {}
+
+ DownloadManager.prototype = {
+ downloadUrl: function DownloadManager_downloadUrl(url, filename) {
+ if (!PDFJS.isValidUrl(url, true)) {
+ return; // restricted/invalid URL
+ }
+
+ download(url + '#pdfjs.action=download', filename);
+ },
+
+ downloadData: function DownloadManager_downloadData(data, filename,
+ contentType) {
+ if (navigator.msSaveBlob) { // IE10 and above
+ return navigator.msSaveBlob(new Blob([data], { type: contentType }),
+ filename);
+ }
+
+ var blobUrl = PDFJS.createObjectURL(data, contentType);
+ download(blobUrl, filename);
+ },
+
+ download: function DownloadManager_download(blob, url, filename) {
+ if (!URL) {
+ // URL.createObjectURL is not supported
+ this.downloadUrl(url, filename);
+ return;
+ }
+
+ if (navigator.msSaveBlob) {
+ // IE10 / IE11
+ if (!navigator.msSaveBlob(blob, filename)) {
+ this.downloadUrl(url, filename);
+ }
+ return;
+ }
+
+ var blobUrl = URL.createObjectURL(blob);
+ download(blobUrl, filename);
+ }
+ };
+
+ return DownloadManager;
+})();
+
+
+
+
+
+/**
+ * View History - This is a utility for saving various view parameters for
+ * recently opened files.
+ *
+ * The way that the view parameters are stored depends on how PDF.js is built,
+ * for 'node make <flag>' the following cases exist:
+ * - FIREFOX or MOZCENTRAL - uses sessionStorage.
+ * - B2G - uses asyncStorage.
+ * - GENERIC or CHROME - uses localStorage, if it is available.
+ */
+var ViewHistory = (function ViewHistoryClosure() {
+ function ViewHistory(fingerprint) {
+ this.fingerprint = fingerprint;
+ this.isInitializedPromiseResolved = false;
+ this.initializedPromise =
+ this._readFromStorage().then(function (databaseStr) {
+ this.isInitializedPromiseResolved = true;
+
+ var database = JSON.parse(databaseStr || '{}');
+ if (!('files' in database)) {
+ database.files = [];
+ }
+ if (database.files.length >= VIEW_HISTORY_MEMORY) {
+ database.files.shift();
+ }
+ var index;
+ for (var i = 0, length = database.files.length; i < length; i++) {
+ var branch = database.files[i];
+ if (branch.fingerprint === this.fingerprint) {
+ index = i;
+ break;
+ }
+ }
+ if (typeof index !== 'number') {
+ index = database.files.push({fingerprint: this.fingerprint}) - 1;
+ }
+ this.file = database.files[index];
+ this.database = database;
+ }.bind(this));
+ }
+
+ ViewHistory.prototype = {
+ _writeToStorage: function ViewHistory_writeToStorage() {
+ return new Promise(function (resolve) {
+ var databaseStr = JSON.stringify(this.database);
+
+
+
+ localStorage.setItem('database', databaseStr);
+ resolve();
+ }.bind(this));
+ },
+
+ _readFromStorage: function ViewHistory_readFromStorage() {
+ return new Promise(function (resolve) {
+
+
+ resolve(localStorage.getItem('database'));
+ });
+ },
+
+ set: function ViewHistory_set(name, val) {
+ if (!this.isInitializedPromiseResolved) {
+ return;
+ }
+ this.file[name] = val;
+ return this._writeToStorage();
+ },
+
+ setMultiple: function ViewHistory_setMultiple(properties) {
+ if (!this.isInitializedPromiseResolved) {
+ return;
+ }
+ for (var name in properties) {
+ this.file[name] = properties[name];
+ }
+ return this._writeToStorage();
+ },
+
+ get: function ViewHistory_get(name, defaultValue) {
+ if (!this.isInitializedPromiseResolved) {
+ return defaultValue;
+ }
+ return this.file[name] || defaultValue;
+ }
+ };
+
+ return ViewHistory;
+})();
+
+
+/**
+ * Creates a "search bar" given a set of DOM elements that act as controls
+ * for searching or for setting search preferences in the UI. This object
+ * also sets up the appropriate events for the controls. Actual searching
+ * is done by PDFFindController.
+ */
+var PDFFindBar = (function PDFFindBarClosure() {
+ function PDFFindBar(options) {
+ this.opened = false;
+ this.bar = options.bar || null;
+ this.toggleButton = options.toggleButton || null;
+ this.findField = options.findField || null;
+ this.highlightAll = options.highlightAllCheckbox || null;
+ this.caseSensitive = options.caseSensitiveCheckbox || null;
+ this.findMsg = options.findMsg || null;
+ this.findStatusIcon = options.findStatusIcon || null;
+ this.findPreviousButton = options.findPreviousButton || null;
+ this.findNextButton = options.findNextButton || null;
+ this.findController = options.findController || null;
+
+ if (this.findController === null) {
+ throw new Error('PDFFindBar cannot be used without a ' +
+ 'PDFFindController instance.');
+ }
+
+ // Add event listeners to the DOM elements.
+ var self = this;
+ this.toggleButton.addEventListener('click', function() {
+ self.toggle();
+ });
+
+ this.findField.addEventListener('input', function() {
+ self.dispatchEvent('');
+ });
+
+ this.bar.addEventListener('keydown', function(evt) {
+ switch (evt.keyCode) {
+ case 13: // Enter
+ if (evt.target === self.findField) {
+ self.dispatchEvent('again', evt.shiftKey);
+ }
+ break;
+ case 27: // Escape
+ self.close();
+ break;
+ }
+ });
+
+ this.findPreviousButton.addEventListener('click', function() {
+ self.dispatchEvent('again', true);
+ });
+
+ this.findNextButton.addEventListener('click', function() {
+ self.dispatchEvent('again', false);
+ });
+
+ this.highlightAll.addEventListener('click', function() {
+ self.dispatchEvent('highlightallchange');
+ });
+
+ this.caseSensitive.addEventListener('click', function() {
+ self.dispatchEvent('casesensitivitychange');
+ });
+ }
+
+ PDFFindBar.prototype = {
+ dispatchEvent: function PDFFindBar_dispatchEvent(type, findPrev) {
+ var event = document.createEvent('CustomEvent');
+ event.initCustomEvent('find' + type, true, true, {
+ query: this.findField.value,
+ caseSensitive: this.caseSensitive.checked,
+ highlightAll: this.highlightAll.checked,
+ findPrevious: findPrev
+ });
+ return window.dispatchEvent(event);
+ },
+
+ updateUIState: function PDFFindBar_updateUIState(state, previous) {
+ var notFound = false;
+ var findMsg = '';
+ var status = '';
+
+ switch (state) {
+ case FindStates.FIND_FOUND:
+ break;
+
+ case FindStates.FIND_PENDING:
+ status = 'pending';
+ break;
+
+ case FindStates.FIND_NOTFOUND:
+ findMsg = mozL10n.get('find_not_found', null, 'Phrase not found');
+ notFound = true;
+ break;
+
+ case FindStates.FIND_WRAPPED:
+ if (previous) {
+ findMsg = mozL10n.get('find_reached_top', null,
+ 'Reached top of document, continued from bottom');
+ } else {
+ findMsg = mozL10n.get('find_reached_bottom', null,
+ 'Reached end of document, continued from top');
+ }
+ break;
+ }
+
+ if (notFound) {
+ this.findField.classList.add('notFound');
+ } else {
+ this.findField.classList.remove('notFound');
+ }
+
+ this.findField.setAttribute('data-status', status);
+ this.findMsg.textContent = findMsg;
+ },
+
+ open: function PDFFindBar_open() {
+ if (!this.opened) {
+ this.opened = true;
+ this.toggleButton.classList.add('toggled');
+ this.bar.classList.remove('hidden');
+ }
+ this.findField.select();
+ this.findField.focus();
+ },
+
+ close: function PDFFindBar_close() {
+ if (!this.opened) {
+ return;
+ }
+ this.opened = false;
+ this.toggleButton.classList.remove('toggled');
+ this.bar.classList.add('hidden');
+ this.findController.active = false;
+ },
+
+ toggle: function PDFFindBar_toggle() {
+ if (this.opened) {
+ this.close();
+ } else {
+ this.open();
+ }
+ }
+ };
+ return PDFFindBar;
+})();
+
+
+var FindStates = {
+ FIND_FOUND: 0,
+ FIND_NOTFOUND: 1,
+ FIND_WRAPPED: 2,
+ FIND_PENDING: 3
+};
+
+var FIND_SCROLL_OFFSET_TOP = -50;
+var FIND_SCROLL_OFFSET_LEFT = -400;
+
+/**
+ * Provides "search" or "find" functionality for the PDF.
+ * This object actually performs the search for a given string.
+ */
+var PDFFindController = (function PDFFindControllerClosure() {
+ function PDFFindController(options) {
+ this.startedTextExtraction = false;
+ this.extractTextPromises = [];
+ this.pendingFindMatches = {};
+ this.active = false; // If active, find results will be highlighted.
+ this.pageContents = []; // Stores the text for each page.
+ this.pageMatches = [];
+ this.selected = { // Currently selected match.
+ pageIdx: -1,
+ matchIdx: -1
+ };
+ this.offset = { // Where the find algorithm currently is in the document.
+ pageIdx: null,
+ matchIdx: null
+ };
+ this.pagesToSearch = null;
+ this.resumePageIdx = null;
+ this.state = null;
+ this.dirtyMatch = false;
+ this.findTimeout = null;
+ this.pdfViewer = options.pdfViewer || null;
+ this.integratedFind = options.integratedFind || false;
+ this.charactersToNormalize = {
+ '\u2018': '\'', // Left single quotation mark
+ '\u2019': '\'', // Right single quotation mark
+ '\u201A': '\'', // Single low-9 quotation mark
+ '\u201B': '\'', // Single high-reversed-9 quotation mark
+ '\u201C': '"', // Left double quotation mark
+ '\u201D': '"', // Right double quotation mark
+ '\u201E': '"', // Double low-9 quotation mark
+ '\u201F': '"', // Double high-reversed-9 quotation mark
+ '\u00BC': '1/4', // Vulgar fraction one quarter
+ '\u00BD': '1/2', // Vulgar fraction one half
+ '\u00BE': '3/4', // Vulgar fraction three quarters
+ '\u00A0': ' ' // No-break space
+ };
+ this.findBar = options.findBar || null;
+
+ // Compile the regular expression for text normalization once
+ var replace = Object.keys(this.charactersToNormalize).join('');
+ this.normalizationRegex = new RegExp('[' + replace + ']', 'g');
+
+ var events = [
+ 'find',
+ 'findagain',
+ 'findhighlightallchange',
+ 'findcasesensitivitychange'
+ ];
+
+ this.firstPagePromise = new Promise(function (resolve) {
+ this.resolveFirstPage = resolve;
+ }.bind(this));
+ this.handleEvent = this.handleEvent.bind(this);
+
+ for (var i = 0, len = events.length; i < len; i++) {
+ window.addEventListener(events[i], this.handleEvent);
+ }
+ }
+
+ PDFFindController.prototype = {
+ setFindBar: function PDFFindController_setFindBar(findBar) {
+ this.findBar = findBar;
+ },
+
+ reset: function PDFFindController_reset() {
+ this.startedTextExtraction = false;
+ this.extractTextPromises = [];
+ this.active = false;
+ },
+
+ normalize: function PDFFindController_normalize(text) {
+ var self = this;
+ return text.replace(this.normalizationRegex, function (ch) {
+ return self.charactersToNormalize[ch];
+ });
+ },
+
+ calcFindMatch: function PDFFindController_calcFindMatch(pageIndex) {
+ var pageContent = this.normalize(this.pageContents[pageIndex]);
+ var query = this.normalize(this.state.query);
+ var caseSensitive = this.state.caseSensitive;
+ var queryLen = query.length;
+
+ if (queryLen === 0) {
+ return; // Do nothing: the matches should be wiped out already.
+ }
+
+ if (!caseSensitive) {
+ pageContent = pageContent.toLowerCase();
+ query = query.toLowerCase();
+ }
+
+ var matches = [];
+ var matchIdx = -queryLen;
+ while (true) {
+ matchIdx = pageContent.indexOf(query, matchIdx + queryLen);
+ if (matchIdx === -1) {
+ break;
+ }
+ matches.push(matchIdx);
+ }
+ this.pageMatches[pageIndex] = matches;
+ this.updatePage(pageIndex);
+ if (this.resumePageIdx === pageIndex) {
+ this.resumePageIdx = null;
+ this.nextPageMatch();
+ }
+ },
+
+ extractText: function PDFFindController_extractText() {
+ if (this.startedTextExtraction) {
+ return;
+ }
+ this.startedTextExtraction = true;
+
+ this.pageContents = [];
+ var extractTextPromisesResolves = [];
+ var numPages = this.pdfViewer.pagesCount;
+ for (var i = 0; i < numPages; i++) {
+ this.extractTextPromises.push(new Promise(function (resolve) {
+ extractTextPromisesResolves.push(resolve);
+ }));
+ }
+
+ var self = this;
+ function extractPageText(pageIndex) {
+ self.pdfViewer.getPageTextContent(pageIndex).then(
+ function textContentResolved(textContent) {
+ var textItems = textContent.items;
+ var str = [];
+
+ for (var i = 0, len = textItems.length; i < len; i++) {
+ str.push(textItems[i].str);
+ }
+
+ // Store the pageContent as a string.
+ self.pageContents.push(str.join(''));
+
+ extractTextPromisesResolves[pageIndex](pageIndex);
+ if ((pageIndex + 1) < self.pdfViewer.pagesCount) {
+ extractPageText(pageIndex + 1);
+ }
+ }
+ );
+ }
+ extractPageText(0);
+ },
+
+ handleEvent: function PDFFindController_handleEvent(e) {
+ if (this.state === null || e.type !== 'findagain') {
+ this.dirtyMatch = true;
+ }
+ this.state = e.detail;
+ this.updateUIState(FindStates.FIND_PENDING);
+
+ this.firstPagePromise.then(function() {
+ this.extractText();
+
+ clearTimeout(this.findTimeout);
+ if (e.type === 'find') {
+ // Only trigger the find action after 250ms of silence.
+ this.findTimeout = setTimeout(this.nextMatch.bind(this), 250);
+ } else {
+ this.nextMatch();
+ }
+ }.bind(this));
+ },
+
+ updatePage: function PDFFindController_updatePage(index) {
+ if (this.selected.pageIdx === index) {
+ // If the page is selected, scroll the page into view, which triggers
+ // rendering the page, which adds the textLayer. Once the textLayer is
+ // build, it will scroll onto the selected match.
+ this.pdfViewer.scrollPageIntoView(index + 1);
+ }
+
+ var page = this.pdfViewer.getPageView(index);
+ if (page.textLayer) {
+ page.textLayer.updateMatches();
+ }
+ },
+
+ nextMatch: function PDFFindController_nextMatch() {
+ var previous = this.state.findPrevious;
+ var currentPageIndex = this.pdfViewer.currentPageNumber - 1;
+ var numPages = this.pdfViewer.pagesCount;
+
+ this.active = true;
+
+ if (this.dirtyMatch) {
+ // Need to recalculate the matches, reset everything.
+ this.dirtyMatch = false;
+ this.selected.pageIdx = this.selected.matchIdx = -1;
+ this.offset.pageIdx = currentPageIndex;
+ this.offset.matchIdx = null;
+ this.hadMatch = false;
+ this.resumePageIdx = null;
+ this.pageMatches = [];
+ var self = this;
+
+ for (var i = 0; i < numPages; i++) {
+ // Wipe out any previous highlighted matches.
+ this.updatePage(i);
+
+ // As soon as the text is extracted start finding the matches.
+ if (!(i in this.pendingFindMatches)) {
+ this.pendingFindMatches[i] = true;
+ this.extractTextPromises[i].then(function(pageIdx) {
+ delete self.pendingFindMatches[pageIdx];
+ self.calcFindMatch(pageIdx);
+ });
+ }
+ }
+ }
+
+ // If there's no query there's no point in searching.
+ if (this.state.query === '') {
+ this.updateUIState(FindStates.FIND_FOUND);
+ return;
+ }
+
+ // If we're waiting on a page, we return since we can't do anything else.
+ if (this.resumePageIdx) {
+ return;
+ }
+
+ var offset = this.offset;
+ // Keep track of how many pages we should maximally iterate through.
+ this.pagesToSearch = numPages;
+ // If there's already a matchIdx that means we are iterating through a
+ // page's matches.
+ if (offset.matchIdx !== null) {
+ var numPageMatches = this.pageMatches[offset.pageIdx].length;
+ if ((!previous && offset.matchIdx + 1 < numPageMatches) ||
+ (previous && offset.matchIdx > 0)) {
+ // The simple case; we just have advance the matchIdx to select
+ // the next match on the page.
+ this.hadMatch = true;
+ offset.matchIdx = (previous ? offset.matchIdx - 1 :
+ offset.matchIdx + 1);
+ this.updateMatch(true);
+ return;
+ }
+ // We went beyond the current page's matches, so we advance to
+ // the next page.
+ this.advanceOffsetPage(previous);
+ }
+ // Start searching through the page.
+ this.nextPageMatch();
+ },
+
+ matchesReady: function PDFFindController_matchesReady(matches) {
+ var offset = this.offset;
+ var numMatches = matches.length;
+ var previous = this.state.findPrevious;
+
+ if (numMatches) {
+ // There were matches for the page, so initialize the matchIdx.
+ this.hadMatch = true;
+ offset.matchIdx = (previous ? numMatches - 1 : 0);
+ this.updateMatch(true);
+ return true;
+ } else {
+ // No matches, so attempt to search the next page.
+ this.advanceOffsetPage(previous);
+ if (offset.wrapped) {
+ offset.matchIdx = null;
+ if (this.pagesToSearch < 0) {
+ // No point in wrapping again, there were no matches.
+ this.updateMatch(false);
+ // while matches were not found, searching for a page
+ // with matches should nevertheless halt.
+ return true;
+ }
+ }
+ // Matches were not found (and searching is not done).
+ return false;
+ }
+ },
+
+ /**
+ * The method is called back from the text layer when match presentation
+ * is updated.
+ * @param {number} pageIndex - page index.
+ * @param {number} index - match index.
+ * @param {Array} elements - text layer div elements array.
+ * @param {number} beginIdx - start index of the div array for the match.
+ * @param {number} endIdx - end index of the div array for the match.
+ */
+ updateMatchPosition: function PDFFindController_updateMatchPosition(
+ pageIndex, index, elements, beginIdx, endIdx) {
+ if (this.selected.matchIdx === index &&
+ this.selected.pageIdx === pageIndex) {
+ scrollIntoView(elements[beginIdx], {
+ top: FIND_SCROLL_OFFSET_TOP,
+ left: FIND_SCROLL_OFFSET_LEFT
+ });
+ }
+ },
+
+ nextPageMatch: function PDFFindController_nextPageMatch() {
+ if (this.resumePageIdx !== null) {
+ console.error('There can only be one pending page.');
+ }
+ do {
+ var pageIdx = this.offset.pageIdx;
+ var matches = this.pageMatches[pageIdx];
+ if (!matches) {
+ // The matches don't exist yet for processing by "matchesReady",
+ // so set a resume point for when they do exist.
+ this.resumePageIdx = pageIdx;
+ break;
+ }
+ } while (!this.matchesReady(matches));
+ },
+
+ advanceOffsetPage: function PDFFindController_advanceOffsetPage(previous) {
+ var offset = this.offset;
+ var numPages = this.extractTextPromises.length;
+ offset.pageIdx = (previous ? offset.pageIdx - 1 : offset.pageIdx + 1);
+ offset.matchIdx = null;
+
+ this.pagesToSearch--;
+
+ if (offset.pageIdx >= numPages || offset.pageIdx < 0) {
+ offset.pageIdx = (previous ? numPages - 1 : 0);
+ offset.wrapped = true;
+ }
+ },
+
+ updateMatch: function PDFFindController_updateMatch(found) {
+ var state = FindStates.FIND_NOTFOUND;
+ var wrapped = this.offset.wrapped;
+ this.offset.wrapped = false;
+
+ if (found) {
+ var previousPage = this.selected.pageIdx;
+ this.selected.pageIdx = this.offset.pageIdx;
+ this.selected.matchIdx = this.offset.matchIdx;
+ state = (wrapped ? FindStates.FIND_WRAPPED : FindStates.FIND_FOUND);
+ // Update the currently selected page to wipe out any selected matches.
+ if (previousPage !== -1 && previousPage !== this.selected.pageIdx) {
+ this.updatePage(previousPage);
+ }
+ }
+
+ this.updateUIState(state, this.state.findPrevious);
+ if (this.selected.pageIdx !== -1) {
+ this.updatePage(this.selected.pageIdx);
+ }
+ },
+
+ updateUIState: function PDFFindController_updateUIState(state, previous) {
+ if (this.integratedFind) {
+ FirefoxCom.request('updateFindControlState',
+ { result: state, findPrevious: previous });
+ return;
+ }
+ if (this.findBar === null) {
+ throw new Error('PDFFindController is not initialized with a ' +
+ 'PDFFindBar instance.');
+ }
+ this.findBar.updateUIState(state, previous);
+ }
+ };
+ return PDFFindController;
+})();
+
+
+var PDFHistory = {
+ initialized: false,
+ initialDestination: null,
+
+ /**
+ * @param {string} fingerprint
+ * @param {IPDFLinkService} linkService
+ */
+ initialize: function pdfHistoryInitialize(fingerprint, linkService) {
+ this.initialized = true;
+ this.reInitialized = false;
+ this.allowHashChange = true;
+ this.historyUnlocked = true;
+ this.isViewerInPresentationMode = false;
+
+ this.previousHash = window.location.hash.substring(1);
+ this.currentBookmark = '';
+ this.currentPage = 0;
+ this.updatePreviousBookmark = false;
+ this.previousBookmark = '';
+ this.previousPage = 0;
+ this.nextHashParam = '';
+
+ this.fingerprint = fingerprint;
+ this.linkService = linkService;
+ this.currentUid = this.uid = 0;
+ this.current = {};
+
+ var state = window.history.state;
+ if (this._isStateObjectDefined(state)) {
+ // This corresponds to navigating back to the document
+ // from another page in the browser history.
+ if (state.target.dest) {
+ this.initialDestination = state.target.dest;
+ } else {
+ linkService.setHash(state.target.hash);
+ }
+ this.currentUid = state.uid;
+ this.uid = state.uid + 1;
+ this.current = state.target;
+ } else {
+ // This corresponds to the loading of a new document.
+ if (state && state.fingerprint &&
+ this.fingerprint !== state.fingerprint) {
+ // Reinitialize the browsing history when a new document
+ // is opened in the web viewer.
+ this.reInitialized = true;
+ }
+ this._pushOrReplaceState({ fingerprint: this.fingerprint }, true);
+ }
+
+ var self = this;
+ window.addEventListener('popstate', function pdfHistoryPopstate(evt) {
+ evt.preventDefault();
+ evt.stopPropagation();
+
+ if (!self.historyUnlocked) {
+ return;
+ }
+ if (evt.state) {
+ // Move back/forward in the history.
+ self._goTo(evt.state);
+ } else {
+ // Handle the user modifying the hash of a loaded document.
+ self.previousHash = window.location.hash.substring(1);
+
+ // If the history is empty when the hash changes,
+ // update the previous entry in the browser history.
+ if (self.uid === 0) {
+ var previousParams = (self.previousHash && self.currentBookmark &&
+ self.previousHash !== self.currentBookmark) ?
+ { hash: self.currentBookmark, page: self.currentPage } :
+ { page: 1 };
+ self.historyUnlocked = false;
+ self.allowHashChange = false;
+ window.history.back();
+ self._pushToHistory(previousParams, false, true);
+ window.history.forward();
+ self.historyUnlocked = true;
+ }
+ self._pushToHistory({ hash: self.previousHash }, false, true);
+ self._updatePreviousBookmark();
+ }
+ }, false);
+
+ function pdfHistoryBeforeUnload() {
+ var previousParams = self._getPreviousParams(null, true);
+ if (previousParams) {
+ var replacePrevious = (!self.current.dest &&
+ self.current.hash !== self.previousHash);
+ self._pushToHistory(previousParams, false, replacePrevious);
+ self._updatePreviousBookmark();
+ }
+ // Remove the event listener when navigating away from the document,
+ // since 'beforeunload' prevents Firefox from caching the document.
+ window.removeEventListener('beforeunload', pdfHistoryBeforeUnload, false);
+ }
+ window.addEventListener('beforeunload', pdfHistoryBeforeUnload, false);
+
+ window.addEventListener('pageshow', function pdfHistoryPageShow(evt) {
+ // If the entire viewer (including the PDF file) is cached in the browser,
+ // we need to reattach the 'beforeunload' event listener since
+ // the 'DOMContentLoaded' event is not fired on 'pageshow'.
+ window.addEventListener('beforeunload', pdfHistoryBeforeUnload, false);
+ }, false);
+
+ window.addEventListener('presentationmodechanged', function(e) {
+ self.isViewerInPresentationMode = !!e.detail.active;
+ });
+ },
+
+ _isStateObjectDefined: function pdfHistory_isStateObjectDefined(state) {
+ return (state && state.uid >= 0 &&
+ state.fingerprint && this.fingerprint === state.fingerprint &&
+ state.target && state.target.hash) ? true : false;
+ },
+
+ _pushOrReplaceState: function pdfHistory_pushOrReplaceState(stateObj,
+ replace) {
+ if (replace) {
+ window.history.replaceState(stateObj, '', document.URL);
+ } else {
+ window.history.pushState(stateObj, '', document.URL);
+ }
+ },
+
+ get isHashChangeUnlocked() {
+ if (!this.initialized) {
+ return true;
+ }
+ // If the current hash changes when moving back/forward in the history,
+ // this will trigger a 'popstate' event *as well* as a 'hashchange' event.
+ // Since the hash generally won't correspond to the exact the position
+ // stored in the history's state object, triggering the 'hashchange' event
+ // can thus corrupt the browser history.
+ //
+ // When the hash changes during a 'popstate' event, we *only* prevent the
+ // first 'hashchange' event and immediately reset allowHashChange.
+ // If it is not reset, the user would not be able to change the hash.
+
+ var temp = this.allowHashChange;
+ this.allowHashChange = true;
+ return temp;
+ },
+
+ _updatePreviousBookmark: function pdfHistory_updatePreviousBookmark() {
+ if (this.updatePreviousBookmark &&
+ this.currentBookmark && this.currentPage) {
+ this.previousBookmark = this.currentBookmark;
+ this.previousPage = this.currentPage;
+ this.updatePreviousBookmark = false;
+ }
+ },
+
+ updateCurrentBookmark: function pdfHistoryUpdateCurrentBookmark(bookmark,
+ pageNum) {
+ if (this.initialized) {
+ this.currentBookmark = bookmark.substring(1);
+ this.currentPage = pageNum | 0;
+ this._updatePreviousBookmark();
+ }
+ },
+
+ updateNextHashParam: function pdfHistoryUpdateNextHashParam(param) {
+ if (this.initialized) {
+ this.nextHashParam = param;
+ }
+ },
+
+ push: function pdfHistoryPush(params, isInitialBookmark) {
+ if (!(this.initialized && this.historyUnlocked)) {
+ return;
+ }
+ if (params.dest && !params.hash) {
+ params.hash = (this.current.hash && this.current.dest &&
+ this.current.dest === params.dest) ?
+ this.current.hash :
+ this.linkService.getDestinationHash(params.dest).split('#')[1];
+ }
+ if (params.page) {
+ params.page |= 0;
+ }
+ if (isInitialBookmark) {
+ var target = window.history.state.target;
+ if (!target) {
+ // Invoked when the user specifies an initial bookmark,
+ // thus setting initialBookmark, when the document is loaded.
+ this._pushToHistory(params, false);
+ this.previousHash = window.location.hash.substring(1);
+ }
+ this.updatePreviousBookmark = this.nextHashParam ? false : true;
+ if (target) {
+ // If the current document is reloaded,
+ // avoid creating duplicate entries in the history.
+ this._updatePreviousBookmark();
+ }
+ return;
+ }
+ if (this.nextHashParam) {
+ if (this.nextHashParam === params.hash) {
+ this.nextHashParam = null;
+ this.updatePreviousBookmark = true;
+ return;
+ } else {
+ this.nextHashParam = null;
+ }
+ }
+
+ if (params.hash) {
+ if (this.current.hash) {
+ if (this.current.hash !== params.hash) {
+ this._pushToHistory(params, true);
+ } else {
+ if (!this.current.page && params.page) {
+ this._pushToHistory(params, false, true);
+ }
+ this.updatePreviousBookmark = true;
+ }
+ } else {
+ this._pushToHistory(params, true);
+ }
+ } else if (this.current.page && params.page &&
+ this.current.page !== params.page) {
+ this._pushToHistory(params, true);
+ }
+ },
+
+ _getPreviousParams: function pdfHistory_getPreviousParams(onlyCheckPage,
+ beforeUnload) {
+ if (!(this.currentBookmark && this.currentPage)) {
+ return null;
+ } else if (this.updatePreviousBookmark) {
+ this.updatePreviousBookmark = false;
+ }
+ if (this.uid > 0 && !(this.previousBookmark && this.previousPage)) {
+ // Prevent the history from getting stuck in the current state,
+ // effectively preventing the user from going back/forward in the history.
+ //
+ // This happens if the current position in the document didn't change when
+ // the history was previously updated. The reasons for this are either:
+ // 1. The current zoom value is such that the document does not need to,
+ // or cannot, be scrolled to display the destination.
+ // 2. The previous destination is broken, and doesn't actally point to a
+ // position within the document.
+ // (This is either due to a bad PDF generator, or the user making a
+ // mistake when entering a destination in the hash parameters.)
+ return null;
+ }
+ if ((!this.current.dest && !onlyCheckPage) || beforeUnload) {
+ if (this.previousBookmark === this.currentBookmark) {
+ return null;
+ }
+ } else if (this.current.page || onlyCheckPage) {
+ if (this.previousPage === this.currentPage) {
+ return null;
+ }
+ } else {
+ return null;
+ }
+ var params = { hash: this.currentBookmark, page: this.currentPage };
+ if (this.isViewerInPresentationMode) {
+ params.hash = null;
+ }
+ return params;
+ },
+
+ _stateObj: function pdfHistory_stateObj(params) {
+ return { fingerprint: this.fingerprint, uid: this.uid, target: params };
+ },
+
+ _pushToHistory: function pdfHistory_pushToHistory(params,
+ addPrevious, overwrite) {
+ if (!this.initialized) {
+ return;
+ }
+ if (!params.hash && params.page) {
+ params.hash = ('page=' + params.page);
+ }
+ if (addPrevious && !overwrite) {
+ var previousParams = this._getPreviousParams();
+ if (previousParams) {
+ var replacePrevious = (!this.current.dest &&
+ this.current.hash !== this.previousHash);
+ this._pushToHistory(previousParams, false, replacePrevious);
+ }
+ }
+ this._pushOrReplaceState(this._stateObj(params),
+ (overwrite || this.uid === 0));
+ this.currentUid = this.uid++;
+ this.current = params;
+ this.updatePreviousBookmark = true;
+ },
+
+ _goTo: function pdfHistory_goTo(state) {
+ if (!(this.initialized && this.historyUnlocked &&
+ this._isStateObjectDefined(state))) {
+ return;
+ }
+ if (!this.reInitialized && state.uid < this.currentUid) {
+ var previousParams = this._getPreviousParams(true);
+ if (previousParams) {
+ this._pushToHistory(this.current, false);
+ this._pushToHistory(previousParams, false);
+ this.currentUid = state.uid;
+ window.history.back();
+ return;
+ }
+ }
+ this.historyUnlocked = false;
+
+ if (state.target.dest) {
+ this.linkService.navigateTo(state.target.dest);
+ } else {
+ this.linkService.setHash(state.target.hash);
+ }
+ this.currentUid = state.uid;
+ if (state.uid > this.uid) {
+ this.uid = state.uid;
+ }
+ this.current = state.target;
+ this.updatePreviousBookmark = true;
+
+ var currentHash = window.location.hash.substring(1);
+ if (this.previousHash !== currentHash) {
+ this.allowHashChange = false;
+ }
+ this.previousHash = currentHash;
+
+ this.historyUnlocked = true;
+ },
+
+ back: function pdfHistoryBack() {
+ this.go(-1);
+ },
+
+ forward: function pdfHistoryForward() {
+ this.go(1);
+ },
+
+ go: function pdfHistoryGo(direction) {
+ if (this.initialized && this.historyUnlocked) {
+ var state = window.history.state;
+ if (direction === -1 && state && state.uid > 0) {
+ window.history.back();
+ } else if (direction === 1 && state && state.uid < (this.uid - 1)) {
+ window.history.forward();
+ }
+ }
+ }
+};
+
+
+var SecondaryToolbar = {
+ opened: false,
+ previousContainerHeight: null,
+ newContainerHeight: null,
+
+ initialize: function secondaryToolbarInitialize(options) {
+ this.toolbar = options.toolbar;
+ this.buttonContainer = this.toolbar.firstElementChild;
+
+ // Define the toolbar buttons.
+ this.toggleButton = options.toggleButton;
+ this.presentationModeButton = options.presentationModeButton;
+ this.openFile = options.openFile;
+ this.print = options.print;
+ this.download = options.download;
+ this.viewBookmark = options.viewBookmark;
+ this.firstPage = options.firstPage;
+ this.lastPage = options.lastPage;
+ this.pageRotateCw = options.pageRotateCw;
+ this.pageRotateCcw = options.pageRotateCcw;
+ this.documentPropertiesButton = options.documentPropertiesButton;
+
+ // Attach the event listeners.
+ var elements = [
+ // Button to toggle the visibility of the secondary toolbar:
+ { element: this.toggleButton, handler: this.toggle },
+ // All items within the secondary toolbar
+ // (except for toggleHandTool, hand_tool.js is responsible for it):
+ { element: this.presentationModeButton,
+ handler: this.presentationModeClick },
+ { element: this.openFile, handler: this.openFileClick },
+ { element: this.print, handler: this.printClick },
+ { element: this.download, handler: this.downloadClick },
+ { element: this.viewBookmark, handler: this.viewBookmarkClick },
+ { element: this.firstPage, handler: this.firstPageClick },
+ { element: this.lastPage, handler: this.lastPageClick },
+ { element: this.pageRotateCw, handler: this.pageRotateCwClick },
+ { element: this.pageRotateCcw, handler: this.pageRotateCcwClick },
+ { element: this.documentPropertiesButton,
+ handler: this.documentPropertiesClick }
+ ];
+
+ for (var item in elements) {
+ var element = elements[item].element;
+ if (element) {
+ element.addEventListener('click', elements[item].handler.bind(this));
+ }
+ }
+ },
+
+ // Event handling functions.
+ presentationModeClick: function secondaryToolbarPresentationModeClick(evt) {
+ PDFViewerApplication.requestPresentationMode();
+ this.close();
+ },
+
+ openFileClick: function secondaryToolbarOpenFileClick(evt) {
+ document.getElementById('fileInput').click();
+ this.close();
+ },
+
+ printClick: function secondaryToolbarPrintClick(evt) {
+ window.print();
+ this.close();
+ },
+
+ downloadClick: function secondaryToolbarDownloadClick(evt) {
+ PDFViewerApplication.download();
+ this.close();
+ },
+
+ viewBookmarkClick: function secondaryToolbarViewBookmarkClick(evt) {
+ this.close();
+ },
+
+ firstPageClick: function secondaryToolbarFirstPageClick(evt) {
+ PDFViewerApplication.page = 1;
+ this.close();
+ },
+
+ lastPageClick: function secondaryToolbarLastPageClick(evt) {
+ if (PDFViewerApplication.pdfDocument) {
+ PDFViewerApplication.page = PDFViewerApplication.pagesCount;
+ }
+ this.close();
+ },
+
+ pageRotateCwClick: function secondaryToolbarPageRotateCwClick(evt) {
+ PDFViewerApplication.rotatePages(90);
+ },
+
+ pageRotateCcwClick: function secondaryToolbarPageRotateCcwClick(evt) {
+ PDFViewerApplication.rotatePages(-90);
+ },
+
+ documentPropertiesClick: function secondaryToolbarDocumentPropsClick(evt) {
+ PDFViewerApplication.pdfDocumentProperties.open();
+ this.close();
+ },
+
+ // Misc. functions for interacting with the toolbar.
+ setMaxHeight: function secondaryToolbarSetMaxHeight(container) {
+ if (!container || !this.buttonContainer) {
+ return;
+ }
+ this.newContainerHeight = container.clientHeight;
+ if (this.previousContainerHeight === this.newContainerHeight) {
+ return;
+ }
+ this.buttonContainer.setAttribute('style',
+ 'max-height: ' + (this.newContainerHeight - SCROLLBAR_PADDING) + 'px;');
+ this.previousContainerHeight = this.newContainerHeight;
+ },
+
+ open: function secondaryToolbarOpen() {
+ if (this.opened) {
+ return;
+ }
+ this.opened = true;
+ this.toggleButton.classList.add('toggled');
+ this.toolbar.classList.remove('hidden');
+ },
+
+ close: function secondaryToolbarClose(target) {
+ if (!this.opened) {
+ return;
+ } else if (target && !this.toolbar.contains(target)) {
+ return;
+ }
+ this.opened = false;
+ this.toolbar.classList.add('hidden');
+ this.toggleButton.classList.remove('toggled');
+ },
+
+ toggle: function secondaryToolbarToggle() {
+ if (this.opened) {
+ this.close();
+ } else {
+ this.open();
+ }
+ }
+};
+
+
+var DELAY_BEFORE_RESETTING_SWITCH_IN_PROGRESS = 1500; // in ms
+var DELAY_BEFORE_HIDING_CONTROLS = 3000; // in ms
+var ACTIVE_SELECTOR = 'pdfPresentationMode';
+var CONTROLS_SELECTOR = 'pdfPresentationModeControls';
+
+/**
+ * @typedef {Object} PDFPresentationModeOptions
+ * @property {HTMLDivElement} container - The container for the viewer element.
+ * @property {HTMLDivElement} viewer - (optional) The viewer element.
+ * @property {PDFThumbnailViewer} pdfThumbnailViewer - (optional) The thumbnail
+ * viewer.
+ * @property {Array} contextMenuItems - (optional) The menuitems that are added
+ * to the context menu in Presentation Mode.
+ */
+
+/**
+ * @class
+ */
+var PDFPresentationMode = (function PDFPresentationModeClosure() {
+ /**
+ * @constructs PDFPresentationMode
+ * @param {PDFPresentationModeOptions} options
+ */
+ function PDFPresentationMode(options) {
+ this.container = options.container;
+ this.viewer = options.viewer || options.container.firstElementChild;
+ this.pdfThumbnailViewer = options.pdfThumbnailViewer || null;
+ var contextMenuItems = options.contextMenuItems || null;
+
+ this.active = false;
+ this.args = null;
+ this.contextMenuOpen = false;
+ this.mouseScrollTimeStamp = 0;
+ this.mouseScrollDelta = 0;
+
+ if (contextMenuItems) {
+ for (var i = 0, ii = contextMenuItems.length; i < ii; i++) {
+ var item = contextMenuItems[i];
+ item.element.addEventListener('click', function (handler) {
+ this.contextMenuOpen = false;
+ handler();
+ }.bind(this, item.handler));
+ }
+ }
+ }
+
+ PDFPresentationMode.prototype = {
+ /**
+ * Request the browser to enter fullscreen mode.
+ * @returns {boolean} Indicating if the request was successful.
+ */
+ request: function PDFPresentationMode_request() {
+ if (this.switchInProgress || this.active ||
+ !this.viewer.hasChildNodes()) {
+ return false;
+ }
+ this._addFullscreenChangeListeners();
+ this._setSwitchInProgress();
+ this._notifyStateChange();
+
+ if (this.container.requestFullscreen) {
+ this.container.requestFullscreen();
+ } else if (this.container.mozRequestFullScreen) {
+ this.container.mozRequestFullScreen();
+ } else if (this.container.webkitRequestFullscreen) {
+ this.container.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT);
+ } else if (this.container.msRequestFullscreen) {
+ this.container.msRequestFullscreen();
+ } else {
+ return false;
+ }
+
+ this.args = {
+ page: PDFViewerApplication.page,
+ previousScale: PDFViewerApplication.currentScaleValue
+ };
+
+ return true;
+ },
+
+ /**
+ * Switches page when the user scrolls (using a scroll wheel or a touchpad)
+ * with large enough motion, to prevent accidental page switches.
+ * @param {number} delta - The delta value from the mouse event.
+ */
+ mouseScroll: function PDFPresentationMode_mouseScroll(delta) {
+ if (!this.active) {
+ return;
+ }
+ var MOUSE_SCROLL_COOLDOWN_TIME = 50;
+ var PAGE_SWITCH_THRESHOLD = 120;
+ var PageSwitchDirection = {
+ UP: -1,
+ DOWN: 1
+ };
+
+ var currentTime = (new Date()).getTime();
+ var storedTime = this.mouseScrollTimeStamp;
+
+ // If we've already switched page, avoid accidentally switching again.
+ if (currentTime > storedTime &&
+ currentTime - storedTime < MOUSE_SCROLL_COOLDOWN_TIME) {
+ return;
+ }
+ // If the scroll direction changed, reset the accumulated scroll delta.
+ if ((this.mouseScrollDelta > 0 && delta < 0) ||
+ (this.mouseScrollDelta < 0 && delta > 0)) {
+ this._resetMouseScrollState();
+ }
+ this.mouseScrollDelta += delta;
+
+ if (Math.abs(this.mouseScrollDelta) >= PAGE_SWITCH_THRESHOLD) {
+ var pageSwitchDirection = (this.mouseScrollDelta > 0) ?
+ PageSwitchDirection.UP : PageSwitchDirection.DOWN;
+ var page = PDFViewerApplication.page;
+ this._resetMouseScrollState();
+
+ // If we're at the first/last page, we don't need to do anything.
+ if ((page === 1 && pageSwitchDirection === PageSwitchDirection.UP) ||
+ (page === PDFViewerApplication.pagesCount &&
+ pageSwitchDirection === PageSwitchDirection.DOWN)) {
+ return;
+ }
+ PDFViewerApplication.page = (page + pageSwitchDirection);
+ this.mouseScrollTimeStamp = currentTime;
+ }
+ },
+
+ get isFullscreen() {
+ return !!(document.fullscreenElement ||
+ document.mozFullScreen ||
+ document.webkitIsFullScreen ||
+ document.msFullscreenElement);
+ },
+
+ /**
+ * @private
+ */
+ _notifyStateChange: function PDFPresentationMode_notifyStateChange() {
+ var event = document.createEvent('CustomEvent');
+ event.initCustomEvent('presentationmodechanged', true, true, {
+ active: this.active,
+ switchInProgress: !!this.switchInProgress
+ });
+ window.dispatchEvent(event);
+ },
+
+ /**
+ * Used to initialize a timeout when requesting Presentation Mode,
+ * i.e. when the browser is requested to enter fullscreen mode.
+ * This timeout is used to prevent the current page from being scrolled
+ * partially, or completely, out of view when entering Presentation Mode.
+ * NOTE: This issue seems limited to certain zoom levels (e.g. page-width).
+ * @private
+ */
+ _setSwitchInProgress: function PDFPresentationMode_setSwitchInProgress() {
+ if (this.switchInProgress) {
+ clearTimeout(this.switchInProgress);
+ }
+ this.switchInProgress = setTimeout(function switchInProgressTimeout() {
+ this._removeFullscreenChangeListeners();
+ delete this.switchInProgress;
+ this._notifyStateChange();
+ }.bind(this), DELAY_BEFORE_RESETTING_SWITCH_IN_PROGRESS);
+ },
+
+ /**
+ * @private
+ */
+ _resetSwitchInProgress:
+ function PDFPresentationMode_resetSwitchInProgress() {
+ if (this.switchInProgress) {
+ clearTimeout(this.switchInProgress);
+ delete this.switchInProgress;
+ }
+ },
+
+ /**
+ * @private
+ */
+ _enter: function PDFPresentationMode_enter() {
+ this.active = true;
+ this._resetSwitchInProgress();
+ this._notifyStateChange();
+ this.container.classList.add(ACTIVE_SELECTOR);
+
+ // Ensure that the correct page is scrolled into view when entering
+ // Presentation Mode, by waiting until fullscreen mode in enabled.
+ setTimeout(function enterPresentationModeTimeout() {
+ PDFViewerApplication.page = this.args.page;
+ PDFViewerApplication.setScale('page-fit', true);
+ }.bind(this), 0);
+
+ this._addWindowListeners();
+ this._showControls();
+ this.contextMenuOpen = false;
+ this.container.setAttribute('contextmenu', 'viewerContextMenu');
+
+ // Text selection is disabled in Presentation Mode, thus it's not possible
+ // for the user to deselect text that is selected (e.g. with "Select all")
+ // when entering Presentation Mode, hence we remove any active selection.
+ window.getSelection().removeAllRanges();
+ },
+
+ /**
+ * @private
+ */
+ _exit: function PDFPresentationMode_exit() {
+ var page = PDFViewerApplication.page;
+ this.container.classList.remove(ACTIVE_SELECTOR);
+
+ // Ensure that the correct page is scrolled into view when exiting
+ // Presentation Mode, by waiting until fullscreen mode is disabled.
+ setTimeout(function exitPresentationModeTimeout() {
+ this.active = false;
+ this._removeFullscreenChangeListeners();
+ this._notifyStateChange();
+
+ PDFViewerApplication.setScale(this.args.previousScale, true);
+ PDFViewerApplication.page = page;
+ this.args = null;
+ }.bind(this), 0);
+
+ this._removeWindowListeners();
+ this._hideControls();
+ this._resetMouseScrollState();
+ this.container.removeAttribute('contextmenu');
+ this.contextMenuOpen = false;
+
+ if (this.pdfThumbnailViewer) {
+ this.pdfThumbnailViewer.ensureThumbnailVisible(page);
+ }
+ },
+
+ /**
+ * @private
+ */
+ _mouseDown: function PDFPresentationMode_mouseDown(evt) {
+ if (this.contextMenuOpen) {
+ this.contextMenuOpen = false;
+ evt.preventDefault();
+ return;
+ }
+ if (evt.button === 0) {
+ // Enable clicking of links in presentation mode. Please note:
+ // Only links pointing to destinations in the current PDF document work.
+ var isInternalLink = (evt.target.href &&
+ evt.target.classList.contains('internalLink'));
+ if (!isInternalLink) {
+ // Unless an internal link was clicked, advance one page.
+ evt.preventDefault();
+ PDFViewerApplication.page += (evt.shiftKey ? -1 : 1);
+ }
+ }
+ },
+
+ /**
+ * @private
+ */
+ _contextMenu: function PDFPresentationMode_contextMenu() {
+ this.contextMenuOpen = true;
+ },
+
+ /**
+ * @private
+ */
+ _showControls: function PDFPresentationMode_showControls() {
+ if (this.controlsTimeout) {
+ clearTimeout(this.controlsTimeout);
+ } else {
+ this.container.classList.add(CONTROLS_SELECTOR);
+ }
+ this.controlsTimeout = setTimeout(function showControlsTimeout() {
+ this.container.classList.remove(CONTROLS_SELECTOR);
+ delete this.controlsTimeout;
+ }.bind(this), DELAY_BEFORE_HIDING_CONTROLS);
+ },
+
+ /**
+ * @private
+ */
+ _hideControls: function PDFPresentationMode_hideControls() {
+ if (!this.controlsTimeout) {
+ return;
+ }
+ clearTimeout(this.controlsTimeout);
+ this.container.classList.remove(CONTROLS_SELECTOR);
+ delete this.controlsTimeout;
+ },
+
+ /**
+ * Resets the properties used for tracking mouse scrolling events.
+ * @private
+ */
+ _resetMouseScrollState:
+ function PDFPresentationMode_resetMouseScrollState() {
+ this.mouseScrollTimeStamp = 0;
+ this.mouseScrollDelta = 0;
+ },
+
+ /**
+ * @private
+ */
+ _addWindowListeners: function PDFPresentationMode_addWindowListeners() {
+ this.showControlsBind = this._showControls.bind(this);
+ this.mouseDownBind = this._mouseDown.bind(this);
+ this.resetMouseScrollStateBind = this._resetMouseScrollState.bind(this);
+ this.contextMenuBind = this._contextMenu.bind(this);
+
+ window.addEventListener('mousemove', this.showControlsBind);
+ window.addEventListener('mousedown', this.mouseDownBind);
+ window.addEventListener('keydown', this.resetMouseScrollStateBind);
+ window.addEventListener('contextmenu', this.contextMenuBind);
+ },
+
+ /**
+ * @private
+ */
+ _removeWindowListeners:
+ function PDFPresentationMode_removeWindowListeners() {
+ window.removeEventListener('mousemove', this.showControlsBind);
+ window.removeEventListener('mousedown', this.mouseDownBind);
+ window.removeEventListener('keydown', this.resetMouseScrollStateBind);
+ window.removeEventListener('contextmenu', this.contextMenuBind);
+
+ delete this.showControlsBind;
+ delete this.mouseDownBind;
+ delete this.resetMouseScrollStateBind;
+ delete this.contextMenuBind;
+ },
+
+ /**
+ * @private
+ */
+ _fullscreenChange: function PDFPresentationMode_fullscreenChange() {
+ if (this.isFullscreen) {
+ this._enter();
+ } else {
+ this._exit();
+ }
+ },
+
+ /**
+ * @private
+ */
+ _addFullscreenChangeListeners:
+ function PDFPresentationMode_addFullscreenChangeListeners() {
+ this.fullscreenChangeBind = this._fullscreenChange.bind(this);
+
+ window.addEventListener('fullscreenchange', this.fullscreenChangeBind);
+ window.addEventListener('mozfullscreenchange', this.fullscreenChangeBind);
+ window.addEventListener('webkitfullscreenchange',
+ this.fullscreenChangeBind);
+ window.addEventListener('MSFullscreenChange', this.fullscreenChangeBind);
+ },
+
+ /**
+ * @private
+ */
+ _removeFullscreenChangeListeners:
+ function PDFPresentationMode_removeFullscreenChangeListeners() {
+ window.removeEventListener('fullscreenchange', this.fullscreenChangeBind);
+ window.removeEventListener('mozfullscreenchange',
+ this.fullscreenChangeBind);
+ window.removeEventListener('webkitfullscreenchange',
+ this.fullscreenChangeBind);
+ window.removeEventListener('MSFullscreenChange',
+ this.fullscreenChangeBind);
+
+ delete this.fullscreenChangeBind;
+ }
+ };
+
+ return PDFPresentationMode;
+})();
+
+
+/* Copyright 2013 Rob Wu <gwnRob@gmail.com>
+ * https://github.com/Rob--W/grab-to-pan.js
+ *
+ * Licensed 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.
+ */
+
+'use strict';
+
+var GrabToPan = (function GrabToPanClosure() {
+ /**
+ * Construct a GrabToPan instance for a given HTML element.
+ * @param options.element {Element}
+ * @param options.ignoreTarget {function} optional. See `ignoreTarget(node)`
+ * @param options.onActiveChanged {function(boolean)} optional. Called
+ * when grab-to-pan is (de)activated. The first argument is a boolean that
+ * shows whether grab-to-pan is activated.
+ */
+ function GrabToPan(options) {
+ this.element = options.element;
+ this.document = options.element.ownerDocument;
+ if (typeof options.ignoreTarget === 'function') {
+ this.ignoreTarget = options.ignoreTarget;
+ }
+ this.onActiveChanged = options.onActiveChanged;
+
+ // Bind the contexts to ensure that `this` always points to
+ // the GrabToPan instance.
+ this.activate = this.activate.bind(this);
+ this.deactivate = this.deactivate.bind(this);
+ this.toggle = this.toggle.bind(this);
+ this._onmousedown = this._onmousedown.bind(this);
+ this._onmousemove = this._onmousemove.bind(this);
+ this._endPan = this._endPan.bind(this);
+
+ // This overlay will be inserted in the document when the mouse moves during
+ // a grab operation, to ensure that the cursor has the desired appearance.
+ var overlay = this.overlay = document.createElement('div');
+ overlay.className = 'grab-to-pan-grabbing';
+ }
+ GrabToPan.prototype = {
+ /**
+ * Class name of element which can be grabbed
+ */
+ CSS_CLASS_GRAB: 'grab-to-pan-grab',
+
+ /**
+ * Bind a mousedown event to the element to enable grab-detection.
+ */
+ activate: function GrabToPan_activate() {
+ if (!this.active) {
+ this.active = true;
+ this.element.addEventListener('mousedown', this._onmousedown, true);
+ this.element.classList.add(this.CSS_CLASS_GRAB);
+ if (this.onActiveChanged) {
+ this.onActiveChanged(true);
+ }
+ }
+ },
+
+ /**
+ * Removes all events. Any pending pan session is immediately stopped.
+ */
+ deactivate: function GrabToPan_deactivate() {
+ if (this.active) {
+ this.active = false;
+ this.element.removeEventListener('mousedown', this._onmousedown, true);
+ this._endPan();
+ this.element.classList.remove(this.CSS_CLASS_GRAB);
+ if (this.onActiveChanged) {
+ this.onActiveChanged(false);
+ }
+ }
+ },
+
+ toggle: function GrabToPan_toggle() {
+ if (this.active) {
+ this.deactivate();
+ } else {
+ this.activate();
+ }
+ },
+
+ /**
+ * Whether to not pan if the target element is clicked.
+ * Override this method to change the default behaviour.
+ *
+ * @param node {Element} The target of the event
+ * @return {boolean} Whether to not react to the click event.
+ */
+ ignoreTarget: function GrabToPan_ignoreTarget(node) {
+ // Use matchesSelector to check whether the clicked element
+ // is (a child of) an input element / link
+ return node[matchesSelector](
+ 'a[href], a[href] *, input, textarea, button, button *, select, option'
+ );
+ },
+
+ /**
+ * @private
+ */
+ _onmousedown: function GrabToPan__onmousedown(event) {
+ if (event.button !== 0 || this.ignoreTarget(event.target)) {
+ return;
+ }
+ if (event.originalTarget) {
+ try {
+ /* jshint expr:true */
+ event.originalTarget.tagName;
+ } catch (e) {
+ // Mozilla-specific: element is a scrollbar (XUL element)
+ return;
+ }
+ }
+
+ this.scrollLeftStart = this.element.scrollLeft;
+ this.scrollTopStart = this.element.scrollTop;
+ this.clientXStart = event.clientX;
+ this.clientYStart = event.clientY;
+ this.document.addEventListener('mousemove', this._onmousemove, true);
+ this.document.addEventListener('mouseup', this._endPan, true);
+ // When a scroll event occurs before a mousemove, assume that the user
+ // dragged a scrollbar (necessary for Opera Presto, Safari and IE)
+ // (not needed for Chrome/Firefox)
+ this.element.addEventListener('scroll', this._endPan, true);
+ event.preventDefault();
+ event.stopPropagation();
+ this.document.documentElement.classList.add(this.CSS_CLASS_GRABBING);
+
+ var focusedElement = document.activeElement;
+ if (focusedElement && !focusedElement.contains(event.target)) {
+ focusedElement.blur();
+ }
+ },
+
+ /**
+ * @private
+ */
+ _onmousemove: function GrabToPan__onmousemove(event) {
+ this.element.removeEventListener('scroll', this._endPan, true);
+ if (isLeftMouseReleased(event)) {
+ this._endPan();
+ return;
+ }
+ var xDiff = event.clientX - this.clientXStart;
+ var yDiff = event.clientY - this.clientYStart;
+ this.element.scrollTop = this.scrollTopStart - yDiff;
+ this.element.scrollLeft = this.scrollLeftStart - xDiff;
+ if (!this.overlay.parentNode) {
+ document.body.appendChild(this.overlay);
+ }
+ },
+
+ /**
+ * @private
+ */
+ _endPan: function GrabToPan__endPan() {
+ this.element.removeEventListener('scroll', this._endPan, true);
+ this.document.removeEventListener('mousemove', this._onmousemove, true);
+ this.document.removeEventListener('mouseup', this._endPan, true);
+ if (this.overlay.parentNode) {
+ this.overlay.parentNode.removeChild(this.overlay);
+ }
+ }
+ };
+
+ // Get the correct (vendor-prefixed) name of the matches method.
+ var matchesSelector;
+ ['webkitM', 'mozM', 'msM', 'oM', 'm'].some(function(prefix) {
+ var name = prefix + 'atches';
+ if (name in document.documentElement) {
+ matchesSelector = name;
+ }
+ name += 'Selector';
+ if (name in document.documentElement) {
+ matchesSelector = name;
+ }
+ return matchesSelector; // If found, then truthy, and [].some() ends.
+ });
+
+ // Browser sniffing because it's impossible to feature-detect
+ // whether event.which for onmousemove is reliable
+ var isNotIEorIsIE10plus = !document.documentMode || document.documentMode > 9;
+ var chrome = window.chrome;
+ var isChrome15OrOpera15plus = chrome && (chrome.webstore || chrome.app);
+ // ^ Chrome 15+ ^ Opera 15+
+ var isSafari6plus = /Apple/.test(navigator.vendor) &&
+ /Version\/([6-9]\d*|[1-5]\d+)/.test(navigator.userAgent);
+
+ /**
+ * Whether the left mouse is not pressed.
+ * @param event {MouseEvent}
+ * @return {boolean} True if the left mouse button is not pressed.
+ * False if unsure or if the left mouse button is pressed.
+ */
+ function isLeftMouseReleased(event) {
+ if ('buttons' in event && isNotIEorIsIE10plus) {
+ // http://www.w3.org/TR/DOM-Level-3-Events/#events-MouseEvent-buttons
+ // Firefox 15+
+ // Internet Explorer 10+
+ return !(event.buttons | 1);
+ }
+ if (isChrome15OrOpera15plus || isSafari6plus) {
+ // Chrome 14+
+ // Opera 15+
+ // Safari 6.0+
+ return event.which === 0;
+ }
+ }
+
+ return GrabToPan;
+})();
+
+var HandTool = {
+ initialize: function handToolInitialize(options) {
+ var toggleHandTool = options.toggleHandTool;
+ this.handTool = new GrabToPan({
+ element: options.container,
+ onActiveChanged: function(isActive) {
+ if (!toggleHandTool) {
+ return;
+ }
+ if (isActive) {
+ toggleHandTool.title =
+ mozL10n.get('hand_tool_disable.title', null, 'Disable hand tool');
+ toggleHandTool.firstElementChild.textContent =
+ mozL10n.get('hand_tool_disable_label', null, 'Disable hand tool');
+ } else {
+ toggleHandTool.title =
+ mozL10n.get('hand_tool_enable.title', null, 'Enable hand tool');
+ toggleHandTool.firstElementChild.textContent =
+ mozL10n.get('hand_tool_enable_label', null, 'Enable hand tool');
+ }
+ }
+ });
+ if (toggleHandTool) {
+ toggleHandTool.addEventListener('click', this.toggle.bind(this), false);
+
+ window.addEventListener('localized', function (evt) {
+ Preferences.get('enableHandToolOnLoad').then(function resolved(value) {
+ if (value) {
+ this.handTool.activate();
+ }
+ }.bind(this), function rejected(reason) {});
+ }.bind(this));
+
+ window.addEventListener('presentationmodechanged', function (evt) {
+ if (evt.detail.switchInProgress) {
+ return;
+ }
+ if (evt.detail.active) {
+ this.enterPresentationMode();
+ } else {
+ this.exitPresentationMode();
+ }
+ }.bind(this));
+ }
+ },
+
+ toggle: function handToolToggle() {
+ this.handTool.toggle();
+ SecondaryToolbar.close();
+ },
+
+ enterPresentationMode: function handToolEnterPresentationMode() {
+ if (this.handTool.active) {
+ this.wasActive = true;
+ this.handTool.deactivate();
+ }
+ },
+
+ exitPresentationMode: function handToolExitPresentationMode() {
+ if (this.wasActive) {
+ this.wasActive = null;
+ this.handTool.activate();
+ }
+ }
+};
+
+
+var OverlayManager = {
+ overlays: {},
+ active: null,
+
+ /**
+ * @param {string} name The name of the overlay that is registered. This must
+ * be equal to the ID of the overlay's DOM element.
+ * @param {function} callerCloseMethod (optional) The method that, if present,
+ * will call OverlayManager.close from the Object
+ * registering the overlay. Access to this method is
+ * necessary in order to run cleanup code when e.g.
+ * the overlay is force closed. The default is null.
+ * @param {boolean} canForceClose (optional) Indicates if opening the overlay
+ * will close an active overlay. The default is false.
+ * @returns {Promise} A promise that is resolved when the overlay has been
+ * registered.
+ */
+ register: function overlayManagerRegister(name,
+ callerCloseMethod, canForceClose) {
+ return new Promise(function (resolve) {
+ var element, container;
+ if (!name || !(element = document.getElementById(name)) ||
+ !(container = element.parentNode)) {
+ throw new Error('Not enough parameters.');
+ } else if (this.overlays[name]) {
+ throw new Error('The overlay is already registered.');
+ }
+ this.overlays[name] = { element: element,
+ container: container,
+ callerCloseMethod: (callerCloseMethod || null),
+ canForceClose: (canForceClose || false) };
+ resolve();
+ }.bind(this));
+ },
+
+ /**
+ * @param {string} name The name of the overlay that is unregistered.
+ * @returns {Promise} A promise that is resolved when the overlay has been
+ * unregistered.
+ */
+ unregister: function overlayManagerUnregister(name) {
+ return new Promise(function (resolve) {
+ if (!this.overlays[name]) {
+ throw new Error('The overlay does not exist.');
+ } else if (this.active === name) {
+ throw new Error('The overlay cannot be removed while it is active.');
+ }
+ delete this.overlays[name];
+
+ resolve();
+ }.bind(this));
+ },
+
+ /**
+ * @param {string} name The name of the overlay that should be opened.
+ * @returns {Promise} A promise that is resolved when the overlay has been
+ * opened.
+ */
+ open: function overlayManagerOpen(name) {
+ return new Promise(function (resolve) {
+ if (!this.overlays[name]) {
+ throw new Error('The overlay does not exist.');
+ } else if (this.active) {
+ if (this.overlays[name].canForceClose) {
+ this._closeThroughCaller();
+ } else if (this.active === name) {
+ throw new Error('The overlay is already active.');
+ } else {
+ throw new Error('Another overlay is currently active.');
+ }
+ }
+ this.active = name;
+ this.overlays[this.active].element.classList.remove('hidden');
+ this.overlays[this.active].container.classList.remove('hidden');
+
+ window.addEventListener('keydown', this._keyDown);
+ resolve();
+ }.bind(this));
+ },
+
+ /**
+ * @param {string} name The name of the overlay that should be closed.
+ * @returns {Promise} A promise that is resolved when the overlay has been
+ * closed.
+ */
+ close: function overlayManagerClose(name) {
+ return new Promise(function (resolve) {
+ if (!this.overlays[name]) {
+ throw new Error('The overlay does not exist.');
+ } else if (!this.active) {
+ throw new Error('The overlay is currently not active.');
+ } else if (this.active !== name) {
+ throw new Error('Another overlay is currently active.');
+ }
+ this.overlays[this.active].container.classList.add('hidden');
+ this.overlays[this.active].element.classList.add('hidden');
+ this.active = null;
+
+ window.removeEventListener('keydown', this._keyDown);
+ resolve();
+ }.bind(this));
+ },
+
+ /**
+ * @private
+ */
+ _keyDown: function overlayManager_keyDown(evt) {
+ var self = OverlayManager;
+ if (self.active && evt.keyCode === 27) { // Esc key.
+ self._closeThroughCaller();
+ evt.preventDefault();
+ }
+ },
+
+ /**
+ * @private
+ */
+ _closeThroughCaller: function overlayManager_closeThroughCaller() {
+ if (this.overlays[this.active].callerCloseMethod) {
+ this.overlays[this.active].callerCloseMethod();
+ }
+ if (this.active) {
+ this.close(this.active);
+ }
+ }
+};
+
+
+var PasswordPrompt = {
+ overlayName: null,
+ updatePassword: null,
+ reason: null,
+ passwordField: null,
+ passwordText: null,
+ passwordSubmit: null,
+ passwordCancel: null,
+
+ initialize: function secondaryToolbarInitialize(options) {
+ this.overlayName = options.overlayName;
+ this.passwordField = options.passwordField;
+ this.passwordText = options.passwordText;
+ this.passwordSubmit = options.passwordSubmit;
+ this.passwordCancel = options.passwordCancel;
+
+ // Attach the event listeners.
+ this.passwordSubmit.addEventListener('click',
+ this.verifyPassword.bind(this));
+
+ this.passwordCancel.addEventListener('click', this.close.bind(this));
+
+ this.passwordField.addEventListener('keydown', function (e) {
+ if (e.keyCode === 13) { // Enter key
+ this.verifyPassword();
+ }
+ }.bind(this));
+
+ OverlayManager.register(this.overlayName, this.close.bind(this), true);
+ },
+
+ open: function passwordPromptOpen() {
+ OverlayManager.open(this.overlayName).then(function () {
+ this.passwordField.focus();
+
+ var promptString = mozL10n.get('password_label', null,
+ 'Enter the password to open this PDF file.');
+
+ if (this.reason === PDFJS.PasswordResponses.INCORRECT_PASSWORD) {
+ promptString = mozL10n.get('password_invalid', null,
+ 'Invalid password. Please try again.');
+ }
+
+ this.passwordText.textContent = promptString;
+ }.bind(this));
+ },
+
+ close: function passwordPromptClose() {
+ OverlayManager.close(this.overlayName).then(function () {
+ this.passwordField.value = '';
+ }.bind(this));
+ },
+
+ verifyPassword: function passwordPromptVerifyPassword() {
+ var password = this.passwordField.value;
+ if (password && password.length > 0) {
+ this.close();
+ return this.updatePassword(password);
+ }
+ }
+};
+
+
+/**
+ * @typedef {Object} PDFDocumentPropertiesOptions
+ * @property {string} overlayName - Name/identifier for the overlay.
+ * @property {Object} fields - Names and elements of the overlay's fields.
+ * @property {HTMLButtonElement} closeButton - Button for closing the overlay.
+ */
+
+/**
+ * @class
+ */
+var PDFDocumentProperties = (function PDFDocumentPropertiesClosure() {
+ /**
+ * @constructs PDFDocumentProperties
+ * @param {PDFDocumentPropertiesOptions} options
+ */
+ function PDFDocumentProperties(options) {
+ this.fields = options.fields;
+ this.overlayName = options.overlayName;
+
+ this.rawFileSize = 0;
+ this.url = null;
+ this.pdfDocument = null;
+
+ // Bind the event listener for the Close button.
+ if (options.closeButton) {
+ options.closeButton.addEventListener('click', this.close.bind(this));
+ }
+
+ this.dataAvailablePromise = new Promise(function (resolve) {
+ this.resolveDataAvailable = resolve;
+ }.bind(this));
+
+ OverlayManager.register(this.overlayName, this.close.bind(this));
+ }
+
+ PDFDocumentProperties.prototype = {
+ /**
+ * Open the document properties overlay.
+ */
+ open: function PDFDocumentProperties_open() {
+ Promise.all([OverlayManager.open(this.overlayName),
+ this.dataAvailablePromise]).then(function () {
+ this._getProperties();
+ }.bind(this));
+ },
+
+ /**
+ * Close the document properties overlay.
+ */
+ close: function PDFDocumentProperties_close() {
+ OverlayManager.close(this.overlayName);
+ },
+
+ /**
+ * Set the file size of the PDF document. This method is used to
+ * update the file size in the document properties overlay once it
+ * is known so we do not have to wait until the entire file is loaded.
+ *
+ * @param {number} fileSize - The file size of the PDF document.
+ */
+ setFileSize: function PDFDocumentProperties_setFileSize(fileSize) {
+ if (fileSize > 0) {
+ this.rawFileSize = fileSize;
+ }
+ },
+
+ /**
+ * Set a reference to the PDF document and the URL in order
+ * to populate the overlay fields with the document properties.
+ * Note that the overlay will contain no information if this method
+ * is not called.
+ *
+ * @param {Object} pdfDocument - A reference to the PDF document.
+ * @param {string} url - The URL of the document.
+ */
+ setDocumentAndUrl:
+ function PDFDocumentProperties_setDocumentAndUrl(pdfDocument, url) {
+ this.pdfDocument = pdfDocument;
+ this.url = url;
+ this.resolveDataAvailable();
+ },
+
+ /**
+ * @private
+ */
+ _getProperties: function PDFDocumentProperties_getProperties() {
+ if (!OverlayManager.active) {
+ // If the dialog was closed before dataAvailablePromise was resolved,
+ // don't bother updating the properties.
+ return;
+ }
+ // Get the file size (if it hasn't already been set).
+ this.pdfDocument.getDownloadInfo().then(function(data) {
+ if (data.length === this.rawFileSize) {
+ return;
+ }
+ this.setFileSize(data.length);
+ this._updateUI(this.fields['fileSize'], this._parseFileSize());
+ }.bind(this));
+
+ // Get the document properties.
+ this.pdfDocument.getMetadata().then(function(data) {
+ var content = {
+ 'fileName': getPDFFileNameFromURL(this.url),
+ 'fileSize': this._parseFileSize(),
+ 'title': data.info.Title,
+ 'author': data.info.Author,
+ 'subject': data.info.Subject,
+ 'keywords': data.info.Keywords,
+ 'creationDate': this._parseDate(data.info.CreationDate),
+ 'modificationDate': this._parseDate(data.info.ModDate),
+ 'creator': data.info.Creator,
+ 'producer': data.info.Producer,
+ 'version': data.info.PDFFormatVersion,
+ 'pageCount': this.pdfDocument.numPages
+ };
+
+ // Show the properties in the dialog.
+ for (var identifier in content) {
+ this._updateUI(this.fields[identifier], content[identifier]);
+ }
+ }.bind(this));
+ },
+
+ /**
+ * @private
+ */
+ _updateUI: function PDFDocumentProperties_updateUI(field, content) {
+ if (field && content !== undefined && content !== '') {
+ field.textContent = content;
+ }
+ },
+
+ /**
+ * @private
+ */
+ _parseFileSize: function PDFDocumentProperties_parseFileSize() {
+ var fileSize = this.rawFileSize, kb = fileSize / 1024;
+ if (!kb) {
+ return;
+ } else if (kb < 1024) {
+ return mozL10n.get('document_properties_kb', {
+ size_kb: (+kb.toPrecision(3)).toLocaleString(),
+ size_b: fileSize.toLocaleString()
+ }, '{{size_kb}} KB ({{size_b}} bytes)');
+ } else {
+ return mozL10n.get('document_properties_mb', {
+ size_mb: (+(kb / 1024).toPrecision(3)).toLocaleString(),
+ size_b: fileSize.toLocaleString()
+ }, '{{size_mb}} MB ({{size_b}} bytes)');
+ }
+ },
+
+ /**
+ * @private
+ */
+ _parseDate: function PDFDocumentProperties_parseDate(inputDate) {
+ // This is implemented according to the PDF specification, but note that
+ // Adobe Reader doesn't handle changing the date to universal time
+ // and doesn't use the user's time zone (they're effectively ignoring
+ // the HH' and mm' parts of the date string).
+ var dateToParse = inputDate;
+ if (dateToParse === undefined) {
+ return '';
+ }
+
+ // Remove the D: prefix if it is available.
+ if (dateToParse.substring(0,2) === 'D:') {
+ dateToParse = dateToParse.substring(2);
+ }
+
+ // Get all elements from the PDF date string.
+ // JavaScript's Date object expects the month to be between
+ // 0 and 11 instead of 1 and 12, so we're correcting for this.
+ var year = parseInt(dateToParse.substring(0,4), 10);
+ var month = parseInt(dateToParse.substring(4,6), 10) - 1;
+ var day = parseInt(dateToParse.substring(6,8), 10);
+ var hours = parseInt(dateToParse.substring(8,10), 10);
+ var minutes = parseInt(dateToParse.substring(10,12), 10);
+ var seconds = parseInt(dateToParse.substring(12,14), 10);
+ var utRel = dateToParse.substring(14,15);
+ var offsetHours = parseInt(dateToParse.substring(15,17), 10);
+ var offsetMinutes = parseInt(dateToParse.substring(18,20), 10);
+
+ // As per spec, utRel = 'Z' means equal to universal time.
+ // The other cases ('-' and '+') have to be handled here.
+ if (utRel === '-') {
+ hours += offsetHours;
+ minutes += offsetMinutes;
+ } else if (utRel === '+') {
+ hours -= offsetHours;
+ minutes -= offsetMinutes;
+ }
+
+ // Return the new date format from the user's locale.
+ var date = new Date(Date.UTC(year, month, day, hours, minutes, seconds));
+ var dateString = date.toLocaleDateString();
+ var timeString = date.toLocaleTimeString();
+ return mozL10n.get('document_properties_date_string',
+ {date: dateString, time: timeString},
+ '{{date}}, {{time}}');
+ }
+ };
+
+ return PDFDocumentProperties;
+})();
+
+
+var PresentationModeState = {
+ UNKNOWN: 0,
+ NORMAL: 1,
+ CHANGING: 2,
+ FULLSCREEN: 3,
+};
+
+var IGNORE_CURRENT_POSITION_ON_ZOOM = false;
+var DEFAULT_CACHE_SIZE = 10;
+
+
+var CLEANUP_TIMEOUT = 30000;
+
+var RenderingStates = {
+ INITIAL: 0,
+ RUNNING: 1,
+ PAUSED: 2,
+ FINISHED: 3
+};
+
+/**
+ * Controls rendering of the views for pages and thumbnails.
+ * @class
+ */
+var PDFRenderingQueue = (function PDFRenderingQueueClosure() {
+ /**
+ * @constructs
+ */
+ function PDFRenderingQueue() {
+ this.pdfViewer = null;
+ this.pdfThumbnailViewer = null;
+ this.onIdle = null;
+
+ this.highestPriorityPage = null;
+ this.idleTimeout = null;
+ this.printing = false;
+ this.isThumbnailViewEnabled = false;
+ }
+
+ PDFRenderingQueue.prototype = /** @lends PDFRenderingQueue.prototype */ {
+ /**
+ * @param {PDFViewer} pdfViewer
+ */
+ setViewer: function PDFRenderingQueue_setViewer(pdfViewer) {
+ this.pdfViewer = pdfViewer;
+ },
+
+ /**
+ * @param {PDFThumbnailViewer} pdfThumbnailViewer
+ */
+ setThumbnailViewer:
+ function PDFRenderingQueue_setThumbnailViewer(pdfThumbnailViewer) {
+ this.pdfThumbnailViewer = pdfThumbnailViewer;
+ },
+
+ /**
+ * @param {IRenderableView} view
+ * @returns {boolean}
+ */
+ isHighestPriority: function PDFRenderingQueue_isHighestPriority(view) {
+ return this.highestPriorityPage === view.renderingId;
+ },
+
+ renderHighestPriority: function
+ PDFRenderingQueue_renderHighestPriority(currentlyVisiblePages) {
+ if (this.idleTimeout) {
+ clearTimeout(this.idleTimeout);
+ this.idleTimeout = null;
+ }
+
+ // Pages have a higher priority than thumbnails, so check them first.
+ if (this.pdfViewer.forceRendering(currentlyVisiblePages)) {
+ return;
+ }
+ // No pages needed rendering so check thumbnails.
+ if (this.pdfThumbnailViewer && this.isThumbnailViewEnabled) {
+ if (this.pdfThumbnailViewer.forceRendering()) {
+ return;
+ }
+ }
+
+ if (this.printing) {
+ // If printing is currently ongoing do not reschedule cleanup.
+ return;
+ }
+
+ if (this.onIdle) {
+ this.idleTimeout = setTimeout(this.onIdle.bind(this), CLEANUP_TIMEOUT);
+ }
+ },
+
+ getHighestPriority: function
+ PDFRenderingQueue_getHighestPriority(visible, views, scrolledDown) {
+ // The state has changed figure out which page has the highest priority to
+ // render next (if any).
+ // Priority:
+ // 1 visible pages
+ // 2 if last scrolled down page after the visible pages
+ // 2 if last scrolled up page before the visible pages
+ var visibleViews = visible.views;
+
+ var numVisible = visibleViews.length;
+ if (numVisible === 0) {
+ return false;
+ }
+ for (var i = 0; i < numVisible; ++i) {
+ var view = visibleViews[i].view;
+ if (!this.isViewFinished(view)) {
+ return view;
+ }
+ }
+
+ // All the visible views have rendered, try to render next/previous pages.
+ if (scrolledDown) {
+ var nextPageIndex = visible.last.id;
+ // ID's start at 1 so no need to add 1.
+ if (views[nextPageIndex] &&
+ !this.isViewFinished(views[nextPageIndex])) {
+ return views[nextPageIndex];
+ }
+ } else {
+ var previousPageIndex = visible.first.id - 2;
+ if (views[previousPageIndex] &&
+ !this.isViewFinished(views[previousPageIndex])) {
+ return views[previousPageIndex];
+ }
+ }
+ // Everything that needs to be rendered has been.
+ return null;
+ },
+
+ /**
+ * @param {IRenderableView} view
+ * @returns {boolean}
+ */
+ isViewFinished: function PDFRenderingQueue_isViewFinished(view) {
+ return view.renderingState === RenderingStates.FINISHED;
+ },
+
+ /**
+ * Render a page or thumbnail view. This calls the appropriate function
+ * based on the views state. If the view is already rendered it will return
+ * false.
+ * @param {IRenderableView} view
+ */
+ renderView: function PDFRenderingQueue_renderView(view) {
+ var state = view.renderingState;
+ switch (state) {
+ case RenderingStates.FINISHED:
+ return false;
+ case RenderingStates.PAUSED:
+ this.highestPriorityPage = view.renderingId;
+ view.resume();
+ break;
+ case RenderingStates.RUNNING:
+ this.highestPriorityPage = view.renderingId;
+ break;
+ case RenderingStates.INITIAL:
+ this.highestPriorityPage = view.renderingId;
+ var continueRendering = function () {
+ this.renderHighestPriority();
+ }.bind(this);
+ view.draw().then(continueRendering, continueRendering);
+ break;
+ }
+ return true;
+ },
+ };
+
+ return PDFRenderingQueue;
+})();
+
+
+var TEXT_LAYER_RENDER_DELAY = 200; // ms
+
+/**
+ * @typedef {Object} PDFPageViewOptions
+ * @property {HTMLDivElement} container - The viewer element.
+ * @property {number} id - The page unique ID (normally its number).
+ * @property {number} scale - The page scale display.
+ * @property {PageViewport} defaultViewport - The page viewport.
+ * @property {PDFRenderingQueue} renderingQueue - The rendering queue object.
+ * @property {IPDFTextLayerFactory} textLayerFactory
+ * @property {IPDFAnnotationsLayerFactory} annotationsLayerFactory
+ */
+
+/**
+ * @class
+ * @implements {IRenderableView}
+ */
+var PDFPageView = (function PDFPageViewClosure() {
+ /**
+ * @constructs PDFPageView
+ * @param {PDFPageViewOptions} options
+ */
+ function PDFPageView(options) {
+ var container = options.container;
+ var id = options.id;
+ var scale = options.scale;
+ var defaultViewport = options.defaultViewport;
+ var renderingQueue = options.renderingQueue;
+ var textLayerFactory = options.textLayerFactory;
+ var annotationsLayerFactory = options.annotationsLayerFactory;
+
+ this.id = id;
+ this.renderingId = 'page' + id;
+
+ this.rotation = 0;
+ this.scale = scale || 1.0;
+ this.viewport = defaultViewport;
+ this.pdfPageRotate = defaultViewport.rotation;
+ this.hasRestrictedScaling = false;
+
+ this.renderingQueue = renderingQueue;
+ this.textLayerFactory = textLayerFactory;
+ this.annotationsLayerFactory = annotationsLayerFactory;
+
+ this.renderingState = RenderingStates.INITIAL;
+ this.resume = null;
+
+ this.onBeforeDraw = null;
+ this.onAfterDraw = null;
+
+ this.textLayer = null;
+
+ this.zoomLayer = null;
+
+ this.annotationLayer = null;
+
+ var div = document.createElement('div');
+ div.id = 'pageContainer' + this.id;
+ div.className = 'page';
+ div.style.width = Math.floor(this.viewport.width) + 'px';
+ div.style.height = Math.floor(this.viewport.height) + 'px';
+ div.setAttribute('data-page-number', this.id);
+ this.div = div;
+
+ container.appendChild(div);
+ }
+
+ PDFPageView.prototype = {
+ setPdfPage: function PDFPageView_setPdfPage(pdfPage) {
+ this.pdfPage = pdfPage;
+ this.pdfPageRotate = pdfPage.rotate;
+ var totalRotation = (this.rotation + this.pdfPageRotate) % 360;
+ this.viewport = pdfPage.getViewport(this.scale * CSS_UNITS,
+ totalRotation);
+ this.stats = pdfPage.stats;
+ this.reset();
+ },
+
+ destroy: function PDFPageView_destroy() {
+ this.zoomLayer = null;
+ this.reset();
+ if (this.pdfPage) {
+ this.pdfPage.destroy();
+ }
+ },
+
+ reset: function PDFPageView_reset(keepAnnotations) {
+ if (this.renderTask) {
+ this.renderTask.cancel();
+ }
+ this.resume = null;
+ this.renderingState = RenderingStates.INITIAL;
+
+ var div = this.div;
+ div.style.width = Math.floor(this.viewport.width) + 'px';
+ div.style.height = Math.floor(this.viewport.height) + 'px';
+
+ var childNodes = div.childNodes;
+ var currentZoomLayer = this.zoomLayer || null;
+ var currentAnnotationNode = (keepAnnotations && this.annotationLayer &&
+ this.annotationLayer.div) || null;
+ for (var i = childNodes.length - 1; i >= 0; i--) {
+ var node = childNodes[i];
+ if (currentZoomLayer === node || currentAnnotationNode === node) {
+ continue;
+ }
+ div.removeChild(node);
+ }
+ div.removeAttribute('data-loaded');
+
+ if (keepAnnotations) {
+ if (this.annotationLayer) {
+ // Hide annotationLayer until all elements are resized
+ // so they are not displayed on the already-resized page
+ this.annotationLayer.hide();
+ }
+ } else {
+ this.annotationLayer = null;
+ }
+
+ if (this.canvas) {
+ // Zeroing the width and height causes Firefox to release graphics
+ // resources immediately, which can greatly reduce memory consumption.
+ this.canvas.width = 0;
+ this.canvas.height = 0;
+ delete this.canvas;
+ }
+
+ this.loadingIconDiv = document.createElement('div');
+ this.loadingIconDiv.className = 'loadingIcon';
+ div.appendChild(this.loadingIconDiv);
+ },
+
+ update: function PDFPageView_update(scale, rotation) {
+ this.scale = scale || this.scale;
+
+ if (typeof rotation !== 'undefined') {
+ this.rotation = rotation;
+ }
+
+ var totalRotation = (this.rotation + this.pdfPageRotate) % 360;
+ this.viewport = this.viewport.clone({
+ scale: this.scale * CSS_UNITS,
+ rotation: totalRotation
+ });
+
+ var isScalingRestricted = false;
+ if (this.canvas && PDFJS.maxCanvasPixels > 0) {
+ var ctx = this.canvas.getContext('2d');
+ var outputScale = getOutputScale(ctx);
+ var pixelsInViewport = this.viewport.width * this.viewport.height;
+ var maxScale = Math.sqrt(PDFJS.maxCanvasPixels / pixelsInViewport);
+ if (((Math.floor(this.viewport.width) * outputScale.sx) | 0) *
+ ((Math.floor(this.viewport.height) * outputScale.sy) | 0) >
+ PDFJS.maxCanvasPixels) {
+ isScalingRestricted = true;
+ }
+ }
+
+ if (this.canvas &&
+ (PDFJS.useOnlyCssZoom ||
+ (this.hasRestrictedScaling && isScalingRestricted))) {
+ this.cssTransform(this.canvas, true);
+ return;
+ } else if (this.canvas && !this.zoomLayer) {
+ this.zoomLayer = this.canvas.parentNode;
+ this.zoomLayer.style.position = 'absolute';
+ }
+ if (this.zoomLayer) {
+ this.cssTransform(this.zoomLayer.firstChild);
+ }
+ this.reset(true);
+ },
+
+ /**
+ * Called when moved in the parent's container.
+ */
+ updatePosition: function PDFPageView_updatePosition() {
+ if (this.textLayer) {
+ this.textLayer.render(TEXT_LAYER_RENDER_DELAY);
+ }
+ },
+
+ cssTransform: function PDFPageView_transform(canvas, redrawAnnotations) {
+ // Scale canvas, canvas wrapper, and page container.
+ var width = this.viewport.width;
+ var height = this.viewport.height;
+ var div = this.div;
+ canvas.style.width = canvas.parentNode.style.width = div.style.width =
+ Math.floor(width) + 'px';
+ canvas.style.height = canvas.parentNode.style.height = div.style.height =
+ Math.floor(height) + 'px';
+ // The canvas may have been originally rotated, rotate relative to that.
+ var relativeRotation = this.viewport.rotation - canvas._viewport.rotation;
+ var absRotation = Math.abs(relativeRotation);
+ var scaleX = 1, scaleY = 1;
+ if (absRotation === 90 || absRotation === 270) {
+ // Scale x and y because of the rotation.
+ scaleX = height / width;
+ scaleY = width / height;
+ }
+ var cssTransform = 'rotate(' + relativeRotation + 'deg) ' +
+ 'scale(' + scaleX + ',' + scaleY + ')';
+ CustomStyle.setProp('transform', canvas, cssTransform);
+
+ if (this.textLayer) {
+ // Rotating the text layer is more complicated since the divs inside the
+ // the text layer are rotated.
+ // TODO: This could probably be simplified by drawing the text layer in
+ // one orientation then rotating overall.
+ var textLayerViewport = this.textLayer.viewport;
+ var textRelativeRotation = this.viewport.rotation -
+ textLayerViewport.rotation;
+ var textAbsRotation = Math.abs(textRelativeRotation);
+ var scale = width / textLayerViewport.width;
+ if (textAbsRotation === 90 || textAbsRotation === 270) {
+ scale = width / textLayerViewport.height;
+ }
+ var textLayerDiv = this.textLayer.textLayerDiv;
+ var transX, transY;
+ switch (textAbsRotation) {
+ case 0:
+ transX = transY = 0;
+ break;
+ case 90:
+ transX = 0;
+ transY = '-' + textLayerDiv.style.height;
+ break;
+ case 180:
+ transX = '-' + textLayerDiv.style.width;
+ transY = '-' + textLayerDiv.style.height;
+ break;
+ case 270:
+ transX = '-' + textLayerDiv.style.width;
+ transY = 0;
+ break;
+ default:
+ console.error('Bad rotation value.');
+ break;
+ }
+ CustomStyle.setProp('transform', textLayerDiv,
+ 'rotate(' + textAbsRotation + 'deg) ' +
+ 'scale(' + scale + ', ' + scale + ') ' +
+ 'translate(' + transX + ', ' + transY + ')');
+ CustomStyle.setProp('transformOrigin', textLayerDiv, '0% 0%');
+ }
+
+ if (redrawAnnotations && this.annotationLayer) {
+ this.annotationLayer.setupAnnotations(this.viewport);
+ }
+ },
+
+ get width() {
+ return this.viewport.width;
+ },
+
+ get height() {
+ return this.viewport.height;
+ },
+
+ getPagePoint: function PDFPageView_getPagePoint(x, y) {
+ return this.viewport.convertToPdfPoint(x, y);
+ },
+
+ draw: function PDFPageView_draw() {
+ if (this.renderingState !== RenderingStates.INITIAL) {
+ console.error('Must be in new state before drawing');
+ }
+
+ this.renderingState = RenderingStates.RUNNING;
+
+ var pdfPage = this.pdfPage;
+ var viewport = this.viewport;
+ var div = this.div;
+ // Wrap the canvas so if it has a css transform for highdpi the overflow
+ // will be hidden in FF.
+ var canvasWrapper = document.createElement('div');
+ canvasWrapper.style.width = div.style.width;
+ canvasWrapper.style.height = div.style.height;
+ canvasWrapper.classList.add('canvasWrapper');
+
+ var canvas = document.createElement('canvas');
+ canvas.id = 'page' + this.id;
+ canvasWrapper.appendChild(canvas);
+ if (this.annotationLayer) {
+ // annotationLayer needs to stay on top
+ div.insertBefore(canvasWrapper, this.annotationLayer.div);
+ } else {
+ div.appendChild(canvasWrapper);
+ }
+ this.canvas = canvas;
+
+ var ctx = canvas.getContext('2d');
+ var outputScale = getOutputScale(ctx);
+
+ if (PDFJS.useOnlyCssZoom) {
+ var actualSizeViewport = viewport.clone({ scale: CSS_UNITS });
+ // Use a scale that will make the canvas be the original intended size
+ // of the page.
+ outputScale.sx *= actualSizeViewport.width / viewport.width;
+ outputScale.sy *= actualSizeViewport.height / viewport.height;
+ outputScale.scaled = true;
+ }
+
+ if (PDFJS.maxCanvasPixels > 0) {
+ var pixelsInViewport = viewport.width * viewport.height;
+ var maxScale = Math.sqrt(PDFJS.maxCanvasPixels / pixelsInViewport);
+ if (outputScale.sx > maxScale || outputScale.sy > maxScale) {
+ outputScale.sx = maxScale;
+ outputScale.sy = maxScale;
+ outputScale.scaled = true;
+ this.hasRestrictedScaling = true;
+ } else {
+ this.hasRestrictedScaling = false;
+ }
+ }
+
+ canvas.width = (Math.floor(viewport.width) * outputScale.sx) | 0;
+ canvas.height = (Math.floor(viewport.height) * outputScale.sy) | 0;
+ canvas.style.width = Math.floor(viewport.width) + 'px';
+ canvas.style.height = Math.floor(viewport.height) + 'px';
+ // Add the viewport so it's known what it was originally drawn with.
+ canvas._viewport = viewport;
+
+ var textLayerDiv = null;
+ var textLayer = null;
+ if (this.textLayerFactory) {
+ textLayerDiv = document.createElement('div');
+ textLayerDiv.className = 'textLayer';
+ textLayerDiv.style.width = canvas.style.width;
+ textLayerDiv.style.height = canvas.style.height;
+ if (this.annotationLayer) {
+ // annotationLayer needs to stay on top
+ div.insertBefore(textLayerDiv, this.annotationLayer.div);
+ } else {
+ div.appendChild(textLayerDiv);
+ }
+
+ textLayer = this.textLayerFactory.createTextLayerBuilder(textLayerDiv,
+ this.id - 1,
+ this.viewport);
+ }
+ this.textLayer = textLayer;
+
+ if (outputScale.scaled) {
+ // Used by the mozCurrentTransform polyfill in src/display/canvas.js.
+ ctx._transformMatrix = [outputScale.sx, 0, 0, outputScale.sy, 0, 0];
+ ctx.scale(outputScale.sx, outputScale.sy);
+ }
+
+ var resolveRenderPromise, rejectRenderPromise;
+ var promise = new Promise(function (resolve, reject) {
+ resolveRenderPromise = resolve;
+ rejectRenderPromise = reject;
+ });
+
+ // Rendering area
+
+ var self = this;
+ function pageViewDrawCallback(error) {
+ // The renderTask may have been replaced by a new one, so only remove
+ // the reference to the renderTask if it matches the one that is
+ // triggering this callback.
+ if (renderTask === self.renderTask) {
+ self.renderTask = null;
+ }
+
+ if (error === 'cancelled') {
+ rejectRenderPromise(error);
+ return;
+ }
+
+ self.renderingState = RenderingStates.FINISHED;
+
+ if (self.loadingIconDiv) {
+ div.removeChild(self.loadingIconDiv);
+ delete self.loadingIconDiv;
+ }
+
+ if (self.zoomLayer) {
+ div.removeChild(self.zoomLayer);
+ self.zoomLayer = null;
+ }
+
+ self.error = error;
+ self.stats = pdfPage.stats;
+ if (self.onAfterDraw) {
+ self.onAfterDraw();
+ }
+ var event = document.createEvent('CustomEvent');
+ event.initCustomEvent('pagerendered', true, true, {
+ pageNumber: self.id
+ });
+ div.dispatchEvent(event);
+ // This custom event is deprecated, and will be removed in the future,
+ // please use the |pagerendered| event instead.
+ var deprecatedEvent = document.createEvent('CustomEvent');
+ deprecatedEvent.initCustomEvent('pagerender', true, true, {
+ pageNumber: pdfPage.pageNumber
+ });
+ div.dispatchEvent(deprecatedEvent);
+
+ if (!error) {
+ resolveRenderPromise(undefined);
+ } else {
+ rejectRenderPromise(error);
+ }
+ }
+
+ var renderContinueCallback = null;
+ if (this.renderingQueue) {
+ renderContinueCallback = function renderContinueCallback(cont) {
+ if (!self.renderingQueue.isHighestPriority(self)) {
+ self.renderingState = RenderingStates.PAUSED;
+ self.resume = function resumeCallback() {
+ self.renderingState = RenderingStates.RUNNING;
+ cont();
+ };
+ return;
+ }
+ cont();
+ };
+ }
+
+ var renderContext = {
+ canvasContext: ctx,
+ viewport: this.viewport,
+ // intent: 'default', // === 'display'
+ continueCallback: renderContinueCallback
+ };
+ var renderTask = this.renderTask = this.pdfPage.render(renderContext);
+
+ this.renderTask.promise.then(
+ function pdfPageRenderCallback() {
+ pageViewDrawCallback(null);
+ if (textLayer) {
+ self.pdfPage.getTextContent().then(
+ function textContentResolved(textContent) {
+ textLayer.setTextContent(textContent);
+ textLayer.render(TEXT_LAYER_RENDER_DELAY);
+ }
+ );
+ }
+ },
+ function pdfPageRenderError(error) {
+ pageViewDrawCallback(error);
+ }
+ );
+
+ if (this.annotationsLayerFactory) {
+ if (!this.annotationLayer) {
+ this.annotationLayer = this.annotationsLayerFactory.
+ createAnnotationsLayerBuilder(div, this.pdfPage);
+ }
+ this.annotationLayer.setupAnnotations(this.viewport);
+ }
+ div.setAttribute('data-loaded', true);
+
+ if (self.onBeforeDraw) {
+ self.onBeforeDraw();
+ }
+ return promise;
+ },
+
+ beforePrint: function PDFPageView_beforePrint() {
+ var pdfPage = this.pdfPage;
+
+ var viewport = pdfPage.getViewport(1);
+ // Use the same hack we use for high dpi displays for printing to get
+ // better output until bug 811002 is fixed in FF.
+ var PRINT_OUTPUT_SCALE = 2;
+ var canvas = document.createElement('canvas');
+
+ // The logical size of the canvas.
+ canvas.width = Math.floor(viewport.width) * PRINT_OUTPUT_SCALE;
+ canvas.height = Math.floor(viewport.height) * PRINT_OUTPUT_SCALE;
+
+ // The rendered size of the canvas, relative to the size of canvasWrapper.
+ canvas.style.width = (PRINT_OUTPUT_SCALE * 100) + '%';
+ canvas.style.height = (PRINT_OUTPUT_SCALE * 100) + '%';
+
+ var cssScale = 'scale(' + (1 / PRINT_OUTPUT_SCALE) + ', ' +
+ (1 / PRINT_OUTPUT_SCALE) + ')';
+ CustomStyle.setProp('transform' , canvas, cssScale);
+ CustomStyle.setProp('transformOrigin' , canvas, '0% 0%');
+
+ var printContainer = document.getElementById('printContainer');
+ var canvasWrapper = document.createElement('div');
+ canvasWrapper.style.width = viewport.width + 'pt';
+ canvasWrapper.style.height = viewport.height + 'pt';
+ canvasWrapper.appendChild(canvas);
+ printContainer.appendChild(canvasWrapper);
+
+ canvas.mozPrintCallback = function(obj) {
+ var ctx = obj.context;
+
+ ctx.save();
+ ctx.fillStyle = 'rgb(255, 255, 255)';
+ ctx.fillRect(0, 0, canvas.width, canvas.height);
+ ctx.restore();
+ // Used by the mozCurrentTransform polyfill in src/display/canvas.js.
+ ctx._transformMatrix =
+ [PRINT_OUTPUT_SCALE, 0, 0, PRINT_OUTPUT_SCALE, 0, 0];
+ ctx.scale(PRINT_OUTPUT_SCALE, PRINT_OUTPUT_SCALE);
+
+ var renderContext = {
+ canvasContext: ctx,
+ viewport: viewport,
+ intent: 'print'
+ };
+
+ pdfPage.render(renderContext).promise.then(function() {
+ // Tell the printEngine that rendering this canvas/page has finished.
+ obj.done();
+ }, function(error) {
+ console.error(error);
+ // Tell the printEngine that rendering this canvas/page has failed.
+ // This will make the print proces stop.
+ if ('abort' in obj) {
+ obj.abort();
+ } else {
+ obj.done();
+ }
+ });
+ };
+ },
+ };
+
+ return PDFPageView;
+})();
+
+
+var MAX_TEXT_DIVS_TO_RENDER = 100000;
+
+var NonWhitespaceRegexp = /\S/;
+
+function isAllWhitespace(str) {
+ return !NonWhitespaceRegexp.test(str);
+}
+
+/**
+ * @typedef {Object} TextLayerBuilderOptions
+ * @property {HTMLDivElement} textLayerDiv - The text layer container.
+ * @property {number} pageIndex - The page index.
+ * @property {PageViewport} viewport - The viewport of the text layer.
+ * @property {PDFFindController} findController
+ */
+
+/**
+ * TextLayerBuilder provides text-selection functionality for the PDF.
+ * It does this by creating overlay divs over the PDF text. These divs
+ * contain text that matches the PDF text they are overlaying. This object
+ * also provides a way to highlight text that is being searched for.
+ * @class
+ */
+var TextLayerBuilder = (function TextLayerBuilderClosure() {
+ function TextLayerBuilder(options) {
+ this.textLayerDiv = options.textLayerDiv;
+ this.renderingDone = false;
+ this.divContentDone = false;
+ this.pageIdx = options.pageIndex;
+ this.pageNumber = this.pageIdx + 1;
+ this.matches = [];
+ this.viewport = options.viewport;
+ this.textDivs = [];
+ this.findController = options.findController || null;
+ }
+
+ TextLayerBuilder.prototype = {
+ _finishRendering: function TextLayerBuilder_finishRendering() {
+ this.renderingDone = true;
+
+ var event = document.createEvent('CustomEvent');
+ event.initCustomEvent('textlayerrendered', true, true, {
+ pageNumber: this.pageNumber
+ });
+ this.textLayerDiv.dispatchEvent(event);
+ },
+
+ renderLayer: function TextLayerBuilder_renderLayer() {
+ var textLayerFrag = document.createDocumentFragment();
+ var textDivs = this.textDivs;
+ var textDivsLength = textDivs.length;
+ var canvas = document.createElement('canvas');
+ var ctx = canvas.getContext('2d');
+
+ // No point in rendering many divs as it would make the browser
+ // unusable even after the divs are rendered.
+ if (textDivsLength > MAX_TEXT_DIVS_TO_RENDER) {
+ this._finishRendering();
+ return;
+ }
+
+ var lastFontSize;
+ var lastFontFamily;
+ for (var i = 0; i < textDivsLength; i++) {
+ var textDiv = textDivs[i];
+ if (textDiv.dataset.isWhitespace !== undefined) {
+ continue;
+ }
+
+ var fontSize = textDiv.style.fontSize;
+ var fontFamily = textDiv.style.fontFamily;
+
+ // Only build font string and set to context if different from last.
+ if (fontSize !== lastFontSize || fontFamily !== lastFontFamily) {
+ ctx.font = fontSize + ' ' + fontFamily;
+ lastFontSize = fontSize;
+ lastFontFamily = fontFamily;
+ }
+
+ var width = ctx.measureText(textDiv.textContent).width;
+ if (width > 0) {
+ textLayerFrag.appendChild(textDiv);
+ var transform;
+ if (textDiv.dataset.canvasWidth !== undefined) {
+ // Dataset values come of type string.
+ var textScale = textDiv.dataset.canvasWidth / width;
+ transform = 'scaleX(' + textScale + ')';
+ } else {
+ transform = '';
+ }
+ var rotation = textDiv.dataset.angle;
+ if (rotation) {
+ transform = 'rotate(' + rotation + 'deg) ' + transform;
+ }
+ if (transform) {
+ CustomStyle.setProp('transform' , textDiv, transform);
+ }
+ }
+ }
+
+ this.textLayerDiv.appendChild(textLayerFrag);
+ this._finishRendering();
+ this.updateMatches();
+ },
+
+ /**
+ * Renders the text layer.
+ * @param {number} timeout (optional) if specified, the rendering waits
+ * for specified amount of ms.
+ */
+ render: function TextLayerBuilder_render(timeout) {
+ if (!this.divContentDone || this.renderingDone) {
+ return;
+ }
+
+ if (this.renderTimer) {
+ clearTimeout(this.renderTimer);
+ this.renderTimer = null;
+ }
+
+ if (!timeout) { // Render right away
+ this.renderLayer();
+ } else { // Schedule
+ var self = this;
+ this.renderTimer = setTimeout(function() {
+ self.renderLayer();
+ self.renderTimer = null;
+ }, timeout);
+ }
+ },
+
+ appendText: function TextLayerBuilder_appendText(geom, styles) {
+ var style = styles[geom.fontName];
+ var textDiv = document.createElement('div');
+ this.textDivs.push(textDiv);
+ if (isAllWhitespace(geom.str)) {
+ textDiv.dataset.isWhitespace = true;
+ return;
+ }
+ var tx = PDFJS.Util.transform(this.viewport.transform, geom.transform);
+ var angle = Math.atan2(tx[1], tx[0]);
+ if (style.vertical) {
+ angle += Math.PI / 2;
+ }
+ var fontHeight = Math.sqrt((tx[2] * tx[2]) + (tx[3] * tx[3]));
+ var fontAscent = fontHeight;
+ if (style.ascent) {
+ fontAscent = style.ascent * fontAscent;
+ } else if (style.descent) {
+ fontAscent = (1 + style.descent) * fontAscent;
+ }
+
+ var left;
+ var top;
+ if (angle === 0) {
+ left = tx[4];
+ top = tx[5] - fontAscent;
+ } else {
+ left = tx[4] + (fontAscent * Math.sin(angle));
+ top = tx[5] - (fontAscent * Math.cos(angle));
+ }
+ textDiv.style.left = left + 'px';
+ textDiv.style.top = top + 'px';
+ textDiv.style.fontSize = fontHeight + 'px';
+ textDiv.style.fontFamily = style.fontFamily;
+
+ textDiv.textContent = geom.str;
+ // |fontName| is only used by the Font Inspector. This test will succeed
+ // when e.g. the Font Inspector is off but the Stepper is on, but it's
+ // not worth the effort to do a more accurate test.
+ if (PDFJS.pdfBug) {
+ textDiv.dataset.fontName = geom.fontName;
+ }
+ // Storing into dataset will convert number into string.
+ if (angle !== 0) {
+ textDiv.dataset.angle = angle * (180 / Math.PI);
+ }
+ // We don't bother scaling single-char text divs, because it has very
+ // little effect on text highlighting. This makes scrolling on docs with
+ // lots of such divs a lot faster.
+ if (textDiv.textContent.length > 1) {
+ if (style.vertical) {
+ textDiv.dataset.canvasWidth = geom.height * this.viewport.scale;
+ } else {
+ textDiv.dataset.canvasWidth = geom.width * this.viewport.scale;
+ }
+ }
+ },
+
+ setTextContent: function TextLayerBuilder_setTextContent(textContent) {
+ this.textContent = textContent;
+
+ var textItems = textContent.items;
+ for (var i = 0, len = textItems.length; i < len; i++) {
+ this.appendText(textItems[i], textContent.styles);
+ }
+ this.divContentDone = true;
+ },
+
+ convertMatches: function TextLayerBuilder_convertMatches(matches) {
+ var i = 0;
+ var iIndex = 0;
+ var bidiTexts = this.textContent.items;
+ var end = bidiTexts.length - 1;
+ var queryLen = (this.findController === null ?
+ 0 : this.findController.state.query.length);
+ var ret = [];
+
+ for (var m = 0, len = matches.length; m < len; m++) {
+ // Calculate the start position.
+ var matchIdx = matches[m];
+
+ // Loop over the divIdxs.
+ while (i !== end && matchIdx >= (iIndex + bidiTexts[i].str.length)) {
+ iIndex += bidiTexts[i].str.length;
+ i++;
+ }
+
+ if (i === bidiTexts.length) {
+ console.error('Could not find a matching mapping');
+ }
+
+ var match = {
+ begin: {
+ divIdx: i,
+ offset: matchIdx - iIndex
+ }
+ };
+
+ // Calculate the end position.
+ matchIdx += queryLen;
+
+ // Somewhat the same array as above, but use > instead of >= to get
+ // the end position right.
+ while (i !== end && matchIdx > (iIndex + bidiTexts[i].str.length)) {
+ iIndex += bidiTexts[i].str.length;
+ i++;
+ }
+
+ match.end = {
+ divIdx: i,
+ offset: matchIdx - iIndex
+ };
+ ret.push(match);
+ }
+
+ return ret;
+ },
+
+ renderMatches: function TextLayerBuilder_renderMatches(matches) {
+ // Early exit if there is nothing to render.
+ if (matches.length === 0) {
+ return;
+ }
+
+ var bidiTexts = this.textContent.items;
+ var textDivs = this.textDivs;
+ var prevEnd = null;
+ var pageIdx = this.pageIdx;
+ var isSelectedPage = (this.findController === null ?
+ false : (pageIdx === this.findController.selected.pageIdx));
+ var selectedMatchIdx = (this.findController === null ?
+ -1 : this.findController.selected.matchIdx);
+ var highlightAll = (this.findController === null ?
+ false : this.findController.state.highlightAll);
+ var infinity = {
+ divIdx: -1,
+ offset: undefined
+ };
+
+ function beginText(begin, className) {
+ var divIdx = begin.divIdx;
+ textDivs[divIdx].textContent = '';
+ appendTextToDiv(divIdx, 0, begin.offset, className);
+ }
+
+ function appendTextToDiv(divIdx, fromOffset, toOffset, className) {
+ var div = textDivs[divIdx];
+ var content = bidiTexts[divIdx].str.substring(fromOffset, toOffset);
+ var node = document.createTextNode(content);
+ if (className) {
+ var span = document.createElement('span');
+ span.className = className;
+ span.appendChild(node);
+ div.appendChild(span);
+ return;
+ }
+ div.appendChild(node);
+ }
+
+ var i0 = selectedMatchIdx, i1 = i0 + 1;
+ if (highlightAll) {
+ i0 = 0;
+ i1 = matches.length;
+ } else if (!isSelectedPage) {
+ // Not highlighting all and this isn't the selected page, so do nothing.
+ return;
+ }
+
+ for (var i = i0; i < i1; i++) {
+ var match = matches[i];
+ var begin = match.begin;
+ var end = match.end;
+ var isSelected = (isSelectedPage && i === selectedMatchIdx);
+ var highlightSuffix = (isSelected ? ' selected' : '');
+
+ if (this.findController) {
+ this.findController.updateMatchPosition(pageIdx, i, textDivs,
+ begin.divIdx, end.divIdx);
+ }
+
+ // Match inside new div.
+ if (!prevEnd || begin.divIdx !== prevEnd.divIdx) {
+ // If there was a previous div, then add the text at the end.
+ if (prevEnd !== null) {
+ appendTextToDiv(prevEnd.divIdx, prevEnd.offset, infinity.offset);
+ }
+ // Clear the divs and set the content until the starting point.
+ beginText(begin);
+ } else {
+ appendTextToDiv(prevEnd.divIdx, prevEnd.offset, begin.offset);
+ }
+
+ if (begin.divIdx === end.divIdx) {
+ appendTextToDiv(begin.divIdx, begin.offset, end.offset,
+ 'highlight' + highlightSuffix);
+ } else {
+ appendTextToDiv(begin.divIdx, begin.offset, infinity.offset,
+ 'highlight begin' + highlightSuffix);
+ for (var n0 = begin.divIdx + 1, n1 = end.divIdx; n0 < n1; n0++) {
+ textDivs[n0].className = 'highlight middle' + highlightSuffix;
+ }
+ beginText(end, 'highlight end' + highlightSuffix);
+ }
+ prevEnd = end;
+ }
+
+ if (prevEnd) {
+ appendTextToDiv(prevEnd.divIdx, prevEnd.offset, infinity.offset);
+ }
+ },
+
+ updateMatches: function TextLayerBuilder_updateMatches() {
+ // Only show matches when all rendering is done.
+ if (!this.renderingDone) {
+ return;
+ }
+
+ // Clear all matches.
+ var matches = this.matches;
+ var textDivs = this.textDivs;
+ var bidiTexts = this.textContent.items;
+ var clearedUntilDivIdx = -1;
+
+ // Clear all current matches.
+ for (var i = 0, len = matches.length; i < len; i++) {
+ var match = matches[i];
+ var begin = Math.max(clearedUntilDivIdx, match.begin.divIdx);
+ for (var n = begin, end = match.end.divIdx; n <= end; n++) {
+ var div = textDivs[n];
+ div.textContent = bidiTexts[n].str;
+ div.className = '';
+ }
+ clearedUntilDivIdx = match.end.divIdx + 1;
+ }
+
+ if (this.findController === null || !this.findController.active) {
+ return;
+ }
+
+ // Convert the matches on the page controller into the match format
+ // used for the textLayer.
+ this.matches = this.convertMatches(this.findController === null ?
+ [] : (this.findController.pageMatches[this.pageIdx] || []));
+ this.renderMatches(this.matches);
+ }
+ };
+ return TextLayerBuilder;
+})();
+
+/**
+ * @constructor
+ * @implements IPDFTextLayerFactory
+ */
+function DefaultTextLayerFactory() {}
+DefaultTextLayerFactory.prototype = {
+ /**
+ * @param {HTMLDivElement} textLayerDiv
+ * @param {number} pageIndex
+ * @param {PageViewport} viewport
+ * @returns {TextLayerBuilder}
+ */
+ createTextLayerBuilder: function (textLayerDiv, pageIndex, viewport) {
+ return new TextLayerBuilder({
+ textLayerDiv: textLayerDiv,
+ pageIndex: pageIndex,
+ viewport: viewport
+ });
+ }
+};
+
+
+/**
+ * @typedef {Object} AnnotationsLayerBuilderOptions
+ * @property {HTMLDivElement} pageDiv
+ * @property {PDFPage} pdfPage
+ * @property {IPDFLinkService} linkService
+ */
+
+/**
+ * @class
+ */
+var AnnotationsLayerBuilder = (function AnnotationsLayerBuilderClosure() {
+ /**
+ * @param {AnnotationsLayerBuilderOptions} options
+ * @constructs AnnotationsLayerBuilder
+ */
+ function AnnotationsLayerBuilder(options) {
+ this.pageDiv = options.pageDiv;
+ this.pdfPage = options.pdfPage;
+ this.linkService = options.linkService;
+
+ this.div = null;
+ }
+ AnnotationsLayerBuilder.prototype =
+ /** @lends AnnotationsLayerBuilder.prototype */ {
+
+ /**
+ * @param {PageViewport} viewport
+ */
+ setupAnnotations:
+ function AnnotationsLayerBuilder_setupAnnotations(viewport) {
+ function bindLink(link, dest) {
+ link.href = linkService.getDestinationHash(dest);
+ link.onclick = function annotationsLayerBuilderLinksOnclick() {
+ if (dest) {
+ linkService.navigateTo(dest);
+ }
+ return false;
+ };
+ if (dest) {
+ link.className = 'internalLink';
+ }
+ }
+
+ function bindNamedAction(link, action) {
+ link.href = linkService.getAnchorUrl('');
+ link.onclick = function annotationsLayerBuilderNamedActionOnClick() {
+ linkService.executeNamedAction(action);
+ return false;
+ };
+ link.className = 'internalLink';
+ }
+
+ var linkService = this.linkService;
+ var pdfPage = this.pdfPage;
+ var self = this;
+
+ pdfPage.getAnnotations().then(function (annotationsData) {
+ viewport = viewport.clone({ dontFlip: true });
+ var transform = viewport.transform;
+ var transformStr = 'matrix(' + transform.join(',') + ')';
+ var data, element, i, ii;
+
+ if (self.div) {
+ // If an annotationLayer already exists, refresh its children's
+ // transformation matrices
+ for (i = 0, ii = annotationsData.length; i < ii; i++) {
+ data = annotationsData[i];
+ element = self.div.querySelector(
+ '[data-annotation-id="' + data.id + '"]');
+ if (element) {
+ CustomStyle.setProp('transform', element, transformStr);
+ }
+ }
+ // See PDFPageView.reset()
+ self.div.removeAttribute('hidden');
+ } else {
+ for (i = 0, ii = annotationsData.length; i < ii; i++) {
+ data = annotationsData[i];
+ if (!data || !data.hasHtml) {
+ continue;
+ }
+
+ element = PDFJS.AnnotationUtils.getHtmlElement(data,
+ pdfPage.commonObjs);
+ element.setAttribute('data-annotation-id', data.id);
+ if (typeof mozL10n !== 'undefined') {
+ mozL10n.translate(element);
+ }
+
+ var rect = data.rect;
+ var view = pdfPage.view;
+ rect = PDFJS.Util.normalizeRect([
+ rect[0],
+ view[3] - rect[1] + view[1],
+ rect[2],
+ view[3] - rect[3] + view[1]
+ ]);
+ element.style.left = rect[0] + 'px';
+ element.style.top = rect[1] + 'px';
+ element.style.position = 'absolute';
+
+ CustomStyle.setProp('transform', element, transformStr);
+ var transformOriginStr = -rect[0] + 'px ' + -rect[1] + 'px';
+ CustomStyle.setProp('transformOrigin', element, transformOriginStr);
+
+ if (data.subtype === 'Link' && !data.url) {
+ var link = element.getElementsByTagName('a')[0];
+ if (link) {
+ if (data.action) {
+ bindNamedAction(link, data.action);
+ } else {
+ bindLink(link, ('dest' in data) ? data.dest : null);
+ }
+ }
+ }
+
+ if (!self.div) {
+ var annotationLayerDiv = document.createElement('div');
+ annotationLayerDiv.className = 'annotationLayer';
+ self.pageDiv.appendChild(annotationLayerDiv);
+ self.div = annotationLayerDiv;
+ }
+
+ self.div.appendChild(element);
+ }
+ }
+ });
+ },
+
+ hide: function () {
+ if (!this.div) {
+ return;
+ }
+ this.div.setAttribute('hidden', 'true');
+ }
+ };
+ return AnnotationsLayerBuilder;
+})();
+
+/**
+ * @constructor
+ * @implements IPDFAnnotationsLayerFactory
+ */
+function DefaultAnnotationsLayerFactory() {}
+DefaultAnnotationsLayerFactory.prototype = {
+ /**
+ * @param {HTMLDivElement} pageDiv
+ * @param {PDFPage} pdfPage
+ * @returns {AnnotationsLayerBuilder}
+ */
+ createAnnotationsLayerBuilder: function (pageDiv, pdfPage) {
+ return new AnnotationsLayerBuilder({
+ pageDiv: pageDiv,
+ pdfPage: pdfPage
+ });
+ }
+};
+
+
+/**
+ * @typedef {Object} PDFViewerOptions
+ * @property {HTMLDivElement} container - The container for the viewer element.
+ * @property {HTMLDivElement} viewer - (optional) The viewer element.
+ * @property {IPDFLinkService} linkService - The navigation/linking service.
+ * @property {PDFRenderingQueue} renderingQueue - (optional) The rendering
+ * queue object.
+ * @property {boolean} removePageBorders - (optional) Removes the border shadow
+ * around the pages. The default is false.
+ */
+
+/**
+ * Simple viewer control to display PDF content/pages.
+ * @class
+ * @implements {IRenderableView}
+ */
+var PDFViewer = (function pdfViewer() {
+ function PDFPageViewBuffer(size) {
+ var data = [];
+ this.push = function cachePush(view) {
+ var i = data.indexOf(view);
+ if (i >= 0) {
+ data.splice(i, 1);
+ }
+ data.push(view);
+ if (data.length > size) {
+ data.shift().destroy();
+ }
+ };
+ this.resize = function (newSize) {
+ size = newSize;
+ while (data.length > size) {
+ data.shift().destroy();
+ }
+ };
+ }
+
+ /**
+ * @constructs PDFViewer
+ * @param {PDFViewerOptions} options
+ */
+ function PDFViewer(options) {
+ this.container = options.container;
+ this.viewer = options.viewer || options.container.firstElementChild;
+ this.linkService = options.linkService || new SimpleLinkService(this);
+ this.removePageBorders = options.removePageBorders || false;
+
+ this.defaultRenderingQueue = !options.renderingQueue;
+ if (this.defaultRenderingQueue) {
+ // Custom rendering queue is not specified, using default one
+ this.renderingQueue = new PDFRenderingQueue();
+ this.renderingQueue.setViewer(this);
+ } else {
+ this.renderingQueue = options.renderingQueue;
+ }
+
+ this.scroll = watchScroll(this.container, this._scrollUpdate.bind(this));
+ this.updateInProgress = false;
+ this.presentationModeState = PresentationModeState.UNKNOWN;
+ this._resetView();
+
+ if (this.removePageBorders) {
+ this.viewer.classList.add('removePageBorders');
+ }
+ }
+
+ PDFViewer.prototype = /** @lends PDFViewer.prototype */{
+ get pagesCount() {
+ return this._pages.length;
+ },
+
+ getPageView: function (index) {
+ return this._pages[index];
+ },
+
+ get currentPageNumber() {
+ return this._currentPageNumber;
+ },
+
+ set currentPageNumber(val) {
+ if (!this.pdfDocument) {
+ this._currentPageNumber = val;
+ return;
+ }
+
+ var event = document.createEvent('UIEvents');
+ event.initUIEvent('pagechange', true, true, window, 0);
+ event.updateInProgress = this.updateInProgress;
+
+ if (!(0 < val && val <= this.pagesCount)) {
+ event.pageNumber = this._currentPageNumber;
+ event.previousPageNumber = val;
+ this.container.dispatchEvent(event);
+ return;
+ }
+
+ event.previousPageNumber = this._currentPageNumber;
+ this._currentPageNumber = val;
+ event.pageNumber = val;
+ this.container.dispatchEvent(event);
+ },
+
+ /**
+ * @returns {number}
+ */
+ get currentScale() {
+ return this._currentScale;
+ },
+
+ /**
+ * @param {number} val - Scale of the pages in percents.
+ */
+ set currentScale(val) {
+ if (isNaN(val)) {
+ throw new Error('Invalid numeric scale');
+ }
+ if (!this.pdfDocument) {
+ this._currentScale = val;
+ this._currentScaleValue = val.toString();
+ return;
+ }
+ this._setScale(val, false);
+ },
+
+ /**
+ * @returns {string}
+ */
+ get currentScaleValue() {
+ return this._currentScaleValue;
+ },
+
+ /**
+ * @param val - The scale of the pages (in percent or predefined value).
+ */
+ set currentScaleValue(val) {
+ if (!this.pdfDocument) {
+ this._currentScale = isNaN(val) ? UNKNOWN_SCALE : val;
+ this._currentScaleValue = val;
+ return;
+ }
+ this._setScale(val, false);
+ },
+
+ /**
+ * @returns {number}
+ */
+ get pagesRotation() {
+ return this._pagesRotation;
+ },
+
+ /**
+ * @param {number} rotation - The rotation of the pages (0, 90, 180, 270).
+ */
+ set pagesRotation(rotation) {
+ this._pagesRotation = rotation;
+
+ for (var i = 0, l = this._pages.length; i < l; i++) {
+ var pageView = this._pages[i];
+ pageView.update(pageView.scale, rotation);
+ }
+
+ this._setScale(this._currentScaleValue, true);
+ },
+
+ /**
+ * @param pdfDocument {PDFDocument}
+ */
+ setDocument: function (pdfDocument) {
+ if (this.pdfDocument) {
+ this._resetView();
+ }
+
+ this.pdfDocument = pdfDocument;
+ if (!pdfDocument) {
+ return;
+ }
+
+ var pagesCount = pdfDocument.numPages;
+ var pagesRefMap = this.pagesRefMap = {};
+ var self = this;
+
+ var resolvePagesPromise;
+ var pagesPromise = new Promise(function (resolve) {
+ resolvePagesPromise = resolve;
+ });
+ this.pagesPromise = pagesPromise;
+ pagesPromise.then(function () {
+ var event = document.createEvent('CustomEvent');
+ event.initCustomEvent('pagesloaded', true, true, {
+ pagesCount: pagesCount
+ });
+ self.container.dispatchEvent(event);
+ });
+
+ var isOnePageRenderedResolved = false;
+ var resolveOnePageRendered = null;
+ var onePageRendered = new Promise(function (resolve) {
+ resolveOnePageRendered = resolve;
+ });
+ this.onePageRendered = onePageRendered;
+
+ var bindOnAfterAndBeforeDraw = function (pageView) {
+ pageView.onBeforeDraw = function pdfViewLoadOnBeforeDraw() {
+ // Add the page to the buffer at the start of drawing. That way it can
+ // be evicted from the buffer and destroyed even if we pause its
+ // rendering.
+ self._buffer.push(this);
+ };
+ // when page is painted, using the image as thumbnail base
+ pageView.onAfterDraw = function pdfViewLoadOnAfterDraw() {
+ if (!isOnePageRenderedResolved) {
+ isOnePageRenderedResolved = true;
+ resolveOnePageRendered();
+ }
+ };
+ };
+
+ var firstPagePromise = pdfDocument.getPage(1);
+ this.firstPagePromise = firstPagePromise;
+
+ // Fetch a single page so we can get a viewport that will be the default
+ // viewport for all pages
+ return firstPagePromise.then(function(pdfPage) {
+ var scale = this._currentScale || 1.0;
+ var viewport = pdfPage.getViewport(scale * CSS_UNITS);
+ for (var pageNum = 1; pageNum <= pagesCount; ++pageNum) {
+ var textLayerFactory = null;
+ if (!PDFJS.disableTextLayer) {
+ textLayerFactory = this;
+ }
+ var pageView = new PDFPageView({
+ container: this.viewer,
+ id: pageNum,
+ scale: scale,
+ defaultViewport: viewport.clone(),
+ renderingQueue: this.renderingQueue,
+ textLayerFactory: textLayerFactory,
+ annotationsLayerFactory: this
+ });
+ bindOnAfterAndBeforeDraw(pageView);
+ this._pages.push(pageView);
+ }
+
+ // Fetch all the pages since the viewport is needed before printing
+ // starts to create the correct size canvas. Wait until one page is
+ // rendered so we don't tie up too many resources early on.
+ onePageRendered.then(function () {
+ if (!PDFJS.disableAutoFetch) {
+ var getPagesLeft = pagesCount;
+ for (var pageNum = 1; pageNum <= pagesCount; ++pageNum) {
+ pdfDocument.getPage(pageNum).then(function (pageNum, pdfPage) {
+ var pageView = self._pages[pageNum - 1];
+ if (!pageView.pdfPage) {
+ pageView.setPdfPage(pdfPage);
+ }
+ var refStr = pdfPage.ref.num + ' ' + pdfPage.ref.gen + ' R';
+ pagesRefMap[refStr] = pageNum;
+ getPagesLeft--;
+ if (!getPagesLeft) {
+ resolvePagesPromise();
+ }
+ }.bind(null, pageNum));
+ }
+ } else {
+ // XXX: Printing is semi-broken with auto fetch disabled.
+ resolvePagesPromise();
+ }
+ });
+
+ var event = document.createEvent('CustomEvent');
+ event.initCustomEvent('pagesinit', true, true, null);
+ self.container.dispatchEvent(event);
+
+ if (this.defaultRenderingQueue) {
+ this.update();
+ }
+
+ if (this.findController) {
+ this.findController.resolveFirstPage();
+ }
+ }.bind(this));
+ },
+
+ _resetView: function () {
+ this._pages = [];
+ this._currentPageNumber = 1;
+ this._currentScale = UNKNOWN_SCALE;
+ this._currentScaleValue = null;
+ this._buffer = new PDFPageViewBuffer(DEFAULT_CACHE_SIZE);
+ this._location = null;
+ this._pagesRotation = 0;
+ this._pagesRequests = [];
+
+ var container = this.viewer;
+ while (container.hasChildNodes()) {
+ container.removeChild(container.lastChild);
+ }
+ },
+
+ _scrollUpdate: function () {
+ if (this.pagesCount === 0) {
+ return;
+ }
+ this.update();
+ for (var i = 0, ii = this._pages.length; i < ii; i++) {
+ this._pages[i].updatePosition();
+ }
+ },
+
+ _setScaleDispatchEvent: function pdfViewer_setScaleDispatchEvent(
+ newScale, newValue, preset) {
+ var event = document.createEvent('UIEvents');
+ event.initUIEvent('scalechange', true, true, window, 0);
+ event.scale = newScale;
+ if (preset) {
+ event.presetValue = newValue;
+ }
+ this.container.dispatchEvent(event);
+ },
+
+ _setScaleUpdatePages: function pdfViewer_setScaleUpdatePages(
+ newScale, newValue, noScroll, preset) {
+ this._currentScaleValue = newValue;
+ if (newScale === this._currentScale) {
+ if (preset) {
+ this._setScaleDispatchEvent(newScale, newValue, true);
+ }
+ return;
+ }
+
+ for (var i = 0, ii = this._pages.length; i < ii; i++) {
+ this._pages[i].update(newScale);
+ }
+ this._currentScale = newScale;
+
+ if (!noScroll) {
+ var page = this._currentPageNumber, dest;
+ if (this._location && !IGNORE_CURRENT_POSITION_ON_ZOOM &&
+ !(this.isInPresentationMode || this.isChangingPresentationMode)) {
+ page = this._location.pageNumber;
+ dest = [null, { name: 'XYZ' }, this._location.left,
+ this._location.top, null];
+ }
+ this.scrollPageIntoView(page, dest);
+ }
+
+ this._setScaleDispatchEvent(newScale, newValue, preset);
+ },
+
+ _setScale: function pdfViewer_setScale(value, noScroll) {
+ if (value === 'custom') {
+ return;
+ }
+ var scale = parseFloat(value);
+
+ if (scale > 0) {
+ this._setScaleUpdatePages(scale, value, noScroll, false);
+ } else {
+ var currentPage = this._pages[this._currentPageNumber - 1];
+ if (!currentPage) {
+ return;
+ }
+ var hPadding = (this.isInPresentationMode || this.removePageBorders) ?
+ 0 : SCROLLBAR_PADDING;
+ var vPadding = (this.isInPresentationMode || this.removePageBorders) ?
+ 0 : VERTICAL_PADDING;
+ var pageWidthScale = (this.container.clientWidth - hPadding) /
+ currentPage.width * currentPage.scale;
+ var pageHeightScale = (this.container.clientHeight - vPadding) /
+ currentPage.height * currentPage.scale;
+ switch (value) {
+ case 'page-actual':
+ scale = 1;
+ break;
+ case 'page-width':
+ scale = pageWidthScale;
+ break;
+ case 'page-height':
+ scale = pageHeightScale;
+ break;
+ case 'page-fit':
+ scale = Math.min(pageWidthScale, pageHeightScale);
+ break;
+ case 'auto':
+ var isLandscape = (currentPage.width > currentPage.height);
+ // For pages in landscape mode, fit the page height to the viewer
+ // *unless* the page would thus become too wide to fit horizontally.
+ var horizontalScale = isLandscape ?
+ Math.min(pageHeightScale, pageWidthScale) : pageWidthScale;
+ scale = Math.min(MAX_AUTO_SCALE, horizontalScale);
+ break;
+ default:
+ console.error('pdfViewSetScale: \'' + value +
+ '\' is an unknown zoom value.');
+ return;
+ }
+ this._setScaleUpdatePages(scale, value, noScroll, true);
+ }
+ },
+
+ /**
+ * Scrolls page into view.
+ * @param {number} pageNumber
+ * @param {Array} dest - (optional) original PDF destination array:
+ * <page-ref> </XYZ|FitXXX> <args..>
+ */
+ scrollPageIntoView: function PDFViewer_scrollPageIntoView(pageNumber,
+ dest) {
+ var pageView = this._pages[pageNumber - 1];
+
+ if (this.isInPresentationMode) {
+ if (this.linkService.page !== pageView.id) {
+ // Avoid breaking getVisiblePages in presentation mode.
+ this.linkService.page = pageView.id;
+ return;
+ }
+ dest = null;
+ // Fixes the case when PDF has different page sizes.
+ this._setScale(this.currentScaleValue, true);
+ }
+ if (!dest) {
+ scrollIntoView(pageView.div);
+ return;
+ }
+
+ var x = 0, y = 0;
+ var width = 0, height = 0, widthScale, heightScale;
+ var changeOrientation = (pageView.rotation % 180 === 0 ? false : true);
+ var pageWidth = (changeOrientation ? pageView.height : pageView.width) /
+ pageView.scale / CSS_UNITS;
+ var pageHeight = (changeOrientation ? pageView.width : pageView.height) /
+ pageView.scale / CSS_UNITS;
+ var scale = 0;
+ switch (dest[1].name) {
+ case 'XYZ':
+ x = dest[2];
+ y = dest[3];
+ scale = dest[4];
+ // If x and/or y coordinates are not supplied, default to
+ // _top_ left of the page (not the obvious bottom left,
+ // since aligning the bottom of the intended page with the
+ // top of the window is rarely helpful).
+ x = x !== null ? x : 0;
+ y = y !== null ? y : pageHeight;
+ break;
+ case 'Fit':
+ case 'FitB':
+ scale = 'page-fit';
+ break;
+ case 'FitH':
+ case 'FitBH':
+ y = dest[2];
+ scale = 'page-width';
+ break;
+ case 'FitV':
+ case 'FitBV':
+ x = dest[2];
+ width = pageWidth;
+ height = pageHeight;
+ scale = 'page-height';
+ break;
+ case 'FitR':
+ x = dest[2];
+ y = dest[3];
+ width = dest[4] - x;
+ height = dest[5] - y;
+ var viewerContainer = this.container;
+ var hPadding = this.removePageBorders ? 0 : SCROLLBAR_PADDING;
+ var vPadding = this.removePageBorders ? 0 : VERTICAL_PADDING;
+
+ widthScale = (viewerContainer.clientWidth - hPadding) /
+ width / CSS_UNITS;
+ heightScale = (viewerContainer.clientHeight - vPadding) /
+ height / CSS_UNITS;
+ scale = Math.min(Math.abs(widthScale), Math.abs(heightScale));
+ break;
+ default:
+ return;
+ }
+
+ if (scale && scale !== this.currentScale) {
+ this.currentScaleValue = scale;
+ } else if (this.currentScale === UNKNOWN_SCALE) {
+ this.currentScaleValue = DEFAULT_SCALE;
+ }
+
+ if (scale === 'page-fit' && !dest[4]) {
+ scrollIntoView(pageView.div);
+ return;
+ }
+
+ var boundingRect = [
+ pageView.viewport.convertToViewportPoint(x, y),
+ pageView.viewport.convertToViewportPoint(x + width, y + height)
+ ];
+ var left = Math.min(boundingRect[0][0], boundingRect[1][0]);
+ var top = Math.min(boundingRect[0][1], boundingRect[1][1]);
+
+ scrollIntoView(pageView.div, { left: left, top: top });
+ },
+
+ _updateLocation: function (firstPage) {
+ var currentScale = this._currentScale;
+ var currentScaleValue = this._currentScaleValue;
+ var normalizedScaleValue =
+ parseFloat(currentScaleValue) === currentScale ?
+ Math.round(currentScale * 10000) / 100 : currentScaleValue;
+
+ var pageNumber = firstPage.id;
+ var pdfOpenParams = '#page=' + pageNumber;
+ pdfOpenParams += '&zoom=' + normalizedScaleValue;
+ var currentPageView = this._pages[pageNumber - 1];
+ var container = this.container;
+ var topLeft = currentPageView.getPagePoint(
+ (container.scrollLeft - firstPage.x),
+ (container.scrollTop - firstPage.y));
+ var intLeft = Math.round(topLeft[0]);
+ var intTop = Math.round(topLeft[1]);
+ pdfOpenParams += ',' + intLeft + ',' + intTop;
+
+ this._location = {
+ pageNumber: pageNumber,
+ scale: normalizedScaleValue,
+ top: intTop,
+ left: intLeft,
+ pdfOpenParams: pdfOpenParams
+ };
+ },
+
+ update: function () {
+ var visible = this._getVisiblePages();
+ var visiblePages = visible.views;
+ if (visiblePages.length === 0) {
+ return;
+ }
+
+ this.updateInProgress = true;
+
+ var suggestedCacheSize = Math.max(DEFAULT_CACHE_SIZE,
+ 2 * visiblePages.length + 1);
+ this._buffer.resize(suggestedCacheSize);
+
+ this.renderingQueue.renderHighestPriority(visible);
+
+ var currentId = this.currentPageNumber;
+ var firstPage = visible.first;
+
+ for (var i = 0, ii = visiblePages.length, stillFullyVisible = false;
+ i < ii; ++i) {
+ var page = visiblePages[i];
+
+ if (page.percent < 100) {
+ break;
+ }
+ if (page.id === currentId) {
+ stillFullyVisible = true;
+ break;
+ }
+ }
+
+ if (!stillFullyVisible) {
+ currentId = visiblePages[0].id;
+ }
+
+ if (!this.isInPresentationMode) {
+ this.currentPageNumber = currentId;
+ }
+
+ this._updateLocation(firstPage);
+
+ this.updateInProgress = false;
+
+ var event = document.createEvent('UIEvents');
+ event.initUIEvent('updateviewarea', true, true, window, 0);
+ event.location = this._location;
+ this.container.dispatchEvent(event);
+ },
+
+ containsElement: function (element) {
+ return this.container.contains(element);
+ },
+
+ focus: function () {
+ this.container.focus();
+ },
+
+ get isInPresentationMode() {
+ return this.presentationModeState === PresentationModeState.FULLSCREEN;
+ },
+
+ get isChangingPresentationMode() {
+ return this.PresentationModeState === PresentationModeState.CHANGING;
+ },
+
+ get isHorizontalScrollbarEnabled() {
+ return (this.isInPresentationMode ?
+ false : (this.container.scrollWidth > this.container.clientWidth));
+ },
+
+ _getVisiblePages: function () {
+ if (!this.isInPresentationMode) {
+ return getVisibleElements(this.container, this._pages, true);
+ } else {
+ // The algorithm in getVisibleElements doesn't work in all browsers and
+ // configurations when presentation mode is active.
+ var visible = [];
+ var currentPage = this._pages[this._currentPageNumber - 1];
+ visible.push({ id: currentPage.id, view: currentPage });
+ return { first: currentPage, last: currentPage, views: visible };
+ }
+ },
+
+ cleanup: function () {
+ for (var i = 0, ii = this._pages.length; i < ii; i++) {
+ if (this._pages[i] &&
+ this._pages[i].renderingState !== RenderingStates.FINISHED) {
+ this._pages[i].reset();
+ }
+ }
+ },
+
+ /**
+ * @param {PDFPageView} pageView
+ * @returns {PDFPage}
+ * @private
+ */
+ _ensurePdfPageLoaded: function (pageView) {
+ if (pageView.pdfPage) {
+ return Promise.resolve(pageView.pdfPage);
+ }
+ var pageNumber = pageView.id;
+ if (this._pagesRequests[pageNumber]) {
+ return this._pagesRequests[pageNumber];
+ }
+ var promise = this.pdfDocument.getPage(pageNumber).then(
+ function (pdfPage) {
+ pageView.setPdfPage(pdfPage);
+ this._pagesRequests[pageNumber] = null;
+ return pdfPage;
+ }.bind(this));
+ this._pagesRequests[pageNumber] = promise;
+ return promise;
+ },
+
+ forceRendering: function (currentlyVisiblePages) {
+ var visiblePages = currentlyVisiblePages || this._getVisiblePages();
+ var pageView = this.renderingQueue.getHighestPriority(visiblePages,
+ this._pages,
+ this.scroll.down);
+ if (pageView) {
+ this._ensurePdfPageLoaded(pageView).then(function () {
+ this.renderingQueue.renderView(pageView);
+ }.bind(this));
+ return true;
+ }
+ return false;
+ },
+
+ getPageTextContent: function (pageIndex) {
+ return this.pdfDocument.getPage(pageIndex + 1).then(function (page) {
+ return page.getTextContent();
+ });
+ },
+
+ /**
+ * @param {HTMLDivElement} textLayerDiv
+ * @param {number} pageIndex
+ * @param {PageViewport} viewport
+ * @returns {TextLayerBuilder}
+ */
+ createTextLayerBuilder: function (textLayerDiv, pageIndex, viewport) {
+ return new TextLayerBuilder({
+ textLayerDiv: textLayerDiv,
+ pageIndex: pageIndex,
+ viewport: viewport,
+ findController: this.isInPresentationMode ? null : this.findController
+ });
+ },
+
+ /**
+ * @param {HTMLDivElement} pageDiv
+ * @param {PDFPage} pdfPage
+ * @returns {AnnotationsLayerBuilder}
+ */
+ createAnnotationsLayerBuilder: function (pageDiv, pdfPage) {
+ return new AnnotationsLayerBuilder({
+ pageDiv: pageDiv,
+ pdfPage: pdfPage,
+ linkService: this.linkService
+ });
+ },
+
+ setFindController: function (findController) {
+ this.findController = findController;
+ },
+ };
+
+ return PDFViewer;
+})();
+
+var SimpleLinkService = (function SimpleLinkServiceClosure() {
+ function SimpleLinkService(pdfViewer) {
+ this.pdfViewer = pdfViewer;
+ }
+ SimpleLinkService.prototype = {
+ /**
+ * @returns {number}
+ */
+ get page() {
+ return this.pdfViewer.currentPageNumber;
+ },
+ /**
+ * @param {number} value
+ */
+ set page(value) {
+ this.pdfViewer.currentPageNumber = value;
+ },
+ /**
+ * @param dest - The PDF destination object.
+ */
+ navigateTo: function (dest) {},
+ /**
+ * @param dest - The PDF destination object.
+ * @returns {string} The hyperlink to the PDF object.
+ */
+ getDestinationHash: function (dest) {
+ return '#';
+ },
+ /**
+ * @param hash - The PDF parameters/hash.
+ * @returns {string} The hyperlink to the PDF object.
+ */
+ getAnchorUrl: function (hash) {
+ return '#';
+ },
+ /**
+ * @param {string} hash
+ */
+ setHash: function (hash) {},
+ /**
+ * @param {string} action
+ */
+ executeNamedAction: function (action) {},
+ };
+ return SimpleLinkService;
+})();
+
+
+var THUMBNAIL_SCROLL_MARGIN = -19;
+
+
+var THUMBNAIL_WIDTH = 98; // px
+var THUMBNAIL_CANVAS_BORDER_WIDTH = 1; // px
+
+/**
+ * @typedef {Object} PDFThumbnailViewOptions
+ * @property {HTMLDivElement} container - The viewer element.
+ * @property {number} id - The thumbnail's unique ID (normally its number).
+ * @property {PageViewport} defaultViewport - The page viewport.
+ * @property {IPDFLinkService} linkService - The navigation/linking service.
+ * @property {PDFRenderingQueue} renderingQueue - The rendering queue object.
+ */
+
+/**
+ * @class
+ * @implements {IRenderableView}
+ */
+var PDFThumbnailView = (function PDFThumbnailViewClosure() {
+ function getTempCanvas(width, height) {
+ var tempCanvas = PDFThumbnailView.tempImageCache;
+ if (!tempCanvas) {
+ tempCanvas = document.createElement('canvas');
+ PDFThumbnailView.tempImageCache = tempCanvas;
+ }
+ tempCanvas.width = width;
+ tempCanvas.height = height;
+
+ // Since this is a temporary canvas, we need to fill the canvas with a white
+ // background ourselves. |_getPageDrawContext| uses CSS rules for this.
+ var ctx = tempCanvas.getContext('2d');
+ ctx.save();
+ ctx.fillStyle = 'rgb(255, 255, 255)';
+ ctx.fillRect(0, 0, width, height);
+ ctx.restore();
+ return tempCanvas;
+ }
+
+ /**
+ * @constructs PDFThumbnailView
+ * @param {PDFThumbnailViewOptions} options
+ */
+ function PDFThumbnailView(options) {
+ var container = options.container;
+ var id = options.id;
+ var defaultViewport = options.defaultViewport;
+ var linkService = options.linkService;
+ var renderingQueue = options.renderingQueue;
+
+ this.id = id;
+ this.renderingId = 'thumbnail' + id;
+
+ this.pdfPage = null;
+ this.rotation = 0;
+ this.viewport = defaultViewport;
+ this.pdfPageRotate = defaultViewport.rotation;
+
+ this.linkService = linkService;
+ this.renderingQueue = renderingQueue;
+
+ this.hasImage = false;
+ this.resume = null;
+ this.renderingState = RenderingStates.INITIAL;
+
+ this.pageWidth = this.viewport.width;
+ this.pageHeight = this.viewport.height;
+ this.pageRatio = this.pageWidth / this.pageHeight;
+
+ this.canvasWidth = THUMBNAIL_WIDTH;
+ this.canvasHeight = (this.canvasWidth / this.pageRatio) | 0;
+ this.scale = this.canvasWidth / this.pageWidth;
+
+ var anchor = document.createElement('a');
+ anchor.href = linkService.getAnchorUrl('#page=' + id);
+ anchor.title = mozL10n.get('thumb_page_title', {page: id}, 'Page {{page}}');
+ anchor.onclick = function stopNavigation() {
+ linkService.page = id;
+ return false;
+ };
+
+ var div = document.createElement('div');
+ div.id = 'thumbnailContainer' + id;
+ div.className = 'thumbnail';
+ this.div = div;
+
+ if (id === 1) {
+ // Highlight the thumbnail of the first page when no page number is
+ // specified (or exists in cache) when the document is loaded.
+ div.classList.add('selected');
+ }
+
+ var ring = document.createElement('div');
+ ring.className = 'thumbnailSelectionRing';
+ var borderAdjustment = 2 * THUMBNAIL_CANVAS_BORDER_WIDTH;
+ ring.style.width = this.canvasWidth + borderAdjustment + 'px';
+ ring.style.height = this.canvasHeight + borderAdjustment + 'px';
+ this.ring = ring;
+
+ div.appendChild(ring);
+ anchor.appendChild(div);
+ container.appendChild(anchor);
+ }
+
+ PDFThumbnailView.prototype = {
+ setPdfPage: function PDFThumbnailView_setPdfPage(pdfPage) {
+ this.pdfPage = pdfPage;
+ this.pdfPageRotate = pdfPage.rotate;
+ var totalRotation = (this.rotation + this.pdfPageRotate) % 360;
+ this.viewport = pdfPage.getViewport(1, totalRotation);
+ this.reset();
+ },
+
+ reset: function PDFThumbnailView_reset() {
+ if (this.renderTask) {
+ this.renderTask.cancel();
+ }
+ this.hasImage = false;
+ this.resume = null;
+ this.renderingState = RenderingStates.INITIAL;
+
+ this.pageWidth = this.viewport.width;
+ this.pageHeight = this.viewport.height;
+ this.pageRatio = this.pageWidth / this.pageHeight;
+
+ this.canvasHeight = (this.canvasWidth / this.pageRatio) | 0;
+ this.scale = (this.canvasWidth / this.pageWidth);
+
+ this.div.removeAttribute('data-loaded');
+ var ring = this.ring;
+ var childNodes = ring.childNodes;
+ for (var i = childNodes.length - 1; i >= 0; i--) {
+ ring.removeChild(childNodes[i]);
+ }
+ var borderAdjustment = 2 * THUMBNAIL_CANVAS_BORDER_WIDTH;
+ ring.style.width = this.canvasWidth + borderAdjustment + 'px';
+ ring.style.height = this.canvasHeight + borderAdjustment + 'px';
+
+ if (this.canvas) {
+ // Zeroing the width and height causes Firefox to release graphics
+ // resources immediately, which can greatly reduce memory consumption.
+ this.canvas.width = 0;
+ this.canvas.height = 0;
+ delete this.canvas;
+ }
+ },
+
+ update: function PDFThumbnailView_update(rotation) {
+ if (typeof rotation !== 'undefined') {
+ this.rotation = rotation;
+ }
+ var totalRotation = (this.rotation + this.pdfPageRotate) % 360;
+ this.viewport = this.viewport.clone({
+ scale: 1,
+ rotation: totalRotation
+ });
+ this.reset();
+ },
+
+ /**
+ * @private
+ */
+ _getPageDrawContext:
+ function PDFThumbnailView_getPageDrawContext(noCtxScale) {
+ var canvas = document.createElement('canvas');
+ canvas.id = this.renderingId;
+
+ canvas.className = 'thumbnailImage';
+ canvas.setAttribute('aria-label', mozL10n.get('thumb_page_canvas',
+ {page: this.id}, 'Thumbnail of Page {{page}}'));
+
+ this.canvas = canvas;
+ this.div.setAttribute('data-loaded', true);
+ this.ring.appendChild(canvas);
+
+ var ctx = canvas.getContext('2d');
+ var outputScale = getOutputScale(ctx);
+ canvas.width = (this.canvasWidth * outputScale.sx) | 0;
+ canvas.height = (this.canvasHeight * outputScale.sy) | 0;
+ canvas.style.width = this.canvasWidth + 'px';
+ canvas.style.height = this.canvasHeight + 'px';
+ if (!noCtxScale && outputScale.scaled) {
+ ctx.scale(outputScale.sx, outputScale.sy);
+ }
+ return ctx;
+ },
+
+ draw: function PDFThumbnailView_draw() {
+ if (this.renderingState !== RenderingStates.INITIAL) {
+ console.error('Must be in new state before drawing');
+ }
+ if (this.hasImage) {
+ return Promise.resolve(undefined);
+ }
+ this.hasImage = true;
+ this.renderingState = RenderingStates.RUNNING;
+
+ var resolveRenderPromise, rejectRenderPromise;
+ var promise = new Promise(function (resolve, reject) {
+ resolveRenderPromise = resolve;
+ rejectRenderPromise = reject;
+ });
+
+ var self = this;
+ function thumbnailDrawCallback(error) {
+ // The renderTask may have been replaced by a new one, so only remove
+ // the reference to the renderTask if it matches the one that is
+ // triggering this callback.
+ if (renderTask === self.renderTask) {
+ self.renderTask = null;
+ }
+ if (error === 'cancelled') {
+ rejectRenderPromise(error);
+ return;
+ }
+ self.renderingState = RenderingStates.FINISHED;
+
+ if (!error) {
+ resolveRenderPromise(undefined);
+ } else {
+ rejectRenderPromise(error);
+ }
+ }
+
+ var ctx = this._getPageDrawContext();
+ var drawViewport = this.viewport.clone({ scale: this.scale });
+ var renderContinueCallback = function renderContinueCallback(cont) {
+ if (!self.renderingQueue.isHighestPriority(self)) {
+ self.renderingState = RenderingStates.PAUSED;
+ self.resume = function resumeCallback() {
+ self.renderingState = RenderingStates.RUNNING;
+ cont();
+ };
+ return;
+ }
+ cont();
+ };
+
+ var renderContext = {
+ canvasContext: ctx,
+ viewport: drawViewport,
+ continueCallback: renderContinueCallback
+ };
+ var renderTask = this.renderTask = this.pdfPage.render(renderContext);
+
+ renderTask.promise.then(
+ function pdfPageRenderCallback() {
+ thumbnailDrawCallback(null);
+ },
+ function pdfPageRenderError(error) {
+ thumbnailDrawCallback(error);
+ }
+ );
+ return promise;
+ },
+
+ setImage: function PDFThumbnailView_setImage(pageView) {
+ var img = pageView.canvas;
+ if (this.hasImage || !img) {
+ return;
+ }
+ if (!this.pdfPage) {
+ this.setPdfPage(pageView.pdfPage);
+ }
+ this.hasImage = true;
+ this.renderingState = RenderingStates.FINISHED;
+
+ var ctx = this._getPageDrawContext(true);
+ var canvas = ctx.canvas;
+
+ if (img.width <= 2 * canvas.width) {
+ ctx.drawImage(img, 0, 0, img.width, img.height,
+ 0, 0, canvas.width, canvas.height);
+ return;
+ }
+ // drawImage does an awful job of rescaling the image, doing it gradually.
+ var MAX_NUM_SCALING_STEPS = 3;
+ var reducedWidth = canvas.width << MAX_NUM_SCALING_STEPS;
+ var reducedHeight = canvas.height << MAX_NUM_SCALING_STEPS;
+ var reducedImage = getTempCanvas(reducedWidth, reducedHeight);
+ var reducedImageCtx = reducedImage.getContext('2d');
+
+ while (reducedWidth > img.width || reducedHeight > img.height) {
+ reducedWidth >>= 1;
+ reducedHeight >>= 1;
+ }
+ reducedImageCtx.drawImage(img, 0, 0, img.width, img.height,
+ 0, 0, reducedWidth, reducedHeight);
+ while (reducedWidth > 2 * canvas.width) {
+ reducedImageCtx.drawImage(reducedImage,
+ 0, 0, reducedWidth, reducedHeight,
+ 0, 0, reducedWidth >> 1, reducedHeight >> 1);
+ reducedWidth >>= 1;
+ reducedHeight >>= 1;
+ }
+ ctx.drawImage(reducedImage, 0, 0, reducedWidth, reducedHeight,
+ 0, 0, canvas.width, canvas.height);
+ }
+ };
+
+ return PDFThumbnailView;
+})();
+
+PDFThumbnailView.tempImageCache = null;
+
+
+/**
+ * @typedef {Object} PDFThumbnailViewerOptions
+ * @property {HTMLDivElement} container - The container for the thumbnail
+ * elements.
+ * @property {IPDFLinkService} linkService - The navigation/linking service.
+ * @property {PDFRenderingQueue} renderingQueue - The rendering queue object.
+ */
+
+/**
+ * Simple viewer control to display thumbnails for pages.
+ * @class
+ * @implements {IRenderableView}
+ */
+var PDFThumbnailViewer = (function PDFThumbnailViewerClosure() {
+ /**
+ * @constructs PDFThumbnailViewer
+ * @param {PDFThumbnailViewerOptions} options
+ */
+ function PDFThumbnailViewer(options) {
+ this.container = options.container;
+ this.renderingQueue = options.renderingQueue;
+ this.linkService = options.linkService;
+
+ this.scroll = watchScroll(this.container, this._scrollUpdated.bind(this));
+ this._resetView();
+ }
+
+ PDFThumbnailViewer.prototype = {
+ /**
+ * @private
+ */
+ _scrollUpdated: function PDFThumbnailViewer_scrollUpdated() {
+ this.renderingQueue.renderHighestPriority();
+ },
+
+ getThumbnail: function PDFThumbnailViewer_getThumbnail(index) {
+ return this.thumbnails[index];
+ },
+
+ /**
+ * @private
+ */
+ _getVisibleThumbs: function PDFThumbnailViewer_getVisibleThumbs() {
+ return getVisibleElements(this.container, this.thumbnails);
+ },
+
+ scrollThumbnailIntoView:
+ function PDFThumbnailViewer_scrollThumbnailIntoView(page) {
+ var selected = document.querySelector('.thumbnail.selected');
+ if (selected) {
+ selected.classList.remove('selected');
+ }
+ var thumbnail = document.getElementById('thumbnailContainer' + page);
+ if (thumbnail) {
+ thumbnail.classList.add('selected');
+ }
+ var visibleThumbs = this._getVisibleThumbs();
+ var numVisibleThumbs = visibleThumbs.views.length;
+
+ // If the thumbnail isn't currently visible, scroll it into view.
+ if (numVisibleThumbs > 0) {
+ var first = visibleThumbs.first.id;
+ // Account for only one thumbnail being visible.
+ var last = (numVisibleThumbs > 1 ? visibleThumbs.last.id : first);
+ if (page <= first || page >= last) {
+ scrollIntoView(thumbnail, { top: THUMBNAIL_SCROLL_MARGIN });
+ }
+ }
+ },
+
+ get pagesRotation() {
+ return this._pagesRotation;
+ },
+
+ set pagesRotation(rotation) {
+ this._pagesRotation = rotation;
+ for (var i = 0, l = this.thumbnails.length; i < l; i++) {
+ var thumb = this.thumbnails[i];
+ thumb.update(rotation);
+ }
+ },
+
+ cleanup: function PDFThumbnailViewer_cleanup() {
+ var tempCanvas = PDFThumbnailView.tempImageCache;
+ if (tempCanvas) {
+ // Zeroing the width and height causes Firefox to release graphics
+ // resources immediately, which can greatly reduce memory consumption.
+ tempCanvas.width = 0;
+ tempCanvas.height = 0;
+ }
+ PDFThumbnailView.tempImageCache = null;
+ },
+
+ /**
+ * @private
+ */
+ _resetView: function PDFThumbnailViewer_resetView() {
+ this.thumbnails = [];
+ this._pagesRotation = 0;
+ this._pagesRequests = [];
+ },
+
+ setDocument: function PDFThumbnailViewer_setDocument(pdfDocument) {
+ if (this.pdfDocument) {
+ // cleanup of the elements and views
+ var thumbsView = this.container;
+ while (thumbsView.hasChildNodes()) {
+ thumbsView.removeChild(thumbsView.lastChild);
+ }
+ this._resetView();
+ }
+
+ this.pdfDocument = pdfDocument;
+ if (!pdfDocument) {
+ return Promise.resolve();
+ }
+
+ return pdfDocument.getPage(1).then(function (firstPage) {
+ var pagesCount = pdfDocument.numPages;
+ var viewport = firstPage.getViewport(1.0);
+ for (var pageNum = 1; pageNum <= pagesCount; ++pageNum) {
+ var thumbnail = new PDFThumbnailView({
+ container: this.container,
+ id: pageNum,
+ defaultViewport: viewport.clone(),
+ linkService: this.linkService,
+ renderingQueue: this.renderingQueue
+ });
+ this.thumbnails.push(thumbnail);
+ }
+ }.bind(this));
+ },
+
+ /**
+ * @param {PDFPageView} pageView
+ * @returns {PDFPage}
+ * @private
+ */
+ _ensurePdfPageLoaded:
+ function PDFThumbnailViewer_ensurePdfPageLoaded(thumbView) {
+ if (thumbView.pdfPage) {
+ return Promise.resolve(thumbView.pdfPage);
+ }
+ var pageNumber = thumbView.id;
+ if (this._pagesRequests[pageNumber]) {
+ return this._pagesRequests[pageNumber];
+ }
+ var promise = this.pdfDocument.getPage(pageNumber).then(
+ function (pdfPage) {
+ thumbView.setPdfPage(pdfPage);
+ this._pagesRequests[pageNumber] = null;
+ return pdfPage;
+ }.bind(this));
+ this._pagesRequests[pageNumber] = promise;
+ return promise;
+ },
+
+ ensureThumbnailVisible:
+ function PDFThumbnailViewer_ensureThumbnailVisible(page) {
+ // Ensure that the thumbnail of the current page is visible
+ // when switching from another view.
+ scrollIntoView(document.getElementById('thumbnailContainer' + page));
+ },
+
+ forceRendering: function () {
+ var visibleThumbs = this._getVisibleThumbs();
+ var thumbView = this.renderingQueue.getHighestPriority(visibleThumbs,
+ this.thumbnails,
+ this.scroll.down);
+ if (thumbView) {
+ this._ensurePdfPageLoaded(thumbView).then(function () {
+ this.renderingQueue.renderView(thumbView);
+ }.bind(this));
+ return true;
+ }
+ return false;
+ }
+ };
+
+ return PDFThumbnailViewer;
+})();
+
+
+/**
+ * @typedef {Object} PDFOutlineViewOptions
+ * @property {HTMLDivElement} container - The viewer element.
+ * @property {Array} outline - An array of outline objects.
+ * @property {IPDFLinkService} linkService - The navigation/linking service.
+ */
+
+/**
+ * @class
+ */
+var PDFOutlineView = (function PDFOutlineViewClosure() {
+ /**
+ * @constructs PDFOutlineView
+ * @param {PDFOutlineViewOptions} options
+ */
+ function PDFOutlineView(options) {
+ this.container = options.container;
+ this.outline = options.outline;
+ this.linkService = options.linkService;
+ }
+
+ PDFOutlineView.prototype = {
+ reset: function PDFOutlineView_reset() {
+ var container = this.container;
+ while (container.firstChild) {
+ container.removeChild(container.firstChild);
+ }
+ },
+
+ /**
+ * @private
+ */
+ _dispatchEvent: function PDFOutlineView_dispatchEvent(outlineCount) {
+ var event = document.createEvent('CustomEvent');
+ event.initCustomEvent('outlineloaded', true, true, {
+ outlineCount: outlineCount
+ });
+ this.container.dispatchEvent(event);
+ },
+
+ /**
+ * @private
+ */
+ _bindLink: function PDFOutlineView_bindLink(element, item) {
+ var linkService = this.linkService;
+ element.href = linkService.getDestinationHash(item.dest);
+ element.onclick = function goToDestination(e) {
+ linkService.navigateTo(item.dest);
+ return false;
+ };
+ },
+
+ render: function PDFOutlineView_render() {
+ var outline = this.outline;
+ var outlineCount = 0;
+
+ this.reset();
+
+ if (!outline) {
+ this._dispatchEvent(outlineCount);
+ return;
+ }
+
+ var queue = [{ parent: this.container, items: this.outline }];
+ while (queue.length > 0) {
+ var levelData = queue.shift();
+ for (var i = 0, len = levelData.items.length; i < len; i++) {
+ var item = levelData.items[i];
+ var div = document.createElement('div');
+ div.className = 'outlineItem';
+ var element = document.createElement('a');
+ this._bindLink(element, item);
+ element.textContent = item.title;
+ div.appendChild(element);
+
+ if (item.items.length > 0) {
+ var itemsDiv = document.createElement('div');
+ itemsDiv.className = 'outlineItems';
+ div.appendChild(itemsDiv);
+ queue.push({ parent: itemsDiv, items: item.items });
+ }
+
+ levelData.parent.appendChild(div);
+ outlineCount++;
+ }
+ }
+
+ this._dispatchEvent(outlineCount);
+ }
+ };
+
+ return PDFOutlineView;
+})();
+
+
+/**
+ * @typedef {Object} PDFAttachmentViewOptions
+ * @property {HTMLDivElement} container - The viewer element.
+ * @property {Array} attachments - An array of attachment objects.
+ * @property {DownloadManager} downloadManager - The download manager.
+ */
+
+/**
+ * @class
+ */
+var PDFAttachmentView = (function PDFAttachmentViewClosure() {
+ /**
+ * @constructs PDFAttachmentView
+ * @param {PDFAttachmentViewOptions} options
+ */
+ function PDFAttachmentView(options) {
+ this.container = options.container;
+ this.attachments = options.attachments;
+ this.downloadManager = options.downloadManager;
+ }
+
+ PDFAttachmentView.prototype = {
+ reset: function PDFAttachmentView_reset() {
+ var container = this.container;
+ while (container.firstChild) {
+ container.removeChild(container.firstChild);
+ }
+ },
+
+ /**
+ * @private
+ */
+ _dispatchEvent: function PDFAttachmentView_dispatchEvent(attachmentsCount) {
+ var event = document.createEvent('CustomEvent');
+ event.initCustomEvent('attachmentsloaded', true, true, {
+ attachmentsCount: attachmentsCount
+ });
+ this.container.dispatchEvent(event);
+ },
+
+ /**
+ * @private
+ */
+ _bindLink: function PDFAttachmentView_bindLink(button, content, filename) {
+ button.onclick = function downloadFile(e) {
+ this.downloadManager.downloadData(content, filename, '');
+ return false;
+ }.bind(this);
+ },
+
+ render: function PDFAttachmentView_render() {
+ var attachments = this.attachments;
+ var attachmentsCount = 0;
+
+ this.reset();
+
+ if (!attachments) {
+ this._dispatchEvent(attachmentsCount);
+ return;
+ }
+
+ var names = Object.keys(attachments).sort(function(a, b) {
+ return a.toLowerCase().localeCompare(b.toLowerCase());
+ });
+ attachmentsCount = names.length;
+
+ for (var i = 0; i < attachmentsCount; i++) {
+ var item = attachments[names[i]];
+ var filename = getFileName(item.filename);
+ var div = document.createElement('div');
+ div.className = 'attachmentsItem';
+ var button = document.createElement('button');
+ this._bindLink(button, item.content, filename);
+ button.textContent = filename;
+ div.appendChild(button);
+ this.container.appendChild(div);
+ }
+
+ this._dispatchEvent(attachmentsCount);
+ }
+ };
+
+ return PDFAttachmentView;
+})();
+
+
+var PDFViewerApplication = {
+ initialBookmark: document.location.hash.substring(1),
+ initialized: false,
+ fellback: false,
+ pdfDocument: null,
+ sidebarOpen: false,
+ printing: false,
+ /** @type {PDFViewer} */
+ pdfViewer: null,
+ /** @type {PDFThumbnailViewer} */
+ pdfThumbnailViewer: null,
+ /** @type {PDFRenderingQueue} */
+ pdfRenderingQueue: null,
+ /** @type {PDFPresentationMode} */
+ pdfPresentationMode: null,
+ /** @type {PDFDocumentProperties} */
+ pdfDocumentProperties: null,
+ pageRotation: 0,
+ updateScaleControls: true,
+ isInitialViewSet: false,
+ animationStartedPromise: null,
+ preferenceSidebarViewOnLoad: SidebarView.NONE,
+ preferencePdfBugEnabled: false,
+ preferenceShowPreviousViewOnLoad: true,
+ preferenceDefaultZoomValue: '',
+ isViewerEmbedded: (window.parent !== window),
+ url: '',
+
+ // called once when the document is loaded
+ initialize: function pdfViewInitialize() {
+ var pdfRenderingQueue = new PDFRenderingQueue();
+ pdfRenderingQueue.onIdle = this.cleanup.bind(this);
+ this.pdfRenderingQueue = pdfRenderingQueue;
+
+ var container = document.getElementById('viewerContainer');
+ var viewer = document.getElementById('viewer');
+ this.pdfViewer = new PDFViewer({
+ container: container,
+ viewer: viewer,
+ renderingQueue: pdfRenderingQueue,
+ linkService: this
+ });
+ pdfRenderingQueue.setViewer(this.pdfViewer);
+
+ var thumbnailContainer = document.getElementById('thumbnailView');
+ this.pdfThumbnailViewer = new PDFThumbnailViewer({
+ container: thumbnailContainer,
+ renderingQueue: pdfRenderingQueue,
+ linkService: this
+ });
+ pdfRenderingQueue.setThumbnailViewer(this.pdfThumbnailViewer);
+
+ Preferences.initialize();
+
+ this.findController = new PDFFindController({
+ pdfViewer: this.pdfViewer,
+ integratedFind: this.supportsIntegratedFind
+ });
+ this.pdfViewer.setFindController(this.findController);
+
+ this.findBar = new PDFFindBar({
+ bar: document.getElementById('findbar'),
+ toggleButton: document.getElementById('viewFind'),
+ findField: document.getElementById('findInput'),
+ highlightAllCheckbox: document.getElementById('findHighlightAll'),
+ caseSensitiveCheckbox: document.getElementById('findMatchCase'),
+ findMsg: document.getElementById('findMsg'),
+ findStatusIcon: document.getElementById('findStatusIcon'),
+ findPreviousButton: document.getElementById('findPrevious'),
+ findNextButton: document.getElementById('findNext'),
+ findController: this.findController
+ });
+
+ this.findController.setFindBar(this.findBar);
+
+ HandTool.initialize({
+ container: container,
+ toggleHandTool: document.getElementById('toggleHandTool')
+ });
+
+ this.pdfDocumentProperties = new PDFDocumentProperties({
+ overlayName: 'documentPropertiesOverlay',
+ closeButton: document.getElementById('documentPropertiesClose'),
+ fields: {
+ 'fileName': document.getElementById('fileNameField'),
+ 'fileSize': document.getElementById('fileSizeField'),
+ 'title': document.getElementById('titleField'),
+ 'author': document.getElementById('authorField'),
+ 'subject': document.getElementById('subjectField'),
+ 'keywords': document.getElementById('keywordsField'),
+ 'creationDate': document.getElementById('creationDateField'),
+ 'modificationDate': document.getElementById('modificationDateField'),
+ 'creator': document.getElementById('creatorField'),
+ 'producer': document.getElementById('producerField'),
+ 'version': document.getElementById('versionField'),
+ 'pageCount': document.getElementById('pageCountField')
+ }
+ });
+
+ SecondaryToolbar.initialize({
+ toolbar: document.getElementById('secondaryToolbar'),
+ toggleButton: document.getElementById('secondaryToolbarToggle'),
+ presentationModeButton:
+ document.getElementById('secondaryPresentationMode'),
+ openFile: document.getElementById('secondaryOpenFile'),
+ print: document.getElementById('secondaryPrint'),
+ download: document.getElementById('secondaryDownload'),
+ viewBookmark: document.getElementById('secondaryViewBookmark'),
+ firstPage: document.getElementById('firstPage'),
+ lastPage: document.getElementById('lastPage'),
+ pageRotateCw: document.getElementById('pageRotateCw'),
+ pageRotateCcw: document.getElementById('pageRotateCcw'),
+ documentPropertiesButton: document.getElementById('documentProperties')
+ });
+
+ if (this.supportsFullscreen) {
+ var toolbar = SecondaryToolbar;
+ this.pdfPresentationMode = new PDFPresentationMode({
+ container: container,
+ viewer: viewer,
+ pdfThumbnailViewer: this.pdfThumbnailViewer,
+ contextMenuItems: [
+ { element: document.getElementById('contextFirstPage'),
+ handler: toolbar.firstPageClick.bind(toolbar) },
+ { element: document.getElementById('contextLastPage'),
+ handler: toolbar.lastPageClick.bind(toolbar) },
+ { element: document.getElementById('contextPageRotateCw'),
+ handler: toolbar.pageRotateCwClick.bind(toolbar) },
+ { element: document.getElementById('contextPageRotateCcw'),
+ handler: toolbar.pageRotateCcwClick.bind(toolbar) }
+ ]
+ });
+ }
+
+ PasswordPrompt.initialize({
+ overlayName: 'passwordOverlay',
+ passwordField: document.getElementById('password'),
+ passwordText: document.getElementById('passwordText'),
+ passwordSubmit: document.getElementById('passwordSubmit'),
+ passwordCancel: document.getElementById('passwordCancel')
+ });
+
+ var self = this;
+ var initializedPromise = Promise.all([
+ Preferences.get('enableWebGL').then(function resolved(value) {
+ PDFJS.disableWebGL = !value;
+ }),
+ Preferences.get('sidebarViewOnLoad').then(function resolved(value) {
+ self.preferenceSidebarViewOnLoad = value;
+ }),
+ Preferences.get('pdfBugEnabled').then(function resolved(value) {
+ self.preferencePdfBugEnabled = value;
+ }),
+ Preferences.get('showPreviousViewOnLoad').then(function resolved(value) {
+ self.preferenceShowPreviousViewOnLoad = value;
+ }),
+ Preferences.get('defaultZoomValue').then(function resolved(value) {
+ self.preferenceDefaultZoomValue = value;
+ }),
+ Preferences.get('disableTextLayer').then(function resolved(value) {
+ if (PDFJS.disableTextLayer === true) {
+ return;
+ }
+ PDFJS.disableTextLayer = value;
+ }),
+ Preferences.get('disableRange').then(function resolved(value) {
+ if (PDFJS.disableRange === true) {
+ return;
+ }
+ PDFJS.disableRange = value;
+ }),
+ Preferences.get('disableAutoFetch').then(function resolved(value) {
+ PDFJS.disableAutoFetch = value;
+ }),
+ Preferences.get('disableFontFace').then(function resolved(value) {
+ if (PDFJS.disableFontFace === true) {
+ return;
+ }
+ PDFJS.disableFontFace = value;
+ }),
+ Preferences.get('useOnlyCssZoom').then(function resolved(value) {
+ PDFJS.useOnlyCssZoom = value;
+ })
+ // TODO move more preferences and other async stuff here
+ ]).catch(function (reason) { });
+
+ return initializedPromise.then(function () {
+ PDFViewerApplication.initialized = true;
+ });
+ },
+
+ zoomIn: function pdfViewZoomIn(ticks) {
+ var newScale = this.pdfViewer.currentScale;
+ do {
+ newScale = (newScale * DEFAULT_SCALE_DELTA).toFixed(2);
+ newScale = Math.ceil(newScale * 10) / 10;
+ newScale = Math.min(MAX_SCALE, newScale);
+ } while (--ticks > 0 && newScale < MAX_SCALE);
+ this.setScale(newScale, true);
+ },
+
+ zoomOut: function pdfViewZoomOut(ticks) {
+ var newScale = this.pdfViewer.currentScale;
+ do {
+ newScale = (newScale / DEFAULT_SCALE_DELTA).toFixed(2);
+ newScale = Math.floor(newScale * 10) / 10;
+ newScale = Math.max(MIN_SCALE, newScale);
+ } while (--ticks > 0 && newScale > MIN_SCALE);
+ this.setScale(newScale, true);
+ },
+
+ get currentScaleValue() {
+ return this.pdfViewer.currentScaleValue;
+ },
+
+ get pagesCount() {
+ return this.pdfDocument.numPages;
+ },
+
+ set page(val) {
+ this.pdfViewer.currentPageNumber = val;
+ },
+
+ get page() {
+ return this.pdfViewer.currentPageNumber;
+ },
+
+ get supportsPrinting() {
+ var canvas = document.createElement('canvas');
+ var value = 'mozPrintCallback' in canvas;
+
+ return PDFJS.shadow(this, 'supportsPrinting', value);
+ },
+
+ get supportsFullscreen() {
+ var doc = document.documentElement;
+ var support = !!(doc.requestFullscreen || doc.mozRequestFullScreen ||
+ doc.webkitRequestFullScreen || doc.msRequestFullscreen);
+
+ if (document.fullscreenEnabled === false ||
+ document.mozFullScreenEnabled === false ||
+ document.webkitFullscreenEnabled === false ||
+ document.msFullscreenEnabled === false) {
+ support = false;
+ }
+ if (support && PDFJS.disableFullscreen === true) {
+ support = false;
+ }
+
+ return PDFJS.shadow(this, 'supportsFullscreen', support);
+ },
+
+ get supportsIntegratedFind() {
+ var support = false;
+
+ return PDFJS.shadow(this, 'supportsIntegratedFind', support);
+ },
+
+ get supportsDocumentFonts() {
+ var support = true;
+
+ return PDFJS.shadow(this, 'supportsDocumentFonts', support);
+ },
+
+ get supportsDocumentColors() {
+ var support = true;
+
+ return PDFJS.shadow(this, 'supportsDocumentColors', support);
+ },
+
+ get loadingBar() {
+ var bar = new ProgressBar('#loadingBar', {});
+
+ return PDFJS.shadow(this, 'loadingBar', bar);
+ },
+
+
+ setTitleUsingUrl: function pdfViewSetTitleUsingUrl(url) {
+ this.url = url;
+ try {
+ this.setTitle(decodeURIComponent(getFileName(url)) || url);
+ } catch (e) {
+ // decodeURIComponent may throw URIError,
+ // fall back to using the unprocessed url in that case
+ this.setTitle(url);
+ }
+ },
+
+ setTitle: function pdfViewSetTitle(title) {
+ if (this.isViewerEmbedded) {
+ // Embedded PDF viewers should not be changing their parent page's title.
+ return;
+ }
+ //document.title = title;
+ },
+
+ close: function pdfViewClose() {
+ var errorWrapper = document.getElementById('errorWrapper');
+ errorWrapper.setAttribute('hidden', 'true');
+
+ if (!this.pdfDocument) {
+ return;
+ }
+
+ this.pdfDocument.destroy();
+ this.pdfDocument = null;
+
+ this.pdfThumbnailViewer.setDocument(null);
+ this.pdfViewer.setDocument(null);
+
+ if (typeof PDFBug !== 'undefined') {
+ PDFBug.cleanup();
+ }
+ },
+
+ // TODO(mack): This function signature should really be pdfViewOpen(url, args)
+ open: function pdfViewOpen(file, scale, password,
+ pdfDataRangeTransport, args) {
+ if (this.pdfDocument) {
+ // Reload the preferences if a document was previously opened.
+ Preferences.reload();
+ }
+ this.close();
+
+ var parameters = {password: password};
+ if (typeof file === 'string') { // URL
+ this.setTitleUsingUrl(file);
+ parameters.url = file;
+ } else if (file && 'byteLength' in file) { // ArrayBuffer
+ parameters.data = file;
+ } else if (file.url && file.originalUrl) {
+ this.setTitleUsingUrl(file.originalUrl);
+ parameters.url = file.url;
+ }
+ if (args) {
+ for (var prop in args) {
+ parameters[prop] = args[prop];
+ }
+ }
+
+ var self = this;
+ self.loading = true;
+ self.downloadComplete = false;
+
+ var passwordNeeded = function passwordNeeded(updatePassword, reason) {
+ PasswordPrompt.updatePassword = updatePassword;
+ PasswordPrompt.reason = reason;
+ PasswordPrompt.open();
+ };
+
+ function getDocumentProgress(progressData) {
+ self.progress(progressData.loaded / progressData.total);
+ }
+
+ PDFJS.getDocument(parameters, pdfDataRangeTransport, passwordNeeded,
+ getDocumentProgress).then(
+ function getDocumentCallback(pdfDocument) {
+ self.load(pdfDocument, scale);
+ self.loading = false;
+ },
+ function getDocumentError(exception) {
+ var message = exception && exception.message;
+ var loadingErrorMessage = mozL10n.get('loading_error', null,
+ 'An error occurred while loading the PDF.');
+
+ if (exception instanceof PDFJS.InvalidPDFException) {
+ // change error message also for other builds
+ loadingErrorMessage = mozL10n.get('invalid_file_error', null,
+ 'Invalid or corrupted PDF file.');
+ } else if (exception instanceof PDFJS.MissingPDFException) {
+ // special message for missing PDF's
+ loadingErrorMessage = mozL10n.get('missing_file_error', null,
+ 'Missing PDF file.');
+ } else if (exception instanceof PDFJS.UnexpectedResponseException) {
+ loadingErrorMessage = mozL10n.get('unexpected_response_error', null,
+ 'Unexpected server response.');
+ }
+
+ var moreInfo = {
+ message: message
+ };
+ self.error(loadingErrorMessage, moreInfo);
+ self.loading = false;
+ }
+ );
+
+ if (args && args.length) {
+ PDFViewerApplication.pdfDocumentProperties.setFileSize(args.length);
+ }
+ },
+
+ download: function pdfViewDownload() {
+ function downloadByUrl() {
+ downloadManager.downloadUrl(url, filename);
+ }
+
+ var url = this.url.split('#')[0];
+ var filename = getPDFFileNameFromURL(url);
+ var downloadManager = new DownloadManager();
+ downloadManager.onerror = function (err) {
+ // This error won't really be helpful because it's likely the
+ // fallback won't work either (or is already open).
+ PDFViewerApplication.error('PDF failed to download.');
+ };
+
+ if (!this.pdfDocument) { // the PDF is not ready yet
+ downloadByUrl();
+ return;
+ }
+
+ if (!this.downloadComplete) { // the PDF is still downloading
+ downloadByUrl();
+ return;
+ }
+
+ this.pdfDocument.getData().then(
+ function getDataSuccess(data) {
+ var blob = PDFJS.createBlob(data, 'application/pdf');
+ downloadManager.download(blob, url, filename);
+ },
+ downloadByUrl // Error occurred try downloading with just the url.
+ ).then(null, downloadByUrl);
+ },
+
+ fallback: function pdfViewFallback(featureId) {
+ },
+
+ navigateTo: function pdfViewNavigateTo(dest) {
+ var destString = '';
+ var self = this;
+
+ var goToDestination = function(destRef) {
+ self.pendingRefStr = null;
+ // dest array looks like that: <page-ref> </XYZ|FitXXX> <args..>
+ var pageNumber = destRef instanceof Object ?
+ self.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'] :
+ (destRef + 1);
+ if (pageNumber) {
+ if (pageNumber > self.pagesCount) {
+ pageNumber = self.pagesCount;
+ }
+ self.pdfViewer.scrollPageIntoView(pageNumber, dest);
+
+ // Update the browsing history.
+ PDFHistory.push({ dest: dest, hash: destString, page: pageNumber });
+ } else {
+ self.pdfDocument.getPageIndex(destRef).then(function (pageIndex) {
+ var pageNum = pageIndex + 1;
+ self.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'] = pageNum;
+ goToDestination(destRef);
+ });
+ }
+ };
+
+ var destinationPromise;
+ if (typeof dest === 'string') {
+ destString = dest;
+ destinationPromise = this.pdfDocument.getDestination(dest);
+ } else {
+ destinationPromise = Promise.resolve(dest);
+ }
+ destinationPromise.then(function(destination) {
+ dest = destination;
+ if (!(destination instanceof Array)) {
+ return; // invalid destination
+ }
+ goToDestination(destination[0]);
+ });
+ },
+
+ executeNamedAction: function pdfViewExecuteNamedAction(action) {
+ // See PDF reference, table 8.45 - Named action
+ switch (action) {
+ case 'GoToPage':
+ document.getElementById('pageNumber').focus();
+ break;
+
+ case 'GoBack':
+ PDFHistory.back();
+ break;
+
+ case 'GoForward':
+ PDFHistory.forward();
+ break;
+
+ case 'Find':
+ if (!this.supportsIntegratedFind) {
+ this.findBar.toggle();
+ }
+ break;
+
+ case 'NextPage':
+ this.page++;
+ break;
+
+ case 'PrevPage':
+ this.page--;
+ break;
+
+ case 'LastPage':
+ this.page = this.pagesCount;
+ break;
+
+ case 'FirstPage':
+ this.page = 1;
+ break;
+
+ default:
+ break; // No action according to spec
+ }
+ },
+
+ getDestinationHash: function pdfViewGetDestinationHash(dest) {
+ if (typeof dest === 'string') {
+ return this.getAnchorUrl('#' + escape(dest));
+ }
+ if (dest instanceof Array) {
+ var destRef = dest[0]; // see navigateTo method for dest format
+ var pageNumber = destRef instanceof Object ?
+ this.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'] :
+ (destRef + 1);
+ if (pageNumber) {
+ var pdfOpenParams = this.getAnchorUrl('#page=' + pageNumber);
+ var destKind = dest[1];
+ if (typeof destKind === 'object' && 'name' in destKind &&
+ destKind.name === 'XYZ') {
+ var scale = (dest[4] || this.currentScaleValue);
+ var scaleNumber = parseFloat(scale);
+ if (scaleNumber) {
+ scale = scaleNumber * 100;
+ }
+ pdfOpenParams += '&zoom=' + scale;
+ if (dest[2] || dest[3]) {
+ pdfOpenParams += ',' + (dest[2] || 0) + ',' + (dest[3] || 0);
+ }
+ }
+ return pdfOpenParams;
+ }
+ }
+ return '';
+ },
+
+ /**
+ * Prefix the full url on anchor links to make sure that links are resolved
+ * relative to the current URL instead of the one defined in <base href>.
+ * @param {String} anchor The anchor hash, including the #.
+ */
+ getAnchorUrl: function getAnchorUrl(anchor) {
+ return anchor;
+ },
+
+ /**
+ * Show the error box.
+ * @param {String} message A message that is human readable.
+ * @param {Object} moreInfo (optional) Further information about the error
+ * that is more technical. Should have a 'message'
+ * and optionally a 'stack' property.
+ */
+ error: function pdfViewError(message, moreInfo) {
+ var moreInfoText = mozL10n.get('error_version_info',
+ {version: PDFJS.version || '?', build: PDFJS.build || '?'},
+ 'PDF.js v{{version}} (build: {{build}})') + '\n';
+ if (moreInfo) {
+ moreInfoText +=
+ mozL10n.get('error_message', {message: moreInfo.message},
+ 'Message: {{message}}');
+ if (moreInfo.stack) {
+ moreInfoText += '\n' +
+ mozL10n.get('error_stack', {stack: moreInfo.stack},
+ 'Stack: {{stack}}');
+ } else {
+ if (moreInfo.filename) {
+ moreInfoText += '\n' +
+ mozL10n.get('error_file', {file: moreInfo.filename},
+ 'File: {{file}}');
+ }
+ if (moreInfo.lineNumber) {
+ moreInfoText += '\n' +
+ mozL10n.get('error_line', {line: moreInfo.lineNumber},
+ 'Line: {{line}}');
+ }
+ }
+ }
+
+ var errorWrapper = document.getElementById('errorWrapper');
+ errorWrapper.removeAttribute('hidden');
+
+ var errorMessage = document.getElementById('errorMessage');
+ errorMessage.textContent = message;
+
+ var closeButton = document.getElementById('errorClose');
+ closeButton.onclick = function() {
+ errorWrapper.setAttribute('hidden', 'true');
+ };
+
+ var errorMoreInfo = document.getElementById('errorMoreInfo');
+ var moreInfoButton = document.getElementById('errorShowMore');
+ var lessInfoButton = document.getElementById('errorShowLess');
+ moreInfoButton.onclick = function() {
+ errorMoreInfo.removeAttribute('hidden');
+ moreInfoButton.setAttribute('hidden', 'true');
+ lessInfoButton.removeAttribute('hidden');
+ errorMoreInfo.style.height = errorMoreInfo.scrollHeight + 'px';
+ };
+ lessInfoButton.onclick = function() {
+ errorMoreInfo.setAttribute('hidden', 'true');
+ moreInfoButton.removeAttribute('hidden');
+ lessInfoButton.setAttribute('hidden', 'true');
+ };
+ moreInfoButton.oncontextmenu = noContextMenuHandler;
+ lessInfoButton.oncontextmenu = noContextMenuHandler;
+ closeButton.oncontextmenu = noContextMenuHandler;
+ moreInfoButton.removeAttribute('hidden');
+ lessInfoButton.setAttribute('hidden', 'true');
+ errorMoreInfo.value = moreInfoText;
+ },
+
+ progress: function pdfViewProgress(level) {
+ var percent = Math.round(level * 100);
+ // When we transition from full request to range requests, it's possible
+ // that we discard some of the loaded data. This can cause the loading
+ // bar to move backwards. So prevent this by only updating the bar if it
+ // increases.
+ if (percent > this.loadingBar.percent || isNaN(percent)) {
+ this.loadingBar.percent = percent;
+
+ // When disableAutoFetch is enabled, it's not uncommon for the entire file
+ // to never be fetched (depends on e.g. the file structure). In this case
+ // the loading bar will not be completely filled, nor will it be hidden.
+ // To prevent displaying a partially filled loading bar permanently, we
+ // hide it when no data has been loaded during a certain amount of time.
+ if (PDFJS.disableAutoFetch && percent) {
+ if (this.disableAutoFetchLoadingBarTimeout) {
+ clearTimeout(this.disableAutoFetchLoadingBarTimeout);
+ this.disableAutoFetchLoadingBarTimeout = null;
+ }
+ this.loadingBar.show();
+
+ this.disableAutoFetchLoadingBarTimeout = setTimeout(function () {
+ this.loadingBar.hide();
+ this.disableAutoFetchLoadingBarTimeout = null;
+ }.bind(this), DISABLE_AUTO_FETCH_LOADING_BAR_TIMEOUT);
+ }
+ }
+ },
+
+ load: function pdfViewLoad(pdfDocument, scale) {
+ var self = this;
+ scale = scale || UNKNOWN_SCALE;
+
+ this.findController.reset();
+
+ this.pdfDocument = pdfDocument;
+
+ this.pdfDocumentProperties.setDocumentAndUrl(pdfDocument, this.url);
+
+ var downloadedPromise = pdfDocument.getDownloadInfo().then(function() {
+ self.downloadComplete = true;
+ self.loadingBar.hide();
+ });
+
+ var pagesCount = pdfDocument.numPages;
+ document.getElementById('numPages').textContent =
+ mozL10n.get('page_of', {pageCount: pagesCount}, 'of {{pageCount}}');
+ document.getElementById('pageNumber').max = pagesCount;
+
+ var id = this.documentFingerprint = pdfDocument.fingerprint;
+ var store = this.store = new ViewHistory(id);
+
+ var pdfViewer = this.pdfViewer;
+ pdfViewer.currentScale = scale;
+ pdfViewer.setDocument(pdfDocument);
+ var firstPagePromise = pdfViewer.firstPagePromise;
+ var pagesPromise = pdfViewer.pagesPromise;
+ var onePageRendered = pdfViewer.onePageRendered;
+
+ this.pageRotation = 0;
+ this.isInitialViewSet = false;
+ this.pagesRefMap = pdfViewer.pagesRefMap;
+
+ this.pdfThumbnailViewer.setDocument(pdfDocument);
+
+ firstPagePromise.then(function(pdfPage) {
+ downloadedPromise.then(function () {
+ var event = document.createEvent('CustomEvent');
+ event.initCustomEvent('documentload', true, true, {});
+ window.dispatchEvent(event);
+ });
+
+ self.loadingBar.setWidth(document.getElementById('viewer'));
+
+ if (!PDFJS.disableHistory && !self.isViewerEmbedded) {
+ // The browsing history is only enabled when the viewer is standalone,
+ // i.e. not when it is embedded in a web page.
+ if (!self.preferenceShowPreviousViewOnLoad && window.history.state) {
+ window.history.replaceState(null, '');
+ }
+ PDFHistory.initialize(self.documentFingerprint, self);
+ }
+
+ store.initializedPromise.then(function resolved() {
+ var storedHash = null;
+ if (self.preferenceShowPreviousViewOnLoad &&
+ store.get('exists', false)) {
+ var pageNum = store.get('page', '1');
+ var zoom = self.preferenceDefaultZoomValue ||
+ store.get('zoom', self.pdfViewer.currentScale);
+ var left = store.get('scrollLeft', '0');
+ var top = store.get('scrollTop', '0');
+
+ storedHash = 'page=' + pageNum + '&zoom=' + zoom + ',' +
+ left + ',' + top;
+ } else if (self.preferenceDefaultZoomValue) {
+ storedHash = 'page=1&zoom=' + self.preferenceDefaultZoomValue;
+ }
+ self.setInitialView(storedHash, scale);
+
+ // Make all navigation keys work on document load,
+ // unless the viewer is embedded in a web page.
+ if (!self.isViewerEmbedded) {
+ self.pdfViewer.focus();
+ }
+ }, function rejected(reason) {
+ console.error(reason);
+ self.setInitialView(null, scale);
+ });
+ });
+
+ pagesPromise.then(function() {
+ if (self.supportsPrinting) {
+ pdfDocument.getJavaScript().then(function(javaScript) {
+ if (javaScript.length) {
+ console.warn('Warning: JavaScript is not supported');
+ self.fallback(PDFJS.UNSUPPORTED_FEATURES.javaScript);
+ }
+ // Hack to support auto printing.
+ var regex = /\bprint\s*\(/g;
+ for (var i = 0, ii = javaScript.length; i < ii; i++) {
+ var js = javaScript[i];
+ if (js && regex.test(js)) {
+ setTimeout(function() {
+ window.print();
+ });
+ return;
+ }
+ }
+ });
+ }
+ });
+
+ // outline depends on pagesRefMap
+ var promises = [pagesPromise, this.animationStartedPromise];
+ Promise.all(promises).then(function() {
+ pdfDocument.getOutline().then(function(outline) {
+ var container = document.getElementById('outlineView');
+ self.outline = new PDFOutlineView({
+ container: container,
+ outline: outline,
+ linkService: self
+ });
+ self.outline.render();
+ document.getElementById('viewOutline').disabled = !outline;
+
+ if (!outline && !container.classList.contains('hidden')) {
+ self.switchSidebarView('thumbs');
+ }
+ if (outline &&
+ self.preferenceSidebarViewOnLoad === SidebarView.OUTLINE) {
+ self.switchSidebarView('outline', true);
+ }
+ });
+ pdfDocument.getAttachments().then(function(attachments) {
+ var container = document.getElementById('attachmentsView');
+ self.attachments = new PDFAttachmentView({
+ container: container,
+ attachments: attachments,
+ downloadManager: new DownloadManager()
+ });
+ self.attachments.render();
+ document.getElementById('viewAttachments').disabled = !attachments;
+
+ if (!attachments && !container.classList.contains('hidden')) {
+ self.switchSidebarView('thumbs');
+ }
+ if (attachments &&
+ self.preferenceSidebarViewOnLoad === SidebarView.ATTACHMENTS) {
+ self.switchSidebarView('attachments', true);
+ }
+ });
+ });
+
+ if (self.preferenceSidebarViewOnLoad === SidebarView.THUMBS) {
+ Promise.all([firstPagePromise, onePageRendered]).then(function () {
+ self.switchSidebarView('thumbs', true);
+ });
+ }
+
+ pdfDocument.getMetadata().then(function(data) {
+ var info = data.info, metadata = data.metadata;
+ self.documentInfo = info;
+ self.metadata = metadata;
+
+ // Provides some basic debug information
+ console.log('PDF ' + pdfDocument.fingerprint + ' [' +
+ info.PDFFormatVersion + ' ' + (info.Producer || '-').trim() +
+ ' / ' + (info.Creator || '-').trim() + ']' +
+ ' (PDF.js: ' + (PDFJS.version || '-') +
+ (!PDFJS.disableWebGL ? ' [WebGL]' : '') + ')');
+
+ var pdfTitle;
+ if (metadata && metadata.has('dc:title')) {
+ var title = metadata.get('dc:title');
+ // Ghostscript sometimes return 'Untitled', sets the title to 'Untitled'
+ if (title !== 'Untitled') {
+ pdfTitle = title;
+ }
+ }
+
+ if (!pdfTitle && info && info['Title']) {
+ pdfTitle = info['Title'];
+ }
+
+ if (pdfTitle) {
+ self.setTitle(pdfTitle + ' - ' + document.title);
+ }
+
+ if (info.IsAcroFormPresent) {
+ console.warn('Warning: AcroForm/XFA is not supported');
+ self.fallback(PDFJS.UNSUPPORTED_FEATURES.forms);
+ }
+
+ });
+ },
+
+ setInitialView: function pdfViewSetInitialView(storedHash, scale) {
+ this.isInitialViewSet = true;
+
+ // When opening a new file (when one is already loaded in the viewer):
+ // Reset 'currentPageNumber', since otherwise the page's scale will be wrong
+ // if 'currentPageNumber' is larger than the number of pages in the file.
+ document.getElementById('pageNumber').value =
+ this.pdfViewer.currentPageNumber = 1;
+
+ if (PDFHistory.initialDestination) {
+ this.navigateTo(PDFHistory.initialDestination);
+ PDFHistory.initialDestination = null;
+ } else if (this.initialBookmark) {
+ this.setHash(this.initialBookmark);
+ PDFHistory.push({ hash: this.initialBookmark }, !!this.initialBookmark);
+ this.initialBookmark = null;
+ } else if (storedHash) {
+ this.setHash(storedHash);
+ } else if (scale) {
+ this.setScale(scale, true);
+ this.page = 1;
+ }
+
+ if (this.pdfViewer.currentScale === UNKNOWN_SCALE) {
+ // Scale was not initialized: invalid bookmark or scale was not specified.
+ // Setting the default one.
+ this.setScale(DEFAULT_SCALE, true);
+ }
+ },
+
+ cleanup: function pdfViewCleanup() {
+ this.pdfViewer.cleanup();
+ this.pdfThumbnailViewer.cleanup();
+ this.pdfDocument.cleanup();
+ },
+
+ forceRendering: function pdfViewForceRendering() {
+ this.pdfRenderingQueue.printing = this.printing;
+ this.pdfRenderingQueue.isThumbnailViewEnabled = this.sidebarOpen;
+ this.pdfRenderingQueue.renderHighestPriority();
+ },
+
+ setHash: function pdfViewSetHash(hash) {
+ if (!this.isInitialViewSet) {
+ this.initialBookmark = hash;
+ return;
+ }
+ if (!hash) {
+ return;
+ }
+
+ if (hash.indexOf('=') >= 0) {
+ var params = this.parseQueryString(hash);
+ // borrowing syntax from "Parameters for Opening PDF Files"
+ if ('nameddest' in params) {
+ PDFHistory.updateNextHashParam(params.nameddest);
+ this.navigateTo(params.nameddest);
+ return;
+ }
+ var pageNumber, dest;
+ if ('page' in params) {
+ pageNumber = (params.page | 0) || 1;
+ }
+ if ('zoom' in params) {
+ // Build the destination array.
+ var zoomArgs = params.zoom.split(','); // scale,left,top
+ var zoomArg = zoomArgs[0];
+ var zoomArgNumber = parseFloat(zoomArg);
+
+ if (zoomArg.indexOf('Fit') === -1) {
+ // If the zoomArg is a number, it has to get divided by 100. If it's
+ // a string, it should stay as it is.
+ dest = [null, { name: 'XYZ' },
+ zoomArgs.length > 1 ? (zoomArgs[1] | 0) : null,
+ zoomArgs.length > 2 ? (zoomArgs[2] | 0) : null,
+ (zoomArgNumber ? zoomArgNumber / 100 : zoomArg)];
+ } else {
+ if (zoomArg === 'Fit' || zoomArg === 'FitB') {
+ dest = [null, { name: zoomArg }];
+ } else if ((zoomArg === 'FitH' || zoomArg === 'FitBH') ||
+ (zoomArg === 'FitV' || zoomArg === 'FitBV')) {
+ dest = [null, { name: zoomArg },
+ zoomArgs.length > 1 ? (zoomArgs[1] | 0) : null];
+ } else if (zoomArg === 'FitR') {
+ if (zoomArgs.length !== 5) {
+ console.error('pdfViewSetHash: ' +
+ 'Not enough parameters for \'FitR\'.');
+ } else {
+ dest = [null, { name: zoomArg },
+ (zoomArgs[1] | 0), (zoomArgs[2] | 0),
+ (zoomArgs[3] | 0), (zoomArgs[4] | 0)];
+ }
+ } else {
+ console.error('pdfViewSetHash: \'' + zoomArg +
+ '\' is not a valid zoom value.');
+ }
+ }
+ }
+ if (dest) {
+ this.pdfViewer.scrollPageIntoView(pageNumber || this.page, dest);
+ } else if (pageNumber) {
+ this.page = pageNumber; // simple page
+ }
+ if ('pagemode' in params) {
+ if (params.pagemode === 'thumbs' || params.pagemode === 'bookmarks' ||
+ params.pagemode === 'attachments') {
+ this.switchSidebarView((params.pagemode === 'bookmarks' ?
+ 'outline' : params.pagemode), true);
+ } else if (params.pagemode === 'none' && this.sidebarOpen) {
+ document.getElementById('sidebarToggle').click();
+ }
+ }
+ } else if (/^\d+$/.test(hash)) { // page number
+ this.page = hash;
+ } else { // named destination
+ PDFHistory.updateNextHashParam(unescape(hash));
+ this.navigateTo(unescape(hash));
+ }
+ },
+
+ refreshThumbnailViewer: function pdfViewRefreshThumbnailViewer() {
+ var pdfViewer = this.pdfViewer;
+ var thumbnailViewer = this.pdfThumbnailViewer;
+
+ // set thumbnail images of rendered pages
+ var pagesCount = pdfViewer.pagesCount;
+ for (var pageIndex = 0; pageIndex < pagesCount; pageIndex++) {
+ var pageView = pdfViewer.getPageView(pageIndex);
+ if (pageView && pageView.renderingState === RenderingStates.FINISHED) {
+ var thumbnailView = thumbnailViewer.getThumbnail(pageIndex);
+ thumbnailView.setImage(pageView);
+ }
+ }
+
+ thumbnailViewer.scrollThumbnailIntoView(this.page);
+ },
+
+ switchSidebarView: function pdfViewSwitchSidebarView(view, openSidebar) {
+ if (openSidebar && !this.sidebarOpen) {
+ document.getElementById('sidebarToggle').click();
+ }
+ var thumbsView = document.getElementById('thumbnailView');
+ var outlineView = document.getElementById('outlineView');
+ var attachmentsView = document.getElementById('attachmentsView');
+
+ var thumbsButton = document.getElementById('viewThumbnail');
+ var outlineButton = document.getElementById('viewOutline');
+ var attachmentsButton = document.getElementById('viewAttachments');
+
+ switch (view) {
+ case 'thumbs':
+ var wasAnotherViewVisible = thumbsView.classList.contains('hidden');
+
+ thumbsButton.classList.add('toggled');
+ outlineButton.classList.remove('toggled');
+ attachmentsButton.classList.remove('toggled');
+ thumbsView.classList.remove('hidden');
+ outlineView.classList.add('hidden');
+ attachmentsView.classList.add('hidden');
+
+ this.forceRendering();
+
+ if (wasAnotherViewVisible) {
+ this.pdfThumbnailViewer.ensureThumbnailVisible(this.page);
+ }
+ break;
+
+ case 'outline':
+ thumbsButton.classList.remove('toggled');
+ outlineButton.classList.add('toggled');
+ attachmentsButton.classList.remove('toggled');
+ thumbsView.classList.add('hidden');
+ outlineView.classList.remove('hidden');
+ attachmentsView.classList.add('hidden');
+
+ if (outlineButton.getAttribute('disabled')) {
+ return;
+ }
+ break;
+
+ case 'attachments':
+ thumbsButton.classList.remove('toggled');
+ outlineButton.classList.remove('toggled');
+ attachmentsButton.classList.add('toggled');
+ thumbsView.classList.add('hidden');
+ outlineView.classList.add('hidden');
+ attachmentsView.classList.remove('hidden');
+
+ if (attachmentsButton.getAttribute('disabled')) {
+ return;
+ }
+ break;
+ }
+ },
+
+ // Helper function to parse query string (e.g. ?param1=value&parm2=...).
+ parseQueryString: function pdfViewParseQueryString(query) {
+ var parts = query.split('&');
+ var params = {};
+ for (var i = 0, ii = parts.length; i < ii; ++i) {
+ var param = parts[i].split('=');
+ var key = param[0].toLowerCase();
+ var value = param.length > 1 ? param[1] : null;
+ params[decodeURIComponent(key)] = decodeURIComponent(value);
+ }
+ return params;
+ },
+
+ beforePrint: function pdfViewSetupBeforePrint() {
+ if (!this.supportsPrinting) {
+ var printMessage = mozL10n.get('printing_not_supported', null,
+ 'Warning: Printing is not fully supported by this browser.');
+ this.error(printMessage);
+ return;
+ }
+
+ var alertNotReady = false;
+ var i, ii;
+ if (!this.pagesCount) {
+ alertNotReady = true;
+ } else {
+ for (i = 0, ii = this.pagesCount; i < ii; ++i) {
+ if (!this.pdfViewer.getPageView(i).pdfPage) {
+ alertNotReady = true;
+ break;
+ }
+ }
+ }
+ if (alertNotReady) {
+ var notReadyMessage = mozL10n.get('printing_not_ready', null,
+ 'Warning: The PDF is not fully loaded for printing.');
+ window.alert(notReadyMessage);
+ return;
+ }
+
+ this.printing = true;
+ this.forceRendering();
+
+ var body = document.querySelector('body');
+ body.setAttribute('data-mozPrintCallback', true);
+
+ if (!this.hasEqualPageSizes) {
+ console.warn('Not all pages have the same size. The printed result ' +
+ 'may be incorrect!');
+ }
+
+ // Insert a @page + size rule to make sure that the page size is correctly
+ // set. Note that we assume that all pages have the same size, because
+ // variable-size pages are not supported yet (at least in Chrome & Firefox).
+ // TODO(robwu): Use named pages when size calculation bugs get resolved
+ // (e.g. https://crbug.com/355116) AND when support for named pages is
+ // added (http://www.w3.org/TR/css3-page/#using-named-pages).
+ // In browsers where @page + size is not supported (such as Firefox,
+ // https://bugzil.la/851441), the next stylesheet will be ignored and the
+ // user has to select the correct paper size in the UI if wanted.
+ this.pageStyleSheet = document.createElement('style');
+ var pageSize = this.pdfViewer.getPageView(0).pdfPage.getViewport(1);
+ this.pageStyleSheet.textContent =
+ // "size:<width> <height>" is what we need. But also add "A4" because
+ // Firefox incorrectly reports support for the other value.
+ '@supports ((size:A4) and (size:1pt 1pt)) {' +
+ '@page { size: ' + pageSize.width + 'pt ' + pageSize.height + 'pt;}' +
+ // The canvas and each ancestor node must have a height of 100% to make
+ // sure that each canvas is printed on exactly one page.
+ '#printContainer {height:100%}' +
+ '#printContainer > div {width:100% !important;height:100% !important;}' +
+ '}';
+ body.appendChild(this.pageStyleSheet);
+
+ for (i = 0, ii = this.pagesCount; i < ii; ++i) {
+ this.pdfViewer.getPageView(i).beforePrint();
+ }
+
+ },
+
+ // Whether all pages of the PDF have the same width and height.
+ get hasEqualPageSizes() {
+ var firstPage = this.pdfViewer.getPageView(0);
+ for (var i = 1, ii = this.pagesCount; i < ii; ++i) {
+ var pageView = this.pdfViewer.getPageView(i);
+ if (pageView.width !== firstPage.width ||
+ pageView.height !== firstPage.height) {
+ return false;
+ }
+ }
+ return true;
+ },
+
+ afterPrint: function pdfViewSetupAfterPrint() {
+ var div = document.getElementById('printContainer');
+ while (div.hasChildNodes()) {
+ div.removeChild(div.lastChild);
+ }
+
+ if (this.pageStyleSheet && this.pageStyleSheet.parentNode) {
+ this.pageStyleSheet.parentNode.removeChild(this.pageStyleSheet);
+ this.pageStyleSheet = null;
+ }
+
+ this.printing = false;
+ this.forceRendering();
+ },
+
+ setScale: function (value, resetAutoSettings) {
+ this.updateScaleControls = !!resetAutoSettings;
+ this.pdfViewer.currentScaleValue = value;
+ this.updateScaleControls = true;
+ },
+
+ rotatePages: function pdfViewRotatePages(delta) {
+ var pageNumber = this.page;
+ this.pageRotation = (this.pageRotation + 360 + delta) % 360;
+ this.pdfViewer.pagesRotation = this.pageRotation;
+ this.pdfThumbnailViewer.pagesRotation = this.pageRotation;
+
+ this.forceRendering();
+
+ this.pdfViewer.scrollPageIntoView(pageNumber);
+ },
+
+ requestPresentationMode: function pdfViewRequestPresentationMode() {
+ if (!this.pdfPresentationMode) {
+ return;
+ }
+ this.pdfPresentationMode.request();
+ },
+
+ /**
+ * @param {number} delta - The delta value from the mouse event.
+ */
+ scrollPresentationMode: function pdfViewScrollPresentationMode(delta) {
+ if (!this.pdfPresentationMode) {
+ return;
+ }
+ this.pdfPresentationMode.mouseScroll(delta);
+ }
+};
+window.PDFView = PDFViewerApplication; // obsolete name, using it as an alias
+
+
+function webViewerLoad(evt) {
+ PDFViewerApplication.initialize().then(webViewerInitialized);
+}
+
+function webViewerInitialized() {
+ var queryString = document.location.search.substring(1);
+ var params = PDFViewerApplication.parseQueryString(queryString);
+ var file = 'file' in params ? params.file : DEFAULT_URL;
+
+ var fileInput = document.createElement('input');
+ fileInput.id = 'fileInput';
+ fileInput.className = 'fileInput';
+ fileInput.setAttribute('type', 'file');
+ fileInput.oncontextmenu = noContextMenuHandler;
+ document.body.appendChild(fileInput);
+
+ if (!window.File || !window.FileReader || !window.FileList || !window.Blob) {
+ document.getElementById('openFile').setAttribute('hidden', 'true');
+ document.getElementById('secondaryOpenFile').setAttribute('hidden', 'true');
+ } else {
+ document.getElementById('fileInput').value = null;
+ }
+
+ var locale = PDFJS.locale || navigator.language;
+
+ if (PDFViewerApplication.preferencePdfBugEnabled) {
+ // Special debugging flags in the hash section of the URL.
+ var hash = document.location.hash.substring(1);
+ var hashParams = PDFViewerApplication.parseQueryString(hash);
+
+ if ('disableworker' in hashParams) {
+ PDFJS.disableWorker = (hashParams['disableworker'] === 'true');
+ }
+ if ('disablerange' in hashParams) {
+ PDFJS.disableRange = (hashParams['disablerange'] === 'true');
+ }
+ if ('disablestream' in hashParams) {
+ PDFJS.disableStream = (hashParams['disablestream'] === 'true');
+ }
+ if ('disableautofetch' in hashParams) {
+ PDFJS.disableAutoFetch = (hashParams['disableautofetch'] === 'true');
+ }
+ if ('disablefontface' in hashParams) {
+ PDFJS.disableFontFace = (hashParams['disablefontface'] === 'true');
+ }
+ if ('disablehistory' in hashParams) {
+ PDFJS.disableHistory = (hashParams['disablehistory'] === 'true');
+ }
+ if ('webgl' in hashParams) {
+ PDFJS.disableWebGL = (hashParams['webgl'] !== 'true');
+ }
+ if ('useonlycsszoom' in hashParams) {
+ PDFJS.useOnlyCssZoom = (hashParams['useonlycsszoom'] === 'true');
+ }
+ if ('verbosity' in hashParams) {
+ PDFJS.verbosity = hashParams['verbosity'] | 0;
+ }
+ if ('ignorecurrentpositiononzoom' in hashParams) {
+ IGNORE_CURRENT_POSITION_ON_ZOOM =
+ (hashParams['ignorecurrentpositiononzoom'] === 'true');
+ }
+ if ('locale' in hashParams) {
+ locale = hashParams['locale'];
+ }
+ if ('textlayer' in hashParams) {
+ switch (hashParams['textlayer']) {
+ case 'off':
+ PDFJS.disableTextLayer = true;
+ break;
+ case 'visible':
+ case 'shadow':
+ case 'hover':
+ var viewer = document.getElementById('viewer');
+ viewer.classList.add('textLayer-' + hashParams['textlayer']);
+ break;
+ }
+ }
+ if ('pdfbug' in hashParams) {
+ PDFJS.pdfBug = true;
+ var pdfBug = hashParams['pdfbug'];
+ var enabled = pdfBug.split(',');
+ PDFBug.enable(enabled);
+ PDFBug.init();
+ }
+ }
+
+ mozL10n.setLanguage(locale);
+
+ if (!PDFViewerApplication.supportsPrinting) {
+ document.getElementById('print').classList.add('hidden');
+ document.getElementById('secondaryPrint').classList.add('hidden');
+ }
+
+ if (!PDFViewerApplication.supportsFullscreen) {
+ document.getElementById('presentationMode').classList.add('hidden');
+ document.getElementById('secondaryPresentationMode').
+ classList.add('hidden');
+ }
+
+ if (PDFViewerApplication.supportsIntegratedFind) {
+ document.getElementById('viewFind').classList.add('hidden');
+ }
+
+ // Listen for unsupported features to trigger the fallback UI.
+ PDFJS.UnsupportedManager.listen(
+ PDFViewerApplication.fallback.bind(PDFViewerApplication));
+
+ // Suppress context menus for some controls
+ document.getElementById('scaleSelect').oncontextmenu = noContextMenuHandler;
+
+ var mainContainer = document.getElementById('mainContainer');
+ var outerContainer = document.getElementById('outerContainer');
+ mainContainer.addEventListener('transitionend', function(e) {
+ if (e.target === mainContainer) {
+ var event = document.createEvent('UIEvents');
+ event.initUIEvent('resize', false, false, window, 0);
+ window.dispatchEvent(event);
+ outerContainer.classList.remove('sidebarMoving');
+ }
+ }, true);
+
+ document.getElementById('sidebarToggle').addEventListener('click',
+ function() {
+ this.classList.toggle('toggled');
+ outerContainer.classList.add('sidebarMoving');
+ outerContainer.classList.toggle('sidebarOpen');
+ PDFViewerApplication.sidebarOpen =
+ outerContainer.classList.contains('sidebarOpen');
+ if (PDFViewerApplication.sidebarOpen) {
+ PDFViewerApplication.refreshThumbnailViewer();
+ }
+ PDFViewerApplication.forceRendering();
+ });
+
+ document.getElementById('viewThumbnail').addEventListener('click',
+ function() {
+ PDFViewerApplication.switchSidebarView('thumbs');
+ });
+
+ document.getElementById('viewOutline').addEventListener('click',
+ function() {
+ PDFViewerApplication.switchSidebarView('outline');
+ });
+
+ document.getElementById('viewAttachments').addEventListener('click',
+ function() {
+ PDFViewerApplication.switchSidebarView('attachments');
+ });
+
+ document.getElementById('previous').addEventListener('click',
+ function() {
+ PDFViewerApplication.page--;
+ });
+
+ document.getElementById('next').addEventListener('click',
+ function() {
+ PDFViewerApplication.page++;
+ });
+
+ document.getElementById('zoomIn').addEventListener('click',
+ function() {
+ PDFViewerApplication.zoomIn();
+ });
+
+ document.getElementById('zoomOut').addEventListener('click',
+ function() {
+ PDFViewerApplication.zoomOut();
+ });
+
+ document.getElementById('pageNumber').addEventListener('click', function() {
+ this.select();
+ });
+
+ document.getElementById('pageNumber').addEventListener('change', function() {
+ // Handle the user inputting a floating point number.
+ PDFViewerApplication.page = (this.value | 0);
+
+ if (this.value !== (this.value | 0).toString()) {
+ this.value = PDFViewerApplication.page;
+ }
+ });
+
+ document.getElementById('scaleSelect').addEventListener('change',
+ function() {
+ PDFViewerApplication.setScale(this.value, false);
+ });
+
+ document.getElementById('presentationMode').addEventListener('click',
+ SecondaryToolbar.presentationModeClick.bind(SecondaryToolbar));
+
+ document.getElementById('openFile').addEventListener('click',
+ SecondaryToolbar.openFileClick.bind(SecondaryToolbar));
+
+ document.getElementById('print').addEventListener('click',
+ SecondaryToolbar.printClick.bind(SecondaryToolbar));
+
+ document.getElementById('download').addEventListener('click',
+ SecondaryToolbar.downloadClick.bind(SecondaryToolbar));
+
+
+ if (file && file.lastIndexOf('file:', 0) === 0) {
+ // file:-scheme. Load the contents in the main thread because QtWebKit
+ // cannot load file:-URLs in a Web Worker. file:-URLs are usually loaded
+ // very quickly, so there is no need to set up progress event listeners.
+ PDFViewerApplication.setTitleUsingUrl(file);
+ var xhr = new XMLHttpRequest();
+ xhr.onload = function() {
+ PDFViewerApplication.open(new Uint8Array(xhr.response), 0);
+ };
+ try {
+ xhr.open('GET', file);
+ xhr.responseType = 'arraybuffer';
+ xhr.send();
+ } catch (e) {
+ PDFViewerApplication.error(mozL10n.get('loading_error', null,
+ 'An error occurred while loading the PDF.'), e);
+ }
+ return;
+ }
+
+ if (file) {
+ PDFViewerApplication.open(file, 0);
+ }
+}
+
+document.addEventListener('DOMContentLoaded', webViewerLoad, true);
+
+document.addEventListener('pagerendered', function (e) {
+ var pageNumber = e.detail.pageNumber;
+ var pageIndex = pageNumber - 1;
+ var pageView = PDFViewerApplication.pdfViewer.getPageView(pageIndex);
+
+ if (PDFViewerApplication.sidebarOpen) {
+ var thumbnailView = PDFViewerApplication.pdfThumbnailViewer.
+ getThumbnail(pageIndex);
+ thumbnailView.setImage(pageView);
+ }
+
+ if (PDFJS.pdfBug && Stats.enabled && pageView.stats) {
+ Stats.add(pageNumber, pageView.stats);
+ }
+
+ if (pageView.error) {
+ PDFViewerApplication.error(mozL10n.get('rendering_error', null,
+ 'An error occurred while rendering the page.'), pageView.error);
+ }
+
+ // If the page is still visible when it has finished rendering,
+ // ensure that the page number input loading indicator is hidden.
+ if (pageNumber === PDFViewerApplication.page) {
+ var pageNumberInput = document.getElementById('pageNumber');
+ pageNumberInput.classList.remove(PAGE_NUMBER_LOADING_INDICATOR);
+ }
+
+}, true);
+
+document.addEventListener('textlayerrendered', function (e) {
+ var pageIndex = e.detail.pageNumber - 1;
+ var pageView = PDFViewerApplication.pdfViewer.getPageView(pageIndex);
+
+}, true);
+
+window.addEventListener('presentationmodechanged', function (e) {
+ var active = e.detail.active;
+ var switchInProgress = e.detail.switchInProgress;
+ PDFViewerApplication.pdfViewer.presentationModeState =
+ switchInProgress ? PresentationModeState.CHANGING :
+ active ? PresentationModeState.FULLSCREEN : PresentationModeState.NORMAL;
+});
+
+function updateViewarea() {
+ if (!PDFViewerApplication.initialized) {
+ return;
+ }
+ PDFViewerApplication.pdfViewer.update();
+}
+
+window.addEventListener('updateviewarea', function (evt) {
+ if (!PDFViewerApplication.initialized) {
+ return;
+ }
+ var location = evt.location;
+
+ PDFViewerApplication.store.initializedPromise.then(function() {
+ PDFViewerApplication.store.setMultiple({
+ 'exists': true,
+ 'page': location.pageNumber,
+ 'zoom': location.scale,
+ 'scrollLeft': location.left,
+ 'scrollTop': location.top
+ }).catch(function() {
+ // unable to write to storage
+ });
+ });
+ var href = PDFViewerApplication.getAnchorUrl(location.pdfOpenParams);
+ document.getElementById('viewBookmark').href = href;
+ document.getElementById('secondaryViewBookmark').href = href;
+
+ // Update the current bookmark in the browsing history.
+ PDFHistory.updateCurrentBookmark(location.pdfOpenParams, location.pageNumber);
+
+ // Show/hide the loading indicator in the page number input element.
+ var pageNumberInput = document.getElementById('pageNumber');
+ var currentPage =
+ PDFViewerApplication.pdfViewer.getPageView(PDFViewerApplication.page - 1);
+
+ if (currentPage.renderingState === RenderingStates.FINISHED) {
+ pageNumberInput.classList.remove(PAGE_NUMBER_LOADING_INDICATOR);
+ } else {
+ pageNumberInput.classList.add(PAGE_NUMBER_LOADING_INDICATOR);
+ }
+}, true);
+
+window.addEventListener('resize', function webViewerResize(evt) {
+ if (PDFViewerApplication.initialized &&
+ (document.getElementById('pageAutoOption').selected ||
+ /* Note: the scale is constant for |pageActualOption|. */
+ document.getElementById('pageFitOption').selected ||
+ document.getElementById('pageWidthOption').selected)) {
+ var selectedScale = document.getElementById('scaleSelect').value;
+ PDFViewerApplication.setScale(selectedScale, false);
+ }
+ updateViewarea();
+
+ // Set the 'max-height' CSS property of the secondary toolbar.
+ SecondaryToolbar.setMaxHeight(document.getElementById('viewerContainer'));
+});
+
+window.addEventListener('hashchange', function webViewerHashchange(evt) {
+ if (PDFHistory.isHashChangeUnlocked) {
+ PDFViewerApplication.setHash(document.location.hash.substring(1));
+ }
+});
+
+window.addEventListener('change', function webViewerChange(evt) {
+ var files = evt.target.files;
+ if (!files || files.length === 0) {
+ return;
+ }
+ var file = files[0];
+
+ if (!PDFJS.disableCreateObjectURL &&
+ typeof URL !== 'undefined' && URL.createObjectURL) {
+ PDFViewerApplication.open(URL.createObjectURL(file), 0);
+ } else {
+ // Read the local file into a Uint8Array.
+ var fileReader = new FileReader();
+ fileReader.onload = function webViewerChangeFileReaderOnload(evt) {
+ var buffer = evt.target.result;
+ var uint8Array = new Uint8Array(buffer);
+ PDFViewerApplication.open(uint8Array, 0);
+ };
+ fileReader.readAsArrayBuffer(file);
+ }
+
+ PDFViewerApplication.setTitleUsingUrl(file.name);
+
+ // URL does not reflect proper document location - hiding some icons.
+ document.getElementById('viewBookmark').setAttribute('hidden', 'true');
+ document.getElementById('secondaryViewBookmark').
+ setAttribute('hidden', 'true');
+ document.getElementById('download').setAttribute('hidden', 'true');
+ document.getElementById('secondaryDownload').setAttribute('hidden', 'true');
+}, true);
+
+function selectScaleOption(value) {
+ var options = document.getElementById('scaleSelect').options;
+ var predefinedValueFound = false;
+ for (var i = 0; i < options.length; i++) {
+ var option = options[i];
+ if (option.value !== value) {
+ option.selected = false;
+ continue;
+ }
+ option.selected = true;
+ predefinedValueFound = true;
+ }
+ return predefinedValueFound;
+}
+
+window.addEventListener('localized', function localized(evt) {
+ document.getElementsByTagName('html')[0].dir = mozL10n.getDirection();
+
+ PDFViewerApplication.animationStartedPromise.then(function() {
+ // Adjust the width of the zoom box to fit the content.
+ // Note: If the window is narrow enough that the zoom box is not visible,
+ // we temporarily show it to be able to adjust its width.
+ var container = document.getElementById('scaleSelectContainer');
+ if (container.clientWidth === 0) {
+ container.setAttribute('style', 'display: inherit;');
+ }
+ if (container.clientWidth > 0) {
+ var select = document.getElementById('scaleSelect');
+ select.setAttribute('style', 'min-width: inherit;');
+ var width = select.clientWidth + SCALE_SELECT_CONTAINER_PADDING;
+ select.setAttribute('style', 'min-width: ' +
+ (width + SCALE_SELECT_PADDING) + 'px;');
+ container.setAttribute('style', 'min-width: ' + width + 'px; ' +
+ 'max-width: ' + width + 'px;');
+ }
+
+ // Set the 'max-height' CSS property of the secondary toolbar.
+ SecondaryToolbar.setMaxHeight(document.getElementById('viewerContainer'));
+ });
+}, true);
+
+window.addEventListener('scalechange', function scalechange(evt) {
+ document.getElementById('zoomOut').disabled = (evt.scale === MIN_SCALE);
+ document.getElementById('zoomIn').disabled = (evt.scale === MAX_SCALE);
+
+ var customScaleOption = document.getElementById('customScaleOption');
+ customScaleOption.selected = false;
+
+ if (!PDFViewerApplication.updateScaleControls &&
+ (document.getElementById('pageAutoOption').selected ||
+ document.getElementById('pageActualOption').selected ||
+ document.getElementById('pageFitOption').selected ||
+ document.getElementById('pageWidthOption').selected)) {
+ updateViewarea();
+ return;
+ }
+
+ if (evt.presetValue) {
+ selectScaleOption(evt.presetValue);
+ updateViewarea();
+ return;
+ }
+
+ var predefinedValueFound = selectScaleOption('' + evt.scale);
+ if (!predefinedValueFound) {
+ var customScale = Math.round(evt.scale * 10000) / 100;
+ customScaleOption.textContent =
+ mozL10n.get('page_scale_percent', { scale: customScale }, '{{scale}}%');
+ customScaleOption.selected = true;
+ }
+ updateViewarea();
+}, true);
+
+window.addEventListener('pagechange', function pagechange(evt) {
+ var page = evt.pageNumber;
+ if (evt.previousPageNumber !== page) {
+ document.getElementById('pageNumber').value = page;
+ if (PDFViewerApplication.sidebarOpen) {
+ PDFViewerApplication.pdfThumbnailViewer.scrollThumbnailIntoView(page);
+ }
+ }
+ var numPages = PDFViewerApplication.pagesCount;
+
+ document.getElementById('previous').disabled = (page <= 1);
+ document.getElementById('next').disabled = (page >= numPages);
+
+ document.getElementById('firstPage').disabled = (page <= 1);
+ document.getElementById('lastPage').disabled = (page >= numPages);
+
+ // we need to update stats
+ if (PDFJS.pdfBug && Stats.enabled) {
+ var pageView = PDFViewerApplication.pdfViewer.getPageView(page - 1);
+ if (pageView.stats) {
+ Stats.add(page, pageView.stats);
+ }
+ }
+
+ // checking if the this.page was called from the updateViewarea function
+ if (evt.updateInProgress) {
+ return;
+ }
+ // Avoid scrolling the first page during loading
+ if (this.loading && page === 1) {
+ return;
+ }
+ PDFViewerApplication.pdfViewer.scrollPageIntoView(page);
+}, true);
+
+function handleMouseWheel(evt) {
+ var MOUSE_WHEEL_DELTA_FACTOR = 40;
+ var ticks = (evt.type === 'DOMMouseScroll') ? -evt.detail :
+ evt.wheelDelta / MOUSE_WHEEL_DELTA_FACTOR;
+ var direction = (ticks < 0) ? 'zoomOut' : 'zoomIn';
+
+ if (PDFViewerApplication.pdfViewer.isInPresentationMode) {
+ evt.preventDefault();
+ PDFViewerApplication.scrollPresentationMode(ticks *
+ MOUSE_WHEEL_DELTA_FACTOR);
+ } else if (evt.ctrlKey || evt.metaKey) {
+ // Only zoom the pages, not the entire viewer.
+ evt.preventDefault();
+ PDFViewerApplication[direction](Math.abs(ticks));
+ }
+}
+
+window.addEventListener('DOMMouseScroll', handleMouseWheel);
+window.addEventListener('mousewheel', handleMouseWheel);
+
+window.addEventListener('click', function click(evt) {
+ if (SecondaryToolbar.opened &&
+ PDFViewerApplication.pdfViewer.containsElement(evt.target)) {
+ SecondaryToolbar.close();
+ }
+}, false);
+
+window.addEventListener('keydown', function keydown(evt) {
+ if (OverlayManager.active) {
+ return;
+ }
+
+ var handled = false;
+ var cmd = (evt.ctrlKey ? 1 : 0) |
+ (evt.altKey ? 2 : 0) |
+ (evt.shiftKey ? 4 : 0) |
+ (evt.metaKey ? 8 : 0);
+
+ var pdfViewer = PDFViewerApplication.pdfViewer;
+ var isViewerInPresentationMode = pdfViewer && pdfViewer.isInPresentationMode;
+
+ // First, handle the key bindings that are independent whether an input
+ // control is selected or not.
+ if (cmd === 1 || cmd === 8 || cmd === 5 || cmd === 12) {
+ // either CTRL or META key with optional SHIFT.
+ switch (evt.keyCode) {
+ case 70: // f
+ if (!PDFViewerApplication.supportsIntegratedFind) {
+ PDFViewerApplication.findBar.open();
+ handled = true;
+ }
+ break;
+ case 71: // g
+ if (!PDFViewerApplication.supportsIntegratedFind) {
+ PDFViewerApplication.findBar.dispatchEvent('again',
+ cmd === 5 || cmd === 12);
+ handled = true;
+ }
+ break;
+ case 61: // FF/Mac '='
+ case 107: // FF '+' and '='
+ case 187: // Chrome '+'
+ case 171: // FF with German keyboard
+ if (!isViewerInPresentationMode) {
+ PDFViewerApplication.zoomIn();
+ }
+ handled = true;
+ break;
+ case 173: // FF/Mac '-'
+ case 109: // FF '-'
+ case 189: // Chrome '-'
+ if (!isViewerInPresentationMode) {
+ PDFViewerApplication.zoomOut();
+ }
+ handled = true;
+ break;
+ case 48: // '0'
+ case 96: // '0' on Numpad of Swedish keyboard
+ if (!isViewerInPresentationMode) {
+ // keeping it unhandled (to restore page zoom to 100%)
+ setTimeout(function () {
+ // ... and resetting the scale after browser adjusts its scale
+ PDFViewerApplication.setScale(DEFAULT_SCALE, true);
+ });
+ handled = false;
+ }
+ break;
+ }
+ }
+
+ // CTRL or META without shift
+ if (cmd === 1 || cmd === 8) {
+ switch (evt.keyCode) {
+ case 83: // s
+ PDFViewerApplication.download();
+ handled = true;
+ break;
+ }
+ }
+
+ // CTRL+ALT or Option+Command
+ if (cmd === 3 || cmd === 10) {
+ switch (evt.keyCode) {
+ case 80: // p
+ PDFViewerApplication.requestPresentationMode();
+ handled = true;
+ break;
+ case 71: // g
+ // focuses input#pageNumber field
+ document.getElementById('pageNumber').select();
+ handled = true;
+ break;
+ }
+ }
+
+ if (handled) {
+ evt.preventDefault();
+ return;
+ }
+
+ // Some shortcuts should not get handled if a control/input element
+ // is selected.
+ var curElement = document.activeElement || document.querySelector(':focus');
+ var curElementTagName = curElement && curElement.tagName.toUpperCase();
+ if (curElementTagName === 'INPUT' ||
+ curElementTagName === 'TEXTAREA' ||
+ curElementTagName === 'SELECT') {
+ // Make sure that the secondary toolbar is closed when Escape is pressed.
+ if (evt.keyCode !== 27) { // 'Esc'
+ return;
+ }
+ }
+
+ if (cmd === 0) { // no control key pressed at all.
+ switch (evt.keyCode) {
+ case 38: // up arrow
+ case 33: // pg up
+ case 8: // backspace
+ if (!isViewerInPresentationMode &&
+ PDFViewerApplication.currentScaleValue !== 'page-fit') {
+ break;
+ }
+ /* in presentation mode */
+ /* falls through */
+ case 37: // left arrow
+ // horizontal scrolling using arrow keys
+ if (pdfViewer.isHorizontalScrollbarEnabled) {
+ break;
+ }
+ /* falls through */
+ case 75: // 'k'
+ case 80: // 'p'
+ PDFViewerApplication.page--;
+ handled = true;
+ break;
+ case 27: // esc key
+ if (SecondaryToolbar.opened) {
+ SecondaryToolbar.close();
+ handled = true;
+ }
+ if (!PDFViewerApplication.supportsIntegratedFind &&
+ PDFViewerApplication.findBar.opened) {
+ PDFViewerApplication.findBar.close();
+ handled = true;
+ }
+ break;
+ case 40: // down arrow
+ case 34: // pg down
+ case 32: // spacebar
+ if (!isViewerInPresentationMode &&
+ PDFViewerApplication.currentScaleValue !== 'page-fit') {
+ break;
+ }
+ /* falls through */
+ case 39: // right arrow
+ // horizontal scrolling using arrow keys
+ if (pdfViewer.isHorizontalScrollbarEnabled) {
+ break;
+ }
+ /* falls through */
+ case 74: // 'j'
+ case 78: // 'n'
+ PDFViewerApplication.page++;
+ handled = true;
+ break;
+
+ case 36: // home
+ if (isViewerInPresentationMode || PDFViewerApplication.page > 1) {
+ PDFViewerApplication.page = 1;
+ handled = true;
+ }
+ break;
+ case 35: // end
+ if (isViewerInPresentationMode || (PDFViewerApplication.pdfDocument &&
+ PDFViewerApplication.page < PDFViewerApplication.pagesCount)) {
+ PDFViewerApplication.page = PDFViewerApplication.pagesCount;
+ handled = true;
+ }
+ break;
+
+ case 72: // 'h'
+ if (!isViewerInPresentationMode) {
+ HandTool.toggle();
+ }
+ break;
+ case 82: // 'r'
+ PDFViewerApplication.rotatePages(90);
+ break;
+ }
+ }
+
+ if (cmd === 4) { // shift-key
+ switch (evt.keyCode) {
+ case 32: // spacebar
+ if (!isViewerInPresentationMode &&
+ PDFViewerApplication.currentScaleValue !== 'page-fit') {
+ break;
+ }
+ PDFViewerApplication.page--;
+ handled = true;
+ break;
+
+ case 82: // 'r'
+ PDFViewerApplication.rotatePages(-90);
+ break;
+ }
+ }
+
+ if (!handled && !isViewerInPresentationMode) {
+ // 33=Page Up 34=Page Down 35=End 36=Home
+ // 37=Left 38=Up 39=Right 40=Down
+ if (evt.keyCode >= 33 && evt.keyCode <= 40 &&
+ !pdfViewer.containsElement(curElement)) {
+ // The page container is not focused, but a page navigation key has been
+ // pressed. Change the focus to the viewer container to make sure that
+ // navigation by keyboard works as expected.
+ pdfViewer.focus();
+ }
+ // 32=Spacebar
+ if (evt.keyCode === 32 && curElementTagName !== 'BUTTON' &&
+ !pdfViewer.containsElement(curElement)) {
+ pdfViewer.focus();
+ }
+ }
+
+ if (cmd === 2) { // alt-key
+ switch (evt.keyCode) {
+ case 37: // left arrow
+ if (isViewerInPresentationMode) {
+ PDFHistory.back();
+ handled = true;
+ }
+ break;
+ case 39: // right arrow
+ if (isViewerInPresentationMode) {
+ PDFHistory.forward();
+ handled = true;
+ }
+ break;
+ }
+ }
+
+ if (handled) {
+ evt.preventDefault();
+ }
+});
+
+window.addEventListener('beforeprint', function beforePrint(evt) {
+ PDFViewerApplication.beforePrint();
+});
+
+window.addEventListener('afterprint', function afterPrint(evt) {
+ PDFViewerApplication.afterPrint();
+});
+
+(function animationStartedClosure() {
+ // The offsetParent is not set until the pdf.js iframe or object is visible.
+ // Waiting for first animation.
+ PDFViewerApplication.animationStartedPromise = new Promise(
+ function (resolve) {
+ window.requestAnimationFrame(resolve);
+ });
+})();
+
+
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/view/userlist.html b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/view/userlist.html
new file mode 100644
index 0000000..049c822
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/static/view/userlist.html
@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <title>iview example</title>
+ <link rel="stylesheet" type="text/css" href="http://unpkg.com/iview/dist/styles/iview.css">
+ <script type="text/javascript" src="http://vuejs.org/js/vue.min.js"></script>
+ <script type="text/javascript" src="http://unpkg.com/iview/dist/iview.min.js"></script>
+ <style>
+ #app{padding: 32px;}
+ </style>
+</head>
+<body>
+<div id="app">
+ <i-table border :columns="columns7" :data="data6"></i-table>
+</div>
+<script>
+
+ var Main = {
+ data () {
+ return {
+ columns7: [
+ {
+ title: 'Name',
+ key: 'name',
+ render: (h, params) => {
+ return h('div', [
+ h('Icon', {
+ props: {
+ type: 'person'
+ }
+ }),
+ h('strong', params.row.name)
+ ]);
+ }
+ },
+ {
+ title: 'Age',
+ key: 'age'
+ },
+ {
+ title: 'Address',
+ key: 'address'
+ },
+ {
+ title: 'Action',
+ key: 'action',
+ width: 150,
+ align: 'center',
+ render: (h, params) => {
+ return h('div', [
+ h('Button', {
+ props: {
+ type: 'primary',
+ size: 'small'
+ },
+ style: {
+ marginRight: '5px'
+ },
+ on: {
+ click: () => {
+ this.show(params.index)
+ }
+ }
+ }, 'View'),
+ h('Button', {
+ props: {
+ type: 'error',
+ size: 'small'
+ },
+ on: {
+ click: () => {
+ this.remove(params.index)
+ }
+ }
+ }, 'Delete')
+ ]);
+ }
+ }
+ ],
+ data6: [
+ {
+ name: 'John Brown',
+ age: 18,
+ address: 'New York No. 1 Lake Park'
+ },
+ {
+ name: 'Jim Green',
+ age: 24,
+ address: 'London No. 1 Lake Park'
+ },
+ {
+ name: 'Joe Black',
+ age: 30,
+ address: 'Sydney No. 1 Lake Park'
+ },
+ {
+ name: 'Jon Snow',
+ age: 26,
+ address: 'Ottawa No. 2 Lake Park'
+ }
+ ]
+ }
+ },
+ methods: {
+ show (index) {
+ this.$Modal.info({
+ title: 'User Info',
+ content: `Name：${this.data6[index].name}<br>Age：${this.data6[index].age}<br>Address：${this.data6[index].address}`
+ })
+ },
+ remove (index) {
+ this.data6.splice(index, 1);
+ }
+ }
+ }
+
+var Component = Vue.extend(Main)
+new Component().$mount('#app')
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/templates/demo3.ftl b/jeecg-boot/jeecg-boot-module-system/src/main/resources/templates/demo3.ftl
new file mode 100644
index 0000000..d75badc
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/templates/demo3.ftl
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head lang="en">
+<title>Spring Boot FreeMarker</title>
+</head>
+<body>
+ Freemarker HTML <br><br>
+
+ Sessionid: ${sessionid!}<br><br>
+
+ <font>
+ <#list userList as item>
+ ${item!}<br />
+ </#list>
+ </font>
+</body>
+</html>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/templates/pdfPreviewIframe.ftl b/jeecg-boot/jeecg-boot-module-system/src/main/resources/templates/pdfPreviewIframe.ftl
new file mode 100644
index 0000000..e92d4a9
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/templates/pdfPreviewIframe.ftl
@@ -0,0 +1,30 @@
+<#assign base=springMacroRequestContext.getContextUrl("")>
+<html>
+<head>
+<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE9">
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312">
+<meta http-equiv="Cache-Control" content="no-store"/>
+<meta http-equiv="Pragma" content="no-cache"/>
+<meta http-equiv="Expires" content="0"/>
+<title>PDF预览</title>
+</head>
+<body>
+<script type="text/javascript">
+
+function openScanFile(title,token,bizNo,archivesNo){
+ //var pdfUrl ="http://127.0.0.1:8080/jeecg-boot/generic/web/viewer.html?file="+encodeURIComponent("http://127.0.0.1:8080/jeecg-boot/test/jeecgDemo/getPdfUrl?title="+encodeURI(title));
+ var pdfUrl ="${base}/generic/web/viewer.html?file="+encodeURIComponent("http://storage.xuetangx.com/public_assets/xuetangx/PDF/PlayerAPI_v1.0.6.pdf");
+
+ var vm=window.open(pdfUrl);
+}
+
+ window.addEventListener('message', function(event) {
+ var data = event.data;
+ var title = data.title;
+ var token = data.token;
+ openScanFile(title,token);
+ }, false);
+
+</script>
+</body>
+</html>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java b/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
new file mode 100644
index 0000000..177cf10
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
@@ -0,0 +1,67 @@
+package org.jeecg;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.jeecg.modules.demo.mock.MockController;
+import org.jeecg.modules.demo.test.entity.JeecgDemo;
+import org.jeecg.modules.demo.test.mapper.JeecgDemoMapper;
+import org.jeecg.modules.demo.test.service.IJeecgDemoService;
+import org.jeecg.modules.system.service.ISysDataLogService;
+import org.junit.Assert;
+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 SampleTest {
+
+ @Resource
+ private JeecgDemoMapper jeecgDemoMapper;
+ @Resource
+ private IJeecgDemoService jeecgDemoService;
+ @Resource
+ private ISysDataLogService sysDataLogService;
+ @Resource
+ private MockController mock;
+
+ @Test
+ public void testSelect() {
+ System.out.println(("----- selectAll method test ------"));
+ List<JeecgDemo> userList = jeecgDemoMapper.selectList(null);
+ Assert.assertEquals(5, userList.size());
+ userList.forEach(System.out::println);
+ }
+
+ @Test
+ public void testXmlSql() {
+ System.out.println(("----- selectAll method test ------"));
+ List<JeecgDemo> userList = jeecgDemoMapper.getDemoByName("Sandy12");
+ userList.forEach(System.out::println);
+ }
+
+ /**
+ * 测试事务
+ */
+ @Test
+ public void testTran() {
+ jeecgDemoService.testTran();
+ }
+
+ //author:lvdandan-----date：20190315---for:添加数据日志测试----
+ /**
+ * 测试数据日志添加
+ */
+ @Test
+ public void testDataLogSave() {
+ System.out.println(("----- datalog test ------"));
+ String tableName = "jeecg_demo";
+ String dataId = "4028ef81550c1a7901550c1cd6e70001";
+ String dataContent = mock.sysDataLogJson();
+ sysDataLogService.addDataLog(tableName, dataId, dataContent);
+ }
+ //author:lvdandan-----date：20190315---for:添加数据日志测试----
+}
diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml
index aab1ab4..65c563b 100644
--- a/jeecg-boot/pom.xml
+++ b/jeecg-boot/pom.xml
@@ -1,18 +1,36 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jeecgframework.boot</groupId>
- <artifactId>jeecg-boot</artifactId>
- <version>1.1.0</version>
-
- <parent>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jeecgframework.boot</groupId>
+ <artifactId>jeecg-boot-parent</artifactId>
+ <version>2.0.0</version>
+ <packaging>pom</packaging>
+
+ <parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.0.3.RELEASE</version>
+ <version>2.1.3.RELEASE</version>
<relativePath/>
</parent>
+
+ <modules>
+ <module>jeecg-boot-base-common</module>
+ <module>jeecg-boot-module-system</module>
+ </modules>
+
+ <distributionManagement>
+ <repository>
+ <id>jeecg</id>
+ <name>jeecg Repository</name>
+ <url>http://maven.jeecg.com:8090/nexus/content/repositories/jeecg</url>
+ </repository>
+ <snapshotRepository>
+ <id>jeecg-snapshots</id>
+ <name>jeecg Snapshot Repository</name>
+ <url>http://maven.jeecg.com:8090/nexus/content/repositories/snapshots/</url>
+ </snapshotRepository>
+ </distributionManagement>
+
<repositories>
<repository>
<id>aliyun</id>
@@ -33,12 +51,12 @@
</repositories>
<properties>
+ <jeecgboot.common.version>2.0.0</jeecgboot.common.version>
<java.version>1.8</java.version>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<mybatis-plus.version>3.0.6</mybatis-plus.version>
<druid.version>1.1.10</druid.version>
- <jwt.version>0.9.1</jwt.version>
<commons.version>2.6</commons.version>
</properties>
@@ -106,29 +124,43 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
- <version>1.1.10</version>
+ <version>${druid.version}</version>
</dependency>
<!-- 动态数据源 -->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
- <version>2.5.0</version>
+ <version>2.5.2</version>
</dependency>
<!-- json -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
- <version>1.2.35</version>
+ <version>1.2.56</version>
</dependency>
<!--mysql-->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
+ <version>5.1.47</version>
<scope>runtime</scope>
</dependency>
+ <!--sqlserver-->
+ <dependency>
+ <groupId>net.sourceforge.jtds</groupId>
+ <artifactId>jtds</artifactId>
+ <version>1.3.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>mssql-jdbc</artifactId>
+ <version>7.2.1.jre8</version>
+ <scope>runtime</scope>
+ </dependency>
<!-- Quartz定时任务 -->
<dependency>
@@ -140,14 +172,14 @@
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
- <version>3.4.1</version>
+ <version>3.7.0</version>
</dependency>
<!--shiro-->
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot-starter</artifactId>
- <version>1.4.0-RC2</version>
+ <version>1.4.0</version>
</dependency>
<!-- Swagger API文档 -->
@@ -161,6 +193,17 @@
<artifactId>springfox-swagger-ui</artifactId>
<version>2.9.2</version>
</dependency>
+ <dependency>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>swagger-bootstrap-ui</artifactId>
+ <version>1.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-bean-validators</artifactId>
+ <version>2.9.2</version>
+ </dependency>
+
<!-- Redis -->
<dependency>
@@ -177,38 +220,40 @@
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>codegenerate</artifactId>
- <version>1.0.2</version>
+ <version>1.0.4</version>
</dependency>
<!-- AutoPoi Excel工具类-->
<dependency>
<groupId>org.jeecgframework</groupId>
<artifactId>autopoi-web</artifactId>
- <version>1.0.2</version>
- </dependency>
-
- <!-- Hibernate -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>4.1.0.Final</version>
+ <version>1.0.3</version>
<exclusions>
<exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
</exclusion>
</exclusions>
</dependency>
-
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <!-- jeecg-boot-base-common -->
+ <dependency>
+ <groupId>org.jeecgframework.boot</groupId>
+ <artifactId>jeecg-boot-base-common</artifactId>
+ <version>${jeecgboot.common.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<build>
<plugins>
- <plugin>
+ <!--<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
- <!-- 指定JDK编译版本 -->
+ 指定JDK编译版本 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -226,6 +271,20 @@
<skipTests>true</skipTests>
</configuration>
</plugin>
+ <!-- 避免font文件的二进制文件格式压缩破坏 -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <nonFilteredFileExtensions>
+ <nonFilteredFileExtension>woff</nonFilteredFileExtension>
+ <nonFilteredFileExtension>woff2</nonFilteredFileExtension>
+ <nonFilteredFileExtension>eot</nonFilteredFileExtension>
+ <nonFilteredFileExtension>ttf</nonFilteredFileExtension>
+ <nonFilteredFileExtension>svg</nonFilteredFileExtension>
+ </nonFilteredFileExtensions>
+ </configuration>
+ </plugin>
</plugins>
<resources>
<resource>
@@ -242,5 +301,4 @@
</resource>
</resources>
</build>
-
</project>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/java/org/jeecg/JeecgApplication.java b/jeecg-boot/src/main/java/org/jeecg/JeecgApplication.java
deleted file mode 100644
index 68c68b6..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/JeecgApplication.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.jeecg;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-@SpringBootApplication
-@EnableSwagger2
-public class JeecgApplication {
-
- public static void main(String[] args) {
- System.setProperty("spring.devtools.restart.enabled", "false");
- SpringApplication.run(JeecgApplication.class, args);
- }
-}
\ No newline at end of file
diff --git a/jeecg-boot/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java b/jeecg-boot/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
deleted file mode 100644
index ed31de1..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.jeecg.common.system.api;
-
-public interface ISysBaseAPI {
-
- /**
- * 日志添加
- * @param LogContent 内容
- * @param logType 日志类型(0:操作日志;1:登录日志;2:定时任务)
- * @param operatetype 操作类型(1:添加;2:修改;3:删除;)
- */
- void addLog(String LogContent, Integer logType, Integer operatetype);
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json b/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json
deleted file mode 100644
index 1a927b7..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "success": true,
- "message": "查询成功",
- "code": null,
- "result": [{
- "resultIndex": 0,
- "yearcount": null,
- "year": 0,
- "month": null,
- "monthcount": null,
- "classifyname": "证明类",
- "cntrnocount": 4,
- "cabinetname": null,
- "cabinetcocunt": 0
- }, {
- "resultIndex": 0,
- "yearcount": null,
- "year": 0,
- "month": null,
- "monthcount": null,
- "classifyname": "产权类",
- "cntrnocount": 9,
- "cabinetname": null,
- "cabinetcocunt": 0
- }],
- "timestamp": 1554285003594
-}
\ No newline at end of file
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportAPI.java b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportAPI.java
deleted file mode 100644
index 0945063..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportAPI.java
+++ /dev/null
@@ -1,253 +0,0 @@
-package org.jeecg.modules.online.cgreport.controller;
-
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.poi.ss.usermodel.Workbook;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.exception.JeecgBootException;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.online.cgreport.def.CgReportConstant;
-import org.jeecg.modules.online.cgreport.entity.OnlCgreportHead;
-import org.jeecg.modules.online.cgreport.entity.OnlCgreportItem;
-import org.jeecg.modules.online.cgreport.service.IOnlCgreportHeadService;
-import org.jeecg.modules.online.cgreport.service.IOnlCgreportItemService;
-import org.jeecg.modules.online.cgreport.util.BrowserUtils;
-import org.jeecg.modules.online.cgreport.util.CgReportQueryParamUtil;
-import org.jeecg.modules.online.cgreport.util.SqlUtil;
-import org.jeecg.modules.system.service.ISysDictService;
-import org.jeecgframework.poi.excel.ExcelExportUtil;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * @Title: Controller
- * @Description: 在线报表配置
- * @author: jeecg-boot
- * @date: 2019-03-08
- * @version: V1.0
- */
-@Slf4j
-@RestController
-@RequestMapping("/online/cgreport/api")
-public class OnlCgreportAPI {
-
- @Autowired
- private IOnlCgreportHeadService onlCgreportHeadService;
- @Autowired
- private IOnlCgreportItemService onlCgreportItemService;
- @Autowired
- private ISysDictService sysDictService;
-
- /**
- * 通过 head code 获取 所有的 item，并生成 columns 所需的 json
- *
- * @param code
- * head code
- * @return
- * @throws Exception
- */
- @GetMapping(value = "/getColumns/{code}")
- public Result<?> getColumns(@PathVariable("code") String code) {
-
- QueryWrapper<OnlCgreportItem> queryWrapper = new QueryWrapper<OnlCgreportItem>();
- queryWrapper.eq("cgrhead_id", code);
- queryWrapper.eq("is_show", 1);
- queryWrapper.orderByAsc("order_num");
-
- List<OnlCgreportItem> list = onlCgreportItemService.list(queryWrapper);
-
- List<Map<String, String>> array = new ArrayList<Map<String, String>>();
- for (OnlCgreportItem item : list) {
- Map<String, String> column = new HashMap<String, String>(3);
- column.put("title", item.getFieldTxt());
- column.put("dataIndex", item.getFieldName());
- column.put("align", "center");
- column.put("sorter", "true");
-
- array.add(column);
- }
-
- Map<String, Object> result = new HashMap<String, Object>(1);
- result.put("columns", array);
-
- return Result.ok(result);
- }
-
- /**
- * 通过 head code 获取 sql语句，并执行该语句返回查询数据
- *
- * @param code
- * @return
- */
- @GetMapping(value = "/getData/{code}")
- public Result<?> getData(@PathVariable("code") String code,HttpServletRequest request) {
- OnlCgreportHead head = onlCgreportHeadService.getById(code);
- if (head == null) {
- return Result.error("实体不存在");
- }
- String sql = head.getCgrSql();
- try {
- Map<String,Object> params = SqlUtil.getParameterMap(request);
- Map<String, Object> reslutMap = onlCgreportHeadService.executeSelectSql(sql,params);
- return Result.ok(reslutMap);
- } catch (Exception e) {
- e.printStackTrace();
- return Result.error("SQL执行失败：" + e.getMessage());
- }
-
- }
-
-
- /**
- * 获取查询条件
- */
- @GetMapping(value = "/getQueryInfo/{code}")
- public Result<?> getQueryInfo(@PathVariable("code") String cgrheadId) {
- try {
- List<Map<String,String>> list = onlCgreportItemService.getAutoListQueryInfo(cgrheadId);
- return Result.ok(list);
- } catch (Exception e) {
- e.printStackTrace();
- log.info("OnlCgformApiController.getQueryInfo()发生异常：" + e.getMessage());
- return Result.error("查询失败");
- }
- }
-
-
- /**
- * 将报表导出为excel
- * @param request
- * @param response
- */
- @RequestMapping(value = "/exportXls/{reportId}")
- public void exportXls(@PathVariable("reportId") String reportId,HttpServletRequest request,HttpServletResponse response) {
- //step.1 设置，获取配置信息
- String codedFileName = "报表";
- String sheetName="导出信息";
- if (oConvertUtils.isNotEmpty(reportId)) {
- Map<String, Object> cgReportMap = null;
- try{
- cgReportMap = onlCgreportHeadService.queryCgReportConfig(reportId);
- }catch (Exception e) {
- throw new JeecgBootException("动态报表配置不存在!");
- }
- List<Map<String,Object>> fieldList = (List<Map<String, Object>>) cgReportMap.get(CgReportConstant.ITEMS);
- Map<String, Object> configM = (Map<String, Object>) cgReportMap.get(CgReportConstant.MAIN);
- codedFileName = configM.get("name")+codedFileName;
- String querySql = (String) configM.get(CgReportConstant.CONFIG_SQL);
- List<Map<String,Object>> items = (List<Map<String, Object>>) cgReportMap.get(CgReportConstant.ITEMS);
- List<String> paramList = (List<String>) cgReportMap.get(CgReportConstant.PARAMS);
- //页面参数查询字段（占位符的条件语句）
- Map<String, Object> pageSearchFields = new LinkedHashMap<String,Object>();
- //step.2 装载查询条件
- Map<String,Object> paramData = new HashMap<String, Object>();
- if(paramList!=null&¶mList.size()>0){
- for(String param :paramList){
- String value = request.getParameter(param);
- value = value==null?"":value;
- querySql = querySql.replace("'${"+param+"}'", ":"+param);
- querySql = querySql.replace("${"+param+"}", ":"+param);
- paramData.put(param, value);
- }
- }
- for(Map<String,Object> item:items){
- String isQuery = item.get(CgReportConstant.ITEM_ISQUERY).toString();
- if(CgReportConstant.BOOL_TRUE.equalsIgnoreCase(isQuery)){
- CgReportQueryParamUtil.loadQueryParams(request, item, pageSearchFields,paramData);
- }
- }
- //step.3 进行查询返回结果
- String dbKey=(String)configM.get("db_source");
- List<Map<?, ?>> result=null;
- if(oConvertUtils.isNotEmpty(dbKey)){
- if(paramData!=null&¶mData.size()>0){
- //TODO 动态数据源功能未实现
- //result= DynamicDBUtil.findListByHash(dbKey,SqlUtil.getFullSql(querySql,pageSearchFields),(HashMap<String, Object>)paramData);
- }else{
- //result= DynamicDBUtil.findList(dbKey, SqlUtil.getFullSql(querySql,pageSearchFields));
- }
- }else{
- result= onlCgreportHeadService.queryByCgReportSql(querySql, pageSearchFields,paramData, -1, -1);
- }
-
- // Step.4 组装AutoPoi所需参数
- List<ExcelExportEntity> entityList = new ArrayList<ExcelExportEntity>();
- for (int i = 0; i < fieldList.size(); i++) {
- // 过滤不展示的字段
- if ("1".equals(oConvertUtils.getString(fieldList.get(i).get("is_show")))) {
- ExcelExportEntity expEntity = new ExcelExportEntity(fieldList.get(i).get("field_txt").toString(), fieldList.get(i).get("field_name"), 15);
-
- //1. 字典值设置
- Object dictCode = fieldList.get(i).get("dict_code");
- if (oConvertUtils.isNotEmpty(dictCode)) {
- List<String> dictReplaces = new ArrayList<String>();
- List<Map<String, Object>> dictList = sysDictService.queryDictItemsByCode(dictCode.toString());
- for (Map<String, Object> d : dictList) {
- dictReplaces.add(d.get("text") + "_" + d.get("value"));
- }
- //男_1, 女_2
- expEntity.setReplace(dictReplaces.toArray(new String[dictReplaces.size()]));
- }
- //2. 取值表达式(男_1, 女_2)
- //TODO oracle下大小写兼容问题
- Object replace_val = fieldList.get(i).get("replace_val");
- if(oConvertUtils.isNotEmpty(replace_val)) {
- expEntity.setReplace(replace_val.toString().split(","));
- }
- entityList.add(expEntity);
- }
- }
-
- //---------------------------------------------------------------------------------------------------------------------
- response.setContentType("application/vnd.ms-excel");
- OutputStream fOut = null;
- try {
-
- // step.4 根据浏览器进行转码，使其支持中文文件名
- String browse = BrowserUtils.checkBrowse(request);
- if ("MSIE".equalsIgnoreCase(browse.substring(0, 4))) {
- response.setHeader("content-disposition", "attachment;filename=" + java.net.URLEncoder.encode(codedFileName, "UTF-8") + ".xls");
- } else {
- String newtitle = new String(codedFileName.getBytes("UTF-8"), "ISO8859-1");
- response.setHeader("content-disposition", "attachment;filename=" + newtitle + ".xls");
- }
- // step.5 产生工作簿对象
- //HSSFWorkbook workbook = cgReportExcelService.exportExcel(codedFileName, fieldList, result);
- Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(null,sheetName), entityList, result);
- fOut = response.getOutputStream();
- workbook.write(fOut);
- } catch (Exception e) {
-
- } finally {
- try {
- fOut.flush();
- fOut.close();
- } catch (Exception e) {
-
- }
- }
- //---------------------------------------------------------------------------------------------------------------------
-
- } else {
- throw new JeecgBootException("参数错误");
- }
- }
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportHeadController.java b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportHeadController.java
deleted file mode 100644
index 5346592..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportHeadController.java
+++ /dev/null
@@ -1,269 +0,0 @@
-package org.jeecg.modules.online.cgreport.controller;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.online.cgreport.entity.OnlCgreportHead;
-import org.jeecg.modules.online.cgreport.entity.OnlCgreportItem;
-import org.jeecg.modules.online.cgreport.entity.OnlCgreportParam;
-import org.jeecg.modules.online.cgreport.model.OnlCgreportModel;
-import org.jeecg.modules.online.cgreport.service.IOnlCgreportHeadService;
-import org.jeecg.modules.online.cgreport.service.IOnlCgreportItemService;
-import org.jeecg.modules.online.cgreport.service.IOnlCgreportParamService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * @Title: Controller
- * @Description: 在线报表配置
- * @author: jeecg-boot
- * @date: 2019-03-08
- * @version: V1.0
- */
-@RestController
-@RequestMapping("/online/cgreport/head")
-@Slf4j
-public class OnlCgreportHeadController {
-
- @Autowired
- private IOnlCgreportHeadService onlCgreportHeadService;
- @Autowired
- private IOnlCgreportParamService onlCgreportParamService;
- @Autowired
- private IOnlCgreportItemService onlCgreportItemService;
-
- /**
- * sql解析获取字段和参数
- *
- * @return
- */
- @GetMapping(value = "/parseSql")
- public Result<?> parseSql(@RequestParam(name = "sql", required = true) String sql) {
- Map<String, Object> resultJson = new HashMap<String, Object>();
- //返回SQL解析字段
- List<OnlCgreportItem> onlCgreportItemList = new ArrayList<OnlCgreportItem>();
- //返回SQL解析参数
- List<OnlCgreportParam> onlCgreportParamList = new ArrayList<OnlCgreportParam>();
- List<String> fields = null;
- List<String> params = null;
- String dbKey = null;
- try {
- fields = onlCgreportHeadService.getSqlFields(sql, dbKey);
- params = onlCgreportHeadService.getSqlParams(sql);
-
- int i = 1;
- for(String f:fields) {
- OnlCgreportItem t = new OnlCgreportItem();
- t.setFieldName(f);
- t.setFieldTxt(f);
- t.setIsShow(1);
- t.setOrderNum(i);
- t.setId(i+"_"+System.currentTimeMillis());
- t.setFieldType("String");
- onlCgreportItemList.add(t);
- i++;
- }
-
- for(String p:params) {
- OnlCgreportParam param = new OnlCgreportParam();
- param.setParamName(p);
- param.setParamTxt(p);
- onlCgreportParamList.add(param);
- }
- resultJson.put("fields", onlCgreportItemList);
- resultJson.put("params", onlCgreportParamList);
- } catch (Exception e) {
- e.printStackTrace();
- String msg = "解析失败!<br><br>失败原因：";
- int i = e.getMessage().indexOf("Connection refused: connect");
- if (i != -1) {// 非链接异常
- msg += "数据源连接失败.";
- } else {
- msg += "SQL语法错误.";
- }
- Result.error(msg);
- }
- return Result.ok(resultJson);
- }
-
- /**
- * 分页列表查询
- *
- * @param onlCgreportHead
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @GetMapping(value = "/list")
- public Result<IPage<OnlCgreportHead>> queryPageList(OnlCgreportHead onlCgreportHead, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
- Result<IPage<OnlCgreportHead>> result = new Result<IPage<OnlCgreportHead>>();
- QueryWrapper<OnlCgreportHead> queryWrapper = QueryGenerator.initQueryWrapper(onlCgreportHead, req.getParameterMap());
- Page<OnlCgreportHead> page = new Page<OnlCgreportHead>(pageNo, pageSize);
- IPage<OnlCgreportHead> pageList = onlCgreportHeadService.page(page, queryWrapper);
- result.setSuccess(true);
- result.setResult(pageList);
- return result;
- }
-
- /**
- * 添加
- *
- * @param onlCgreportHead
- * @return
- */
- @PostMapping(value = "/add")
- public Result<?> add(@RequestBody OnlCgreportModel values) {
- Result<OnlCgreportHead> result = new Result<OnlCgreportHead>();
- try {
- String uuid = UUID.randomUUID().toString().replace("-", "");
-
- OnlCgreportHead head = values.getHead();
- List<OnlCgreportParam> params = values.getParams();
- List<OnlCgreportItem> items = values.getItems();
-
- head.setId(uuid);
- for (OnlCgreportParam param : params) {
- param.setId(null);
- param.setCgrheadId(uuid);
- }
- for (OnlCgreportItem item : items) {
- item.setId(null);
- item.setCgrheadId(uuid);
- }
-
- onlCgreportHeadService.save(head);
- onlCgreportParamService.saveBatch(params);
- onlCgreportItemService.saveBatch(items);
-
- result.success("添加成功！");
- } catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
- result.error500("操作失败");
- }
- return result;
- }
-
- /**
- * 编辑保存全部操作
- */
- @PutMapping(value = "/editAll")
- public Result<?> editAll(@RequestBody OnlCgreportModel values) {
-
- try {
- return onlCgreportHeadService.editAll(values);
-
- } catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
- return Result.error("操作失败");
- }
-
- }
-
- /**
- * 编辑
- *
- * @param onlCgreportHead
- * @return
- */
- @PutMapping(value = "/edit")
- public Result<OnlCgreportHead> edit(@RequestBody OnlCgreportHead onlCgreportHead) {
- Result<OnlCgreportHead> result = new Result<OnlCgreportHead>();
- OnlCgreportHead onlCgreportHeadEntity = onlCgreportHeadService.getById(onlCgreportHead.getId());
- if (onlCgreportHeadEntity == null) {
- result.error500("未找到对应实体");
- } else {
- boolean ok = onlCgreportHeadService.updateById(onlCgreportHead);
- // TODO 返回false说明什么？
- if (ok) {
- result.success("修改成功!");
- }
- }
-
- return result;
- }
-
- /**
- * 通过id删除
- *
- * @param id
- * @return
- */
- @DeleteMapping(value = "/delete")
- public Result<OnlCgreportHead> delete(@RequestParam(name = "id", required = true) String id) {
- Result<OnlCgreportHead> result = new Result<OnlCgreportHead>();
- OnlCgreportHead onlCgreportHead = onlCgreportHeadService.getById(id);
- if (onlCgreportHead == null) {
- result.error500("未找到对应实体");
- } else {
- boolean ok = onlCgreportHeadService.removeById(id);
- if (ok) {
- result.success("删除成功!");
- }
- }
-
- return result;
- }
-
- /**
- * 批量删除
- *
- * @param ids
- * @return
- */
- @DeleteMapping(value = "/deleteBatch")
- public Result<OnlCgreportHead> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
- Result<OnlCgreportHead> result = new Result<OnlCgreportHead>();
- if (ids == null || "".equals(ids.trim())) {
- result.error500("参数不识别！");
- } else {
- this.onlCgreportHeadService.removeByIds(Arrays.asList(ids.split(",")));
- result.success("删除成功!");
- }
- return result;
- }
-
- /**
- * 通过id查询
- *
- * @param id
- * @return
- */
- @GetMapping(value = "/queryById")
- public Result<OnlCgreportHead> queryById(@RequestParam(name = "id", required = true) String id) {
- Result<OnlCgreportHead> result = new Result<OnlCgreportHead>();
- OnlCgreportHead onlCgreportHead = onlCgreportHeadService.getById(id);
- if (onlCgreportHead == null) {
- result.error500("未找到对应实体");
- } else {
- result.setResult(onlCgreportHead);
- result.setSuccess(true);
- }
- return result;
- }
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportParamController.java b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportParamController.java
deleted file mode 100644
index 5ac2708..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportParamController.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package org.jeecg.modules.online.cgreport.controller;
-
-import java.util.Arrays;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.online.cgreport.entity.OnlCgreportParam;
-import org.jeecg.modules.online.cgreport.service.IOnlCgreportParamService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * @Title: Controller
- * @Description: 在线报表配置
- * @author: jeecg-boot
- * @date: 2019-03-08
- * @version: V1.0
- */
-@RestController
-@RequestMapping("/online/cgreport/param")
-@Slf4j
-public class OnlCgreportParamController {
-
- @Autowired
- private IOnlCgreportParamService onlCgreportParamService;
-
- /**
- * 根据 headId 查询出 所有的 param
- */
- @GetMapping(value = "/listByHeadId")
- public Result<?> queryPageListByHeadId(String headId) {
-
- QueryWrapper<OnlCgreportParam> queryWrapper = new QueryWrapper<OnlCgreportParam>();
- queryWrapper.eq("cgrhead_id", headId);
- queryWrapper.orderByAsc("order_num");
- List<OnlCgreportParam> list = onlCgreportParamService.list(queryWrapper);
-
- Result<List<OnlCgreportParam>> result = new Result<List<OnlCgreportParam>>();
- result.setSuccess(true);
- result.setResult(list);
- return result;
- }
-
- /**
- * 分页列表查询
- *
- * @param onlCgreportParam
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @GetMapping(value = "/list")
- public Result<IPage<OnlCgreportParam>> queryPageList(OnlCgreportParam onlCgreportParam, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
- Result<IPage<OnlCgreportParam>> result = new Result<IPage<OnlCgreportParam>>();
- QueryWrapper<OnlCgreportParam> queryWrapper = QueryGenerator.initQueryWrapper(onlCgreportParam, req.getParameterMap());
- Page<OnlCgreportParam> page = new Page<OnlCgreportParam>(pageNo, pageSize);
- IPage<OnlCgreportParam> pageList = onlCgreportParamService.page(page, queryWrapper);
- result.setSuccess(true);
- result.setResult(pageList);
- return result;
- }
-
- /**
- * 添加
- *
- * @param onlCgreportParam
- * @return
- */
- @PostMapping(value = "/add")
- public Result<OnlCgreportParam> add(@RequestBody OnlCgreportParam onlCgreportParam) {
- Result<OnlCgreportParam> result = new Result<OnlCgreportParam>();
- try {
- onlCgreportParamService.save(onlCgreportParam);
- result.success("添加成功！");
- } catch (Exception e) {
- e.printStackTrace();
- log.info(e.getMessage());
- result.error500("操作失败");
- }
- return result;
- }
-
- /**
- * 编辑
- *
- * @param onlCgreportParam
- * @return
- */
- @PutMapping(value = "/edit")
- public Result<OnlCgreportParam> edit(@RequestBody OnlCgreportParam onlCgreportParam) {
- Result<OnlCgreportParam> result = new Result<OnlCgreportParam>();
- OnlCgreportParam onlCgreportParamEntity = onlCgreportParamService.getById(onlCgreportParam.getId());
- if (onlCgreportParamEntity == null) {
- result.error500("未找到对应实体");
- } else {
- boolean ok = onlCgreportParamService.updateById(onlCgreportParam);
- // TODO 返回false说明什么？
- if (ok) {
- result.success("修改成功!");
- }
- }
-
- return result;
- }
-
- /**
- * 通过id删除
- *
- * @param id
- * @return
- */
- @DeleteMapping(value = "/delete")
- public Result<OnlCgreportParam> delete(@RequestParam(name = "id", required = true) String id) {
- Result<OnlCgreportParam> result = new Result<OnlCgreportParam>();
- OnlCgreportParam onlCgreportParam = onlCgreportParamService.getById(id);
- if (onlCgreportParam == null) {
- result.error500("未找到对应实体");
- } else {
- boolean ok = onlCgreportParamService.removeById(id);
- if (ok) {
- result.success("删除成功!");
- }
- }
-
- return result;
- }
-
- /**
- * 批量删除
- *
- * @param ids
- * @return
- */
- @DeleteMapping(value = "/deleteBatch")
- public Result<OnlCgreportParam> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
- Result<OnlCgreportParam> result = new Result<OnlCgreportParam>();
- if (ids == null || "".equals(ids.trim())) {
- result.error500("参数不识别！");
- } else {
- this.onlCgreportParamService.removeByIds(Arrays.asList(ids.split(",")));
- result.success("删除成功!");
- }
- return result;
- }
-
- /**
- * 通过id查询
- *
- * @param id
- * @return
- */
- @GetMapping(value = "/queryById")
- public Result<OnlCgreportParam> queryById(@RequestParam(name = "id", required = true) String id) {
- Result<OnlCgreportParam> result = new Result<OnlCgreportParam>();
- OnlCgreportParam onlCgreportParam = onlCgreportParamService.getById(id);
- if (onlCgreportParam == null) {
- result.error500("未找到对应实体");
- } else {
- result.setResult(onlCgreportParam);
- result.setSuccess(true);
- }
- return result;
- }
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/def/CgReportConstant.java b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/def/CgReportConstant.java
deleted file mode 100644
index 6ad22e7..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/def/CgReportConstant.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.jeecg.modules.online.cgreport.def;
-/**
- *
- * @Title:CgReportConstant
- * @description:动态报表常量类
- * @author 赵俊夫
- * @date Jul 30, 2013 9:16:18 AM
- * @version V1.0
- */
-public class CgReportConstant {
- /** 抬头配置 */
- public static final String MAIN= "main";
- /** 明细配置*/
- public static final String ITEMS= "items";
- /** 动态报表参数*/
- public static final String PARAMS= "params";
- /** 配置的id*/
- public static final String CONFIG_ID="config_id";
- /** 配置的名称*/
- public static final String CONFIG_NAME="config_name";
- /** 字段列表*/
- public static final String CONFIG_FIELDLIST = "config_fieldList";
- /** 查询字段*/
- public static final String CONFIG_QUERYLIST ="config_queryList";
- /** 动态报表参数*/
- public static final String CONFIG_PARAMS ="config_params";
- /**字典数据*/
- public static final String FIELD_DICTLIST = "field_dictlist";
- /**系统字典表*/
- public static final String SYS_DIC="t_s_type";
- /**系统字典分组表*/
- public static final String SYS_DICGROUP="t_s_typegroup";
- /** 抬头配置-查询SQL*/
- public static final String CONFIG_SQL= "cgreport_sql";
- /** 字典编码*/
- public static final String ITEM_DICCODE= "dict_code";
- /** 取值表达式*/
- public static final String ITEM_REPLACE = "replace_value";
- /** 明细配置-字段名*/
- public static final String ITEM_FIELDNAME = "field_name";
- /** 明细配置-是否查询*/
- public static final String ITEM_ISQUERY = "search_flag";
- /** 明细配置-字段类型*/
- public static final String ITEM_FIELDTYPE = "field_type";
- /** 明细配置-查询模式*/
- public static final String ITEM_QUERYMODE = "search_mode";
- /**逻辑true*/
- public static final String BOOL_TRUE= "Y";
- /**逻辑false*/
- public static final String BOOL_FALSE= "N";
- /**查询操作=*/
- public static final String OP_EQ = " = ";
- /**查询操作>=*/
- public static final String OP_RQ = " >= ";
- /**查询操作<=*/
- public static final String OP_LQ = " <= ";
- /**查询操作like*/
- public static final String OP_LIKE = " LIKE ";
- /**显示模式Date*/
- public static final String TYPE_DATE = "Date";
- /**显示模式String*/
- public static final String TYPE_STRING = "String";
- /**显示模式Integer*/
- public static final String TYPE_INTEGER = "Integer";
- /**显示模式Double*/
- public static final String TYPE_DOUBLE = "Double";
-
- /** iframe */
- public static final String CONFIG_IFRAME = "config_iframe";
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/entity/OnlCgreportHead.java b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/entity/OnlCgreportHead.java
deleted file mode 100644
index fb9e36c..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/entity/OnlCgreportHead.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.jeecg.modules.online.cgreport.entity;
-
-import java.io.Serializable;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import lombok.Data;
-
-/**
- * @Description: 在线报表配置
- * @author: jeecg-boot
- * @date: 2019-03-08
- * @version: V1.0
- */
-@Data
-@TableName("onl_cgreport_head")
-public class OnlCgreportHead implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /** id */
- @TableId(type = IdType.UUID)
- private java.lang.String id;
- /** 报表编码 */
- private java.lang.String code;
- /** 报表名字 */
- private java.lang.String name;
- /** 报表SQL */
- private java.lang.String cgrSql;
- /** 返回值字段 */
- private java.lang.String returnValField;
- /** 返回文本字段 */
- private java.lang.String returnTxtField;
- /** 返回类型，单选或多选 */
- private java.lang.String returnType;
- /** 动态数据源 */
- private java.lang.String dbSource;
- /** 描述 */
- private java.lang.String content;
- /** 修改时间 */
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private java.util.Date updateTime;
- /** 修改人id */
- private java.lang.String updateBy;
- /** 创建时间 */
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private java.util.Date createTime;
- /** 创建人id */
- private java.lang.String createBy;
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/entity/OnlCgreportItem.java b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/entity/OnlCgreportItem.java
deleted file mode 100644
index 1a05aef..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/entity/OnlCgreportItem.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.jeecg.modules.online.cgreport.entity;
-
-import java.io.Serializable;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import lombok.Data;
-
-/**
- * @Description: 在线报表配置
- * @author: jeecg-boot
- * @date: 2019-03-08
- * @version: V1.0
- */
-@Data
-@TableName("onl_cgreport_item")
-public class OnlCgreportItem implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /** id */
- @TableId(type = IdType.UUID)
- private java.lang.String id;
- /** 报表ID */
- private java.lang.String cgrheadId;
- /** 字段名字 */
- private java.lang.String fieldName;
- /** 字段文本 */
- private java.lang.String fieldTxt;
- /** fieldWidth */
- private java.lang.Integer fieldWidth;
- /** 字段类型 */
- private java.lang.String fieldType;
- /** 查询模式 */
- private java.lang.String searchMode;
- /** 是否排序 0否,1是 */
- private java.lang.Integer isOrder;
- /** 是否查询 0否,1是 */
- private java.lang.Integer isSearch;
- /** 字典CODE */
- private java.lang.String dictCode;
- /** 字段跳转URL */
- private java.lang.String fieldHref;
- /** 是否显示 0否,1显示 */
- private java.lang.Integer isShow;
- /** 排序 */
- private java.lang.Integer orderNum;
- /** 取值表达式 */
- private java.lang.String replaceVal;
- /** 创建人 */
- private java.lang.String createBy;
- /** 创建时间 */
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private java.util.Date createTime;
- /** 修改人 */
- private java.lang.String updateBy;
- /** 修改时间 */
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private java.util.Date updateTime;
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/entity/OnlCgreportParam.java b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/entity/OnlCgreportParam.java
deleted file mode 100644
index 49ef38a..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/entity/OnlCgreportParam.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.jeecg.modules.online.cgreport.entity;
-
-import java.io.Serializable;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import lombok.Data;
-
-/**
- * @Description: 在线报表配置
- * @author: jeecg-boot
- * @date: 2019-03-08
- * @version: V1.0
- */
-@Data
-@TableName("onl_cgreport_param")
-public class OnlCgreportParam implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /** id */
- @TableId(type = IdType.UUID)
- private java.lang.String id;
- /** 动态报表ID */
- private java.lang.String cgrheadId;
- /** 参数字段 */
- private java.lang.String paramName;
- /** 参数文本 */
- private java.lang.String paramTxt;
- /** 参数默认值 */
- private java.lang.String paramValue;
- /** 排序 */
- private java.lang.Integer orderNum;
- /** 创建人登录名称 */
- private java.lang.String createBy;
- /** 创建日期 */
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private java.util.Date createTime;
- /** 更新人登录名称 */
- private java.lang.String updateBy;
- /** 更新日期 */
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private java.util.Date updateTime;
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/OnlCgreportHeadMapper.java b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/OnlCgreportHeadMapper.java
deleted file mode 100644
index 325dc29..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/OnlCgreportHeadMapper.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.jeecg.modules.online.cgreport.mapper;
-
-import java.util.List;
-import java.util.Map;
-
-import org.jeecg.modules.online.cgreport.entity.OnlCgreportHead;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 在线报表配置
- * @author: jeecg-boot
- * @date: 2019-03-08
- * @version: V1.0
- */
-public interface OnlCgreportHeadMapper extends BaseMapper<OnlCgreportHead> {
-
- /**
- * 执行查询SQL语句
- *
- * @param sql
- * @return
- */
- List<Map<?, ?>> executeSelete(String sql);
-
- /**
- * 动态sql查询数据量
- * @param sql
- * @return
- */
- Long queryCountBySql(String sql);
-
- /**
- * 通过reportId获取报表主配置信息
- * @param reportId
- * @return
- */
- Map<String, Object> queryCgReportMainConfig(String reportId);
- /**
- * 通过reportId获取报表字段信息
- * @param reportCode
- * @return
- */
- List<Map<String, Object>> queryCgReportItems(String reportId);
- /**
- * 通过reportId获取报参数信息
- * @param reportId
- * @return
- */
- List<String> queryCgReportParams(String reportId);
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/OnlCgreportItemMapper.java b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/OnlCgreportItemMapper.java
deleted file mode 100644
index e611274..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/OnlCgreportItemMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.jeecg.modules.online.cgreport.mapper;
-
-import org.jeecg.modules.online.cgreport.entity.OnlCgreportItem;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 在线报表配置
- * @author： jeecg-boot
- * @date： 2019-03-08
- * @version： V1.0
- */
-public interface OnlCgreportItemMapper extends BaseMapper<OnlCgreportItem> {
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/OnlCgreportParamMapper.java b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/OnlCgreportParamMapper.java
deleted file mode 100644
index d8caf9a..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/OnlCgreportParamMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.jeecg.modules.online.cgreport.mapper;
-
-import org.jeecg.modules.online.cgreport.entity.OnlCgreportParam;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 在线报表配置
- * @author： jeecg-boot
- * @date： 2019-03-08
- * @version： V1.0
- */
-public interface OnlCgreportParamMapper extends BaseMapper<OnlCgreportParam> {
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/xml/OnlCgreportHeadMapper.xml b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/xml/OnlCgreportHeadMapper.xml
deleted file mode 100644
index 1737d6c..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/xml/OnlCgreportHeadMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.online.cgreport.mapper.OnlCgreportHeadMapper">
-
- <!-- 执行select sql语句 -->
- <select id="executeSelete" resultType="map" parameterType="java.lang.String">
- ${_parameter}
- </select>
-
- <!-- 执行select count语句 -->
- <select id="queryCountBySql" parameterType="java.lang.String" resultType="java.lang.Long">
- ${_parameter}
- </select>
-
- <!-- 执行select sql语句 -->
- <select id="findForListMap" resultType="map" parameterType="map">
- ${_parameter}
- </select>
-
- <!-- 查询报表配置主信息 -->
- <select id="queryCgReportMainConfig" resultType="map" parameterType="java.lang.String">
- select
- ch.id as id,
- ch.code as code,
- ch.name as name,
- ch.cgr_sql as cgreport_sql,
- ch.content as content,
- ch.db_source,
- ch.return_type
- from onl_cgreport_head ch
- where ch.id =#{reportId,jdbcType=VARCHAR}
- </select>
-
- <!-- 查询报表配置字段信息 -->
- <select id="queryCgReportItems" resultType="map" parameterType="java.lang.String">
- select
- ci.id as id,
- ci.field_name as field_name,
- ci.field_txt as field_txt,
- ci.field_href as field_href,
- ci.is_show as is_show,
- ci.field_type as field_type,
- ci.replace_val as replace_value,
- ci.dict_code as dict_code,
- ci.is_search as search_flag,
- ci.search_mode as search_mode,
- ci.cgrhead_id as cgreport_head_id
- from onl_cgreport_item ci
- where ci.cgrhead_id = #{cgrheadId,jdbcType=VARCHAR}
- order by ci.order_num asc
- </select>
-
- <!-- 查询报表配置参数信息 -->
- <select id="queryCgReportParams" resultType="map" parameterType="java.lang.String">
- select * from onl_cgreport_param where cgrhead_id = #{cgrheadId,jdbcType=VARCHAR}
- </select>
-
-</mapper>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/xml/OnlCgreportParamMapper.xml b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/xml/OnlCgreportParamMapper.xml
deleted file mode 100644
index e95d928..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/mapper/xml/OnlCgreportParamMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.online.cgreport.mapper.OnlCgreportParamMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/model/OnlCgreportModel.java b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/model/OnlCgreportModel.java
deleted file mode 100644
index 151a535..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/model/OnlCgreportModel.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.jeecg.modules.online.cgreport.model;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.jeecg.modules.online.cgreport.entity.OnlCgreportHead;
-import org.jeecg.modules.online.cgreport.entity.OnlCgreportItem;
-import org.jeecg.modules.online.cgreport.entity.OnlCgreportParam;
-
-/**
- * @Description: 用于接收修改或新增报表信息的model
- * @author: sunjianlei
- * @date: 2019-03-11
- * @version: V1.0
- */
-public class OnlCgreportModel {
-
- private OnlCgreportHead head;
-
- private List<OnlCgreportParam> params;
- private String deleteParamIds;
-
- private List<OnlCgreportItem> items;
- private String deleteItemIds;
-
- public OnlCgreportHead getHead() {
- return head;
- }
-
- public void setHead(OnlCgreportHead head) {
- this.head = head;
- }
-
- public List<OnlCgreportParam> getParams() {
- return params;
- }
-
- public void setParams(List<OnlCgreportParam> params) {
- this.params = params;
- }
-
- public List<OnlCgreportItem> getItems() {
- return items;
- }
-
- public void setItems(List<OnlCgreportItem> items) {
- this.items = items;
- }
-
- public String getDeleteParamIds() {
- return deleteParamIds;
- }
-
- public List<String> getDeleteParamIdList() {
- return Arrays.asList(deleteParamIds.split(","));
- }
-
- public void setDeleteParamIds(String deleteParamIds) {
- this.deleteParamIds = deleteParamIds;
- }
-
- public String getDeleteItemIds() {
- return deleteItemIds;
- }
-
- public List<String> getDeleteItemIdList() {
- return Arrays.asList(deleteItemIds.split(","));
- }
-
- public void setDeleteItemIds(String deleteItemIds) {
- this.deleteItemIds = deleteItemIds;
- }
-
- @Override
- public String toString() {
- return "OnlCgreportModel [head=" + head + ", params=" + params + ", deleteParamIds=" + deleteParamIds + ", items=" + items + ", deleteItemIds=" + deleteItemIds + "]";
- }
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/CgReportExcelServiceI.java b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/CgReportExcelServiceI.java
deleted file mode 100644
index f48c016..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/CgReportExcelServiceI.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.jeecg.modules.online.cgreport.service;
-
-
-import java.util.Collection;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-/**
- *
- * @Title:CgReportExcelServiceI
- * @description:动态报表excel导出
- * @author scott
- * @date 2019-03-21
- * @version V1.0
- */
-public interface CgReportExcelServiceI{
- /**
- *
- * @param title 标题
- * @param titleSet 报表头
- * @param dataSet 报表内容
- * @return
- */
- public HSSFWorkbook exportExcel(String title, Collection<?> titleSet,Collection<?> dataSet);
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/IOnlCgreportHeadService.java b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/IOnlCgreportHeadService.java
deleted file mode 100644
index 73fe21f..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/IOnlCgreportHeadService.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.jeecg.modules.online.cgreport.service;
-
-import java.util.List;
-import java.util.Map;
-
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.online.cgreport.entity.OnlCgreportHead;
-import org.jeecg.modules.online.cgreport.model.OnlCgreportModel;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 在线报表配置
- * @author: jeecg-boot
- * @date: 2019-03-08
- * @version: V1.0
- */
-public interface IOnlCgreportHeadService extends IService<OnlCgreportHead> {
-
- /**
- * 修改全部项，包括新增、修改、删除
- *
- * @param values
- * @return
- */
- Result<?> editAll(OnlCgreportModel values);
-
- /**
- * 执行SQL语句
- *
- * @param sql
- * @return
- */
- Map<String, Object> executeSelectSql(String sql,Map<String,Object> params);
-
- /**
- * 动态数据源： 获取SQL解析的字段
- */
- public List<String> getSqlFields(String sql,String dbKey);
-
-
- /**
- * 解析SQL参数
- */
- public List<String> getSqlParams(String sql);
-
- Map<String, Object> queryCgReportConfig(String reportCode);
-
- public List<Map<?, ?>> queryByCgReportSql(String sql, Map params,Map paramData,int page, int rows);
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/IOnlCgreportItemService.java b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/IOnlCgreportItemService.java
deleted file mode 100644
index 669744b..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/IOnlCgreportItemService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.jeecg.modules.online.cgreport.service;
-
-import java.util.List;
-import java.util.Map;
-
-import org.jeecg.modules.online.cgreport.entity.OnlCgreportItem;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 在线报表配置
- * @author: jeecg-boot
- * @date: 2019-03-08
- * @version: V1.0
- */
-public interface IOnlCgreportItemService extends IService<OnlCgreportItem> {
-
- List<Map<String, String>> getAutoListQueryInfo(String cgrheadId);
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/IOnlCgreportParamService.java b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/IOnlCgreportParamService.java
deleted file mode 100644
index f84d130..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/IOnlCgreportParamService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.jeecg.modules.online.cgreport.service;
-
-import org.jeecg.modules.online.cgreport.entity.OnlCgreportParam;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 在线报表配置
- * @author： jeecg-boot
- * @date： 2019-03-08
- * @version： V1.0
- */
-public interface IOnlCgreportParamService extends IService<OnlCgreportParam> {
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/impl/CgReportExcelServiceImpl.java b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/impl/CgReportExcelServiceImpl.java
deleted file mode 100644
index 3e3a1a5..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/impl/CgReportExcelServiceImpl.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package org.jeecg.modules.online.cgreport.service.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFRichTextString;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.RichTextString;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.jeecg.modules.online.cgreport.service.CgReportExcelServiceI;
-import org.springframework.stereotype.Service;
-
-/**
- * @Description: Excel导出工具类
- * @author: scott
- * @date: 2019-03-21
- * @version: V1.0
- */
-@Service(value = "cgReportExcelService")
-public class CgReportExcelServiceImpl implements CgReportExcelServiceI {
-
- @Override
- public HSSFWorkbook exportExcel(String title, Collection<?> titleSet, Collection<?> dataSet) {
- // 声明一个工作薄
- HSSFWorkbook workbook = null;
- try {
- // 首先检查数据看是否是正确的
- if (titleSet == null || titleSet.size() == 0) {
- throw new Exception("读取表头失败！");
- }
- if (title == null) {
- title = "";
- }
- // 声明一个工作薄
- workbook = new HSSFWorkbook();
- // 生成一个表格
- Sheet sheet = workbook.createSheet(title);
- int rindex = 0;
- int cindex = 0;
- // 产生表格标题行
- Row row = sheet.createRow(rindex);
- row.setHeight((short) 450);
- CellStyle titleStyle = getTitleStyle(workbook);
-// Iterator itTitle = titleSet.iterator();
- List<Map> titleList = (List<Map>) titleSet;
- Iterator itData = dataSet.iterator();
- // 遍历标题行
- for (Map titleM : titleList) {
- String titleContent = (String) titleM.get("field_txt");
- Cell cell = row.createCell(cindex);
- RichTextString text = new HSSFRichTextString(titleContent);
- cell.setCellValue(text);
- cell.setCellStyle(titleStyle);
- cindex++;
- }
- HSSFCellStyle bodyStyle = getOneStyle(workbook);
- // 遍历内容
- while (itData.hasNext()) {
- cindex = 0;
- rindex++;
- row = sheet.createRow(rindex);
- Map dataM = (Map) itData.next();// 获取每一行的内容
- for (Map titleM : titleList) {
- String field = (String) titleM.get("field_name");
- String content = dataM.get(field) == null ? "" : dataM.get(field).toString();
- Cell cell = row.createCell(cindex);
- RichTextString text = new HSSFRichTextString(content);
- cell.setCellStyle(bodyStyle);
- cell.setCellValue(text);
- cindex++;
- }
- }
- for (int i = 0; i < titleList.size(); i++) {
- sheet.autoSizeColumn(i);
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- return workbook;
- }
-
- /**
- * exce表头单元格样式处理
- *
- * @param workbook
- * @return
- */
- private HSSFCellStyle getTitleStyle(HSSFWorkbook workbook) {
- // 产生Excel表头
- HSSFCellStyle titleStyle = workbook.createCellStyle();
- titleStyle.setBorderLeft(HSSFCellStyle.BORDER_THIN); // 左边框
- titleStyle.setBorderRight(HSSFCellStyle.BORDER_THIN); // 右边框
- titleStyle.setBorderBottom(HSSFCellStyle.BORDER_THIN); // 底边框
- titleStyle.setBorderTop(HSSFCellStyle.BORDER_THIN); // 顶边框
- titleStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER);
- titleStyle.setFillForegroundColor(HSSFColor.GREY_25_PERCENT.index); // 填充的背景颜色
- titleStyle.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND); // 填充图案
-
- return titleStyle;
- }
-
- // 生成多少行的带有比边框的空行
- private void setBlankRows(int rows, int columns, HSSFWorkbook workbook) {
- // 得到第一页
- Sheet sheet = workbook.getSheetAt(0);
- // 样式
- CellStyle cellStyle = getOneStyle(workbook);
- for (int i = 1; i <= rows; i++) {
- Row row = sheet.createRow(i);
- for (int j = 0; j < columns; j++) {
- row.createCell(j).setCellStyle(cellStyle);
- }
- }
- }
-
- private HSSFCellStyle getTwoStyle(HSSFWorkbook workbook) {
- // 产生Excel表头
- HSSFCellStyle style = workbook.createCellStyle();
- style.setBorderLeft((short) 1); // 左边框
- style.setBorderRight((short) 1); // 右边框
- style.setBorderBottom((short) 1);
- style.setBorderTop((short) 1);
- style.setFillForegroundColor(HSSFColor.LIGHT_TURQUOISE.index); // 填充的背景颜色
- style.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND); // 填充图案
- return style;
- }
-
- private HSSFCellStyle getOneStyle(HSSFWorkbook workbook) {
- // 产生Excel表头
- HSSFCellStyle style = workbook.createCellStyle();
- style.setBorderLeft((short) 1); // 左边框
- style.setBorderRight((short) 1); // 右边框
- style.setBorderBottom((short) 1);
- style.setBorderTop((short) 1);
- return style;
- }
-}
\ No newline at end of file
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/impl/OnlCgreportHeadServiceImpl.java b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/impl/OnlCgreportHeadServiceImpl.java
deleted file mode 100644
index 99b59d6..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/impl/OnlCgreportHeadServiceImpl.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package org.jeecg.modules.online.cgreport.service.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.commons.lang.StringUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.exception.JeecgBootException;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.online.cgreport.def.CgReportConstant;
-import org.jeecg.modules.online.cgreport.entity.OnlCgreportHead;
-import org.jeecg.modules.online.cgreport.entity.OnlCgreportItem;
-import org.jeecg.modules.online.cgreport.entity.OnlCgreportParam;
-import org.jeecg.modules.online.cgreport.mapper.OnlCgreportHeadMapper;
-import org.jeecg.modules.online.cgreport.model.OnlCgreportModel;
-import org.jeecg.modules.online.cgreport.service.IOnlCgreportHeadService;
-import org.jeecg.modules.online.cgreport.service.IOnlCgreportItemService;
-import org.jeecg.modules.online.cgreport.service.IOnlCgreportParamService;
-import org.jeecg.modules.online.cgreport.util.SqlUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 在线报表配置
- * @author: jeecg-boot
- * @date: 2019-03-08
- * @version: V1.0
- */
-@Service
-public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMapper, OnlCgreportHead> implements IOnlCgreportHeadService {
-
- @Autowired
- private IOnlCgreportParamService onlCgreportParamService;
- @Autowired
- private IOnlCgreportItemService onlCgreportItemService;
-
- @Autowired
- OnlCgreportHeadMapper mapper;
-
- /**
- * 执行 select sql语句
- *
- * @param sql
- */
- @Override
- public Map<String, Object> executeSelectSql(String sql,Map<String,Object> params) {
- Map<String, Object> result = new HashMap<>();
-
- //1、分页查询逻辑
- Integer pageSize = oConvertUtils.getInt(params.get("pageSize"),10);
- Integer pageNo = oConvertUtils.getInt(params.get("pageNo"),1);
- String pagesql = SqlUtil.jeecgCreatePageSql(sql,null,pageNo,pageSize);
-
- //2、排序逻辑
- //TODO
-
- //TODO 页面查询条件未实现
- String countSql = SqlUtil.getCountSql(sql, null);
- Long cl = mapper.queryCountBySql(countSql);
-
- result.put("total", cl);
- result.put("records", mapper.executeSelete(pagesql));
- return result;
- }
-
- /** 修改全部项，包括新增、修改、删除 */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public Result<?> editAll(OnlCgreportModel values) {
- OnlCgreportHead head = values.getHead();
-
- OnlCgreportHead onlCgreportHeadEntity = super.getById(head.getId());
- if (onlCgreportHeadEntity == null) {
- return Result.error("未找到对应实体");
- }
-
- super.updateById(head);
-
- List<OnlCgreportParam> params = values.getParams();
- List<OnlCgreportItem> items = values.getItems();
-
- // 将param分类成 添加和修改 两个列表
- List<OnlCgreportParam> addParam = new ArrayList<OnlCgreportParam>();
- List<OnlCgreportParam> editParam = new ArrayList<OnlCgreportParam>();
- for (OnlCgreportParam param : params) {
- String id = String.valueOf(param.getId());
-
- if (id.length() == 32) {
- // 修改项
- editParam.add(param);
-
- } else {
- // 新增项
- param.setId(null);
- param.setCgrheadId(head.getId());
- addParam.add(param);
- }
- }
- onlCgreportParamService.saveBatch(addParam);
-
- // 使用 updateBatchById 会报错，原因未知，具体错误：
- // updateBatch Parameter 'param1' not found. Available parameters are
- // [et]
-
- for (OnlCgreportParam edit : editParam) {
- onlCgreportParamService.updateById(edit);
- }
-
- // 将item分类
- List<OnlCgreportItem> addItem = new ArrayList<OnlCgreportItem>();
- List<OnlCgreportItem> editItem = new ArrayList<OnlCgreportItem>();
- for (OnlCgreportItem item : items) {
- String id = String.valueOf(item.getId());
-
- if (id.length() == 32) {
- // 修改项
- editItem.add(item);
-
- } else {
- // 新增项
- item.setId(null);
- item.setCgrheadId(head.getId());
- addItem.add(item);
- }
- }
- onlCgreportItemService.saveBatch(addItem);
-
- for (OnlCgreportItem edit : editItem) {
- onlCgreportItemService.updateById(edit);
- }
-
- // 删除项
- onlCgreportParamService.removeByIds(values.getDeleteParamIdList());
- onlCgreportItemService.removeByIds(values.getDeleteItemIdList());
-
- return Result.ok("全部修改成功");
-
- }
-
-
- /**
- * 动态数据源： 获取SQL解析的字段
- */
- @Override
- public List<String> getSqlFields(String sql,String dbKey){
- List<String> fields = null;
- sql = SqlUtil.getSql(sql);
- if(StringUtils.isNotBlank(dbKey)){
- fields = this.parseSql(sql,dbKey);
- }else{
- fields = this.parseSql(sql,null);
- }
- return fields;
- }
-
-
- /**
- * 解析SQL参数
- */
- @Override
- public List<String> getSqlParams(String sql) {
- if(oConvertUtils.isEmpty(sql)){
- return null;
- }
- List<String> params = new ArrayList<String>();
- String regex = "\\$\\{\\w+\\}";
-
- Pattern p = Pattern.compile(regex);
- Matcher m = p.matcher(sql);
- while(m.find()){
- String whereParam = m.group();
- params.add(whereParam.substring(whereParam.indexOf("{")+1,whereParam.indexOf("}")));
- }
- return params;
- }
-
- /**
- * 未实现动态数据源的逻辑
- * @param sql
- * @param dbKey
- * @return
- */
- private List<String> parseSql(String sql,String dbKey) {
- if(oConvertUtils.isEmpty(sql)){
- return null;
- }
- //封装分页SQL
- int page = 1;
- int rows = 1;
- String pagesql = SqlUtil.jeecgCreatePageSql(sql,null,page,rows);
- List<Map<?, ?>> result = mapper.executeSelete(pagesql);
- if(result.size()<1){
- throw new JeecgBootException("该报表sql没有数据");
- }
- Set fieldsSet= result.get(0).keySet();
- List<String> fileds = new ArrayList<String>(fieldsSet);
- return fileds;
- }
-
-
- @Override
- public Map<String, Object> queryCgReportConfig(String reportId) {
- Map<String,Object> cgReportM = new HashMap<String, Object>(0);
- Map<String,Object> mainM = mapper.queryCgReportMainConfig(reportId);
- List<Map<String,Object>> itemsM = mapper.queryCgReportItems(reportId);
- List<String> params = mapper.queryCgReportParams(reportId);
- cgReportM.put(CgReportConstant.MAIN, mainM);
- cgReportM.put(CgReportConstant.ITEMS, itemsM);
- cgReportM.put(CgReportConstant.PARAMS, params);
- return cgReportM;
- }
-
- /**
- * 分页查询报表数据
- */
- @Override
- public List<Map<?, ?>> queryByCgReportSql(String sql, Map params,Map paramData,
- int page, int rows) {
- String querySql = SqlUtil.getFullSql(sql,params);
- List<Map<?, ?>> result = null;
- if(paramData!=null&¶mData.size()==0){
- paramData = null;
- }
- if(page==-1 && rows==-1){
- //TODO 根据sql,paramData，转换成真正的SQL
- result = mapper.executeSelete(querySql);
- }else{
- //TODO 根据sql,paramData，转换成真正的SQL
- String pagesql = SqlUtil.jeecgCreatePageSql(sql,paramData,page,rows);
- result = mapper.executeSelete(pagesql);
- }
- return result;
- }
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/impl/OnlCgreportItemServiceImpl.java b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/impl/OnlCgreportItemServiceImpl.java
deleted file mode 100644
index 5fa1e55..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/impl/OnlCgreportItemServiceImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.jeecg.modules.online.cgreport.service.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.jeecg.modules.online.cgreport.entity.OnlCgreportItem;
-import org.jeecg.modules.online.cgreport.mapper.OnlCgreportItemMapper;
-import org.jeecg.modules.online.cgreport.service.IOnlCgreportItemService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 在线报表配置
- * @author: jeecg-boot
- * @date: 2019-03-08
- * @version: V1.0
- */
-@Service
-public class OnlCgreportItemServiceImpl extends ServiceImpl<OnlCgreportItemMapper, OnlCgreportItem> implements IOnlCgreportItemService {
-
- /**
- * 获取online报表查询条件
- */
- @Override
- public List<Map<String, String>> getAutoListQueryInfo(String cgrheadId) {
- LambdaQueryWrapper<OnlCgreportItem> query = new LambdaQueryWrapper<OnlCgreportItem>();
- query.eq(OnlCgreportItem::getCgrheadId, cgrheadId);
- query.eq(OnlCgreportItem::getIsSearch,1);
- List<OnlCgreportItem> fieldList = this.list(query);
- List<Map<String, String>> list = new ArrayList<>();
- int i=0;
- for (OnlCgreportItem item : fieldList) {
- Map<String,String> map = new HashMap<>();
- map.put("label",item.getFieldTxt());
- map.put("view",item.getFieldType());
- map.put("mode",item.getSearchMode());
- map.put("field",item.getFieldName());
- if((++i)>2) {
- map.put("hidden","1");
- }
- list.add(map);
- }
- return list;
- }
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/impl/OnlCgreportParamServiceImpl.java b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/impl/OnlCgreportParamServiceImpl.java
deleted file mode 100644
index da13b37..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/service/impl/OnlCgreportParamServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.jeecg.modules.online.cgreport.service.impl;
-
-import org.jeecg.modules.online.cgreport.entity.OnlCgreportParam;
-import org.jeecg.modules.online.cgreport.mapper.OnlCgreportParamMapper;
-import org.jeecg.modules.online.cgreport.service.IOnlCgreportParamService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 在线报表配置
- * @author： jeecg-boot
- * @date： 2019-03-08
- * @version： V1.0
- */
-@Service
-public class OnlCgreportParamServiceImpl extends ServiceImpl<OnlCgreportParamMapper, OnlCgreportParam> implements IOnlCgreportParamService {
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/util/CgReportQueryParamUtil.java b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/util/CgReportQueryParamUtil.java
deleted file mode 100644
index 88cd976..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/util/CgReportQueryParamUtil.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package org.jeecg.modules.online.cgreport.util;
-
-import java.io.UnsupportedEncodingException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import org.jeecg.common.util.DateUtils;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.online.cgreport.def.CgReportConstant;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-
-/**
- *
- * @Title:QueryParamUtil
- * @description:动态报表查询条件处理工具
- * @author 赵俊夫
- * @date Jul 5, 2013 10:22:31 PM
- * @version V1.0
- */
-public class CgReportQueryParamUtil{
-
- /**
- * 组装查询参数
- * @param request 请求(查询值从此处取)
- * @param item 动态报表字段配置
- * @param pageSearchFields 页面参数查询字段（占位符的条件语句）
- * @param paramData 占位符对应的数据
- */
- public static void loadQueryParams(HttpServletRequest request, Map<String,Object> item, Map<String,Object> pageSearchFields,Map<String,Object> paramData) {
- String filedName = (String) item.get(CgReportConstant.ITEM_FIELDNAME);
- String queryMode = (String) item.get(CgReportConstant.ITEM_QUERYMODE);
- String filedType = (String) item.get(CgReportConstant.ITEM_FIELDTYPE);
- if("single".equals(queryMode)){
- //单条件组装方式
- String value =request.getParameter(filedName.toLowerCase());
- try {
- if(oConvertUtils.isEmpty(value)){
- return;
- }
- String uri = request.getQueryString();
- if(uri.contains(filedName+"=")){
- String contiansChinesevalue = new String(value.getBytes("ISO-8859-1"), "UTF-8");
- value = contiansChinesevalue;
- }
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- return;
- }
- if(oConvertUtils.isNotEmpty(value)){
- if(value.contains("*")){
- //模糊查询
- value = value.replaceAll("\\*", "%");
- pageSearchFields.put(filedName, CgReportConstant.OP_LIKE+":"+filedName);
- }else{
- pageSearchFields.put(filedName, CgReportConstant.OP_EQ+":"+filedName);
- }
- }
- paramData.put(filedName, covertData(filedType,value,true));
- }else if("group".equals(queryMode)){
- //范围查询组装
- String begin = request.getParameter(filedName.toLowerCase()+"_begin");
- String end = request.getParameter(filedName.toLowerCase()+"_end");
- if(oConvertUtils.isNotEmpty(begin)){
- String re = CgReportConstant.OP_RQ+":"+filedName+"_begin";
- pageSearchFields.put(filedName, re);
- paramData.put(filedName+"_begin", covertData(filedType,begin,true));
- }
- if(oConvertUtils.isNotEmpty(end)){
- String re = CgReportConstant.OP_LQ+":"+filedName+"_end";
- pageSearchFields.put(new String(filedName), re);
- paramData.put(filedName+"_end", covertData(filedType,end,false));
- }
- }
- }
-
- private static Object covertData(String fieldType,String value,boolean isBegin){
- Object obj = null;
- if(oConvertUtils.isNotEmpty(value)){
- if(CgReportConstant.TYPE_STRING.equalsIgnoreCase(fieldType)){
- obj = value;
- }else if(CgReportConstant.TYPE_DATE.equalsIgnoreCase(fieldType)){
- if (value.length() == 19) {
- } else if (value.length() == 10) {
- if(isBegin){
- value +=" 00:00:00";
- }else{
- value +=" 23:59:59";
- }
- }
- SimpleDateFormat datetimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- obj = DateUtils.str2Date(value, datetimeFormat);
- }else if(CgReportConstant.TYPE_DOUBLE.equalsIgnoreCase(fieldType)){
- obj = value;
- }else if(CgReportConstant.TYPE_INTEGER.equalsIgnoreCase(fieldType)){
- obj = value;
- }else{
- obj = value;
- }
- }
- return obj;
- }
-
- /**
- * 将结果集转化为列表json格式
- * @param result 结果集
- * @param size 总大小
- * @return 处理好的json格式
- */
- public static String getJson(List<Map<String, Object>> result,Long size){
- JSONObject main = new JSONObject();
- JSONArray rows = new JSONArray();
- main.put("total",size );
- if(result!=null){
- for(Map m:result){
- JSONObject item = new JSONObject();
- Iterator it =m.keySet().iterator();
- while(it.hasNext()){
- String key = (String) it.next();
- String value =String.valueOf(m.get(key));
- key = key.toLowerCase();
- if(key.contains("time")||key.contains("date")){
- value = datatimeFormat(value);
- }
- item.put(key,value );
- }
- rows.add(item);
- }
- }
- main.put("rows", rows);
- return main.toString();
- }
-
- /**
- * 将结果集转化为列表json格式(不含分页信息)
- * @param result 结果集
- * @param size 总大小
- * @return 处理好的json格式
- */
- public static String getJson(List<Map<String, Object>> result){
- JSONArray rows = new JSONArray();
- for(Map m:result){
- JSONObject item = new JSONObject();
- Iterator it =m.keySet().iterator();
- while(it.hasNext()){
- String key = (String) it.next();
- String value =String.valueOf(m.get(key));
- key = key.toLowerCase();
- if(key.contains("time")||key.contains("date")){
- value = datatimeFormat(value);
- }
- item.put(key,value );
- }
- rows.add(item);
- }
- return rows.toString();
- }
-
- /**
- * 将毫秒数去掉
- * @param datetime
- * @return
- */
- public static String datatimeFormat(String datetime){
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S");
- SimpleDateFormat dateFormatTo = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- Date d = null;
- try{
- d = dateFormat.parse(datetime);
- return dateFormatTo.format(d);
- }catch (Exception e) {
- return datetime;
- }
- }
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/util/SqlUtil.java b/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/util/SqlUtil.java
deleted file mode 100644
index 3c5ff95..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/online/cgreport/util/SqlUtil.java
+++ /dev/null
@@ -1,260 +0,0 @@
-package org.jeecg.modules.online.cgreport.util;
-
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.jeecg.common.util.oConvertUtils;
-
-/**
- * @Description: 根据不同的数据库，动态生成分页SQL
- * @author scott
- * @date 2019-03-20
- */
-public class SqlUtil {
-
- public static final String DATABSE_TYPE_MYSQL ="mysql";
- public static final String DATABSE_TYPE_POSTGRE ="postgresql";
- public static final String DATABSE_TYPE_ORACLE ="oracle";
- public static final String DATABSE_TYPE_SQLSERVER ="sqlserver";
-
- /**
- * 分页SQL
- */
- public static final String MYSQL_SQL = "select * from ( {0}) sel_tab00 limit {1},{2}"; //mysql
- public static final String POSTGRE_SQL = "select * from ( {0}) sel_tab00 limit {2} offset {1}";//postgresql
- public static final String ORACLE_SQL = "select * from (select row_.*,rownum rownum_ from ({0}) row_ where rownum <= {1}) where rownum_>{2}"; //oracle
- public static final String SQLSERVER_SQL = "select * from ( select row_number() over(order by tempColumn) tempRowNumber, * from (select top {1} tempColumn = 0, {0}) t ) tt where tempRowNumber > {2}"; //sqlserver
-
- /**
- * 获取所有表的SQL
- */
- public static final String MYSQL_ALLTABLES_SQL = "select distinct table_name from information_schema.columns where table_schema = {0}";
- public static final String POSTGRE__ALLTABLES_SQL = "SELECT distinct c.relname AS table_name FROM pg_class c";
- public static final String ORACLE__ALLTABLES_SQL = "select distinct colstable.table_name as table_name from user_tab_cols colstable";
- public static final String SQLSERVER__ALLTABLES_SQL= "select distinct c.name as table_name from sys.objects c";
-
- /**
- * 获取指定表的所有列名
- */
- public static final String MYSQL_ALLCOLUMNS_SQL = "select column_name from information_schema.columns where table_name = {0} and table_schema = {1}";
- public static final String POSTGRE_ALLCOLUMNS_SQL = "select table_name from information_schema.columns where table_name = {0}";
- public static final String ORACLE_ALLCOLUMNS_SQL = "select column_name from all_tab_columns where table_name ={0}";
- public static final String SQLSERVER_ALLCOLUMNS_SQL = "select name from syscolumns where id={0}";
- /**
- * 获取全sql
- * @param sql
- * @param params
- * @return
- */
- //TODO 规则要改
- public static String getFullSql(String sql,Map params){
- StringBuilder sqlB = new StringBuilder();
- sqlB.append("SELECT t.* FROM ( ");
- sqlB.append(sql+" ");
- sqlB.append(") t ");
- if (params!=null&¶ms.size() >= 1) {
- sqlB.append("WHERE 1=1 ");
- Iterator it = params.keySet().iterator();
- while (it.hasNext()) {
- String key = String.valueOf(it.next());
- String value = String.valueOf(params.get(key));
- if (oConvertUtils.isNotEmpty(value)) {
- sqlB.append(" AND ");
- sqlB.append(" " + key + value );
- }
- }
- }
- return sqlB.toString();
- }
-
- /**
- * 获取求数量sql
- * @param sql
- * @param params
- * @return
- */
- public static String getCountSql(String sql, Map params) {
- String querySql = getFullSql(sql,params);
- //若要兼容数据库,SQL中取别名一律用大写
- querySql = "SELECT COUNT(*) COUNT FROM ("+querySql+") t2";
- return querySql;
- }
-
- /**
- * 生成分页查询sql
- * @param sql
- * @param page
- * @param rows
- * @return
- */
- public static String jeecgCreatePageSql(String sql,Map params, int page, int rows){
- //TODO 数据库链接URL，需要动态获取
- String dbTypeUrl = "jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false";
- int beginNum = (page - 1) * rows;
- String[] sqlParam = new String[3];
- sqlParam[0] = sql;
- sqlParam[1] = beginNum+"";
- sqlParam[2] = rows+"";
- if(dbTypeUrl.indexOf(DATABSE_TYPE_MYSQL)!=-1){
- sql = MessageFormat.format(MYSQL_SQL, sqlParam);
- }else if(dbTypeUrl.indexOf(DATABSE_TYPE_POSTGRE)!=-1){
- sql = MessageFormat.format(POSTGRE_SQL, sqlParam);
- }else {
- int beginIndex = (page-1)*rows;
- int endIndex = beginIndex+rows;
- sqlParam[2] = Integer.toString(beginIndex);
- sqlParam[1] = Integer.toString(endIndex);
- if(dbTypeUrl.indexOf(DATABSE_TYPE_ORACLE)!=-1) {
- sql = MessageFormat.format(ORACLE_SQL, sqlParam);
- } else if(dbTypeUrl.indexOf(DATABSE_TYPE_SQLSERVER)!=-1) {
- sqlParam[0] = sql.substring(getAfterSelectInsertPoint(sql));
- sql = MessageFormat.format(SQLSERVER_SQL, sqlParam);
- }
- }
- return sql;
- }
-
- /**
- * 生成分页查询sql
- * @param sql
- * @param page
- * @param rows
- * @return
- */
- @SuppressWarnings("rawtypes")
- public static String jeecgCreatePageSql(String dbTypeUrl,String dbKey,String sql,Map params, int page, int rows){
- sql = getFullSql(sql,params);
- int beginNum = (page - 1) * rows;
- String[] sqlParam = new String[3];
- sqlParam[0] = sql;
- sqlParam[1] = beginNum+"";
- sqlParam[2] = rows+"";
- //TODO 动态数据源，获取数据库类型
- String databaseType = "";
- if(DATABSE_TYPE_MYSQL.equalsIgnoreCase(databaseType)){
- sql = MessageFormat.format(MYSQL_SQL, sqlParam);
- }else if(DATABSE_TYPE_POSTGRE.equalsIgnoreCase(databaseType)){
- sql = MessageFormat.format(POSTGRE_SQL, sqlParam);
- }else {
- int beginIndex = (page-1)*rows;
- int endIndex = beginIndex+rows;
- sqlParam[2] = Integer.toString(beginIndex);
- sqlParam[1] = Integer.toString(endIndex);
- if(DATABSE_TYPE_ORACLE.equalsIgnoreCase(databaseType)) {
- sql = MessageFormat.format(ORACLE_SQL, sqlParam);
- } else if(DATABSE_TYPE_SQLSERVER.equalsIgnoreCase(databaseType)) {
- sqlParam[0] = sql.substring(getAfterSelectInsertPoint(sql));
- sql = MessageFormat.format(SQLSERVER_SQL, sqlParam);
- }
- }
- return sql;
- }
-
- private static int getAfterSelectInsertPoint(String sql) {
- int selectIndex = sql.toLowerCase().indexOf("select");
- int selectDistinctIndex = sql.toLowerCase().indexOf("select distinct");
- return selectIndex + (selectDistinctIndex == selectIndex ? 15 : 6);
- }
-
- //add-begin--Author:luobaoli Date:20150620 for：增加各个数据库获取表的SQL和获取指定表列的SQL
- public static String getAllTableSql(String dbType,String ... param){
- if(oConvertUtils.isNotEmpty(dbType)){
- if(DATABSE_TYPE_MYSQL.equals(dbType)){
- return MessageFormat.format(MYSQL_ALLTABLES_SQL, param);
- }else if(DATABSE_TYPE_ORACLE.equals(dbType)){
- return ORACLE__ALLTABLES_SQL;
- }else if(DATABSE_TYPE_POSTGRE.equals(dbType)){
- return POSTGRE__ALLTABLES_SQL;
- }else if(DATABSE_TYPE_SQLSERVER.equals(dbType)){
- return SQLSERVER__ALLTABLES_SQL;
- }
- }
- return null;
- }
-
- public static String getAllCloumnSql(String dbType,String ... param){
- if(oConvertUtils.isNotEmpty(dbType)){
- if(DATABSE_TYPE_MYSQL.equals(dbType)){
- return MessageFormat.format(MYSQL_ALLCOLUMNS_SQL, param);
- }else if(DATABSE_TYPE_ORACLE.equals(dbType)){
- return MessageFormat.format(ORACLE_ALLCOLUMNS_SQL, param);
- }else if(DATABSE_TYPE_POSTGRE.equals(dbType)){
- return MessageFormat.format(POSTGRE_ALLCOLUMNS_SQL, param);
- }else if(DATABSE_TYPE_SQLSERVER.equals(dbType)){
- return MessageFormat.format(SQLSERVER_ALLCOLUMNS_SQL, param);
- }
- }
- return null;
- }
-
- /**
- * 【转换${}规则为万能SQL，方便SQL执行解析】
- * @param sql
- * @return
- */
- public static String getSql(String sql){
- String regex = "\\$\\{\\w+\\}";
- Pattern p = Pattern.compile(regex);
- Matcher m = p.matcher(sql);
- while(m.find()){
- String whereParam = m.group();
- //System.out.println(whereParam);
- sql = sql.replace(whereParam, "'' or 1=1 or 1=''");
- sql = sql.replace("'''", "''");
- //System.out.println(sql);
- }
- //兼容图表
- regex = "\\{\\w+\\}";
- p = Pattern.compile(regex);
- m = p.matcher(sql);
- while(m.find()){
- String whereParam = m.group();
- //System.out.println(whereParam);
- sql = sql.replace(whereParam, " 1=1 ");
- //System.out.println(sql);
- }
- return sql;
- }
-
- /**
- * 获取页面查询参数
- * @param request
- * @return
- */
- public static Map<String, Object> getParameterMap(HttpServletRequest request) {
- // 参数Map
- Map<?, ?> properties = request.getParameterMap();
- // 返回值Map
- Map<String, Object> returnMap = new HashMap<String, Object>();
- Iterator<?> entries = properties.entrySet().iterator();
-
- Map.Entry<String, Object> entry;
- String name = "";
- String value = "";
- Object valueObj =null;
- while (entries.hasNext()) {
- entry = (Map.Entry<String, Object>) entries.next();
- name = (String) entry.getKey();
- valueObj = entry.getValue();
- if ("_t".equals(name) || null == valueObj) {
- value = "";
- } else if (valueObj instanceof String[]) {
- String[] values = (String[]) valueObj;
- for (int i = 0; i < values.length; i++) {
- value = values[i] + ",";
- }
- value = value.substring(0, value.length() - 1);
- } else {
- value = valueObj.toString();
- }
- returnMap.put(name, value);
- }
- return returnMap;
- }
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/quartz/service/impl/QuartzJobServiceImpl.java b/jeecg-boot/src/main/java/org/jeecg/modules/quartz/service/impl/QuartzJobServiceImpl.java
deleted file mode 100644
index 5e2aad9..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/quartz/service/impl/QuartzJobServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.jeecg.modules.quartz.service.impl;
-
-import java.util.List;
-
-import org.jeecg.modules.quartz.entity.QuartzJob;
-import org.jeecg.modules.quartz.mapper.QuartzJobMapper;
-import org.jeecg.modules.quartz.service.IQuartzJobService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 定时任务在线管理
- * @author： jeecg-boot
- * @date： 2019-01-02
- * @version： V1.0
- */
-@Service
-public class QuartzJobServiceImpl extends ServiceImpl<QuartzJobMapper, QuartzJob> implements IQuartzJobService {
- @Autowired
- private QuartzJobMapper quartzJobMapper;
-
- @Override
- public List<QuartzJob> findByJobClassName(String jobClassName) {
- return quartzJobMapper.findByJobClassName(jobClassName);
- }
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml b/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
deleted file mode 100644
index 9641c5e..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysUserMapper">
-
- <!-- 根据用户名查询 -->
- <select id="getUserByName" resultType="org.jeecg.modules.system.entity.SysUser">
- select * from sys_user where username = #{username}
- </select>
-
-</mapper>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysDictTree.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysDictTree.java
deleted file mode 100644
index 4c7bf9f..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysDictTree.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.jeecg.modules.system.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import org.jeecg.modules.system.entity.SysDict;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 字典表
- * </p>
- *
- * @author zhangweijian
- * @since 2018-12-28
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class SysDictTree implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private String key;
-
- private String title;
-
- /**
- * id
- */
- @TableId(type = IdType.UUID)
- private String id;
- /**
- * 字典类型,0 string,1 number类型,2 boolean
- * 前端js对stirng类型和number类型 boolean 类型敏感，需要区分。在select 标签匹配的时候会用到
- * 默认为string类型
- */
- private Integer type;
-
- /**
- * 字典名称
- */
- private String dictName;
-
- /**
- * 字典编码
- */
- private String dictCode;
-
- /**
- * 描述
- */
- private String description;
-
- /**
- * 删除状态
- */
- private Integer delFlag;
-
- /**
- * 创建人
- */
- private String createBy;
-
- /**
- * 创建时间
- */
- private Date createTime;
-
- /**
- * 更新人
- */
- private String updateBy;
-
- /**
- * 更新时间
- */
- private Date updateTime;
-
- public SysDictTree(SysDict node) {
- this.id = node.getId();
- this.key = node.getId();
- this.title = node.getDictName();
- this.dictCode = node.getDictCode();
- this.description = node.getDescription();
- this.delFlag = node.getDelFlag();
- this.type = node.getType();
- }
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysUserCacheInfo.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysUserCacheInfo.java
deleted file mode 100644
index 524fa2c..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/SysUserCacheInfo.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.jeecg.modules.system.model;
-
-import java.util.List;
-
-import org.jeecg.common.util.DateUtils;
-
-public class SysUserCacheInfo {
-
- private String sysUserCode;
-
- private String sysUserName;
-
- /*private String sysDate;
-
- private String sysTime;*/
-
- private String companyCode;
-
- private List<String> sysOrgCode;
-
- private boolean oneDepart;
-
- public boolean isOneDepart() {
- return oneDepart;
- }
-
- public void setOneDepart(boolean oneDepart) {
- this.oneDepart = oneDepart;
- }
-
- public String getSysDate() {
- return DateUtils.formatDate();
- }
-
- public String getSysTime() {
- return DateUtils.now();
- }
-
- public String getSysUserCode() {
- return sysUserCode;
- }
-
- public void setSysUserCode(String sysUserCode) {
- this.sysUserCode = sysUserCode;
- }
-
- public String getSysUserName() {
- return sysUserName;
- }
-
- public void setSysUserName(String sysUserName) {
- this.sysUserName = sysUserName;
- }
-
-
-
- public String getCompanyCode() {
- return companyCode;
- }
-
- public void setCompanyCode(String companyCode) {
- this.companyCode = companyCode;
- }
-
- public List<String> getSysOrgCode() {
- return sysOrgCode;
- }
-
- public void setSysOrgCode(List<String> sysOrgCode) {
- this.sysOrgCode = sysOrgCode;
- }
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/TreeSelectModel.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/model/TreeSelectModel.java
deleted file mode 100644
index 14e219a..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/model/TreeSelectModel.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.jeecg.modules.system.model;
-
-import java.io.Serializable;
-
-public class TreeSelectModel implements Serializable {
-
-
- private static final long serialVersionUID = 9016390975325574747L;
-
- private String key;
-
- private String title;
-
- private boolean isLeaf;
-
- private String icon;
-
- private String parentId;
-
- private String value;
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- public String getParentId() {
- return parentId;
- }
-
- public void setParentId(String parentId) {
- this.parentId = parentId;
- }
-
- public String getKey() {
- return key;
- }
-
- public void setKey(String key) {
- this.key = key;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public boolean isLeaf() {
- return isLeaf;
- }
-
- public void setLeaf(boolean isLeaf) {
- this.isLeaf = isLeaf;
- }
-
- public String getIcon() {
- return icon;
- }
-
- public void setIcon(String icon) {
- this.icon = icon;
- }
-
-
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java
deleted file mode 100644
index ba962c4..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.jeecg.modules.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.model.SysDepartTreeModel;
-import java.util.List;
-
-/**
- * <p>
- * 部门表 服务实现类
- * <p>
- *
- * @author：Steve
- * @Since： 2019-01-22
- */
-public interface ISysDepartService extends IService<SysDepart>{
-
-
- /**
- * 查询所有部门信息,并分节点进行显示
- * @return
- */
- List<SysDepartTreeModel> queryTreeList();
-
- /**
- * 保存部门数据
- * @param sysDepart
- */
- void saveDepartData(SysDepart sysDepart,String username);
-
- /**
- * 更新depart数据
- * @param sysDepart
- * @return
- */
- Boolean updateDepartDataById(SysDepart sysDepart,String username);
-
- /**
- * 删除depart数据
- * @param id
- * @return
- */
- /* boolean removeDepartDataById(String id); */
-
- /**
- * 根据关键字搜索相关的部门数据
- * @param keyWord
- * @return
- */
- List<SysDepartTreeModel> searhBy(String keyWord);
-
- /**
- * 根据部门id删除并删除其可能存在的子级部门
- * @param id
- * @return
- */
- boolean delete(String id);
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysDictService.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysDictService.java
deleted file mode 100644
index cf95302..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysDictService.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.jeecg.modules.system.service;
-
-import java.util.List;
-import java.util.Map;
-
-import org.jeecg.modules.system.entity.SysDict;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.system.entity.SysDictItem;
-
-/**
- * <p>
- * 字典表 服务类
- * </p>
- *
- * @author zhangweijian
- * @since 2018-12-28
- */
-public interface ISysDictService extends IService<SysDict> {
-
- public List<Map<String, Object>> queryDictItemsByCode(String code);
-
- List<Map<String, Object>> queryTableDictItemsByCode(String table, String text, String code);
-
- public String queryDictTextByKey(String code, String key);
-
- String queryTableDictTextByKey(String table, String text, String code, String key);
-
- /**
- * 根据字典类型删除关联表中其对应的数据
- *
- * @param sysDict
- * @return
- */
- boolean deleteByDictId(SysDict sysDict);
-
- /**
- * 添加一对多
- */
- public void saveMain(SysDict sysDict, List<SysDictItem> sysDictItemList);
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysLogService.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysLogService.java
deleted file mode 100644
index 66d2927..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysLogService.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.jeecg.modules.system.service;
-
-import org.jeecg.modules.system.entity.SysLog;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 系统日志表 服务类
- * </p>
- *
- * @author zhangweijian
- * @since 2018-12-26
- */
-public interface ISysLogService extends IService<SysLog> {
-
- /**
- * @功能：清空所有日志记录
- */
- public void removeAll();
-
- /**
- * 获取系统总访问次数
- *
- * @return Long
- */
- Long findTotalVisitCount();
-
- /**
- * 获取系统今日访问次数
- *
- * @return Long
- */
- Long findTodayVisitCount();
-
- /**
- * 获取系统今日访问 IP数
- *
- * @return Long
- */
- Long findTodayIp();
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java
deleted file mode 100644
index ef89006..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.jeecg.modules.system.service;
-
-import java.util.List;
-
-import org.jeecg.modules.system.entity.SysPermissionDataRule;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 菜单权限规则 服务类
- * </p>
- *
- * @author huangzhilin
- * @since 2019-04-01
- */
-public interface ISysPermissionDataRuleService extends IService<SysPermissionDataRule> {
-
- /**
- * 根据菜单id查询其对应的权限数据
- *
- * @param permRule
- */
- List<SysPermissionDataRule> getPermRuleListByPermId(String permissionId);
-
- /**
- * 根据页面传递的参数查询菜单权限数据
- *
- * @return
- */
- List<SysPermissionDataRule> queryPermissionRule(SysPermissionDataRule permRule);
-
-
- /**
- * 根据菜单ID和用户名查找数据权限配置信息
- * @param permission
- * @param username
- * @return
- */
- List<SysPermissionDataRule> queryPermissionDataRules(String username,String permissionId);
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysPermissionService.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysPermissionService.java
deleted file mode 100644
index b209d6b..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysPermissionService.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.jeecg.modules.system.service;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.common.exception.JeecgBootException;
-import org.jeecg.modules.system.entity.SysPermission;
-import org.jeecg.modules.system.model.TreeModel;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 菜单权限表 服务类
- * </p>
- *
- * @author scott
- * @since 2018-12-21
- */
-public interface ISysPermissionService extends IService<SysPermission> {
-
- public List<TreeModel> queryListByParentId(String parentId);
-
- /**真实删除*/
- public void deletePermission(String id) throws JeecgBootException;
- /**逻辑删除*/
- public void deletePermissionLogical(String id) throws JeecgBootException;
-
- public void addPermission(SysPermission sysPermission) throws JeecgBootException;
-
- public void editPermission(SysPermission sysPermission) throws JeecgBootException;
-
- public List<SysPermission> queryByUser(String username);
-
- /**
- * 根据permissionId删除其关联的SysPermissionDataRule表中的数据
- *
- * @param id
- * @return
- */
- public void deletePermRuleByPermId(String id);
-
- /**
- * 查询出带有特殊符号的菜单地址的集合
- * @return
- */
- public List<String> queryPermissionUrlWithStar();
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysRolePermissionService.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysRolePermissionService.java
deleted file mode 100644
index 6965386..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysRolePermissionService.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.jeecg.modules.system.service;
-
-import org.jeecg.modules.system.entity.SysRolePermission;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 角色权限表 服务类
- * </p>
- *
- * @author scott
- * @since 2018-12-21
- */
-public interface ISysRolePermissionService extends IService<SysRolePermission> {
-
- /**
- * 保存授权/先删后增
- * @param roleId
- * @param permissionIds
- */
- public void saveRolePermission(String roleId,String permissionIds);
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java
deleted file mode 100644
index 9c3fbeb..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.jeecg.modules.system.service;
-
-
-import java.util.List;
-
-import org.jeecg.modules.system.entity.SysUser;
-import org.jeecg.modules.system.entity.SysUserDepart;
-import org.jeecg.modules.system.model.DepartIdModel;
-import org.jeecg.modules.system.model.SysUserDepartsVO;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * SysUserDpeart用户组织机构service
- * </p>
- * @author ZhiLin
- *
- */
-public interface ISysUserDepartService extends IService<SysUserDepart> {
-
- /**
- * 根据指定用户添加部门信息
- * @param sysUserDepartsVO
- * @return
- */
- boolean addSysUseWithrDepart(SysUserDepartsVO sysUserDepartsVO);
-
- /**
- * 根据指定用户id查询部门信息
- * @param userId
- * @return
- */
- List<DepartIdModel> queryDepartIdsOfUser(String userId);
-
- /**
- * 根据指定用户id编辑部门信息
- * @param sysUserDepartsVO
- * @return
- */
- boolean editSysUserWithDepart(SysUserDepartsVO sysUserDepartsVO);
-
- /**
- * 根据部门id查询用户信息
- * @param depId
- * @return
- */
- List<SysUser> queryUserByDepId(String depId);
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
deleted file mode 100644
index e6136f1..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.jeecg.modules.system.service;
-
-import java.util.List;
-import org.jeecg.modules.system.entity.SysUser;
-import org.jeecg.modules.system.model.SysUserCacheInfo;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 用户表 服务类
- * </p>
- *
- * @author scott
- * @since 2018-12-20
- */
-public interface ISysUserService extends IService<SysUser> {
-
- public SysUser getUserByName(String username);
-
- /**
- * 添加用户和用户角色关系
- * @param user
- * @param roles
- */
- public void addUserWithRole(SysUser user,String roles);
-
-
- /**
- * 修改用户和用户角色关系
- * @param user
- * @param roles
- */
- public void editUserWithRole(SysUser user,String roles);
-
- /**
- * 获取用户的授权角色
- * @param username
- * @return
- */
- public List<String> getRole(String username);
-
- /**
- * 查询用户信息包括 部门信息
- * @param username
- * @return
- */
- public SysUserCacheInfo getCacheUser(String username);
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/AutoPoiDictService.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/AutoPoiDictService.java
deleted file mode 100644
index cf538a5..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/AutoPoiDictService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.jeecg.modules.system.service.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.mapper.SysDictMapper;
-import org.jeecgframework.dict.service.AutoPoiDictServiceI;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * 描述：AutoPoi Excel注解支持字典参数设置
- * 举例： @Excel(name = "性别", width = 15, dicCode = "sex")
- * 1、导出的时候会根据字典配置，把值1,2翻译成：男、女;
- * 2、导入的时候，会把男、女翻译成1,2存进数据库;
- *
- * @author：scott
- * @since：2019-04-09
- * @version:1.0
- */
-@Slf4j
-@Service
-public class AutoPoiDictService implements AutoPoiDictServiceI {
- @Autowired
- private SysDictMapper sysDictMapper;
-
- /**
- * 通过字典查询easypoi，所需字典文本
- *
- * @author：scott
- * @since：2019-04-09
- * @return
- */
- @Override
- public String[] queryDict(String dicTable, String dicCode, String dicText) {
- List<String> dictReplaces = new ArrayList<String>();
- List<Map<String, Object>> dictList = null;
- // step.1 如果没有字典表则使用系统字典表
- if (oConvertUtils.isEmpty(dicTable)) {
- dictList = sysDictMapper.queryDictItemsByCode(dicCode);
- } else {
- try {
- dicText = oConvertUtils.getString(dicText, dicCode);
- dictList = sysDictMapper.queryTableDictItemsByCode(dicTable, dicText, dicCode);
- } catch (Exception e) {
- log.error(e.toString());
- }
- }
- for (Map<String, Object> t : dictList) {
- dictReplaces.add(t.get("text") + "_" + t.get("value"));
- }
- if (dictReplaces != null && dictReplaces.size() != 0) {
- log.info("---AutoPoi--Get_DB_Dict------"+ dictReplaces.toString());
- return dictReplaces.toArray(new String[dictReplaces.size()]);
- }
- return null;
- }
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java
deleted file mode 100644
index fc810ee..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.jeecg.modules.system.service.impl;
-
-import org.jeecg.modules.system.entity.SysAnnouncement;
-import org.jeecg.modules.system.mapper.SysAnnouncementMapper;
-import org.jeecg.modules.system.service.ISysAnnouncementService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 系统通告表
- * @author： jeecg-boot
- * @date： 2019-01-02
- * @version： V1.0
- */
-@Service
-public class SysAnnouncementServiceImpl extends ServiceImpl<SysAnnouncementMapper, SysAnnouncement> implements ISysAnnouncementService {
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysBaseAPI.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysBaseAPI.java
deleted file mode 100644
index e338466..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysBaseAPI.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.jeecg.modules.system.service.impl;
-
-import java.util.Date;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.system.api.ISysBaseAPI;
-import org.jeecg.common.util.IPUtils;
-import org.jeecg.common.util.SpringContextUtils;
-import org.jeecg.modules.system.entity.SysLog;
-import org.jeecg.modules.system.entity.SysUser;
-import org.jeecg.modules.system.mapper.SysLogMapper;
-import org.springframework.stereotype.Service;
-
-@Service
-public class SysBaseAPI implements ISysBaseAPI {
- @Resource
- private SysLogMapper sysLogMapper;
-
- @Override
- public void addLog(String LogContent, Integer logType, Integer operatetype) {
- SysLog sysLog = new SysLog();
- //注解上的描述,操作日志内容
- sysLog.setLogContent(LogContent);
- sysLog.setLogType(logType);
- sysLog.setOperateType(operatetype);
-
- //请求的方法名
- //请求的参数
-
- //获取request
- HttpServletRequest request = SpringContextUtils.getHttpServletRequest();
- //设置IP地址
- sysLog.setIp(IPUtils.getIpAddr(request));
-
- //获取登录用户信息
- SysUser sysUser = (SysUser)SecurityUtils.getSubject().getPrincipal();
- if(sysUser!=null){
- sysLog.setUserid(sysUser.getUsername());
- sysLog.setUsername(sysUser.getRealname());
-
- }
- sysLog.setCreateTime(new Date());
- //保存系统日志
- sysLogMapper.insert(sysLog);
- }
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDataLogServiceImpl.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDataLogServiceImpl.java
deleted file mode 100644
index c805010..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDataLogServiceImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.jeecg.modules.system.service.impl;
-
-import org.jeecg.modules.system.entity.SysDataLog;
-import org.jeecg.modules.system.mapper.SysDataLogMapper;
-import org.jeecg.modules.system.service.ISysDataLogService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-@Service
-public class SysDataLogServiceImpl extends ServiceImpl<SysDataLogMapper,SysDataLog> implements ISysDataLogService {
- @Autowired
- private SysDataLogMapper logMapper;
-
- /**
- * 添加数据日志
- */
- @Override
- public void addDataLog(String tableName, String dataId, String dataContent) {
- String versionNumber = "0";
- String dataVersion = logMapper.queryMaxDataVer(tableName, dataId);
- if(dataVersion != null ) {
- versionNumber = String.valueOf(Integer.parseInt(dataVersion)+1);
- }
- SysDataLog log = new SysDataLog();
- log.setDataTable(tableName);
- log.setDataId(dataId);
- log.setDataContent(dataContent);
- log.setDataVersion(versionNumber);
- this.save(log);
- }
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDictItemServiceImpl.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDictItemServiceImpl.java
deleted file mode 100644
index a38a46f..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDictItemServiceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.jeecg.modules.system.service.impl;
-
-import org.jeecg.modules.system.entity.SysDictItem;
-import org.jeecg.modules.system.mapper.SysDictItemMapper;
-import org.jeecg.modules.system.service.ISysDictItemService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author zhangweijian
- * @since 2018-12-28
- */
-@Service
-public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDictItem> implements ISysDictItemService {
-
- @Autowired
- private SysDictItemMapper sysDictItemMapper;
-
- @Override
- public List<SysDictItem> selectItemsByMainId(String mainId) {
- return sysDictItemMapper.selectItemsByMainId(mainId);
- }
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
deleted file mode 100644
index 3bbc924..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package org.jeecg.modules.system.service.impl;
-
-import java.util.*;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.modules.system.entity.SysDict;
-import org.jeecg.modules.system.entity.SysDictItem;
-import org.jeecg.modules.system.mapper.SysDictItemMapper;
-import org.jeecg.modules.system.mapper.SysDictMapper;
-import org.jeecg.modules.system.service.ISysDictItemService;
-import org.jeecg.modules.system.service.ISysDictService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.CacheManager;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.cache.concurrent.ConcurrentMapCache;
-import org.springframework.cache.support.SimpleCacheManager;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.PostConstruct;
-
-/**
- * <p>
- * 字典表 服务实现类
- * </p>
- *
- * @author zhangweijian
- * @since 2018-12-28
- */
-@Service()
-@Slf4j
-public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> implements ISysDictService {
-
- @Autowired
- private SysDictMapper sysDictMapper;
- @Autowired
- private SysDictItemMapper sysDictItemMapper;
- @Autowired
- private ISysDictService sysDictService;
- @Autowired
- private ISysDictItemService sysDictItemService;
-
- /**
- * 通过查询指定code 获取字典
- * @param code
- * @return
- */
- @Override
- @Cacheable(value = "dictCache",key = "#code")
- public List<Map<String, Object>> queryDictItemsByCode(String code) {
- log.info("无缓存dictList的时候调用这里！");
- return sysDictMapper.queryDictItemsByCode(code);
- }
-
- /**
- * 通过查询指定code 获取字典值text
- * @param code
- * @param key
- * @return
- */
-
- @Override
- @Cacheable(value = "dictCache")
- public String queryDictTextByKey(String code, String key) {
- log.info("无缓存dictText的时候调用这里！");
- return sysDictMapper.queryDictTextByKey(code, key);
- }
-
- /**
- * 通过查询指定table的 text code 获取字典
- * dictTableCache采用redis缓存有效期10分钟
- * @param table
- * @param text
- * @param code
- * @return
- */
- @Override
- @Cacheable(value = "dictTableCache")
- public List<Map<String, Object>> queryTableDictItemsByCode(String table, String text, String code) {
- log.info("无缓存dictTableList的时候调用这里！");
- return sysDictMapper.queryTableDictItemsByCode(table,text,code);
- }
-
- /**
- * 通过查询指定table的 text code 获取字典值text
- * dictTableCache采用redis缓存有效期10分钟
- * @param table
- * @param text
- * @param code
- * @param key
- * @return
- */
- @Override
- @Cacheable(value = "dictTableCache")
- public String queryTableDictTextByKey(String table,String text,String code, String key) {
- log.info("无缓存dictTable的时候调用这里！");
- return sysDictMapper.queryTableDictTextByKey(table,text,code,key);
- }
-
- /**
- * 根据字典类型id删除关联表中其对应的数据
- */
- @Override
- public boolean deleteByDictId(SysDict sysDict) {
- sysDict.setDelFlag(2);
- sysDictService.updateById(sysDict);
- // 删除关联表中的数据
- String deleteId = sysDict.getId();
- LambdaQueryWrapper<SysDictItem> dictItemQuery = new LambdaQueryWrapper<SysDictItem>();
- dictItemQuery.eq(SysDictItem::getDictId, deleteId);
- boolean ok = sysDictItemService.remove(dictItemQuery);
- return ok;
- }
-
- @Override
- @Transactional
- public void saveMain(SysDict sysDict, List<SysDictItem> sysDictItemList) {
-
- sysDictMapper.insert(sysDict);
- if (sysDictItemList != null) {
- for (SysDictItem entity : sysDictItemList) {
- entity.setDictId(sysDict.getId());
- sysDictItemMapper.insert(entity);
- }
- }
- }
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java
deleted file mode 100644
index a5348e3..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.jeecg.modules.system.service.impl;
-
-import javax.annotation.Resource;
-
-import org.jeecg.modules.system.entity.SysLog;
-import org.jeecg.modules.system.mapper.SysLogMapper;
-import org.jeecg.modules.system.service.ISysLogService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * <p>
- * 系统日志表 服务实现类
- * </p>
- *
- * @author zhangweijian
- * @since 2018-12-26
- */
-@Service
-public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> implements ISysLogService {
-
- @Resource
- private SysLogMapper sysLogMapper;
-
- /**
- * @功能：清空所有日志记录
- */
- @Override
- public void removeAll() {
- sysLogMapper.removeAll();
- }
-
- @Override
- public Long findTotalVisitCount() {
- return sysLogMapper.findTotalVisitCount();
- }
-
- @Override
- public Long findTodayVisitCount() {
- return sysLogMapper.findTodayVisitCount();
- }
-
- @Override
- public Long findTodayIp() {
- return sysLogMapper.findTodayIp();
- }
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java
deleted file mode 100644
index 6785acf..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.jeecg.modules.system.service.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysRolePermission;
-import org.jeecg.modules.system.mapper.SysRolePermissionMapper;
-import org.jeecg.modules.system.service.ISysRolePermissionService;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 角色权限表 服务实现类
- * </p>
- *
- * @author scott
- * @since 2018-12-21
- */
-@Service
-public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionMapper, SysRolePermission> implements ISysRolePermissionService {
-
- @Override
- public void saveRolePermission(String roleId, String permissionIds) {
- LambdaQueryWrapper<SysRolePermission> query = new QueryWrapper<SysRolePermission>().lambda().eq(SysRolePermission::getRoleId, roleId);
- this.remove(query);
- List<SysRolePermission> list = new ArrayList<SysRolePermission>();
- String arr[] = permissionIds.split(",");
- for (String p : arr) {
- if(oConvertUtils.isNotEmpty(p)) {
- SysRolePermission rolepms = new SysRolePermission(roleId, p);
- list.add(rolepms);
- }
- }
- this.saveBatch(list);
- }
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java
deleted file mode 100644
index 026f965..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.jeecg.modules.system.service.impl;
-
-import org.jeecg.modules.system.entity.SysRole;
-import org.jeecg.modules.system.mapper.SysRoleMapper;
-import org.jeecg.modules.system.service.ISysRoleService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * <p>
- * 角色表 服务实现类
- * </p>
- *
- * @author scott
- * @since 2018-12-19
- */
-@Service
-public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
-
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java
deleted file mode 100644
index 571d52f..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.jeecg.modules.system.service.impl;
-
-import java.util.Hashtable;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.jeecg.modules.system.entity.SysRole;
-import org.jeecg.modules.system.entity.SysUser;
-import org.jeecg.modules.system.entity.SysUserRole;
-import org.jeecg.modules.system.mapper.SysUserRoleMapper;
-import org.jeecg.modules.system.service.ISysRoleService;
-import org.jeecg.modules.system.service.ISysUserRoleService;
-import org.jeecg.modules.system.service.ISysUserService;
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 用户角色表 服务实现类
- * </p>
- *
- * @author scott
- * @since 2018-12-21
- */
-@Service
-public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUserRole> implements ISysUserRoleService {
-
- @Autowired
- private ISysUserService userService;
- @Autowired
- private ISysRoleService roleService;
-
- /**
- * 查询所有用户对应的角色信息
- */
- @Override
- public Map<String,String> queryUserRole() {
- List<SysUserRole> uRoleList = this.list();
- List<SysUser> userList = userService.list();
- List<SysRole> roleList = roleService.list();
- Map<String,String> map = new IdentityHashMap<>();
- String userId = "";
- String roleId = "";
- String roleName = "";
- if(uRoleList != null && uRoleList.size() > 0) {
- for(SysUserRole uRole : uRoleList) {
- roleId = uRole.getRoleId();
- for(SysUser user : userList) {
- userId = user.getId();
- if(uRole.getUserId().equals(userId)) {
- roleName = this.searchByRoleId(roleList,roleId);
- map.put(userId, roleName);
- }
- }
- }
- return map;
- }
- return map;
- }
-
- /**
- * queryUserRole调用的方法
- * @param roleList
- * @param roleId
- * @return
- */
- private String searchByRoleId(List<SysRole> roleList, String roleId) {
- while(true) {
- for(SysRole role : roleList) {
- if(roleId.equals(role.getId())) {
- return role.getRoleName();
- }
- }
- }
- }
-
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java
deleted file mode 100644
index fcbe4a0..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.jeecg.modules.system.util;
-
-import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.model.DepartIdModel;
-import org.jeecg.modules.system.model.SysDepartTreeModel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <P>
- * 对应部门的表,处理并查找树级数据
- * <P>
- *
- * @author Steve
- * @Since 2019-01-22
- */
-public class FindsDepartsChildrenUtil {
-
-
- private static List<DepartIdModel> idList = new ArrayList<>(4);
-
-
- /**
- * queryTreeList的子方法 ====1=====
- * 该方法是s将SysDepart类型的list集合转换成SysDepartTreeModel类型的集合
- */
- public static List<SysDepartTreeModel> wrapTreeDataToTreeList(List<SysDepart> recordList) {
- // 在该方法每请求一次,都要对全局list集合进行一次清理
- idList.clear();
- List<SysDepartTreeModel> records = new ArrayList<>();
- for (int i = 0; i < recordList.size(); i++) {
- SysDepart depart = recordList.get(i);
- records.add(new SysDepartTreeModel(recordList.get(i)));
- }
- List<SysDepartTreeModel> tree = findChildren(records, idList);
- setEmptyChildrenAsNull(tree);
- return tree;
- }
-
- public static List<DepartIdModel> wrapDepartIdModel() {
- return idList;
- }
-
- /**
- * queryTreeList的子方法 ====2=====
- * 该方法是找到并封装顶级父类的节点到TreeList集合
- */
- private static List<SysDepartTreeModel> findChildren(List<SysDepartTreeModel> recordList,
- List<DepartIdModel> idList) {
-
- List<SysDepartTreeModel> treeList = new ArrayList<>();
- for (int i = 0; i < recordList.size(); i++) {
- SysDepartTreeModel branch = recordList.get(i);
- if ("".equals(branch.getParentId())) {
- treeList.add(branch);
- DepartIdModel departIdModel = new DepartIdModel().convert(branch);
- idList.add(departIdModel);
- }
- }
- getGrandChildren(treeList,recordList,idList);
- return treeList;
- }
-
- /**
- * queryTreeList的子方法====3====
- *该方法是找到顶级父类下的所有子节点集合并封装到TreeList集合
- */
- private static void getGrandChildren(List<SysDepartTreeModel> treeList,List<SysDepartTreeModel> recordList,List<DepartIdModel> idList) {
-
- for (int i = 0; i < treeList.size(); i++) {
- SysDepartTreeModel model = treeList.get(i);
- DepartIdModel idModel = idList.get(i);
- for (int i1 = 0; i1 < recordList.size(); i1++) {
- SysDepartTreeModel m = recordList.get(i1);
- if (m.getParentId().equals(model.getId())) {
- model.getChildren().add(m);
- DepartIdModel dim = new DepartIdModel().convert(m);
- idModel.getChildren().add(dim);
- }
- }
- getGrandChildren(treeList.get(i).getChildren(), recordList, idList.get(i).getChildren());
- }
-
- }
-
-
- /**
- * queryTreeList的子方法 ====4====
- * 该方法是将子节点为空的List集合设置为Null值
- */
- private static void setEmptyChildrenAsNull(List<SysDepartTreeModel> treeList) {
-
- for (int i = 0; i < treeList.size(); i++) {
- SysDepartTreeModel model = treeList.get(i);
- if (model.getChildren().size() == 0) {
- model.setChildren(null);
- model.setIsLeaf(true);
- }else{
- setEmptyChildrenAsNull(model.getChildren());
- model.setIsLeaf(false);
- }
- }
- }
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/util/JeecgDataAutorUtils.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/util/JeecgDataAutorUtils.java
deleted file mode 100644
index 9200b6a..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/util/JeecgDataAutorUtils.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.jeecg.modules.system.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.jeecg.common.util.SpringContextUtils;
-import org.jeecg.modules.system.entity.SysPermissionDataRule;
-import org.jeecg.modules.system.model.SysUserCacheInfo;
-import org.springframework.util.StringUtils;
-
-/**
- * @ClassName: JeecgDataAutorUtils
- * @Description: 数据权限查询规则容器工具类
- * @author 张代浩
- * @date 2012-12-15 下午11:27:39
- *
- */
-public class JeecgDataAutorUtils {
-
- public static final String MENU_DATA_AUTHOR_RULES = "MENU_DATA_AUTHOR_RULES";
-
- public static final String MENU_DATA_AUTHOR_RULE_SQL = "MENU_DATA_AUTHOR_RULE_SQL";
-
- public static final String SYS_USER_INFO = "SYS_USER_INFO";
-
- /**
- * 往链接请求里面，传入数据查询条件
- *
- * @param request
- * @param MENU_DATA_AUTHOR_RULES
- */
- public static synchronized void installDataSearchConditon(HttpServletRequest request, List<SysPermissionDataRule> dataRules) {
- @SuppressWarnings("unchecked")
- List<SysPermissionDataRule> list = (List<SysPermissionDataRule>)loadDataSearchConditon();// 1.先从request获取MENU_DATA_AUTHOR_RULES，如果存则获取到LIST
- if (list==null) {
- // 2.如果不存在，则new一个list
- list = new ArrayList<SysPermissionDataRule>();
- }
- for (SysPermissionDataRule tsDataRule : dataRules) {
- list.add(tsDataRule);
- }
- request.setAttribute(MENU_DATA_AUTHOR_RULES, list); // 3.往list里面增量存指
- }
-
- /**
- * 获取请求对应的数据权限规则
- *
- * @param request
- * @return
- */
- @SuppressWarnings("unchecked")
- public static synchronized List<SysPermissionDataRule> loadDataSearchConditon() {
- return (List<SysPermissionDataRule>) SpringContextUtils.getHttpServletRequest().getAttribute(MENU_DATA_AUTHOR_RULES);
-
- }
-
- /**
- * 获取请求对应的数据权限SQL
- *
- * @param request
- * @return
- */
- public static synchronized String loadDataSearchConditonSQLString() {
- return (String) SpringContextUtils.getHttpServletRequest().getAttribute(MENU_DATA_AUTHOR_RULE_SQL);
- }
-
- /**
- * 往链接请求里面，传入数据查询条件
- *
- * @param request
- * @param MENU_DATA_AUTHOR_RULE_SQL
- */
- public static synchronized void installDataSearchConditon(HttpServletRequest request, String sql) {
- String ruleSql = (String)loadDataSearchConditonSQLString();
- if (!StringUtils.hasText(ruleSql)) {
- request.setAttribute(MENU_DATA_AUTHOR_RULE_SQL,sql);
- }
- }
-
- public static synchronized void installUserInfo(HttpServletRequest request, SysUserCacheInfo userinfo) {
- request.setAttribute(SYS_USER_INFO, userinfo);
- }
-
- public static synchronized SysUserCacheInfo loadUserInfo() {
- return (SysUserCacheInfo) SpringContextUtils.getHttpServletRequest().getAttribute(SYS_USER_INFO);
-
- }
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java
deleted file mode 100644
index ea6c933..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.jeecg.modules.system.util;
-
-import org.jeecg.modules.system.entity.SysPermission;
-
-/**
- * @author scott
- * @since 2019-04-03
- */
-public class PermissionDataUtil {
-
- /**
- * 智能处理错误数据，简化用户失误操作
- *
- * @param permission
- */
- public static SysPermission intelligentProcessData(SysPermission permission) {
- if (permission == null) {
- return null;
- }
-
- // 组件
- if (permission.getComponent() != null) {
- String component = permission.getComponent();
- if (component.startsWith("/")) {
- component = component.substring(1);
- }
- if (component.startsWith("views/")) {
- component = component.replaceFirst("views/", "");
- }
- if (component.startsWith("src/views/")) {
- component = component.replaceFirst("src/views/", "");
- }
- if (component.endsWith(".vue")) {
- component = component.replace(".vue", "");
- }
- permission.setComponent(component);
- }
-
- // 请求URL
- if (permission.getUrl() != null) {
- String url = permission.getUrl();
- if (url.endsWith(".vue")) {
- url = url.replace(".vue", "");
- }
- if (!url.startsWith("http") && !url.startsWith("/")) {
- url = "/" + url;
- }
- permission.setUrl(url);
- }
-
- // 一级菜单默认组件
- if (0 == permission.getMenuType() && permission.getComponent() == null) {
- // 一级菜单默认组件
- permission.setComponent("layouts/RouteView");
- }
- return permission;
- }
-}
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java
deleted file mode 100644
index bd06e8b..0000000
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.jeecg.modules.system.vo;
-
-import lombok.Data;
-import org.jeecg.modules.system.entity.SysDictItem;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecgframework.poi.excel.annotation.ExcelCollection;
-
-import java.util.List;
-
-@Data
-public class SysDictPage {
-
- /**
- * 主键
- */
- private String id;
- /**
- * 字典名称
- */
- @Excel(name = "字典名称", width = 20)
- private String dictName;
-
- /**
- * 字典编码
- */
- @Excel(name = "字典编码", width = 30)
- private String dictCode;
- /**
- * 删除状态
- */
- private Integer delFlag;
- /**
- * 描述
- */
- @Excel(name = "描述", width = 30)
- private String description;
-
- @ExcelCollection(name = "字典列表")
- private List<SysDictItem> sysDictItemList;
-
-}
diff --git a/jeecg-boot/src/main/resources/application.yml b/jeecg-boot/src/main/resources/application.yml
deleted file mode 100644
index caf4dfc..0000000
--- a/jeecg-boot/src/main/resources/application.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-spring:
- profiles:
- active: dev
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/db/schema-mysql.sql b/jeecg-boot/src/main/resources/db/schema-mysql.sql
deleted file mode 100644
index 2eea9ec..0000000
--- a/jeecg-boot/src/main/resources/db/schema-mysql.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-DROP TABLE IF EXISTS demo;
-CREATE TABLE demo (
- id BIGINT(20) NOT NULL auto_increment COMMENT '主键ID',
- name varchar(30) default NULL COMMENT '姓名',
- sex varchar(2) default NULL,
- age int(11) default NULL COMMENT '年龄',
- birthday date default NULL COMMENT '生日',
- email varchar(50) default NULL COMMENT '邮箱',
- content varchar(1000) default NULL COMMENT '个人简介',
- PRIMARY KEY (id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
deleted file mode 100644
index 5dfc06b..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
+++ /dev/null
@@ -1,45 +0,0 @@
-package ${bussiPackage}.${entityPackage}.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-@Data
-@TableName("${tableName}")
-public class ${entityName} implements Serializable {
- private static final long serialVersionUID = 1L;
-
- <#list originalColumns as po>
- /**${po.filedComment}*/
- <#if po.fieldName == primaryKeyField>
- @TableId(type = IdType.UUID)
- <#else>
- <#if po.fieldType =='java.util.Date'>
- <#if po.fieldDbType =='date'>
- @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- <#elseif po.fieldDbType =='datetime'>
- @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- </#if>
- <#else>
- @Excel(name = "${po.filedComment}", width = 15)
- </#if>
- </#if>
- private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
- </#list>
-}
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai b/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai
deleted file mode 100644
index 34deb8b..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai
+++ /dev/null
@@ -1,17 +0,0 @@
-package ${bussiPackage}.${entityPackage}.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-public interface ${entityName}Mapper extends BaseMapper<${entityName}> {
-
-}
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
deleted file mode 100644
index 6144399..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
+++ /dev/null
@@ -1,19 +0,0 @@
-package ${bussiPackage}.${entityPackage}.service.impl;
-
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-import ${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper;
-import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-@Service
-public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, ${entityName}> implements I${entityName}Service {
-
-}
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai b/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai
deleted file mode 100644
index 0dcc6d0..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai
+++ /dev/null
@@ -1,45 +0,0 @@
-package ${bussiPackage}.entity.${entityPackage};
-
-import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-@Data
-@TableName("${tableName}")
-public class ${entityName} implements Serializable {
- private static final long serialVersionUID = 1L;
-
- <#list originalColumns as po>
- /**${po.filedComment}*/
- <#if po.fieldName == primaryKeyField>
- @TableId(type = IdType.UUID)
- <#else>
- <#if po.fieldType =='java.util.Date'>
- <#if po.fieldDbType =='date'>
- @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- <#elseif po.fieldDbType =='datetime'>
- @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- </#if>
- <#else>
- @Excel(name = "${po.filedComment}", width = 15)
- </#if>
- </#if>
- private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
- </#list>
-}
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/${entityName}Mapper.javai b/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/${entityName}Mapper.javai
deleted file mode 100644
index b58c461..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/${entityName}Mapper.javai
+++ /dev/null
@@ -1,17 +0,0 @@
-package ${bussiPackage}.mapper.${entityPackage};
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import ${bussiPackage}.entity.${entityPackage}.${entityName};
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-public interface ${entityName}Mapper extends BaseMapper<${entityName}> {
-
-}
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/service/${entityPackage}/I${entityName}Service.javai b/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/service/${entityPackage}/I${entityName}Service.javai
deleted file mode 100644
index 0ff45a6..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/service/${entityPackage}/I${entityName}Service.javai
+++ /dev/null
@@ -1,14 +0,0 @@
-package ${bussiPackage}.service.${entityPackage};
-
-import ${bussiPackage}.entity.${entityPackage}.${entityName};
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-public interface I${entityName}Service extends IService<${entityName}> {
-
-}
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/service/${entityPackage}/impl/${entityName}ServiceImpl.javai b/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/service/${entityPackage}/impl/${entityName}ServiceImpl.javai
deleted file mode 100644
index fc9d000..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/service/${entityPackage}/impl/${entityName}ServiceImpl.javai
+++ /dev/null
@@ -1,19 +0,0 @@
-package ${bussiPackage}.service.${entityPackage}.impl;
-
-import ${bussiPackage}.entity.${entityPackage}.${entityName};
-import ${bussiPackage}.mapper.${entityPackage}.${entityName}Mapper;
-import ${bussiPackage}.service.${entityPackage}.I${entityName}Service;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-@Service
-public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, ${entityName}> implements I${entityName}Service {
-
-}
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal__Style#Drawer.vuei b/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal__Style#Drawer.vuei
deleted file mode 100644
index 4446ba6..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal__Style#Drawer.vuei
+++ /dev/null
@@ -1,162 +0,0 @@
-<template>
- <a-drawer
- :title="title"
- :width="800"
- placement="right"
- :closable="false"
- @close="close"
- :visible="visible"
- >
-
- <a-spin :spinning="confirmLoading">
- <a-form :form="form">
-
-<#list columns as po><#rt/>
-<#if po.fieldName !='id'><#rt/>
- <a-form-item
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- label="${po.filedComment}">
- <#if po.fieldType =='date'>
- <a-date-picker v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
- <#elseif po.fieldType =='datetime'>
- <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
- <#elseif "int,decimal,double,"?contains(po.fieldType)>
- <a-input-number v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
- <#else>
- <a-input placeholder="请输入${po.filedComment}" v-decorator="['${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
- </#if>
- </a-form-item>
-</#if>
-</#list>
-
- </a-form>
- </a-spin>
- <a-button type="primary" @click="handleOk">确定</a-button>
- <a-button type="primary" @click="handleCancel">取消</a-button>
- </a-drawer>
-</template>
-
-<script>
- import { httpAction } from '@/api/manage'
- import pick from 'lodash.pick'
- import moment from "moment"
-
- export default {
- name: "${entityName}Modal",
- data () {
- return {
- title:"操作",
- visible: false,
- model: {},
- labelCol: {
- xs: { span: 24 },
- sm: { span: 5 },
- },
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 16 },
- },
-
- confirmLoading: false,
- form: this.$form.createForm(this),
- validatorRules:{
- <#list columns as po>
- <#if po.fieldName !='id'>
- <#if po.nullable =='N'>
- ${po.fieldName}:{rules: [{ required: true, message: '请输入${po.filedComment}!' }]},
- </#if>
- </#if>
- </#list>
- },
- url: {
- add: "/${entityPackage}/${entityName?uncap_first}/add",
- edit: "/${entityPackage}/${entityName?uncap_first}/edit",
- },
- }
- },
- created () {
- },
- methods: {
- add () {
- this.edit({});
- },
- edit (record) {
- this.form.resetFields();
- this.model = Object.assign({}, record);
- this.visible = true;
- this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model<#list columns as po><#if po.fieldName !='id' && po.fieldType?index_of("date")==-1>,'${po.fieldName}'</#if></#list>))
- //时间格式化
- <#list columns as po>
- <#if po.fieldName !='id' && po.fieldType?index_of("date")!=-1>
- this.form.setFieldsValue({${po.fieldName}:this.model.${po.fieldName}?moment(this.model.${po.fieldName}):null})
- </#if>
- </#list>
- });
-
- },
- close () {
- this.$emit('close');
- this.visible = false;
- },
- handleOk () {
- const that = this;
- // 触发表单验证
- this.form.validateFields((err, values) => {
- if (!err) {
- that.confirmLoading = true;
- let httpurl = '';
- let method = '';
- if(!this.model.id){
- httpurl+=this.url.add;
- method = 'post';
- }else{
- httpurl+=this.url.edit;
- method = 'put';
- }
- let formData = Object.assign(this.model, values);
- //时间格式化
- <#list columns as po>
- <#if po.fieldName !='id' && po.fieldType =='date'>
- formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format():null;
- <#elseif po.fieldName !='id' && po.fieldType =='datetime'>
- formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format('YYYY-MM-DD HH:mm:ss'):null;
- </#if>
- </#list>
-
- console.log(formData)
- httpAction(httpurl,formData,method).then((res)=>{
- if(res.success){
- that.$message.success(res.message);
- that.$emit('ok');
- }else{
- that.$message.warning(res.message);
- }
- }).finally(() => {
- that.confirmLoading = false;
- that.close();
- })
-
-
-
- }
- })
- },
- handleCancel () {
- this.close()
- },
-
-
- }
- }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
- .ant-btn {
- margin-left: 30px;
- margin-bottom: 30px;
- float: right;
- }
-</style>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
deleted file mode 100644
index 5cbe5e1..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
+++ /dev/null
@@ -1,39 +0,0 @@
-package ${bussiPackage}.${entityPackage}.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-@Data
-@TableName("${tableName}")
-public class ${entityName} implements Serializable {
- private static final long serialVersionUID = 1L;
-
- <#list originalColumns as po>
- /**${po.filedComment}*/
- <#if po.fieldName == primaryKeyField>
- @TableId(type = IdType.UUID)
- </#if>
- <#if po.fieldType =='java.util.Date'>
- <#if po.fieldDbType =='date'>
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- <#elseif po.fieldDbType =='datetime'>
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- </#if>
- </#if>
- private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
- </#list>
-}
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
deleted file mode 100644
index fa5b75e..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
+++ /dev/null
@@ -1,50 +0,0 @@
-<#list subTables as subTab>
-#segment#${subTab.entityName}.java
-package ${bussiPackage}.${entityPackage}.entity;
-
-import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import java.util.Date;
-
-/**
- * @Description: ${subTab.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-@Data
-@TableName("${subTab.tableName}")
-public class ${subTab.entityName} implements Serializable {
- private static final long serialVersionUID = 1L;
-
- <#list subTab.originalColumns as po>
- /**${po.filedComment}*/
- <#if po.fieldName == primaryKeyField>
- @TableId(type = IdType.UUID)
- <#else>
- <#if po.fieldType =='java.util.Date'>
- <#if po.fieldDbType =='date'>
- @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- <#elseif po.fieldDbType =='datetime'>
- @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- </#if>
- <#else>
- <#if !subTab.foreignKeys?seq_contains(po.fieldName?cap_first)>
- @Excel(name = "${po.filedComment}", width = 15)
- </#if>
- </#if>
- </#if>
- private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
- </#list>
-}
-</#list>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai
deleted file mode 100644
index 34deb8b..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai
+++ /dev/null
@@ -1,17 +0,0 @@
-package ${bussiPackage}.${entityPackage}.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-public interface ${entityName}Mapper extends BaseMapper<${entityName}> {
-
-}
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai
deleted file mode 100644
index e607930..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai
+++ /dev/null
@@ -1,21 +0,0 @@
-<#list subTables as subTab>
-#segment#${subTab.entityName}Mapper.java
-package ${bussiPackage}.${entityPackage}.mapper;
-
-import java.util.List;
-import ${bussiPackage}.${entityPackage}.entity.${subTab.entityName};
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: ${subTab.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-public interface ${subTab.entityName}Mapper extends BaseMapper<${subTab.entityName}> {
-
- public boolean deleteByMainId(String mainId);
-
- public List<${subTab.entityName}> selectByMainId(String mainId);
-}
-</#list>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml
deleted file mode 100644
index 708ae0b..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<#list subTables as subTab>
-<#assign originalForeignKeys = subTab.originalForeignKeys>
-#segment#${subTab.entityName}Mapper.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="${bussiPackage}.${entityPackage}.mapper.${subTab.entityName}Mapper">
-
- <delete id="deleteByMainId" parameterType="java.lang.String">
- DELETE
- FROM ${subTab.tableName}
- WHERE
- <#list originalForeignKeys as key>
- <#if key?lower_case?index_of("${primaryKeyField}")!=-1>
- ${key} = ${r'#'}{${primaryKeyField}} <#rt/>
- <#else>
- ${key} = ${r'#'}{${key}} <#rt/>
- </#if>
- <#if key_has_next>AND</#if>
- </#list>
- </delete>
-
- <select id="selectByMainId" parameterType="java.lang.String" resultType="${bussiPackage}.${entityPackage}.entity.${subTab.entityName}">
- SELECT *
- FROM ${subTab.tableName}
- WHERE
- <#list originalForeignKeys as key>
- <#if key?lower_case?index_of("${primaryKeyField}")!=-1>
- ${key} = ${r'#'}{${primaryKeyField}} <#rt/>
- <#else>
- ${key} = ${r'#'}{${key}} <#rt/>
- </#if>
- <#if key_has_next>AND</#if>
- </#list>
- </select>
-</mapper>
-</#list>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
deleted file mode 100644
index 9032bd8..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
+++ /dev/null
@@ -1,42 +0,0 @@
-package ${bussiPackage}.${entityPackage}.service;
-
-<#list subTables as sub>
-import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
-</#list>
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-public interface I${entityName}Service extends IService<${entityName}> {
-
- /**
- * 添加一对多
- *
- */
- public void saveMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) ;
-
- /**
- * 修改一对多
- *
- */
- public void updateMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>);
-
- /**
- * 删除一对多
- */
- public void delMain (String id);
-
- /**
- * 批量删除一对多
- */
- public void delBatchMain (Collection<? extends Serializable> idList);
-
-}
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai
deleted file mode 100644
index af91385..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai
+++ /dev/null
@@ -1,19 +0,0 @@
-<#list subTables as subTab>
-#segment#I${subTab.entityName}Service.java
-package ${bussiPackage}.${entityPackage}.service;
-
-import ${bussiPackage}.${entityPackage}.entity.${subTab.entityName};
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-
-/**
- * @Description: ${subTab.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-public interface I${subTab.entityName}Service extends IService<${subTab.entityName}> {
-
- public List<${subTab.entityName}> selectByMainId(String mainId);
-}
-</#list>
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
deleted file mode 100644
index 5b539dd..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
+++ /dev/null
@@ -1,101 +0,0 @@
-package ${bussiPackage}.${entityPackage}.service.impl;
-
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-<#list subTables as sub>
-import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
-</#list>
-<#list subTables as sub>
-import ${bussiPackage}.${entityPackage}.mapper.${sub.entityName}Mapper;
-</#list>
-import ${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper;
-import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Collection;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-@Service
-public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, ${entityName}> implements I${entityName}Service {
-
- @Autowired
- private ${entityName}Mapper ${entityName?uncap_first}Mapper;
- <#list subTables as sub>
- @Autowired
- private ${sub.entityName}Mapper ${sub.entityName?uncap_first}Mapper;
- </#list>
-
- @Override
- @Transactional
- public void saveMain(${entityName} ${entityName?uncap_first}, <#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
- ${entityName?uncap_first}Mapper.insert(${entityName?uncap_first});
- <#list subTables as sub>
- for(${sub.entityName} entity:${sub.entityName?uncap_first}List) {
- <#list sub.foreignKeys as key>
- //外键设置
- <#if key?lower_case?index_of("${primaryKeyField}")!=-1>
- entity.set${key?cap_first}(${entityName?uncap_first}.get${primaryKeyField?cap_first}());
- <#else>
- entity.set${key?cap_first}(${entityName?uncap_first}.get${key}());
- </#if>
- </#list>
- ${sub.entityName?uncap_first}Mapper.insert(entity);
- }
- </#list>
- }
-
- @Override
- @Transactional
- public void updateMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
- ${entityName?uncap_first}Mapper.updateById(${entityName?uncap_first});
-
- //1.先删除子表数据
- <#list subTables as sub>
- ${sub.entityName?uncap_first}Mapper.deleteByMainId(${entityName?uncap_first}.getId());
- </#list>
-
- //2.子表数据重新插入
- <#list subTables as sub>
- for(${sub.entityName} entity:${sub.entityName?uncap_first}List) {
- <#list sub.foreignKeys as key>
- //外键设置
- <#if key?lower_case?index_of("${primaryKeyField}")!=-1>
- entity.set${key?cap_first}(${entityName?uncap_first}.get${primaryKeyField?cap_first}());
- <#else>
- entity.set${key?cap_first}(${entityName?uncap_first}.get${key}());
- </#if>
- </#list>
- ${sub.entityName?uncap_first}Mapper.insert(entity);
- }
- </#list>
- }
-
- @Override
- @Transactional
- public void delMain(String id) {
- ${entityName?uncap_first}Mapper.deleteById(id);
- <#list subTables as sub>
- ${sub.entityName?uncap_first}Mapper.deleteByMainId(id);
- </#list>
- }
-
- @Override
- @Transactional
- public void delBatchMain(Collection<? extends Serializable> idList) {
- for(Serializable id:idList) {
- ${entityName?uncap_first}Mapper.deleteById(id);
- <#list subTables as sub>
- ${sub.entityName?uncap_first}Mapper.deleteByMainId(id.toString());
- </#list>
- }
- }
-
-}
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai
deleted file mode 100644
index c893c7e..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai
+++ /dev/null
@@ -1,30 +0,0 @@
-<#list subTables as subTab>
-#segment#${subTab.entityName}ServiceImpl.java
-package ${bussiPackage}.${entityPackage}.service.impl;
-
-import ${bussiPackage}.${entityPackage}.entity.${subTab.entityName};
-import ${bussiPackage}.${entityPackage}.mapper.${subTab.entityName}Mapper;
-import ${bussiPackage}.${entityPackage}.service.I${subTab.entityName}Service;
-import org.springframework.stereotype.Service;
-import java.util.List;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * @Description: ${subTab.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-@Service
-public class ${subTab.entityName}ServiceImpl extends ServiceImpl<${subTab.entityName}Mapper, ${subTab.entityName}> implements I${subTab.entityName}Service {
-
- @Autowired
- private ${subTab.entityName}Mapper ${subTab.entityName?uncap_first}Mapper;
-
- @Override
- public List<${subTab.entityName}> selectByMainId(String mainId) {
- return ${subTab.entityName?uncap_first}Mapper.selectByMainId(mainId);
- }
-}
-</#list>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
deleted file mode 100644
index 2c41c39..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
+++ /dev/null
@@ -1,44 +0,0 @@
-package ${bussiPackage}.${entityPackage}.vo;
-
-import java.util.List;
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-<#list subTables as sub>
-import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
-</#list>
-import lombok.Data;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecgframework.poi.excel.annotation.ExcelCollection;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.util.Date;
-
-@Data
-public class ${entityName}Page {
-
- <#list originalColumns as po>
- /**${po.filedComment}*/
- <#if po.fieldName == primaryKeyField>
- <#else>
- <#if po.fieldType =='java.util.Date'>
- <#if po.fieldDbType =='date'>
- @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- <#elseif po.fieldDbType =='datetime'>
- @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- </#if>
- <#else>
- @Excel(name = "${po.filedComment}", width = 15)
- </#if>
- </#if>
- private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
- </#list>
-
- <#list subTables as sub>
- @ExcelCollection(name="${sub.ftlDescription}")
- private List<${sub.entityName}> ${sub.entityName?uncap_first}List;
- </#list>
-
-}
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
deleted file mode 100644
index abdd79a..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
+++ /dev/null
@@ -1,195 +0,0 @@
-<template>
- <a-card :bordered="false">
-
- <!-- 查询区域 -->
- <div class="table-page-search-wrapper">
- <a-form layout="inline">
- <a-row :gutter="24">
-<#list columns as po><#rt/>
-<#if po.fieldName !='id' && po_index<= tableVo.searchFieldNum>
- <a-col :span="6">
- <a-form-item label="${po.filedComment}">
- <a-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></a-input>
- </a-form-item>
- </a-col>
-</#if>
-</#list>
- <a-col :span="8" >
- <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
- <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
- </span>
- </a-col>
-
- </a-row>
- </a-form>
- </div>
-
- <!-- 操作按钮区域 -->
- <div class="table-operator">
- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls">导出</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
- <a-button type="primary" icon="import">导入</a-button>
- </a-upload>
- <a-dropdown v-if="selectedRowKeys.length > 0">
- <a-menu slot="overlay">
- <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
- </a-menu>
- <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
- </a-dropdown>
- </div>
-
- <!-- table区域-begin -->
- <div>
- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
- <i class="anticon anticon-info-circle ant-alert-icon"></i>
- <span>已选择</span>
- <a style="font-weight: 600">
- {{ selectedRowKeys.length }}
- </a>
- <span>项</span>
- <a style="margin-left: 24px" @click="onClearSelected">清空</a>
- </div>
-
- <a-table
- ref="table"
- size="middle"
- bordered
- rowKey="id"
- :columns="columns"
- :dataSource="dataSource"
- :pagination="ipagination"
- :loading="loading"
- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
- @change="handleTableChange">
-
- <span slot="action" slot-scope="text, record">
- <a @click="handleEdit(record)">编辑</a>
-
- <a-divider type="vertical" />
- <a-dropdown>
- <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
- <a-menu slot="overlay">
- <a-menu-item>
- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
- <a>删除</a>
- </a-popconfirm>
- </a-menu-item>
- </a-menu>
- </a-dropdown>
- </span>
-
- </a-table>
- </div>
- <!-- table区域-end -->
-
- <!-- 表单区域 -->
- <${entityName?uncap_first}-modal ref="modalForm" @ok="modalFormOk"/>
-
- </a-card>
-</template>
-
-<script>
-
- import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- import ${entityName}Modal from './modules/${entityName}Modal'
-
- export default {
- name: "${entityName}List",
- mixins: [JeecgListMixin],
- components: {
- ${entityName}Modal
- },
- data () {
- return {
- description: '${tableVo.ftlDescription}管理页面',
- // 表头
- columns: [
- {
- title: '#',
- dataIndex: '',
- key: 'rowIndex',
- width: 60,
- align: "center",
- customRender:function (t, r, index) {
- return parseInt(index)+1;
- }
- },
-<#list columns as po><#rt/>
- <#if po.fieldName !='id'>
- {
- title: '${po.filedComment}',
- align:"center",
- dataIndex: '${po.fieldName}'
- },
- </#if>
-</#list>
- {
- title: '操作',
- dataIndex: 'action',
- align:"center",
- scopedSlots: { customRender: 'action' },
- }
- ],
- // 请求参数
- url: {
- list: "/${entityPackage}/${entityName?uncap_first}/list",
- delete: "/${entityPackage}/${entityName?uncap_first}/delete",
- deleteBatch: "/${entityPackage}/${entityName?uncap_first}/deleteBatch",
- exportXlsUrl: "${entityPackage}/${entityName?uncap_first}/exportXls",
- importExcelUrl: "${entityPackage}/${entityName?uncap_first}/importExcel",
- },
- }
- },
- computed: {
- importExcelUrl: function(){
- <#noparse>return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;</#noparse>
- }
- },
-
-
- methods: {
-
- initDictConfig() {
- }
-
- }
- }
-</script>
-<style lang="less" scoped>
-/** Button按钮间距 */
- .ant-btn {
- margin-left: 3px
- }
- .ant-card-body .table-operator {
- margin-bottom: 18px;
- }
-
- .ant-table-tbody .ant-table-row td {
- padding-top: 15px;
- padding-bottom: 15px;
- }
-
- .anty-row-operator button {
- margin: 0 5px
- }
-
- .ant-btn-danger {
- background-color: #ffffff
- }
-
- .ant-modal-cust-warp {
- height: 100%
- }
-
- .ant-modal-cust-warp .ant-modal-body {
- height: calc(100% - 110px) !important;
- overflow-y: auto
- }
-
- .ant-modal-cust-warp .ant-modal-content {
- height: 90% !important;
- overflow-y: hidden
- }
-</style>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
deleted file mode 100644
index 5cbe5e1..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
+++ /dev/null
@@ -1,39 +0,0 @@
-package ${bussiPackage}.${entityPackage}.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-@Data
-@TableName("${tableName}")
-public class ${entityName} implements Serializable {
- private static final long serialVersionUID = 1L;
-
- <#list originalColumns as po>
- /**${po.filedComment}*/
- <#if po.fieldName == primaryKeyField>
- @TableId(type = IdType.UUID)
- </#if>
- <#if po.fieldType =='java.util.Date'>
- <#if po.fieldDbType =='date'>
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- <#elseif po.fieldDbType =='datetime'>
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- </#if>
- </#if>
- private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
- </#list>
-}
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
deleted file mode 100644
index bf376ad..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
+++ /dev/null
@@ -1,49 +0,0 @@
-<#list subTables as subTab>
-#segment#${subTab.entityName}.java
-package ${bussiPackage}.${entityPackage}.entity;
-
-import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-/**
- * @Description: ${subTab.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-@Data
-@TableName("${subTab.tableName}")
-public class ${subTab.entityName} implements Serializable {
- private static final long serialVersionUID = 1L;
-
- <#list subTab.originalColumns as po>
- /**${po.filedComment}*/
- <#if po.fieldName == primaryKeyField>
- @TableId(type = IdType.UUID)
- <#else>
- <#if po.fieldType =='java.util.Date'>
- <#if po.fieldDbType =='date'>
- @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- <#elseif po.fieldDbType =='datetime'>
- @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- </#if>
- <#else>
- <#if !subTab.foreignKeys?seq_contains(po.fieldName?cap_first)>
- @Excel(name = "${po.filedComment}", width = 15)
- </#if>
- </#if>
- </#if>
- private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
- </#list>
-}
-</#list>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai
deleted file mode 100644
index 34deb8b..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai
+++ /dev/null
@@ -1,17 +0,0 @@
-package ${bussiPackage}.${entityPackage}.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-public interface ${entityName}Mapper extends BaseMapper<${entityName}> {
-
-}
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai
deleted file mode 100644
index e607930..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai
+++ /dev/null
@@ -1,21 +0,0 @@
-<#list subTables as subTab>
-#segment#${subTab.entityName}Mapper.java
-package ${bussiPackage}.${entityPackage}.mapper;
-
-import java.util.List;
-import ${bussiPackage}.${entityPackage}.entity.${subTab.entityName};
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: ${subTab.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-public interface ${subTab.entityName}Mapper extends BaseMapper<${subTab.entityName}> {
-
- public boolean deleteByMainId(String mainId);
-
- public List<${subTab.entityName}> selectByMainId(String mainId);
-}
-</#list>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml
deleted file mode 100644
index 708ae0b..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<#list subTables as subTab>
-<#assign originalForeignKeys = subTab.originalForeignKeys>
-#segment#${subTab.entityName}Mapper.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="${bussiPackage}.${entityPackage}.mapper.${subTab.entityName}Mapper">
-
- <delete id="deleteByMainId" parameterType="java.lang.String">
- DELETE
- FROM ${subTab.tableName}
- WHERE
- <#list originalForeignKeys as key>
- <#if key?lower_case?index_of("${primaryKeyField}")!=-1>
- ${key} = ${r'#'}{${primaryKeyField}} <#rt/>
- <#else>
- ${key} = ${r'#'}{${key}} <#rt/>
- </#if>
- <#if key_has_next>AND</#if>
- </#list>
- </delete>
-
- <select id="selectByMainId" parameterType="java.lang.String" resultType="${bussiPackage}.${entityPackage}.entity.${subTab.entityName}">
- SELECT *
- FROM ${subTab.tableName}
- WHERE
- <#list originalForeignKeys as key>
- <#if key?lower_case?index_of("${primaryKeyField}")!=-1>
- ${key} = ${r'#'}{${primaryKeyField}} <#rt/>
- <#else>
- ${key} = ${r'#'}{${key}} <#rt/>
- </#if>
- <#if key_has_next>AND</#if>
- </#list>
- </select>
-</mapper>
-</#list>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
deleted file mode 100644
index 9032bd8..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
+++ /dev/null
@@ -1,42 +0,0 @@
-package ${bussiPackage}.${entityPackage}.service;
-
-<#list subTables as sub>
-import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
-</#list>
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-public interface I${entityName}Service extends IService<${entityName}> {
-
- /**
- * 添加一对多
- *
- */
- public void saveMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) ;
-
- /**
- * 修改一对多
- *
- */
- public void updateMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>);
-
- /**
- * 删除一对多
- */
- public void delMain (String id);
-
- /**
- * 批量删除一对多
- */
- public void delBatchMain (Collection<? extends Serializable> idList);
-
-}
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai
deleted file mode 100644
index af91385..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai
+++ /dev/null
@@ -1,19 +0,0 @@
-<#list subTables as subTab>
-#segment#I${subTab.entityName}Service.java
-package ${bussiPackage}.${entityPackage}.service;
-
-import ${bussiPackage}.${entityPackage}.entity.${subTab.entityName};
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-
-/**
- * @Description: ${subTab.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-public interface I${subTab.entityName}Service extends IService<${subTab.entityName}> {
-
- public List<${subTab.entityName}> selectByMainId(String mainId);
-}
-</#list>
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
deleted file mode 100644
index 5b539dd..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
+++ /dev/null
@@ -1,101 +0,0 @@
-package ${bussiPackage}.${entityPackage}.service.impl;
-
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-<#list subTables as sub>
-import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
-</#list>
-<#list subTables as sub>
-import ${bussiPackage}.${entityPackage}.mapper.${sub.entityName}Mapper;
-</#list>
-import ${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper;
-import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Collection;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-@Service
-public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, ${entityName}> implements I${entityName}Service {
-
- @Autowired
- private ${entityName}Mapper ${entityName?uncap_first}Mapper;
- <#list subTables as sub>
- @Autowired
- private ${sub.entityName}Mapper ${sub.entityName?uncap_first}Mapper;
- </#list>
-
- @Override
- @Transactional
- public void saveMain(${entityName} ${entityName?uncap_first}, <#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
- ${entityName?uncap_first}Mapper.insert(${entityName?uncap_first});
- <#list subTables as sub>
- for(${sub.entityName} entity:${sub.entityName?uncap_first}List) {
- <#list sub.foreignKeys as key>
- //外键设置
- <#if key?lower_case?index_of("${primaryKeyField}")!=-1>
- entity.set${key?cap_first}(${entityName?uncap_first}.get${primaryKeyField?cap_first}());
- <#else>
- entity.set${key?cap_first}(${entityName?uncap_first}.get${key}());
- </#if>
- </#list>
- ${sub.entityName?uncap_first}Mapper.insert(entity);
- }
- </#list>
- }
-
- @Override
- @Transactional
- public void updateMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
- ${entityName?uncap_first}Mapper.updateById(${entityName?uncap_first});
-
- //1.先删除子表数据
- <#list subTables as sub>
- ${sub.entityName?uncap_first}Mapper.deleteByMainId(${entityName?uncap_first}.getId());
- </#list>
-
- //2.子表数据重新插入
- <#list subTables as sub>
- for(${sub.entityName} entity:${sub.entityName?uncap_first}List) {
- <#list sub.foreignKeys as key>
- //外键设置
- <#if key?lower_case?index_of("${primaryKeyField}")!=-1>
- entity.set${key?cap_first}(${entityName?uncap_first}.get${primaryKeyField?cap_first}());
- <#else>
- entity.set${key?cap_first}(${entityName?uncap_first}.get${key}());
- </#if>
- </#list>
- ${sub.entityName?uncap_first}Mapper.insert(entity);
- }
- </#list>
- }
-
- @Override
- @Transactional
- public void delMain(String id) {
- ${entityName?uncap_first}Mapper.deleteById(id);
- <#list subTables as sub>
- ${sub.entityName?uncap_first}Mapper.deleteByMainId(id);
- </#list>
- }
-
- @Override
- @Transactional
- public void delBatchMain(Collection<? extends Serializable> idList) {
- for(Serializable id:idList) {
- ${entityName?uncap_first}Mapper.deleteById(id);
- <#list subTables as sub>
- ${sub.entityName?uncap_first}Mapper.deleteByMainId(id.toString());
- </#list>
- }
- }
-
-}
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai
deleted file mode 100644
index c893c7e..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai
+++ /dev/null
@@ -1,30 +0,0 @@
-<#list subTables as subTab>
-#segment#${subTab.entityName}ServiceImpl.java
-package ${bussiPackage}.${entityPackage}.service.impl;
-
-import ${bussiPackage}.${entityPackage}.entity.${subTab.entityName};
-import ${bussiPackage}.${entityPackage}.mapper.${subTab.entityName}Mapper;
-import ${bussiPackage}.${entityPackage}.service.I${subTab.entityName}Service;
-import org.springframework.stereotype.Service;
-import java.util.List;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * @Description: ${subTab.ftlDescription}
- * @author： jeecg-boot
- * @date： ${.now?string["yyyy-MM-dd"]}
- * @version： V1.0
- */
-@Service
-public class ${subTab.entityName}ServiceImpl extends ServiceImpl<${subTab.entityName}Mapper, ${subTab.entityName}> implements I${subTab.entityName}Service {
-
- @Autowired
- private ${subTab.entityName}Mapper ${subTab.entityName?uncap_first}Mapper;
-
- @Override
- public List<${subTab.entityName}> selectByMainId(String mainId) {
- return ${subTab.entityName?uncap_first}Mapper.selectByMainId(mainId);
- }
-}
-</#list>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
deleted file mode 100644
index 7e20b38..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
+++ /dev/null
@@ -1,43 +0,0 @@
-package ${bussiPackage}.${entityPackage}.vo;
-
-import java.util.List;
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-<#list subTables as sub>
-import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
-</#list>
-import lombok.Data;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecgframework.poi.excel.annotation.ExcelCollection;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-@Data
-public class ${entityName}Page {
-
- <#list originalColumns as po>
- /**${po.filedComment}*/
- <#if po.fieldName == primaryKeyField>
- <#else>
- <#if po.fieldType =='java.util.Date'>
- <#if po.fieldDbType =='date'>
- @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- <#elseif po.fieldDbType =='datetime'>
- @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- </#if>
- <#else>
- @Excel(name = "${po.filedComment}", width = 15)
- </#if>
- </#if>
- private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
- </#list>
-
- <#list subTables as sub>
- @ExcelCollection(name="${sub.ftlDescription}")
- private List<${sub.entityName}> ${sub.entityName?uncap_first}List;
- </#list>
-
-}
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei
deleted file mode 100644
index fb3601f..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei
+++ /dev/null
@@ -1,140 +0,0 @@
-<#list subTables as subTab>
-#segment#${subTab.entityName}List.vue
-<template>
- <a-card :bordered="false">
-
- <!-- 操作按钮区域 -->
- <div class="table-operator" :md="24" :sm="24" style="margin: 0px 0px 20px 0px">
- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-
- <a-dropdown v-if="selectedRowKeys.length > 0">
- <a-menu slot="overlay">
- <a-menu-item key="1" @click="batchDel">
- <a-icon type="delete"/>删除
- </a-menu-item>
- </a-menu>
- <a-button style="margin-left: 8px"> 批量操作
- <a-icon type="down"/>
- </a-button>
- </a-dropdown>
- </div>
-
- <!-- table区域-begin -->
- <div>
- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
- <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
- <a style="margin-left: 24px" @click="onClearSelected">清空</a>
- </div>
-
- <a-table
- ref="table"
- size="middle"
- bordered
- rowKey="id"
- :columns="columns"
- :dataSource="dataSource"
- :pagination="ipagination"
- :loading="loading"
- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
- @change="handleTableChange">
-
- <span slot="action" slot-scope="text, record">
- <a @click="handleEdit(record)">编辑</a>
- <a-divider type="vertical"/>
- <a-dropdown>
- <a class="ant-dropdown-link">
- 更多 <a-icon type="down"/>
- </a>
- <a-menu slot="overlay">
- <a-menu-item>
- <a href="javascript:;" @click="handleDetail(record)">详情</a>
- </a-menu-item>
- <a-menu-item>
- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
- <a>删除</a>
- </a-popconfirm>
- </a-menu-item>
- </a-menu>
- </a-dropdown>
- </span>
-
- </a-table>
- </div>
- <!-- table区域-end -->
-
- <!-- 表单区域 -->
- <${subTab.entityName}-modal ref="modalForm" @ok="modalFormOk"/>
- </a-card>
-</template>
-
-<script>
- import ${subTab.entityName}Modal from './modules/${subTab.entityName}Modal'
- import {JeecgListMixin} from '@/mixins/JeecgListMixin'
- import {getAction} from '@/api/manage'
-
- export default {
- name: "${subTab.entityName}List",
- mixins: [JeecgListMixin],
- components: {
- ${subTab.entityName}Modal,
- },
- data() {
- return {
- description: '信息',
- // 表头
- columns: [
- <#list subTab.colums as po><#rt/>
- <#if po.fieldName !='id' && subTab.foreignKeys[0]?uncap_first != po.fieldName>
- {
- title: '${po.filedComment}',
- align:"center",
- dataIndex: '${po.fieldName}'
- },
- </#if>
-</#list>
- {
- title: '操作',
- key: 'operation',
- align: "center",
- width: 130,
- scopedSlots: {customRender: 'action'},
- }],
- url: {
- list: "/${entityPackage}/${entityName?uncap_first}/list${subTab.entityName}ByMainId",
- delete: "/${entityPackage}/${entityName?uncap_first}/delete${subTab.entityName}",
- deleteBatch: "/${entityPackage}/${entityName?uncap_first}/deleteBatch${subTab.entityName}",
- }
- }
- },
- methods: {
- loadData(arg) {
- if (arg === 1) {
- this.ipagination.current = 1;
- }
- var params = this.getQueryParams();
- getAction(this.url.list, {mainId: params.mainId}).then((res) => {
- if (res.success) {
- this.dataSource = res.result;
- } else {
- this.dataSource = null;
- }
- })
- },
- getMain(mainId) {
- this.queryParam.mainId = mainId;
- this.loadData(1);
- },
- handleAdd: function () {
- this.$refs.modalForm.add(this.queryParam.mainId);
- this.$refs.modalForm.title = "添加${subTab.ftlDescription}";
- },
- }
- }
-</script>
-<style scoped>
- .ant-card {
- margin-left: -30px;
- margin-right: -30px;
- }
-</style>
-</#list>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
deleted file mode 100644
index 02c97c2..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
+++ /dev/null
@@ -1,167 +0,0 @@
-<template>
- <a-modal
- :title="title"
- :width="1000"
- :visible="visible"
- :confirmLoading="confirmLoading"
- @ok="handleOk"
- @cancel="handleCancel">
- <a-spin :spinning="confirmLoading">
- <!-- 主表单区域 -->
- <a-form :form="form">
- <#list columns as po><#rt/>
- <#if po.fieldName !='id'><#rt/>
- <a-form-item
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- label="${po.filedComment}">
- <#if po.fieldType =='date'>
- <a-date-picker v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
- <#elseif po.fieldType =='datetime'>
- <a-date-picker showTime format="YYYY-MM-DD HH:mm:ss" v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
- <#elseif "int,decimal,double,"?contains(po.fieldType)>
- <a-input-number v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
- <#else>
- <a-input placeholder="请输入${po.filedComment}" v-decorator="['${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
- </#if>
- </a-form-item>
- </#if>
- </#list>
- </a-form>
- </a-spin>
- </a-modal>
-</template>
-
-<script>
- import {httpAction} from '@/api/manage'
- import JDate from '@/components/jeecg/JDate'
- import pick from 'lodash.pick'
- import moment from "moment"
-
- export default {
- name: '${entityName}Modal',
- components: {
- JDate
- },
- data() {
- return {
- title: "操作",
- visible: false,
- model: {},
- labelCol: {
- xs: {span: 24},
- sm: {span: 5},
- },
- wrapperCol: {
- xs: {span: 24},
- sm: {span: 16},
- },
- confirmLoading: false,
- form: this.$form.createForm(this),
- validatorRules: {
-<#list columns as po>
- <#if po.fieldName !='id'>
- <#if po.nullable =='N'>
- ${po.fieldName}: { rules: [{ required: true, message: '请输入${po.filedComment}!' }] },
- </#if>
- </#if>
-</#list>
- },
- url: {
- add: "/${entityPackage}/${entityName?uncap_first}/add",
- edit: "/${entityPackage}/${entityName?uncap_first}/edit",
-<#list subTables as sub><#rt/>
- ${sub.entityName?uncap_first}List: '/${entityPackage}/${entityName?uncap_first}/query${sub.entityName}ByMainId',
-</#list>
- }
- }
- },
- methods: {
- add() {
- this.edit({});
- },
- edit(record) {
- this.form.resetFields();
- this.model = Object.assign({}, record);
- //初始化明细表数据
- console.log(this.model.id)
- this.visible = true;
- this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model, <#list columns as col>'${col.fieldName}', </#list>))
- // 时间格式化
-<#list columns as col><#rt/>
- <#if col.fieldName !='id' && (col.fieldType =='date' || col.fieldType =='datetime')>
- this.form.setFieldsValue({ ${col.fieldName}: this.model.${col.fieldName} ? moment(this.model.${col.fieldName}) : null })
- </#if>
-</#list>
- });
- },
- close() {
- this.$emit('close');
- this.visible = false;
- },
- handleOk() {
- const that = this;
- // 触发表单验证
- this.form.validateFields((err, values) => {
- if (!err) {
- that.confirmLoading = true;
- let httpurl = '';
- let method = '';
- if (!this.model.id) {
- httpurl += this.url.add;
- method = 'post';
- } else {
- httpurl += this.url.edit;
- method = 'put';
- }
- let formData = Object.assign(this.model, values);
- //时间格式化
- <#list columns as po>
- <#if po.fieldName !='id' && po.fieldType =='date'>
- formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format():null;
- <#elseif po.fieldName !='id' && po.fieldType =='datetime'>
- formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format('YYYY-MM-DD HH:mm:ss'):null;
- </#if>
- </#list>
- httpAction(httpurl, formData, method).then((res) => {
- if (res.success) {
- that.$message.success(res.message);
- that.$emit('ok');
- } else {
- that.$message.warning(res.message);
- }
- }).finally(() => {
- that.confirmLoading = false;
- that.close();
- })
- }
- })
- },
- handleCancel() {
- this.close()
- }
- }
- }
-</script>
-
-<style scoped>
- .ant-btn {
- padding: 0 10px;
- margin-left: 3px;
- }
-
- .ant-form-item-control {
- line-height: 0px;
- }
-
- /** 主表单行间距 */
- .ant-form .ant-form-item {
- margin-bottom: 10px;
- }
-
- /** Tab页面行间距 */
- .ant-tabs-content .ant-form-item {
- margin-bottom: 0px;
- }
-</style>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei b/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei
deleted file mode 100644
index ee0c9b0..0000000
--- a/jeecg-boot/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei
+++ /dev/null
@@ -1,183 +0,0 @@
-<#list subTables as subTab>
-#segment#${subTab.entityName}Modal.vue
-<template>
- <a-modal
- :title="title"
- :width="800"
- :visible="visible"
- :okButtonProps="{ props: {disabled: disableSubmit} }"
- :confirmLoading="confirmLoading"
- @ok="handleOk"
- @cancel="handleCancel"
- cancelText="关闭">
- <a-spin :spinning="confirmLoading">
- <a-form :form="form">
-<#list subTab.colums as po><#rt/>
-
-<#if po.fieldName !='id'><#rt/>
- <a-form-item
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- label="${po.filedComment}"
- <#if subTab.foreignKeys[0]?uncap_first == po.fieldName>
- :hidden="hiding"
- </#if>
- hasFeedback>
- <#if po.fieldType =='date'>
- <a-date-picker v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
- <#elseif po.fieldType =='datetime'>
- <a-date-picker showTime format="YYYY-MM-DD HH:mm:ss" v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
- <#elseif "int,decimal,double,"?contains(po.fieldType)>
- <a-input-number v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
- <#else>
- <#if subTab.foreignKeys[0]?uncap_first == po.fieldName>
- <a-input placeholder="请输入${po.filedComment}" v-decorator="['${po.fieldName}', {'initialValue':this.mainId}]" />
- <#else>
- <a-input placeholder="请输入${po.filedComment}" v-decorator="['${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
- </#if>
- </#if>
- </a-form-item>
-</#if>
-</#list>
- </a-form>
- </a-spin>
- </a-modal>
-</template>
-
-<script>
- import {httpAction} from '@/api/manage'
- import pick from 'lodash.pick'
- import moment from 'moment'
- import JDate from '@/components/jeecg/JDate'
-
- export default {
- components: {
- JDate
- },
- name: '${subTab.entityName}Modal',
- data() {
- return {
- title: '操作',
- visible: false,
- model: {},
- labelCol: {
- xs: {span: 24},
- sm: {span: 5}
- },
- wrapperCol: {
- xs: {span: 24},
- sm: {span: 16}
- },
- moment,
- format: 'YYYY-MM-DD HH:mm:ss',
- disableSubmit: false,
- mainId: '',
- hiding: false,
- confirmLoading: false,
- form: this.$form.createForm(this),
- validatorRules: {
- <#list subTab.colums as po>
- <#if po.fieldName !='id' && subTab.foreignKeys[0]?uncap_first != po.fieldName>
- <#if po.nullable =='N'>
- ${po.fieldName}: { rules: [{ required: true, message: '请输入${po.filedComment}!' }] },
- </#if>
- </#if>
-</#list>
- },
- url: {
- add: '/${entityPackage}/${entityName?uncap_first}/add${subTab.entityName}',
- edit: '/${entityPackage}/${entityName?uncap_first}/edit${subTab.entityName}'
- }
- }
- },
- created() {
- },
- methods: {
- add(mainId) {
- if (mainId) {
- this.edit({mainId}, '')
- } else {
- this.$message.warning('请选择一条数据')
- }
- },
- detail(record) {
- this.edit(record, 'd')
- },
- edit(record, v) {
- if (v == 'e') {
- this.hiding = false;
- this.disableSubmit = false;
- } else if (v == 'd') {
- this.hiding = false;
- this.disableSubmit = true;
- } else {
- this.hiding = true;
- this.disableSubmit = false;
- }
- this.form.resetFields();
- this.mainId = record.mainId;
- this.model = Object.assign({}, record);
- this.visible = true;
- this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model, <#list subTab.colums as col>'${col.fieldName}', </#list>))
- // 时间格式化
-<#list subTab.colums as col><#rt/>
- <#if col.fieldName !='id' && (col.fieldType =='date' || col.fieldType =='datetime')>
- this.form.setFieldsValue({ ${col.fieldName}: this.model.${col.fieldName} ? moment(this.model.${col.fieldName}) : null })
- </#if>
-</#list>
- })
- },
- close() {
- this.$emit('close');
- this.visible = false;
- },
- handleOk() {
- const that = this;
- // 触发表单验证
- this.form.validateFields((err, values) => {
- if (!err) {
- that.confirmLoading = true;
- let httpurl = '';
- let method = '';
- if (!this.model.id) {
- httpurl += this.url.add;
- method = 'post';
- } else {
- httpurl += this.url.edit;
- method = 'put';
- }
- let formData = Object.assign(this.model, values);
- //时间格式化
- <#list subTab.colums as po>
- <#if po.fieldName !='id' && po.fieldType =='date'>
- formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format():null;
- <#elseif po.fieldName !='id' && po.fieldType =='datetime'>
- formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format('YYYY-MM-DD HH:mm:ss'):null;
- </#if>
- </#list>
- httpAction(httpurl, formData, method).then((res) => {
- if (res.success) {
- that.$message.success(res.message);
- that.$emit('ok');
- } else {
- that.$message.warning(res.message);
- }
- }).finally(() => {
- that.confirmLoading = false;
- that.close();
- })
- }
- })
- },
- handleCancel() {
- this.close();
- }
- }
- }
-</script>
-
-<style scoped>
-
-</style>
-</#list>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/jeecg/jeecg_config.properties b/jeecg-boot/src/main/resources/jeecg/jeecg_config.properties
deleted file mode 100644
index cecf6a1..0000000
--- a/jeecg-boot/src/main/resources/jeecg/jeecg_config.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-#code_generate_project_path
-project_path=E:\\eclipse2018-workspace\\jeecg-boot
-#bussi_package[User defined]
-bussi_package=org.jeecg.modules.demo
-
-
-#default code path
-#source_root_package=src
-#webroot_package=WebRoot
-
-#maven code path
-source_root_package=src.main.java
-webroot_package=src.main.webapp
-
-#ftl resource url
-templatepath=/jeecg/code-template
-system_encoding=utf-8
-
-#db Table id [User defined]
-db_table_id=id
-
-#db convert flag[true/false]
-db_filed_convert=true
-
-#page Search Field num [User defined]
-page_search_filed_num=1
-#page_filter_fields
-page_filter_fields=create_time,create_by,update_time,update_by
-
-
diff --git a/jeecg-boot/src/main/resources/jeecg/jeecg_database.properties b/jeecg-boot/src/main/resources/jeecg/jeecg_database.properties
deleted file mode 100644
index 67ad5ab..0000000
--- a/jeecg-boot/src/main/resources/jeecg/jeecg_database.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-#mysql
-diver_name=com.mysql.jdbc.Driver
-url=jdbc:mysql://localhost:3306/jeecg-boot?useUnicode=true&characterEncoding=UTF-8
-username=root
-password=root
-database_name=jeecg-boot
-
-#oracle
-#diver_name=oracle.jdbc.driver.OracleDriver
-#url=jdbc:oracle:thin:@192.168.1.200:1521:ORCL
-#username=scott
-#password=tiger
-#database_name=ORCL
-
-#postgre
-#diver_name=org.postgresql.Driver
-#url=jdbc:postgresql://localhost:5432/jeecg
-#username=postgres
-#password=postgres
-#database_name=jeecg
-
-#SQLServer2005\u4ee5\u4e0a
-#diver_name=org.hibernate.dialect.SQLServerDialect
-#url=jdbc:sqlserver://192.168.1.200:1433;DatabaseName=jeecg
-#username=sa
-#password=SA
-#database_name=jeecg
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/logback-spring.xml b/jeecg-boot/src/main/resources/logback-spring.xml
deleted file mode 100644
index 7e9a273..0000000
--- a/jeecg-boot/src/main/resources/logback-spring.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration debug="false">
- <!--定义日志文件的存储地址 -->
- <property name="LOG_HOME" value="../logs" />
-
- <!-- 控制台输出 -->
- <appender name="STDOUT"
- class="ch.qos.logback.core.ConsoleAppender">
- <encoder
- class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
- </encoder>
- </appender>
-
- <!-- 按照每天生成日志文件 -->
- <appender name="FILE"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <rollingPolicy
- class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!--日志文件输出的文件名 -->
- <FileNamePattern>${LOG_HOME}/jeecgboot.%d{yyyy-MM-dd}.log
- </FileNamePattern>
- <!--日志文件保留天数 -->
- <MaxHistory>30</MaxHistory>
- </rollingPolicy>
- <encoder
- class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
- </encoder>
- <!--日志文件最大的大小 -->
- <triggeringPolicy
- class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <MaxFileSize>10MB</MaxFileSize>
- </triggeringPolicy>
- </appender>
-
- <!-- 生成html格式日志开始 -->
- <appender name="HTML" class="ch.qos.logback.core.FileAppender">
- <!-- 过滤器，只记录WARN级别的日志 -->
- <!-- <filter class="ch.qos.logback.classic.filter.LevelFilter"> <level>info</level>
- <onMatch>ACCEPT</onMatch> <onMismatch>DENY</onMismatch> </filter> -->
-
- <encoder
- class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
- <layout class="ch.qos.logback.classic.html.HTMLLayout">
- <pattern>%p%d%msg%M%F{32}%L</pattern>
- </layout>
- </encoder>
- <file>${LOG_HOME}/error-log.html</file>
- </appender>
- <!-- 生成html格式日志结束 -->
-
- <!-- 每天生成一个html格式的日志开始 -->
- <appender name="FILE_HTML"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <rollingPolicy
- class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!--日志文件输出的文件名 -->
- <FileNamePattern>${LOG_HOME}/jeecgboot.%d{yyyy-MM-dd}.html
- </FileNamePattern>
- <!--日志文件保留天数 -->
- <MaxHistory>30</MaxHistory>
- </rollingPolicy>
- <encoder
- class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
- <layout class="ch.qos.logback.classic.html.HTMLLayout">
- <pattern>%p%d%msg%M%F{32}%L</pattern>
- </layout>
- </encoder>
- <!--日志文件最大的大小 -->
- <triggeringPolicy
- class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <MaxFileSize>10MB</MaxFileSize>
- </triggeringPolicy>
- </appender>
- <!-- 每天生成一个html格式的日志结束 -->
-
- <!--myibatis log configure -->
- <logger name="com.apache.ibatis" level="TRACE" />
- <logger name="java.sql.Connection" level="DEBUG" />
- <logger name="java.sql.Statement" level="DEBUG" />
- <logger name="java.sql.PreparedStatement" level="DEBUG" />
-
- <!-- 日志输出级别 -->
- <root level="INFO">
- <appender-ref ref="STDOUT" />
- <appender-ref ref="FILE" />
- <appender-ref ref="HTML" />
- <appender-ref ref="FILE_HTML" />
- </root>
-
-</configuration>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/static/view/userlist.html b/jeecg-boot/src/main/resources/static/view/userlist.html
deleted file mode 100644
index 049c822..0000000
--- a/jeecg-boot/src/main/resources/static/view/userlist.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <meta charset="utf-8">
- <title>iview example</title>
- <link rel="stylesheet" type="text/css" href="http://unpkg.com/iview/dist/styles/iview.css">
- <script type="text/javascript" src="http://vuejs.org/js/vue.min.js"></script>
- <script type="text/javascript" src="http://unpkg.com/iview/dist/iview.min.js"></script>
- <style>
- #app{padding: 32px;}
- </style>
-</head>
-<body>
-<div id="app">
- <i-table border :columns="columns7" :data="data6"></i-table>
-</div>
-<script>
-
- var Main = {
- data () {
- return {
- columns7: [
- {
- title: 'Name',
- key: 'name',
- render: (h, params) => {
- return h('div', [
- h('Icon', {
- props: {
- type: 'person'
- }
- }),
- h('strong', params.row.name)
- ]);
- }
- },
- {
- title: 'Age',
- key: 'age'
- },
- {
- title: 'Address',
- key: 'address'
- },
- {
- title: 'Action',
- key: 'action',
- width: 150,
- align: 'center',
- render: (h, params) => {
- return h('div', [
- h('Button', {
- props: {
- type: 'primary',
- size: 'small'
- },
- style: {
- marginRight: '5px'
- },
- on: {
- click: () => {
- this.show(params.index)
- }
- }
- }, 'View'),
- h('Button', {
- props: {
- type: 'error',
- size: 'small'
- },
- on: {
- click: () => {
- this.remove(params.index)
- }
- }
- }, 'Delete')
- ]);
- }
- }
- ],
- data6: [
- {
- name: 'John Brown',
- age: 18,
- address: 'New York No. 1 Lake Park'
- },
- {
- name: 'Jim Green',
- age: 24,
- address: 'London No. 1 Lake Park'
- },
- {
- name: 'Joe Black',
- age: 30,
- address: 'Sydney No. 1 Lake Park'
- },
- {
- name: 'Jon Snow',
- age: 26,
- address: 'Ottawa No. 2 Lake Park'
- }
- ]
- }
- },
- methods: {
- show (index) {
- this.$Modal.info({
- title: 'User Info',
- content: `Name：${this.data6[index].name}<br>Age：${this.data6[index].age}<br>Address：${this.data6[index].address}`
- })
- },
- remove (index) {
- this.data6.splice(index, 1);
- }
- }
- }
-
-var Component = Vue.extend(Main)
-new Component().$mount('#app')
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/jeecg-boot/src/main/resources/templates/demo3.ftl b/jeecg-boot/src/main/resources/templates/demo3.ftl
deleted file mode 100644
index d75badc..0000000
--- a/jeecg-boot/src/main/resources/templates/demo3.ftl
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head lang="en">
-<title>Spring Boot FreeMarker</title>
-</head>
-<body>
- Freemarker HTML <br><br>
-
- Sessionid: ${sessionid!}<br><br>
-
- <font>
- <#list userList as item>
- ${item!}<br />
- </#list>
- </font>
-</body>
-</html>
\ No newline at end of file
diff --git a/jeecg-boot/src/test/java/org/jeecg/SampleTest.java b/jeecg-boot/src/test/java/org/jeecg/SampleTest.java
deleted file mode 100644
index 177cf10..0000000
--- a/jeecg-boot/src/test/java/org/jeecg/SampleTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.jeecg;
-
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.jeecg.modules.demo.mock.MockController;
-import org.jeecg.modules.demo.test.entity.JeecgDemo;
-import org.jeecg.modules.demo.test.mapper.JeecgDemoMapper;
-import org.jeecg.modules.demo.test.service.IJeecgDemoService;
-import org.jeecg.modules.system.service.ISysDataLogService;
-import org.junit.Assert;
-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 SampleTest {
-
- @Resource
- private JeecgDemoMapper jeecgDemoMapper;
- @Resource
- private IJeecgDemoService jeecgDemoService;
- @Resource
- private ISysDataLogService sysDataLogService;
- @Resource
- private MockController mock;
-
- @Test
- public void testSelect() {
- System.out.println(("----- selectAll method test ------"));
- List<JeecgDemo> userList = jeecgDemoMapper.selectList(null);
- Assert.assertEquals(5, userList.size());
- userList.forEach(System.out::println);
- }
-
- @Test
- public void testXmlSql() {
- System.out.println(("----- selectAll method test ------"));
- List<JeecgDemo> userList = jeecgDemoMapper.getDemoByName("Sandy12");
- userList.forEach(System.out::println);
- }
-
- /**
- * 测试事务
- */
- @Test
- public void testTran() {
- jeecgDemoService.testTran();
- }
-
- //author:lvdandan-----date：20190315---for:添加数据日志测试----
- /**
- * 测试数据日志添加
- */
- @Test
- public void testDataLogSave() {
- System.out.println(("----- datalog test ------"));
- String tableName = "jeecg_demo";
- String dataId = "4028ef81550c1a7901550c1cd6e70001";
- String dataContent = mock.sysDataLogJson();
- sysDataLogService.addDataLog(tableName, dataId, dataContent);
- }
- //author:lvdandan-----date：20190315---for:添加数据日志测试----
-}