diff --git a/.drone.yml b/.drone.yml index 5a745da0..6895a496 100644 --- a/.drone.yml +++ b/.drone.yml @@ -40,7 +40,7 @@ pipeline: - cp -rf publish image/docker/webim/webim - echo 'build success' when: - branch: [ dev, online ] + branch: [ dev, release ] dockerize-latest: @@ -80,7 +80,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 @@ -91,7 +91,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 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 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