Merge pull request edp963#498 from shanmengm/master

Merge from dev-0.3
Allen0769 · Oct 16, 2018 · a53d43d · a53d43d
2 parents 575c06e + 9ccd761
commit a53d43d
Show file tree

Hide file tree

Showing 246 changed files with 11,704 additions and 5,219 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,7 +26,6 @@ spark-warehouse
 *.conf
 config/application.yml
 swagger-ui/
-lib/
 tempFiles/
 userfiles/
 .vscode

diff --git a/assembly/src/main/assembly/assembly.xml b/assembly/src/main/assembly/assembly.xml
@@ -20,7 +20,7 @@
 
 
 <assembly>
-    <id>dist</id>
+    <id>dist-beta.2</id>
     <formats>
         <format>zip</format>
     </formats>
@@ -56,12 +56,18 @@
                 ${project.parent.basedir}/userfiles
             </directory>
             <outputDirectory>userfiles</outputDirectory>
+            <excludes>
+                <exclude>*</exclude>
+            </excludes>
         </fileSet>
         <fileSet>
             <directory>
                 ${project.parent.basedir}/logs
             </directory>
             <outputDirectory>logs</outputDirectory>
+            <excludes>
+                <exclude>*</exclude>
+            </excludes>
         </fileSet>
         <fileSet>
             <directory>

diff --git a/assembly/src/main/assembly/release.xml b/assembly/src/main/assembly/release.xml
@@ -60,12 +60,18 @@
                 ${project.parent.basedir}/userfiles
             </directory>
             <outputDirectory>userfiles</outputDirectory>
+            <excludes>
+                <exclude>*</exclude>
+            </excludes>
         </fileSet>
         <fileSet>
             <directory>
                 ${project.parent.basedir}/logs
             </directory>
             <outputDirectory>logs</outputDirectory>
+            <excludes>
+                <exclude>*</exclude>
+            </excludes>
         </fileSet>
         <fileSet>
             <directory>

diff --git a/bin/start-server.sh b/bin/start-server.sh
@@ -19,17 +19,29 @@
 
 #start server
 
+if [ -z "$DAVINCI3_HOME" ]; then
+  echo "DAVINCI3_HOME not found"
+  echo "Please export DAVINCI3_HOME to your environment variable"
+  exit
+fi
+
+cd $DAVINCI3_HOME
+Lib_dir=`ls | grep lib`
+if [ -z "$Lib_dir" ]; then
+  echo "Invalid DAVINCI3_HOME"
+  exit
+fi
+
 Server=`ps -ef | grep java | grep davinci-server_3.01-0.3.0-SNAPSHOT | grep -v grep | awk '{print $2}'`
 if [[ $Server -gt 0 ]]; then
   echo "[Davinci Server] is already started"
   exit
 fi
 
-script_dir=$(cd `dirname $0`; pwd)
-cd $script_dir/../
+cd $DAVINCI3_HOME
 TODAY=`date "+%Y-%m-%d"`
 LOG_PATH=$DAVINCI3_HOME/logs/davinci.$TODAY.log
