fix bugs

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/DataSyncController.java

@@ -146,7 +146,7 @@ public class DataSyncController extends BaseExamController {
         int examId = getSessionExamId(request);
         DataSync sync = dataSyncService.findByExamId(examId);
         try {
-            List<SubjectiveQuestionDTO> list = getPaperStruct(sync.getSubjectUrl(), sync.getCloudExamId());
+            List<SubjectiveQuestionDTO> list = getPaperStruct(sync);
             new ExportExcel("主观题数据", SubjectiveQuestionDTO.class, 2).setDataList(list).write(response, "主观题数据.xlsx")
                     .dispose();
             return null;
@@ -157,12 +157,13 @@ public class DataSyncController extends BaseExamController {
         return new ModelAndView("redirect:/admin/exam/sync?examId=" + examId);
     }
 
-    private List<SubjectiveQuestionDTO> getPaperStruct(String url, Long cloudExamId) {
+    private List<SubjectiveQuestionDTO> getPaperStruct(DataSync sync) {
         List<SubjectiveQuestionDTO> list = new ArrayList<SubjectiveQuestionDTO>();
 
-        HttpUtil subjectHttp = new HttpUtil(url, secretKey, appId, rootOrgId);
+        HttpUtil subjectHttp = new HttpUtil(sync.getSubjectUrl(), sync.getSecretKey(), sync.getAppId(),
+                sync.getRootOrgId());
         JSONObject datas = new JSONObject();
-        datas.accumulate("examId", cloudExamId);
+        datas.accumulate("examId", sync.getCloudExamId());
         String subjectResult = subjectHttp.httpAction(null, datas.toString());
         JSONObject subjectJson = JSONObject.fromObject(subjectResult);
         JSONArray subjectArray = subjectJson.getJSONArray("paperStructList");

stmms-web/src/main/java/cn/com/qmth/stmms/admin/thread/DataSyncThread.java

@@ -1,7 +1,9 @@
 package cn.com.qmth.stmms.admin.thread;
 
+import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -174,9 +176,10 @@ public class DataSyncThread implements Runnable {
                             file.getParentFile().mkdirs();
                             file.createNewFile();
                         }
-                        FileOutputStream fos = new FileOutputStream(file);
-                        fos.write(answerJson.getBytes());
-                        fos.close();
+                        BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file),
+                                "UTF-8"));
+                        bw.write(answerJson);
+                        bw.close();
                     }
                     int count = studentService.batchSave(list);
                     if (count > 0) {

stmms-web/src/main/webapp/static/i18n/messages.properties

@@ -14,7 +14,7 @@ user.login.error.access=\u7528\u6237\u6ca1\u6709\u8bbf\u95ee\u6743\u9650
 #reset
 user.reset.submit=\u786e\u5b9a
 user.reset.logout=\u9000\u51fa
-user.reset.title=\u9996\u6b21\u767b\u9646\uff0c\u8bf7\u5b8c\u5584\u8d44\u6599
+user.reset.title=\u9996\u6b21\u767b\u5f55\uff0c\u8bf7\u5b8c\u5584\u8d44\u6599
 user.reset.name=\u8f93\u5165\u7528\u6237\u540d
 user.reset.password=\u8f93\u5165\u65b0\u5bc6\u7801
 user.reset.password.again=\u518d\u6b21\u8f93\u5165\u65b0\u5bc6\u7801

stmms-web/src/main/webapp/static/i18n/messages_zh.properties

@@ -14,7 +14,7 @@ user.login.error.access=\u7528\u6237\u6ca1\u6709\u8bbf\u95ee\u6743\u9650
 #reset
 user.reset.submit=\u786e\u5b9a
 user.reset.logout=\u9000\u51fa
-user.reset.title=\u9996\u6b21\u767b\u9646\uff0c\u8bf7\u5b8c\u5584\u8d44\u6599
+user.reset.title=\u9996\u6b21\u767b\u5f55\uff0c\u8bf7\u5b8c\u5584\u8d44\u6599
 user.reset.name=\u8f93\u5165\u7528\u6237\u540d
 user.reset.password=\u8f93\u5165\u65b0\u5bc6\u7801
 user.reset.password.again=\u518d\u6b21\u8f93\u5165\u65b0\u5bc6\u7801