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

# Conflicts:
#	distributed-print/src/main/java/com/qmth/distributed/print/api/ConditionController.java

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

@@ -24,7 +24,6 @@ import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.util.CreatePrintPdfUtil;
 import com.qmth.distributed.print.business.util.HtmlToPdfUtil;
 import com.qmth.distributed.print.business.util.PdfUtil;
-import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
 import com.qmth.teachcloud.common.bean.dto.MqDto;
 import com.qmth.teachcloud.common.bean.params.ArraysParams;
 import com.qmth.teachcloud.common.bean.result.BasicStudentResult;
@@ -441,12 +440,11 @@ public class PrintCommonServiceImpl implements PrintCommonService {
 
             FileCopyUtils.copy(htmlContent.getBytes(StandardCharsets.UTF_8), htmlFile);
 
+            HtmlToPdfUtil.convert(htmlFile.getPath(), pdfFile.getPath(), PageSizeEnum.A4);
             String htmlFileMd5 = DigestUtils.md5Hex(new FileInputStream(htmlFile));
             String pdfFileMd5 = DigestUtils.md5Hex(new FileInputStream(pdfFile));
-
             jsonObject.put("htmlMd5", htmlFileMd5);
             jsonObject.put("pdfMd5", pdfFileMd5);
-            HtmlToPdfUtil.convert(htmlFile.getPath(), pdfFile.getPath(), PageSizeEnum.A4);
             if (oss || (!oss && dictionaryConfig.fssPrivateDomain().getConfig().startsWith(SystemConstant.START_PARENT))) {//上传至oss
                 jsonObject.put(SystemConstant.TYPE, oss ? SystemConstant.OSS : SystemConstant.LOCAL);
                 fileStoreUtil.ossUpload(htmlDirName, htmlContent, fileStoreUtil.getUploadEnumByPath(htmlDirName).getFssType());

distributed-print-business/src/main/resources/db/3.2.3更新脚本-增量.sql

@@ -1260,4 +1260,13 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 
 UPDATE `sys_privilege` SET `url` = '/api/admin/teach/clazz/page' WHERE (`id` = '842');
 UPDATE `sys_privilege` SET `url` = 'Enable' WHERE (`id` = '559');
-UPDATE `sys_privilege` SET `related` = '77,842,843,844,845,846,847,848,849,850,851,852,853' WHERE (`id` = '841');
+UPDATE `sys_privilege` SET `related` = '77,842,843,844,845,846,847,848,849,850,851,852,853' WHERE (`id` = '841');
+
+ALTER TABLE `basic_operation_log`
+    ADD COLUMN `privilege_id` BIGINT NULL COMMENT '权限菜单id' AFTER `url`;
+ALTER TABLE `basic_operation_log`
+    ADD INDEX `operation_log_idx` (`school_id` ASC, `customized_operation_type` ASC, `org_id` ASC, `user_id` ASC , `create_time` ASC) VISIBLE;
+;
+ALTER TABLE `basic_role_data_permission`
+    ADD INDEX `role_data_permission_idx` (`role_id` ASC, `privilege_id` ASC) VISIBLE;
+;

distributed-print/src/main/resources/application.properties

@@ -75,8 +75,8 @@ com.qmth.fss.private.server=/static/
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=true
 sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
-sys.config.serverUpload=
-spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
+#sys.config.serverUpload=
+#spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
 #com.qmth.api.uri-prefix=/aaa
 #\u7EDF\u8BA1\u9875\u9762\u914D\u7F6E

teachcloud-common/src/main/java/com/qmth/teachcloud/common/aspect/LogAspect.java

@@ -109,6 +109,7 @@ public class LogAspect {
         String userName = requestUser.getRealName();
         HttpServletRequest request = ServletUtil.getRequest();
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+        Long privilegeId = ServletUtil.getCurrentPrivilegeId();
         String clazzName = signature.getDeclaringTypeName();
         String methodName = signature.getName();
         Object[] args = joinPoint.getArgs();
@@ -131,6 +132,7 @@ public class LogAspect {
         operationLog.setIp(ServletUtil.getIP());
         operationLog.setCreateTime(System.currentTimeMillis());
         operationLog.setOrgId(requestUser.getOrgId());
+        operationLog.setPrivilegeId(privilegeId);
 
         // 注解中的信息
         OperationLogDetail annotation = signature.getMethod().getAnnotation(OperationLogDetail.class);

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/BasicOperationLog.java

@@ -50,6 +50,10 @@ public class BasicOperationLog implements Serializable {
     @ApiModelProperty(value = "请求地址url")
     private String url;
 
+    @ApiModelProperty(value = "父菜单权限id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long privilegeId;
+
     @ApiModelProperty(value = "类名称")
     private String clazzName;
 
@@ -163,6 +167,14 @@ public class BasicOperationLog implements Serializable {
         this.url = url;
     }
 
+    public Long getPrivilegeId() {
+        return privilegeId;
+    }
+
+    public void setPrivilegeId(Long privilegeId) {
+        this.privilegeId = privilegeId;
+    }
+
     public String getClazzName() {
         return clazzName;
     }

teachcloud-report/src/main/resources/application.properties

@@ -35,8 +35,8 @@ com.qmth.fss.private.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-pr
 
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=false
-sys.config.serverUpload=
-spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
+#sys.config.serverUpload=
+#spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
 #com.qmth.api.uri-prefix=/aaa
 #\u7EDF\u8BA1\u9875\u9762\u914D\u7F6E

teachcloud-task/src/main/resources/application.properties

@@ -13,7 +13,7 @@ spring.application.name=teachcloud-task
 #\u6570\u636E\u6E90\u914D\u7F6E
 db.host=localhost
 db.port=3306
-db.name=distributed-v3.2.0
+db.name=distributed-v3.2.3
 db.username=root
 db.password=123456789
 
@@ -71,8 +71,8 @@ com.qmth.fss.private.server=/static/
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=true
 sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
-sys.config.serverUpload=
-spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
+#sys.config.serverUpload=
+#spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
 #\u65E5\u671F\u683C\u5F0F\u5316
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss