From 39f72646a00e49cd25e1ef2c2cf5d56b8e555bdf Mon Sep 17 00:00:00 2001
From: qi_liang <qi_liang_gz@163.com>
Date: Fri, 31 May 2019 17:16:16 +0800
Subject: [PATCH] =?UTF-8?q?1.Linux=E9=9B=86=E7=BE=A4=E9=80=9A=E8=BF=87NFS?=
 =?UTF-8?q?=E5=85=B1=E4=BA=AB=E5=9B=BE=E7=89=87=202.pom=20=E5=A4=9A?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  4 +-
 .../web/wechat/WechatMessageController.java   |  1 +
 .../java/com/lq/entity/WechatRuleMessage.java | 38 ++++++++
 src/main/resources/pro/file.properties        |  2 +-
 .../views/jsp/cms/wechat/rule/index.jsp       | 13 +--
 src/main/webapp/WEB-INF/views/jsp/index.jsp   | 93 +++++++------------
 6 files changed, 84 insertions(+), 67 deletions(-)
 create mode 100644 src/main/java/com/lq/entity/WechatRuleMessage.java

diff --git a/pom.xml b/pom.xml
index b3d0cc7..c77d21b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -623,14 +623,14 @@
         <filtering>false</filtering>
       </resource>
 
-      <!-- <resource>
+       <resource>
          <directory>src/main/java</directory>
          <includes>
            <include>**/*.properties</include>
          </includes>
          <filtering>false</filtering>
        </resource>
-       -->
+
     </resources>
 
   </build>
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 @@
             <div class="keyword-content-row">
                 <select class="keyword-select">
                     <c:forEach var="wechatKeywordMatchinType" items="${wechatKeywordMatchinTypeMap}"  >
-                    <option value="${wechatKeywordMatchinType.key}" >${wechatKeywordMatchinType.value}</option>
+                        <option value="${wechatKeywordMatchinType.key}" >${wechatKeywordMatchinType.value}</option>
                     </c:forEach>
                 </select>
                 <input type="text" class="keyword-input" placeholder="请输入关键字" />
@@ -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 = '<div class="keyword-content-row">'+
             '<select class="keyword-select">' +
-            '<option value="completely" '+completelyStr+' >全匹配</option>' +
-            '<option value="contain" '+containStr+'>半匹配</option><' +
+            '<option value="1" '+completelyStr+' >全匹配</option>' +
+            '<option value="2" '+containStr+'>半匹配</option><' +
             '/select>' +
             '<input type="text" class="keyword-input" placeholder="请输入关键字"  value="'+inputVal+'" />' +
             ' <button class="keyword-add" onclick="addkeyword()"><a href="#" class="keyword-add-title" >十</a></button> ' +
@@ -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 = '<div class="alert"><div class="left-navigation"><p>图文('+data.wechatMessageCount+')</p></div>';
         html += ' <div class="alert-content">';
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" %>
-<html>
+<!DOCTYPE html>
+<html lang="en">
 <head>
-    <title>堂吉诃德网</title>
-    <link href="${ctx}/resources/plugins/umeditor/themes/default/css/umeditor.css" type="text/css" rel="stylesheet">
-    <script type="text/javascript" src="${ctx}/resources/plugins/umeditor/third-party/jquery.min.js"></script>
-    <script type="text/javascript" charset="utf-8" src="${ctx}/resources/plugins/umeditor/umeditor.config.js"></script>
-    <script type="text/javascript" charset="utf-8" src="${ctx}/resources/plugins/umeditor/umeditor.min.js"></script>
-    <script type="text/javascript" src="${ctx}/resources/plugins/umeditor/lang/zh-cn/zh-cn.js"></script>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>test</title>
+ <!--   <link rel="stylesheet" href="https://test.com/index.css" />-->
 </head>
-
 <body>
-<!--<script id="container" name="content" type="text/plain">
-
-</script>-->
-
-<button id="openBtn">打开App</button>
-
-</body>
-<!-- 配置文件-->
-<script type="text/javascript">
-   // window.um = UM.getEditor("container");
-   var ua = navigator.userAgent.toLowerCase();
-
-   var config = {
-       scheme_IOS: 'myscheme://myhost:1024/main',
-       scheme_Adr: 'myscheme://myhost:1024/main',
-       download_url: 'http://a.app.qq.com/o/simple.jsp?pkgname=aa.bbxxx',
-       timeout: 3000
-   }
-
-   $(function () {
-        $("#openBtn").on("click",function(){
-            location.href="myscheme://myhost:1024/main";
-        });
+<div class="app">
+    <h1>webview-wechat-detail</h1>
+    <p>
+        detail
+    </p>
+    <button type="button" id="btn">返回小程序</button>
+</div>
+<script src="${ctx}/resources/code/js/jquery-2.2.4.min.js"></script>
+<script src="https://res.wx.qq.com/open/js/jweixin-1.3.0.js"></script>
+<script>
+    /* eslint-disable */
+    $(function(){
+    //    doucument.cookie = 'bb=bbbbbb';
+        $("#btn").click(function () {
+            alert("测试!");
+            wx.miniProgram.getEnv(function (res) {
+                if (res.miniprogram) {
+                    //如果当前是小程序环境
+                    wx.miniProgram.postMessage({
+                        data:  {
+                            name: 'name',
+                            age: 12
+                        }
+                    })
+                }
+            });
+        })
 
     });
-
-   function  openClient() {
-       var  startTime = Date.now();
-
-       var ifr = document.createElement('iframe');
-       ifr.src = ua.indexOf('OS')>0?config.scheme_IOS:config.scheme_Adr;
-       ifr.style.display='none';
-       document.body.appendChild(ifr);
-
-       var t = setTimeout(function(){
-           var endTime = Date.now();
-           if(!startTime||endTime-startTime<config.timeout+200){
-               window.location = config.download_url;
-           }else {
-
-           }
-       },config.timeout);
-
-       window.onblur = function () {
-           clearTimeout(t);
-       }
-   }
-
-   window.addEventListener("DOMContentLoaded",function () {
-
-   },false);
-
 </script>
+</body>
 </html>