去掉localStore配置；修复数据同步字段缺失问题

config.json

@@ -18,15 +18,14 @@
         "level": "info"
     },
     "openDevTools": false,
-    "localStore": "",
     "servers": [
         {
             "name": "分题线上",
-            "host": "ft.markingcloud.com"
+            "host": "https://ft.markingcloud.com"
         },
         {
             "name": "局域网",
-            "host": "localhost:8090"
+            "host": "http://192.168.10.120:8080"
         }
     ]
 }

source/lib/api.js

@@ -5,7 +5,7 @@ const logger = require('./logger.js')('api.js')
 async function execute(uri, method, form) {
     return new Promise((resolve, reject) => {
         request({
-            url: 'http://' + env.server.host + uri,
+            url: env.server.host + uri,
             method: method,
             json: true,
             timeout: 10000,

source/lib/sync.js

@@ -45,21 +45,22 @@ class executor extends EventEmitter {
                             subList.push(score)
                         })
                     }
-                    datas.push([obj['id'], env.examId, obj['schoolId'], obj['examNumber'], obj['name'], obj['studentCode'], obj['subjectCode'],
+                    datas.push([obj['id'], env.examId, obj['schoolId'], obj['examNumber'], obj['examNumber'], obj['name'], obj['studentCode'], obj['subjectCode'],
                         obj['subjectName'], obj['campusName'], obj['packageCode'], obj['batchCode'], obj['sheetCount'], obj['sliceCount'], obj['answers'],
                         obj['upload'] ? 1 : 0, obj['absent'] ? 1 : 0, obj['breach'] ? 1 : 0, obj['manualAbsent'] ? 1 : 0, obj['objectiveScore'].length > 0 ? obj['objectiveScore'] : 0,
-                        obj['subjectiveScore'].length > 0 ? obj['subjectiveScore'] : 0, objList.join(';'), subList.join(';'), obj['examSite'], obj['examRoom'], obj['remark']
+                        obj['subjectiveScore'].length > 0 ? obj['subjectiveScore'] : 0, objList.join(';'), subList.join(';'), obj['subjectiveStatus'] || 'UNMARK',
+                        obj['examSite'], obj['examRoom'], obj['remark'], obj['college'] || '', obj['className'] || '', obj['teacher'] || ''
                     ])
                 }
                 //console.log('get:' + array.length)
                 promises.push(new Promise((resolve, reject) => {
                     db.batchQuery('replace into eb_exam_student(id, exam_id, school_id\
-                        , exam_number, name, student_code, subject_code, subject_name, campus_name\
+                        , exam_number, secret_number, name, student_code, subject_code, subject_name, campus_name\
                         , package_code, batch_code, sheet_count, slice_count, answers, is_upload\
                         , is_absent, is_manual_absent, is_breach, is_exception\
-                        , objective_score, subjective_score, objective_score_list, subjective_score_list\
-                        , exam_site, exam_room, remark) \
-                        values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,?,?,?,?,?,?,?)',
+                        , objective_score, subjective_score, objective_score_list, subjective_score_list, subjective_status\
+                        , exam_site, exam_room, remark, college, class_name, teacher) \
+                        values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,?,?,?,?,?,?,?,?,?,?,?)',
                         datas).then(() => {
                         count += datas.length
                         this.emit('student', count)

source/test/config-test.js

@@ -1,4 +1,3 @@
 const config = require('../lib/config')
 
-config.localStore = '/Users/luoshi'
 config.sync()