diff --git a/ant-design-vue-jeecg/src/components/page/GlobalHeader.vue b/ant-design-vue-jeecg/src/components/page/GlobalHeader.vue
index 5837f1f6..83a9ffb9 100644
--- a/ant-design-vue-jeecg/src/components/page/GlobalHeader.vue
+++ b/ant-design-vue-jeecg/src/components/page/GlobalHeader.vue
@@ -10,12 +10,12 @@
v-if="device==='mobile'"
class="trigger"
:type="collapsed ? 'menu-fold' : 'menu-unfold'"
- @click.native="toggle">
+ @click="toggle">
+ @click="toggle"/>
欢迎进入 Jeecg-Boot 企业级快速开发平台
Jeecg-Boot
@@ -37,7 +37,7 @@
v-else
class="trigger"
:type="collapsed ? 'menu-fold' : 'menu-unfold'"
- @click.native="toggle">
+ @click="toggle">
diff --git a/ant-design-vue-jeecg/src/components/tools/UserMenu.vue b/ant-design-vue-jeecg/src/components/tools/UserMenu.vue
index 6acc105a..b1bc495d 100644
--- a/ant-design-vue-jeecg/src/components/tools/UserMenu.vue
+++ b/ant-design-vue-jeecg/src/components/tools/UserMenu.vue
@@ -20,7 +20,7 @@
@change="searchMethods"
@blur="hiddenClick"
>
- {{site.meta.title}}
+ {{site.meta.title}}
diff --git a/ant-design-vue-jeecg/src/views/system/modules/SysCheckRuleTestModal.vue b/ant-design-vue-jeecg/src/views/system/modules/SysCheckRuleTestModal.vue
index d9ede26d..4cf61b1e 100644
--- a/ant-design-vue-jeecg/src/views/system/modules/SysCheckRuleTestModal.vue
+++ b/ant-design-vue-jeecg/src/views/system/modules/SysCheckRuleTestModal.vue
@@ -12,7 +12,7 @@
-
+
diff --git a/jeecg-boot/db/mysql_schema.sql b/jeecg-boot/db/1mysql_schema.sql
similarity index 100%
rename from jeecg-boot/db/mysql_schema.sql
rename to jeecg-boot/db/1mysql_schema.sql
diff --git a/jeecg-boot/db/mysql5.7.sql b/jeecg-boot/db/2jeecgboot_mysql5.7.sql
similarity index 99%
rename from jeecg-boot/db/mysql5.7.sql
rename to jeecg-boot/db/2jeecgboot_mysql5.7.sql
index 09e725ff..00733e89 100644
--- a/jeecg-boot/db/mysql5.7.sql
+++ b/jeecg-boot/db/2jeecgboot_mysql5.7.sql
@@ -1,3 +1,4 @@
+USE jeecg-boot;
/*
Navicat Premium Data Transfer
diff --git a/jeecg-boot/db/增量升级SQL/2.1.3升级到2.1.4mysq.sql b/jeecg-boot/db/增量升级SQL/2.1.3升级到2.1.4mysq.sql
index d28f7221..2fcb3457 100644
--- a/jeecg-boot/db/增量升级SQL/2.1.3升级到2.1.4mysq.sql
+++ b/jeecg-boot/db/增量升级SQL/2.1.3升级到2.1.4mysq.sql
@@ -1,5 +1,4 @@
-
-- 多数据源表
DROP TABLE IF EXISTS `sys_data_source`;
CREATE TABLE `sys_data_source` (
@@ -27,14 +26,10 @@ INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `descri
INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1209733839933476865', '1209733563293962241', 'Oracle', '2', '', '1', '1', 'admin', '2019-12-25 151318', NULL, NULL);
INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1209733903020003330', '1209733563293962241', 'SQLServer', '3', '', '1', '1', 'admin', '2019-12-25 151333', NULL, NULL);
-
-- 生产销售监控 --
-update sys_permission set url='{{ window._CONFIG['domianURL'] }}bigscreentemplatindex1' where id='1205098241075453953';
+update sys_permission set url='{{ window._CONFIG[\'domianURL\'] }}/big/screen/templat/index1' where id='1205098241075453953';
-- 智慧物流监控 --
-update sys_permission set url='{{ window._CONFIG['domianURL'] }}bigscreentemplatindex2' where id='1205306106780364802';
-
-
-
+update sys_permission set url='{{ window._CONFIG[\'domianURL\'] }}/big/screen/templat/index2' where id='1205306106780364802';
@@ -137,5 +132,4 @@ update onl_cgform_head SET theme_template = 'normal';
INSERT INTO `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`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1229674163694841857', 'e41b69c57a941a3bbcce45032fe57605', 'AUTO在线表单ERP', 'onlinecgformErpListcode', 'modulesonlinecgformautoerpOnlCgformErpList', NULL, NULL, 1, NULL, '1', 5.00, 0, NULL, 1, 1, 0, 1, NULL, 'admin', '2020-02-18 154900', 'admin', '2020-02-18 155225', 0, 0, '1', 0);
ALTER TABLE `onl_cgform_field`
-ADD COLUMN `is_read_only` tinyint(1) NULL DEFAULT 0 COMMENT '是否是只读(1是 0否)' AFTER `is_show_list`;
-
+ADD COLUMN `is_read_only` tinyint(1) NULL DEFAULT 0 COMMENT '是否是只读(1是 0否)' AFTER `is_show_list`;
\ No newline at end of file
diff --git a/jeecg-boot/db/增量升级SQL/版本升级 b/jeecg-boot/db/增量升级SQL/版本升级
new file mode 100644
index 00000000..de63ff48
--- /dev/null
+++ b/jeecg-boot/db/增量升级SQL/版本升级
@@ -0,0 +1,10 @@
+版本升级方法?
+
+ JeecgBoot属于平台级产品,每次升级改动内容较多,目前做不到平滑升级。
+
+ 这里给用户的升级建议是这样的:
+ 1.代码升级 => 本地版本通过svn或者git做好主干,在分支上做业务开发,jeecg每次版本发布,可以手工覆盖主干的代码,对比代码进行提交;
+ 2.数据库升级 => 针对数据库我们每次发布会提供增量升级SQL,可以通过增量SQL实现数据库的升级。
+ 3.兼容问题 => 每次版本发布会针对不兼容地方标注说明,需要手工修改不兼容的代码。
+
+ 注意: 升级sql目前只提供mysql版本,执行完脚步后,新菜单需要手工进行角色授权,刷新首页才会出现。
\ No newline at end of file