Merge branch 'feature/ci_jenkins' into 'develop'

Merge of feature/ci_jenkins to develop

See merge request o2oa/o2oa!75

Jenkinsfile

@@ -3,8 +3,12 @@ pipeline {
     stages {
         stage('preperation') {
             steps {
-                catchError {
-                    sh 'target/o2server/stop_linux.sh'
+                script {
+                    try {
+                        sh 'target/o2server/stop_linux.sh'
+                    } catch (err) {
+                        echo err
+                    }
                 }
                 sh 'npm install'
                 sh 'npm run preperation:linux'

o2web/gulpconfig.js

@@ -1,11 +1,20 @@
 module.exports = {
+    // "dev": {
+    //     'location': 'E:/o2server/servers/webServer/',
+    //     'host': 'dev.o2oa.net',
+    //     'user': 'xadmin',
+    //     'pass': 'o2No.one',
+    //     "port": 21,
+    //     "remotePath": "/",
+    //     "dest": "dest"
+    // },
     "dev": {
         'location': 'E:/o2server/servers/webServer/',
-        'host': 'dev.o2oa.net',
-        'user': 'xadmin',
-        'pass': 'o2No.one',
-        "port": 21,
-        "remotePath": "/",
+        'host': 'develop.o2oa.net',
+        'user': 'root',
+        'pass': 'zone2019',
+        "port": 22132,
+        "remotePath": "/data/jenkins/workspace/develop/target/o2server/servers/webServer/",
         "dest": "dest"
     },
     "release": {

o2web/source/o2_core/o2/xDesktop/shortcut.js

@@ -45,7 +45,6 @@ MWF.shortcut = {
     }
 };
 
-debugger;
 MWF.shortcut.keyboard = new Keyboard({
     defaultEventType: 'keydown',
     events: {