diff --git a/Jenkinsfile b/Jenkinsfile index 0fd3e07e409269844726b2215de3df6832923789..432a7d224e38dbb29b46128f7b72bbd3c99a1af1 100644 --- a/Jenkinsfile +++ b/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' diff --git a/o2web/gulpconfig.js b/o2web/gulpconfig.js index 68cb187f6d4224d365b467adb6147648914c2e5e..30c1db8854dc3325502c6c47bc9936b711103b2b 100644 --- a/o2web/gulpconfig.js +++ b/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": { diff --git a/o2web/source/o2_core/o2/xDesktop/shortcut.js b/o2web/source/o2_core/o2/xDesktop/shortcut.js index 11d1bba4a5ae6b333a1bd7d019198e80f752d1c6..5196a4110de79adda5d2b9d485e11b8e5904ad6a 100644 --- a/o2web/source/o2_core/o2/xDesktop/shortcut.js +++ b/o2web/source/o2_core/o2/xDesktop/shortcut.js @@ -45,7 +45,6 @@ MWF.shortcut = { } }; -debugger; MWF.shortcut.keyboard = new Keyboard({ defaultEventType: 'keydown', events: {