diff --git a/cim-boot-server/src/main/resources/static/js/cim/cim.web.sdk.js b/cim-boot-server/src/main/resources/static/js/cim/cim.web.sdk.js index e226705..7cac050 100644 --- a/cim-boot-server/src/main/resources/static/js/cim/cim.web.sdk.js +++ b/cim-boot-server/src/main/resources/static/js/cim/cim.web.sdk.js @@ -8,7 +8,6 @@ const CIM_URI = "ws://" + CIM_HOST + ":" + CIM_PORT; const APP_VERSION = "1.0.0"; const APP_CHANNEL = "web"; -const APP_PACKAGE = "com.farsunset.cim"; /* *特殊的消息类型,代表被服务端强制下线 @@ -70,7 +69,6 @@ CIMPushManager.bind = function (account) { body.getDataMap().set("channel", APP_CHANNEL); body.getDataMap().set("appVersion", APP_VERSION); body.getDataMap().set("osVersion", browser.version); - body.getDataMap().set("packageName", APP_PACKAGE); body.getDataMap().set("deviceId", deviceId); body.getDataMap().set("deviceName", browser.name); body.getDataMap().set("language", navigator.language); diff --git a/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushManager.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushManager.java index 7f2af61..137066f 100644 --- a/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushManager.java +++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushManager.java @@ -191,7 +191,6 @@ public class CIMPushManager { sent.put("deviceName", Build.MODEL); sent.put("appVersion", getVersionName(context)); sent.put("osVersion", Build.VERSION.RELEASE); - sent.put("packageName", context.getPackageName()); sent.put("language", getLanguage()); sent.setTimestamp(System.currentTimeMillis()); sendRequest(context, sent); diff --git a/cim-client-sdk/cim-web-sdk/cim.web.sdk.js b/cim-client-sdk/cim-web-sdk/cim.web.sdk.js index e226705..7cac050 100644 --- a/cim-client-sdk/cim-web-sdk/cim.web.sdk.js +++ b/cim-client-sdk/cim-web-sdk/cim.web.sdk.js @@ -8,7 +8,6 @@ const CIM_URI = "ws://" + CIM_HOST + ":" + CIM_PORT; const APP_VERSION = "1.0.0"; const APP_CHANNEL = "web"; -const APP_PACKAGE = "com.farsunset.cim"; /* *特殊的消息类型,代表被服务端强制下线 @@ -70,7 +69,6 @@ CIMPushManager.bind = function (account) { body.getDataMap().set("channel", APP_CHANNEL); body.getDataMap().set("appVersion", APP_VERSION); body.getDataMap().set("osVersion", browser.version); - body.getDataMap().set("packageName", APP_PACKAGE); body.getDataMap().set("deviceId", deviceId); body.getDataMap().set("deviceName", browser.name); body.getDataMap().set("language", navigator.language); diff --git a/cim-use-examples/cim-client-web-json/js/cim/cim.web.sdk.js b/cim-use-examples/cim-client-web-json/js/cim/cim.web.sdk.js index f677e05..5efee02 100644 --- a/cim-use-examples/cim-client-web-json/js/cim/cim.web.sdk.js +++ b/cim-use-examples/cim-client-web-json/js/cim/cim.web.sdk.js @@ -8,7 +8,6 @@ const CIM_URI = "ws://" + CIM_HOST + ":" + CIM_PORT; const APP_VERSION = "1.0.0"; const APP_CHANNEL = "web"; -const APP_PACKAGE = "com.farsunset.cim"; /* *特殊的消息类型,代表被服务端强制下线 @@ -69,7 +68,6 @@ CIMPushManager.bind = function (account) { body.data.uid = account; body.data.channel = APP_CHANNEL; body.data.appVersion = APP_VERSION; - body.data.packageName = APP_PACKAGE; body.data.deviceId = deviceId; body.data.deviceName = browser; diff --git a/cim-use-examples/cim-client-web-protobuf/js/cim/cim.web.sdk.js b/cim-use-examples/cim-client-web-protobuf/js/cim/cim.web.sdk.js index 71b1209..c2ad663 100644 --- a/cim-use-examples/cim-client-web-protobuf/js/cim/cim.web.sdk.js +++ b/cim-use-examples/cim-client-web-protobuf/js/cim/cim.web.sdk.js @@ -8,7 +8,6 @@ const CIM_URI = "ws://" + CIM_HOST + ":" + CIM_PORT; const APP_VERSION = "1.0.0"; const APP_CHANNEL = "web"; -const APP_PACKAGE = "com.farsunset.cim"; /* *特殊的消息类型,代表被服务端强制下线 @@ -70,7 +69,6 @@ CIMPushManager.bind = function (account) { body.getDataMap().set("channel", APP_CHANNEL); body.getDataMap().set("appVersion", APP_VERSION); body.getDataMap().set("osVersion", browser.version); - body.getDataMap().set("packageName", APP_PACKAGE); body.getDataMap().set("deviceId", deviceId); body.getDataMap().set("deviceName", browser.name); body.getDataMap().set("language", navigator.language); diff --git a/cim-use-examples/cim-client-wechat/README.txt b/cim-use-examples/cim-client-wechat/README.txt index 02091ba..0b21dd2 100644 --- a/cim-use-examples/cim-client-wechat/README.txt +++ b/cim-use-examples/cim-client-wechat/README.txt @@ -1,4 +1,8 @@ #微信小程序客户端代码示例 +``` +createWebsocketConnection()中设置当前账号和终端ID +body.data.uid = '10000';//设置你的用户ID +``` 该示例使用json编解码策略,没有使用protobuf,所以服务端需要设置消息编码格式为json diff --git a/cim-use-examples/cim-client-wechat/index.js b/cim-use-examples/cim-client-wechat/index.js index d6d7224..1eff751 100644 --- a/cim-use-examples/cim-client-wechat/index.js +++ b/cim-use-examples/cim-client-wechat/index.js @@ -59,7 +59,7 @@ let self; body.data = {}; body.data.uid = '10000';//设置你的用户ID body.data.channel = 'wechat'; - body.data.deviceId = '这里自己创建一个保存到本地的UUID'; + body.data.deviceId = getDeivceId(); body.data.appVersion = '1.0.0'; body.data.osVersion = wx.getSystemInfoSync().version; body.data.deviceName = wx.getSystemInfoSync().platform; @@ -115,6 +115,24 @@ let self; if(websocketTask != null && websocketTask != undefined){ websocketTask.close({code:1000,reason:"FINISH"}); } - } + }, + + getDeivceId() { + let deviceId = wx.getStorageSync('x-device-id'); + if(deviceId != undefined && deviceId != ''){ + return deviceId; + } + + let d = new Date().getTime(); + let uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) { + let r = (d + Math.random() * 16) % 16 | 0; + d = Math.floor(d / 16); + return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16); + }); + + let newDeviceId = uuid.replace(/-/g, ''); + wx.setStorageSync('x-device-id', newDeviceId); + return newDeviceId; + } }) \ No newline at end of file