Merge remote-tracking branch 'origin/dev_v3.3.1' into dev_v3.3.1

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/GradeBatchPaperServiceImpl.java

@@ -84,6 +84,8 @@ public class GradeBatchPaperServiceImpl extends ServiceImpl<GradeBatchPaperMappe
         }
 
         List<GradeBatchPaperResult> datasource = this.baseMapper.findAbleAnalyzePaper(gradeBatch.getSemesterId(), examId, collegeId, courseCode, SystemConstant.translateSpecificSign(teacherName), dpr, schoolId);
+        List<GradeBatchPaperResult> copy = new ArrayList<>();
+
         for (GradeBatchPaperResult gradeBatchPaperResult : datasource) {
             // 额外处理开课学院
             Long teachingRoomId = gradeBatchPaperResult.getTeachingRoomId();
@@ -94,8 +96,9 @@ public class GradeBatchPaperServiceImpl extends ServiceImpl<GradeBatchPaperMappe
             gradeBatchPaperResult.setPaperName(gradeBatchPaperResult.getCourseName());
             gradeBatchPaperResult.setTeachCollegeId(teachCollege.getId());
             gradeBatchPaperResult.setTeachCollegeName(teachCollege.getName());
+            copy.add(gradeBatchPaperResult);
         }
-        return datasource.stream().sorted(Comparator.comparing(GradeBatchPaperResult::getSemesterName)
+        return copy.stream().sorted(Comparator.comparing(GradeBatchPaperResult::getSemesterName)
                 .thenComparing(GradeBatchPaperResult::getExamName)
                 .thenComparing(GradeBatchPaperResult::getTeachCollegeId)
                 .thenComparing(GradeBatchPaperResult::getCourseCode)

distributed-print/install/mysql/init/teachcloud_db.sql

@@ -2103,7 +2103,7 @@ INSERT INTO `sys_config` (`id`, `school_id`, `org_id`, `config_key`, `config_nam
 INSERT INTO `sys_config` (`id`, `school_id`, `org_id`, `config_key`, `config_name`, `config_value`, `remark`, `enable`, `sort`, `create_id`, `create_time`, `update_id`, `update_time`) VALUES (18, NULL, NULL, 'sms.normal.code', '万能短信验证码', 'qmth', NULL, 1, 1, 1, NULL, NULL, NULL);
 INSERT INTO `sys_config` (`id`, `school_id`, `org_id`, `config_key`, `config_name`, `config_value`, `remark`, `enable`, `sort`, `create_id`, `create_time`, `update_id`, `update_time`) VALUES (19, NULL, NULL, 'code.expired.time', '短信验证码有效时间', '2', NULL, 1, 1, 1, NULL, NULL, NULL);
 INSERT INTO `sys_config` (`id`, `school_id`, `org_id`, `config_key`, `config_name`, `config_value`, `remark`, `enable`, `sort`, `create_id`, `create_time`, `update_id`, `update_time`) VALUES (20, NULL, NULL, 'code.send.interval', '短信验证码发送间隔', '60', NULL, 1, 1, 1, NULL, NULL, NULL);
-INSERT INTO `sys_config` (`id`, `school_id`, `org_id`, `config_key`, `config_name`, `config_value`, `remark`, `enable`, `sort`, `create_id`, `create_time`, `update_id`, `update_time`) VALUES (21, NULL, NULL, 'teachcloud.print.open.callback.pwd', '分布式印刷回调密码', 'qmth87863577-online', NULL, 1, 1, 1, NULL, NULL, NULL);
+INSERT INTO `sys_config` (`id`, `school_id`, `org_id`, `config_key`, `config_name`, `config_value`, `remark`, `enable`, `sort`, `create_id`, `create_time`, `update_id`, `update_time`) VALUES (21, NULL, NULL, 'teachcloud.print.open.callback.pwd', '分布式印刷回调密码', 'qmth87863577-offline', NULL, 1, 1, 1, NULL, NULL, NULL);
 INSERT INTO `sys_config` (`id`, `school_id`, `org_id`, `config_key`, `config_name`, `config_value`, `remark`, `enable`, `sort`, `create_id`, `create_time`, `update_id`, `update_time`) VALUES (24, NULL, NULL, 'sms.sign.name', '短信签名', '知学知考', NULL, 1, 1, 1, NULL, NULL, NULL);
 INSERT INTO `sys_config` (`id`, `school_id`, `org_id`, `config_key`, `config_name`, `config_value`, `remark`, `enable`, `sort`, `create_id`, `create_time`, `update_id`, `update_time`) VALUES (25, NULL, NULL, 'sms.tpl.code', '登录短信验证码', 'SMS_147416565', NULL, 1, 2, 1, NULL, NULL, NULL);
 INSERT INTO `sys_config` (`id`, `school_id`, `org_id`, `config_key`, `config_name`, `config_value`, `remark`, `enable`, `sort`, `create_id`, `create_time`, `update_id`, `update_time`) VALUES (26, NULL, NULL, 'sms.audit.pass.code', '命题任务审核通过', 'SMS_216425141', NULL, 1, 3, 1, NULL, NULL, NULL);

distributed-print/install/mysql/upgrade/3.3.0.sql

@@ -818,6 +818,8 @@ DELETE FROM `sys_privilege` WHERE (`id` = '822');
 DELETE FROM `sys_privilege` WHERE (`id` = '823');
 DELETE FROM `sys_privilege` WHERE (`id` = '824');
 DELETE FROM `sys_privilege` WHERE (`id` = '818');
+
+delete from t_b_task where type in ('COURSE_IMPORT', 'ORG_IMPORT');
 delete from t_b_sync_task where type in ('EXAM_PUSH','STRUCTURE_GROUP_PUSH','MARK_LEADER_PUSH','MARKER_PUSH','PAPER_ANSWER_FILE_PUSH','OBJECTIVE_ANSWER_PUSH', 'SCORE_PUSH');
 ALTER TABLE `t_b_sync_task`
     DROP COLUMN `org_code`,
@@ -846,7 +848,6 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('489', '成绩报告', 'ScoreReport', 'LINK', '487', '2', 'AUTH', '494', '1', '0', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('490', '列表查询', '/api/admin/mark/archive/student/list', 'URL', '488', '1', 'AUTH', NULL, '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('494', '报告数据', '/api/admin/mark/archive/score/report', 'URL', '489', '1', 'AUTH', '1', '1', '1');
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1009', '任务列表', '/api/scan/task/omr/list', 'URL', '970', '37', 'AUTH', '1', '1', '1');
 UPDATE `sys_privilege` SET `property` = 'SYS' WHERE (`id` = '370');
 delete from sys_config  where config_key = 'cloudmark.host.url';
 delete from sys_config  where config_key = 'cloudmark.sync.mode';
@@ -874,3 +875,7 @@ ADD COLUMN `undertaking_body` VARCHAR(300) NULL COMMENT '考生承诺书内容'
 
 ALTER TABLE `basic_template`
     ADD COLUMN `font_size` VARCHAR(10) DEFAULT 'SMALL' COMMENT '字体大小（small,medium,large）' AFTER `line_height_times`;
+
+ALTER TABLE `basic_operation_log`
+    CHANGE COLUMN `customized_operation_type` `customized_operation_type` VARCHAR(32) CHARACTER SET 'utf8' NULL COMMENT '自定义记录日志操作类型（LOGIN(\"用户登录\"),LOGOUT(\"用户登出\"),ADD(\"新增\"),DELETE(\"删除\"),UPDATE(\"修改\"),IMPORT(\"导入\"),EXPORT(\"导出\"),UN_KNOW(\"未知\")）' ;
+update basic_operation_log set customized_operation_type = null where customized_operation_type = '';

distributed-print/install/nginx/teachcloud-utf8.conf

@@ -1,5 +1,6 @@
 server {
         listen 7400;
+        access_log off;
         charset utf-8;
  
         location ^~ / {

distributed-print/install/nginx/teachcloud.conf

@@ -1,5 +1,6 @@
 server {
         listen 7400;
+        access_log off;
         charset utf-8;
  
         location ^~ / {

teachcloud-report/install/mysql/init/teachreport_db.sql

@@ -1754,7 +1754,7 @@ INSERT INTO `sys_config` VALUES (19, NULL, NULL, 'code.expired.time', '短信验
 INSERT INTO `sys_config` VALUES (20, NULL, NULL, 'code.send.interval', '短信验证码发送间隔', '60', NULL, 1, 1, 1, NULL, NULL, NULL);
 INSERT INTO `sys_config` VALUES (21, NULL, NULL, 'teachcloud.report.student.url', '学生报告地址', 'http://127.0.0.1:7500/#/student-report/', NULL, 1, 1, 1, NULL, NULL, NULL);
 INSERT INTO `sys_config` VALUES (22, NULL, NULL, 'teachcloud.report.login.url', '单点登录地址', 'http://127.0.0.1:7500/#/login-authen/', NULL, 1, 1, 1, NULL, NULL, NULL);
-INSERT INTO `sys_config` VALUES (23, NULL, NULL, 'teachcloud.print.open.callback.pwd', '分布式印刷回调密码', '123456', NULL, 1, 1, 1, NULL, NULL, NULL);
+INSERT INTO `sys_config` VALUES (23, NULL, NULL, 'teachcloud.print.open.callback.pwd', '分布式印刷回调密码', 'qmth87863577-offline', NULL, 1, 1, 1, NULL, NULL, NULL);
 INSERT INTO `sys_config` VALUES (24, NULL, NULL, 'sms.sign.name', '短信签名', '逸教云', NULL, 1, 1, 1, NULL, NULL, NULL);
 INSERT INTO `sys_config` VALUES (25, NULL, NULL, 'sms.tpl.code', '登录短信验证码', 'SMS_147416565', NULL, 1, 2, 1, NULL, NULL, NULL);
 INSERT INTO `sys_config` VALUES (26, NULL, NULL, 'sys.txt.charset', 'txt文件编码', 'utf8', NULL, 1, 1, 1, NULL, NULL, NULL);

teachcloud-report/install/nginx/teachreport.conf

@@ -1,5 +1,6 @@
 server {
         listen 7500;
+        access_log off;
 
         location /api/ {
             proxy_pass http://127.0.0.1:7580;