yzx пре 1 дан
родитељ
комит
c57121d7d4

+ 36 - 1
ruoyi-admin/src/main/java/com/ruoyi/cc/controller/FsConfController.java

@@ -314,6 +314,16 @@ public class FsConfController extends BaseController {
         return "cc/aliasrbridgeconf/aliasrbridgeconf";
     }
 
+    /**
+     * ASR(腾讯新模块)参数配置
+     * @return
+     */
+    @RequiresPermissions("cc:txasrbridgeconf:view")
+    @GetMapping(value = "/txasrbridgeconf")
+    public String txAsrBridgeConf() {
+        return "cc/txasrbridgeconf/txasrbridgeconf";
+    }
+
 
     /**
      * 获取ASR配置
@@ -337,6 +347,17 @@ public class FsConfController extends BaseController {
         return getConfigFileJsonData(asrFileName, 5);
     }
 
+    /**
+     * 获取腾讯 ASR 模块配置
+     * @return
+     */
+    @GetMapping(value = "/getTxBridgeAsrConf")
+    @ResponseBody
+    public AjaxResult getTxBridgeAsrConf() {
+        String asrFileName = "/autoload_configs/tx_asr.conf.xml";
+        return getConfigFileJsonData(asrFileName, 5);
+    }
+
     /**
      * 获取FunASR配置
      * @return
@@ -507,6 +528,19 @@ public class FsConfController extends BaseController {
         return saveAndReloadAsrModule(asrFileName, moduleName, params, "ali");
     }
 
+    /**
+     * 保存腾讯 ASR 模块配置
+     * @param params
+     * @return
+     */
+    @PostMapping(value = "/setTxBridgeAsrConf")
+    @ResponseBody
+    public AjaxResult setTxBridgeAsrConf(@RequestBody JSONArray params) {
+        String asrFileName = "/autoload_configs/tx_asr.conf.xml";
+        String moduleName = "mod_tx_asr";
+        return saveAndReloadAsrModule(asrFileName, moduleName, params, "tx");
+    }
+
     /**
      * 保存ASR配置
      * @param params
@@ -606,7 +640,7 @@ public class FsConfController extends BaseController {
 
 
     /**
-     * 设置ASR引擎(mod_xunfei_asr、mod_aliyun_asr、mod_ali_asr)
+     * 设置ASR引擎(mod_xunfei_asr、mod_aliyun_asr、mod_ali_asr、mod_tx_asr
      * @param asrengine
      * @return
      */
