Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/UserBiz.java

@@ -55,7 +55,7 @@ public class UserBiz {
         if(map.get("nickname") != null && !("").equals(map.get("nickname"))){
             str += "nickname="+map.get("nickname").toString();
         }
-        String result = this.doPost(imUrl + "/xxfcim/user/register",str) ;
+        String result = this.doPost(imUrl + "/user/register",str) ;
         JSONObject json = JSONObject.parseObject(result);
         //如果已经注册过，查询出手机号对应用户信息执行登录返回
         if(0 == json.getInteger("resultCode")){
@@ -105,7 +105,7 @@ public class UserBiz {
             str += "password="+map.get("password").toString();
         }
         str += "&areaCode=86";
-        String result = this.doPost(imUrl + "/xxfcim/user/login",str) ;
+        String result = this.doPost(imUrl + "/user/login",str) ;
         JSONObject json = JSONObject.parseObject(result);
         log.info("用户登录：result = {}, telephone = {}, password = {}, userId = {}", result, map.get("telephone"), map.get("password"), map.get("userId"));
         json.put("password",map.get("password").toString());