Merge remote-tracking branch 'origin/master'

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

@@ -2,15 +2,16 @@ package com.ym.mec.common.controller;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.ym.mec.common.exception.BizException;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
+import org.springframework.security.access.AccessDeniedException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.exception.BizException;
 
 @ControllerAdvice
 public class BaseController {
@@ -69,8 +70,10 @@ public class BaseController {
 		}
 		logger.error("System Error", e);
 //		return failed(e.getMessage());
-		if(ex instanceof BizException){
+		if(e instanceof BizException){
 			return failed(e.getMessage());
+		}else if(e instanceof AccessDeniedException){
+			return failed("禁止访问");
 		}
 		return failed("系统繁忙");
 	}

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/eseal/provider/TsignPlugin.java

@@ -159,7 +159,7 @@ public class TsignPlugin implements ESealPlugin, InitializingBean, DisposableBea
 		int sealId = 0;
 		// 设置接口调用方(平台方)签章位置信息
 		posBean.setPosPage("1");// 签署页码，若为多页签章，支持页码格式“1-3,5,8“，若为坐标定位时，不可空
-		posBean.setKey("甲方（签字）");
+		posBean.setKey("甲方签章");
 		// 签署位置X坐标,默认值为0,以pdf页面的左下角作为原点,控制距离页面左端的横向移动距离,单位为px
 		posBean.setPosX(100);
 		// 签署位置Y坐标,默认值为0,以pdf页面的左下角作为原点,控制距离页面底端的纵向移动距离,单位为px