diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java
index 1157b4e5..ffb0673c 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java
@@ -6,6 +6,7 @@ import com.mdp.core.utils.RequestUtils;
 import com.mdp.mybatis.PageUtils;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
+import com.mdp.sensitive.SensitiveWordService;
 import com.mdp.swagger.ApiEntityParams;
 import com.xm.core.entity.XmFunc;
 import com.xm.core.service.XmFuncService;
@@ -37,6 +38,9 @@ public class XmFuncController {
 	
 	@Autowired
 	private XmFuncService xmFuncService;
+
+	@Autowired
+	SensitiveWordService sensitiveWordService;
 	 
 
 	Map<String,Object> fieldsMap = toMap(new XmFunc());
@@ -89,6 +93,10 @@ public class XmFuncController {
                     return failed("pk-exists","编号重复，请修改编号再提交");
                 }
             }
+			Set<String> words=sensitiveWordService.getSensitiveWord(xmFunc.getName());
+			if(words!=null && words.size()>0){
+				return failed("name-sensitive-word","名字有敏感词"+words+",请修改后再提交");
+			}
 			xmFuncService.parentIdPathsCalcBeforeSave(xmFunc);
 			xmFuncService.insert(xmFunc);
 			m.put("data",xmFunc);
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java
index 59905188..26817d31 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java
@@ -10,6 +10,7 @@ import com.mdp.mybatis.PageUtils;
 import com.mdp.qx.HasQx;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
+import com.mdp.sensitive.SensitiveWordService;
 import com.mdp.swagger.ApiEntityParams;
 import com.xm.core.entity.XmIteration;
 import com.xm.core.service.*;
