oss 新增cdn

coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDAO.java

@@ -4,11 +4,15 @@ import com.cool.store.constants.CommonConstants;
 import com.cool.store.entity.RegionDO;
 import com.cool.store.mapper.RegionMapper;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.ListUtils;
 import org.springframework.stereotype.Repository;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author zhangchenbiao
@@ -49,4 +53,12 @@ public class RegionDAO {
         return regionMapper.getRegionBaseInfoList();
     }
 
+    public Map<String, String> getRegionMap(List<String> regionIds){
+        if(CollectionUtils.isEmpty(regionIds)){
+            return Maps.newHashMap();
+        }
+        List<RegionDO> regionList = regionMapper.getRegionNameByRegionIds(regionIds);
+        return ListUtils.emptyIfNull(regionList).stream().collect(Collectors.toMap(RegionDO::getRegionId, RegionDO::getName));
+    }
+
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java

@@ -39,6 +39,13 @@ public interface RegionMapper {
      */
     List<RegionDO> getRegionByRegionIds(@Param("regionIds")List<String> regionIds);
 
+    /**
+     * 根据区域id获取名称
+     * @param regionIds
+     * @return
+     */
+    List<RegionDO> getRegionNameByRegionIds(@Param("regionIds")List<String> regionIds);
+
     /**
      * 获取区域基本信息
      * @return

coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml

@@ -169,6 +169,16 @@
 
     </select>
 
+    <select id="getRegionNameByRegionIds" resultMap="BaseResultMap">
+        select
+            region_id, name
+        from
+            region
+        where
+            deleted = 0 and region_id in <foreach collection="regionIds" item="regionId" separator="," open="(" close=")">#{regionId}</foreach>
+
+    </select>
+
     <select id="getRegionBaseInfoList" resultMap="BaseResultMap">
         select
             region_id, name, parent_id

coolstore-partner-model/src/main/java/com/cool/store/vo/oss/OssUploadConfigVO.java

@@ -30,13 +30,17 @@ public class OssUploadConfigVO {
     @ApiModelProperty("上传策略Policy失效时间")
     private String expire;
 
-    public OssUploadConfigVO(String accessKeyId, String policy, String signature, String dir, String host, String expire) {
+    @ApiModelProperty("cdn地址")
+    private String cdnUrl;
+
+    public OssUploadConfigVO(String accessKeyId, String policy, String signature, String dir, String host, String expire, String cdnUrl) {
         this.accessKeyId = accessKeyId;
         this.policy = policy;
         this.signature = signature;
         this.dir = dir;
         this.host = host;
         this.expire = expire;
+        this.cdnUrl = cdnUrl;
     }
 
 }

coolstore-partner-webb/src/main/java/com/cool/store/config/XxlJobConfig.java

@@ -53,7 +53,6 @@ public class XxlJobConfig {
         xxlJobSpringExecutor.setAccessToken(accessToken);
         xxlJobSpringExecutor.setLogPath(logPath);
         xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
-        logger.info(">>>>>>>>>>> xxl-job config finish,adminAddresses:{}，appName:{}", adminAddresses, appName);
         return xxlJobSpringExecutor;
     }
 

coolstore-partner-webb/src/main/java/com/cool/store/controller/OssClientController.java

@@ -40,6 +40,8 @@ public class OssClientController {
     private String bucket;
     @Value("${corp.id:null}")
     private String corpId;
+    @Value("${cdn.url:null}")
+    private String cdnUrl;
 
     @GetMapping("/getUploadFileConfig")
     public ResponseResult getUploadFileConfig(){
@@ -60,7 +62,7 @@ public class OssClientController {
             byte[] binaryData = postPolicy.getBytes("utf-8");
             String encodedPolicy = BinaryUtil.toBase64String(binaryData);
             String signature = client.calculatePostSignature(postPolicy);
-            OssUploadConfigVO result = new OssUploadConfigVO(accessKeyId, encodedPolicy, signature, dir, host, String.valueOf(expireEndTime / 1000));
+            OssUploadConfigVO result = new OssUploadConfigVO(accessKeyId, encodedPolicy, signature, dir, host, String.valueOf(expireEndTime / 1000), cdnUrl);
             return ResponseResult.success(result);
         }catch (Exception e){
             log.info("exception", e);

coolstore-partner-webb/src/main/resources/application-ab.properties

@@ -46,7 +46,11 @@ oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur
 oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2
 oss.endpoint=oss-cn-hangzhou.aliyuncs.com
 oss.bucket=cool-store-hsay
+
+#企业corpId
 corp.id = 171cddee76471740
+#cdn地址
+cdn.url=https://testhsaypic.coolstore.cn
 
 #TRTC
 trtc.sdkAppId=1400811820

coolstore-partner-webb/src/main/resources/application-local.properties

@@ -49,7 +49,11 @@ oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur
 oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2
 oss.endpoint=oss-cn-hangzhou.aliyuncs.com
 oss.bucket=vec-coolstore
+
+#企业corpId
 corp.id = 171cddee76471740
+#cdn地址
+cdn.url=https://testhsaypic.coolstore.cn
 
 #TRTC
 trtc.sdkAppId=1400811820

coolstore-partner-webc/src/main/java/com/cool/store/controller/OssClientController.java

@@ -37,6 +37,8 @@ public class OssClientController {
     private String bucket;
     @Value("${corp.id:null}")
     private String corpId;
+    @Value("${cdn.url:null}")
+    private String cdnUrl;
 
     @GetMapping("/getUploadFileConfig")
     public ResponseResult getUploadFileConfig(){
@@ -57,7 +59,7 @@ public class OssClientController {
             byte[] binaryData = postPolicy.getBytes("utf-8");
             String encodedPolicy = BinaryUtil.toBase64String(binaryData);
             String signature = client.calculatePostSignature(postPolicy);
-            OssUploadConfigVO result = new OssUploadConfigVO(accessKeyId, encodedPolicy, signature, dir, host, String.valueOf(expireEndTime / 1000));
+            OssUploadConfigVO result = new OssUploadConfigVO(accessKeyId, encodedPolicy, signature, dir, host, String.valueOf(expireEndTime / 1000), cdnUrl);
             return ResponseResult.success(result);
         }catch (Exception e){
             log.info("exception", e);

coolstore-partner-webc/src/main/resources/application-ab.properties

@@ -46,7 +46,11 @@ oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur
 oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2
 oss.endpoint=oss-cn-hangzhou.aliyuncs.com
 oss.bucket=cool-store-hsay
+
+#企业corpId
 corp.id = 171cddee76471740
+#cdn地址
+cdn.url=https://testhsaypic.coolstore.cn
 
 #TRTC
 trtc.sdkAppId=1400811820

coolstore-partner-webc/src/main/resources/application-local.properties

@@ -50,7 +50,11 @@ oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3
 oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS
 oss.endpoint=oss-cn-shanghai.aliyuncs.com
 oss.bucket=vec-coolstore
+
+#企业corpId
 corp.id = 171cddee76471740
+#cdn地址
+cdn.url=https://testhsaypic.coolstore.cn
 
 #TRTC
 trtc.sdkAppId=1400811820