5.0

sop-example/example-story/src/main/java/com/gitee/sop/storyweb/impl/OpenStoryImpl.java

@@ -65,6 +65,10 @@ public class OpenStoryImpl implements OpenStory {
         if (id == null || id == 0) {
             throw new OpenException(StoryMessageEnum.ISV_PARAM_ERROR, "id is null or 0");
         }
+        if (id < 0) {
+            // 自定义code, msg
+            throw new OpenException("4000", "id必须大于0");
+        }
         return 1;
     }
 

sop-example/example-story/src/main/java/com/gitee/sop/storyweb/message/StoryMessageEnum.java

@@ -1,6 +1,6 @@
 package com.gitee.sop.storyweb.message;
 
-import com.gitee.sop.support.message.OpenError;
+import com.gitee.sop.support.message.I18nMessage;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -9,24 +9,12 @@ import lombok.Getter;
  */
 @AllArgsConstructor
 @Getter
-public enum StoryMessageEnum implements OpenError {
+public enum StoryMessageEnum implements I18nMessage {
-    /**
-     * 未知错误
-     */
-    ISP_UNKNOWN_ERROR("isp.service-unknown-error"),
     /**
      * 参数错误
      */
-    ISV_PARAM_ERROR("isv.invalid-parameter"),
+    ISV_PARAM_ERROR("isv.invalid-parameter");
-    /**
-     * 通用错误
-     */
-    ISV_COMMON_ERROR("isv.common-error");
 
-    private final String subCode;
+    private final String configKey;
 
-    @Override
-    public String modulePrefix() {
-        return "isp.error_";
-    }
 }

sop-example/example-story/src/main/resources/i18n/bizerror_en.properties

@@ -0,0 +1,2 @@
+isv.invalid-parameter=Invalid parameter, {0}
+isv.invalid-parameter.solution=Check doc api and input right parameter.

sop-example/example-story/src/main/resources/i18n/bizerror_zh_CN.properties

@@ -0,0 +1,2 @@
+isv.invalid-parameter=\u53c2\u6570\u65e0\u6548, {0}
+isv.invalid-parameter.solution=\u67e5\u770b\u63a5\u53e3\u6587\u6863\u5e76\u8f93\u5165\u6b63\u786e\u7684\u53c2\u6570

sop-example/example-story/src/main/resources/i18n/isp/bizerror_en.properties

@@ -1,10 +0,0 @@
-# 错误配置
-
-# 系统配置
-isp.error_isv.common-error=The system is busy.
-isp.error_isv.invalid-parameter=Invalid parameter, {0}
-
-# ==== 参数配置 ====
-
-goods.remark.notNull=The goods_remark can not be null
-goods.comment.length=The goods_comment length must >= {0} and <= {1}

sop-example/example-story/src/main/resources/i18n/isp/bizerror_zh_CN.properties

@@ -1,14 +0,0 @@
-# 错误配置
-
-# 系统繁忙
-isp.error_isv.common-error=\u7cfb\u7edf\u7e41\u5fd9
-# 参数无效
-isp.error_isv.invalid-parameter=\u53c2\u6570\u65e0\u6548, {0}
-
-# ==== 参数配置 ====
-
-# 商品备注不能为空
-goods.remark.notNull=\u5546\u54c1\u5907\u6ce8\u4e0d\u80fd\u4e3a\u7a7a
-# 商品评论长度必须在{0}和{1}之间
-goods.comment.length=\u5546\u54c1\u8bc4\u8bba\u957f\u5ea6\u5fc5\u987b\u5728{0}\u548c{1}\u4e4b\u95f4
-

sop-example/example-story/src/main/resources/i18n/isp/goods_error_en.properties

@@ -1,2 +0,0 @@
-isp.goods_error_100=the goods_name can NOT be null
-isp.goods_error_101=the goods_name must bigger than {0}

sop-example/example-story/src/main/resources/i18n/isp/goods_error_zh_CN.properties

@@ -1,5 +0,0 @@
-# 商品名字不能为空
-isp.goods_error_100=\u5546\u54C1\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A
-
-# 商品名称太短，不能小于{0}个字
-isp.goods_error_101=\u5546\u54C1\u540D\u79F0\u592A\u77ED\uFF0C\u4E0D\u80FD\u5C0F\u4E8E{0}\u4E2A\u5B57

sop-gateway/src/main/java/com/gitee/sop/gateway/config/GatewayConfig.java

@@ -1,10 +1,11 @@
 package com.gitee.sop.gateway.config;
 
-import com.gitee.sop.gateway.message.ErrorFactory;
 import com.gitee.sop.gateway.service.ParamExecutor;
 import com.gitee.sop.gateway.service.ParamExecutorImpl;
 import com.gitee.sop.gateway.service.RouteService;
 import com.gitee.sop.gateway.service.RouteServiceImpl;
+import com.gitee.sop.gateway.service.Serde;
+import com.gitee.sop.gateway.service.SerdeImpl;
 import com.gitee.sop.gateway.service.interceptor.internal.ResultRouteInterceptor;
 import com.gitee.sop.gateway.service.manager.ApiManager;
 import com.gitee.sop.gateway.service.manager.IsvApiPermissionManager;
@@ -18,6 +19,7 @@ import com.gitee.sop.gateway.service.manager.impl.RedisApiManagerImpl;
 import com.gitee.sop.gateway.service.manager.impl.RedisIsvApiPermissionManagerImpl;
 import com.gitee.sop.gateway.service.manager.impl.RedisIsvManagerImpl;
 import com.gitee.sop.gateway.service.manager.impl.RedisSecretManager;
+import com.gitee.sop.support.message.OpenMessageFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -25,13 +27,14 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import javax.annotation.PostConstruct;
+import java.util.Collections;
 
 /**
  * @author 六如
  */
 @Configuration
 @Slf4j
-public class IndexConfig {
+public class GatewayConfig {
 
     @Bean
     @ConditionalOnProperty(value = "gateway.manager.api", havingValue = "local", matchIfMissing = true)
@@ -101,8 +104,14 @@ public class IndexConfig {
         return new RouteServiceImpl();
     }
 
+    @Bean
+    @ConditionalOnMissingBean
+    public Serde serde() {
+        return new SerdeImpl();
+    }
+
     @PostConstruct
     public void init() {
-        ErrorFactory.initMessageSource(null);
+        OpenMessageFactory.initMessage();
     }
 }

sop-gateway/src/main/java/com/gitee/sop/gateway/exception/ApiException.java

@@ -31,7 +31,7 @@ public class ApiException extends RuntimeException {
     }
 
     public IError getError() {
-        return errorEnum.getErrorMeta().getError(locale, params);
+        return errorEnum.getError(locale, params);
     }
 
     public ErrorEnum getErrorEnum() {
@@ -41,7 +41,7 @@ public class ApiException extends RuntimeException {
     @Override
     public String getMessage() {
         String message = super.getMessage();
-        return message == null ? errorEnum.getErrorMeta().toString() : message;
+        return message == null ? errorEnum.getSubCode() : message;
     }
 
 }

sop-gateway/src/main/java/com/gitee/sop/gateway/exception/impl/ExceptionExecutorImpl.java

@@ -43,20 +43,26 @@ public class ExceptionExecutorImpl implements ExceptionExecutor {
                 String errorMsg;
                 if (matcher.find()) {
                     errorMsg = matcher.group(1);
-                } else {
-                    errorMsg = "biz-error@@系统错误";
-                }
                     // isv.common-error@@系统错误@@
                     String[] msgAr = errorMsg.split("@@");
+                    String subCode = msgAr[0];
+                    String subMsg = msgAr[1];
+                    String solution = msgAr.length == 3 ? msgAr[2] : null;
                     return ApiResponse.error(
                             ErrorEnum.BIZ_ERROR,
                             apiRequestContext.getLocale(),
-                        msgAr[0],
+                            subCode,
-                        msgAr[1]
+                            subMsg,
+                            solution
                     );
+                } else {
+                    ErrorEnum bizError = ErrorEnum.ISP_SERVICE_UNKNOWN_ERROR;
+                    return ApiResponse.error(bizError.getError(apiRequestContext.getLocale()));
+                }
+
             }
         } else if (e instanceof ApiException) {
-            return ApiResponse.error(((ApiException) e));
+            return ApiResponse.error(((ApiException) e).getError());
         }
         return ApiResponse.error(ErrorEnum.ISP_SERVICE_UNKNOWN_ERROR, apiRequestContext.getLocale());
     }

sop-gateway/src/main/java/com/gitee/sop/gateway/message/CodeEnum.java

@@ -0,0 +1,44 @@
+package com.gitee.sop.gateway.message;
+
+import com.gitee.sop.support.message.I18nMessage;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author 六如
+ */
+@Getter
+@AllArgsConstructor
+public enum CodeEnum implements I18nMessage {
+    SUCCESS("0"),
+    /**
+     * 认证异常
+     */
+    AUTH("20001"),
+    /**
+     * 缺少参数
+     */
+    MISSING("40001"),
+    /**
+     * 错误参数
+     */
+    INVALID("40002"),
+    /**
+     * 业务异常
+     */
+    BIZ("50003"),
+    /**
+     * 权限异常
+     */
+    ISV_PERM("40006"),
+    /**
+     * 未知异常
+     */
+    UNKNOWN("99999");
+
+    private final String configKey;
+
+    public String getCode() {
+        return configKey;
+    }
+}

sop-gateway/src/main/java/com/gitee/sop/gateway/message/ErrorEnum.java

@@ -1,228 +1,246 @@
 package com.gitee.sop.gateway.message;
 
+import com.gitee.sop.support.message.I18nMessage;
+import com.gitee.sop.support.message.OpenMessage;
+import com.gitee.sop.support.message.OpenMessageFactory;
+import lombok.Getter;
+
+import java.util.Locale;
+
 /**
  * 网关错误定义
  *
  * @author 六如
  */