-nohup java -Dfile.encoding=UTF-8 -cp $JAVA_HOME/lib/*:$DAVINCI3_HOME/lib/*:davinci-server_3.01-0.3.0-SNAPSHOT.jar edp.DavinciServerApplication > $LOG_PATH  2>&1 &
+nohup java -Dfile.encoding=UTF-8 -cp $JAVA_HOME/lib/*:lib/* edp.DavinciServerApplication > $LOG_PATH  2>&1 &
 
 echo "=========================================="
 echo "Starting..., press \`CRTL + C\` to exit log"

diff --git a/config/application.yml.example b/config/application.yml.example
@@ -41,6 +41,8 @@ source:
   min-idle: 1
   max-wait: 6000
   max-active: 10
+  break-after-acquire-failure: true
+  connection-error-retry-attempts: 3
 
 
 spring:
@@ -95,7 +97,7 @@ spring:
     properties:
       smtp:
         starttls:
-          enable: false
+          enable: true
           required: true
         auth: true
       mail:

diff --git a/...i-ui/d5451b22234691c54bc84522f691f651.svg → ...i-ui/2b30acf9b166780fa3559b91f6896f8a.svg b/...i-ui/d5451b22234691c54bc84522f691f651.svg → ...i-ui/2b30acf9b166780fa3559b91f6896f8a.svg
diff --git a/...i-ui/399a92a93efc679ce6169a00e20be760.ttf → ...i-ui/360a23ab9773513a02861e5a8c0c207c.ttf b/...i-ui/399a92a93efc679ce6169a00e20be760.ttf → ...i-ui/360a23ab9773513a02861e5a8c0c207c.ttf
diff --git a/...i-ui/65e1147825d932152347091396c437bd.eot → ...i-ui/82ff331d7a0d7070bed0ebd83a9b7f74.eot b/...i-ui/65e1147825d932152347091396c437bd.eot → ...i-ui/82ff331d7a0d7070bed0ebd83a9b7f74.eot
diff --git a/davinci-ui/app.875ce217417755c2b420.js → davinci-ui/app.469ae82133661622c661.js b/davinci-ui/app.875ce217417755c2b420.js → davinci-ui/app.469ae82133661622c661.js
diff --git a/davinci-ui/index.html b/davinci-ui/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1"><link rel="manifest" href="manifest.json"><meta name="mobile-web-app-capable" content="yes"><title>Davinci</title><style>.general-loading{width:100%;height:100%;position:absolute;top:0;left:0}.general-loading .dot-container{width:90px;position:absolute;top:50%;left:50%;transform:translate3d(-50%,-50%,0);display:table}.general-loading .dot-container .dot{width:30px;height:30px;display:table-cell;position:relative}.general-loading .dot-container .dot:after{width:26px;height:26px;background-color:#1b98e0;border-radius:50%;position:absolute;top:2px;left:2px;content:''}.general-loading .dot-container .dot:nth-child(1){animation:loading-1 1s linear infinite}.general-loading .dot-container .dot:nth-child(2){transform:scale(.5,.5);animation:loading-2 1s linear infinite}.general-loading .dot-container .dot:nth-child(3){transform:scale(0,0);animation:loading-3 1s linear infinite}@keyframes loading-1{0%{transform:scale(1,1)}50%{transform:scale(0,0)}100%{transform:scale(1,1)}}@keyframes loading-2{0%{transform:scale(.5,.5)}25%{transform:scale(1,1)}50%{transform:scale(.5,.5)}75%{transform:scale(0,0)}100%{transform:scale(.5,.5)}}@keyframes loading-3{0%{transform:scale(0,0)}50%{transform:scale(1,1)}100%{transform:scale(0,0)}}</style></head><body><noscript>如果你看到这条信息，说明<strong> 你的浏览器禁用了 JavaScript </strong>, 请 <strong>取消禁用</strong> 恢复应用程序正常工作。</noscript><div id="app"><div class="general-loading"><div class="dot-container"><div class="dot"></div><div class="dot"></div><div class="dot"></div></div></div></div><script type="text/javascript" src="/app.875ce217417755c2b420.js"></script></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1"><link rel="manifest" href="manifest.json"><meta name="mobile-web-app-capable" content="yes"><title>Davinci</title><style>.general-loading{width:100%;height:100%;position:absolute;top:0;left:0}.general-loading .dot-container{width:90px;position:absolute;top:50%;left:50%;transform:translate3d(-50%,-50%,0);display:table}.general-loading .dot-container .dot{width:30px;height:30px;display:table-cell;position:relative}.general-loading .dot-container .dot:after{width:26px;height:26px;background-color:#1b98e0;border-radius:50%;position:absolute;top:2px;left:2px;content:''}.general-loading .dot-container .dot:nth-child(1){animation:loading-1 1s linear infinite}.general-loading .dot-container .dot:nth-child(2){transform:scale(.5,.5);animation:loading-2 1s linear infinite}.general-loading .dot-container .dot:nth-child(3){transform:scale(0,0);animation:loading-3 1s linear infinite}@keyframes loading-1{0%{transform:scale(1,1)}50%{transform:scale(0,0)}100%{transform:scale(1,1)}}@keyframes loading-2{0%{transform:scale(.5,.5)}25%{transform:scale(1,1)}50%{transform:scale(.5,.5)}75%{transform:scale(0,0)}100%{transform:scale(.5,.5)}}@keyframes loading-3{0%{transform:scale(0,0)}50%{transform:scale(1,1)}100%{transform:scale(0,0)}}</style></head><body><noscript>如果你看到这条信息，说明<strong> 你的浏览器禁用了 JavaScript </strong>, 请 <strong>取消禁用</strong> 恢复应用程序正常工作。</noscript><div id="app"><div class="general-loading"><div class="dot-container"><div class="dot"></div><div class="dot"></div><div class="dot"></div></div></div></div><script type="text/javascript" src="/app.469ae82133661622c661.js"></script></body></html>
diff --git a/davinci-ui/share.38c89c5d4f3c659f4986.js → davinci-ui/share.d06c3c2cc7f19c0f0c62.js b/davinci-ui/share.38c89c5d4f3c659f4986.js → davinci-ui/share.d06c3c2cc7f19c0f0c62.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1"><link rel="manifest" href="manifest.json"><meta name="mobile-web-app-capable" content="yes"><title>Davinci</title><style>.general-loading{width:100%;height:100%;position:absolute;top:0;left:0}.general-loading .dot-container{width:90px;position:absolute;top:50%;left:50%;transform:translate3d(-50%,-50%,0);display:table}.general-loading .dot-container .dot{width:30px;height:30px;display:table-cell;position:relative}.general-loading .dot-container .dot:after{width:26px;height:26px;background-color:#1b98e0;border-radius:50%;position:absolute;top:2px;left:2px;content:''}.general-loading .dot-container .dot:nth-child(1){animation:loading-1 1s linear infinite}.general-loading .dot-container .dot:nth-child(2){transform:scale(.5,.5);animation:loading-2 1s linear infinite}.general-loading .dot-container .dot:nth-child(3){transform:scale(0,0);animation:loading-3 1s linear infinite}@keyframes loading-1{0%{transform:scale(1,1)}50%{transform:scale(0,0)}100%{transform:scale(1,1)}}@keyframes loading-2{0%{transform:scale(.5,.5)}25%{transform:scale(1,1)}50%{transform:scale(.5,.5)}75%{transform:scale(0,0)}100%{transform:scale(.5,.5)}}@keyframes loading-3{0%{transform:scale(0,0)}50%{transform:scale(1,1)}100%{transform:scale(0,0)}}</style></head><body><noscript>如果你看到这条信息，说明<strong> 你的浏览器禁用了 JavaScript </strong>, 请 <strong>取消禁用</strong> 恢复应用程序正常工作。</noscript><div id="app"><div class="general-loading"><div class="dot-container"><div class="dot"></div><div class="dot"></div><div class="dot"></div></div></div></div><script type="text/javascript" src="/app.875ce217417755c2b420.js"></script></body></html>
		<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1"><link rel="manifest" href="manifest.json"><meta name="mobile-web-app-capable" content="yes"><title>Davinci</title><style>.general-loading{width:100%;height:100%;position:absolute;top:0;left:0}.general-loading .dot-container{width:90px;position:absolute;top:50%;left:50%;transform:translate3d(-50%,-50%,0);display:table}.general-loading .dot-container .dot{width:30px;height:30px;display:table-cell;position:relative}.general-loading .dot-container .dot:after{width:26px;height:26px;background-color:#1b98e0;border-radius:50%;position:absolute;top:2px;left:2px;content:''}.general-loading .dot-container .dot:nth-child(1){animation:loading-1 1s linear infinite}.general-loading .dot-container .dot:nth-child(2){transform:scale(.5,.5);animation:loading-2 1s linear infinite}.general-loading .dot-container .dot:nth-child(3){transform:scale(0,0);animation:loading-3 1s linear infinite}@keyframes loading-1{0%{transform:scale(1,1)}50%{transform:scale(0,0)}100%{transform:scale(1,1)}}@keyframes loading-2{0%{transform:scale(.5,.5)}25%{transform:scale(1,1)}50%{transform:scale(.5,.5)}75%{transform:scale(0,0)}100%{transform:scale(.5,.5)}}@keyframes loading-3{0%{transform:scale(0,0)}50%{transform:scale(1,1)}100%{transform:scale(0,0)}}</style></head><body><noscript>如果你看到这条信息，说明<strong> 你的浏览器禁用了 JavaScript </strong>, 请 <strong>取消禁用</strong> 恢复应用程序正常工作。</noscript><div id="app"><div class="general-loading"><div class="dot-container"><div class="dot"></div><div class="dot"></div><div class="dot"></div></div></div></div><script type="text/javascript" src="/app.469ae82133661622c661.js"></script></body></html>