From c9e0d15bd189348adb073ae1793ebf8c46678491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BF=9C=E6=96=B9=E5=A4=95=E9=98=B3?= Date: Tue, 8 Jun 2021 10:52:01 +0800 Subject: [PATCH 1/6] update cim-use-examples/cim-client-web/index.html. --- cim-use-examples/cim-client-web/index.html | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/cim-use-examples/cim-client-web/index.html b/cim-use-examples/cim-client-web/index.html index c13bbb1..692ca78 100644 --- a/cim-use-examples/cim-client-web/index.html +++ b/cim-use-examples/cim-client-web/index.html @@ -3,16 +3,16 @@ CIM Webclient - - - - - - - - - - + + + + + + + + + + @@ -125,7 +125,7 @@
- +
请输入一个帐号用于登录，随后接收推送消息
From 6baf846b4c5ee21b9ea8eecd641b7309cafd4f35 Mon Sep 17 00:00:00 2001 From: xiajun Date: Thu, 17 Jun 2021 20:10:47 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=BB=BA=E7=AB=8B=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E6=97=B6=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7=E7=AB=AFlanguage?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cim-boot-server/cim-boot-server.iml | 1 + cim-boot-server/cim-boot-server.iws | 37 ++++++++++++++++-- .../libs/cim-server-sdk-netty-4.0.0.jar | Bin 79151 -> 79180 bytes .../cim/component/handler/BindHandler.java | 2 + .../com/farsunset/cim/entity/Session.java | 14 +++++++ .../main/resources/i18n/messages.properties | 1 + .../page/console/session/manage.html | 16 ++++---- .../src/main/resources/static/css/common.css | 2 +- .../resources/static/js/cim/cim.web.sdk.js | 1 + .../android/cim-android-sdk-4.0.0.jar | Bin 75368 -> 75622 bytes cim-client-sdk-libs/js/cim.web.sdk.js | 1 + .../cim-android-sdk/cim-android-sdk.iml | 0 .../cim/sdk/android/CIMPushManager.java | 9 +++++ .../cim/sdk/server/constant/ChannelAttr.java | 1 + .../app/libs/cim-android-sdk-4.0.0.jar | Bin 75368 -> 75622 bytes .../cim-client-vue/websocket/cim.web.sdk.js | 1 + 16 files changed, 75 insertions(+), 11 deletions(-) mode change 100755 => 100644 cim-client-sdk/cim-android-sdk/cim-android-sdk.iml diff --git a/cim-boot-server/cim-boot-server.iml b/cim-boot-server/cim-boot-server.iml index 6d0ab4a..e9a3876 100644 --- a/cim-boot-server/cim-boot-server.iml +++ b/cim-boot-server/cim-boot-server.iml @@ -18,6 +18,7 @@ + diff --git a/cim-boot-server/cim-boot-server.iws b/cim-boot-server/cim-boot-server.iws index 6c69322..e4dad74 100644 --- a/cim-boot-server/cim-boot-server.iws +++ b/cim-boot-server/cim-boot-server.iws @@ -9,10 +9,15 @@ - - - + + + + + + + + + + + @@ -149,12 +168,24 @@ + + + + diff --git a/cim-boot-server/libs/cim-server-sdk-netty-4.0.0.jar b/cim-boot-server/libs/cim-server-sdk-netty-4.0.0.jar index 5ccdbd3f337ac3d49fb095d3665e46ed58bc4cb2..150677e36e3c6d8a512a27076690da506d14ced1 100644 GIT binary patch delta 3261 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 LLQar1st)RRy&C*F diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/component/handler/BindHandler.java b/cim-boot-server/src/main/java/com/farsunset/cim/component/handler/BindHandler.java index bbfd8f6..977ddee 100644 --- a/cim-boot-server/src/main/java/com/farsunset/cim/component/handler/BindHandler.java +++ b/cim-boot-server/src/main/java/com/farsunset/cim/component/handler/BindHandler.java @@ -67,10 +67,12 @@ public class BindHandler implements CIMRequestHandler { session.setDeviceName(body.get("deviceName")); session.setAppVersion(body.get("appVersion")); session.setOsVersion(body.get("osVersion")); + session.setLanguage(body.get("language")); channel.attr(ChannelAttr.UID).set(uid); channel.attr(ChannelAttr.CHANNEL).set(session.getChannel()); channel.attr(ChannelAttr.DEVICE_ID).set(session.getDeviceId()); + channel.attr(ChannelAttr.LANGUAGE).set(session.getLanguage()); /* *存储到数据库 diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/entity/Session.java b/cim-boot-server/src/main/java/com/farsunset/cim/entity/Session.java index 49eb598..ed09032 100644 --- a/cim-boot-server/src/main/java/com/farsunset/cim/entity/Session.java +++ b/cim-boot-server/src/main/java/com/farsunset/cim/entity/Session.java @@ -97,6 +97,12 @@ public class Session implements Serializable { @Column(name = "os_version") private String osVersion; + /** + * 终端语言 + */ + @Column(name = "language") + private String language; + /** * 登录时间 */ @@ -230,6 +236,14 @@ public class Session implements Serializable { this.location = location; } + public String getLanguage() { + return language; + } + + public void setLanguage(String language) { + this.language = language; + } + public int getState() { return state; } diff --git a/cim-boot-server/src/main/resources/i18n/messages.properties b/cim-boot-server/src/main/resources/i18n/messages.properties index b2d4192..8d7892d 100644 --- a/cim-boot-server/src/main/resources/i18n/messages.properties +++ b/cim-boot-server/src/main/resources/i18n/messages.properties @@ -32,6 +32,7 @@ module.common.headlogo = 头像 module.common.homepage = 主页 module.common.website = 网址 module.common.text = 文字 +module.common.language = 语言 module.global.error.500.hint = 服务程序发生内部错误 module.global.error.400.hint = 请求参数类型不正确 diff --git a/cim-boot-server/src/main/resources/page/console/session/manage.html b/cim-boot-server/src/main/resources/page/console/session/manage.html index 549df67..584357e 100644 --- a/cim-boot-server/src/main/resources/page/console/session/manage.html +++ b/cim-boot-server/src/main/resources/page/console/session/manage.html @@ -48,13 +48,14 @@ function doSendMessage(){ - - - - - - - + + + + + + + + @@ -69,6 +70,7 @@ function doSendMessage(){ + diff --git a/cim-boot-server/src/main/resources/static/css/common.css b/cim-boot-server/src/main/resources/static/css/common.css index 2e70f3c..28ad0ff 100644 --- a/cim-boot-server/src/main/resources/static/css/common.css +++ b/cim-boot-server/src/main/resources/static/css/common.css @@ -1 +1 @@ -@CHARSET "UTF-8";html,body{height:100%;font-family:微软雅黑;background:url(/image/pattern.png) repeat,linear-gradient(#e1e4e7,#f3f4f5);}.header{position:fixed;height:100px;background:#2b345d;width:100%;z-index:999;line-height:100px;-webkit-box-shadow:0 0 12px 0 #0d1e33;box-shadow:0 0 12px 0 #0d1e33;}.header_liner{position:fixed;height:5px;top:95px;width:100%;z-index:998;background:linear-gradient(to right,#ff4444,#99cc00,#33b5e5,#aa66cc,#ffbb33);}#mainWrapper{width:auto;margin-left:180px;min-height:600px;padding-bottom:50px;padding-top:100px;}ul,ol{margin:0;padding:0;list-style:none;}.tip_blue{zoom:1;background:#3391D7;color:#FFFFFF;text-align:center;line-height:50px;height:50px;font-family:楷体;min-width:300px;position:absolute;z-index:9999;font-size:16px;font-weight:bold;padding:0 15px;border-radius:3px;border:1px solid rgba(0,0,0,.2);-webkit-box-shadow:0 3px 9px rgba(0,0,0,.4);box-shadow:0 3px 5px rgba(0,0,0,.4);}.tip_red{zoom:1;background:#DF3D3D;color:#FFFFFF;text-align:center;font-family:楷体;line-height:50px;height:50px;min-width:300px;position:absolute;z-index:9999;font-size:16px;font-weight:bold;padding:0 15px;border-radius:3px;border:1px solid rgba(0,0,0,.2);-webkit-box-shadow:0 3px 9px rgba(0,0,0,.4);box-shadow:0 3px 5px rgba(0,0,0,.4);}.tip_green{zoom:1;background:#54ad18;color:#ffffff;text-align:center;font-family:楷体;line-height:50px;height:50px;min-width:300px;position:absolute;z-index:9999;font-size:16px;font-weight:bold;padding:0 15px;border-radius:3px;border:1px solid rgba(0,0,0,.2);-webkit-box-shadow:0 3px 9px rgba(0,0,0,.4);box-shadow:0 3px 5px rgba(0,0,0,.4);}.tip_process{zoom:1;color:#394A5E;text-align:center;line-height:50px;height:50px;font-family:楷体;background-color:white;min-width:300px;position:absolute;z-index:9999;border-radius:4px;border:1px solid rgba(0,0,0,.2);-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5);}.icon_loading_small{background:url(/image/icon_loading_small.gif) no-repeat;width:22px;height:22px;left:20px;top:15px;position:absolute;}.form-group label{width:70px;text-align:right;}.lay-main-toolbar{height:60px;border-radius:0px;border-right:1px solid #B5BBBF;border-bottom:#c8c8c8 solid 1px;background:white;box-shadow:rgba(0,0,0,0.15) 0px 1px 8px;position:relative;width:100%;padding:8px;}.nav-menu-divider{box-shadow:#e9eaeb 0px 1px 0px;border-bottom:#c4c6c7 solid 1px;}.btn i{font-size:17px;margin-right:2px;font-weight:bold;font-style:normal;line-height:17px;}.modal-dialog{margin:150px auto;}.dialog_close:hover,.dialog_close:focus{opacity:.6;filter:alpha(opacity=60);}.gdialog .modal-header{cursor:move;}.ui-vnav{position:fixed;top:100px;left:0;width:180px;min-height:560px;height:960px;_overflow:hidden;background:#ffffff;z-index:88;box-shadow:1px 0 4px rgba(0,0,0,.3);}.ui-vnav .ui-bar{height:20px;overflow:hidden;}.ui-vnav .ui-bd{display:block;margin:9px 0;width:100%;height:0px;line-height:0px;border-top:1px solid #afb1b2;border-bottom:1px solid #eaeaea;}.ui-vnav .ui-item{height:45px;line-height:45px;padding:0 10px;text-align:center;cursor:pointer;border-bottom:1px #e4e5e6 solid;}.ui-vnav .ui-item:hover{color:white;background-color:#F3F3F3;}.ui-vnav .current,.ui-vnav .current:hover{background-color:#FFFFFF;border-left:6px #44b549 solid;padding-left:4px;}.ui-vnav .ui-item a{position:relative;display:block;height:45px;line-height:45px;font-size:16px;color:#666;text-decoration:none;}.ui-vnav .ui-shd{position:absolute;right:0;top:0;width:4px;height:100%;overflow:hidden;border-right:1px solid #b5b5b6;background-image:-webkit-linear-gradient(left,transparent,rgba(0,0,0,.1));background-image:-moz-linear-gradient(left,transparent,rgba(0,0,0,.1));background-image:-o-linear-gradient(left,transparent,rgba(0,0,0,.1));background-image:linear-gradient(top right,transparent,#c9cacb);filter:progid:DXImageTransform.Microsoft.gradient(startColorStr='#00DBDCDD',EndColorStr='#B5B5B6',gradientType=1);}.utable{border-collapse:collapse;border-spacing:0;text-align:center;font-size:12px;background:#ffffff;word-break:break-all;table-layout:fixed;margin-right:10px;}.utable tr th{background-color:#eff1f9;border-right:solid 1px #D4D4D4;border-left:solid 1px #D4D4D4;border-bottom:solid 1px #D4D4D4;color:#463E5E;line-height:40px;font-size:14px;text-align:center;}.utable tr:hover{background-color:#f5f6f9;}.utable tr td{border-right:solid 1px #D4D4D4;border-bottom:solid 1px #D4D4D4;color:#666;max-height:80px;line-height:35px;height:35px;padding-left:5px;padding-right:5px;word-break:keep-all;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}.datarecord{text-align:center;line-height:30px;background-color:#14A7D5;margin-right:10px;}.input-pagenumber{width:50px;display:inline;height:31px;margin-left:20px;border-top-left-radius:4px;border-bottom-left-radius:4px;border-top-right-radius:0px;border-bottom-right-radius:0px;}textarea{resize:none;}.modal-header{border-bottom:#c8c8c8 solid 1px;box-shadow:rgba(0,0,0,0.15) 0px 1px 8px;height:50px;}.modal-open .modal{overflow-y:hidden;}.btn:focus,button:focus{outline:none;}.bar-button{color:#222222;background-color:#ffffff;border-color:#7d7d7d;}.input-required{border-color:#e91e63;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(204,42,79,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(204,42,79,.6);} \ No newline at end of file +@CHARSET "UTF-8";html,body{height:100%;font-family:微软雅黑;background:url(/image/pattern.png) repeat,linear-gradient(#e1e4e7,#f3f4f5);}.header{position:fixed;height:100px;background:#2b345d;width:100%;z-index:999;line-height:100px;-webkit-box-shadow:0 0 12px 0 #0d1e33;box-shadow:0 0 12px 0 #0d1e33;}.header_liner{position:fixed;height:5px;top:95px;width:100%;z-index:998;background:linear-gradient(to right,#ff4444,#99cc00,#33b5e5,#aa66cc,#ffbb33);}#mainWrapper{width:auto;margin-left:180px;min-height:600px;padding-bottom:50px;padding-top:100px;}ul,ol{margin:0;padding:0;list-style:none;}.tip_blue{zoom:1;background:#3391D7;color:#FFFFFF;text-align:center;line-height:50px;height:50px;font-family:楷体;min-width:300px;position:absolute;z-index:9999;font-size:16px;font-weight:bold;padding:0 15px;border-radius:3px;border:1px solid rgba(0,0,0,.2);-webkit-box-shadow:0 3px 9px rgba(0,0,0,.4);box-shadow:0 3px 5px rgba(0,0,0,.4);}.tip_red{zoom:1;background:#DF3D3D;color:#FFFFFF;text-align:center;font-family:楷体;line-height:50px;height:50px;min-width:300px;position:absolute;z-index:9999;font-size:16px;font-weight:bold;padding:0 15px;border-radius:3px;border:1px solid rgba(0,0,0,.2);-webkit-box-shadow:0 3px 9px rgba(0,0,0,.4);box-shadow:0 3px 5px rgba(0,0,0,.4);}.tip_green{zoom:1;background:#54ad18;color:#ffffff;text-align:center;font-family:楷体;line-height:50px;height:50px;min-width:300px;position:absolute;z-index:9999;font-size:16px;font-weight:bold;padding:0 15px;border-radius:3px;border:1px solid rgba(0,0,0,.2);-webkit-box-shadow:0 3px 9px rgba(0,0,0,.4);box-shadow:0 3px 5px rgba(0,0,0,.4);}.tip_process{zoom:1;color:#394A5E;text-align:center;line-height:50px;height:50px;font-family:楷体;background-color:white;min-width:300px;position:absolute;z-index:9999;border-radius:4px;border:1px solid rgba(0,0,0,.2);-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5);}.icon_loading_small{background:url(/image/icon_loading_small.gif) no-repeat;width:22px;height:22px;left:20px;top:15px;position:absolute;}.form-group label{width:70px;text-align:right;}.lay-main-toolbar{height:60px;border-radius:0px;border-right:1px solid #B5BBBF;border-bottom:#c8c8c8 solid 1px;background:white;box-shadow:rgba(0,0,0,0.15) 0px 1px 8px;position:relative;width:100%;padding:8px;}.nav-menu-divider{box-shadow:#e9eaeb 0px 1px 0px;border-bottom:#c4c6c7 solid 1px;}.btn i{font-size:17px;margin-right:2px;font-weight:bold;font-style:normal;line-height:17px;}.modal-dialog{margin:150px auto;}.dialog_close:hover,.dialog_close:focus{opacity:.6;filter:alpha(opacity=60);}.gdialog .modal-header{cursor:move;}.ui-vnav{position:fixed;top:100px;left:0;width:180px;min-height:560px;height:100%;_overflow:hidden;background:#ffffff;z-index:88;box-shadow:1px 0 4px rgba(0,0,0,.3);}.ui-vnav .ui-bar{height:20px;overflow:hidden;}.ui-vnav .ui-bd{display:block;margin:9px 0;width:100%;height:0px;line-height:0px;border-top:1px solid #afb1b2;border-bottom:1px solid #eaeaea;}.ui-vnav .ui-item{height:45px;line-height:45px;padding:0 10px;text-align:center;cursor:pointer;border-bottom:1px #e4e5e6 solid;}.ui-vnav .ui-item:hover{color:white;background-color:#F3F3F3;}.ui-vnav .current,.ui-vnav .current:hover{background-color:#FFFFFF;border-left:6px #44b549 solid;padding-left:4px;}.ui-vnav .ui-item a{position:relative;display:block;height:45px;line-height:45px;font-size:16px;color:#666;text-decoration:none;}.ui-vnav .ui-shd{position:absolute;right:0;top:0;width:4px;height:100%;overflow:hidden;border-right:1px solid #b5b5b6;background-image:-webkit-linear-gradient(left,transparent,rgba(0,0,0,.1));background-image:-moz-linear-gradient(left,transparent,rgba(0,0,0,.1));background-image:-o-linear-gradient(left,transparent,rgba(0,0,0,.1));background-image:linear-gradient(top right,transparent,#c9cacb);filter:progid:DXImageTransform.Microsoft.gradient(startColorStr='#00DBDCDD',EndColorStr='#B5B5B6',gradientType=1);}.utable{border-collapse:collapse;border-spacing:0;text-align:center;font-size:12px;background:#ffffff;word-break:break-all;table-layout:fixed;margin-right:10px;}.utable tr th{background-color:#eff1f9;border-right:solid 1px #D4D4D4;border-left:solid 1px #D4D4D4;border-bottom:solid 1px #D4D4D4;color:#463E5E;line-height:40px;font-size:14px;text-align:center;}.utable tr:hover{background-color:#f5f6f9;}.utable tr td{border-right:solid 1px #D4D4D4;border-bottom:solid 1px #D4D4D4;color:#666;max-height:80px;line-height:35px;height:35px;padding-left:5px;padding-right:5px;word-break:keep-all;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}.datarecord{text-align:center;line-height:30px;background-color:#14A7D5;margin-right:10px;}.input-pagenumber{width:50px;display:inline;height:31px;margin-left:20px;border-top-left-radius:4px;border-bottom-left-radius:4px;border-top-right-radius:0px;border-bottom-right-radius:0px;}textarea{resize:none;}.modal-header{border-bottom:#c8c8c8 solid 1px;box-shadow:rgba(0,0,0,0.15) 0px 1px 8px;height:50px;}.modal-open .modal{overflow-y:hidden;}.btn:focus,button:focus{outline:none;}.bar-button{color:#222222;background-color:#ffffff;border-color:#7d7d7d;}.input-required{border-color:#e91e63;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(204,42,79,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(204,42,79,.6);} \ No newline at end of file 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 52c9f8d..86411e6 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 @@ -63,6 +63,7 @@ CIMPushManager.bind = function (account) { body.getDataMap().set("packageName", APP_PACKAGE); body.getDataMap().set("deviceId", deviceId); body.getDataMap().set("deviceName", browser.name); + body.getDataMap().set("language", navigator.language); CIMPushManager.sendRequest(body); }; diff --git a/cim-client-sdk-libs/android/cim-android-sdk-4.0.0.jar b/cim-client-sdk-libs/android/cim-android-sdk-4.0.0.jar index acd0649d691365ca537eb1496092c0b407fce7db..171b4dfab2bdad8f1b74cfecf7bfbad652033ae7 100644 GIT binary patch delta 6968 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 bv^D-5xHw&ULR1A%Ulib`pl5*gEA0OOnqM^q delta 6764 zcmaJ_2{=^k+nUy77{$u3JGTiGl7q(qdl44p`nrR>p^8gH^>iR=oM zWG96|g%mwa`t)Xk|)CMUNnTt`??cFp4rJ z6{gvo^!mjMXj#?|R?niTY~)c}P8I3Wno;9@E0VE1H-BYO%x(i4xObYmqc@ZoH? zs92$a%>tlsvzY>cNTx<0%yG5dlDOYpw0JA-&lIqOF5d?LM&Re)h6Mrw88q+!FW$0i z5+RiYz}%Y7#5;VULm>8ZA`m(_Axcq@njPT7TgiNa=@+Kflwd~Eet4g{v!a}Fh+a@m`L+t82!Za4#e4;5+@jc0IwJI z98TAZBehQ}%e&u0$q5hXV!+$aRF_i`w(pNP?oyn%%;7KdjydTf{zXr-BDY z4TIG1fVZ_Aw!yt@C&GfiI_M~2Mjc&m0VdMK;+;H&Mi~)^4+1#r22ou4R~j%-7+}O? zJJH3sT!`J-KBci@92deT7J}638JG+9lJGak<^Lr1%B0fp#)(%)aRcQkzdRd_k}|w- zHHV!Xs%@6>S8T9@p;>ZNbGhd~1J}=9QS4=G*QleAQ{#OaMw(~{(*Eh`Ylqgyo1Dv-NcifznVX&hX=8KYM{ zO^3GZn)FePv3M~b>zLd)Ox%Z7do}rSbE4zp;-;2Hq)A6HR-tPW4FA=DRd_Y2w@?#4 zHub`RXcze-U~To>)@EX2(2p9%fCSKNbKg9kDapuPR6{#Uz5J@E zh(XanaB;i-b0e{9%^6-8ZuF~S7Lr;Kl| zy(n{>>c9KaD#aur>Xg@CB@agmxJ((15;LulsS=4rG)0r?u??Zcdha;>f{P2^#`Kmo z8~#dfTC1phX7}9aPFcW6=|zbXToPO|r|ieCTh3!|wM~9qt&~!f^%{IT5I&F@<}+|S z|B(qrv}ev?`3PZGS@U_*(;7E1wV};}o1Gq-dTz3g(}$G!^W@E$iq}8U;g5ZJY$jBo zrtBT>;ZPZx65y@u&XhR&({`)Lv*<`kf^+-0L@46}n}?l;laFd2zas1|Y!VH2PhHPe zELxOgtXrsS5OEc8vhcBBD!$LB>R?mmc=FQ2qif&0_NBJzieEVqs7ceN7>Q}flfS{t zkuqmkd*Jqcd;*Vqn!J7VYRbc`whAP+Q>C^$G)vi3j6$~mhVi`e>EWJ`Q>U;gqamjG z&WEdBtT_%nYCAr4z&uX({PC+SFDAcI`DM)x9k(%32j^!NQr~)H`b6)azVF8qG|DKsb3Oow{C+yyamOB*pvADEdVc17dWJyU&@GP4N z_DtWFa4;&=4rX0O`aTE}h|lND8bWglQh2`K-!Q%4e|5<-DV~OSM+8&yqs@C&xz%Ez zO;%2AY*tp4#aP@R>GgJX)X&Ln7Sj`E9!rH)k`)EdI6Yc<3thf)MaV5oT!e66BR9ZovJHJ1A_hn-yo=G@s99op??$&m1%n|Lh+i9+2UXl5o5` zH*r+tQsPs`6P^>U5o*?9-J}4j=I4gC^fw)yRSdd2gOT-}vN1RzZu!{kZM^6T&s1p074d47Rv;u>sG4JhYsxtU zZCXm@{_XHXn#?;%49{+>UvpzU-(7b{z?cbNs}!uK+imMTp*tW^Q+7LF%J;@(U%CC3>U9x7F{>*X+M9`}>cdVbdSpygmZl0g{be;_EZW&wQ{ zzb54AsgDXTPT+do`Yn+wv-HHU`n3Ak6XT|-eFrHjUuGQV4l6&?N&mdAx&Bg(g0NP% z?ITN6)=9_fT%NWknt9AdE(^7{GA61^bH4L;QVjXU@y6w`oLQE{mrcER~DC5vr1w<>Ax)BHcpKHU_9_dT-r6eX}sEX zzO-Whit?uikJgkwRjQ8n*#}vDi(GPL%r#nh9ZtB^d~SZIUd8wHF?nfRaoXka!$JY~ z*5}{8dUv)EO)wqSQkzp!lmwn7NM_akF20W){EJ8JiRKY(o;2rBN&uRG;c;)c*Sobo z<(hUfJbC@y^oa0wj=%9mD>J1% zDd#>%46FUVr=GRa*>MCcRwE7(BD!R`R^iWYy(IqRg52{br3Y4*hr{@D=P@C5b>Qd2ex zbR*Bw){RGEbmngaJWpPCIkArE$twu&*&rsSyNkul5s)*t7%6ipnGIrW&{9Og3AyDK zwt~c1gu)?fDci$u3BSZ5HfdV_ny>l7@5{Rqub6aiITcTgQJQe?^_H6$QR{8yCH~Bv z>qioKzX!DOISaIP6#`ALf>5W zmeW*?)^MBjy)o~M`sm`X#PoIZy_QdHU}Z<6Tj#s!m;NHd76})vyEKiQg7j&y$X};S z^5qUzm20~M^ST*Z$T?ONJ7SE+F_+$>$5$kRi~}&K8`=4c{5y#s@C#hickmtDXNt8s zUp9-2^;7q0Cm%dCy>8?gf!ZooZ{*fWHb}1ymbz_aQr9e94vWf5lDLTcu9?9oJy z4y8)@U)0gJUx*oQBMpK)*7@qXPX?q`TDlfovY@HTShu%Zo3eN|E_4Aj2)ynyQ#Rbh zC;!YvQ|3rR>0CrzsW*kXdHsFKK|ju=Vd*9N!5i3f74=fZ%nf(DT0^~-W7ytfb+0dl z-?@!nSX^CM%s--EZ@F<8vk|F5Xt-n>RMhNd%vt|oR`<4D_3enFsq&$L@dP!QjY!is zf-kUv0ep3jsDGE3`j0mBb3G7G9ZCNfVEoAfObp<2(@d4uIQDhic{cc+;+947xDIjk zvCAd(KFaUi>j>Uqra5+&yY|vGnZg&+7wqHQS0-pYQnxIUB9Fd7pPDhs&kwTuhtE3kSzWH6z&~}y z&IR|#R=avUkSU`g21dR7z}Jve*a+r)cPn4hog4ibtnorUf%$-OY&yplivcli?mM%x zn%>02Po3rFmYVsmv8?X!$hGuCU3nALJz>KzuGlE3?zTwuodgn$UNgyvi@2sBum6b zLh7B+D!Oacb#O;_XoA`CVBFQSn;E8wOIU`_uAQq5cEgkwj1Ro=8hm^%H+%Ah(tOH3 zD;%2!t6SVUPs>*=S79{A#k>@lYp?&D3tkZF4q}O$E-carf3^nRYa2<`9Kkqj{D}Ql zy)i=A{#ifr(Y+xK^%2={eu_0)amYkLCq_-B?=n&44MlskAjV@yWs`0@FV%x-Wdbs-{+n$)l^jcU_hhaPb>sxk+-VuW5GffH$~WLWj-Ed+o8R_i>v=lQ za+BVa%d3Vn5(ONC?WYQJ5U(&t_2j<4___0c4F_68QX!CrfAzj-_ZAs4HMM)ww4XJm zhA)lxl%^}Gp>Du3B@V+T0mdN#2K>Zl&Rwe?OJ3CQ9rNT@=(0&_C!F1&+P!R2d~JH{ z&5A(SNbFrUp;wj7bF7rfg=wG^Js=Ga?CAk@c#uI49HXrCIQL|X9tfwPBi&X}^v#B6 zK_^DQ2y^_rWsj+xiL9}?^|5kWqPeVT&$JCwr=(r5tfb8W6}tmUH59^vFErGtUMech zNSn$@_jdQ;RR@&&l_yLTx)kJyX0_(MeQ!)nWu@hNWGv(+O=P7z%}mYY0b{SZMe(^3 zwppKh3mo^o!T_ij15mJ0{^|2T{S{Dv2~Z?&_JFQTfT{rLn*Y!C3)P<=EQqB;9bhdJ zfclRS6PeK`8~~s|S#f|~@ZV@iGDCI%$4bE_`%iZNcHkg$I6`vZ0wb6K20>Ci|0tmW z|DPWuqLCy^!T%RpjLhLN>;ST`0I2`4mLRj-Bw5OUfh+*rjsl}u0A4@`Jj4pMaY$_` zu#pAWPg+4>4@rZ8H8`t42IhYyy6f3N(ksI;8|N;$GeGN$3JR$9Cnf?>98X7y6XF)Z zEp@Pf9jpKnMjvAZcq#nZND7b-2?)SKT_hx=<%WcoU^%p|NedVxkc29Hq>7LdqyhU; z039xt4+U27K$Rrbe6s9YWfc^13;G@;3(dy=FF#j)S}+#12Ynp{L9+{xnef6vmr0s3 zahP|(1`DXm28h55XZXE)tUA<0(u8)P3R$Q?@FE*v0P`X1vXL2WO5<2%^!`pxksXSo zr-~cUQpKgJB4z$AGU*^lvtiRiWBz&p`36K3_$?e7`>*J9@Z))RMbu7RhPNxv);xeFsLTbRU~FS9NGf2AJLIkliu3QWAdrNT?vT)I*Pld9ksA^gorXXU zfoa@;Bn(|?D zkmRlpHgN*n@D$!@D)=iBD%T9;Zc64V1X}X~&ai7WFXT!YL2}gqsrdGobMrycACVAA zO)wY|!gy6N=-L(ti+Uddp-+bQ9lXm2Si*CJ40ynF3kvE)i9l$R8F65sLa2ks(0egl z(NK*2@sLmh=NeA~YI5zZ)=rW_C; zWC5S$!S#eOU~ZEo*9cD_Zi`S7@?@rsH4v~kZo7v5KPw}JZuyi4l(8lQ0-;Ri)bfzz z1hxwRyl{QKv~oU)f~Lu6KLVjhW*K%v5YUGy9OZuGdj)E5i!&n-N@O(wF1Z{3>~|qMfrC>_upCMbVHUBr0y;^yf0FOpOzv5;f<__$H*Ed7al~p9nuG+XY~%-@ z+05SA#SEXhFulLu9R8ii%|%@8=Yt@(=pG9#{)RdZXgc;o{~O6Cm-q$7m0d=HJ*<0M zKUow?#$laQ3tR!z!ybcR;4D9r6sNxLG2w(u3hyp!F-YOR0V(9cJTYkDlU_nE&86$b=BX>kaYWTqhwNt0ly0@;#)-d1c*cj$SDLFG$>$p3S$cH#$N mkHc^w;5QklxFOIN+8%#C#qq`rq-e^Zkp#d)&CCeRI^uuC$+F7; diff --git a/cim-client-sdk-libs/js/cim.web.sdk.js b/cim-client-sdk-libs/js/cim.web.sdk.js index 52c9f8d..86411e6 100644 --- a/cim-client-sdk-libs/js/cim.web.sdk.js +++ b/cim-client-sdk-libs/js/cim.web.sdk.js @@ -63,6 +63,7 @@ CIMPushManager.bind = function (account) { body.getDataMap().set("packageName", APP_PACKAGE); body.getDataMap().set("deviceId", deviceId); body.getDataMap().set("deviceName", browser.name); + body.getDataMap().set("language", navigator.language); CIMPushManager.sendRequest(body); }; diff --git a/cim-client-sdk/cim-android-sdk/cim-android-sdk.iml b/cim-client-sdk/cim-android-sdk/cim-android-sdk.iml old mode 100755 new mode 100644 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 4fd7025..98ad286 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 @@ -28,11 +28,13 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.Build; +import android.os.LocaleList; import android.text.TextUtils; import com.farsunset.cim.sdk.android.logger.CIMLogger; import com.farsunset.cim.sdk.android.constant.CIMConstant; import com.farsunset.cim.sdk.android.model.SentBody; +import java.util.Locale; import java.util.UUID; /** @@ -161,6 +163,7 @@ public class CIMPushManager { 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); } @@ -293,4 +296,10 @@ public class CIMPushManager { return deviceId; } + private static String getLanguage(){ + + Locale locale = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ? LocaleList.getDefault().get(0) : Locale.getDefault(); + + return locale.getLanguage() + "-" + locale.getCountry(); + } } diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/sdk/server/constant/ChannelAttr.java b/cim-server-sdk/src/main/java/com/farsunset/cim/sdk/server/constant/ChannelAttr.java index bf7df87..da69d86 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/sdk/server/constant/ChannelAttr.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/sdk/server/constant/ChannelAttr.java @@ -9,4 +9,5 @@ public interface ChannelAttr { AttributeKey ID = AttributeKey.valueOf("id"); AttributeKey DEVICE_ID = AttributeKey.valueOf("device_id"); AttributeKey TAG = AttributeKey.valueOf("tag"); + AttributeKey LANGUAGE = AttributeKey.valueOf("language"); } diff --git a/cim-use-examples/cim-client-android/app/libs/cim-android-sdk-4.0.0.jar b/cim-use-examples/cim-client-android/app/libs/cim-android-sdk-4.0.0.jar index acd0649d691365ca537eb1496092c0b407fce7db..1ef7e40c176d2dfbe74c0baea69595949dcc72ec 100644 GIT binary patch delta 6941 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 BG#LN@ delta 6736 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 KW@dzD9q~V7e5h;y diff --git a/cim-use-examples/cim-client-vue/websocket/cim.web.sdk.js b/cim-use-examples/cim-client-vue/websocket/cim.web.sdk.js index 433e741..14f9a74 100644 --- a/cim-use-examples/cim-client-vue/websocket/cim.web.sdk.js +++ b/cim-use-examples/cim-client-vue/websocket/cim.web.sdk.js @@ -67,6 +67,7 @@ const onbindAccount = CIMPushManager.bindAccount = function (account) { body.getDataMap().set("packageName", APP_PACKAGE); body.getDataMap().set("deviceId", deviceId); body.getDataMap().set("deviceName", browser.name); + body.getDataMap().set("language", navigator.language); CIMPushManager.sendRequest(body); }; From 673bb6bbc0b1978313fb83e701d95f2d7d1a71d9 Mon Sep 17 00:00:00 2001 From: xiajun Date: Wed, 28 Jul 2021 18:27:26 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AFIM=E7=AB=AF?= =?UTF-8?q?=E5=8F=A3=E5=92=8C=E9=80=9A=E8=BF=87=E9=85=8D=E7=BD=AE=E5=90=AF?= =?UTF-8?q?=E7=94=A8=E5=92=8C=E7=A6=81=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cim-boot-server/cim-boot-server.iml | 143 ++-- cim-boot-server/cim-boot-server.ipr | 658 ++++++++---------- cim-boot-server/cim-boot-server.iws | 186 +---- cim-boot-server/pom.xml | 14 +- .../com/farsunset/cim/BootApplication.java | 6 + .../com/farsunset/cim/config/CIMConfig.java | 8 +- .../cim/config/properties/APNsProperties.java | 74 ++ .../cim/config/properties/CIMProperties.java | 74 ++ .../cim/service/impl/APNsServiceImpl.java | 12 +- .../src/main/resources/application.properties | 9 +- 10 files changed, 557 insertions(+), 627 deletions(-) create mode 100644 cim-boot-server/src/main/java/com/farsunset/cim/config/properties/APNsProperties.java create mode 100644 cim-boot-server/src/main/java/com/farsunset/cim/config/properties/CIMProperties.java diff --git a/cim-boot-server/cim-boot-server.iml b/cim-boot-server/cim-boot-server.iml index e9a3876..41bd885 100644 --- a/cim-boot-server/cim-boot-server.iml +++ b/cim-boot-server/cim-boot-server.iml @@ -1,29 +1,22 @@ - - - - - - - - - - - + + + + @@ -31,78 +24,78 @@ - - - - - - + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - + + - - - + + + - - + + - + - - + + - - - - + + + + + @@ -123,7 +116,7 @@ - + @@ -137,18 +130,18 @@ - - - - - - - - - - + + + + + + + + + + - + \ No newline at end of file diff --git a/cim-boot-server/cim-boot-server.ipr b/cim-boot-server/cim-boot-server.ipr index 07d4d24..1a65ac8 100644 --- a/cim-boot-server/cim-boot-server.ipr +++ b/cim-boot-server/cim-boot-server.ipr @@ -2,6 +2,7 @@ + @@ -14,14 +15,12 @@ - + - @@ -69,133 +67,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -263,70 +140,70 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -340,15 +217,15 @@ - + - + - + - + @@ -362,26 +239,26 @@ - + - + - + - + - + - + - + - + @@ -406,125 +283,125 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -780,15 +657,15 @@ - + - + - + - + @@ -802,48 +679,59 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + @@ -879,37 +767,26 @@ - + - + - + - + - + - + - + - - - - - - - - - - - - + @@ -923,15 +800,15 @@ - + - + - + - + @@ -945,15 +822,15 @@ - + - + - + - + @@ -989,202 +866,213 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + @@ -1209,169 +1097,169 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/cim-boot-server/cim-boot-server.iws b/cim-boot-server/cim-boot-server.iws index e4dad74..9570d1b 100644 --- a/cim-boot-server/cim-boot-server.iws +++ b/cim-boot-server/cim-boot-server.iws @@ -1,51 +1,30 @@ - - + + + - - - - - - - - + + + + + - - - - - - - - - - - - - - + @@ -61,114 +40,41 @@ - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - 1557734989980 + 1627465791411 @@ -185,42 +91,24 @@ + - jar://$PROJECT_DIR$/lib/cim-server-sdk-mina-3.7.0.jar!/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.class - 72 - - - jar://$PROJECT_DIR$/lib/cim-server-sdk-netty-3.7.0.jar!/com/farsunset/cim/sdk/server/coder/WebMessageEncoder.class - 22 - - - file://$PROJECT_DIR$/src/main/java/com/farsunset/cim/component/message/PushMessageListener.java - 24 - - - - - - 1.8 - - - - - - + + +
<@spring.message 'module.console.cimsession.account'/><@spring.message 'module.console.cimsession.nid'/><@spring.message 'module.console.cimsession.channel'/><@spring.message 'module.console.cimsession.deviceid'/><@spring.message 'module.console.cimsession.device.name'/><@spring.message 'module.console.cimsession.app.version'/><@spring.message 'module.console.cimsession.os.version'/><@spring.message 'module.console.cimsession.account'/><@spring.message 'module.console.cimsession.nid'/><@spring.message 'module.console.cimsession.channel'/><@spring.message 'module.console.cimsession.deviceid'/><@spring.message 'module.console.cimsession.device.name'/><@spring.message 'module.console.cimsession.app.version'/><@spring.message 'module.console.cimsession.os.version'/><@spring.message 'module.common.language'/> <@spring.message 'module.console.cimsession.online.time'/> <@spring.message "module.common.operation"/>
${cimsession.deviceName! } ${cimsession.appVersion! } ${cimsession.osVersion! }${cimsession.language! } <@spring.messageArgs "module.console.cimsession.time.format",[((.now?long - cimsession.bindTime)/1000)?round?c] />