From 464219b2062eda17c36a59e97eff438a8298ffe0 Mon Sep 17 00:00:00 2001 From: wk3368 Date: Fri, 2 Jun 2017 19:28:41 +0800 Subject: [PATCH 1/6] release 1.4.11 --- release.log | 1 + 1 file changed, 1 insertion(+) create mode 100644 release.log diff --git a/release.log b/release.log new file mode 100644 index 00000000..009e668d --- /dev/null +++ b/release.log @@ -0,0 +1 @@ +1.4.11 \ No newline at end of file From 7003000271663a755941bd2fe1defe7b580a2819 Mon Sep 17 00:00:00 2001 From: wk3368 Date: Fri, 2 Jun 2017 19:30:25 +0800 Subject: [PATCH 2/6] release branch --- .drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3fae9209..fee248e0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -39,7 +39,7 @@ pipeline: - cp -rf publish image/docker/webim/webim - echo 'build success' when: - branch: [ dev, online ] + branch: [ dev, release ] dockerize-latest: @@ -79,7 +79,7 @@ pipeline: dockerfile: image/docker/webim/Dockerfile context: image/docker/webim/ when: - branch: online + branch: release deploy-online: image: docker-registry-cn.easemob.com/kubernetes/im/webim-online:latest @@ -90,7 +90,7 @@ pipeline: secrets: [ ssh_key, jumpserver_host, jumpserver_port, online_host ] debug: true when: - branch: online + branch: release rollback-online: image: docker-registry-cn.easemob.com/kubernetes/im/webim-rollback:latest From 5c11c37f0755c960efabb922bf6a86aea3155490 Mon Sep 17 00:00:00 2001 From: wk3368 Date: Fri, 2 Jun 2017 20:28:41 +0800 Subject: [PATCH 3/6] release 1.4.11 --- .drone.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index fee248e0..a99975c3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,7 @@ pipeline: - node_modules - tag volumes: - - /data/apps/opt/web-im/${DRONE_BRANCH}:/cache + - /data/apps/opt/web-im:/cache build: image: node:7.8 @@ -109,14 +109,15 @@ pipeline: - node_modules - tag volumes: - - /data/apps/opt/web-im/${DRONE_BRANCH}:/cache + - /data/apps/opt/web-im:/cache notify: image: drillster/drone-email - from: acolyte@easemob.com - host: smtp.exmail.qq.com - port: 25 - username: acolyte@easemob.com - password: 'Easemob536^@#' + from: ${NOTIFY_USERNAME} + host: ${NOTIFY_HOST} + port: ${NOTIFY_PORT} + username: ${NOTIFY_USERNAME} + password: ${NOTIFY_PASSWORD} + secrets: [ notify_host, notify_port, notify_username, notify_password ] when: status: [ failure, success ] \ No newline at end of file From 7042294ea00b3152fb688ecab90f55db1d33ce20 Mon Sep 17 00:00:00 2001 From: wk3368 Date: Fri, 2 Jun 2017 21:08:48 +0800 Subject: [PATCH 4/6] notify ok --- .drone.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index a99975c3..6ca0aa9b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -113,11 +113,7 @@ pipeline: notify: image: drillster/drone-email - from: ${NOTIFY_USERNAME} - host: ${NOTIFY_HOST} - port: ${NOTIFY_PORT} - username: ${NOTIFY_USERNAME} - password: ${NOTIFY_PASSWORD} - secrets: [ notify_host, notify_port, notify_username, notify_password ] + port: 25 + secrets: [ plugin_host, plugin_from, plugin_username, plugin_password ] when: status: [ failure, success ] \ No newline at end of file From 4228aaf2ed10697cf537d1bce2f9c0b98804592b Mon Sep 17 00:00:00 2001 From: clock <18209263592@163.com> Date: Wed, 9 Aug 2017 12:03:11 +0800 Subject: [PATCH 5/6] =?UTF-8?q?conflict=E6=97=B6=E6=AD=A3=E5=B8=B8?= =?UTF-8?q?=E9=87=8A=E6=94=BE=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sdk/src/connection.js | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/src/connection.js b/sdk/src/connection.js index a1709c07..9464cfcc 100755 --- a/sdk/src/connection.js +++ b/sdk/src/connection.js @@ -395,6 +395,7 @@ var _loginCallback = function (status, msg, conn) { if (msg === 'conflict') { conflict = true; + conn.close(); } if (status == Strophe.Status.CONNFAIL) { From 213a42758da9fbcdbd1043b0d5b3ea45a2e1da11 Mon Sep 17 00:00:00 2001 From: jasminehou Date: Tue, 9 Jan 2018 16:30:43 +0800 Subject: [PATCH 6/6] CLOUD-7799 --- sdk/src/connection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/src/connection.js b/sdk/src/connection.js index 9464cfcc..a08fb025 100755 --- a/sdk/src/connection.js +++ b/sdk/src/connection.js @@ -1670,7 +1670,7 @@ connection.prototype.handleMessage = function (msginfo) { receiveMsg = decryptedStr; } var emojibody = _utils.parseTextMessage(receiveMsg, WebIM.Emoji); - if (emojibody.isemoji) { + if (emojibody && emojibody.isemoji) { var msg = { id: id , type: chattype