From e2ba762da8b42698d9477f7af93a2d3f8c7be373 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 05 八月 2023 16:44:23 +0800
Subject: [PATCH] 增加存储模块，将minio工具类迁移到存储包 增加minio的通知功能，通过mqtt将通知入库 修复配置文件自定义字段标黄的问题
---
ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java | 96 +++++++++++++++++++++++++++++++----------------
1 files changed, 63 insertions(+), 33 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 8674902..1666afa 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,32 +1,23 @@
package com.ruoyi.rongcloud.service.Impl;
-import com.alibaba.fastjson2.JSONObject;
-import com.fasterxml.jackson.databind.util.JSONPObject;
-import com.ruoyi.alarm.stealAlarm.domain.ArdAlarmStealelec;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.common.utils.uuid.UUID;
-import com.ruoyi.rongcloud.domain.TokenParam;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.rongcloud.domain.RongCloudParam;
import com.ruoyi.rongcloud.service.RongCloudService;
-import com.ruoyi.system.mapper.SysConfigMapper;
-import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.utils.forest.RongCloudClient;
import lombok.extern.slf4j.Slf4j;
-import okhttp3.FormBody;
-import okhttp3.RequestBody;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
import java.util.Map;
-import java.util.Random;
-
-import static org.bouncycastle.asn1.x500.style.RFC4519Style.l;
/**
- * @Description:
+ * @Description: 閫氳瀺涓氬姟鏈嶅姟
* @ClassName: RongCloudServiceImpl
* @Author: 鍒樿嫃涔�
* @Date: 2023骞�07鏈�15鏃�16:49:12
@@ -39,30 +30,69 @@
@Resource
RongCloudClient rongCloudClient;
@Resource
- ISysConfigService iSysConfigService;
- @Override
- public String getToken(String userId,String name) {
+ RedisCache redisCache;
- String token="";
+ /**
+ * 鑾峰彇铻嶄簯token
+ *
+ * @param userId 鐢ㄦ埛id
+ * @param name 鐢ㄦ埛濮撳悕
+ */
+ @Override
+ public String getToken(String userId, String name) {
+
+ String token = "";
try {
- String rongyunApiUrl = iSysConfigService.selectConfigByKey("rongyun");
- String appKey = iSysConfigService.selectConfigByKey("RongCloudAppKey");
- String appSecret = iSysConfigService.selectConfigByKey("RongCloudAppSecret");
- TokenParam param = new TokenParam();
+ RongCloudParam param = new RongCloudParam();
param.setUserId(userId);
param.setName(name);
- String Nonce = RandomStringUtils.randomNumeric(18);
- String Timestamp = String.valueOf(new Date().getTime());
- String Signature = DigestUtils.sha1Hex(appSecret + Nonce + Timestamp);//App Secret + Nonce + Timestamp
- String jsonStr = rongCloudClient.getToken(rongyunApiUrl, appKey, Nonce, Timestamp, Signature, param);
- Map map = JSONObject.parseObject(jsonStr, Map.class);
+ Map map = rongCloudClient.getToken(getRongCloudHead(), param);
token = (String) map.get("token");
- log.debug("鐢ㄦ埛"+userId+"鑾峰彇鍒拌瀺浜憈oken:"+token);
- }
- catch (Exception ex)
- {
- log.error("鑾峰彇token寮傚父:"+ex.getMessage());
+ log.debug("鐢ㄦ埛" + userId + "鑾峰彇鍒拌瀺浜憈oken:" + token);
+ } catch (Exception ex) {
+ log.error("鑾峰彇token寮傚父:" + ex.getMessage());
}
return token;
}
+
+ @Override
+ public Map checkOnline(List<String> userIds) {
+ Map<String, Object> onlineMap = new HashMap<>();
+ for (String userId : userIds) {
+ RongCloudParam param = new RongCloudParam();
+ param.setUserId(userId);
+ Map isOnline = rongCloudClient.checkOnline(getRongCloudHead(), param);
+ onlineMap.put(userId, isOnline.get("status"));
+ }
+ return onlineMap;
+ }
+
+ @Override
+ public Boolean checkOnline(String userId) {
+ RongCloudParam param = new RongCloudParam();
+ param.setUserId(userId);
+ Map isOnline = rongCloudClient.checkOnline(getRongCloudHead(), param);
+ if (isOnline.get("status").equals("1")) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * 鑾峰彇铻嶄簯绛惧悕淇℃伅
+ */
+ public Map<String, Object> getRongCloudHead() {
+ String appKey = redisCache.getCacheObject("sys_config:RongCloudAppKey");
+ String appSecret = redisCache.getCacheObject("sys_config:RongCloudAppSecret");
+ String nonce = RandomStringUtils.randomNumeric(18);
+ String timestamp = String.valueOf(new Date().getTime());
+ String signature = DigestUtils.sha1Hex(appSecret + nonce + timestamp);//App Secret + Nonce + T
+ Map<String, Object> headerMap = new HashMap<>();
+ headerMap.put("App-Key", appKey);
+ headerMap.put("Nonce", nonce);
+ headerMap.put("Timestamp", timestamp);
+ headerMap.put("Signature", signature);
+ return headerMap;
+ }
}
--
Gitblit v1.9.3