Merge remote-tracking branch 'origin/dev-0.3' into dev-0.3

xxxllluuu · Oct 29, 2020 · 80bb036 · 80bb036
2 parents 7891637 + ade7181
commit 80bb036
Show file tree

Hide file tree

Showing 230 changed files with 448 additions and 625 deletions.
diff --git a/CONTRIBUTING-CH.md b/CONTRIBUTING-CH.md
@@ -24,7 +24,7 @@ Davinci 用户手册文档在 docs/ 目录下，我们使用了 [jekyll](https:/
 ### 分支结构
 Davinci 源码可能会产生一些临时分支，但真正有明确意义的只有以下三个分支：
 
-- dev-0.3: 默认分支，主要开发分支；
+- dev-0.3: 默认分支，主要开发分支，**需要注意，dev-0.3分支代码不保证可用性，请谨慎使用到生产**；
 - master: 最近一次稳定 release 的源码，偶尔会多几次 hotfix 提交；
 - dev-0.2: 0.2 版本源码，目前 0.2 版本已经停止更新，如有 0.2 版本使用者或是需要进行二次开发的用户可以参考此分支。
 
@@ -97,7 +97,6 @@ npm run build
   ├── davinci.sql           # 完整系统数据库脚本（包含所有补丁）
   ├── initdb.bat            # 针对 Windows 环境的初始化数据库批处理脚本
   ├── initdb.sh             # 针对 Linux、Mac 环境的初始化数据库 Shell 脚本
-  ├── phantom.js            # 截图脚本（未来版本将不再使用）
   ├── restart-server.sh     # 针对 Linux、Mac 环境的重启服务脚本
   ├── run.bat               # 针对	Windows 环境的服务启停核心脚本						
   ├── start.bat             # 针对 Windows 环境的服务启动脚本

diff --git a/bin/phantom.js b/bin/phantom.js
diff --git a/config/application.yml.example b/config/application.yml.example
@@ -173,9 +173,8 @@ spring:
 #              avatar: "attributes.Avatar"
 
 screenshot:
-  default_browser: PHANTOMJS                    # PHANTOMJS or CHROME
+  default_browser: CHROME
   timeout_second: 600
-  phantomjs_path: $your_phantomjs_path$
   chromedriver_path: $your_chromedriver_path$
   remote_webdriver_url: $your_remote_webdriver_url$
 

diff --git a/davinci-ui/.htaccess.bin b/davinci-ui/.htaccess.bin
diff --git a/davinci-ui/00f7a8c40be35dccdb90a642a58078d4.eot b/davinci-ui/00f7a8c40be35dccdb90a642a58078d4.eot
diff --git a/davinci-ui/1.07df75f50ea533269e4d.chunk.js b/davinci-ui/1.07df75f50ea533269e4d.chunk.js
diff --git a/davinci-ui/1.07df75f50ea533269e4d.chunk.js.gz b/davinci-ui/1.07df75f50ea533269e4d.chunk.js.gz
diff --git a/davinci-ui/11.e57a1c8d0c2f11b5442a.chunk.js b/davinci-ui/11.e57a1c8d0c2f11b5442a.chunk.js
diff --git a/davinci-ui/11.e57a1c8d0c2f11b5442a.chunk.js.gz b/davinci-ui/11.e57a1c8d0c2f11b5442a.chunk.js.gz
diff --git a/davinci-ui/12.d4a2ab97dbd236370cd5.chunk.js b/davinci-ui/12.d4a2ab97dbd236370cd5.chunk.js
diff --git a/davinci-ui/12.d4a2ab97dbd236370cd5.chunk.js.gz b/davinci-ui/12.d4a2ab97dbd236370cd5.chunk.js.gz
diff --git a/davinci-ui/13.17327ba073aea1bd96a6.chunk.js b/davinci-ui/13.17327ba073aea1bd96a6.chunk.js
diff --git a/davinci-ui/13.17327ba073aea1bd96a6.chunk.js.gz b/davinci-ui/13.17327ba073aea1bd96a6.chunk.js.gz
diff --git a/davinci-ui/14.7b123dbfd8c7b7c77a8f.chunk.js b/davinci-ui/14.7b123dbfd8c7b7c77a8f.chunk.js
diff --git a/davinci-ui/14.7b123dbfd8c7b7c77a8f.chunk.js.gz b/davinci-ui/14.7b123dbfd8c7b7c77a8f.chunk.js.gz
diff --git a/davinci-ui/15.9cbcd6f778a5bee0d011.chunk.js b/davinci-ui/15.9cbcd6f778a5bee0d011.chunk.js
diff --git a/davinci-ui/15.9cbcd6f778a5bee0d011.chunk.js.gz b/davinci-ui/15.9cbcd6f778a5bee0d011.chunk.js.gz
diff --git a/davinci-ui/16.eff75f46e332d56a47ac.chunk.js b/davinci-ui/16.eff75f46e332d56a47ac.chunk.js
diff --git a/davinci-ui/16.eff75f46e332d56a47ac.chunk.js.gz b/davinci-ui/16.eff75f46e332d56a47ac.chunk.js.gz
diff --git a/davinci-ui/17.24f2f7492787b246cd5a.chunk.js b/davinci-ui/17.24f2f7492787b246cd5a.chunk.js
diff --git a/davinci-ui/17.24f2f7492787b246cd5a.chunk.js.gz b/davinci-ui/17.24f2f7492787b246cd5a.chunk.js.gz
diff --git a/davinci-ui/1797c70b895d9c8d20a92fa453ef7151.woff b/davinci-ui/1797c70b895d9c8d20a92fa453ef7151.woff
diff --git a/davinci-ui/18.a6f98754a67c278baac6.chunk.js b/davinci-ui/18.a6f98754a67c278baac6.chunk.js
diff --git a/davinci-ui/18.a6f98754a67c278baac6.chunk.js.gz b/davinci-ui/18.a6f98754a67c278baac6.chunk.js.gz
diff --git a/davinci-ui/19.0b9b8308fde3abd4da3a.chunk.js b/davinci-ui/19.0b9b8308fde3abd4da3a.chunk.js
diff --git a/davinci-ui/19.0b9b8308fde3abd4da3a.chunk.js.gz b/davinci-ui/19.0b9b8308fde3abd4da3a.chunk.js.gz
diff --git a/davinci-ui/2.7bfcfb5ead549196020f.chunk.js b/davinci-ui/2.7bfcfb5ead549196020f.chunk.js
diff --git a/davinci-ui/2.7bfcfb5ead549196020f.chunk.js.gz b/davinci-ui/2.7bfcfb5ead549196020f.chunk.js.gz
diff --git a/davinci-ui/20.2db0c3cf78aa6858765f.chunk.js b/davinci-ui/20.2db0c3cf78aa6858765f.chunk.js
diff --git a/davinci-ui/20.2db0c3cf78aa6858765f.chunk.js.gz b/davinci-ui/20.2db0c3cf78aa6858765f.chunk.js.gz
diff --git a/davinci-ui/21.4d910faad6484b9d9694.chunk.js b/davinci-ui/21.4d910faad6484b9d9694.chunk.js
diff --git a/davinci-ui/21.4d910faad6484b9d9694.chunk.js.gz b/davinci-ui/21.4d910faad6484b9d9694.chunk.js.gz
diff --git a/davinci-ui/22.04cf0f864f147d5c5a4a.chunk.js b/davinci-ui/22.04cf0f864f147d5c5a4a.chunk.js
diff --git a/davinci-ui/22.04cf0f864f147d5c5a4a.chunk.js.gz b/davinci-ui/22.04cf0f864f147d5c5a4a.chunk.js.gz
diff --git a/davinci-ui/22be548b8275fdf8e97a4a2d77b8c93c.png b/davinci-ui/22be548b8275fdf8e97a4a2d77b8c93c.png
diff --git a/davinci-ui/23.a37c16aaf7b7e46cd052.chunk.js b/davinci-ui/23.a37c16aaf7b7e46cd052.chunk.js
diff --git a/davinci-ui/23.a37c16aaf7b7e46cd052.chunk.js.gz b/davinci-ui/23.a37c16aaf7b7e46cd052.chunk.js.gz
diff --git a/davinci-ui/24.8d4219d6714f3b6eaccb.chunk.js b/davinci-ui/24.8d4219d6714f3b6eaccb.chunk.js
diff --git a/davinci-ui/24.8d4219d6714f3b6eaccb.chunk.js.gz b/davinci-ui/24.8d4219d6714f3b6eaccb.chunk.js.gz
diff --git a/davinci-ui/25.c3c07302b1069dc46cca.chunk.js b/davinci-ui/25.c3c07302b1069dc46cca.chunk.js
diff --git a/davinci-ui/25.c3c07302b1069dc46cca.chunk.js.gz b/davinci-ui/25.c3c07302b1069dc46cca.chunk.js.gz
diff --git a/davinci-ui/26.936a460ea96c420542ab.chunk.js b/davinci-ui/26.936a460ea96c420542ab.chunk.js
diff --git a/davinci-ui/26.936a460ea96c420542ab.chunk.js.gz b/davinci-ui/26.936a460ea96c420542ab.chunk.js.gz
diff --git a/davinci-ui/27.5f885ada434d326f1ad0.chunk.js b/davinci-ui/27.5f885ada434d326f1ad0.chunk.js
diff --git a/davinci-ui/27.5f885ada434d326f1ad0.chunk.js.gz b/davinci-ui/27.5f885ada434d326f1ad0.chunk.js.gz
diff --git a/davinci-ui/28.399a8d5b478c600855c5.chunk.js b/davinci-ui/28.399a8d5b478c600855c5.chunk.js
diff --git a/davinci-ui/28.399a8d5b478c600855c5.chunk.js.gz b/davinci-ui/28.399a8d5b478c600855c5.chunk.js.gz
diff --git a/davinci-ui/29.affb038052eaf084fd5a.chunk.js b/davinci-ui/29.affb038052eaf084fd5a.chunk.js
diff --git a/davinci-ui/29.affb038052eaf084fd5a.chunk.js.gz b/davinci-ui/29.affb038052eaf084fd5a.chunk.js.gz
diff --git a/davinci-ui/2f1597f2b4a3710b9b1d2dfc8f28f530.svg b/davinci-ui/2f1597f2b4a3710b9b1d2dfc8f28f530.svg
diff --git a/davinci-ui/3.00282b60982218f9b211.chunk.js b/davinci-ui/3.00282b60982218f9b211.chunk.js
diff --git a/davinci-ui/3.00282b60982218f9b211.chunk.js.gz b/davinci-ui/3.00282b60982218f9b211.chunk.js.gz
diff --git a/davinci-ui/30.fe0a90ee71606a5f0318.chunk.js b/davinci-ui/30.fe0a90ee71606a5f0318.chunk.js
diff --git a/davinci-ui/30.fe0a90ee71606a5f0318.chunk.js.gz b/davinci-ui/30.fe0a90ee71606a5f0318.chunk.js.gz
diff --git a/davinci-ui/31.33fec4e84977f6cf5cb7.chunk.js b/davinci-ui/31.33fec4e84977f6cf5cb7.chunk.js
diff --git a/davinci-ui/31.33fec4e84977f6cf5cb7.chunk.js.gz b/davinci-ui/31.33fec4e84977f6cf5cb7.chunk.js.gz
diff --git a/davinci-ui/32.f5bfc9674b62cecf2b0e.chunk.js b/davinci-ui/32.f5bfc9674b62cecf2b0e.chunk.js
diff --git a/davinci-ui/32.f5bfc9674b62cecf2b0e.chunk.js.gz b/davinci-ui/32.f5bfc9674b62cecf2b0e.chunk.js.gz
diff --git a/davinci-ui/33.82eb0200adfd1394114c.chunk.js b/davinci-ui/33.82eb0200adfd1394114c.chunk.js
diff --git a/davinci-ui/33.82eb0200adfd1394114c.chunk.js.gz b/davinci-ui/33.82eb0200adfd1394114c.chunk.js.gz
diff --git a/davinci-ui/34.a74d146b25e623be94a8.chunk.js b/davinci-ui/34.a74d146b25e623be94a8.chunk.js
diff --git a/davinci-ui/34.a74d146b25e623be94a8.chunk.js.gz b/davinci-ui/34.a74d146b25e623be94a8.chunk.js.gz
diff --git a/davinci-ui/35.d7a5e18f3d9f88ec302f.chunk.js b/davinci-ui/35.d7a5e18f3d9f88ec302f.chunk.js
diff --git a/davinci-ui/35.d7a5e18f3d9f88ec302f.chunk.js.gz b/davinci-ui/35.d7a5e18f3d9f88ec302f.chunk.js.gz
diff --git a/davinci-ui/36.6b956c46c581cd349957.chunk.js b/davinci-ui/36.6b956c46c581cd349957.chunk.js
diff --git a/davinci-ui/36.6b956c46c581cd349957.chunk.js.gz b/davinci-ui/36.6b956c46c581cd349957.chunk.js.gz
diff --git a/davinci-ui/37.0a7d479465c7abf07261.chunk.js b/davinci-ui/37.0a7d479465c7abf07261.chunk.js
diff --git a/davinci-ui/37.0a7d479465c7abf07261.chunk.js.gz b/davinci-ui/37.0a7d479465c7abf07261.chunk.js.gz
diff --git a/davinci-ui/38.140880402f7d682e3ad8.chunk.js b/davinci-ui/38.140880402f7d682e3ad8.chunk.js
diff --git a/davinci-ui/38.140880402f7d682e3ad8.chunk.js.gz b/davinci-ui/38.140880402f7d682e3ad8.chunk.js.gz
diff --git a/davinci-ui/39.8addfc70d88a4e349b4e.chunk.js b/davinci-ui/39.8addfc70d88a4e349b4e.chunk.js
diff --git a/davinci-ui/39.8addfc70d88a4e349b4e.chunk.js.gz b/davinci-ui/39.8addfc70d88a4e349b4e.chunk.js.gz
diff --git a/davinci-ui/4.d105e0454ad367a37cda.chunk.js b/davinci-ui/4.d105e0454ad367a37cda.chunk.js
diff --git a/davinci-ui/4.d105e0454ad367a37cda.chunk.js.gz b/davinci-ui/4.d105e0454ad367a37cda.chunk.js.gz
diff --git a/davinci-ui/40.5799d92cf44cd85045d4.chunk.js b/davinci-ui/40.5799d92cf44cd85045d4.chunk.js
diff --git a/davinci-ui/40.5799d92cf44cd85045d4.chunk.js.gz b/davinci-ui/40.5799d92cf44cd85045d4.chunk.js.gz
diff --git a/davinci-ui/41.f2bf6bf42d97158a5175.chunk.js b/davinci-ui/41.f2bf6bf42d97158a5175.chunk.js
diff --git a/davinci-ui/41.f2bf6bf42d97158a5175.chunk.js.gz b/davinci-ui/41.f2bf6bf42d97158a5175.chunk.js.gz
diff --git a/davinci-ui/413d0d1383643058a7dc3455fa32f876.png b/davinci-ui/413d0d1383643058a7dc3455fa32f876.png
diff --git a/davinci-ui/42.2e9633e38666da430acc.chunk.js b/davinci-ui/42.2e9633e38666da430acc.chunk.js
diff --git a/davinci-ui/42.2e9633e38666da430acc.chunk.js.gz b/davinci-ui/42.2e9633e38666da430acc.chunk.js.gz