Merge branch '20250408-wyp-contentPlatform' into test

common-module/src/main/java/com/tzld/piaoquan/growth/common/common/enums/EnumUploadFileType.java → api-module/src/main/java/com/tzld/piaoquan/api/common/enums/EnumUploadFileType.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.growth.common.common.enums;
+package com.tzld.piaoquan.api.common.enums;
 
 public enum EnumUploadFileType {
 	FILE(4,"4"),

common-module/src/main/java/com/tzld/piaoquan/growth/common/config/AliOssConfig.java → api-module/src/main/java/com/tzld/piaoquan/api/config/AliOssConfig.java

@@ -1,13 +1,13 @@
-package com.tzld.piaoquan.growth.common.config;
+package com.tzld.piaoquan.api.config;
 
 import com.aliyun.oss.ClientConfiguration;
 import com.aliyun.oss.OSSClient;
 import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.IAcsClient;
 import com.aliyuncs.profile.DefaultProfile;
-import com.tzld.piaoquan.growth.common.model.vo.PolicyDetailVO;
-import com.tzld.piaoquan.growth.common.utils.AliOssFileTool;
-import com.tzld.piaoquan.growth.common.utils.PropertiesUtils;
+import com.tzld.piaoquan.api.util.AliOssFileTool;
+import com.tzld.piaoquan.api.util.PropertiesUtils;
+import com.tzld.piaoquan.api.model.vo.PolicyDetailVO;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Value;

api-module/src/main/java/com/tzld/piaoquan/api/controller/FileController.java

@@ -1,13 +1,13 @@
 package com.tzld.piaoquan.api.controller;
 
-import com.stuuudy.commons.external.filestorage.alibaba.AliOssConfig;
 import com.stuuudy.commons.external.filestorage.enums.EnumPublicBuckets;
 import com.tzld.piaoquan.api.common.enums.ExceptionEnum;
 import com.tzld.piaoquan.api.common.exception.CommonException;
+import com.tzld.piaoquan.api.config.AliOssConfig;
 import com.tzld.piaoquan.api.model.param.FileUploadParam;
 import com.tzld.piaoquan.api.model.vo.FileInfo;
+import com.tzld.piaoquan.api.util.AliOssFileTool;
 import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
-import com.tzld.piaoquan.growth.common.utils.AliOssFileTool;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;

common-module/src/main/java/com/tzld/piaoquan/growth/common/model/vo/PolicyDetailVO.java → api-module/src/main/java/com/tzld/piaoquan/api/model/vo/PolicyDetailVO.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.growth.common.model.vo;
+package com.tzld.piaoquan.api.model.vo;
 
 import java.util.List;
 

common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/AliOssFileTool.java → api-module/src/main/java/com/tzld/piaoquan/api/util/AliOssFileTool.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.growth.common.utils;
+package com.tzld.piaoquan.api.util;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -27,8 +27,9 @@ import com.stuuudy.commons.util.CompressImage;
 import com.stuuudy.commons.util.MD5.Md5Util;
 import com.stuuudy.commons.util.exception.CommonsException;
 import com.stuuudy.commons.util.exception.EnumErrorException;
-import com.tzld.piaoquan.growth.common.common.enums.EnumUploadFileType;
-import com.tzld.piaoquan.growth.common.config.AliOssConfig;
+import com.tzld.piaoquan.api.config.AliOssConfig;
+import com.tzld.piaoquan.api.common.enums.EnumUploadFileType;
+import com.tzld.piaoquan.growth.common.utils.DateUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;

common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/CdnUtil.java → api-module/src/main/java/com/tzld/piaoquan/api/util/CdnUtil.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.growth.common.utils;
+package com.tzld.piaoquan.api.util;
 
 import com.alibaba.fastjson.JSON;
 import com.aliyuncs.DefaultAcsClient;

common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/PropertiesUtils.java → api-module/src/main/java/com/tzld/piaoquan/api/util/PropertiesUtils.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.growth.common.utils;
+package com.tzld.piaoquan.api.util;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;