‘liusuyi’
2023-07-17 9ab77cae08198c4c3d9d8fe7f41b0910fb54762e
优化融云业务
已修改3个文件
53 ■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/utils/forest/RongCloudClient.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/logback.xml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java
@@ -4,19 +4,26 @@
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.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.Map;
import java.util.Random;
import static org.bouncycastle.asn1.x500.style.RFC4519Style.l;
/**
 * @Description:
@@ -26,6 +33,7 @@
 * @Version: 1.0
 **/
@Service
@Slf4j(topic = "rongCloud")
public class RongCloudServiceImpl implements RongCloudService {
    @Resource
@@ -34,20 +42,27 @@
    ISysConfigService iSysConfigService;
    @Override
    public String getToken(String userId,String name) {
//        String appKey="6tnym11s1h717";
//        String appSecret="IwcGk2flZr";
        String token="";
        try {
        String rongyunApiUrl = iSysConfigService.selectConfigByKey("rongyun");
        String appKey = iSysConfigService.selectConfigByKey("RongCloudAppKey");
        String appSecret = iSysConfigService.selectConfigByKey("RongCloudAppSecret");
        TokenParam param=new TokenParam();
        param.setUserId(userId);
        param.setName(name);
        String Nonce = String.valueOf(Math.random()).split("\\.")[1];
            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);
        String token = (String)map.get("token");
            token = (String) map.get("token");
            log.debug("用户"+userId+"获取到融云token:"+token);
        }
        catch (Exception ex)
        {
            log.error("获取token异常:"+ex.getMessage());
        }
        return token;
    }
}
ard-work/src/main/java/com/ruoyi/utils/forest/RongCloudClient.java
@@ -8,16 +8,17 @@
@BaseRequest(
        baseURL = "{rongyunApiUrl}",
        sslProtocol = "TLS"
)
public interface RongCloudClient {
    @Post(url = "/user/getToken.json", headers = {
        headers = {
            "App-Key:{AppKey}",
            "Nonce:{Nonce}",
            "Timestamp:{Timestamp}",
            "Signature:{Signature}",
    })
        },
        sslProtocol = "TLS"
)
public interface RongCloudClient {
    @Post(url = "/user/getToken.json")
    public String getToken(@Var("rongyunApiUrl") String rongyunApiUrl,@Var("AppKey") String AppKey, @Var("Nonce") String Nonce, @Var("Timestamp") String Timestamp, @Var("Signature") String Signature, @Body TokenParam param);
}
ruoyi-admin/src/main/resources/logback.xml
@@ -172,6 +172,19 @@
            <pattern>${log.pattern}</pattern>
        </encoder>
    </appender>
    <!--融云日志输出-->
    <appender name="rongCloud" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <file>${log.path}/rongCloud.log</file>
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!--按天回滚daily-->
            <fileNamePattern>${log.path}/rongCloud.%d{yyyy-MM-dd}.log</fileNamePattern>
            <!--日志最大的历史60天-->
            <maxHistory>60</maxHistory>
        </rollingPolicy>
        <encoder>
            <pattern>${log.pattern}</pattern>
        </encoder>
    </appender>
    <!-- 系统模块日志级别控制  -->
    <logger name="com.ruoyi" level="info"/>
    <!-- Spring日志级别控制  -->
@@ -222,4 +235,8 @@
    <logger name="guideQueue" level="DEBUG">
        <appender-ref ref="guideQueue"/>
    </logger>
    <!--rongCloud日志打印等级-->
    <logger name="rongCloud" level="DEBUG">
        <appender-ref ref="rongCloud"/>
    </logger>
</configuration>