core

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/issue/IssueOrderStep.java

@@ -17,7 +17,7 @@ public enum IssueOrderStep {
     WAITING_SEND(8, "待发货"),
     WAITING_RECEIVE(9, "待收货"),
     WAITING_ACTIVE(10, "待激活"),
-    ACTIVED(11, "已完成"),
+    ACTIVED(11, "已完成"),//已激活
     APPLY_CHANGE(12, "申请换货"),
     APPLY_RETURN(13, "申请退货"),
     ORDER_CLOSE(14, "已结束"),

gly-base-core/src/main/java/cn/com/taiji/core/manager/comm/client/feign/FeignClientManager.java

@@ -19,6 +19,5 @@ public interface FeignClientManager {
 
     <RE extends AbstractSignTypeRequest<?>, RS extends AbstractSignTypeResponse> RS jsonPost(RE req, Class<RS> clazz, String ifCode, String accessToken)
         throws IOException;
-    <RE extends AbstractReqIdTypeRequest,RS> RS jsonPost(RE req, Class<RS> clazz, String ifCode, String accessToken) throws IOException;
     <RE extends AbstractSignTypeRequest<?>> SignJsonRequest createJsonRequest(RE req, String ifCode, String accessToken) throws EncryptException;
 }

gly-base-core/src/main/java/cn/com/taiji/core/manager/comm/client/feign/FeignClientManagerImpl.java

@@ -8,8 +8,6 @@ import cn.com.taiji.common.pub.json.JsonTools;
 import cn.com.taiji.core.manager.tools.sm4.SM4Utils;
 import cn.com.taiji.core.model.comm.protocol.*;
 import cn.hutool.json.JSONUtil;
-import com.zgglyun.common.manager.net.http.EncryptException;
-import com.zgglyun.common.pub.SignException;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -85,16 +83,6 @@ public class FeignClientManagerImpl extends AbstractManager implements FeignClie
         return handleOldSystemResponse(jsonRes, req.getResponseType(), jsonReq, req);
     }
 
-    @Override
-    @Deprecated
-    public <RE extends AbstractReqIdTypeRequest, RS> RS jsonPost(RE req, Class<RS> clazz, String ifCode,
-                                                                 String accessToken) throws IOException {
-        FeignCommClient client = feignClientFactory.getFeignClient(FeignCommClient.class, GATEWAY_SYSTEM.getAppId(),
-                GATEWAY_SYSTEM.getJsonUri());
-        SignJsonRequest jsonReq = createReqIdJsonRequest(req, ifCode, accessToken);
-        SignJsonResponse jsonRes = client.jsonApi(jsonReq);
-        return handleReqIDJsonResponse(jsonRes, clazz, jsonReq, req);
-    }
 
     @Override
     public <RE extends AbstractSignTypeRequest<?>> SignJsonRequest createJsonRequest(RE req, String ifCode,
@@ -211,60 +199,4 @@ public class FeignClientManagerImpl extends AbstractManager implements FeignClie
         }
         return rs;
     }
