Api版权接口

joying-common/src/main/java/com/fzm/common/open/entity/openobject/BaseOO.java

@@ -15,12 +15,15 @@ public class BaseOO<T> {
     @NotBlank(message = "appKey不能为空")
     @ApiModelProperty(value = "appKey")
     private String appKey;
+
     @NotBlank(message = "业务id不能为空")
     @ApiModelProperty(value = "业务id")
     private String bizId;
+
     @NotBlank(message = "签名不能为空")
     @ApiModelProperty("签名")
     private String signature;
+
     @NotNull(message = "数据不能为空")
     @ApiModelProperty("数据")
     private T data;

joying-common/src/main/java/com/fzm/common/open/entity/openobject/CopyrightOO.java

@@ -107,4 +107,19 @@ public class CopyrightOO {
     @ApiModelProperty("内容")
     private String content;
 
+    public void setOpusCompleteDate(Date opusCompleteDate) {
+        if (opusCompleteDate == null) {
+            this.opusCompleteDate = new Date(0);
+            return;
+        }
+        this.opusCompleteDate = opusCompleteDate;
+    }
+
+    public void setFirstPublishDate(Date firstPublishDate) {
+        if (firstPublishDate == null) {
+            this.firstPublishDate = new Date(0);
+            return;
+        }
+        this.firstPublishDate = firstPublishDate;
+    }
 }

joying-common/src/main/java/com/fzm/common/open/entity/openobject/CopyrightOwnerOO.java

@@ -76,4 +76,20 @@ public class CopyrightOwnerOO {
 
     @ApiModelProperty(value = "委托证明")
     private String entrustProve;
+
+    public void setEffectiveStartDate(Date effectiveStartDate) {
+        if (effectiveStartDate == null) {
+            this.effectiveStartDate = new Date(0);
+            return;
+        }
+        this.effectiveStartDate = effectiveStartDate;
+    }
+
+    public void setEffectiveEndDate(Date effectiveEndDate) {
+        if (effectiveEndDate == null) {
+            this.effectiveEndDate = new Date(0);
+            return;
+        }
+        this.effectiveEndDate = effectiveEndDate;
+    }
 }

joying-common/src/main/java/com/fzm/common/utils/OpenSignUtils.java

 package com.fzm.common.utils;
 
+import cn.hutool.core.lang.TypeReference;
 import cn.hutool.crypto.SecureUtil;
+import cn.hutool.json.JSONUtil;
 import com.fzm.common.enums.ResultCode;
 import com.fzm.common.exception.GlobalException;
 
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -13,26 +20,95 @@ import java.util.TreeMap;
  */
 public class OpenSignUtils {
 
-    public static void verify(String appKey, String appKeySecret, String bizId, String bizJson, String signature) {
-        Map<String, String> param = new TreeMap<>();
+    public static void verify(String appKey, String appKeySecret, String bizId, Object obj, String signature) {
+        TreeMap<String, Object> param = new TreeMap<>();
         param.put("appKey", appKey);
         param.put("appKeySecret", appKeySecret);
         param.put("bizId", bizId);
-        param.put("bizJson", bizJson);
 
-        StringBuilder sb = new StringBuilder();
-        for (Map.Entry<String, String> entry : param.entrySet()) {
-            String key = entry.getKey();
-            String value = entry.getValue();
-            sb.append(key).append("=").append(value).append("&");
-        }
-        String signStr = sb.deleteCharAt(sb.length() - 1).toString();
+        String mapToStr = mapToStr(toTreeMap(obj));
+        String bizHash = SecureUtil.md5(mapToStr);
+        param.put("bizHash", bizHash);
+
+        mapToStr = mapToStr(param);
 
-        String md5 = SecureUtil.md5(signStr);
+        String md5 = SecureUtil.md5(mapToStr);
         boolean equals = signature.equals(md5);
         if (!equals) {
             throw GlobalException.newException(ResultCode.signature_wrong);
         }
     }
 
+    public static TreeMap<String, Object> toTreeMap(Object obj) {
+        return JSONUtil.toBean(JSONUtil.toJsonStr(obj), new TypeReference<TreeMap<String, Object>>() {
+        }, true);
+    }
+
+    private static String mapToStr(TreeMap<String, Object> treeMap) {
+        StringBuilder sb = new StringBuilder();
+
+        for (Map.Entry<String, Object> entry : treeMap.entrySet()) {
+            String k = entry.getKey();
+            Object v = entry.getValue();
+
+            if (v instanceof String) {
+                sb.append(k).append("=").append(v).append("&");
+                continue;
+            }
+
+            if (k.endsWith("Date")) {
+                long v1 = Long.parseLong(v.toString());
+                String s = "";
+                if (v1 > 0) {
+                    s = dateFormat(timestamp2DateTime(v1));
+                }
+                sb.append(k).append("=").append(s).append("&");
+                continue;
+            }
+
+            if (v instanceof Integer) {
+                sb.append(k).append("=").append(v).append("&");
+                continue;
+            }
+
+            if (v instanceof Long) {
+                sb.append(k).append("=").append(v).append("&");
+                continue;
+            }
+            if (v == null) {
+                sb.append(k).append("=").append("&");
+                continue;
+            }
+
+            if (v instanceof List) {
+                List list = (List) v;
+                Object o1 = list.get(0);
+                if (o1 instanceof Integer) {
+                    sb.append(k).append("=").append(list).append("&");
+                    continue;
+                }
+
+                StringBuilder sbSub = new StringBuilder();
+                for (Object o : list) {
+                    TreeMap<String, Object> map = toTreeMap(o);
+                    sbSub.append(mapToStr(map)).append("&");
+                }
+                String sbSubStr = sbSub.deleteCharAt(sbSub.length() - 1).toString();
+                String md5 = SecureUtil.md5(sbSubStr);
+                sb.append(k).append("=").append(md5).append("&");
+            }
+        }
+        return sb.deleteCharAt(sb.length() - 1).toString();
+    }
+
+    private static final DateTimeFormatter ymd = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+    private static LocalDateTime timestamp2DateTime(long timestamp) {
+        Instant instant = Instant.ofEpochMilli(timestamp);
+        return LocalDateTime.ofInstant(instant, ZoneId.of("Asia/Shanghai"));
+    }
+
+    public static String dateFormat(LocalDateTime dateTime) {
+        return dateTime.format(ymd);
+    }
 }

joying-portal/src/main/java/com/fzm/portal/controller/open/CopyrightApiController.java

 package com.fzm.portal.controller.open;
 
-import cn.hutool.json.JSONUtil;
 import com.fzm.common.constant.SystemConstant;
 import com.fzm.common.entity.vo.CopyrightStateVo;
 import com.fzm.common.enums.CopyrightApplyState;
@@ -48,18 +47,18 @@ public class CopyrightApiController {
             throw GlobalException.newException(ResultCode.VALIDATE_FAILED);
         }
 
-        String signature = baseOO.getSignature();
-        if (StringUtils.isBlank(signature)) {
-            throw GlobalException.newException(ResultCode.signature_wrong);
-        }
-
         String bizId = baseOO.getBizId();
         if (StringUtils.isBlank(bizId)) {
             throw GlobalException.newException(ResultCode.VALIDATE_FAILED);
         }
 
+        String signature = baseOO.getSignature();
+        if (StringUtils.isBlank(signature)) {
+            throw GlobalException.newException(ResultCode.signature_wrong);
+        }
+
         CopyrightOO copyrightOO = baseOO.getData();
-        OpenSignUtils.verify(appKey, openKeyDO.getAppKeySecret(), bizId, JSONUtil.toJsonStr(copyrightOO), signature);
+        OpenSignUtils.verify(appKey, openKeyDO.getAppKeySecret(), bizId, copyrightOO, signature);
 
         CopyrightApiDO apiDO = copyrightApiService.getByAppKeyAndBizId(appKey, bizId);
         if (apiDO != null) {