Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_jshvc

pom.xml

@@ -10,10 +10,10 @@
         <mysql-connector-java.version>8.0.28</mysql-connector-java.version>
         <jaxb-api.version>2.3.1</jaxb-api.version>
         <slf4j.version>2.0.8</slf4j.version>
-        <logback.version>1.5.8</logback.version>
+        <logback.version>1.5.13</logback.version>
         <sa-token.version>1.25.0</sa-token.version>
         <easy-captcha.version>1.6.2</easy-captcha.version>
-        <commons-lang3.version>3.8.1</commons-lang3.version>
+        <commons-lang3.version>3.18.0</commons-lang3.version>
         <emoji-java.veision>4.0.0</emoji-java.veision>
         <jsoup.veision>1.15.3</jsoup.veision>
         <pinyin4j.veision>2.5.1</pinyin4j.veision>
@@ -57,7 +57,7 @@
             <version>4.35.37.ALL</version>
         </dependency>
 
-        <dependency>
+        <!--<dependency>
             <groupId>org.apache.axis</groupId>
             <artifactId>axis</artifactId>
             <version>1.4</version>
@@ -66,7 +66,7 @@
             <groupId>org.apache.axis</groupId>
             <artifactId>axis-ant</artifactId>
             <version>1.4</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>javax.xml</groupId>
             <artifactId>jaxrpc</artifactId>
@@ -102,6 +102,12 @@
             <groupId>io.minio</groupId>
             <artifactId>minio</artifactId>
             <version>8.2.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>javax.activation</groupId>
@@ -138,6 +144,17 @@
             <groupId>org.nutz</groupId>
             <artifactId>nutzboot-core</artifactId>
             <version>${nutzboot.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.yaml</groupId>
+                    <artifactId>snakeyaml</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>2.0</version>
         </dependency>
         <dependency>
             <groupId>org.nutz</groupId>
@@ -233,6 +250,18 @@
             <groupId>net.unicon.cas</groupId>
             <artifactId>cas-client-autoconfig-support</artifactId>
             <version>2.3.0-GA</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+            <version>2.6.15</version>
+            <scope>compile</scope>
         </dependency>
         <!--  html  -->
         <dependency>
@@ -319,12 +348,18 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.8.1</version>
+            <version>2.9.4</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.uuid</groupId>
             <artifactId>java-uuid-generator</artifactId>
             <version>3.1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!--         <dependency> -->
         <!--             <groupId>org.dromara.warm</groupId> -->
@@ -376,8 +411,18 @@
                     <artifactId>slf4j-api</artifactId>
                     <groupId>org.slf4j</groupId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>32.0.1-jre</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-openapi2-spring-boot-starter</artifactId>

src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java

@@ -284,8 +284,8 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo
         }
         sysHomeActivity.setH5Url("/platform/h5/activity/culture/signUp?id=" + this.getId());
         if (Lang.isNotEmpty(this.getApplyStartTime())) {
-            sysHomeActivity.setStartDate(DateUtil.parseDate(this.getApplyStartTime()));
-            sysHomeActivity.setEndDate(DateUtil.parseDate(this.getApplyEndTime()));
+            sysHomeActivity.setStartDate(DateUtil.parse(this.getApplyStartTime(), "yyyy-MM-dd HH:mm"));
+            sysHomeActivity.setEndDate(DateUtil.parse(this.getApplyEndTime(), "yyyy-MM-dd HH:mm"));
         }
         sysHomeActivity.setAllowUserGroupId(this.getGroupId());
         sysHomeActivity.setEnable(this.getIsUnseal());

src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html

@@ -156,12 +156,12 @@ layout("/layouts/platform.html"){
         computed: {
             welfareOptions() {
                 if (this.pageForm.projectId) {
-                    return this.projectOptions.find((item) => item.id === this.pageForm.projectId).options
+                    return this.projectOptions.find((item) => item.id === this.pageForm.projectId)?.options
                 }
                 return []
             },
             provideMode() {
-                return this.projectOptions.find((item) => item.id === this.pageForm.projectId).provideMode
+                return this.projectOptions.find((item) => item.id === this.pageForm.projectId)?.provideMode
             }
         },
         methods: {