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

distributed-print-business/src/main/java/com/qmth/distributed/print/business/backup/MySQLDatabaseBackup.java

@@ -244,6 +244,8 @@ public class MySQLDatabaseBackup {
                         commonCacheService.removeSysConfigCache(s.getSchoolId(), s.getConfigKey());
                     }
                 }
+                commonCacheService.removeSchoolRoleCache(schoolId);
+                commonCacheService.removeSchoolPrivilegeCache(schoolId);
                 if (Objects.nonNull(file)) {
                     file.delete();
                 }

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

@@ -53,6 +53,8 @@ INSERT INTO sys_role
 (id, school_id, org_id, name, enable, `type`, create_id, create_time, update_id, update_time, default_role, source, interpret)
 VALUES(11, NULL, NULL, '学院秘书', 1, 'ASSISTANT', NULL, NULL, NULL, NULL, 1, 'SYS', '系统内置');
 
+delete t from sys_role_privilege t where t.role_id = 9;
+
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
 VALUES(99, 9, 1, 1);
@@ -517,9 +519,6 @@ INSERT INTO sys_role_privilege
 VALUES(252, 9, 477, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(253, 9, 509, 1);
-INSERT INTO sys_role_privilege
-(id, role_id, privilege_id, enable)
 VALUES(254, 9, 510, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
@@ -571,9 +570,6 @@ INSERT INTO sys_role_privilege
 VALUES(270, 9, 526, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(271, 9, 532, 1);
-INSERT INTO sys_role_privilege
-(id, role_id, privilege_id, enable)
 VALUES(272, 9, 533, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
@@ -845,6 +841,13 @@ VALUES(361, 9, 816, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
 VALUES(362, 9, 817, 1);
+INSERT INTO sys_role_privilege
+(id, role_id, privilege_id, enable)
+VALUES(479, 9, 828, 1);
+INSERT INTO sys_role_privilege
+(id, role_id, privilege_id, enable)
+VALUES(480, 9, 829, 1);
+
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
 VALUES(363, 10, 40, 1);
@@ -970,6 +973,9 @@ INSERT INTO sys_role_privilege
 VALUES(403, 10, 807, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
+
+delete t from sys_role_privilege t where t.role_id = 11;
+
 VALUES(404, 11, 483, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
@@ -1009,121 +1015,115 @@ INSERT INTO sys_role_privilege
 VALUES(416, 11, 576, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(417, 11, 577, 1);
-INSERT INTO sys_role_privilege
-(id, role_id, privilege_id, enable)
-VALUES(418, 11, 578, 1);
-INSERT INTO sys_role_privilege
-(id, role_id, privilege_id, enable)
-VALUES(419, 11, 579, 1);
+VALUES(443, 11, 650, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(420, 11, 580, 1);
+VALUES(445, 11, 666, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(421, 11, 581, 1);
+VALUES(446, 11, 667, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(422, 11, 582, 1);
+VALUES(447, 11, 668, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(423, 11, 583, 1);
+VALUES(448, 11, 669, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(424, 11, 584, 1);
+VALUES(449, 11, 670, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(425, 11, 585, 1);
+VALUES(450, 11, 671, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(426, 11, 586, 1);
+VALUES(451, 11, 672, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(427, 11, 587, 1);
+VALUES(452, 11, 673, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(428, 11, 588, 1);
+VALUES(453, 11, 674, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(429, 11, 589, 1);
+VALUES(454, 11, 753, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(430, 11, 590, 1);
+VALUES(455, 11, 754, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(431, 11, 591, 1);
+VALUES(456, 11, 77, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(432, 11, 592, 1);
+VALUES(457, 11, 830, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(433, 11, 593, 1);
+VALUES(458, 11, 831, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(434, 11, 594, 1);
+VALUES(459, 11, 832, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(435, 11, 595, 1);
+VALUES(460, 11, 833, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(436, 11, 596, 1);
+VALUES(461, 11, 834, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(437, 11, 597, 1);
+VALUES(462, 11, 835, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(438, 11, 598, 1);
+VALUES(463, 11, 836, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(439, 11, 599, 1);
+VALUES(464, 11, 837, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(440, 11, 600, 1);
+VALUES(465, 11, 838, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(441, 11, 601, 1);
+VALUES(466, 11, 839, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(442, 11, 608, 1);
+VALUES(467, 11, 840, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(443, 11, 650, 1);
+VALUES(468, 11, 841, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(444, 11, 662, 1);
+VALUES(467, 11, 842, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(445, 11, 666, 1);
+VALUES(468, 11, 843, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(446, 11, 667, 1);
+VALUES(469, 11, 844, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(447, 11, 668, 1);
+VALUES(470, 11, 845, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(448, 11, 669, 1);
+VALUES(471, 11, 846, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(449, 11, 670, 1);
+VALUES(472, 11, 847, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(450, 11, 671, 1);
+VALUES(473, 11, 848, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(451, 11, 672, 1);
+VALUES(474, 11, 849, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(452, 11, 673, 1);
+VALUES(475, 11, 850, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(453, 11, 674, 1);
+VALUES(476, 11, 851, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(454, 11, 753, 1);
+VALUES(477, 11, 852, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(455, 11, 754, 1);
+VALUES(478, 11, 853, 1);
 
 UPDATE sys_privilege
 SET name='课程管理'
@@ -1155,6 +1155,14 @@ UPDATE sys_privilege
 SET name='管理'
 WHERE id=585;
 
+UPDATE sys_privilege
+SET enable=0, default_auth=0, front_display=0
+WHERE id=509;
+
+UPDATE sys_privilege
+SET enable=0, default_auth=1, front_display=0
+WHERE id=532;
+
 /*曹子轩新增*/
 ALTER TABLE `teach_clazz`
     CHANGE COLUMN `teach_course_id` `basic_course_id` BIGINT NOT NULL COMMENT '基础课程主键' ,

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

@@ -89,7 +89,7 @@ public class LogAspect {
                 //方法执行完成后增加日志
                 addOperationLog(joinPoint, res, endTime - beginTime, runStatus);
             } catch (Exception e) {
-                System.out.println("LogAspect 操作失败：" + e.getMessage());
+                log.error("LogAspect 操作失败：" + e.getMessage());
                 e.printStackTrace();
             }
         }
@@ -143,7 +143,7 @@ public class LogAspect {
             }
             operationLog.setLevel(annotation.level());
             CustomizedOperationTypeEnum customizedOperationType = annotation.customizedOperationType();
-            if (CustomizedOperationTypeEnum.EDIT.equals(customizedOperationType)){
+            if (CustomizedOperationTypeEnum.EDIT.equals(customizedOperationType)) {
                 customizedOperationType = this.getAddOrUpdateByParam(args);
             }
 
@@ -197,7 +197,7 @@ public class LogAspect {
                 }
             }
             Class<?> supperClazz = clazz.getSuperclass();
-            if (Objects.nonNull(supperClazz)){
+            if (Objects.nonNull(supperClazz)) {
                 Field[] supperFields = supperClazz.getDeclaredFields();
                 for (Field field : supperFields) {
                     EditKey editKey = field.getAnnotation(EditKey.class);
@@ -280,8 +280,7 @@ public class LogAspect {
 
     @Before(value = "operationLog()")
     public void doBeforeAdvice(JoinPoint joinPoint) {
-        System.out.println("进入方法前执行.....");
-
+        log.info("进入方法前执行.....");
     }
 
     /**
@@ -291,7 +290,7 @@ public class LogAspect {
      */
     @AfterReturning(returning = "ret", pointcut = "operationLog()")
     public void doAfterReturning(Object ret) {
-        System.out.println("方法的返回值 : " + ret);
+        log.info("方法的返回值 : " + ret);
     }
 
     /**
@@ -299,7 +298,7 @@ public class LogAspect {
      */
     @AfterThrowing(value = "operationLog()")
     public void throwss(JoinPoint jp) {
-        System.out.println("方法异常时执行.....");
+        log.info("方法异常时执行.....");
     }
 
 
@@ -308,6 +307,6 @@ public class LogAspect {
      */
     @After(value = "operationLog()")
     public void after(JoinPoint jp) {
-        System.out.println("方法最后执行.....");
+        log.info("方法最后执行.....");
     }
 }