list = rs.get(key);
diff --git a/trade-common/src/main/java/com/hchbox/exception/CheckedAccountException.java b/trade-common/src/main/java/com/hchbox/exception/CheckedAccountException.java
new file mode 100644
index 0000000..6605ebe
--- /dev/null
+++ b/trade-common/src/main/java/com/hchbox/exception/CheckedAccountException.java
@@ -0,0 +1,32 @@
+
+
+package com.hchbox.exception;
+
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Enzo
+ * @date 2021-7-26
+ */
+@NoArgsConstructor
+public class CheckedAccountException extends RuntimeException {
+
+ private static final long serialVersionUID = 1751129723237168054L;
+
+ public CheckedAccountException(String message) {
+ super(message);
+ }
+
+ public CheckedAccountException(Throwable cause) {
+ super(cause);
+ }
+
+ public CheckedAccountException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public CheckedAccountException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+ super(message, cause, enableSuppression, writableStackTrace);
+ }
+
+}
diff --git a/trade-common/src/main/java/com/hchbox/handle/GlobalBizExceptionHandler.java b/trade-common/src/main/java/com/hchbox/handle/GlobalBizExceptionHandler.java
new file mode 100644
index 0000000..97225af
--- /dev/null
+++ b/trade-common/src/main/java/com/hchbox/handle/GlobalBizExceptionHandler.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hchbox.handle;
+
+import com.hchbox.exception.CheckedAccountException;
+import com.hchbox.model.param.CommonResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+/**
+ *
+ * 全局异常处理器结合sentinel 全局异常处理器不能作用在 oauth server https://gitee.com/log4j/pig/issues/I1M2TJ
+ *
+ *
+ * @author lengleng
+ * @date 2020-06-29
+ */
+@Slf4j
+@RestControllerAdvice
+public class GlobalBizExceptionHandler {
+
+ /**
+ * 账号检测异常
+ * @param e e
+ * @return 返回信息
+ */
+ @ExceptionHandler(CheckedAccountException.class)
+ @ResponseStatus(HttpStatus.FORBIDDEN)
+ public CommonResult handleGlobalException(CheckedAccountException e) {
+ log.error("全局异常信息 ex={}", e.getMessage(), e);
+
+ // 业务异常交由 sentinel 记录 Tracer.trace(e);
+ return new CommonResult().failed(e.getLocalizedMessage());
+ }
+
+ /**
+ * 处理业务校验过程中碰到的非法参数异常 该异常基本由{@link Assert}抛出
+ * @see Assert#hasLength(String, String)
+ * @see Assert#hasText(String, String)
+ * @see Assert#isTrue(boolean, String)
+ * @see Assert#isNull(Object, String)
+ * @see Assert#notNull(Object, String)
+ * @param exception 参数校验异常
+ * @return API返回结果对象包装后的错误输出结果
+ */
+ @ExceptionHandler(IllegalArgumentException.class)
+ @ResponseStatus(HttpStatus.OK)
+ public CommonResult handleIllegalArgumentException(IllegalArgumentException exception) {
+ log.error("非法参数,ex = {}", exception.getMessage(), exception);
+ return new CommonResult().failed(exception.getMessage());
+ }
+
+
+
+
+
+
+}
diff --git a/trade-common/src/main/java/com/hchbox/util/JwtHelper.java b/trade-common/src/main/java/com/hchbox/util/JwtHelper.java
index 13b6265..3eac144 100644
--- a/trade-common/src/main/java/com/hchbox/util/JwtHelper.java
+++ b/trade-common/src/main/java/com/hchbox/util/JwtHelper.java
@@ -12,7 +12,7 @@ import com.auth0.jwt.exceptions.JWTCreationException;
import com.auth0.jwt.exceptions.JWTVerificationException;
import com.auth0.jwt.interfaces.Claim;
import com.auth0.jwt.interfaces.DecodedJWT;
-import com.hchbox.constant.DefaultConstants;
+import com.hchbox.constant.DefaultNumberConstants;
import java.util.Date;
import java.util.HashMap;
@@ -40,7 +40,7 @@ public class JwtHelper {
public String createToken(String accessToke) {
try {
Algorithm algorithm = Algorithm.HMAC256(SECRET);
- Map map = new HashMap<>(DefaultConstants.TWO_NUMBER);
+ Map map = new HashMap<>(DefaultNumberConstants.TWO_NUMBER);
Date nowDate = new Date();
map.put("alg", "HS256");
map.put("typ", "JWT");
diff --git a/trade-gateway/src/main/java/com/hchbox/gateway/provider/AuthProvider.java b/trade-gateway/src/main/java/com/hchbox/gateway/provider/AuthProvider.java
index caed04f..7bc83b7 100644
--- a/trade-gateway/src/main/java/com/hchbox/gateway/provider/AuthProvider.java
+++ b/trade-gateway/src/main/java/com/hchbox/gateway/provider/AuthProvider.java
@@ -27,6 +27,8 @@ public class AuthProvider {
DEFAULT_SKIP_URL.add("/error/**");
DEFAULT_SKIP_URL.add("/assets/**");
DEFAULT_SKIP_URL.add("/aliPay/**");
+ DEFAULT_SKIP_URL.add("/source/**");
+ DEFAULT_SKIP_URL.add("/otherAccount/**");
}
private AuthProvider() {
diff --git a/trade-pojo/pom.xml b/trade-pojo/pom.xml
index 3d67d66..87115f4 100644
--- a/trade-pojo/pom.xml
+++ b/trade-pojo/pom.xml
@@ -27,11 +27,7 @@
compile
-
-
+
diff --git a/trade-pojo/src/main/java/com/hchbox/dto/AuthTokenDTO.java b/trade-pojo/src/main/java/com/hchbox/dto/AuthTokenDTO.java
index 448ab3f..e309356 100644
--- a/trade-pojo/src/main/java/com/hchbox/dto/AuthTokenDTO.java
+++ b/trade-pojo/src/main/java/com/hchbox/dto/AuthTokenDTO.java
@@ -1,6 +1,5 @@
package com.hchbox.dto;
-import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
import lombok.Data;
@@ -14,16 +13,16 @@ public class AuthTokenDTO {
@SerializedName("grant_type")
private String grantType;
- @JsonProperty("client_id")
+ @SerializedName("client_id")
private String clientId;
- @JsonProperty("client_secret")
+ @SerializedName("client_secret")
private String clientSecret;
- @JsonProperty("redirect_uri")
+ @SerializedName("redirect_uri")
private String redirectUri;
- @JsonProperty("code")
+ @SerializedName("code")
private String code;
private String view;
diff --git a/trade-pojo/src/main/java/com/hchbox/dto/ResponseDTO.java b/trade-pojo/src/main/java/com/hchbox/dto/ResponseDTO.java
index 797ac1c..b5ace24 100644
--- a/trade-pojo/src/main/java/com/hchbox/dto/ResponseDTO.java
+++ b/trade-pojo/src/main/java/com/hchbox/dto/ResponseDTO.java
@@ -1,6 +1,5 @@
package com.hchbox.dto;
-import com.google.gson.annotations.SerializedName;
import lombok.Data;
/**
diff --git a/trade-pojo/src/main/java/com/hchbox/enums/ResponseCode.java b/trade-pojo/src/main/java/com/hchbox/enums/ResponseCode.java
index d867360..35b4c7c 100644
--- a/trade-pojo/src/main/java/com/hchbox/enums/ResponseCode.java
+++ b/trade-pojo/src/main/java/com/hchbox/enums/ResponseCode.java
@@ -10,40 +10,42 @@ import lombok.Getter;
public enum ResponseCode {
/**成功*/
- SUCCESS(1,"成功"),
+ SUCCESS("1","成功"),
- PARAMETER_ERROR(1012,"参数错误"),
+ PARAMETER_ERROR("1012","参数错误"),
- PAYMENT_FAILED(1002,"支付宝,下单失败"),
+ PAYMENT_FAILED("1002","支付宝,下单失败"),
- CALLBACK_FAILED(1003,"支付宝,回调失败"),
+ CALLBACK_FAILED("1003","支付宝,回调失败"),
- LOGIN_FAILED(1001,"登录失败,请稍后重试"),
+ LOGIN_FAILED("1001","登录失败,请稍后重试"),
- SAVE_INFORMATION_FAILED(1004, "保存信息失败"),
+ SAVE_INFORMATION_FAILED("1004", "保存信息失败"),
- TEMPLATE_NAME_CANNOT_BE_EMPTY(1011,"模板不能为空"),
+ USER_INFORMATION_EXPIRED("29","用户登录已经失效"),
- ACCOUNT_HAS_EXPIRED(1005, "当前账号旺旺群发已过期"),
+ TEMPLATE_NAME_CANNOT_BE_EMPTY("1011","模板不能为空"),
- LEVEL_VERIFICATION_FAILED(1006,"不同等级套餐无法直接续费"),
+ ACCOUNT_HAS_EXPIRED("1005", "当前账号旺旺群发已过期"),
- UPLOAD_INFORMATION_CANNOT_BE_EMPTY(1009,"上传信息不能为空"),
+ LEVEL_VERIFICATION_FAILED("1006","不同等级套餐无法直接续费"),
- ACCOUNT_VERIFICATION_FAILED(1007,"账号验证失败,请核实后提交"),
+ UPLOAD_INFORMATION_CANNOT_BE_EMPTY("1009","上传信息不能为空"),
- FILE_NAME_ALREADY_EXISTS(1008,"文件名已存在,请核实后重新上传"),
+ ACCOUNT_VERIFICATION_FAILED("1007","账号验证失败,请核实后提交"),
- ACCOUNT_DOES_NOT_YET_HAVE_STORE(1011,"该账号尚未拥有店铺,请申请后重试"),
+ FILE_NAME_ALREADY_EXISTS("1008","文件名已存在,请核实后重新上传"),
- EXCEEDED_QUANTITY(1010, "提交任务数量超过当日限额，您可以订购提额包或升级套餐")
+ ACCOUNT_DOES_NOT_YET_HAVE_STORE("1011","该账号尚未拥有店铺,请申请后重试"),
+
+ EXCEEDED_QUANTITY("1010", "提交任务数量超过当日限额，您可以订购提额包或升级套餐")
;
- private final int code;
+ private final String code;
private final String desc;
- ResponseCode(int code, String desc){
+ ResponseCode(String code, String desc){
this.code = code;
this.desc = desc;
}