-
-    public static <RE extends AbstractReqIdTypeRequest, RS> RS decryptReqIdBizContent(SignJsonResponse jsonRes,
-        Class<RS> clazz, RE req) throws ApiRequestException {
-        // TODO 解密
-        String jsonStr = jsonRes.getBizContent();
-        return JSONUtil.toBean(jsonStr, clazz);
-    }
-    /**
-     * 通过中心平台调用，ifCode必传
-     */
-    @Deprecated
-    private <RE extends AbstractReqIdTypeRequest> SignJsonRequest createReqIdJsonRequest(RE req, String ifCode,
-                                                                                         String accessToken) throws EncryptException {
-        if (!hasText(ifCode)) {
-            throw new ApiRequestException("ifCode IS NULL", FileProtocolSystemError.SIGN_FAILED.getCode());
-        }
-
-        String reqId = commConfig.getAppId() + "_" + LocalDateTime.now().format(TimeTools.yyyyMMddHHmmssSSS) + "_"
-                + RandomStringUtils.randomNumeric(5);
-        req.setReqId(reqId);
-        SignJsonRequest jsonReq = new SignJsonRequest();
-        jsonReq.setAppId(commConfig.getAppId());
-        jsonReq.setIfCode(ifCode);
-        jsonReq.setReqId(reqId);
-        jsonReq.setTimestamp(LocalDateTime.now().format(TimeTools.ISO_LOCAL_DATE_TIME));
-        jsonReq.setEncryptType(commConfig.getEncryptType());
-        jsonReq.setSignType(commConfig.getSignType());
-        jsonReq.setBizContent(req.toJson());
-        if (hasText(accessToken)) {
-            jsonReq.setAccessToken(accessToken);
-        }
-        jsonReq.setSign(jsonReq.toSignContent(commConfig.getServerPublicKey()));
-        return jsonReq;
-    }
-    @Deprecated
-    private <RE extends AbstractReqIdTypeRequest, RS> RS handleReqIDJsonResponse(SignJsonResponse jsonRes,
-                                                                                 Class<RS> clazz, SignJsonRequest jsonReq, RE req) throws IOException {
-        if (jsonRes == null) {
-            logger.error("jsonRes is null ifCode:{},reqId:{}", jsonReq.getIfCode(), jsonReq.getReqId());
-            SignJsonResponse rs = new SignJsonResponse(FileProtocolSystemError.UNKNOWN_ERROR.getCode(), "调用接口返回空");
-            throw new ApiRequestException(rs.toJson(), rs.getStatusCode());
-        }
-        if (SignJsonResponse.SUCCESS_CODE != jsonRes.getStatusCode()) {
-            throw new ApiRequestException(jsonRes.toJson(), jsonRes.getStatusCode());
-        }
-        // 成功时返回具体类型
-        RS rs = decryptReqIdBizContent(jsonRes, clazz, req);
-
-        boolean verifyResult = verify(commConfig.getServerPublicKey(), null, jsonRes.getSign());
-        if (!verifyResult) {
-            throw new ApiRequestException("处理返回时验签失败:" + jsonReq.getReqId(),
-                    FileProtocolSystemError.SIGN_FAILED.getCode());
-        }
-        return rs;
-
-    }
 }

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/AbstractReqIdTypeRequest.java

@@ -1,25 +1,25 @@
-package cn.com.taiji.core.model.comm.protocol;
-
-import cn.com.taiji.common.model.BaseModel;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-/**
- * @Author ChenChao
- * @Date 2024/9/25 13:08
- * @Description 无参数化(response)、无三段式的request
- */
-
-public abstract class AbstractReqIdTypeRequest extends BaseModel {
-    @JsonIgnore
-    protected String reqId;
-    public String getReqId() {
-        return reqId;
-    }
-
-    public void setReqId(String reqId) {
-//        if (this.reqId != null) {
-//            throw new RuntimeException("不允许设置reqId");
-//        }
-        this.reqId = reqId;
-    }
-}
+//package cn.com.taiji.core.model.comm.protocol;
+//
+//import cn.com.taiji.common.model.BaseModel;
+//import com.fasterxml.jackson.annotation.JsonIgnore;
+//
+///**
+// * @Author ChenChao
+// * @Date 2024/9/25 13:08
+// * @Description 无参数化(response)、无三段式的request
+// */
+//
+//public abstract class AbstractReqIdTypeRequest extends BaseModel {
+//    @JsonIgnore
+//    protected String reqId;
+//    public String getReqId() {
+//        return reqId;
+//    }
+//
+//    public void setReqId(String reqId) {
+////        if (this.reqId != null) {
+////            throw new RuntimeException("不允许设置reqId");
+////        }
+//        this.reqId = reqId;
+//    }
+//}