Merge branch 'master' of http://120.76.158.63:18080/zhangtai/zzhnc

WebContent/WEB-INF/classes/spring/spring-mvc.xml

@@ -117,7 +117,7 @@
 		<property name="supportedMediaTypes" value="application/json" />
 		<property name="supportedMediaTypes" value="application/json" />
 	</bean>
 	</bean>
 	<!-- pc登录拦截器 -->
 	<!-- pc登录拦截器 -->
-	<mvc:interceptors>
+	<!-- <mvc:interceptors>
 		<mvc:interceptor>
 		<mvc:interceptor>
 			<mvc:mapping path="/autoreply/*" />
 			<mvc:mapping path="/autoreply/*" />
 			<mvc:mapping path="/poster/*" />
 			<mvc:mapping path="/poster/*" />
@@ -140,7 +140,7 @@
 				</property>
 				</property>
 			</bean>
 			</bean>
 		</mvc:interceptor>
 		</mvc:interceptor>
-	</mvc:interceptors>
+	</mvc:interceptors> -->
 
 
 	<!-- <task:annotation-driven /> -->
 	<!-- <task:annotation-driven /> -->
 	<aop:aspectj-autoproxy proxy-target-class="true" />
 	<aop:aspectj-autoproxy proxy-target-class="true" />

src/com/w1hd/zzhnc/controller/pc/AutoreplyController.java

@@ -44,13 +44,12 @@ public class AutoreplyController extends BaseController {
 	// 添加关键字
 	// 添加关键字
 	@RequestMapping(value = "/addAutoreply", method = RequestMethod.POST)
 	@RequestMapping(value = "/addAutoreply", method = RequestMethod.POST)
 	@ResponseBody
 	@ResponseBody
-	public Object addautoreply(@RequestParam(value = "keywords", required = false) String keywords,
-			@RequestParam(value = "keywords", required = true) boolean isRedirectStaff,
+	public Object addautoreply(@RequestParam(value = "keywords", required = true) String keywords,
 			@RequestParam(value = "content", required = true) String content,
 			@RequestParam(value = "content", required = true) String content,
 			@RequestParam(value = "projectId", required = false, defaultValue = "1") Integer projectId,
 			@RequestParam(value = "projectId", required = false, defaultValue = "1") Integer projectId,
 			@RequestParam(value = "projectName", required = false, defaultValue = "默认") String projectName,
 			@RequestParam(value = "projectName", required = false, defaultValue = "默认") String projectName,
 			@RequestParam(value = "sort", required = false, defaultValue = "0") Integer sort) {
 			@RequestParam(value = "sort", required = false, defaultValue = "0") Integer sort) {
-		String result = replyService.addAutoReply(keywords, isRedirectStaff, content, projectId, projectName, sort);
+		String result = replyService.addAutoReply(keywords, false, content, projectId, projectName, sort);
 		if (result.equals("ok")) {
 		if (result.equals("ok")) {
 			return new Vo_msg(0, "添加成功");
 			return new Vo_msg(0, "添加成功");
 		} else {
 		} else {