@@ -67,6 +68,8 @@ public class XmIterationController {
 
 	@Autowired
 	PushNotifyMsgService notifyMsgService;
+	@Autowired
+	SensitiveWordService sensitiveWordService;
 
 	Map<String,Object> fieldsMap = BaseUtils.toMap(new XmIteration());
 
@@ -179,6 +182,14 @@ public class XmIterationController {
 			XmIteration q=new XmIteration();
 			User user= LoginUtils.getCurrentUserInfo();
 
+			Set<String> words=sensitiveWordService.getSensitiveWord(xmIteration.getIterationName());
+			if(words!=null && words.size()>0){
+				return failed("name-sensitive-word","名字有敏感词"+words+",请修改后再提交");
+			}
+			words=sensitiveWordService.getSensitiveWord(xmIteration.getRemark());
+			if(words!=null && words.size()>0){
+				return failed("remark-sensitive-word","备注中有敏感词"+words+",请修改后再提交");
+			}
 			q.setBranchId(user.getBranchId());
 			Long count=this.xmIterationService.countByWhere(q);
 			xmIteration.setId(this.xmIterationService.createIterationId(count));
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
index 5347032d..fe5dd764 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
@@ -12,6 +12,7 @@ import com.mdp.mybatis.PageUtils;
 import com.mdp.qx.HasQx;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
+import com.mdp.sensitive.SensitiveWordService;
 import com.xm.core.PubTool;
 import com.xm.core.entity.XmMenu;
 import com.xm.core.entity.XmProduct;
@@ -31,6 +32,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.mdp.core.utils.BaseUtils.map;
+import static com.mdp.core.utils.ResponseHelper.failed;
 
 /**
  * url编制采用rest风格,如对XM.xm_menu 项目菜单表的操作有增删改查,对应的url分别为:<br>
@@ -77,6 +79,8 @@ public class XmMenuController {
 
 	@Autowired
 	XmMenuOperQxService menuOperQxService;
+	@Autowired
+	SensitiveWordService sensitiveWordService;
 
 
 	Map<String,Object> fieldsMap = BaseUtils.toMap(new XmMenu());
@@ -255,6 +259,14 @@ public class XmMenuController {
 					return m;
 				}
 			}
+			Set<String> words=sensitiveWordService.getSensitiveWord(xmMenu.getMenuName());
+			if(words!=null && words.size()>0){
+				return failed("name-sensitive-word","名字有敏感词"+words+",请修改后再提交");
+			}
+			words=sensitiveWordService.getSensitiveWord(xmMenu.getRemark());
+			if(words!=null && words.size()>0){
+				return failed("remark-sensitive-word","备注中有敏感词"+words+",请修改后再提交");
+			}
 			User user= LoginUtils.getCurrentUserInfo();
 			if(StringUtils.isEmpty(xmMenu.getMmUserid())) {
 				xmMenu.setMmUserid(user.getUserid());
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java
index bc2bc144..0caa87d1 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java
@@ -9,6 +9,7 @@ import com.mdp.mybatis.PageUtils;
 import com.mdp.qx.HasQx;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
+import com.mdp.sensitive.SensitiveWordService;
 import com.mdp.swagger.ApiEntityParams;
 import com.xm.core.entity.XmProduct;
 import com.xm.core.entity.XmProductCopyVo;
@@ -65,6 +66,8 @@ public class XmProductController {
 	@Autowired
 	PushNotifyMsgService notifyMsgService;
 
+	@Autowired
+	SensitiveWordService sensitiveWordService;
 
 	Map<String,Object> fieldsMap = toMap(new XmProduct());
 
@@ -263,6 +266,15 @@ public class XmProductController {
 			if(!StringUtils.hasText(xmProduct.getProductName())){
 				return failed("productName-0","","产品名称不能为空");
 			}
+
+			Set<String> words=sensitiveWordService.getSensitiveWord(xmProduct.getProductName());
+			if(words!=null && words.size()>0){
+				return failed("name-sensitive-word","名字有敏感词"+words+",请修改后再提交");
+			}
+			words=sensitiveWordService.getSensitiveWord(xmProduct.getRemark());
+			if(words!=null && words.size()>0){
+				return failed("remark-sensitive-word","备注中有敏感词"+words+",请修改后再提交");
+			}
 			if(StringUtils.isEmpty(xmProduct.getPmUserid())) {
 				xmProduct.setPmUserid(user.getUserid());
 				xmProduct.setPmUsername(user.getUsername());
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java
index 412c5e18..4f10bca6 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java
@@ -13,6 +13,7 @@ import com.mdp.mybatis.PageUtils;
 import com.mdp.qx.HasQx;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
+import com.mdp.sensitive.SensitiveWordService;
 import com.mdp.swagger.ApiEntityParams;
 import com.xm.core.entity.XmProductProjectLink;
 import com.xm.core.entity.XmProject;
@@ -74,6 +75,8 @@ public class XmProjectController {
 
 	@Autowired
 	private XmTaskService xmTaskService;
+	@Autowired
+	SensitiveWordService sensitiveWordService;
 
 
 	Map<String,Object> fieldsMap = BaseUtils.toMap(new XmProject());
@@ -224,6 +227,19 @@ public class XmProjectController {
 					}
 				}
 			}
+			Set<String> words=sensitiveWordService.getSensitiveWord(xmProjectVo.getName());
+			if(words!=null && words.size()>0){
+				return failed("name-sensitive-word","名字有敏感词"+words+",请修改后再提交");
+			}
+			words=sensitiveWordService.getSensitiveWord(xmProjectVo.getBaseRemark());
+			if(words!=null && words.size()>0){
+				return failed("remark-sensitive-word","备注中有敏感词"+words+",请修改后再提交");
+			}
+
+			words=sensitiveWordService.getSensitiveWord(xmProjectVo.getAssessRemarks());
+			if(words!=null && words.size()>0){
+				return failed("assessRemarks-sensitive-word","备注中有敏感词"+words+",请修改后再提交");
+			}
 			User user = LoginUtils.getCurrentUserInfo();
 				xmProjectService.saveProject(xmProjectVo);
 				notifyMsgService.pushMsg(user,xmProjectVo.getPmUserid(),xmProjectVo.getPmUsername(),"1",xmProjectVo.getId(),xmProjectVo.getId(),"您成为项目【"+xmProjectVo.getName()+"】的项目经理，请及时跟进。");
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java
index 795c2b4e..01c81581 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java
@@ -12,6 +12,7 @@ import com.mdp.mybatis.PageUtils;
 import com.mdp.qx.HasQx;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
+import com.mdp.sensitive.SensitiveWordService;
 import com.xm.core.entity.XmMenu;
 import com.xm.core.entity.XmQuestion;
 import com.xm.core.entity.XmQuestionHandle;
@@ -31,6 +32,8 @@ import springfox.documentation.annotations.ApiIgnore;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.mdp.core.utils.ResponseHelper.failed;
+
 /**
  * url编制采用rest风格,如对XM.xm_question xm_question的操作有增删改查,对应的url分别为:<br>
  *  新增: xm/xmQuestion/add <br>
@@ -61,6 +64,9 @@ public class XmQuestionController {
 	@Autowired
 	XmQuestionHandleService xmQuestionHandleService;
 
+	@Autowired
+	SensitiveWordService sensitiveWordService;
+
 
 	@Autowired
 	PushNotifyMsgService notifyMsgService;
@@ -194,6 +200,14 @@ public class XmQuestionController {
 				xmQuestionVo.setHandlerUserid(user.getUserid());
 				xmQuestionVo.setHandlerUsername(user.getUsername());
 			}
+			Set<String> words=sensitiveWordService.getSensitiveWord(xmQuestionVo.getName());
+			if(words!=null && words.size()>0){
+				return failed("name-sensitive-word","名字有敏感词"+words+",请修改后再提交");
+			}
+			words=sensitiveWordService.getSensitiveWord(xmQuestionVo.getRemarks());
+			if(words!=null && words.size()>0){
+				return failed("remark-sensitive-word","备注中有敏感词"+words+",请修改后再提交");
+			}
 			xmQuestionService.addQuestion(xmQuestionVo);
 			if(!StringUtils.isEmpty(xmQuestionVo.getHandlerUserid())) {
 				notifyMsgService.pushMsg(user,xmQuestionVo.getHandlerUserid(),xmQuestionVo.getHandlerUsername(),"5",xmQuestionVo.getProductId(),xmQuestionVo.getId(),"您有新的bug【"+xmQuestionVo.getName()+"】需要处理，请尽快修复！");
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
index 1fdf6abe..1ee9bc8d 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
@@ -14,6 +14,7 @@ import com.mdp.mybatis.PageUtils;
 import com.mdp.qx.HasQx;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
+import com.mdp.sensitive.SensitiveWordService;
 import com.mdp.swagger.ApiEntityParams;
 import com.xm.core.PubTool;
 import com.xm.core.entity.*;
@@ -35,6 +36,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.mdp.core.utils.BaseUtils.map;
+import static com.mdp.core.utils.ResponseHelper.failed;
 
 /**
  * url编制采用rest风格,如对XM.xm_task xm_task的操作有增删改查,对应的url分别为:<br>
@@ -86,6 +88,9 @@ public class XmTaskController {
 	@Autowired
 	XmTaskExecuserController execuserController;
 
+	@Autowired
+	SensitiveWordService sensitiveWordService;
+
 
 	@Autowired
 	PushNotifyMsgService notifyMsgService;
@@ -534,6 +539,15 @@ public class XmTaskController {
 				xmTaskVo.setCreateUserid(user.getUserid());
 				xmTaskVo.setCreateUsername(user.getUsername());
 			}
+
+			Set<String> words=sensitiveWordService.getSensitiveWord(xmTaskVo.getName());
+			if(words!=null && words.size()>0){
+				return failed("name-sensitive-word","名字有敏感词"+words+",请修改后再提交");
+			}
+			words=sensitiveWordService.getSensitiveWord(xmTaskVo.getRemarks());
+			if(words!=null && words.size()>0){
+				return failed("remark-sensitive-word","备注中有敏感词"+words+",请修改后再提交");
+			}
 			xmTaskVo.setExecutorUserid(null);
 			xmTaskVo.setExecutorUsername(null);
 			xmTaskVo.setExeUserids(null);