-public enum ErrorEnum {
+@Getter
+public enum ErrorEnum implements I18nMessage {
     /**
      * 成功
      */
-    SUCCESS(Codes.CODE_SUCCESS, ""),
+    SUCCESS(CodeEnum.SUCCESS, ""),
 
     /**
      * 服务暂不可用
      */
-    ISP_UNKNOWN_ERROR(Codes.CODE_UNKNOWN, "isp.unknown-error"),
+    ISP_UNKNOWN_ERROR(CodeEnum.UNKNOWN, "isp.unknown-error"),
     /**
      * 微服务未知错误
      */
-    ISP_SERVICE_UNKNOWN_ERROR(Codes.CODE_UNKNOWN, "isp.service-unknown-error"),
+    ISP_SERVICE_UNKNOWN_ERROR(CodeEnum.UNKNOWN, "isp.service-unknown-error"),
     /**
      * 服务不可用，路由被禁用
      */
-    ISP_API_DISABLED(Codes.CODE_UNKNOWN, "isp.service-not-available"),
+    ISP_API_DISABLED(CodeEnum.UNKNOWN, "isp.service-not-available"),
     /**
      * 网关响应超时
      */
-    ISP_GATEWAY_RESPONSE_TIMEOUT(Codes.CODE_UNKNOWN, "isp.gateway-response-timeout"),
+    ISP_GATEWAY_RESPONSE_TIMEOUT(CodeEnum.UNKNOWN, "isp.gateway-response-timeout"),
     /**
      * 限流处理
      */
-    ISV_REQUEST_LIMIT(Codes.CODE_UNKNOWN, "isv.service-busy"),
+    ISV_REQUEST_LIMIT(CodeEnum.UNKNOWN, "isv.service-busy"),
 
     /**
      * 无效的访问令牌
      */
-    AOP_INVALID_AUTH_TOKEN(Codes.CODE_AUTH, "aop.invalid-auth-token"),
+    AOP_INVALID_AUTH_TOKEN(CodeEnum.AUTH, "aop.invalid-auth-token"),
     /**
      * 访问令牌已过期
      */
-    AOP_AUTH_TOKEN_TIME_OUT(Codes.CODE_AUTH, "aop.auth-token-time-out"),
+    AOP_AUTH_TOKEN_TIME_OUT(CodeEnum.AUTH, "aop.auth-token-time-out"),
     /**
      * 无效的应用授权令牌
      */
-    AOP_INVALID_APP_AUTH_TOKEN(Codes.CODE_AUTH, "aop.invalid-app-auth-token"),
+    AOP_INVALID_APP_AUTH_TOKEN(CodeEnum.AUTH, "aop.invalid-app-auth-token"),
     /**
      * 商户未授权当前接口
      */
-    AOP_INVALID_APP_AUTH_TOKEN_NO_API(Codes.CODE_AUTH, "aop.invalid-app-auth-token-no-api"),
+    AOP_INVALID_APP_AUTH_TOKEN_NO_API(CodeEnum.AUTH, "aop.invalid-app-auth-token-no-api"),
     /**
      * 应用授权令牌已过期
      */
-    AOP_APP_AUTH_TOKEN_TIME_OUT(Codes.CODE_AUTH, "aop.app-auth-token-time-out"),
+    AOP_APP_AUTH_TOKEN_TIME_OUT(CodeEnum.AUTH, "aop.app-auth-token-time-out"),
     /**
      * 商户未签约任何产品
      */
-    AOP_NO_PRODUCT_REG_BY_PARTNER(Codes.CODE_AUTH, "aop.no-product-reg-by-partner"),
+    AOP_NO_PRODUCT_REG_BY_PARTNER(CodeEnum.AUTH, "aop.no-product-reg-by-partner"),
 
     /**
      * 缺少方法名参数
      */
-    ISV_MISSING_METHOD(Codes.CODE_MISSING, "isv.missing-method"),
+    ISV_MISSING_METHOD(CodeEnum.MISSING, "isv.missing-method"),
     /**
      * 缺少签名参数
      */
-    ISV_MISSING_SIGNATURE(Codes.CODE_MISSING, "isv.missing-signature"),
+    ISV_MISSING_SIGNATURE(CodeEnum.MISSING, "isv.missing-signature"),
     /**
      * 缺少签名类型参数
      */
-    ISV_MISSING_SIGNATURE_TYPE(Codes.CODE_MISSING, "isv.missing-signature-type"),
+    ISV_MISSING_SIGNATURE_TYPE(CodeEnum.MISSING, "isv.missing-signature-type"),
     /**
      * 缺少签名配置
      */
-    ISV_MISSING_SIGNATURE_KEY(Codes.CODE_MISSING, "isv.missing-signature-key"),
+    ISV_MISSING_SIGNATURE_KEY(CodeEnum.MISSING, "isv.missing-signature-key"),
     /**
      * 缺少appId参数
      */
-    ISV_MISSING_APP_ID(Codes.CODE_MISSING, "isv.missing-app-id"),
+    ISV_MISSING_APP_ID(CodeEnum.MISSING, "isv.missing-app-id"),
     /**
      * 缺少时间戳参数
      */
-    ISV_MISSING_TIMESTAMP(Codes.CODE_MISSING, "isv.missing-timestamp"),
+    ISV_MISSING_TIMESTAMP(CodeEnum.MISSING, "isv.missing-timestamp"),
     /**
      * 缺少版本参数
      */
-    ISV_MISSING_VERSION(Codes.CODE_MISSING, "isv.missing-version"),
+    ISV_MISSING_VERSION(CodeEnum.MISSING, "isv.missing-version"),
     /**
      * 解密出错, 未指定加密算法
      */
-    ISV_DECRYPTION_ERROR_MISSING_ENCRYPT_TYPE(Codes.CODE_MISSING, "isv.decryption-error-missing-encrypt-type"),
+    ISV_DECRYPTION_ERROR_MISSING_ENCRYPT_TYPE(CodeEnum.MISSING, "isv.decryption-error-missing-encrypt-type"),
 
     /**
      * 参数无效
      */
-    ISV_INVALID_PARAMETER(Codes.CODE_INVALID, "isv.invalid-parameter"),
+    ISV_INVALID_PARAMETER(CodeEnum.INVALID, "isv.invalid-parameter"),
     /**
      * 参数不正确
      */
-    ISV_ERROR_PARAMETER(Codes.CODE_INVALID, "isv.error-parameter"),
+    ISV_ERROR_PARAMETER(CodeEnum.INVALID, "isv.error-parameter"),
     /**
      * 文件上传失败
      */
-    ISV_UPLOAD_FAIL(Codes.CODE_INVALID, "isv.upload-fail"),
+    ISV_UPLOAD_FAIL(CodeEnum.INVALID, "isv.upload-fail"),
     /**
      * 文件扩展名无效
      */
-    ISV_INVALID_FILE_EXTENSION(Codes.CODE_INVALID, "isv.invalid-file-extension"),
+    ISV_INVALID_FILE_EXTENSION(CodeEnum.INVALID, "isv.invalid-file-extension"),
     /**
      * 文件大小无效
      */
-    ISV_INVALID_FILE_SIZE(Codes.CODE_INVALID, "isv.invalid-file-size"),
+    ISV_INVALID_FILE_SIZE(CodeEnum.INVALID, "isv.invalid-file-size"),
     /**
      * 不存在的方法名
      */
-    ISV_INVALID_METHOD(Codes.CODE_INVALID, "isv.invalid-method"),
+    ISV_INVALID_METHOD(CodeEnum.INVALID, "isv.invalid-method"),
     /**
      * 无效的数据格式
      */
-    ISV_INVALID_FORMAT(Codes.CODE_INVALID, "isv.invalid-format"),
+    ISV_INVALID_FORMAT(CodeEnum.INVALID, "isv.invalid-format"),
     /**
      * 无效的签名类型
      */
-    ISV_INVALID_SIGNATURE_TYPE(Codes.CODE_INVALID, "isv.invalid-signature-type"),
+    ISV_INVALID_SIGNATURE_TYPE(CodeEnum.INVALID, "isv.invalid-signature-type"),
     /**
      * 无效签名
      */
-    ISV_INVALID_SIGNATURE(Codes.CODE_INVALID, "isv.invalid-signature"),
+    ISV_INVALID_SIGNATURE(CodeEnum.INVALID, "isv.invalid-signature"),
     /**
      * 无效的加密类型
      */
-    ISV_INVALID_ENCRYPT_TYPE(Codes.CODE_INVALID, "isv.invalid-encrypt-type"),
+    ISV_INVALID_ENCRYPT_TYPE(CodeEnum.INVALID, "isv.invalid-encrypt-type"),
     /**
      * 解密异常
      */
-    ISV_INVALID_ENCRYPT(Codes.CODE_INVALID, "isv.invalid-encrypt"),
+    ISV_INVALID_ENCRYPT(CodeEnum.INVALID, "isv.invalid-encrypt"),
     /**
      * 无效的appId参数
      */
-    ISV_INVALID_APP_ID(Codes.CODE_INVALID, "isv.invalid-app-id"),
+    ISV_INVALID_APP_ID(CodeEnum.INVALID, "isv.invalid-app-id"),
     /**
      * 非法的时间戳参数
      */
-    ISV_INVALID_TIMESTAMP(Codes.CODE_INVALID, "isv.invalid-timestamp"),
+    ISV_INVALID_TIMESTAMP(CodeEnum.INVALID, "isv.invalid-timestamp"),
     /**
      * 字符集错误
      */
-    ISV_INVALID_CHARSET(Codes.CODE_INVALID, "isv.invalid-charset"),
+    ISV_INVALID_CHARSET(CodeEnum.INVALID, "isv.invalid-charset"),
     /**
      * 摘要错误
      */
-    ISV_INVALID_DIGEST(Codes.CODE_INVALID, "isv.invalid-digest"),
+    ISV_INVALID_DIGEST(CodeEnum.INVALID, "isv.invalid-digest"),
     /**
      * 解密出错，不支持的加密算法
      */
-    ISV_DECRYPTION_ERROR_NOT_VALID_ENCRYPT_TYPE(Codes.CODE_INVALID, "isv.decryption-error-not-valid-encrypt-type"),
+    ISV_DECRYPTION_ERROR_NOT_VALID_ENCRYPT_TYPE(CodeEnum.INVALID, "isv.decryption-error-not-valid-encrypt-type"),
     /**
      * 解密出错, 未配置加密密钥或加密密钥格式错误
      */
-    ISV_DECRYPTION_ERROR_NOT_VALID_ENCRYPT_KEY(Codes.CODE_INVALID, "isv.decryption-error-not-valid-encrypt-key"),
+    ISV_DECRYPTION_ERROR_NOT_VALID_ENCRYPT_KEY(CodeEnum.INVALID, "isv.decryption-error-not-valid-encrypt-key"),
     /**
      * 解密出错，未知异常
      */
-    ISV_DECRYPTION_ERROR_UNKNOWN(Codes.CODE_INVALID, "isv.decryption-error-unknown"),
+    ISV_DECRYPTION_ERROR_UNKNOWN(CodeEnum.INVALID, "isv.decryption-error-unknown"),
     /**
      * 验签出错, 未配置对应签名算法的公钥或者证书
      */
-    ISV_MISSING_SIGNATURE_CONFIG(Codes.CODE_INVALID, "isv.missing-signature-config"),
+    ISV_MISSING_SIGNATURE_CONFIG(CodeEnum.INVALID, "isv.missing-signature-config"),
     /**
      * 本接口不支持第三方代理调用
      */
-    ISV_NOT_SUPPORT_APP_AUTH(Codes.CODE_INVALID, "isv.not-support-app-auth"),
+    ISV_NOT_SUPPORT_APP_AUTH(CodeEnum.INVALID, "isv.not-support-app-auth"),
     /**
      * 可疑的攻击请求
      */
-    ISV_SUSPECTED_ATTACK(Codes.CODE_INVALID, "isv.suspected-attack"),
+    ISV_SUSPECTED_ATTACK(CodeEnum.INVALID, "isv.suspected-attack"),
     /**
      * 无效的content-type
      */
-    ISV_INVALID_CONTENT_TYPE(Codes.CODE_INVALID, "isv.invalid-content-type"),
+    ISV_INVALID_CONTENT_TYPE(CodeEnum.INVALID, "isv.invalid-content-type"),
 
     /**
      * 业务处理失败
      */
-    BIZ_ERROR(Codes.CODE_BIZ, ""),
+    BIZ_ERROR(CodeEnum.BIZ, "isp.biz-error"),
 
     /**
      * 请检查配置的账户是否有当前接口权限
      */
-    ISV_INSUFFICIENT_ISV_PERMISSIONS(Codes.CODE_ISV_PERM, "isv.insufficient-isv-permissions"),
+    ISV_INSUFFICIENT_ISV_PERMISSIONS(CodeEnum.ISV_PERM, "isv.insufficient-isv-permissions"),
     /**
      * 代理的商户没有当前接口权限
      */
-    ISV_INSUFFICIENT_USER_PERMISSIONS(Codes.CODE_ISV_PERM, "isv.insufficient-user-permissions"),
+    ISV_INSUFFICIENT_USER_PERMISSIONS(CodeEnum.ISV_PERM, "isv.insufficient-user-permissions"),
     /**
      * 没有当前接口权限
      */
-    ISV_ROUTE_NO_PERMISSIONS(Codes.CODE_ISV_PERM, "isv.route-no-permissions"),
+    ISV_ROUTE_NO_PERMISSIONS(CodeEnum.ISV_PERM, "isv.route-no-permissions"),
     /**
      * 禁止访问
      */
-    ISV_ACCESS_FORBIDDEN(Codes.CODE_ISV_PERM, "isv.access-forbidden"),
+    ISV_ACCESS_FORBIDDEN(CodeEnum.ISV_PERM, "isv.access-forbidden"),
     /**
      * 禁止IP访问
      */
-    ISV_IP_FORBIDDEN(Codes.CODE_ISV_PERM, "isv.ip-forbidden");
+    ISV_IP_FORBIDDEN(CodeEnum.ISV_PERM, "isv.ip-forbidden");
 
-    private final ErrorMeta errorMeta;
+    private final CodeEnum codeEnum;
+    private final String subCode;
 
-    ErrorEnum(String code, String subCode) {
+    ErrorEnum(CodeEnum codeEnum, String subCode) {
-        this.errorMeta = new ErrorMeta("open.error_", code, subCode);
+        this.codeEnum = codeEnum;
+        this.subCode = subCode;
     }
 
-    public ErrorMeta getErrorMeta() {
+    public IError getError(Locale locale, Object... params) {
-        return errorMeta;
+        OpenMessage codeMsg = OpenMessageFactory.getMessage(codeEnum, locale, params);
+        OpenMessage subCodeMsg = OpenMessageFactory.getMessage(this, locale, params);
+        return new ErrorImpl(
+                codeMsg.getCode(),
+                codeMsg.getMsg(),
+                subCodeMsg.getCode(),
+                subCodeMsg.getMsg(),
+                subCodeMsg.getSolution()
+        );
     }
 
-    private static class Codes {
+    public String getCode() {
-        public static final String CODE_SUCCESS = "10000";
+        return codeEnum.getConfigKey();
-        public static final String CODE_AUTH = "20001";
-        public static final String CODE_MISSING = "40001";
-        public static final String CODE_INVALID = "40002";
-        public static final String CODE_BIZ = "40004";
-        public static final String CODE_ISV_PERM = "40006";
-        public static final String CODE_UNKNOWN = "20000";
     }
 
+    @Override
+    public String getConfigKey() {
+        return subCode;
+    }
+
+
 }

sop-gateway/src/main/java/com/gitee/sop/gateway/message/ErrorFactory.java

@@ -1,131 +0,0 @@
-package com.gitee.sop.gateway.message;
-
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.support.MessageSourceAccessor;
-import org.springframework.context.support.ResourceBundleMessageSource;
-import org.springframework.util.Assert;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-
-/**
- * 负责构建错误消息
- *
- * @author 六如
- */
-@Slf4j
-public final class ErrorFactory {
-
-    private static final String ZH = "zh";
-
-    private static final String SYS_ERR = "系统错误";
-
-    private static final String I18N_OPEN_ERROR = "i18n/open/error";
-    public static final String UNDERLINE = "_";
-
-    private static final Set<String> NO_MODULE_CACHE = new HashSet<>();
-
-    private static final List<Locale> LOCALE_LIST = Arrays.asList(Locale.ENGLISH, Locale.SIMPLIFIED_CHINESE);
-
-    private ErrorFactory() {
-    }
-
-    /**
-     * 错误信息的国际化信息
-     */
-    private static MessageSourceAccessor errorMessageSourceAccessor;
-
-    /**
-     * 设置国际化资源信息
-     */
-    public static void initMessageSource(List<String> isvModules) {
-        HashSet<String> baseNamesSet = new HashSet<>();
-        baseNamesSet.add(I18N_OPEN_ERROR);
-
-        if (!CollectionUtils.isEmpty(isvModules)) {
-            baseNamesSet.addAll(isvModules);
-        }
-
-        String[] totalBaseNames = baseNamesSet.toArray(new String[0]);
-
-        log.info("加载错误码国际化资源：{}", StringUtils.arrayToCommaDelimitedString(totalBaseNames));
-        ResourceBundleMessageSource bundleMessageSource = new ResourceBundleMessageSource();
-        bundleMessageSource.setBasenames(totalBaseNames);
-        MessageSourceAccessor messageSourceAccessor = new MessageSourceAccessor(bundleMessageSource);
-        setErrorMessageSourceAccessor(messageSourceAccessor);
-    }
-
-    /**
-     * 通过ErrorMeta，Locale，params构建国际化错误消息
-     *
-     * @param errorMeta 错误信息
-     * @param locale    本地化
-     * @param params    参数
-     * @return 如果没有配置国际化消息，则直接返回errorMeta中的信息
-     */
-    public static IError getError(ErrorMeta errorMeta, Locale locale, Object... params) {
-        if (locale == null) {
-            locale = Locale.SIMPLIFIED_CHINESE;
-        }
-        String localeStr = locale.toString();
-        if (localeStr.startsWith(ZH)) {
-            locale = Locale.SIMPLIFIED_CHINESE;
-        }
-        if (!LOCALE_LIST.contains(locale)) {
-            locale = Locale.ENGLISH;
-        }
-        String key = errorMeta.getModulePrefix() + errorMeta.getCode() + errorMeta.getSubCode() + locale.toString();
-        Assert.notNull(locale, "未设置Locale");
-        String modulePrefix = errorMeta.getModulePrefix();
-        String code = errorMeta.getCode();
-        // open.error_20000=Service is temporarily unavailable
-        String msg = getErrorMessage(modulePrefix + code, locale);
-        String subCode = errorMeta.getSubCode();
-        // open.error_20000_isp.unknown-error=Service is temporarily unavailable
-        String subMsg = getErrorMessage(modulePrefix + code + UNDERLINE + subCode, locale, params);
-        if (ObjectUtils.isEmpty(msg)) {
-            msg = SYS_ERR;
-        }
-        if (ObjectUtils.isEmpty(subMsg)) {
-            subMsg = SYS_ERR;
-        }
-        // solution暂未实现，如果要实现，可以这样配置：
-        // open.error_20000_isp.unknown-error_solution=Service is temporarily unavailable
-        // <code>String solution = getErrorMessage(modulePrefix + code + UNDERLINE + subCode + "_solution", locale, params);</code>
-        return new ErrorImpl(code, msg, subCode, subMsg, null);
-    }
-
-
-    public static void setErrorMessageSourceAccessor(MessageSourceAccessor errorMessageSourceAccessor) {
-        ErrorFactory.errorMessageSourceAccessor = errorMessageSourceAccessor;
-    }
-
-    /**
-     * 返回本地化信息
-     *
-     * @param module 错误模块
-     * @param locale 本地化
-     * @param params 参数
-     * @return 返回信息
-     */
-    public static String getErrorMessage(String module, Locale locale, Object... params) {
-        if (NO_MODULE_CACHE.contains(module)) {
-            return null;
-        }
-        try {
-            return errorMessageSourceAccessor.getMessage(module, params, locale);
-        } catch (Exception e) {
-            NO_MODULE_CACHE.add(module);
-            return null;
-        }
-    }
-
-
-}

sop-gateway/src/main/java/com/gitee/sop/gateway/message/ErrorMeta.java

@@ -1,34 +0,0 @@
-package com.gitee.sop.gateway.message;
-
-import lombok.Getter;
-
-import java.util.Locale;
-
-/**
- * 错误对象
- *
- * @author 六如
- */
-@Getter
-public class ErrorMeta {
-
-    private final String modulePrefix;
-    private final String code;
-    private final String subCode;
-
-    public ErrorMeta(String modulePrefix, String code, String subCode) {
-        this.modulePrefix = modulePrefix;
-        this.code = code;
-        this.subCode = subCode;
-    }
-
-    public IError getError(Locale locale, Object... params) {
-        return ErrorFactory.getError(this, locale, params);
-    }
-
-
-    @Override
-    public String toString() {
-        return modulePrefix + code + "_" + subCode;
-    }
-}

sop-gateway/src/main/java/com/gitee/sop/gateway/response/ApiResponse.java

@@ -1,8 +1,6 @@
 package com.gitee.sop.gateway.response;
 
-import com.gitee.sop.gateway.exception.ApiException;
 import com.gitee.sop.gateway.message.ErrorEnum;
-import com.gitee.sop.gateway.message.ErrorMeta;
 import com.gitee.sop.gateway.message.IError;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -78,47 +76,43 @@ public class ApiResponse extends BaseResponse {
     }
 
 
-    public static ApiResponse error(ApiException e) {
-        IError error = e.getError();
-        return error(error);
-    }
-
     public static ApiResponse error(ErrorEnum errorEnum, Locale locale, String subMsg) {
-        ErrorMeta errorMeta = errorEnum.getErrorMeta();
+        IError error = errorEnum.getError(locale);
-        IError error = errorMeta.getError(locale);
         return error(error, subMsg);
     }
 
-    public static ApiResponse error(ErrorEnum errorEnum, Locale locale, String subCode, String subMsg) {
+    public static ApiResponse error(ErrorEnum errorEnum, Locale locale, String subCode, String subMsg, String solution) {
-        ErrorMeta errorMeta = errorEnum.getErrorMeta();
+        IError error = errorEnum.getError(locale);
-        IError error = errorMeta.getError(locale);
         ApiResponse apiResponse = new ApiResponse();
         apiResponse.setCode(error.getCode());
         apiResponse.setMsg(error.getMsg());
         apiResponse.setSubCode(subCode);
         apiResponse.setSubMsg(subMsg);
+        apiResponse.setSolution(solution);
         return apiResponse;
     }
 
     public static ApiResponse error(ErrorEnum errorEnum, Locale locale) {
-        ErrorMeta errorMeta = errorEnum.getErrorMeta();
+        IError error = errorEnum.getError(locale);
-        IError error = errorMeta.getError(locale);
         return error(error);
     }
 
     public static ApiResponse error(IError error) {
-        return error(error, error.getSubMsg());
-    }
-
-    public static ApiResponse error(IError error, String subMsg) {
         ApiResponse apiResponse = new ApiResponse();
         apiResponse.setSubCode(error.getSubCode());
         apiResponse.setSubMsg(error.getSubMsg());
         apiResponse.setCode(error.getCode());
-        apiResponse.setMsg(subMsg);
+        apiResponse.setMsg(error.getMsg());
+        apiResponse.setSolution(error.getSolution());
         return apiResponse;
     }
 
+    private static ApiResponse error(IError error, String subMsg) {
+        ApiResponse response = error(error);
+        response.setSubMsg(subMsg);
+        return response;
+    }
+
     public Response toLower() {
         ApiResponseLower apiResponseLower = new ApiResponseLower();
         apiResponseLower.setSub_code(this.subCode);
@@ -126,6 +120,7 @@ public class ApiResponse extends BaseResponse {
         apiResponseLower.setCode(this.subCode);
         apiResponseLower.setMsg(this.subMsg);
         apiResponseLower.setData(this.getData());
+        apiResponseLower.setSolution(this.getSolution());
         return apiResponseLower;
     }
 }

sop-gateway/src/main/java/com/gitee/sop/gateway/response/ApiResponseLower.java

@@ -2,7 +2,6 @@ package com.gitee.sop.gateway.response;
 
 import com.gitee.sop.gateway.exception.ApiException;
 import com.gitee.sop.gateway.message.ErrorEnum;
-import com.gitee.sop.gateway.message.ErrorMeta;
 import com.gitee.sop.gateway.message.IError;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -84,14 +83,12 @@ public class ApiResponseLower extends BaseResponse {
     }
 
     public static ApiResponseLower error(ErrorEnum errorEnum, Locale locale, String subMsg) {
-        ErrorMeta errorMeta = errorEnum.getErrorMeta();
+        IError error = errorEnum.getError(locale);
-        IError error = errorMeta.getError(locale);
         return error(error, subMsg);
     }
 
     public static ApiResponseLower error(ErrorEnum errorEnum, Locale locale) {
-        ErrorMeta errorMeta = errorEnum.getErrorMeta();
+        IError error = errorEnum.getError(locale);
-        IError error = errorMeta.getError(locale);
         return error(error);
     }
 

sop-gateway/src/main/java/com/gitee/sop/gateway/response/BaseResponse.java

@@ -26,4 +26,8 @@ public class BaseResponse implements Response {
      */
     private Object data;
 
+    /**
+     * 解决方案
+     */
+    private String solution;
 }

sop-gateway/src/main/java/com/gitee/sop/gateway/service/ParamExecutorImpl.java

@@ -6,15 +6,19 @@ import com.gitee.sop.gateway.common.SopConstants;
 import com.gitee.sop.gateway.config.ApiConfig;
 import com.gitee.sop.gateway.request.ApiRequest;
 import com.gitee.sop.gateway.request.ApiRequestContext;
+import com.gitee.sop.gateway.request.RequestFormatEnum;
 import com.gitee.sop.gateway.request.UploadContext;
 import com.gitee.sop.gateway.response.Response;
+import com.gitee.sop.gateway.util.JsonUtil;
 import com.gitee.sop.gateway.util.RequestUtil;
 import com.gitee.sop.gateway.util.ResponseUtil;
+import com.gitee.sop.gateway.util.XmlUtil;
 import com.gitee.sop.support.dto.FileData;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -39,6 +43,9 @@ public class ParamExecutorImpl implements ParamExecutor<HttpServletRequest, Http
     @Autowired
     private ApiConfig apiConfig;
 
+    @Autowired
+    private Serde serde;
+
     @Override
     public ApiRequestContext build(HttpServletRequest request) {
         // get请求可能返回null
@@ -107,6 +114,7 @@ public class ParamExecutorImpl implements ParamExecutor<HttpServletRequest, Http
     public void write(ApiRequestContext apiRequestContext, Response apiResponse, HttpServletResponse response) throws IOException {
         Object data = apiResponse.getData();
         if (data instanceof FileData) {
+            // 处理文件下载
             FileData fileData = (FileData) data;
             ResponseUtil.writerFile(fileData, response);
         } else {
@@ -115,7 +123,23 @@ public class ParamExecutorImpl implements ParamExecutor<HttpServletRequest, Http
             if (!apiResponse.needWrap()) {
                 responseData = data;
             }
-            ResponseUtil.writerText(apiRequestContext, responseData, response);
+            this.writerText(apiRequestContext, responseData, response);
+        }
+    }
+
+    protected void writerText(ApiRequestContext apiRequestContext, Object apiResponse, HttpServletResponse response) throws IOException {
+        ApiRequest apiRequest = apiRequestContext.getApiRequest();
+        String charset = apiRequest.getCharset();
+        response.setCharacterEncoding(charset);
+        String format = apiRequest.getFormat();
+        if (RequestFormatEnum.of(format) == RequestFormatEnum.XML) {
+            response.setContentType(MediaType.APPLICATION_XML_VALUE);
+            String xml = serde.toXml(apiResponse);
+            response.getWriter().write(xml);
+        } else {
+            response.setContentType(MediaType.APPLICATION_JSON_VALUE);
+            String json = serde.toJSONString(apiResponse);
+            response.getWriter().write(json);
         }
     }
 }

sop-gateway/src/main/java/com/gitee/sop/gateway/service/Serde.java

@@ -0,0 +1,14 @@
+package com.gitee.sop.gateway.service;
+
+/**
+ * 序列化
+ *
+ * @author 六如
+ */
+public interface Serde {
+
+    String toJSONString(Object object);
+
+    String toXml(Object object);
+
+}

sop-gateway/src/main/java/com/gitee/sop/gateway/service/SerdeImpl.java

@@ -0,0 +1,24 @@
+package com.gitee.sop.gateway.service;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.gitee.sop.gateway.util.JsonUtil;
+import com.gitee.sop.gateway.util.XmlUtil;
+
+/**
+ * @author 六如
+ */
+public class SerdeImpl implements Serde{
+    @Override
+    public String toJSONString(Object object) {
+        return JsonUtil.toJSONString(object);
+    }
+
+    @Override
+    public String toXml(Object object) {
+        try {
+            return XmlUtil.toXml(object);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/alipay/AlipaySigner.java

@@ -5,14 +5,13 @@ import com.gitee.sop.gateway.config.ApiConfig;
 import com.gitee.sop.gateway.exception.ApiException;
 import com.gitee.sop.gateway.exception.SignException;
 import com.gitee.sop.gateway.message.ErrorEnum;
-import com.gitee.sop.gateway.message.ErrorMeta;
 import com.gitee.sop.gateway.request.ApiRequest;
 import com.gitee.sop.gateway.request.ApiRequestContext;
 import com.gitee.sop.gateway.service.validate.Signer;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -46,9 +45,8 @@ public class AlipaySigner implements Signer {
             return AlipaySignature.rsaCheckV2(params, publicKey, charset, signType, apiConfig);
         } catch (SignException e) {
             ErrorEnum errorEnum = e.getErrorEnum();
-            ErrorMeta errorMeta = errorEnum.getErrorMeta();
             log.error("验签错误, code={}, subCode={}, apiRequest={}",
-                    errorMeta.getCode(), errorMeta.getSubCode(), apiRequest, e);
+                    errorEnum.getCode(), errorEnum.getSubCode(), apiRequest, e);
             throw new ApiException(errorEnum, apiRequestContext.getLocale());
         } catch (Exception e) {
             log.error("验签未知错误, apiRequest={}", apiRequest, e);

sop-gateway/src/main/resources/i18n/open/code_en.properties

@@ -0,0 +1,7 @@
+0=Success
+20001=Insufficient authorization authority
+40001=Missing required parameters
+40002=Invalid parameter
+50003=Business error
+40006=Insufficient permissions
+99999=Service unavailable

sop-gateway/src/main/resources/i18n/open/code_zh_CN.properties

@@ -0,0 +1,7 @@
+0=Success
+20001=\u6388\u6743\u6743\u9650\u4E0D\u8DB3
+40001=\u7F3A\u5C11\u5FC5\u9009\u53C2\u6570
+40002=\u975E\u6CD5\u7684\u53C2\u6570
+50003=\u4E1A\u52A1\u5904\u7406\u5931\u8D25
+40006=\u6743\u9650\u4E0D\u8DB3
+99999=\u670D\u52A1\u4E0D\u53EF\u7528

sop-gateway/src/main/resources/i18n/open/error_en.properties

@@ -1,65 +1,51 @@
-# \u7F51\u5173\u9519\u8BEF\u914D\u7F6E
+isp.unknown-error=Service is temporarily unavailable
+isp.service-unknown-error=Service not available
+isp.service-not-available=Service is temporarily unavailable
+isp.gateway-response-timeout=Gateway response timeout
+isp.biz-error=Business error
+isv.service-busy=service busy
 
-open.error_10000=Success
+aop.invalid-auth-token=Invalid access token
+aop.auth-token-time-out=The access token has expired
+aop.invalid-app-auth-token=Invalid application authorization token
+aop.invalid-app-auth-token-no-api=Merchant does not authorize current interface
+aop.app-auth-token-time-out=The application authorization token has expired
+aop.no-product-reg-by-partner=The merchant has not signed any product
 
-# \u683C\u5F0F\uFF1A\u524D\u7F00 + \u7F51\u5173\u9519\u8BEF\u7801 + "_"+  \u5B50\u9519\u8BEF\u7801
+isv.missing-method=Method name parameter is missing
-# open.error_\uFF08\u524D\u7F00\uFF0920000\uFF08\u7F51\u5173\u9519\u8BEF\u7801\uFF09_isp.unknow-error\uFF08\u5B50\u9519\u8BEF\u7801\uFF09
+isv.missing-signature=Lack of signature parameter
-open.error_20000=Service is temporarily unavailable
+isv.missing-signature-type=Missing signature type parameter
-open.error_20000_isp.unknown-error=Service is temporarily unavailable
+isv.missing-signature-key=Lack of signature configuration
-open.error_20000_isp.service-unknown-error=Service not available
+isv.missing-app-id=Missing appId parameter
-open.error_20000_aop.unknown-error=Service is temporarily unavailable
+isv.missing-timestamp=Missing timestamp parameter
-open.error_20000_isp.service-not-available=Service is temporarily unavailable
+isv.missing-version=Missing version parameter
-open.error_20000_isp.gateway-response-timeout=Gateway response timeout
+isv.decryption-error-missing-encrypt-type=Decryption error, no encryption algorithm specified
-open.error_20000_isv.service-busy=service busy
 
-open.error_20001=Insufficient authorization authority
+isv.invalid-parameter=Parameter is invalid
-open.error_20001_aop.invalid-auth-token=Invalid access token
+isv.error-parameter=Parameter incorrect
-open.error_20001_aop.auth-token-time-out=The access token has expired
+isv.upload-fail=File upload failed
-open.error_20001_aop.invalid-app-auth-token=Invalid application authorization token
+isv.invalid-file-extension=Invalid file extension
-open.error_20001_aop.invalid-app-auth-token-no-api=Merchant does not authorize current interface
+isv.invalid-file-size=Invalid {0} bytes file size, the limit max size is {1} bytes
-open.error_20001_aop.app-auth-token-time-out=The application authorization token has expired
+isv.invalid-method=Nonexistent method name
-open.error_20001_aop.no-product-reg-by-partner=The merchant has not signed any product
+isv.invalid-format=Invalid data format
+isv.invalid-signature-type=Invalid signature type
+isv.invalid-signature=Invalid signature
+isv.invalid-encrypt-type=Invalid encryption type
+isv.invalid-encrypt=Decryption exception
+isv.invalid-app-id=Invalid appId parameter
+isv.invalid-timestamp=Invalid timestamp parameter
+isv.invalid-charset=Character set error
+isv.invalid-digest=Digest error
+isv.decryption-error-not-valid-encrypt-type=Decryption error, unsupported encryption algorithm
+isv.decryption-error-not-valid-encrypt-key=Decryption error, unconfigured encryption key or encryption key format error
+isv.decryption-error-unknown=Decryption error, unknown exception
+isv.missing-signature-config=Signature verification error, no public key or certificate of the corresponding signature algorithm is configured
+isv.not-support-app-auth=This interface does not support third-party proxy calls
+isv.suspected-attack=Suspicious attack requests
+isv.invalid-content-type=Invalid content type
 
-open.error_40001=Missing required parameters
+isv.insufficient-isv-permissions=Insufficient ISV permissions
-open.error_40001_isv.missing-method=Method name parameter is missing
+isv.insufficient-user-permissions=Insufficient user permissions
-open.error_40001_isv.missing-signature=Lack of signature parameter
+isv.route-no-permissions=No api permissions
-open.error_40001_isv.missing-signature-type=Missing signature type parameter
+isv.access-forbidden=Access forbidden
-open.error_40001_isv.missing-signature-key=Lack of signature configuration
+isv.ip-forbidden=IP access forbidden
-open.error_40001_isv.missing-app-id=Missing appId parameter
-open.error_40001_isv.missing-timestamp=Missing timestamp parameter
-open.error_40001_isv.missing-version=Missing version parameter
-open.error_40001_isv.decryption-error-missing-encrypt-type=Decryption error, no encryption algorithm specified
-
-open.error_40002=Invalid parameter
-open.error_40002_isv.invalid-parameter=Parameter is invalid
-open.error_40002_isv.error-parameter=Parameter incorrect
-open.error_40002_isv.upload-fail=File upload failed
-open.error_40002_isv.invalid-file-extension=Invalid file extension
-open.error_40002_isv.invalid-file-size=Invalid {0} bytes file size, the limit max size is {1} bytes
-open.error_40002_isv.invalid-method=Nonexistent method name
-open.error_40002_isv.invalid-format=Invalid data format
-open.error_40002_isv.invalid-signature-type=Invalid signature type
-open.error_40002_isv.invalid-signature=Invalid signature
-open.error_40002_isv.invalid-encrypt-type=Invalid encryption type
-open.error_40002_isv.invalid-encrypt=Decryption exception
-open.error_40002_isv.invalid-app-id=Invalid appId parameter
-open.error_40002_isv.invalid-timestamp=Invalid timestamp parameter
-open.error_40002_isv.invalid-charset=Character set error
-open.error_40002_isv.invalid-digest=Digest error
-open.error_40002_isv.decryption-error-not-valid-encrypt-type=Decryption error, unsupported encryption algorithm
-open.error_40002_isv.decryption-error-not-valid-encrypt-key=Decryption error, unconfigured encryption key or encryption key format error
-open.error_40002_isv.decryption-error-unknown=Decryption error, unknown exception
-open.error_40002_isv.missing-signature-config=Signature verification error, no public key or certificate of the corresponding signature algorithm is configured
-open.error_40002_isv.not-support-app-auth=This interface does not support third-party proxy calls
-open.error_40002_isv.suspected-attack=Suspicious attack requests
-open.error_40002_isv.invalid-content-type=Invalid content type
-
-open.error_40004=Business processing failure
-open.error_40004_=Business processing failure
-
-open.error_40006=Insufficient permissions
-open.error_40006_isv.insufficient-isv-permissions=Insufficient ISV permissions
-open.error_40006_isv.insufficient-user-permissions=Insufficient user permissions
-open.error_40006_isv.route-no-permissions=No api permissions
-open.error_40006_isv.access-forbidden=Access forbidden
-open.error_40006_isv.ip-forbidden=IP access forbidden

sop-gateway/src/main/resources/i18n/open/error_zh_CN.properties

@@ -1,122 +1,51 @@
-# \u7F51\u5173\u9519\u8BEF\u914D\u7F6E
+isp.unknown-error=\u670D\u52A1\u6682\u4E0D\u53EF\u7528
+isp.service-unknown-error=\u670D\u52A1\u4E0D\u53EF\u7528
+isp.service-not-available=\u670D\u52A1\u6682\u4E0D\u53EF\u7528
+isp.gateway-response-timeout=\u7F51\u5173\u54CD\u5E94\u8D85\u65F6
+isp.biz-error=\u4e1a\u52a1\u5f02\u5e38
+isv.service-busy=\u670D\u52A1\u5668\u5FD9
 
-#open.error_20000=\u670D\u52A1\u4E0D\u53EF\u7528
+aop.invalid-auth-token=\u65E0\u6548\u7684\u8BBF\u95EE\u4EE4\u724C
-#open.error_20000_isp.unknow-error=\u670D\u52A1\u6682\u4E0D\u53EF\u7528
+aop.auth-token-time-out=\u8BBF\u95EE\u4EE4\u724C\u5DF2\u8FC7\u671F
-#open.error_20000_aop.unknow-error=\u670D\u52A1\u6682\u4E0D\u53EF\u7528
+aop.invalid-app-auth-token=\u65E0\u6548\u7684\u5E94\u7528\u6388\u6743\u4EE4\u724C
-#open.error_20000_isp.service-not-available=\u670D\u52A1\u6682\u4E0D\u53EF\u7528
+aop.invalid-app-auth-token-no-api=\u5546\u6237\u672A\u6388\u6743\u5F53\u524D\u63A5\u53E3
-#
+aop.app-auth-token-time-out=\u5E94\u7528\u6388\u6743\u4EE4\u724C\u5DF2\u8FC7\u671F
-#open.error_20001=\u6388\u6743\u6743\u9650\u4E0D\u8DB3
+aop.no-product-reg-by-partner=\u5546\u6237\u672A\u7B7E\u7EA6\u4EFB\u4F55\u4EA7\u54C1
-#open.error_20001_aop.invalid-auth-token=\u65E0\u6548\u7684\u8BBF\u95EE\u4EE4\u724C
-#open.error_20001_aop.auth-token-time-out=\u8BBF\u95EE\u4EE4\u724C\u5DF2\u8FC7\u671F
-#open.error_20001_aop.invalid-app-auth-token=\u65E0\u6548\u7684\u5E94\u7528\u6388\u6743\u4EE4\u724C
-#open.error_20001_aop.invalid-app-auth-token-no-api=\u5546\u6237\u672A\u6388\u6743\u5F53\u524D\u63A5\u53E3
-#open.error_20001_aop.app-auth-token-time-out=\u5E94\u7528\u6388\u6743\u4EE4\u724C\u5DF2\u8FC7\u671F
-#open.error_20001_aop.no-product-reg-by-partner=\u5546\u6237\u672A\u7B7E\u7EA6\u4EFB\u4F55\u4EA7\u54C1
-#
-#open.error_40001=\u7F3A\u5C11\u5FC5\u9009\u53C2\u6570
-#open.error_40001_isv.missing-method=\u7F3A\u5C11\u65B9\u6CD5\u540D\u53C2\u6570
-#open.error_40001_isv.missing-signature=\u7F3A\u5C11\u7B7E\u540D\u53C2\u6570
-#open.error_40001_isv.missing-signature-type=\u7F3A\u5C11\u7B7E\u540D\u7C7B\u578B\u53C2\u6570
-#open.error_40001_isv.missing-signature-key=\u7F3A\u5C11\u7B7E\u540D\u914D\u7F6E
-#open.error_40001_isv.missing-app-id=\u7F3A\u5C11appId\u53C2\u6570
-#open.error_40001_isv.missing-timestamp=\u7F3A\u5C11\u65F6\u95F4\u6233\u53C2\u6570
-#open.error_40001_isv.missing-version=\u7F3A\u5C11\u7248\u672C\u53C2\u6570
-#open.error_40001_isv.decryption-error-missing-encrypt-type=\u89E3\u5BC6\u51FA\u9519, \u672A\u6307\u5B9A\u52A0\u5BC6\u7B97\u6CD5
-#
-#open.error_40002=\u975E\u6CD5\u7684\u53C2\u6570
-#open.error_40002_isv.invalid-parameter=\u53C2\u6570\u65E0\u6548
-#open.error_40002_isv.upload-fail=\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25
-#open.error_40002_isv.invalid-file-extension=\u6587\u4EF6\u6269\u5C55\u540D\u65E0\u6548
-#open.error_40002_isv.invalid-file-size={0}\u6587\u4EF6\u5927\u5C0F\u65E0\u6548\uFF0C\u5355\u6587\u4EF6\u4E0D\u5F97\u8D85\u8FC7{1}
-#open.error_40002_isv.invalid-method=\u4E0D\u5B58\u5728\u7684\u65B9\u6CD5\u540D
-#open.error_40002_isv.invalid-format=\u65E0\u6548\u7684\u6570\u636E\u683C\u5F0F
-#open.error_40002_isv.invalid-signature-type=\u65E0\u6548\u7684\u7B7E\u540D\u7C7B\u578B
-#open.error_40002_isv.invalid-signature=\u65E0\u6548\u7B7E\u540D
-#open.error_40002_isv.invalid-encrypt-type=\u65E0\u6548\u7684\u52A0\u5BC6\u7C7B\u578B
-#open.error_40002_isv.invalid-encrypt=\u89E3\u5BC6\u5F02\u5E38
-#open.error_40002_isv.invalid-app-id=\u65E0\u6548\u7684appId\u53C2\u6570
-#open.error_40002_isv.invalid-timestamp=\u975E\u6CD5\u7684\u65F6\u95F4\u6233\u53C2\u6570
-#open.error_40002_isv.invalid-charset=\u5B57\u7B26\u96C6\u9519\u8BEF
-#open.error_40002_isv.invalid-digest=\u6458\u8981\u9519\u8BEF
-#open.error_40002_isv.decryption-error-not-valid-encrypt-type=\u89E3\u5BC6\u51FA\u9519\uFF0C\u4E0D\u652F\u6301\u7684\u52A0\u5BC6\u7B97\u6CD5
-#open.error_40002_isv.decryption-error-not-valid-encrypt-key=\u89E3\u5BC6\u51FA\u9519, \u672A\u914D\u7F6E\u52A0\u5BC6\u5BC6\u94A5\u6216\u52A0\u5BC6\u5BC6\u94A5\u683C\u5F0F\u9519\u8BEF
-#open.error_40002_isv.decryption-error-unknown=\u89E3\u5BC6\u51FA\u9519\uFF0C\u672A\u77E5\u5F02\u5E38
-#open.error_40002_isv.missing-signature-config=\u9A8C\u7B7E\u51FA\u9519, \u672A\u914D\u7F6E\u5BF9\u5E94\u7B7E\u540D\u7B97\u6CD5\u7684\u516C\u94A5\u6216\u8005\u8BC1\u4E66
-#open.error_40002_isv.not-support-app-auth=\u672C\u63A5\u53E3\u4E0D\u652F\u6301\u7B2C\u4E09\u65B9\u4EE3\u7406\u8C03\u7528
-#open.error_40002_isv.suspected-attack=\u53EF\u7591\u7684\u653B\u51FB\u8BF7\u6C42
-#open.error_40002_isv.invalid-content-type=\u65E0\u6548\u7684content-type
-#
-#open.error_40004=\u4E1A\u52A1\u5904\u7406\u5931\u8D25
-#open.error_40004_=\u4E1A\u52A1\u5904\u7406\u5931\u8D25
-#
-#open.error_40006=\u6743\u9650\u4E0D\u8DB3
-#open.error_40006_isv.insufficient-isv-permissions=\u8BF7\u68C0\u67E5\u914D\u7F6E\u7684\u8D26\u6237\u662F\u5426\u6709\u5F53\u524D\u63A5\u53E3\u6743\u9650
-#open.error_40006_isv.insufficient-user-permissions=\u4EE3\u7406\u7684\u5546\u6237\u6CA1\u6709\u5F53\u524D\u63A5\u53E3\u6743\u9650
-#open.error_40006_isv.route-no-permissions=\u6CA1\u6709\u5F53\u524D\u63A5\u53E3\u6743\u9650
-#open.error_40006_isv.access-forbidden=\u65E0\u6743\u8BBF\u95EE
 
+isv.missing-method=\u7F3A\u5C11\u65B9\u6CD5\u540D\u53C2\u6570
+isv.missing-signature=\u7F3A\u5C11\u7B7E\u540D\u53C2\u6570
+isv.missing-signature-type=\u7F3A\u5C11\u7B7E\u540D\u7C7B\u578B\u53C2\u6570
+isv.missing-signature-key=\u7F3A\u5C11\u7B7E\u540D\u914D\u7F6E
+isv.missing-app-id=\u7F3A\u5C11 appId \u53C2\u6570
+isv.missing-timestamp=\u7F3A\u5C11\u65F6\u95F4\u6233\u53C2\u6570
+isv.missing-version=\u7F3A\u5C11\u7248\u672C\u53C2\u6570
+isv.decryption-error-missing-encrypt-type=\u89E3\u5BC6\u51FA\u9519, \u672A\u6307\u5B9A\u52A0\u5BC6\u7B97\u6CD5
 
-open.error_10000=Success
+isv.invalid-parameter=\u53C2\u6570\u65E0\u6548
+isv.error-parameter=\u53c2\u6570\u4e0d\u6b63\u786e
+isv.upload-fail=\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25
+isv.invalid-file-extension=\u6587\u4EF6\u6269\u5C55\u540D\u65E0\u6548
+isv.invalid-file-size={0}\u6587\u4EF6\u5927\u5C0F\u65E0\u6548\uFF0C\u5355\u6587\u4EF6\u4E0D\u5F97\u8D85\u8FC7{1}
+isv.invalid-method=\u4E0D\u5B58\u5728\u7684\u65B9\u6CD5\u540D
+isv.invalid-format=\u65E0\u6548\u7684\u6570\u636E\u683C\u5F0F
+isv.invalid-signature-type=\u65E0\u6548\u7684\u7B7E\u540D\u7C7B\u578B
+isv.invalid-signature=\u65E0\u6548\u7B7E\u540D
+isv.invalid-encrypt-type=\u65E0\u6548\u7684\u52A0\u5BC6\u7C7B\u578B
+isv.invalid-encrypt=\u89E3\u5BC6\u5F02\u5E38
+isv.invalid-app-id=\u65E0\u6548\u7684 appId \u53C2\u6570
+isv.invalid-timestamp=\u975E\u6CD5\u7684\u65F6\u95F4\u6233\u53C2\u6570
+isv.invalid-charset=\u5B57\u7B26\u96C6\u9519\u8BEF
+isv.invalid-digest=\u6458\u8981\u9519\u8BEF
+isv.decryption-error-not-valid-encrypt-type=\u89E3\u5BC6\u51FA\u9519\uFF0C\u4E0D\u652F\u6301\u7684\u52A0\u5BC6\u7B97\u6CD5
+isv.decryption-error-not-valid-encrypt-key=\u89E3\u5BC6\u51FA\u9519, \u672A\u914D\u7F6E\u52A0\u5BC6\u5BC6\u94A5\u6216\u52A0\u5BC6\u5BC6\u94A5\u683C\u5F0F\u9519\u8BEF
+isv.decryption-error-unknown=\u89E3\u5BC6\u51FA\u9519\uFF0C\u672A\u77E5\u5F02\u5E38
+isv.missing-signature-config=\u9A8C\u7B7E\u51FA\u9519, \u672A\u914D\u7F6E\u5BF9\u5E94\u7B7E\u540D\u7B97\u6CD5\u7684\u516C\u94A5\u6216\u8005\u8BC1\u4E66
+isv.not-support-app-auth=\u672C\u63A5\u53E3\u4E0D\u652F\u6301\u7B2C\u4E09\u65B9\u4EE3\u7406\u8C03\u7528
+isv.suspected-attack=\u53EF\u7591\u7684\u653B\u51FB\u8BF7\u6C42
+isv.invalid-content-type=\u65E0\u6548\u7684 content-type
 
-# \u683C\u5F0F\uFF1A\u524D\u7F00 + \u7F51\u5173\u9519\u8BEF\u7801 + "_"+  \u5B50\u9519\u8BEF\u7801
+isv.insufficient-isv-permissions=\u8BF7\u68C0\u67E5\u914D\u7F6E\u7684\u8D26\u6237\u662F\u5426\u6709\u5F53\u524D\u63A5\u53E3\u6743\u9650
-# open.error_\uFF08\u524D\u7F00\uFF0920000\uFF08\u7F51\u5173\u9519\u8BEF\u7801\uFF09_isp.unknow-error\uFF08\u5B50\u9519\u8BEF\u7801\uFF09
+isv.insufficient-user-permissions=\u4EE3\u7406\u7684\u5546\u6237\u6CA1\u6709\u5F53\u524D\u63A5\u53E3\u6743\u9650
-open.error_20000=\u670D\u52A1\u4E0D\u53EF\u7528
+isv.route-no-permissions=\u6CA1\u6709\u5F53\u524D\u63A5\u53E3\u6743\u9650
-open.error_20000_isp.unknown-error=\u670D\u52A1\u6682\u4E0D\u53EF\u7528
+isv.access-forbidden=\u65E0\u6743\u8BBF\u95EE
-open.error_20000_isp.service-unknown-error=\u670D\u52A1\u4E0D\u53EF\u7528
+isv.ip-forbidden=IP\u65E0\u6743\u8BBF\u95EE
-open.error_20000_aop.unknown-error=\u670D\u52A1\u6682\u4E0D\u53EF\u7528
-open.error_20000_isp.service-not-available=\u670D\u52A1\u6682\u4E0D\u53EF\u7528
-open.error_20000_isp.gateway-response-timeout=\u7F51\u5173\u54CD\u5E94\u8D85\u65F6
-open.error_20000_isv.service-busy=\u670D\u52A1\u5668\u5FD9
-
-open.error_20001=\u6388\u6743\u6743\u9650\u4E0D\u8DB3
-open.error_20001_aop.invalid-auth-token=\u65E0\u6548\u7684\u8BBF\u95EE\u4EE4\u724C
-open.error_20001_aop.auth-token-time-out=\u8BBF\u95EE\u4EE4\u724C\u5DF2\u8FC7\u671F
-open.error_20001_aop.invalid-app-auth-token=\u65E0\u6548\u7684\u5E94\u7528\u6388\u6743\u4EE4\u724C
-open.error_20001_aop.invalid-app-auth-token-no-api=\u5546\u6237\u672A\u6388\u6743\u5F53\u524D\u63A5\u53E3
-open.error_20001_aop.app-auth-token-time-out=\u5E94\u7528\u6388\u6743\u4EE4\u724C\u5DF2\u8FC7\u671F
-open.error_20001_aop.no-product-reg-by-partner=\u5546\u6237\u672A\u7B7E\u7EA6\u4EFB\u4F55\u4EA7\u54C1
-
-open.error_40001=\u7F3A\u5C11\u5FC5\u9009\u53C2\u6570
-open.error_40001_isv.missing-method=\u7F3A\u5C11\u65B9\u6CD5\u540D\u53C2\u6570
-open.error_40001_isv.missing-signature=\u7F3A\u5C11\u7B7E\u540D\u53C2\u6570
-open.error_40001_isv.missing-signature-type=\u7F3A\u5C11\u7B7E\u540D\u7C7B\u578B\u53C2\u6570
-open.error_40001_isv.missing-signature-key=\u7F3A\u5C11\u7B7E\u540D\u914D\u7F6E
-open.error_40001_isv.missing-app-id=\u7F3A\u5C11appId\u53C2\u6570
-open.error_40001_isv.missing-timestamp=\u7F3A\u5C11\u65F6\u95F4\u6233\u53C2\u6570
-open.error_40001_isv.missing-version=\u7F3A\u5C11\u7248\u672C\u53C2\u6570
-open.error_40001_isv.decryption-error-missing-encrypt-type=\u89E3\u5BC6\u51FA\u9519, \u672A\u6307\u5B9A\u52A0\u5BC6\u7B97\u6CD5
-
-open.error_40002=\u975E\u6CD5\u7684\u53C2\u6570
-open.error_40002_isv.invalid-parameter=\u53C2\u6570\u65E0\u6548
-open.error_40002_isv.error-parameter=\u53c2\u6570\u4e0d\u6b63\u786e
-
-open.error_40002_isv.upload-fail=\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25
-open.error_40002_isv.invalid-file-extension=\u6587\u4EF6\u6269\u5C55\u540D\u65E0\u6548
-open.error_40002_isv.invalid-file-size={0}\u6587\u4EF6\u5927\u5C0F\u65E0\u6548\uFF0C\u5355\u6587\u4EF6\u4E0D\u5F97\u8D85\u8FC7{1}
-open.error_40002_isv.invalid-method=\u4E0D\u5B58\u5728\u7684\u65B9\u6CD5\u540D
-open.error_40002_isv.invalid-format=\u65E0\u6548\u7684\u6570\u636E\u683C\u5F0F
-open.error_40002_isv.invalid-signature-type=\u65E0\u6548\u7684\u7B7E\u540D\u7C7B\u578B
-open.error_40002_isv.invalid-signature=\u65E0\u6548\u7B7E\u540D
-open.error_40002_isv.invalid-encrypt-type=\u65E0\u6548\u7684\u52A0\u5BC6\u7C7B\u578B
-open.error_40002_isv.invalid-encrypt=\u89E3\u5BC6\u5F02\u5E38
-open.error_40002_isv.invalid-app-id=\u65E0\u6548\u7684appId\u53C2\u6570
-open.error_40002_isv.invalid-timestamp=\u975E\u6CD5\u7684\u65F6\u95F4\u6233\u53C2\u6570
-open.error_40002_isv.invalid-charset=\u5B57\u7B26\u96C6\u9519\u8BEF
-open.error_40002_isv.invalid-digest=\u6458\u8981\u9519\u8BEF
-open.error_40002_isv.decryption-error-not-valid-encrypt-type=\u89E3\u5BC6\u51FA\u9519\uFF0C\u4E0D\u652F\u6301\u7684\u52A0\u5BC6\u7B97\u6CD5
-open.error_40002_isv.decryption-error-not-valid-encrypt-key=\u89E3\u5BC6\u51FA\u9519, \u672A\u914D\u7F6E\u52A0\u5BC6\u5BC6\u94A5\u6216\u52A0\u5BC6\u5BC6\u94A5\u683C\u5F0F\u9519\u8BEF
-open.error_40002_isv.decryption-error-unknown=\u89E3\u5BC6\u51FA\u9519\uFF0C\u672A\u77E5\u5F02\u5E38
-open.error_40002_isv.missing-signature-config=\u9A8C\u7B7E\u51FA\u9519, \u672A\u914D\u7F6E\u5BF9\u5E94\u7B7E\u540D\u7B97\u6CD5\u7684\u516C\u94A5\u6216\u8005\u8BC1\u4E66
-open.error_40002_isv.not-support-app-auth=\u672C\u63A5\u53E3\u4E0D\u652F\u6301\u7B2C\u4E09\u65B9\u4EE3\u7406\u8C03\u7528
-open.error_40002_isv.suspected-attack=\u53EF\u7591\u7684\u653B\u51FB\u8BF7\u6C42
-open.error_40002_isv.invalid-content-type=\u65E0\u6548\u7684content-type
-
-open.error_40004=\u4E1A\u52A1\u5904\u7406\u5931\u8D25
-open.error_40004_=\u4E1A\u52A1\u5904\u7406\u5931\u8D25
-
-open.error_40006=\u6743\u9650\u4E0D\u8DB3
-open.error_40006_isv.insufficient-isv-permissions=\u8BF7\u68C0\u67E5\u914D\u7F6E\u7684\u8D26\u6237\u662F\u5426\u6709\u5F53\u524D\u63A5\u53E3\u6743\u9650
-open.error_40006_isv.insufficient-user-permissions=\u4EE3\u7406\u7684\u5546\u6237\u6CA1\u6709\u5F53\u524D\u63A5\u53E3\u6743\u9650
-open.error_40006_isv.route-no-permissions=\u6CA1\u6709\u5F53\u524D\u63A5\u53E3\u6743\u9650
-open.error_40006_isv.access-forbidden=\u65E0\u6743\u8BBF\u95EE
-open.error_40006_isv.ip-forbidden=IP\u65E0\u6743\u8BBF\u95EE

sop-gateway/src/main/resources/i18n/readme.md

@@ -1 +0,0 @@
-存放国际化文件

sop-support/sop-service-support/src/main/java/com/gitee/sop/support/exception/OpenException.java

@@ -1,10 +1,9 @@
 package com.gitee.sop.support.exception;
 
 import com.gitee.sop.support.context.OpenContext;
-import com.gitee.sop.support.message.OpenError;
+import com.gitee.sop.support.message.I18nMessage;
 import com.gitee.sop.support.message.OpenMessage;
 import com.gitee.sop.support.message.OpenMessageFactory;
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.Locale;
@@ -13,27 +12,36 @@ import java.util.Locale;
  * @author 六如
  */
 @Getter
-@AllArgsConstructor
 public class OpenException extends RuntimeException {
     private static final long serialVersionUID = -8059687941272829442L;
 
-    private String subCode;
+    private final String subCode;
 
-    private String subMsg;
+    private final String subMsg;
 
-    private String solution;
+    private final String solution;
 
-    public OpenException(OpenError openError, Locale locale, Object... params) {
+    public OpenException(I18nMessage i18nMessage, Locale locale, Object... params) {
-        this.subCode = openError.getSubCode();
+        this.subCode = i18nMessage.getConfigKey();
-        OpenMessage openMessage = OpenMessageFactory.getError(openError, locale, params);
+        OpenMessage openMessage = OpenMessageFactory.getMessage(i18nMessage, locale, params);
-        this.subMsg = openMessage.getSubMsg();
+        this.subMsg = openMessage.getMsg();
         this.solution = openMessage.getSolution();
     }
 
-    public OpenException(OpenError openError, Object... params) {
+    public OpenException(I18nMessage openError, Object... params) {
         this(openError, OpenContext.getLocale(), params);
     }
 
+    public OpenException(String subCode, String subMsg, String solution) {
+        this.subCode = subCode;
+        this.subMsg = subMsg;
+        this.solution = solution;
+    }
+
+    public OpenException(String subCode, String subMsg) {
+        this(subCode, subMsg, "");
+    }
+
     @Override
     public String toString() {
         return "<OPEN_ERROR>" + String.join("@@", subCode, subMsg, solution) + "</OPEN_ERROR>";

sop-support/sop-service-support/src/main/java/com/gitee/sop/support/message/DefaultOpenMessage.java

@@ -8,8 +8,8 @@ import lombok.Data;
  */
 @Data
 @AllArgsConstructor
-public class ServiceMessageImpl implements OpenMessage {
+public class DefaultOpenMessage implements OpenMessage {
-    private String subCode;
+    private String code;
-    private String subMsg;
+    private String msg;
     private String solution;
 }

sop-support/sop-service-support/src/main/java/com/gitee/sop/support/message/I18nMessage.java

@@ -0,0 +1,14 @@
+package com.gitee.sop.support.message;
+
+/**
+ * 定义国际化消息
+ *
+ * @author 六如
+ */
+public interface I18nMessage {
+
+    /**
+     * i18n配置文件key
+     */
+    String getConfigKey();
+}

sop-support/sop-service-support/src/main/java/com/gitee/sop/support/message/OpenError.java

@@ -1,16 +0,0 @@
-package com.gitee.sop.support.message;
-
-/**
- * 定义错误返回
- * @author 六如
- */
-public interface OpenError {
-
-    /**
-     * sub_code（明细返回码）
-     * @return sub_code（明细返回码）
-     */
-    String getSubCode();
-
-    String modulePrefix();
-}

sop-support/sop-service-support/src/main/java/com/gitee/sop/support/message/OpenMessage.java

@@ -10,12 +10,12 @@ public interface OpenMessage {
     /**
      * @return 明细返回码
      */
-    String getSubCode();
+    String getCode();
 
     /**
      * @return 明细信息
      */
-    String getSubMsg();
+    String getMsg();
 
     /**
      * @return 解决方案

sop-support/sop-service-support/src/main/java/com/gitee/sop/support/message/OpenMessageFactory.java

@@ -1,19 +1,30 @@
 package com.gitee.sop.support.message;
 
 
+import lombok.Data;
 import org.springframework.context.support.MessageSourceAccessor;
 import org.springframework.context.support.ResourceBundleMessageSource;
-import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 负责构建错误消息
@@ -25,31 +36,113 @@ public class OpenMessageFactory {
     static Logger logger = Logger.getLogger(OpenMessageFactory.class.getName());
 
     private static final String SOLUTION = ".solution";
+    private static final String I18N_ROOT = "i18n";
 
     private OpenMessageFactory() {
     }
 
     public static final String SYS_ERR = "系统错误";
 
-    private static final String I18N_OPEN_ERROR = "i18n/isp/error";
-
     private static final Set<String> noModuleCache = new HashSet<>();
 
-    private static final Map<String, OpenMessage> errorCache = new ConcurrentHashMap<>(64);
 
     /**
      * 错误信息的国际化信息
      */
     private static MessageSourceAccessor errorMessageSourceAccessor;
 
+    public static void initMessage() {
+        ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+        URL i18nFolder = contextClassLoader.getResource(I18N_ROOT);
+        if (i18nFolder == null) {
+            return;
+        }
+
+        try {
+            Path path = Paths.get(i18nFolder.toURI());
+            try (Stream<Path> walk = Files.walk(path)) {
+                Optional<Path> i18nRoot = walk.findFirst();
+                if (!i18nRoot.isPresent()) {
+                    return;
+                }
+                File root = i18nRoot.get().toFile();
+                List<FileTree> fileTrees = buildFileTree(root);
+                Set<String> isvModuleList = buildIsvModuleList(fileTrees);
+                OpenMessageFactory.initMessageSource(new ArrayList<>(isvModuleList));
+            }
+        } catch (URISyntaxException | IOException e) {
+            logger.warning("初始化i18n模块错误:" + e.getMessage());
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static Set<String> buildIsvModuleList(List<FileTree> fileTreeList) {
+        if (fileTreeList == null) {
+            return Collections.emptySet();
+        }
+
+        Set<String> isvModuleList = new HashSet<>();
+
+        List<FileTree> leafList = fileTreeList.stream().filter(FileTree::isLeaf).collect(Collectors.toList());
+        for (FileTree fileTree : leafList) {
+            LinkedList<String> nameList = new LinkedList<>();
+            appendNames(nameList, fileTree);
+            String moduleName = String.join("/", nameList);
+            isvModuleList.add(moduleName);
+        }
+
+        return isvModuleList;
+    }
+
+    private static void appendNames(LinkedList<String> nameList, FileTree fileTree) {
+        nameList.addFirst(fileTree.getName());
+        FileTree parent = fileTree.getParent();
+        if (parent != null) {
+            appendNames(nameList, parent);
+        }
+    }
+
+    private static List<FileTree> buildFileTree(File file) {
+        List<FileTree> fileTrees = new ArrayList<>();
+        appendFileTree(fileTrees, file, null);
+        return fileTrees;
+    }
+
+    private static void appendFileTree(List<FileTree> fileTrees, File file, FileTree parent) {
+        FileTree i18nTree = new FileTree();
+        i18nTree.setParent(parent);
+
+        fileTrees.add(i18nTree);
+        if (file.isDirectory()) {
+            i18nTree.setName(file.getName());
+            File[] files = file.listFiles();
+            if (files == null || files.length == 0) {
+                return;
+            }
+            for (File childFile : files) {
+                appendFileTree(fileTrees, childFile, i18nTree);
+            }
+        } else {
+            // i18n/isp/bizerror_en.properties
+            String name = file.getName();
+            int i = name.indexOf("_");
+            if (i < 0) {
+                return;
+            }
+            String module = name.substring(0, i);
+
+            i18nTree.setName(module);
+            i18nTree.setLeaf(true);
+        }
+    }
+
     /**
      * 设置国际化资源信息
      */
     public static void initMessageSource(List<String> isvModules) {
         HashSet<String> baseNamesSet = new HashSet<>();
-        baseNamesSet.add(I18N_OPEN_ERROR);
 
-        if (!isvModules.isEmpty()) {
+        if (isvModules != null) {
             baseNamesSet.addAll(isvModules);
         }
 
@@ -70,25 +163,26 @@ public class OpenMessageFactory {
      * @param params    参数
      * @return 如果没有配置国际化消息，则直接返回errorMeta中的信息
      */
-    public static OpenMessage getError(OpenError openError, Locale locale, Object... params) {
+    public static OpenMessage getMessage(I18nMessage openError, Locale locale, Object... params) {
-        Assert.notNull(locale, "未设置Locale");
+        if (locale == null) {
-        String modulePrefix = openError.modulePrefix();
+            locale = Locale.SIMPLIFIED_CHINESE;
-        String subCode = openError.getSubCode();
+        }
-        // isp.error_isp.unknow-error=Service is temporarily unavailable
+        String subCode = openError.getConfigKey();
-        String subMsg = getErrorMessage(modulePrefix + subCode, locale, params);
+        // isp.unknow-error=Service is temporarily unavailable
+        String subMsg = getErrorMessage(subCode, locale, params);
         if (ObjectUtils.isEmpty(subMsg)) {
             subMsg = SYS_ERR;
         }
-        // isp.error_isp.unknow-error.solution=Service is temporarily unavailable
+        // isp.unknow-error.solution=Service is temporarily unavailable
-        String solution = getErrorMessage(modulePrefix + subCode + SOLUTION, locale, params);
+        String solution = getErrorMessage(subCode + SOLUTION, locale, params);
         if (ObjectUtils.isEmpty(solution)) {
             solution = "";
         }
-        return new ServiceMessageImpl(subCode, subMsg, solution);
+        return new DefaultOpenMessage(subCode, subMsg, solution);
     }
 
 
-    public static void setErrorMessageSourceAccessor(MessageSourceAccessor errorMessageSourceAccessor) {
+    private static void setErrorMessageSourceAccessor(MessageSourceAccessor errorMessageSourceAccessor) {
         OpenMessageFactory.errorMessageSourceAccessor = errorMessageSourceAccessor;
     }
 
@@ -100,7 +194,7 @@ public class OpenMessageFactory {
      * @param params 参数
      * @return 返回信息
      */
-    public static String getErrorMessage(String module, Locale locale, Object... params) {
+    private static String getErrorMessage(String module, Locale locale, Object... params) {
         if (noModuleCache.contains(module)) {
             return null;
         }
@@ -112,5 +206,21 @@ public class OpenMessageFactory {
         }
     }
 
+    @Data
+    private static class FileTree {
+        private String name;
+
+        private FileTree parent;
+
+        private boolean isLeaf;
+
+        @Override
+        public String toString() {
+            return "FileTree{" +
+                    "name='" + name + '\'' +
+                    '}';
+        }
+    }
+
 
 }

sop-support/sop-service-support/src/main/java/com/gitee/sop/support/register/ApiRegister.java

@@ -12,27 +12,16 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.dubbo.config.annotation.DubboService;
 
-import java.io.File;
-import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
-import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -43,10 +32,7 @@ import java.util.stream.Stream;
  */
 public class ApiRegister {
 
-    Logger log = Logger.getLogger(ApiRegister.class.getName());
-
     private static final Log LOG = LogFactory.getLog(ApiRegister.class);
-    public static final String I18N_ROOT = "i18n";
 
     private final ApiRegisterService apiRegisterService;
 
@@ -65,89 +51,7 @@ public class ApiRegister {
                     this.regApi(appName, interfaceClass, method, open));
         }
 
-        initMessage();
+        OpenMessageFactory.initMessage();
-    }
-
-    protected void initMessage() {
-        ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
-        URL i18nFolder = contextClassLoader.getResource(I18N_ROOT);
-        if (i18nFolder == null) {
-            return;
-        }
-
-        try {
-            Path path = Paths.get(i18nFolder.toURI());
-            try (Stream<Path> walk = Files.walk(path)) {
-                Optional<Path> i18nRoot = walk.findFirst();
-                if (!i18nRoot.isPresent()) {
-                    return;
-                }
-                File root = i18nRoot.get().toFile();
-                List<FileTree> fileTrees = buildFileTree(root);
-                Set<String> isvModuleList = buildIsvModuleList(fileTrees);
-                OpenMessageFactory.initMessageSource(new ArrayList<>(isvModuleList));
-            }
-        } catch (URISyntaxException | IOException e) {
-            log.warning("初始化i18n模块错误:" + e.getMessage());
-            throw new RuntimeException(e);
-        }
-    }
-
-    private Set<String> buildIsvModuleList(List<FileTree> fileTreeList) {
-        if (fileTreeList == null) {
-            return Collections.emptySet();
-        }
-
-        Set<String> isvModuleList = new HashSet<>();
-
-        List<FileTree> leafList = fileTreeList.stream().filter(FileTree::isLeaf).collect(Collectors.toList());
-        for (FileTree fileTree : leafList) {
-            LinkedList<String> nameList = new LinkedList<>();
-            appendNames(nameList, fileTree);
-            String moduleName = String.join("/", nameList);
-            isvModuleList.add(moduleName);
-        }
-
-        return isvModuleList;
-    }
-
-    private void appendNames(LinkedList<String> nameList, FileTree fileTree) {
-        nameList.addFirst(fileTree.getName());
-        FileTree parent = fileTree.getParent();
-        if (parent != null) {
-            appendNames(nameList, parent);
-        }
-    }
-
-    private List<FileTree> buildFileTree(File file) {
-        List<FileTree> fileTrees = new ArrayList<>();
-        this.appendFileTree(fileTrees, file, null);
-        return fileTrees;
-    }
-
-    private void appendFileTree(List<FileTree> fileTrees, File file, FileTree parent) {
-        FileTree i18nTree = new FileTree();
-        i18nTree.setParent(parent);
-
-        fileTrees.add(i18nTree);
-        if (file.isDirectory()) {
-            i18nTree.setName(file.getName());
-            File[] files = file.listFiles();
-            if (files == null || files.length == 0) {
-                return;
-            }
-            for (File childFile : files) {
-                appendFileTree(fileTrees, childFile, i18nTree);
-            }
-        } else {
-            // i18n/isp/bizerror_en.properties
-            String name = file.getName();
-            int i = name.indexOf("_");
-            String module = name.substring(0, i);
-
-            i18nTree.setName(module);
-            i18nTree.setLeaf(true);
-        }
     }
 
     protected void doWithMethod(Class<?> objClass, RegisterCallback callback) {

sop-test/src/test/java/com/gitee/sop/test/AllInOneTest.java

@@ -73,16 +73,22 @@ public class AllInOneTest extends TestBase {
      * 以json方式提交(application/json)
      */
     public void testError() {
+        // Accept-Language
+        Map<String, String> header = new HashMap<>(4);
+        // zh-CN
+        header.put("Accept-Language", "en-US");
+//        header.put("Accept-Language", "zh-CN");
         Client.RequestBuilder requestBuilder = new Client.RequestBuilder()
                 .method("story.updateError")
                 .version("1.0")
+                .header(header)
                 // 以json方式提交
                 .postJson(true)
                 .bizContent(new BizContent().add("id", "0").add("name", "葫芦娃"))
                 .callback((requestInfo, responseData) -> {
                     System.out.println(responseData);
                     JSONObject jsonObject = JSON.parseObject(responseData);
-                    Assert.assertEquals("40004", jsonObject.getString("code"));
+                    Assert.assertEquals("50003", jsonObject.getString("code"));
                 });
 
 

sop-test/src/test/java/com/gitee/sop/test/ArrayTest.java

@@ -1,63 +0,0 @@
-package com.gitee.sop.test;
-
-import com.alibaba.fastjson.JSON;
-import com.gitee.sop.test.alipay.AlipaySignature;
-import org.junit.Test;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 接收数组
- */
-public class ArrayTest extends TestBase {
-
-    String url = "http://localhost:8081/api";
-    String appId = "2019032617262200001";
-    // 平台提供的私钥
-    String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCXJv1pQFqWNA/++OYEV7WYXwexZK/J8LY1OWlP9X0T6wHFOvxNKRvMkJ5544SbgsJpVcvRDPrcxmhPbi/sAhdO4x2PiPKIz9Yni2OtYCCeaiE056B+e1O2jXoLeXbfi9fPivJZkxH/tb4xfLkH3bA8ZAQnQsoXA0SguykMRZntF0TndUfvDrLqwhlR8r5iRdZLB6F8o8qXH6UPDfNEnf/K8wX5T4EB1b8x8QJ7Ua4GcIUqeUxGHdQpzNbJdaQvoi06lgccmL+PHzminkFYON7alj1CjDN833j7QMHdPtS9l7B67fOU/p2LAAkPMtoVBfxQt9aFj7B8rEhGCz02iJIBAgMBAAECggEARqOuIpY0v6WtJBfmR3lGIOOokLrhfJrGTLF8CiZMQha+SRJ7/wOLPlsH9SbjPlopyViTXCuYwbzn2tdABigkBHYXxpDV6CJZjzmRZ+FY3S/0POlTFElGojYUJ3CooWiVfyUMhdg5vSuOq0oCny53woFrf32zPHYGiKdvU5Djku1onbDU0Lw8w+5tguuEZ76kZ/lUcccGy5978FFmYpzY/65RHCpvLiLqYyWTtaNT1aQ/9pw4jX9HO9NfdJ9gYFK8r/2f36ZE4hxluAfeOXQfRC/WhPmiw/ReUhxPznG/WgKaa/OaRtAx3inbQ+JuCND7uuKeRe4osP2jLPHPP6AUwQKBgQDUNu3BkLoKaimjGOjCTAwtp71g1oo+k5/uEInAo7lyEwpV0EuUMwLA/HCqUgR4K9pyYV+Oyb8d6f0+Hz0BMD92I2pqlXrD7xV2WzDvyXM3s63NvorRooKcyfd9i6ccMjAyTR2qfLkxv0hlbBbsPHz4BbU63xhTJp3Ghi0/ey/1HQKBgQC2VsgqC6ykfSidZUNLmQZe3J0p/Qf9VLkfrQ+xaHapOs6AzDU2H2osuysqXTLJHsGfrwVaTs00ER2z8ljTJPBUtNtOLrwNRlvgdnzyVAKHfOgDBGwJgiwpeE9voB1oAV/mXqSaUWNnuwlOIhvQEBwekqNyWvhLqC7nCAIhj3yvNQKBgQCqYbeec56LAhWP903Zwcj9VvG7sESqXUhIkUqoOkuIBTWFFIm54QLTA1tJxDQGb98heoCIWf5x/A3xNI98RsqNBX5JON6qNWjb7/dobitti3t99v/ptDp9u8JTMC7penoryLKK0Ty3bkan95Kn9SC42YxaSghzqkt+uvfVQgiNGQKBgGxU6P2aDAt6VNwWosHSe+d2WWXt8IZBhO9d6dn0f7ORvcjmCqNKTNGgrkewMZEuVcliueJquR47IROdY8qmwqcBAN7Vg2K7r7CPlTKAWTRYMJxCT1Hi5gwJb+CZF3+IeYqsJk2NF2s0w5WJTE70k1BSvQsfIzAIDz2yE1oPHvwVAoGAA6e+xQkVH4fMEph55RJIZ5goI4Y76BSvt2N5OKZKd4HtaV+eIhM3SDsVYRLIm9ZquJHMiZQGyUGnsvrKL6AAVNK7eQZCRDk9KQz+0GKOGqku0nOZjUbAu6A2/vtXAaAuFSFx1rUQVVjFulLexkXR3KcztL1Qu2k5pB6Si0K/uwQ=";
-
-    @Test
-    public void testGet() throws Exception {
-
-        // 公共请求参数
-        Map<String, String> params = new HashMap<String, String>();
-        params.put("app_id", appId);
-        params.put("method", "story.listparam");
-        params.put("format", "json");
-        params.put("charset", "utf-8");
-        params.put("sign_type", "RSA2");
-        params.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-        params.put("version", "1.0");
-
-        // 业务参数
-        String bizContent = "{\n" +
-                "    \"name\": \"jim\",\n" +
-                "    \"list\": [{\n" +
-                "        \"age\": 22,\n" +
-                "        \"name\": \"jim\",\n" +
-                "        \"address\": \"xx\"\n" +
-                "    }]\n" +
-                "}";
-
-        params.put("biz_content", JSON.toJSONString(JSON.parseObject(bizContent)));
-        String content = AlipaySignature.getSignContent(params);
-        String sign = AlipaySignature.rsa256Sign(content, privateKey, "utf-8");
-        params.put("sign", sign);
-
-        System.out.println("----------- 请求信息 -----------");
-        System.out.println("请求参数：" + buildParamQuery(params));
-        System.out.println("商户秘钥：" + privateKey);
-        System.out.println("待签名内容：" + content);
-        System.out.println("签名(sign)：" + sign);
-        System.out.println("URL参数：" + buildUrlQuery(params));
-
-        System.out.println("----------- 返回结果 -----------");
-        String responseData = postJson(url, params);// 发送请求
-        System.out.println(responseData);
-    }
-
-
-}

sop-test/src/test/java/com/gitee/sop/test/DownloadTest.java

@@ -1,67 +0,0 @@
-package com.gitee.sop.test;
-
-import com.alibaba.fastjson.JSON;
-import com.gitee.sop.test.alipay.AlipayApiException;
-import com.gitee.sop.test.alipay.AlipaySignature;
-import org.apache.commons.io.IOUtils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 文件下载
- * @author 六如
- */
-public class DownloadTest extends TestBase {
-
-    String url = "http://localhost:8081/api";
-    String appId = "2019032617262200001";
-    // 支付宝私钥
-    String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCXJv1pQFqWNA/++OYEV7WYXwexZK/J8LY1OWlP9X0T6wHFOvxNKRvMkJ5544SbgsJpVcvRDPrcxmhPbi/sAhdO4x2PiPKIz9Yni2OtYCCeaiE056B+e1O2jXoLeXbfi9fPivJZkxH/tb4xfLkH3bA8ZAQnQsoXA0SguykMRZntF0TndUfvDrLqwhlR8r5iRdZLB6F8o8qXH6UPDfNEnf/K8wX5T4EB1b8x8QJ7Ua4GcIUqeUxGHdQpzNbJdaQvoi06lgccmL+PHzminkFYON7alj1CjDN833j7QMHdPtS9l7B67fOU/p2LAAkPMtoVBfxQt9aFj7B8rEhGCz02iJIBAgMBAAECggEARqOuIpY0v6WtJBfmR3lGIOOokLrhfJrGTLF8CiZMQha+SRJ7/wOLPlsH9SbjPlopyViTXCuYwbzn2tdABigkBHYXxpDV6CJZjzmRZ+FY3S/0POlTFElGojYUJ3CooWiVfyUMhdg5vSuOq0oCny53woFrf32zPHYGiKdvU5Djku1onbDU0Lw8w+5tguuEZ76kZ/lUcccGy5978FFmYpzY/65RHCpvLiLqYyWTtaNT1aQ/9pw4jX9HO9NfdJ9gYFK8r/2f36ZE4hxluAfeOXQfRC/WhPmiw/ReUhxPznG/WgKaa/OaRtAx3inbQ+JuCND7uuKeRe4osP2jLPHPP6AUwQKBgQDUNu3BkLoKaimjGOjCTAwtp71g1oo+k5/uEInAo7lyEwpV0EuUMwLA/HCqUgR4K9pyYV+Oyb8d6f0+Hz0BMD92I2pqlXrD7xV2WzDvyXM3s63NvorRooKcyfd9i6ccMjAyTR2qfLkxv0hlbBbsPHz4BbU63xhTJp3Ghi0/ey/1HQKBgQC2VsgqC6ykfSidZUNLmQZe3J0p/Qf9VLkfrQ+xaHapOs6AzDU2H2osuysqXTLJHsGfrwVaTs00ER2z8ljTJPBUtNtOLrwNRlvgdnzyVAKHfOgDBGwJgiwpeE9voB1oAV/mXqSaUWNnuwlOIhvQEBwekqNyWvhLqC7nCAIhj3yvNQKBgQCqYbeec56LAhWP903Zwcj9VvG7sESqXUhIkUqoOkuIBTWFFIm54QLTA1tJxDQGb98heoCIWf5x/A3xNI98RsqNBX5JON6qNWjb7/dobitti3t99v/ptDp9u8JTMC7penoryLKK0Ty3bkan95Kn9SC42YxaSghzqkt+uvfVQgiNGQKBgGxU6P2aDAt6VNwWosHSe+d2WWXt8IZBhO9d6dn0f7ORvcjmCqNKTNGgrkewMZEuVcliueJquR47IROdY8qmwqcBAN7Vg2K7r7CPlTKAWTRYMJxCT1Hi5gwJb+CZF3+IeYqsJk2NF2s0w5WJTE70k1BSvQsfIzAIDz2yE1oPHvwVAoGAA6e+xQkVH4fMEph55RJIZ5goI4Y76BSvt2N5OKZKd4HtaV+eIhM3SDsVYRLIm9ZquJHMiZQGyUGnsvrKL6AAVNK7eQZCRDk9KQz+0GKOGqku0nOZjUbAu6A2/vtXAaAuFSFx1rUQVVjFulLexkXR3KcztL1Qu2k5pB6Si0K/uwQ=";
-
-
-    public void testDownload() throws AlipayApiException, IOException {
-        // 公共请求参数
-        Map<String, String> params = new HashMap<String, String>();
-        params.put("app_id", appId);
-        params.put("method", "file.download");
-        params.put("format", "json");
-        params.put("charset", "utf-8");
-        params.put("sign_type", "RSA2");
-        params.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-        params.put("version", "1.0");
-
-        // 业务参数
-        Map<String, Object> bizContent = new HashMap<>();
-        bizContent.put("id", "1");
-        bizContent.put("name", "葫芦娃");
-
-        params.put("biz_content", JSON.toJSONString(bizContent));
-        String content = AlipaySignature.getSignContent(params);
-        String sign = AlipaySignature.rsa256Sign(content, privateKey, "utf-8");
-        params.put("sign", sign);
-
-        System.out.println("----------- 请求信息 -----------");
-        System.out.println("请求参数：" + buildParamQuery(params));
-        System.out.println("商户秘钥：" + privateKey);
-        System.out.println("待签名内容：" + content);
-        System.out.println("签名(sign)：" + sign);
-        System.out.println("URL参数：" + buildUrlQuery(params));
-
-        System.out.println("----------- 返回结果 -----------");
-        InputStream fileInputStream = download(url, params);
-        String fileContent = IOUtils.toString(fileInputStream, StandardCharsets.UTF_8);
-        // 输出文件内容
-        System.out.println("文件内容：");
-        System.out.println(fileContent);
-
-        // 写文件到本地
-        //FileUtils.copyInputStreamToFile(fileInputStream, new File("D:/a.txt"));
-    }
-
-}

sop-test/src/test/java/com/gitee/sop/test/LargeBodyPostTest.java

@@ -1,65 +0,0 @@
-package com.gitee.sop.test;
-
-import com.alibaba.fastjson.JSON;
-import com.gitee.sop.test.alipay.AlipaySignature;
-import org.apache.commons.io.FileUtils;
-import org.junit.Test;
-
-import java.io.File;
-import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 模仿支付宝客户端请求接口
- */
-public class LargeBodyPostTest extends TestBase {
-
-    String url = "http://localhost:8081/api";
-    String appId = "2019032617262200001";
-    // 平台提供的私钥
-    String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCXJv1pQFqWNA/++OYEV7WYXwexZK/J8LY1OWlP9X0T6wHFOvxNKRvMkJ5544SbgsJpVcvRDPrcxmhPbi/sAhdO4x2PiPKIz9Yni2OtYCCeaiE056B+e1O2jXoLeXbfi9fPivJZkxH/tb4xfLkH3bA8ZAQnQsoXA0SguykMRZntF0TndUfvDrLqwhlR8r5iRdZLB6F8o8qXH6UPDfNEnf/K8wX5T4EB1b8x8QJ7Ua4GcIUqeUxGHdQpzNbJdaQvoi06lgccmL+PHzminkFYON7alj1CjDN833j7QMHdPtS9l7B67fOU/p2LAAkPMtoVBfxQt9aFj7B8rEhGCz02iJIBAgMBAAECggEARqOuIpY0v6WtJBfmR3lGIOOokLrhfJrGTLF8CiZMQha+SRJ7/wOLPlsH9SbjPlopyViTXCuYwbzn2tdABigkBHYXxpDV6CJZjzmRZ+FY3S/0POlTFElGojYUJ3CooWiVfyUMhdg5vSuOq0oCny53woFrf32zPHYGiKdvU5Djku1onbDU0Lw8w+5tguuEZ76kZ/lUcccGy5978FFmYpzY/65RHCpvLiLqYyWTtaNT1aQ/9pw4jX9HO9NfdJ9gYFK8r/2f36ZE4hxluAfeOXQfRC/WhPmiw/ReUhxPznG/WgKaa/OaRtAx3inbQ+JuCND7uuKeRe4osP2jLPHPP6AUwQKBgQDUNu3BkLoKaimjGOjCTAwtp71g1oo+k5/uEInAo7lyEwpV0EuUMwLA/HCqUgR4K9pyYV+Oyb8d6f0+Hz0BMD92I2pqlXrD7xV2WzDvyXM3s63NvorRooKcyfd9i6ccMjAyTR2qfLkxv0hlbBbsPHz4BbU63xhTJp3Ghi0/ey/1HQKBgQC2VsgqC6ykfSidZUNLmQZe3J0p/Qf9VLkfrQ+xaHapOs6AzDU2H2osuysqXTLJHsGfrwVaTs00ER2z8ljTJPBUtNtOLrwNRlvgdnzyVAKHfOgDBGwJgiwpeE9voB1oAV/mXqSaUWNnuwlOIhvQEBwekqNyWvhLqC7nCAIhj3yvNQKBgQCqYbeec56LAhWP903Zwcj9VvG7sESqXUhIkUqoOkuIBTWFFIm54QLTA1tJxDQGb98heoCIWf5x/A3xNI98RsqNBX5JON6qNWjb7/dobitti3t99v/ptDp9u8JTMC7penoryLKK0Ty3bkan95Kn9SC42YxaSghzqkt+uvfVQgiNGQKBgGxU6P2aDAt6VNwWosHSe+d2WWXt8IZBhO9d6dn0f7ORvcjmCqNKTNGgrkewMZEuVcliueJquR47IROdY8qmwqcBAN7Vg2K7r7CPlTKAWTRYMJxCT1Hi5gwJb+CZF3+IeYqsJk2NF2s0w5WJTE70k1BSvQsfIzAIDz2yE1oPHvwVAoGAA6e+xQkVH4fMEph55RJIZ5goI4Y76BSvt2N5OKZKd4HtaV+eIhM3SDsVYRLIm9ZquJHMiZQGyUGnsvrKL6AAVNK7eQZCRDk9KQz+0GKOGqku0nOZjUbAu6A2/vtXAaAuFSFx1rUQVVjFulLexkXR3KcztL1Qu2k5pB6Si0K/uwQ=";
-
-    // 测试大容量报文
-    @Test
-    public void testGet() throws Exception {
-
-        // 公共请求参数
-        Map<String, String> params = new HashMap<String, String>();
-        params.put("app_id", appId);
-        params.put("method", "story.get.large");
-        params.put("format", "json");
-        params.put("charset", "utf-8");
-        params.put("sign_type", "RSA2");
-        params.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-        params.put("version", "1.0");
-
-        // 业务参数
-        Map<String, Object> bizContent = new HashMap<>();
-        bizContent.put("id", "1");
-        String root = System.getProperty("user.dir");
-        File file = new File(root + "/src/main/resources/large_data.txt");
-        String fileContent = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
-        bizContent.put("content", fileContent);
-
-        params.put("biz_content", JSON.toJSONString(bizContent));
-        String content = AlipaySignature.getSignContent(params);
-        String sign = AlipaySignature.rsa256Sign(content, privateKey, "utf-8");
-        params.put("sign", sign);
-
-        System.out.println("----------- 请求信息 -----------");
-        System.out.println("请求参数：" + buildParamQuery(params));
-        System.out.println("商户秘钥：" + privateKey);
-        System.out.println("待签名内容：" + content);
-        System.out.println("签名(sign)：" + sign);
-        System.out.println("URL参数：" + buildUrlQuery(params));
-
-        System.out.println("----------- 返回结果 -----------");
-        String responseData = post(url, params);// 发送请求
-        System.out.println(responseData);
-    }
-
-
-}

sop-test/src/test/java/com/gitee/sop/test/LimitTest.java

@@ -1,78 +0,0 @@
-package com.gitee.sop.test;
-
-import com.alibaba.fastjson.JSON;
-import com.gitee.sop.test.alipay.AlipaySignature;
-import junit.framework.TestResult;
-import lombok.SneakyThrows;
-import org.junit.Test;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 测试限流
- */
-public class LimitTest extends TestBase {
-
-    String url = "http://localhost:8081/api";
-    String appId = "2019032617262200001";
-    // 平台提供的私钥
-    String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCXJv1pQFqWNA/++OYEV7WYXwexZK/J8LY1OWlP9X0T6wHFOvxNKRvMkJ5544SbgsJpVcvRDPrcxmhPbi/sAhdO4x2PiPKIz9Yni2OtYCCeaiE056B+e1O2jXoLeXbfi9fPivJZkxH/tb4xfLkH3bA8ZAQnQsoXA0SguykMRZntF0TndUfvDrLqwhlR8r5iRdZLB6F8o8qXH6UPDfNEnf/K8wX5T4EB1b8x8QJ7Ua4GcIUqeUxGHdQpzNbJdaQvoi06lgccmL+PHzminkFYON7alj1CjDN833j7QMHdPtS9l7B67fOU/p2LAAkPMtoVBfxQt9aFj7B8rEhGCz02iJIBAgMBAAECggEARqOuIpY0v6WtJBfmR3lGIOOokLrhfJrGTLF8CiZMQha+SRJ7/wOLPlsH9SbjPlopyViTXCuYwbzn2tdABigkBHYXxpDV6CJZjzmRZ+FY3S/0POlTFElGojYUJ3CooWiVfyUMhdg5vSuOq0oCny53woFrf32zPHYGiKdvU5Djku1onbDU0Lw8w+5tguuEZ76kZ/lUcccGy5978FFmYpzY/65RHCpvLiLqYyWTtaNT1aQ/9pw4jX9HO9NfdJ9gYFK8r/2f36ZE4hxluAfeOXQfRC/WhPmiw/ReUhxPznG/WgKaa/OaRtAx3inbQ+JuCND7uuKeRe4osP2jLPHPP6AUwQKBgQDUNu3BkLoKaimjGOjCTAwtp71g1oo+k5/uEInAo7lyEwpV0EuUMwLA/HCqUgR4K9pyYV+Oyb8d6f0+Hz0BMD92I2pqlXrD7xV2WzDvyXM3s63NvorRooKcyfd9i6ccMjAyTR2qfLkxv0hlbBbsPHz4BbU63xhTJp3Ghi0/ey/1HQKBgQC2VsgqC6ykfSidZUNLmQZe3J0p/Qf9VLkfrQ+xaHapOs6AzDU2H2osuysqXTLJHsGfrwVaTs00ER2z8ljTJPBUtNtOLrwNRlvgdnzyVAKHfOgDBGwJgiwpeE9voB1oAV/mXqSaUWNnuwlOIhvQEBwekqNyWvhLqC7nCAIhj3yvNQKBgQCqYbeec56LAhWP903Zwcj9VvG7sESqXUhIkUqoOkuIBTWFFIm54QLTA1tJxDQGb98heoCIWf5x/A3xNI98RsqNBX5JON6qNWjb7/dobitti3t99v/ptDp9u8JTMC7penoryLKK0Ty3bkan95Kn9SC42YxaSghzqkt+uvfVQgiNGQKBgGxU6P2aDAt6VNwWosHSe+d2WWXt8IZBhO9d6dn0f7ORvcjmCqNKTNGgrkewMZEuVcliueJquR47IROdY8qmwqcBAN7Vg2K7r7CPlTKAWTRYMJxCT1Hi5gwJb+CZF3+IeYqsJk2NF2s0w5WJTE70k1BSvQsfIzAIDz2yE1oPHvwVAoGAA6e+xQkVH4fMEph55RJIZ5goI4Y76BSvt2N5OKZKd4HtaV+eIhM3SDsVYRLIm9ZquJHMiZQGyUGnsvrKL6AAVNK7eQZCRDk9KQz+0GKOGqku0nOZjUbAu6A2/vtXAaAuFSFx1rUQVVjFulLexkXR3KcztL1Qu2k5pB6Si0K/uwQ=";
-
-    // 前往sop-admin，设置限流
-    // ------ 表单内容 ------
-    // 限流维度：路由ID
-    // 路由ID：story.get1.0
-    // 限流策略：窗口策略
-    // 请求数：每 30 秒可请求 2 次
-    @Test
-    public void testGet() throws Exception {
-        for (int i = 0; i < 5; i++) {
-            this.run();
-        }
-    }
-
-    // 前往sop-admin，设置限流
-    // ------ 表单内容 ------
-    // 限流维度：路由ID
-    // 路由ID：story.get1.0
-    // 限流策略：令牌桶
-    // 令牌桶容量：5
-    @Test
-    public void testGet2() throws Exception {
-        for (int i = 0; i < 20; i++) {
-            this.run();
-        }
-    }
-
-    @SneakyThrows
-    public TestResult run() {
-        // 公共请求参数
-        Map<String, String> params = new HashMap<String, String>();
-        params.put("app_id", appId);
-        params.put("method", "story.get");
-        params.put("format", "json");
-        params.put("charset", "utf-8");
-        params.put("sign_type", "RSA2");
-        params.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-        params.put("version", "1.0");
-
-        // 业务参数
-        Map<String, String> bizContent = new HashMap<>();
-        bizContent.put("id", "1");
-        bizContent.put("name", "葫芦娃");
-
-        params.put("biz_content", JSON.toJSONString(bizContent));
-        String content = AlipaySignature.getSignContent(params);
-        String sign = AlipaySignature.rsa256Sign(content, privateKey, "utf-8");
-        params.put("sign", sign);
-
-        String responseData = get(url, params);// 发送请求
-        System.out.println(responseData);
-        return null;
-    }
-
-
-}

sop-test/src/test/java/com/gitee/sop/test/OneParamTest.java

@@ -1,121 +0,0 @@
-package com.gitee.sop.test;
-
-import com.alibaba.fastjson.JSON;
-import com.gitee.sop.test.alipay.AlipaySignature;
-import org.junit.Test;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 模仿支付宝客户端请求接口
- */
-public class OneParamTest extends TestBase {
-
-    String url = "http://localhost:8081/api";
-    String appId = "2019032617262200001";
-    // 平台提供的私钥
-    String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCXJv1pQFqWNA/++OYEV7WYXwexZK/J8LY1OWlP9X0T6wHFOvxNKRvMkJ5544SbgsJpVcvRDPrcxmhPbi/sAhdO4x2PiPKIz9Yni2OtYCCeaiE056B+e1O2jXoLeXbfi9fPivJZkxH/tb4xfLkH3bA8ZAQnQsoXA0SguykMRZntF0TndUfvDrLqwhlR8r5iRdZLB6F8o8qXH6UPDfNEnf/K8wX5T4EB1b8x8QJ7Ua4GcIUqeUxGHdQpzNbJdaQvoi06lgccmL+PHzminkFYON7alj1CjDN833j7QMHdPtS9l7B67fOU/p2LAAkPMtoVBfxQt9aFj7B8rEhGCz02iJIBAgMBAAECggEARqOuIpY0v6WtJBfmR3lGIOOokLrhfJrGTLF8CiZMQha+SRJ7/wOLPlsH9SbjPlopyViTXCuYwbzn2tdABigkBHYXxpDV6CJZjzmRZ+FY3S/0POlTFElGojYUJ3CooWiVfyUMhdg5vSuOq0oCny53woFrf32zPHYGiKdvU5Djku1onbDU0Lw8w+5tguuEZ76kZ/lUcccGy5978FFmYpzY/65RHCpvLiLqYyWTtaNT1aQ/9pw4jX9HO9NfdJ9gYFK8r/2f36ZE4hxluAfeOXQfRC/WhPmiw/ReUhxPznG/WgKaa/OaRtAx3inbQ+JuCND7uuKeRe4osP2jLPHPP6AUwQKBgQDUNu3BkLoKaimjGOjCTAwtp71g1oo+k5/uEInAo7lyEwpV0EuUMwLA/HCqUgR4K9pyYV+Oyb8d6f0+Hz0BMD92I2pqlXrD7xV2WzDvyXM3s63NvorRooKcyfd9i6ccMjAyTR2qfLkxv0hlbBbsPHz4BbU63xhTJp3Ghi0/ey/1HQKBgQC2VsgqC6ykfSidZUNLmQZe3J0p/Qf9VLkfrQ+xaHapOs6AzDU2H2osuysqXTLJHsGfrwVaTs00ER2z8ljTJPBUtNtOLrwNRlvgdnzyVAKHfOgDBGwJgiwpeE9voB1oAV/mXqSaUWNnuwlOIhvQEBwekqNyWvhLqC7nCAIhj3yvNQKBgQCqYbeec56LAhWP903Zwcj9VvG7sESqXUhIkUqoOkuIBTWFFIm54QLTA1tJxDQGb98heoCIWf5x/A3xNI98RsqNBX5JON6qNWjb7/dobitti3t99v/ptDp9u8JTMC7penoryLKK0Ty3bkan95Kn9SC42YxaSghzqkt+uvfVQgiNGQKBgGxU6P2aDAt6VNwWosHSe+d2WWXt8IZBhO9d6dn0f7ORvcjmCqNKTNGgrkewMZEuVcliueJquR47IROdY8qmwqcBAN7Vg2K7r7CPlTKAWTRYMJxCT1Hi5gwJb+CZF3+IeYqsJk2NF2s0w5WJTE70k1BSvQsfIzAIDz2yE1oPHvwVAoGAA6e+xQkVH4fMEph55RJIZ5goI4Y76BSvt2N5OKZKd4HtaV+eIhM3SDsVYRLIm9ZquJHMiZQGyUGnsvrKL6AAVNK7eQZCRDk9KQz+0GKOGqku0nOZjUbAu6A2/vtXAaAuFSFx1rUQVVjFulLexkXR3KcztL1Qu2k5pB6Si0K/uwQ=";
-
-    // 演示没有biz_content，用于绑定单个参数
-    @Test
-    public void testGet() throws Exception {
-
-        // 公共请求参数
-        Map<String, String> params = new HashMap<String, String>();
-        params.put("app_id", appId);
-        params.put("method", "story.oneparam");
-        params.put("format", "json");
-        params.put("charset", "utf-8");
-        params.put("sign_type", "RSA2");
-        params.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-        params.put("version", "1.0");
-
-        // 业务参数
-        params.put("id", "aaa");
-        params.put("name", "jim");
-
-        String content = AlipaySignature.getSignContent(params);
-        String sign = AlipaySignature.rsa256Sign(content, privateKey, "utf-8");
-        params.put("sign", sign);
-
-        System.out.println("----------- 请求信息 -----------");
-        System.out.println("请求参数：" + buildParamQuery(params));
-        System.out.println("商户秘钥：" + privateKey);
-        System.out.println("待签名内容：" + content);
-        System.out.println("签名(sign)：" + sign);
-        System.out.println("URL参数：" + buildUrlQuery(params));
-
-        System.out.println("----------- 返回结果 -----------");
-        String responseData = get(url, params);// 发送请求
-        System.out.println(responseData);
-    }
-
-    @Test
-    public void testGet2() throws Exception {
-
-        // 公共请求参数
-        Map<String, String> params = new HashMap<String, String>();
-        params.put("app_id", appId);
-        params.put("method", "story.oneparam");
-        params.put("format", "json");
-        params.put("charset", "utf-8");
-        params.put("sign_type", "RSA2");
-        params.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-        params.put("version", "1.1");
-
-        // 业务参数
-        params.put("id", "1");
-
-        String content = AlipaySignature.getSignContent(params);
-        String sign = AlipaySignature.rsa256Sign(content, privateKey, "utf-8");
-        params.put("sign", sign);
-
-        System.out.println("----------- 请求信息 -----------");
-        System.out.println("请求参数：" + buildParamQuery(params));
-        System.out.println("商户秘钥：" + privateKey);
-        System.out.println("待签名内容：" + content);
-        System.out.println("签名(sign)：" + sign);
-        System.out.println("URL参数：" + buildUrlQuery(params));
-
-        System.out.println("----------- 返回结果 -----------");
-        String responseData = get(url, params);// 发送请求
-        System.out.println(responseData);
-    }
-
-    @Test
-    public void testGet3() throws Exception {
-
-        // 公共请求参数
-        Map<String, String> params = new HashMap<String, String>();
-        params.put("app_id", appId);
-        params.put("method", "story.oneparam");
-        params.put("format", "json");
-        params.put("charset", "utf-8");
-        params.put("sign_type", "RSA2");
-        params.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-        params.put("version", "1.2");
-
-        // 业务参数
-        params.put("typeEnum", "MOBILE");
-
-        String content = AlipaySignature.getSignContent(params);
-        String sign = AlipaySignature.rsa256Sign(content, privateKey, "utf-8");
-        params.put("sign", sign);
-
-        System.out.println("----------- 请求信息 -----------");
-        System.out.println("请求参数：" + buildParamQuery(params));
-        System.out.println("商户秘钥：" + privateKey);
-        System.out.println("待签名内容：" + content);
-        System.out.println("签名(sign)：" + sign);
-        System.out.println("URL参数：" + buildUrlQuery(params));
-
-        System.out.println("----------- 返回结果 -----------");
-        String responseData = get(url, params);// 发送请求
-        System.out.println(responseData);
-    }
-
-
-}

sop-test/src/test/java/com/gitee/sop/test/ParamBindTest.java

@@ -1,109 +0,0 @@
-package com.gitee.sop.test;
-
-import com.alibaba.fastjson.JSON;
-import com.gitee.sop.test.alipay.AlipaySignature;
-import org.junit.Test;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 模仿支付宝客户端请求接口
- */
-public class ParamBindTest extends TestBase {
-
-    String url = "http://localhost:8081/api";
-    String appId = "2019032617262200001";
-    // 平台提供的私钥
-    String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCXJv1pQFqWNA/++OYEV7WYXwexZK/J8LY1OWlP9X0T6wHFOvxNKRvMkJ5544SbgsJpVcvRDPrcxmhPbi/sAhdO4x2PiPKIz9Yni2OtYCCeaiE056B+e1O2jXoLeXbfi9fPivJZkxH/tb4xfLkH3bA8ZAQnQsoXA0SguykMRZntF0TndUfvDrLqwhlR8r5iRdZLB6F8o8qXH6UPDfNEnf/K8wX5T4EB1b8x8QJ7Ua4GcIUqeUxGHdQpzNbJdaQvoi06lgccmL+PHzminkFYON7alj1CjDN833j7QMHdPtS9l7B67fOU/p2LAAkPMtoVBfxQt9aFj7B8rEhGCz02iJIBAgMBAAECggEARqOuIpY0v6WtJBfmR3lGIOOokLrhfJrGTLF8CiZMQha+SRJ7/wOLPlsH9SbjPlopyViTXCuYwbzn2tdABigkBHYXxpDV6CJZjzmRZ+FY3S/0POlTFElGojYUJ3CooWiVfyUMhdg5vSuOq0oCny53woFrf32zPHYGiKdvU5Djku1onbDU0Lw8w+5tguuEZ76kZ/lUcccGy5978FFmYpzY/65RHCpvLiLqYyWTtaNT1aQ/9pw4jX9HO9NfdJ9gYFK8r/2f36ZE4hxluAfeOXQfRC/WhPmiw/ReUhxPznG/WgKaa/OaRtAx3inbQ+JuCND7uuKeRe4osP2jLPHPP6AUwQKBgQDUNu3BkLoKaimjGOjCTAwtp71g1oo+k5/uEInAo7lyEwpV0EuUMwLA/HCqUgR4K9pyYV+Oyb8d6f0+Hz0BMD92I2pqlXrD7xV2WzDvyXM3s63NvorRooKcyfd9i6ccMjAyTR2qfLkxv0hlbBbsPHz4BbU63xhTJp3Ghi0/ey/1HQKBgQC2VsgqC6ykfSidZUNLmQZe3J0p/Qf9VLkfrQ+xaHapOs6AzDU2H2osuysqXTLJHsGfrwVaTs00ER2z8ljTJPBUtNtOLrwNRlvgdnzyVAKHfOgDBGwJgiwpeE9voB1oAV/mXqSaUWNnuwlOIhvQEBwekqNyWvhLqC7nCAIhj3yvNQKBgQCqYbeec56LAhWP903Zwcj9VvG7sESqXUhIkUqoOkuIBTWFFIm54QLTA1tJxDQGb98heoCIWf5x/A3xNI98RsqNBX5JON6qNWjb7/dobitti3t99v/ptDp9u8JTMC7penoryLKK0Ty3bkan95Kn9SC42YxaSghzqkt+uvfVQgiNGQKBgGxU6P2aDAt6VNwWosHSe+d2WWXt8IZBhO9d6dn0f7ORvcjmCqNKTNGgrkewMZEuVcliueJquR47IROdY8qmwqcBAN7Vg2K7r7CPlTKAWTRYMJxCT1Hi5gwJb+CZF3+IeYqsJk2NF2s0w5WJTE70k1BSvQsfIzAIDz2yE1oPHvwVAoGAA6e+xQkVH4fMEph55RJIZ5goI4Y76BSvt2N5OKZKd4HtaV+eIhM3SDsVYRLIm9ZquJHMiZQGyUGnsvrKL6AAVNK7eQZCRDk9KQz+0GKOGqku0nOZjUbAu6A2/vtXAaAuFSFx1rUQVVjFulLexkXR3KcztL1Qu2k5pB6Si0K/uwQ=";
-
-    // 演示参数绑定，没有用用到biz_content
-    @Test
-    public void testGet() throws Exception {
-
-        // 公共请求参数
-        Map<String, String> params = new HashMap<String, String>();
-        params.put("app_id", appId);
-        params.put("method", "story.param.bind");
-        params.put("format", "json");
-        params.put("charset", "utf-8");
-        params.put("sign_type", "RSA2");
-        params.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-        params.put("version", "1.0");
-
-        // 业务参数
-        params.put("id", "1");
-        params.put("name", "葫芦娃");
-
-        String content = AlipaySignature.getSignContent(params);
-        String sign = AlipaySignature.rsa256Sign(content, privateKey, "utf-8");
-        params.put("sign", sign);
-
-        System.out.println("----------- 请求信息 -----------");
-        System.out.println("请求参数：" + buildParamQuery(params));
-        System.out.println("商户秘钥：" + privateKey);
-        System.out.println("待签名内容：" + content);
-        System.out.println("签名(sign)：" + sign);
-        System.out.println("URL参数：" + buildUrlQuery(params));
-
-        System.out.println("----------- 返回结果 -----------");
-        String responseData = get(url, params);// 发送请求
-        System.out.println(responseData);
-    }
-
-    // 绑定复杂对象
-    @Test
-    public void testGet2() throws Exception {
-
-        // 公共请求参数
-        Map<String, String> params = new HashMap<String, String>();
-        params.put("app_id", appId);
-        params.put("method", "sdt.get");
-        params.put("format", "json");
-        params.put("charset", "utf-8");
-        params.put("sign_type", "RSA2");
-        params.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-        params.put("version", "4.0");
-
-        // 业务参数
-        Map<String, Object> bizContent = new HashMap<>();
-        bizContent.put("label", "1");
-        bizContent.put("type", "葫芦娃");
-
-        List<Map<String, Object>> lsm = new ArrayList<Map<String,Object>>();
-        Map<String, Object> item = new HashMap<>();
-        item.put("label", "11");
-        item.put("type", "22");
-        lsm.add(item);
-
-        Map<String, Object> item2 = new HashMap<>();
-        item2.put("label", "33");
-        item2.put("type", "44");
-        lsm.add(item2);
-
-        bizContent.put("ss", lsm);
-
-        params.put("biz_content", JSON.toJSONString(bizContent));
-
-        String content = AlipaySignature.getSignContent(params);
-        String sign = AlipaySignature.rsa256Sign(content, privateKey, "utf-8");
-        params.put("sign", sign);
-
-        System.out.println("----------- 请求信息 -----------");
-        System.out.println("请求参数：" + buildParamQuery(params));
-        System.out.println("商户秘钥：" + privateKey);
-        System.out.println("待签名内容：" + content);
-        System.out.println("签名(sign)：" + sign);
-        System.out.println("URL参数：" + buildUrlQuery(params));
-
-        System.out.println("----------- 返回结果 -----------");
-        String responseData = post(url, params);// 发送请求
-        System.out.println(responseData);
-    }
-
-}

sop-test/src/test/java/com/gitee/sop/test/SamePathTest.java

@@ -1,96 +0,0 @@
-package com.gitee.sop.test;
-
-import com.alibaba.fastjson.JSON;
-import com.gitee.sop.test.alipay.AlipaySignature;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 超时测试
- */
-public class SamePathTest extends TestBase {
-
-    String url = "http://localhost:8081/api";
-    String appId = "2019032617262200001";
-    // 平台提供的私钥
-    String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCXJv1pQFqWNA/++OYEV7WYXwexZK/J8LY1OWlP9X0T6wHFOvxNKRvMkJ5544SbgsJpVcvRDPrcxmhPbi/sAhdO4x2PiPKIz9Yni2OtYCCeaiE056B+e1O2jXoLeXbfi9fPivJZkxH/tb4xfLkH3bA8ZAQnQsoXA0SguykMRZntF0TndUfvDrLqwhlR8r5iRdZLB6F8o8qXH6UPDfNEnf/K8wX5T4EB1b8x8QJ7Ua4GcIUqeUxGHdQpzNbJdaQvoi06lgccmL+PHzminkFYON7alj1CjDN833j7QMHdPtS9l7B67fOU/p2LAAkPMtoVBfxQt9aFj7B8rEhGCz02iJIBAgMBAAECggEARqOuIpY0v6WtJBfmR3lGIOOokLrhfJrGTLF8CiZMQha+SRJ7/wOLPlsH9SbjPlopyViTXCuYwbzn2tdABigkBHYXxpDV6CJZjzmRZ+FY3S/0POlTFElGojYUJ3CooWiVfyUMhdg5vSuOq0oCny53woFrf32zPHYGiKdvU5Djku1onbDU0Lw8w+5tguuEZ76kZ/lUcccGy5978FFmYpzY/65RHCpvLiLqYyWTtaNT1aQ/9pw4jX9HO9NfdJ9gYFK8r/2f36ZE4hxluAfeOXQfRC/WhPmiw/ReUhxPznG/WgKaa/OaRtAx3inbQ+JuCND7uuKeRe4osP2jLPHPP6AUwQKBgQDUNu3BkLoKaimjGOjCTAwtp71g1oo+k5/uEInAo7lyEwpV0EuUMwLA/HCqUgR4K9pyYV+Oyb8d6f0+Hz0BMD92I2pqlXrD7xV2WzDvyXM3s63NvorRooKcyfd9i6ccMjAyTR2qfLkxv0hlbBbsPHz4BbU63xhTJp3Ghi0/ey/1HQKBgQC2VsgqC6ykfSidZUNLmQZe3J0p/Qf9VLkfrQ+xaHapOs6AzDU2H2osuysqXTLJHsGfrwVaTs00ER2z8ljTJPBUtNtOLrwNRlvgdnzyVAKHfOgDBGwJgiwpeE9voB1oAV/mXqSaUWNnuwlOIhvQEBwekqNyWvhLqC7nCAIhj3yvNQKBgQCqYbeec56LAhWP903Zwcj9VvG7sESqXUhIkUqoOkuIBTWFFIm54QLTA1tJxDQGb98heoCIWf5x/A3xNI98RsqNBX5JON6qNWjb7/dobitti3t99v/ptDp9u8JTMC7penoryLKK0Ty3bkan95Kn9SC42YxaSghzqkt+uvfVQgiNGQKBgGxU6P2aDAt6VNwWosHSe+d2WWXt8IZBhO9d6dn0f7ORvcjmCqNKTNGgrkewMZEuVcliueJquR47IROdY8qmwqcBAN7Vg2K7r7CPlTKAWTRYMJxCT1Hi5gwJb+CZF3+IeYqsJk2NF2s0w5WJTE70k1BSvQsfIzAIDz2yE1oPHvwVAoGAA6e+xQkVH4fMEph55RJIZ5goI4Y76BSvt2N5OKZKd4HtaV+eIhM3SDsVYRLIm9ZquJHMiZQGyUGnsvrKL6AAVNK7eQZCRDk9KQz+0GKOGqku0nOZjUbAu6A2/vtXAaAuFSFx1rUQVVjFulLexkXR3KcztL1Qu2k5pB6Si0K/uwQ=";
-
-    @Test
-    public void testGet() throws Exception {
-
-        // 公共请求参数
-        Map<String, String> params = new HashMap<String, String>();
-        params.put("app_id", appId);
-        params.put("method", "story.path.same");
-        params.put("format", "json");
-        params.put("charset", "utf-8");
-        params.put("sign_type", "RSA2");
-        params.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-        params.put("version", "1.0");
-
-        // 业务参数
-        Map<String, Object> bizContent = new HashMap<>();
-        bizContent.put("id", "1");
-        bizContent.put("name", "葫芦娃");
-
-        params.put("biz_content", JSON.toJSONString(bizContent));
-        String content = AlipaySignature.getSignContent(params);
-        String sign = AlipaySignature.rsa256Sign(content, privateKey, "utf-8");
-        params.put("sign", sign);
-
-        System.out.println("----------- 请求信息 -----------");
-        System.out.println("请求参数：" + buildParamQuery(params));
-        System.out.println("商户秘钥：" + privateKey);
-        System.out.println("待签名内容：" + content);
-        System.out.println("签名(sign)：" + sign);
-        System.out.println("URL参数：" + buildUrlQuery(params));
-
-        System.out.println("----------- 返回结果 -----------");
-        String responseData = get(url, params);// 发送请求
-        System.out.println(responseData);
-        Assert.assertTrue(responseData.contains("葫芦娃 story.."));
-    }
-
-    @Test
-    public void testGet2() throws Exception {
-
-        // 公共请求参数
-        Map<String, String> params = new HashMap<String, String>();
-        params.put("app_id", appId);
-        params.put("method", "springmvc.path.same");
-        params.put("format", "json");
-        params.put("charset", "utf-8");
-        params.put("sign_type", "RSA2");
-        params.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-        params.put("version", "1.0");
-
-        // 业务参数
-        Map<String, Object> bizContent = new HashMap<>();
-        bizContent.put("id", "1");
-        bizContent.put("name", "葫芦娃");
-
-        params.put("biz_content", JSON.toJSONString(bizContent));
-        String content = AlipaySignature.getSignContent(params);
-        String sign = AlipaySignature.rsa256Sign(content, privateKey, "utf-8");
-        params.put("sign", sign);
-
-        System.out.println("----------- 请求信息 -----------");
-        System.out.println("请求参数：" + buildParamQuery(params));
-        System.out.println("商户秘钥：" + privateKey);
-        System.out.println("待签名内容：" + content);
-        System.out.println("签名(sign)：" + sign);
-        System.out.println("URL参数：" + buildUrlQuery(params));
-
-        System.out.println("----------- 返回结果 -----------");
-        String responseData = get(url, params);// 发送请求
-        System.out.println(responseData);
-        Assert.assertTrue(responseData.contains("葫芦娃 mvc.."));
-    }
-
-
-}

sop-test/src/test/java/com/gitee/sop/test/SpringmvcDemoPostTest.java

@@ -1,57 +0,0 @@
-package com.gitee.sop.test;
-
-import com.alibaba.fastjson.JSON;
-import com.gitee.sop.test.alipay.AlipaySignature;
-import org.junit.Test;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 模仿支付宝客户端请求接口
- */
-public class SpringmvcDemoPostTest extends TestBase {
-
-    String url = "http://localhost:8081/api";
-    String appId = "2019032617262200001";
-    // 平台提供的私钥
-    String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCXJv1pQFqWNA/++OYEV7WYXwexZK/J8LY1OWlP9X0T6wHFOvxNKRvMkJ5544SbgsJpVcvRDPrcxmhPbi/sAhdO4x2PiPKIz9Yni2OtYCCeaiE056B+e1O2jXoLeXbfi9fPivJZkxH/tb4xfLkH3bA8ZAQnQsoXA0SguykMRZntF0TndUfvDrLqwhlR8r5iRdZLB6F8o8qXH6UPDfNEnf/K8wX5T4EB1b8x8QJ7Ua4GcIUqeUxGHdQpzNbJdaQvoi06lgccmL+PHzminkFYON7alj1CjDN833j7QMHdPtS9l7B67fOU/p2LAAkPMtoVBfxQt9aFj7B8rEhGCz02iJIBAgMBAAECggEARqOuIpY0v6WtJBfmR3lGIOOokLrhfJrGTLF8CiZMQha+SRJ7/wOLPlsH9SbjPlopyViTXCuYwbzn2tdABigkBHYXxpDV6CJZjzmRZ+FY3S/0POlTFElGojYUJ3CooWiVfyUMhdg5vSuOq0oCny53woFrf32zPHYGiKdvU5Djku1onbDU0Lw8w+5tguuEZ76kZ/lUcccGy5978FFmYpzY/65RHCpvLiLqYyWTtaNT1aQ/9pw4jX9HO9NfdJ9gYFK8r/2f36ZE4hxluAfeOXQfRC/WhPmiw/ReUhxPznG/WgKaa/OaRtAx3inbQ+JuCND7uuKeRe4osP2jLPHPP6AUwQKBgQDUNu3BkLoKaimjGOjCTAwtp71g1oo+k5/uEInAo7lyEwpV0EuUMwLA/HCqUgR4K9pyYV+Oyb8d6f0+Hz0BMD92I2pqlXrD7xV2WzDvyXM3s63NvorRooKcyfd9i6ccMjAyTR2qfLkxv0hlbBbsPHz4BbU63xhTJp3Ghi0/ey/1HQKBgQC2VsgqC6ykfSidZUNLmQZe3J0p/Qf9VLkfrQ+xaHapOs6AzDU2H2osuysqXTLJHsGfrwVaTs00ER2z8ljTJPBUtNtOLrwNRlvgdnzyVAKHfOgDBGwJgiwpeE9voB1oAV/mXqSaUWNnuwlOIhvQEBwekqNyWvhLqC7nCAIhj3yvNQKBgQCqYbeec56LAhWP903Zwcj9VvG7sESqXUhIkUqoOkuIBTWFFIm54QLTA1tJxDQGb98heoCIWf5x/A3xNI98RsqNBX5JON6qNWjb7/dobitti3t99v/ptDp9u8JTMC7penoryLKK0Ty3bkan95Kn9SC42YxaSghzqkt+uvfVQgiNGQKBgGxU6P2aDAt6VNwWosHSe+d2WWXt8IZBhO9d6dn0f7ORvcjmCqNKTNGgrkewMZEuVcliueJquR47IROdY8qmwqcBAN7Vg2K7r7CPlTKAWTRYMJxCT1Hi5gwJb+CZF3+IeYqsJk2NF2s0w5WJTE70k1BSvQsfIzAIDz2yE1oPHvwVAoGAA6e+xQkVH4fMEph55RJIZ5goI4Y76BSvt2N5OKZKd4HtaV+eIhM3SDsVYRLIm9ZquJHMiZQGyUGnsvrKL6AAVNK7eQZCRDk9KQz+0GKOGqku0nOZjUbAu6A2/vtXAaAuFSFx1rUQVVjFulLexkXR3KcztL1Qu2k5pB6Si0K/uwQ=";
-
-
-    @Test
-    public void testPost() throws Exception {
-
-        // 公共请求参数
-        Map<String, String> params = new HashMap<String, String>();
-        params.put("app_id", appId);
-        params.put("method", "springmvc.goods.get");
-        params.put("format", "json");
-        params.put("charset", "utf-8");
-        params.put("sign_type", "RSA2");
-        params.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-        params.put("version", "1.0");
-
-        // 业务参数
-        Map<String, Object> bizContent = new HashMap<>();
-        bizContent.put("goods_name", "iphone6");
-
-        params.put("biz_content", JSON.toJSONString(bizContent));
-        String content = AlipaySignature.getSignContent(params);
-        String sign = AlipaySignature.rsa256Sign(content, privateKey, "utf-8");
-        params.put("sign", sign);
-
-        System.out.println("----------- 请求信息 -----------");
-        System.out.println("请求参数：" + buildParamQuery(params));
-        System.out.println("商户秘钥：" + privateKey);
-        System.out.println("待签名内容：" + content);
-        System.out.println("签名(sign)：" + sign);
-        System.out.println("URL参数：" + buildUrlQuery(params));
-
-        System.out.println("----------- 返回结果 -----------");
-        String responseData = post(url, params);// 发送请求
-        System.out.println(responseData);
-    }
-
-}

sop-test/src/test/java/com/gitee/sop/test/ThrowExceptionDemoTest.java

@@ -1,58 +0,0 @@
-package com.gitee.sop.test;
-
-import com.alibaba.fastjson.JSON;
-import com.gitee.sop.test.alipay.AlipaySignature;
-import org.junit.Test;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author 六如
- */
-public class ThrowExceptionDemoTest extends TestBase {
-
-    String url = "http://localhost:8081/api";
-    String appId = "2019032617262200001";
-    // 平台提供的私钥
-    String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCXJv1pQFqWNA/++OYEV7WYXwexZK/J8LY1OWlP9X0T6wHFOvxNKRvMkJ5544SbgsJpVcvRDPrcxmhPbi/sAhdO4x2PiPKIz9Yni2OtYCCeaiE056B+e1O2jXoLeXbfi9fPivJZkxH/tb4xfLkH3bA8ZAQnQsoXA0SguykMRZntF0TndUfvDrLqwhlR8r5iRdZLB6F8o8qXH6UPDfNEnf/K8wX5T4EB1b8x8QJ7Ua4GcIUqeUxGHdQpzNbJdaQvoi06lgccmL+PHzminkFYON7alj1CjDN833j7QMHdPtS9l7B67fOU/p2LAAkPMtoVBfxQt9aFj7B8rEhGCz02iJIBAgMBAAECggEARqOuIpY0v6WtJBfmR3lGIOOokLrhfJrGTLF8CiZMQha+SRJ7/wOLPlsH9SbjPlopyViTXCuYwbzn2tdABigkBHYXxpDV6CJZjzmRZ+FY3S/0POlTFElGojYUJ3CooWiVfyUMhdg5vSuOq0oCny53woFrf32zPHYGiKdvU5Djku1onbDU0Lw8w+5tguuEZ76kZ/lUcccGy5978FFmYpzY/65RHCpvLiLqYyWTtaNT1aQ/9pw4jX9HO9NfdJ9gYFK8r/2f36ZE4hxluAfeOXQfRC/WhPmiw/ReUhxPznG/WgKaa/OaRtAx3inbQ+JuCND7uuKeRe4osP2jLPHPP6AUwQKBgQDUNu3BkLoKaimjGOjCTAwtp71g1oo+k5/uEInAo7lyEwpV0EuUMwLA/HCqUgR4K9pyYV+Oyb8d6f0+Hz0BMD92I2pqlXrD7xV2WzDvyXM3s63NvorRooKcyfd9i6ccMjAyTR2qfLkxv0hlbBbsPHz4BbU63xhTJp3Ghi0/ey/1HQKBgQC2VsgqC6ykfSidZUNLmQZe3J0p/Qf9VLkfrQ+xaHapOs6AzDU2H2osuysqXTLJHsGfrwVaTs00ER2z8ljTJPBUtNtOLrwNRlvgdnzyVAKHfOgDBGwJgiwpeE9voB1oAV/mXqSaUWNnuwlOIhvQEBwekqNyWvhLqC7nCAIhj3yvNQKBgQCqYbeec56LAhWP903Zwcj9VvG7sESqXUhIkUqoOkuIBTWFFIm54QLTA1tJxDQGb98heoCIWf5x/A3xNI98RsqNBX5JON6qNWjb7/dobitti3t99v/ptDp9u8JTMC7penoryLKK0Ty3bkan95Kn9SC42YxaSghzqkt+uvfVQgiNGQKBgGxU6P2aDAt6VNwWosHSe+d2WWXt8IZBhO9d6dn0f7ORvcjmCqNKTNGgrkewMZEuVcliueJquR47IROdY8qmwqcBAN7Vg2K7r7CPlTKAWTRYMJxCT1Hi5gwJb+CZF3+IeYqsJk2NF2s0w5WJTE70k1BSvQsfIzAIDz2yE1oPHvwVAoGAA6e+xQkVH4fMEph55RJIZ5goI4Y76BSvt2N5OKZKd4HtaV+eIhM3SDsVYRLIm9ZquJHMiZQGyUGnsvrKL6AAVNK7eQZCRDk9KQz+0GKOGqku0nOZjUbAu6A2/vtXAaAuFSFx1rUQVVjFulLexkXR3KcztL1Qu2k5pB6Si0K/uwQ=";
-
-    @Test
-    public void testGoodsAdd() throws Exception {
-        // 公共请求参数
-        Map<String, String> params = new HashMap<String, String>();
-        params.put("app_id", appId);
-        params.put("method", "goods.update");
-        params.put("format", "json");
-        params.put("charset", "utf-8");
-        params.put("sign_type", "RSA2");
-        params.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-        params.put("version", "1.0");
-
-        // 业务参数
-        Map<String, Object> bizContent = new HashMap<>();
-        // 对应校验规则查看GoodsParam.java
-        bizContent.put("goods_name", "1");
-        bizContent.put("goods_remark", "iphone6");
-        bizContent.put("goods_comment", "1111");
-
-        params.put("biz_content", JSON.toJSONString(bizContent));
-        String content = AlipaySignature.getSignContent(params);
-        String sign = AlipaySignature.rsa256Sign(content, privateKey, "utf-8");
-        params.put("sign", sign);
-
-        System.out.println("----------- 请求信息 -----------");
-        System.out.println("请求参数：" + buildParamQuery(params));
-        System.out.println("商户秘钥：" + privateKey);
-        System.out.println("待签名内容：" + content);
-        System.out.println("签名(sign)：" + sign);
-        System.out.println("URL参数：" + buildUrlQuery(params));
-
-        System.out.println("----------- 返回结果 -----------");
-        String responseData = post(url, params);// 发送请求
-        System.out.println(responseData);
-    }
-
-}

sop-test/src/test/java/com/gitee/sop/test/TimeoutTest.java

@@ -1,65 +0,0 @@
-package com.gitee.sop.test;
-
-import com.alibaba.fastjson.JSON;
-import com.gitee.sop.test.alipay.AlipaySignature;
-import org.junit.Test;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 超时测试
- */
-public class TimeoutTest extends TestBase {
-
-    String url = "http://localhost:8081/api";
-    String appId = "2019032617262200001";
-    // 平台提供的私钥
-    String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCXJv1pQFqWNA/++OYEV7WYXwexZK/J8LY1OWlP9X0T6wHFOvxNKRvMkJ5544SbgsJpVcvRDPrcxmhPbi/sAhdO4x2PiPKIz9Yni2OtYCCeaiE056B+e1O2jXoLeXbfi9fPivJZkxH/tb4xfLkH3bA8ZAQnQsoXA0SguykMRZntF0TndUfvDrLqwhlR8r5iRdZLB6F8o8qXH6UPDfNEnf/K8wX5T4EB1b8x8QJ7Ua4GcIUqeUxGHdQpzNbJdaQvoi06lgccmL+PHzminkFYON7alj1CjDN833j7QMHdPtS9l7B67fOU/p2LAAkPMtoVBfxQt9aFj7B8rEhGCz02iJIBAgMBAAECggEARqOuIpY0v6WtJBfmR3lGIOOokLrhfJrGTLF8CiZMQha+SRJ7/wOLPlsH9SbjPlopyViTXCuYwbzn2tdABigkBHYXxpDV6CJZjzmRZ+FY3S/0POlTFElGojYUJ3CooWiVfyUMhdg5vSuOq0oCny53woFrf32zPHYGiKdvU5Djku1onbDU0Lw8w+5tguuEZ76kZ/lUcccGy5978FFmYpzY/65RHCpvLiLqYyWTtaNT1aQ/9pw4jX9HO9NfdJ9gYFK8r/2f36ZE4hxluAfeOXQfRC/WhPmiw/ReUhxPznG/WgKaa/OaRtAx3inbQ+JuCND7uuKeRe4osP2jLPHPP6AUwQKBgQDUNu3BkLoKaimjGOjCTAwtp71g1oo+k5/uEInAo7lyEwpV0EuUMwLA/HCqUgR4K9pyYV+Oyb8d6f0+Hz0BMD92I2pqlXrD7xV2WzDvyXM3s63NvorRooKcyfd9i6ccMjAyTR2qfLkxv0hlbBbsPHz4BbU63xhTJp3Ghi0/ey/1HQKBgQC2VsgqC6ykfSidZUNLmQZe3J0p/Qf9VLkfrQ+xaHapOs6AzDU2H2osuysqXTLJHsGfrwVaTs00ER2z8ljTJPBUtNtOLrwNRlvgdnzyVAKHfOgDBGwJgiwpeE9voB1oAV/mXqSaUWNnuwlOIhvQEBwekqNyWvhLqC7nCAIhj3yvNQKBgQCqYbeec56LAhWP903Zwcj9VvG7sESqXUhIkUqoOkuIBTWFFIm54QLTA1tJxDQGb98heoCIWf5x/A3xNI98RsqNBX5JON6qNWjb7/dobitti3t99v/ptDp9u8JTMC7penoryLKK0Ty3bkan95Kn9SC42YxaSghzqkt+uvfVQgiNGQKBgGxU6P2aDAt6VNwWosHSe+d2WWXt8IZBhO9d6dn0f7ORvcjmCqNKTNGgrkewMZEuVcliueJquR47IROdY8qmwqcBAN7Vg2K7r7CPlTKAWTRYMJxCT1Hi5gwJb+CZF3+IeYqsJk2NF2s0w5WJTE70k1BSvQsfIzAIDz2yE1oPHvwVAoGAA6e+xQkVH4fMEph55RJIZ5goI4Y76BSvt2N5OKZKd4HtaV+eIhM3SDsVYRLIm9ZquJHMiZQGyUGnsvrKL6AAVNK7eQZCRDk9KQz+0GKOGqku0nOZjUbAu6A2/vtXAaAuFSFx1rUQVVjFulLexkXR3KcztL1Qu2k5pB6Si0K/uwQ=";
-
-    // sop-gateway/src/main/resources/application-dev.properties中配置参数：
-    // spring.cloud.gateway.httpclient.response-timeout=11000
-    // 响应超时11秒
-    // 业务逻辑处理10秒，见：com.gitee.sop.storyweb.controller.Example1009_TimeoutController
-    // 把spring.cloud.gateway.httpclient.response-timeout值改成5000网关会报错
-    @Test
-    public void testGet() throws Exception {
-
-        // 公共请求参数
-        Map<String, String> params = new HashMap<String, String>();
-        params.put("app_id", appId);
-        params.put("method", "goods.timeout");
-        params.put("format", "json");
-        params.put("charset", "utf-8");
-        params.put("sign_type", "RSA2");
-        params.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-        params.put("version", "1.0");
-
-        // 业务参数
-        Map<String, Object> bizContent = new HashMap<>();
-        bizContent.put("id", "1");
-        bizContent.put("name", "葫芦娃");
-
-        params.put("biz_content", JSON.toJSONString(bizContent));
-        String content = AlipaySignature.getSignContent(params);
-        String sign = AlipaySignature.rsa256Sign(content, privateKey, "utf-8");
-        params.put("sign", sign);
-
-        System.out.println("----------- 请求信息 -----------");
-        System.out.println("请求参数：" + buildParamQuery(params));
-        System.out.println("商户秘钥：" + privateKey);
-        System.out.println("待签名内容：" + content);
-        System.out.println("签名(sign)：" + sign);
-        System.out.println("URL参数：" + buildUrlQuery(params));
-
-        System.out.println("----------- 返回结果 -----------");
-        long start = System.currentTimeMillis();
-        String responseData = get(url, params);// 发送请求
-        System.out.printf("耗时：%s秒%n", (System.currentTimeMillis() - start) / 1000.0);
-        System.out.println(responseData);
-    }
-
-
-}