merge dev-0.3 0621

justeene · Jun 21, 2019 · d06b594 · d06b594
2 parents a3c5d57 + 5fea781
commit d06b594
Show file tree

Hide file tree

Showing 568 changed files with 28,471 additions and 20,532 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,4 +32,5 @@ userfiles/
 .vscode
 *yarn.lock
 bin/upgrade.go
-bin/upgrade/
+/davinci-ui/
+bin/upgrade
diff --git a/assembly/src/main/assembly/assembly.xml b/assembly/src/main/assembly/assembly.xml
@@ -20,7 +20,7 @@
 
 
 <assembly>
-    <id>dist-beta.5</id>
+    <id>dist-beta.6</id>
     <formats>
         <format>zip</format>
     </formats>
@@ -62,8 +62,7 @@
             </directory>
             <outputDirectory>userfiles</outputDirectory>
             <excludes>
-                <exclude>download/**</exclude>
-                <exclude>tempFiles/**</exclude>
+                <exclude>*/**</exclude>
             </excludes>
         </fileSet>
         <fileSet>

diff --git a/bin/davinci.sql b/bin/davinci.sql
diff --git a/bin/initdb.bat b/bin/initdb.bat
@@ -1,7 +1,7 @@
 :: <<
 :: Davinci
 :: ==
-:: Copyright (C) 2016 - 2018 EDP
+:: Copyright (C) 2016 - 2019 EDP
 :: ==
 :: Licensed under the Apache License, Version 2.0 (the "License");
 :: you may not use this file except in compliance with the License.

diff --git a/bin/migration/README.md b/bin/migration/README.md
@@ -0,0 +1,14 @@
+### 注意！
+
+1. **升级前请务必备份数据！！！, 升级前请务必备份数据！！！, 升级前请务必备份数据！！！**
+2. 本次升级只针对 davinci0.3 beta.4 升级至 beta.5， 其他版本请不要执行！
+3. 已安装 beta.5 及之后版本无须执行此脚本；
+4. 本次升级默认读取 config 下 application.yml 中配置的 davinci 数据源，也可通过参数指定，更多信息请执行 ‘upgrade -help’ 查看；
+5. 本次升级可能造成部分 View 中定义的`变量值`错误，请手动修改；
+6. 升级脚本为二进制文件，不同平台执行相应脚本即可，无须重复执行：
+
+   | 平台 | 对应脚本 |
+   | --- | --- |
+   |Windows | upgrade.exe |
+   |Mac OS  |  upgrade_darwin |
+   |Linux   |  upgrade_linux |
diff --git a/bin/migration/upgrade.exe b/bin/migration/upgrade.exe
diff --git a/bin/migration/upgrade_darwin b/bin/migration/upgrade_darwin
diff --git a/bin/migration/upgrade_linux b/bin/migration/upgrade_linux