Merge remote-tracking branch 'refs/remotes/origin/dev-1.8.0-20241128' into dev-1.9.0-20250318

# Conflicts:
#	720yun_fd_consumer/gis_consumer/src/main/resources/application-proAws.yml

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/entity/WorkCoverTypeEntity.java

@@ -94,4 +94,8 @@ public class WorkCoverTypeEntity extends BaseEntity implements Serializable {
     @ApiModelProperty("关联fodderId")
     private Integer coverPcId;
 
+    @ApiModelProperty("关联fodderId")
+    private Integer coverBacId;
+    @ApiModelProperty("封面背景图片")
+    private String coverBac;
 }

720yun_fd_consumer/gis_consumer/src/main/resources/application-proAws.yml

@@ -9,15 +9,16 @@ logging:
         com:
             gis: info
     path: /root/data/${project.name}_log
-oss:
-    bucket: 4dkankan
-    domain: https://eurs3.4dkankan.com/
-    file:
-        path: 720yun_fd_manage/
-    key: LTAIUrvuHqj8pvry
-    point: http://oss-cn-shenzhen-internal.aliyuncs.com
-    secrecy: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
-    type: aws
+filestorage:
+    active: aws
+    aws:
+        endpoint: http://eurs3.4dkankan.com
+        internal-endpoint: http://eurs3.4dkankan.com
+        access-key: AKIAWCV5QFZ3ZNELKYUY
+        access-key-secret: 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
+        bucket: 4dkankan
+        bucket-custom-domain:
+            4dkankan: https://eurs3.4dkankan.com
 server:
     file:
         path: /mnt/720yun_fd_manage_data/
@@ -84,3 +85,5 @@ queue:
     pano-migrate-scene-queue: pano-migrate-scene-queue
     pano-paystatus-scene-queue: pano-paystatus-scene-queue
     scene-queue-work: queue-pano-scene-work-A
+config:
+    bashPath: 720yun_fd_manage/

720yun_fd_manage/gis_application/src/main/resources/application-proAws.yml

@@ -10,15 +10,17 @@ logging:
     level:
         com:
             gis: info
-oss:
-    bucket: 4dkankan
-    domain: https://eurs3.4dkankan.com/
-    file:
-        path: ${project.name}/
-    key: LTAIUrvuHqj8pvry
-    point: http://oss-cn-shenzhen-internal.aliyuncs.com
-    secrecy: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
-    type: aws
+filestorage:
+    active: aws
+    aws:
+        endpoint: http://eurs3.4dkankan.com
+        internal-endpoint: http://eurs3.4dkankan.com
+        access-key: AKIAWCV5QFZ3ZNELKYUY
+        access-key-secret: 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
+        bucket: 4dkankan
+        bucket-custom-domain:
+            4dkankan: https://eurs3.4dkankan.com
+        full-path: true
 server:
     domain: ''
     file:
@@ -97,4 +99,6 @@ forest:
 queue:
     scene-queue: queue-pano-scene
     do-slice-queue: queue-do-slice
-    relics-update-name-queue: relics-update-name-queue
+    relics-update-name-queue: relics-update-name-queue
+config:
+    bashPath: ${project.name}/

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/dto/WorkCoverTypeDto.java

@@ -97,6 +97,12 @@ public class WorkCoverTypeDto {
     @ApiModelProperty("关联fodderId")
     private Integer coverPcId;
 
+    @ApiModelProperty("关联fodderId")
+    private Integer coverBacId;
+    @ApiModelProperty("封面背景图片")
+    private String coverBac;
+
+
 //    @ApiModelProperty("fodderId集合 ")
 //    //string fodderId = string.Join(",", myList.Select(x => x.ToString()).ToArray());
 //    private List<String> fodderId;

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/dto/WorkHotDTO.java

@@ -91,7 +91,7 @@ public class WorkHotDTO implements Serializable {
      * 图标大小
      */
     @ApiModelProperty(value = "图标大小")
-    private Integer size;
+    private String size;
 
     /**
      * 不知道有啥用，但是需要保存

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/entity/WorkCoverTypeEntity.java

@@ -96,4 +96,8 @@ public class WorkCoverTypeEntity extends BaseEntity implements Serializable {
     @ApiModelProperty("关联fodderId")
     private Integer coverPcId;
 
+    @ApiModelProperty("关联fodderId")
+    private Integer coverBacId;
+    @ApiModelProperty("封面背景图片")
+    private String coverBac;
 }

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/entity/WorkHot.java

@@ -86,7 +86,7 @@ public class WorkHot implements Serializable {
      * 图标大小
      */
     @TableField("size")
-    private Integer size;
+    private String size;
 
     /**
      * 不知道有啥用，但是需要保存

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/vo/WorkCoverTypeVo.java

@@ -92,6 +92,11 @@ public class WorkCoverTypeVo {
     @ApiModelProperty("关联fodderId")
     private Integer coverPcId;
 
+    @ApiModelProperty("关联fodderId")
+    private Integer coverBacId;
+    @ApiModelProperty("封面背景图片")
+    private String coverBac;
+
 //    @ApiModelProperty("fodderId集合 ")
 //    //string fodderId = string.Join(",", myList.Select(x => x.ToString()).ToArray());
 //    private List<String> fodderId;

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/vo/WorkHotVO.java

@@ -90,7 +90,7 @@ public class WorkHotVO implements Serializable {
      * 图标大小
      */
     @ApiModelProperty(value = "图标大小")
-    private Integer size;
+    private String size;
 
     /**
      * 不知道有啥用，但是需要保存

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkBaseSettingServiceImpl.java

@@ -106,7 +106,9 @@ public class WorkBaseSettingServiceImpl implements WorkBaseSettingService {
             if (ObjUtil.isNotNull(workCoverType.getVideoPcId())){
                 workService.saveOrEditFodder(dto.getWorkId(), workCoverType.getVideoPcId(), SomeDataConstant.coverInfo);
             }
-
+            if (ObjUtil.isNotNull(workCoverType.getCoverBacId())){
+                workService.saveOrEditFodder(dto.getWorkId(), workCoverType.getCoverBacId(), SomeDataConstant.coverInfo);
+            }
 
             vo.setWorkCoverType(BeanUtil.toBean(workCoverType, WorkCoverTypeVo.class));
         }