moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

房间-在线列表-日志

Browse Source
This commit is contained in:
khalil
2025-04-27 01:59:33 +08:00
parent b2d9b0e1f7
commit 9dd1eda198
4 changed files with 9 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
accompany-base/accompany-core/src/main/java/com/accompany/common/config/NetEaseConfig.java
View File

@@ -13,7 +13,6 @@ public class NetEaseConfig {
public static String neteaseAppKey;
public static String neteaseAppSecret;
public static Integer smsTemplateid;
public void setNeteaseAppKey(String neteaseAppKey) {
NetEaseConfig.neteaseAppKey = neteaseAppKey;
@@ -22,8 +21,4 @@ public class NetEaseConfig {
public void setNeteaseAppSecret(String neteaseAppSecret) {
NetEaseConfig.neteaseAppSecret = neteaseAppSecret;
}
public void setSmsTemplateid(Integer smsTemplateid) {
NetEaseConfig.smsTemplateid = smsTemplateid;
}
}

5
accompany-base/accompany-core/src/main/java/com/accompany/common/netease/ErBanNetEaseService.java
View File

@@ -11,7 +11,6 @@ import com.accompany.common.utils.BlankUtil;
import com.accompany.common.utils.GsonUtil;
import com.accompany.common.utils.StringUtils;
import com.accompany.core.service.base.BaseService;
import com.accompany.core.util.BeanUtils;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Maps;
import com.google.gson.Gson;
@@ -409,7 +408,9 @@ public class ErBanNetEaseService extends BaseService {
param.put("type", type);
param.put("endtime", endTime);
param.put("limit", limit);
return netEaseBaseClient.buildHttpPostParam(param).executePost();
String result = netEaseBaseClient.buildHttpPostParam(param).executePost();
log.info("[queryMembersByPage] roomId {} type {} endtime {} result {}", roomId, type, endTime, result);
return result;
} catch (Exception e) {
throw new RuntimeException(e);
}

22
accompany-base/accompany-core/src/main/java/com/accompany/common/netease/util/NetEaseConstant.java
View File

@@ -1,36 +1,14 @@
package com.accompany.common.netease.util;
//import com.accompany.common.utils.PropertyUtil;
/**
* Created by liuguofu on 2017/4/27.
*/
public class NetEaseConstant {
// public static final String appKey= PropertyUtil.getProperty("netEaseAppKey");
// public static final String appSecret=PropertyUtil.getProperty("netEaseAppSecret");
public static String basicUrl = "https://api-sg.yunxinapi.com/nimserver";
public static final int MAX_BATCH_SIZE = 100;
// public static final int smsTemplateid=Integer.valueOf(PropertyUtil.getProperty("smsTemplateid"));
// public static final int SMSTEMPLATEID_ALARM=Integer.valueOf(PropertyUtil.getProperty("smsTemplateid"));
//66星球语音网易云短信配置
/**
* 66星球语音appKey
**/
// public static final String tutuAppKey = PropertyUtil.getProperty("tutuNetEaseAppKey");
// /**66星球语音appSecret**/
// public static final String tutuAppSecret = PropertyUtil.getProperty("tutuNetEaseAppSecret");
// /**66星球语音templateId**/
// public static final int tutuSmsTemplateid = Integer.valueOf(PropertyUtil.getProperty("tutuSmsTemplateid"));
//
// public static final Integer tutuInviteSmsTemplateid = Integer.valueOf(PropertyUtil.getProperty("tutuInviteSmsTemplateid"));
// public static final int tutuAlertSmsTemplateId = Integer.valueOf(PropertyUtil.getProperty("tutuAlertSmsTemplateId"));
public static class AccUrl {
public static String get = "/user/getUinfos.action";
public static String create = "/user/create.action";

11
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomService.java
View File

@@ -2098,9 +2098,10 @@ public class RoomService extends BaseService {
if (room == null) {
return Collections.emptyList();
}
long timestamp = System.currentTimeMillis();
List<RoomMemberRet> members = new ArrayList<>();
String fixedMemberInfoJson = erBanNetEaseService.getMembersByPage(room.getRoomId(), NetEaseConstant.RoomMemberType.FIXED_MEMBER, timestamp, 100);
String fixedMemberInfoJson = erBanNetEaseService.getMembersByPage(room.getRoomId(), NetEaseConstant.RoomMemberType.ONLINE_MEMBER, timestamp, 100);
String noFixedMemberInfoJson = erBanNetEaseService.getMembersByPage(room.getRoomId(), NetEaseConstant.RoomMemberType.NO_FIXED_MEMBER, timestamp, 100);
if (StrUtil.isNotEmpty(fixedMemberInfoJson)) {
RoomUserListRet roomUserListRet = GsonUtil.getDefGson().fromJson(fixedMemberInfoJson, RoomUserListRet.class);
@@ -2132,11 +2133,11 @@ public class RoomService extends BaseService {
log.error(e.getMessage(), e);
}
}
Set<Long> uidList = new LinkedHashSet<>();
//当前房间房主
if (members.stream().anyMatch(v -> v.getAccid().equals(roomUid))) {
uidList.add(roomUid);
}
PlayRoomVo playRoom = null;
String roomMicUpJson = jedisService.hget(RedisKey.room_mic_up.getKey(), String.valueOf(roomUid));
if (StrUtil.isNotEmpty(roomMicUpJson)) {