fix: 合并master分支

hzims-service-api/big-model-api/src/main/java/com/hnac/hzims/bigmodel/api/feign/IVideoSyncClient.java

@@ -28,6 +28,6 @@ public interface IVideoSyncClient extends ISyncClient<VideoSyncDTO> {
 
     @Override
     @DeleteMapping(PREFIX_API + DELETE_BY_IDS)
-    R deleteByIds(@RequestParam String ids);
+    R deleteByIds(@RequestParam("ids") String ids);
 
 }

hzims-service/hzims-big-model/pom.xml

@@ -76,7 +76,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            <version>2.5.6</version>
+            <version>3.5.0</version>
         </dependency>
     </dependencies>
 

hzims-service/hzims-big-model/src/main/resources/template/template.yml

@@ -34,10 +34,6 @@ spring:
           url: jdbc:mysql://192.168.60.34:3576/test_hzims_inspect?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
           username: ${hzinfo.db.busines.username}
           password: ${hzinfo.db.busines.password}
-        basic:
-          url: jdbc:mysql://192.168.60.34:3576/test_basic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-          username: ${hzinfo.db.busines.username}
-          password: ${hzinfo.db.busines.password}
         alarm:
           url: jdbc:mysql://192.168.60.34:3576/test_hzims_alarm?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
           username: ${hzinfo.db.busines.username}
@@ -68,10 +64,10 @@ xxl:
   job:
     accessToken: ''
     admin:
-      addresses: http://${hzims.xxljob.ip}:${hzims.xxljob.port}/xxl-job-admin
+      addresses: http://${hzims.server.ip}:${hzims.xxljob.port}/xxl-job-admin
     executor:
       appname: hzims-big-model
-      ip: ${hzims.server.ip}
+      ip: ${hzims.xxljob.ip}
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: 7
       port: 28135