Merge branch 'develop' into 'master'

Develop

See merge request o2oa/o2oa!80

.gitignore

@@ -154,3 +154,5 @@ typings/
 .factorypath
 /o2server/commons/
 /o2server/jvm/
+/o2web/ftpconfig.js
+/o2web/gulpconfig.js

Jenkinsfile

@@ -1,16 +1,24 @@
 pipeline {
     agent {label '132'}
     stages {
-        stage('preperation') {
+        stage('Stop Server') {
             steps {
-                catchError {
+                catchError(buildResult: 'SUCCESS') {
                     sh 'target/o2server/stop_linux.sh'
                 }
+            }
+        }
+        stage('init') {
+            steps {
                 sh 'npm install'
-                sh 'npm run preperation:linux'
                 sh 'npm run clear'
             }
         }
+        stage('dependency') {
+            steps {
+                sh 'npm run preperation:linux'
+            }
+        }
         stage('build') {
             parallel {
                 stage('build server') {

o2web/.gitignore

@@ -9,5 +9,7 @@ npm-debug.log
 **/*.min.js
 package-lock.json
 /.svn/
+/ftpconfig.js
+/gulpconfig.js
 ftpconfig.js
-gulpconfig.js
+gulpconfig.js