|
|
@@ -521,7 +521,14 @@ public class OpenIMServiceImpl implements OpenIMService {
|
|
|
ObjectMapper objectMapper = new ObjectMapper();
|
|
|
//userId = 61l;
|
|
|
objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); // 忽略null字段
|
|
|
- checkAndImportFriendByDianBo(companyUserId,userId.toString(),cropId,true);
|
|
|
+ // 注册账号
|
|
|
+ //查询用户是否注册im
|
|
|
+ Integer isIm = fsUserMapper.getIsIm(userId);
|
|
|
+ if (isIm == null || isIm == 0){
|
|
|
+ //未注册im,注册账号
|
|
|
+ accountCheck("U" + userId, "1");
|
|
|
+ }
|
|
|
+// checkAndImportFriendByDianBo(companyUserId,userId.toString(),cropId,true);
|
|
|
OpenImMsgDTO.Content content = new OpenImMsgDTO.Content();
|
|
|
OpenImMsgDTO.ImData imData = new OpenImMsgDTO.ImData();
|
|
|
PayloadDTO payload = new PayloadDTO();
|
|
|
@@ -1014,6 +1021,10 @@ public class OpenIMServiceImpl implements OpenIMService {
|
|
|
if (errCode==0){
|
|
|
JSONObject userData = userJson.getJSONObject("data");
|
|
|
String userToken = userData.getString("token");
|
|
|
+ if ("1".equals(type)){
|
|
|
+ //用户注册im成功
|
|
|
+ fsUserMapper.updateFsUserIm(Long.valueOf(userId));
|
|
|
+ }
|
|
|
return R.ok().put("token", userToken);
|
|
|
}
|
|
|
// return R.error("注册失败");
|