Merge remote-tracking branch 'origin/master' into ywx

sexam/src/main/java/com/xhkjedu/sexam/config/ConfigKey.java

@@ -38,4 +38,20 @@ public class ConfigKey {
         //Spring Boot注解读取application.properties或者application-{profile}.properties文件时默认的是ISO_8859_1编码,中文会乱码
         ConfigKey.signName = new String(signName.getBytes("ISO_8859_1"),"UTF-8");
     }
+
+    //socket地址
+    public static String examscoket;
+    //图像失败识别地址
+    public static String examface;
+
+    @Value("${exam.socket}")
+    public void setExamsocket(String examscoket) {
+        ConfigKey.examscoket = examscoket;
+    }
+
+    @Value("${exam.face}")
+    public void setExamface(String examface) {
+        ConfigKey.examface = examface;
+    }
+
 }

sexam/src/main/java/com/xhkjedu/sexam/controller/system/ToolConfigController.java

@@ -0,0 +1,29 @@
+package com.xhkjedu.sexam.controller.system;
+
+import com.xhkjedu.sexam.config.ConfigKey;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Description 读取配置文件
+ * @Author WN
+ * Date 2022/10/29 22:20
+ **/
+@RestController
+@RequestMapping("/tc")
+public class ToolConfigController {
+    //socket和图片识别地址
+    @PostMapping("/wsf")
+    public ResultVo info() {
+        Map map = new HashMap<>();
+        map.put("examsocket", ConfigKey.examscoket);
+        map.put("examface",ConfigKey.examface);
+
+        return new ResultVo(0, "获取成功",map);
+    }
+}

sexam/src/main/resources/application.properties

@@ -86,6 +86,10 @@ enable.scheduled=false
 #每隔1分钟修改试卷状态
 cron.updatePaperState=0 0/1 * * * ?
 
+#配置socket地址和face地址
+exam.socket=wss://wsexam.xhkjedu.com/ws
+exam.face=https://face.xhkjedu.com/
+
 #版本号
 versionname=Test_v3.5.0