Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-common/common-core/src/main/java/com/ym/mec/common/controller/BaseController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
 
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.thirdparty.exception.ThirdpartyException;
 
 @ControllerAdvice
 public class BaseController {
@@ -70,7 +71,7 @@ public class BaseController {
 		}
 		logger.error("System Error", e);
 //		return failed(e.getMessage());
-		if(e instanceof BizException){
+		if(e instanceof BizException || e instanceof ThirdpartyException){
 			return failed(e.getMessage());
 		}else if(e instanceof AccessDeniedException){
 			return failed("禁止访问");