Merge pull request edp963#1036 from shanmengm/dev-0.3

Dev 0.3
justeene · Jun 21, 2019 · 5fea781 · 5fea781
2 parents bd9468a + 6cae92d
commit 5fea781
Show file tree

Hide file tree

Showing 57 changed files with 24 additions and 328 deletions.
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/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
diff --git a/bin/upgrade-darwin b/bin/upgrade-darwin
diff --git a/bin/upgrade-linux b/bin/upgrade-linux
diff --git a/bin/upgrade.exe b/bin/upgrade.exe
diff --git a/davinci-ui/1.ef089c2c540a68051205.chunk.js b/davinci-ui/1.ef089c2c540a68051205.chunk.js
diff --git a/davinci-ui/1.ef089c2c540a68051205.chunk.js.gz b/davinci-ui/1.ef089c2c540a68051205.chunk.js.gz
diff --git a/davinci-ui/12.48d192b85a3199d3c0c4.chunk.js b/davinci-ui/12.48d192b85a3199d3c0c4.chunk.js
diff --git a/davinci-ui/12.48d192b85a3199d3c0c4.chunk.js.gz b/davinci-ui/12.48d192b85a3199d3c0c4.chunk.js.gz
diff --git a/davinci-ui/13.57b206fd20c252e628c9.chunk.js b/davinci-ui/13.57b206fd20c252e628c9.chunk.js
diff --git a/davinci-ui/13.57b206fd20c252e628c9.chunk.js.gz b/davinci-ui/13.57b206fd20c252e628c9.chunk.js.gz
diff --git a/davinci-ui/14.fef74ca783a9562f5193.chunk.js b/davinci-ui/14.fef74ca783a9562f5193.chunk.js
diff --git a/davinci-ui/14.fef74ca783a9562f5193.chunk.js.gz b/davinci-ui/14.fef74ca783a9562f5193.chunk.js.gz
diff --git a/davinci-ui/15.ae24c3f99fc4140f7452.chunk.js b/davinci-ui/15.ae24c3f99fc4140f7452.chunk.js
diff --git a/davinci-ui/15.ae24c3f99fc4140f7452.chunk.js.gz b/davinci-ui/15.ae24c3f99fc4140f7452.chunk.js.gz
diff --git a/davinci-ui/16.8e1b7e37a0ad32fc4296.chunk.js b/davinci-ui/16.8e1b7e37a0ad32fc4296.chunk.js
diff --git a/davinci-ui/16.8e1b7e37a0ad32fc4296.chunk.js.gz b/davinci-ui/16.8e1b7e37a0ad32fc4296.chunk.js.gz