Merge remote-tracking branch 'origin/master'

pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.0.RELEASE</version> <!-- 使用最新的稳定版或其他适用版本 -->
+        <version>2.7.18</version> <!-- 使用最新的稳定版或其他适用版本 -->
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>com.malk</groupId>
             <artifactId>base</artifactId>
-            <version>1.2-SNAPSHOT</version>
+            <version>1.3</version>
         </dependency>
 
         <dependency>
@@ -92,6 +92,11 @@
             <artifactId>spire.pdf.free</artifactId>
             <version>5.1.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
     </dependencies>
 

src/main/java/com/malk/pro/zyjn/service/impl/ZyjnServiceImpl.java

@@ -373,8 +373,6 @@ public class ZyjnServiceImpl implements ZyjnService {
             workbook.close();
         } catch (IOException | EncryptedDocumentException e) {
             e.printStackTrace();
-        } catch (InvalidFormatException e) {
-            throw new RuntimeException(e);
         }
 
         //更新宜搭考勤表

src/main/resources/application-dev.yml

@@ -13,9 +13,10 @@ enable:
   scheduling: false
 logging:
   config: classpath:logback-spring.xml
-  path: /home/server/pro/log/
   level:
     com.malk.*: debug
+  file:
+    path: /home/server/pro/log/
 
 mybatis-plus:
   configuration: