xiaochengxu api

framework-boot/src/main/java/com/mrxu/framework/boot/entity/ResponseObj.java

@@ -1,5 +1,6 @@
 package com.mrxu.framework.boot.entity;
 
+import com.mrxu.framework.common.util.BaseCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

framework-boot/src/main/java/com/mrxu/framework/boot/handle/FeignErrorHandler.java

@@ -1,7 +1,7 @@
 package com.mrxu.framework.boot.handle;
 
 import com.alibaba.fastjson.JSONObject;
-import com.mrxu.framework.boot.entity.BusinessException;
+import com.mrxu.framework.common.util.BusinessException;
 import feign.Response;
 import feign.Util;
 import feign.codec.ErrorDecoder;

framework-boot/src/main/java/com/mrxu/framework/boot/handle/WebExceptionHandler.java

@@ -1,9 +1,9 @@
 package com.mrxu.framework.boot.handle;
 
-import com.mrxu.framework.boot.entity.BaseCode;
-import com.mrxu.framework.boot.entity.BusinessException;
 import com.mrxu.framework.boot.entity.ResponseObj;
 import com.mrxu.framework.boot.web.ServletUtils;
+import com.mrxu.framework.common.util.BaseCode;
+import com.mrxu.framework.common.util.BusinessException;
 import com.mrxu.framework.common.util.StrFunc;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

framework-boot/src/main/java/com/mrxu/framework/boot/token/JwtUtil.java

@@ -5,7 +5,7 @@ import com.auth0.jwt.JWTCreator;
 import com.auth0.jwt.JWTVerifier;
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.interfaces.DecodedJWT;
-import com.mrxu.framework.boot.entity.BusinessException;
+import com.mrxu.framework.common.util.BusinessException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

framework-boot/src/main/java/com/mrxu/framework/boot/util/MrxuAssert.java

@@ -1,6 +1,6 @@
 package com.mrxu.framework.boot.util;
 
-import com.mrxu.framework.boot.entity.BusinessException;
+import com.mrxu.framework.common.util.BusinessException;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.FieldError;
 

framework-boot/src/main/java/com/mrxu/framework/boot/web/BaseController.java

@@ -1,10 +1,10 @@
 package com.mrxu.framework.boot.web;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.mrxu.framework.boot.entity.BaseCode;
 import com.mrxu.framework.boot.entity.LayuiPage;
 import com.mrxu.framework.boot.entity.PageResult;
 import com.mrxu.framework.boot.entity.ResponseObj;
+import com.mrxu.framework.common.util.BaseCode;
 import com.mrxu.framework.common.util.StrFunc;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

framework-common/pom.xml

@@ -27,17 +27,17 @@
             <artifactId>fastjson</artifactId>
         </dependency>
 
-        <!-- log -->
+        <!--消除冗余代码使用-->
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.26</version>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
         </dependency>
+
+        <!-- log -->
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-api</artifactId>
             <version>1.7.26</version>
-            <!-- <scope>test</scope> -->
         </dependency>
 
         <dependency>

framework-boot/src/main/java/com/mrxu/framework/boot/entity/BaseCode.java

@@ -1,4 +1,4 @@
-package com.mrxu.framework.boot.entity;
+package com.mrxu.framework.common.util;
 
 import lombok.Data;
 
@@ -16,7 +16,7 @@ public class BaseCode {
 
     public String msg = "成功";
 
-    public BaseCode(int code,String msg) {
+    public BaseCode(int code, String msg) {
         this.code = code;
         this.msg = msg;
     }

framework-boot/src/main/java/com/mrxu/framework/boot/entity/BusinessException.java

@@ -1,4 +1,4 @@
-package com.mrxu.framework.boot.entity;
+package com.mrxu.framework.common.util;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

framework-common/src/main/java/com/mrxu/framework/common/xcx/base/XcxHttp.java

@@ -3,6 +3,7 @@ package com.mrxu.framework.common.xcx.base;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.mrxu.framework.common.util.BusinessException;
 import com.mrxu.framework.common.util.HttpUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,11 +21,11 @@ public class XcxHttp {
 	public static <T extends XcxResult> T get(Class<T> clazz, String url, Map<String, String> queryParas) {
 		String rs = HttpUtil.get(GLOBAL_CONNECT_TIMEOUT, GLOBAL_READ_TIMEOUT, url, queryParas, null);
 		if(rs == null) {
-			throw new RuntimeException("与微信服务器网络不通");
+			throw new BusinessException("与微信服务器网络不通");
 		}
 		T wxRs = JSON.parseObject(rs, clazz);
 		if(!wxRs.isSuccess()) {
-			throw new RuntimeException("调用微信接口出错："+wxRs.getErrmsg());
+			throw new BusinessException(wxRs.getErrmsg());
 		}
 		return wxRs;
     }
@@ -37,12 +38,12 @@ public class XcxHttp {
 	public static <T extends XcxResult> T post(Class<T> clazz,String url,JSONObject json) {
 		String rs = HttpUtil.post(GLOBAL_CONNECT_TIMEOUT, GLOBAL_READ_TIMEOUT, url,json.toJSONString());
 		if(rs == null) {
-			throw new RuntimeException("与微信服务器网络不通");
+			throw new BusinessException("与微信服务器网络不通");
 		}
 		T wxRs = JSON.parseObject(rs, clazz);
 		if(!wxRs.isSuccess()) {
 			logger.error(rs);
-			throw new RuntimeException("调用微信接口出错："+wxRs.getErrmsg());
+			throw new BusinessException(wxRs.getErrmsg());
 		}
         return wxRs;
     }

framework-starter/mrxu-starter-redisson/src/main/java/com/mrxu/framework/starter/token/JwtUtil.java

@@ -5,7 +5,7 @@ import com.auth0.jwt.JWTCreator;
 import com.auth0.jwt.JWTVerifier;
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.interfaces.DecodedJWT;
-import com.mrxu.framework.boot.entity.BusinessException;
+import com.mrxu.framework.common.util.BusinessException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;