From 6bddb83b1e7556aa9b2b1d4ce7ed5f4b4c62f2d0 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 17 五月 2024 15:16:49 +0800
Subject: [PATCH] 融云建群修改提交
---
ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java | 84 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 76 insertions(+), 8 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java b/ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java
index f41d726..3e52f60 100644
--- a/ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java
@@ -1,7 +1,10 @@
package com.ruoyi.rongcloud.service.Impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dtflys.forest.exceptions.ForestRuntimeException;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysConfig;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.SecurityUtils;
@@ -10,14 +13,18 @@
import com.ruoyi.rongcloud.domain.*;
import com.ruoyi.rongcloud.param.*;
import com.ruoyi.rongcloud.service.RongCloudService;
+import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.utils.forest.RongCloudClient;
import lombok.extern.slf4j.Slf4j;
+import okhttp3.*;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.RandomStringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.io.IOException;
import java.lang.reflect.Field;
import java.util.*;
@@ -42,7 +49,8 @@
private ArdRongGroupUserMapper ardRongGroupUserMapper;
@Resource
private SysUserMapper sysUserMapper;
-
+ @Resource
+ private SysConfigMapper sysConfigMapper;
/**
* 鑾峰彇铻嶄簯token
@@ -61,8 +69,9 @@
Map<String, Object> map = rongCloudClient.getToken(getRongCloudHead(), param);
token = (String) map.get("token");
log.debug("鐢ㄦ埛" + userId + "鑾峰彇鍒拌瀺浜憈oken:" + token);
- } catch (Exception ex) {
- log.error("鑾峰彇token寮傚父:" + ex.getMessage());
+ }catch(ForestRuntimeException ex)
+ {
+ log.error("鑾峰彇铻嶄簯token寮傚父:" + ex.getMessage());
}
return token;
}
@@ -90,7 +99,14 @@
@Override
public AjaxResult groupCreate(RongCloudGroupParam group) {
group.setGroupId(String.valueOf(UUID.randomUUID()));
- Map<String, Object> groupMap = rongCloudClient.groupCreate(getRongCloudHead(), group);
+ //Map<String, Object> groupMap = rongCloudClient.groupCreate(getRongCloudHead(), group);
+ SysConfig sysConfig = new SysConfig();
+ sysConfig.setConfigKey("rongyun");
+ SysConfig rySysConfig = sysConfigMapper.selectConfig(sysConfig);
+ String url = rySysConfig.getConfigValue() + "/group/create.json";
+ String appKey = redisCache.getCacheObject("sys_config:RongCloudAppKey");
+ String appSecret = redisCache.getCacheObject("sys_config:RongCloudAppSecret");
+ Map<String, Object> groupMap = createGroupChat(url, appSecret, appKey,group.getUserId(),group.getGroupId(),group.getGroupName());
Integer code = (Integer) groupMap.get("code");
if (code.equals(200)) {
ArdRongGroup ardRongGroup = new ArdRongGroup();
@@ -112,6 +128,53 @@
groupMap.put("groupId", group.getGroupId());
groupMap.put("group", group.getGroupName());
return AjaxResult.success(groupMap);
+ }
+
+ public Map<String,Object> createGroupChat(String url,String AppSecret,String AppKey,List<String> usersIdList,String groupId,String groupName){
+ OkHttpClient okHttpClient = new OkHttpClient();
+ FormBody.Builder builder = new FormBody.Builder();
+ for(String usersId : usersIdList){
+ builder.add("userId", usersId);
+ }
+
+ RequestBody formBody = builder.add("groupId", groupId)
+ .add("groupName", groupName).build();
+
+ String Nonce = String.valueOf(Math.random()).split("\\.")[1];
+ String Timestamp = String.valueOf(new Date().getTime());
+ String Signature = DigestUtils.sha1Hex(AppSecret + Nonce + Timestamp);//App Secret + Nonce + T
+ /*System.out.println(Nonce);
+ System.out.println(Timestamp);
+ System.out.println(AppSecret + Nonce + Timestamp);
+ System.out.println(Signature);*/
+
+ Request request = new Request.Builder().url(url).post(formBody)
+ .addHeader("Host","api-cn.ronghub.com")
+ .addHeader("App-Key", AppKey)
+ .addHeader("Nonce", Nonce)
+ .addHeader("Timestamp", Timestamp)
+ .addHeader("Signature", Signature)
+ .addHeader("Content-Type", "application/x-www-form-urlencoded").build();
+
+ Response response = null;
+ try {
+ response = okHttpClient.newCall(request).execute();
+ } catch (IOException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+
+ ResponseBody responseBody = response.body();
+
+ try {
+ String message = responseBody.string();
+ Map<String,Object> result = (Map<String, Object>) JSON.parse(message);
+ return result;
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ return new HashMap();
+ }
}
@Override
@@ -164,9 +227,14 @@
Map<String, Object> groupMap = rongCloudClient.groupQuit(getRongCloudHead(), groupParam);
Integer code = (Integer) groupMap.get("code");
if (code.equals(200)) {
- ArdRongGroup ardRongGroup = ardRongGroupMapper.selectById(groupParam.getGroupId());
- ardRongGroup.setGroupName(groupParam.getGroupName());
- ardRongGroupMapper.updateById(ardRongGroup);
+ List<String> list = groupParam.getUserId();
+ for (int i = 0; i < list.size(); i++) {
+ String userId = list.get(i);
+ QueryWrapper<ArdRongGroupUser> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("group_id",groupParam.getGroupId())
+ .eq("user_id",userId);
+ ardRongGroupUserMapper.delete(queryWrapper);
+ }
}
groupMap.put("groupId", groupParam.getGroupId());
groupMap.put("groupName", groupParam.getGroupName());
@@ -259,7 +327,7 @@
public AjaxResult groupUserAll(String groupId) {
ArdRongGroup ardRongGroup = ardRongGroupMapper.selectById(groupId);
QueryWrapper<ArdRongGroupUser> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("group_id",ardRongGroup);
+ queryWrapper.eq("group_id",ardRongGroup.getGroupId());
List<ArdRongGroupUser> list = ardRongGroupUserMapper.selectList(queryWrapper);
List<String> userList = new ArrayList<>();
for (int i = 0; i < list.size(); i++) {
--
Gitblit v1.9.3