diff --git a/pom.xml b/pom.xml index b3d0cc7..c77d21b 100644 --- a/pom.xml +++ b/pom.xml @@ -623,14 +623,14 @@ false - + diff --git a/src/main/java/com/lq/cms/web/wechat/WechatMessageController.java b/src/main/java/com/lq/cms/web/wechat/WechatMessageController.java index 0a63e51..3bd1ae9 100755 --- a/src/main/java/com/lq/cms/web/wechat/WechatMessageController.java +++ b/src/main/java/com/lq/cms/web/wechat/WechatMessageController.java @@ -41,6 +41,7 @@ public class WechatMessageController { @Autowired private WechatMessageService wechatMessageService; + @Value("${file.upload}") private String FILE_LOAD_PATH; diff --git a/src/main/java/com/lq/entity/WechatRuleMessage.java b/src/main/java/com/lq/entity/WechatRuleMessage.java new file mode 100644 index 0000000..bcfcc39 --- /dev/null +++ b/src/main/java/com/lq/entity/WechatRuleMessage.java @@ -0,0 +1,38 @@ +package com.lq.entity; + +import com.lq.code.entity.IdEntity; + +import java.util.Date; + +/** + * @Author: qi + * @Description:微信公众号消息ID关联表 + * @Date: Create in 4:14 PM 2019/5/30 + */ +public class WechatRuleMessage extends IdEntity { + + /** + * 微信公众号规则ID + */ + private Long wechatRuleId; + /** + * 微信公众号消息ID + */ + private Long wechatMessageId; + + public Long getWechatRuleId() { + return wechatRuleId; + } + + public void setWechatRuleId(Long wechatRuleId) { + this.wechatRuleId = wechatRuleId; + } + + public Long getWechatMessageId() { + return wechatMessageId; + } + + public void setWechatMessageId(Long wechatMessageId) { + this.wechatMessageId = wechatMessageId; + } +} diff --git a/src/main/resources/pro/file.properties b/src/main/resources/pro/file.properties index 70c8c53..6c6a3a8 100644 --- a/src/main/resources/pro/file.properties +++ b/src/main/resources/pro/file.properties @@ -1 +1 @@ -file.upload=/Users/qi/java/fileManger/ \ No newline at end of file +file.upload=/home/nfs/fileManger/ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/jsp/cms/wechat/rule/index.jsp b/src/main/webapp/WEB-INF/views/jsp/cms/wechat/rule/index.jsp index 58427aa..602e9bf 100755 --- a/src/main/webapp/WEB-INF/views/jsp/cms/wechat/rule/index.jsp +++ b/src/main/webapp/WEB-INF/views/jsp/cms/wechat/rule/index.jsp @@ -120,7 +120,7 @@
@@ -464,7 +464,10 @@ function delkeyword(obj){ var lastId = $(obj).parent(); - $(lastId).remove(); + var rowList = $(".keyword-content-row"); + if(rowList.length>1) { + $(lastId).remove(); + } } function showTextOrImager(type,obj){ @@ -574,8 +577,8 @@ var html = '
'+ '' + ' ' + @@ -617,7 +620,6 @@ dataType:"json", success:function(result){ if(result.success==true){ - location.reload(); } }, @@ -630,7 +632,6 @@ function appendAlertHtml(data){ var isShow ; - var wechatMessageList = data.wechatMessageVoList; var html = '

图文('+data.wechatMessageCount+')

'; html += '
'; diff --git a/src/main/webapp/WEB-INF/views/jsp/index.jsp b/src/main/webapp/WEB-INF/views/jsp/index.jsp index 6fe3b89..ee1af91 100755 --- a/src/main/webapp/WEB-INF/views/jsp/index.jsp +++ b/src/main/webapp/WEB-INF/views/jsp/index.jsp @@ -7,68 +7,45 @@ --%> <%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@ include file="common/import-tag.jsp" %> - + + - 堂吉诃德网 - - - - - + + + + test + - - - - - - - - + + +