lsd/ks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修改日志报错问题

Browse Source 
2.移动公用地址到common下
This commit is contained in:
sh
2026-04-09 19:19:47 +08:00
parent a1b880f817
commit fd4ab146e0
11 changed files with 140 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-bussiness/src/main/java/com/ruoyi/cms/handler/SpeechRecognitionWebSocketHandler.java
View File

@@ -1,6 +1,6 @@
//package com.ruoyi.cms.handler;
//
//import com.ruoyi.cms.util.AliyunNlsUtils;
//import com.ruoyi.common.utils.aliyun.AliyunNlsUtils;
//import org.springframework.stereotype.Component;
//
//import javax.websocket.*;

2
ruoyi-bussiness/src/main/java/com/ruoyi/cms/handler/SpeechRecognizerAI.java
View File

@@ -7,7 +7,7 @@ import com.alibaba.nls.client.protocol.SampleRateEnum;
import com.alibaba.nls.client.protocol.asr.SpeechRecognizer;
import com.alibaba.nls.client.protocol.asr.SpeechRecognizerListener;
import com.alibaba.nls.client.protocol.asr.SpeechRecognizerResponse;
import com.ruoyi.cms.util.AliyunNlsUtils;
import com.ruoyi.common.utils.aliyun.AliyunNlsUtils;
import lombok.Data;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
ruoyi-bussiness/src/main/java/com/ruoyi/cms/handler/SpeechSynthesisWebSocketHandler.java
View File

@@ -7,7 +7,7 @@
//import com.alibaba.nls.client.protocol.tts.SpeechSynthesizer;
//import com.alibaba.nls.client.protocol.tts.SpeechSynthesizerListener;
//import com.alibaba.nls.client.protocol.tts.SpeechSynthesizerResponse;
//import com.ruoyi.cms.util.AliyunNlsUtils;
//import com.ruoyi.common.utils.aliyun.AliyunNlsUtils;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
//import org.springframework.stereotype.Component;

44
ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/AliyunNlsUtils.java
View File

@@ -1,44 +0,0 @@
package com.ruoyi.cms.util;
/**
* 阿里云配置
*/
public class AliyunNlsUtils {
/**
* 标志
*/
public static final boolean USE_TEST_ENV=true;
/**
* 测试nls
*/
public static final String NLS_TEST_URL="wss://nls-gateway-cn-shanghai.aliyuncs.com";
/**
* 测试微信获取oppenid链接
*/
public static final String WX_TEST_URL="https://api.weixin.qq.com/sns/jscode2session";
/**
* 正式nls
*/
public static final String NLS_FORMAL_URL="http://192.168.2.102:10044";
/**
* 根据环境判断正式还是测试
* @return
*/
public static String getNlsUrl(){
String url = USE_TEST_ENV ? NLS_TEST_URL : NLS_FORMAL_URL;
System.out.println("nls当前环境：" + (USE_TEST_ENV ? "测试" : "正式") + "，WebSocket地址：" + url);
return url;
}
/**
* 微信授权登录
* @return
*/
public static String getWXoppenidUrl(){
String url = USE_TEST_ENV ? WX_TEST_URL : NLS_FORMAL_URL+"/weixin";
System.out.println("微信授权登录当前环境：" + (USE_TEST_ENV ? "测试" : "正式") + "，获取oppenid地址：" + url);
return url;
}
}

1
ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/WechatUtil.java
View File

@@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.aliyun.AliyunNlsUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FileUtils;
import org.springframework.beans.factory.annotation.Value;

6
ruoyi-bussiness/src/main/resources/mapper/app/BussinessOperLogMapper.xml
View File

@@ -40,10 +40,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectOperLogVo"/>
<where>
<if test="operIp != null and operIp != ''">
AND oper_ip like concat('%', #{operIp}, '%')
AND oper_ip like concat('%', CAST(#{operIp} AS VARCHAR), '%')
</if>
<if test="title != null and title != ''">
AND title like concat('%', #{title}, '%')
AND title like concat('%', CAST(#{title} AS VARCHAR), '%')
</if>
<if test="businessType != null">
AND business_type = #{businessType}
@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND status = #{status}
</if>
<if test="operName != null and operName != ''">
AND oper_name like concat('%', #{operName}, '%')
AND oper_name like concat('%', CAST(#{operName} AS VARCHAR), '%')
</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND oper_time &gt;= #{params.beginTime}