@@ -620,6 +654,7 @@ public class FsConfController extends BaseController {
                 EslConnectionUtil.sendSyncApiCommand("unload", "mod_funasr");
                 EslConnectionUtil.sendSyncApiCommand("unload", "mod_aliyun_asr");
                 EslConnectionUtil.sendSyncApiCommand("unload", "mod_ali_asr");
+                EslConnectionUtil.sendSyncApiCommand("unload", "mod_tx_asr");
 
                 EslMessage resp = EslConnectionUtil.sendSyncApiCommand("load", asrengine.trim());
                 String text = CommonUtils.ListToString(resp.getBodyLines() , '\n');

+ 5 - 1
ruoyi-admin/src/main/java/com/ruoyi/cc/service/impl/FsConfServiceImpl.java

@@ -227,6 +227,9 @@ public class FsConfServiceImpl implements IFsConfService {
                     if ("mod_ali_asr".equals(element.getAttribute("module"))){
                         return "mod_ali_asr";
                     }
+                    if ("mod_tx_asr".equals(element.getAttribute("module"))){
+                        return "mod_tx_asr";
+                    }
                     if ("mod_funasr".equals(element.getAttribute("module"))){
                         return "mod_funasr";
                     }
@@ -260,7 +263,8 @@ public class FsConfServiceImpl implements IFsConfService {
                     if ("mod_xunfei_asr".equals(element.getAttribute("module"))
                             || "mod_funasr".equals(element.getAttribute("module"))
                             || "mod_aliyun_asr".equals(element.getAttribute("module"))
-                            || "mod_ali_asr".equals(element.getAttribute("module"))){
+                            || "mod_ali_asr".equals(element.getAttribute("module"))
+                            || "mod_tx_asr".equals(element.getAttribute("module"))){
                         existAsrMod = true;
                         if (StringUtils.isNotEmpty(asrengine)) {
                             element.setAttribute("module", asrengine);

+ 4 - 1
ruoyi-admin/src/main/resources/static/i18n/messages.properties

@@ -224,7 +224,9 @@ switchconf.asr.engine.option2=FunASR(免费)
 switchconf.asr.engine.option3=阿里云ASR
 switchconf.asr.engine.option4=阿里ASR(新)
 switchconf.asr.engine.option5=讯飞ASR
-switchconf.asr.engine.option5=电信ASR
+switchconf.asr.engine.option6=电信ASR
+switchconf.asr.engine.option7=腾讯ASR
+switchconf.asr.tx.header=腾讯ASR参数配置
 switchconf.cert.header=网页电话证书配置
 switchconf.cert.label=证书内容:
 switchconf.log.fs.label=freeswitch日志:
@@ -1835,6 +1837,7 @@ _sys.config.config_asr_provider_aliyun=阿里云
 _sys.config.config_asr_provider_funasr=FunASR
 _sys.config.config_asr_provider_chinatelecom=电信
 _sys.config.config_asr_provider_aws=亚马逊
+_sys.config.config_asr_provider_tx=腾讯云
 _sys.config.config_tts_provider_aliyun=阿里云
 _sys.config.config_tts_provider_doubao=豆包
 _sys.config.config_tts_provider_chinatelecom=电信

+ 4 - 1
ruoyi-admin/src/main/resources/static/i18n/messages_en.properties

@@ -224,7 +224,9 @@ switchconf.asr.engine.option2=FunASR (Free)
 switchconf.asr.engine.option3=Alibaba Cloud ASR
 switchconf.asr.engine.option4=Ali ASR (New)
 switchconf.asr.engine.option5=IFlytek ASR
-switchconf.asr.engine.option5=ChinaTele ASR
+switchconf.asr.engine.option6=ChinaTele ASR
+switchconf.asr.engine.option7=Tencent Cloud ASR
+switchconf.asr.tx.header=Tencent Cloud ASR Parameter Configuration
 switchconf.cert.header=WebRTC Certificate Configuration
 switchconf.cert.label=Certificate Content:
 switchconf.log.fs.label=Freeswitch Logs:
@@ -1873,6 +1875,7 @@ _sys.config.config_asr_provider_aliyun=Alibaba Cloud
 _sys.config.config_asr_provider_funasr=FunASR
 _sys.config.config_asr_provider_chinatelecom=China Telecom
 _sys.config.config_asr_provider_aws=Amazon
+_sys.config.config_asr_provider_tx=Tencent Cloud
 _sys.config.config_tts_provider_aliyun=Alibaba Cloud
 _sys.config.config_tts_provider_doubao=Doubao
 _sys.config.config_tts_provider_chinatelecom=China Telecom

+ 4 - 1
ruoyi-admin/src/main/resources/static/i18n/messages_en_US.properties

@@ -224,7 +224,9 @@ switchconf.asr.engine.option2=FunASR (Free)
 switchconf.asr.engine.option3=Alibaba Cloud ASR
 switchconf.asr.engine.option4=Ali ASR (New)
 switchconf.asr.engine.option5=IFlytek ASR
-switchconf.asr.engine.option5=ChinaTele ASR
+switchconf.asr.engine.option6=ChinaTele ASR
+switchconf.asr.engine.option7=Tencent Cloud ASR
+switchconf.asr.tx.header=Tencent Cloud ASR Parameter Configuration
 switchconf.cert.header=WebRTC Certificate Configuration
 switchconf.cert.label=Certificate Content:
 switchconf.log.fs.label=Freeswitch Logs:
@@ -1835,6 +1837,7 @@ _sys.config.config_asr_provider_aliyun=Alibaba Cloud
 _sys.config.config_asr_provider_funasr=FunASR
 _sys.config.config_asr_provider_chinatelecom=China Telecom
 _sys.config.config_asr_provider_aws=Amazon
+_sys.config.config_asr_provider_tx=Tencent Cloud
 _sys.config.config_tts_provider_aliyun=Alibaba Cloud
 _sys.config.config_tts_provider_doubao=Doubao
 _sys.config.config_tts_provider_chinatelecom=China Telecom

+ 4 - 1
ruoyi-admin/src/main/resources/static/i18n/messages_ja_JP.properties

@@ -224,7 +224,9 @@ switchconf.asr.engine.option2=FunASR (Free)
 switchconf.asr.engine.option3=Alibaba Cloud ASR
 switchconf.asr.engine.option4=Ali ASR (New)
 switchconf.asr.engine.option5=IFlytek ASR
-switchconf.asr.engine.option5=ChinaTele ASR
+switchconf.asr.engine.option6=ChinaTele ASR
+switchconf.asr.engine.option7=Tencent Cloud ASR
+switchconf.asr.tx.header=Tencent Cloud ASR Parameter Configuration
 switchconf.cert.header=WebRTC Certificate Configuration
 switchconf.cert.label=Certificate Content:
 switchconf.log.fs.label=Freeswitch Logs:
@@ -1835,6 +1837,7 @@ _sys.config.config_asr_provider_aliyun=Alibaba Cloud
 _sys.config.config_asr_provider_funasr=FunASR
 _sys.config.config_asr_provider_chinatelecom=China Telecom
 _sys.config.config_asr_provider_aws=Amazon
+_sys.config.config_asr_provider_tx=Tencent Cloud
 _sys.config.config_tts_provider_aliyun=Alibaba Cloud
 _sys.config.config_tts_provider_doubao=Doubao
 _sys.config.config_tts_provider_chinatelecom=China Telecom

+ 4 - 1
ruoyi-admin/src/main/resources/static/i18n/messages_zh.properties

@@ -224,7 +224,9 @@ switchconf.asr.engine.option2=FunASR(免费)
 switchconf.asr.engine.option3=阿里云ASR
 switchconf.asr.engine.option4=阿里ASR(新)
 switchconf.asr.engine.option5=讯飞ASR
-switchconf.asr.engine.option5=电信ASR
+switchconf.asr.engine.option6=电信ASR
+switchconf.asr.engine.option7=腾讯ASR
+switchconf.asr.tx.header=腾讯ASR参数配置
 switchconf.cert.header=网页电话证书配置
 switchconf.cert.label=证书内容:
 switchconf.log.fs.label=freeswitch日志:
@@ -1873,6 +1875,7 @@ _sys.config.config_asr_provider_aliyun=阿里云
 _sys.config.config_asr_provider_funasr=FunASR
 _sys.config.config_asr_provider_chinatelecom=电信
 _sys.config.config_asr_provider_aws=亚马逊
+_sys.config.config_asr_provider_tx=腾讯云
 _sys.config.config_tts_provider_aliyun=阿里云
 _sys.config.config_tts_provider_doubao=豆包
 _sys.config.config_tts_provider_chinatelecom=电信

+ 4 - 1
ruoyi-admin/src/main/resources/static/i18n/messages_zh_CN.properties

@@ -224,7 +224,9 @@ switchconf.asr.engine.option2=FunASR(免费)
 switchconf.asr.engine.option3=阿里云ASR
 switchconf.asr.engine.option4=阿里ASR(新)
 switchconf.asr.engine.option5=讯飞ASR
-switchconf.asr.engine.option5=电信ASR
+switchconf.asr.engine.option6=电信ASR
+switchconf.asr.engine.option7=腾讯ASR
+switchconf.asr.tx.header=腾讯ASR参数配置
 switchconf.cert.header=网页电话证书配置
 switchconf.cert.label=证书内容:
 switchconf.log.fs.label=freeswitch日志:
@@ -1835,6 +1837,7 @@ _sys.config.config_asr_provider_aliyun=阿里云
 _sys.config.config_asr_provider_funasr=FunASR
 _sys.config.config_asr_provider_chinatelecom=电信
 _sys.config.config_asr_provider_aws=亚马逊
+_sys.config.config_asr_provider_tx=腾讯云
 _sys.config.config_tts_provider_aliyun=阿里云
 _sys.config.config_tts_provider_doubao=豆包
 _sys.config.config_tts_provider_chinatelecom=电信

+ 2 - 0
ruoyi-admin/src/main/resources/templates/cc/asrengine/asrengine.html

@@ -21,6 +21,8 @@
                         <option value="mod_aliyun_asr" th:text="#{switchconf.asr.engine.option3}"></option>
                         <option value="mod_ali_asr" th:text="#{switchconf.asr.engine.option4}"></option>
                         <option value="mod_xunfei_asr" th:text="#{switchconf.asr.engine.option5}"></option>
+                        <option value="mod_chinatelecom_asr" th:text="#{switchconf.asr.engine.option6}"></option>
+                        <option value="mod_tx_asr" th:text="#{switchconf.asr.engine.option7}"></option>
                     </select>
                 </div>
             </div>