Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/home.ftl

@@ -7,28 +7,28 @@
             <#include "/home/ribao.ftl" /></div>
         <div id="tab2" class="weui-tab__bd-item">
             <#include "/home/qiuzhu.ftl" /></div>
-        <#--<div id="tab3" class="weui-tab__bd-item">-->
-            <#--<h1>页面三</h1> </div>-->
-        <#--<div id="tab4" class="weui-tab__bd-item">-->
-            <#--<h1>页面四</h1> </div>-->
+    <#--<div id="tab3" class="weui-tab__bd-item">-->
+    <#--<h1>页面三</h1> </div>-->
+    <#--<div id="tab4" class="weui-tab__bd-item">-->
+    <#--<h1>页面四</h1> </div>-->
     </div>
     <div class="weui-tabbar">
         <a href="#tab1" class="weui-tabbar__item weui-bar__item--on">
-            <div class="weui-tabbar__icon"> <img src="./images/icon_nav_button.png" alt=""> </div>
+            <div class="weui-tabbar__icon"><img src="/static/images/wx/order.png" alt=""></div>
             <p class="weui-tabbar__label">健康日报</p>
         </a>
         <a href="#tab2" class="weui-tabbar__item">
-            <div class="weui-tabbar__icon"> <img src="./images/icon_nav_msg.png" alt=""> </div>
+            <div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>
             <p class="weui-tabbar__label">家庭求助</p>
         </a>
-        <#--<a href="#tab3" class="weui-tabbar__item">-->
-            <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_article.png" alt=""> </div>-->
-            <#--<p class="weui-tabbar__label">发现</p>-->
-        <#--</a>-->
-        <#--<a href="#tab4" class="weui-tabbar__item">-->
-            <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_cell.png" alt=""> </div>-->
-            <#--<p class="weui-tabbar__label">我</p>-->
-        <#--</a>-->
+    <#--<a href="#tab3" class="weui-tabbar__item">-->
+    <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_article.png" alt=""> </div>-->
+    <#--<p class="weui-tabbar__label">发现</p>-->
+    <#--</a>-->
+    <#--<a href="#tab4" class="weui-tabbar__item">-->
+    <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_cell.png" alt=""> </div>-->
+    <#--<p class="weui-tabbar__label">我</p>-->
+    <#--</a>-->
     </div>
 </div>
 
@@ -39,26 +39,26 @@
 <script>
     <#include "/home/ribao.js" />
     <#include "/home/qiuzhu.js" />
-var userid = ${user};
-(function ($) {
+    var userid = ${user};
+    (function ($) {
 
-    $(function(){
-        $('.weui-navbar__item').on('click', function () {
-            $(this).addClass('weui-bar__item_on').siblings('.weui-bar__item_on').removeClass('weui-bar__item_on');
-            //内容切换
-            var moduleClass = jQuery(this).attr("module");
-            var ss = ".weui-tab__panel ." + moduleClass + "_weui_tab_bd_item_active";
-            $(ss).removeClass(moduleClass + '_weui_tab_bd_item_active');
-            var data_toggle =jQuery(this).attr("target");
-            $(data_toggle).addClass(moduleClass + "_weui_tab_bd_item_active");
+        $(function () {
+            $('.weui-navbar__item').on('click', function () {
+                $(this).addClass('weui-bar__item_on').siblings('.weui-bar__item_on').removeClass('weui-bar__item_on');
+                //内容切换
+                var moduleClass = jQuery(this).attr("module");
+                var ss = ".weui-tab__panel ." + moduleClass + "_weui_tab_bd_item_active";
+                $(ss).removeClass(moduleClass + '_weui_tab_bd_item_active');
+                var data_toggle = jQuery(this).attr("target");
+                $(data_toggle).addClass(moduleClass + "_weui_tab_bd_item_active");
+            });
         });
-    });
 
-    console.log(userid);
+        console.log(userid);
 
-    ribao_init();
-    qiuzhu_init();
-    help();
-    family_init();
-})(jQuery);
+        ribao_init();
+        qiuzhu_init();
+        help();
+        family_init();
+    })(jQuery);
 </script>

whepi-ui/templates/yeweihui/home.ftl

@@ -7,28 +7,28 @@
             <#include "/yeweihui/ribao.ftl" /></div>
         <div id="tab2" class="weui-tab__bd-item">
             <#include "/yeweihui/qiuzhu.ftl" /></div>
-        <#--<div id="tab3" class="weui-tab__bd-item">-->
-            <#--<h1>页面三</h1> </div>-->
-        <#--<div id="tab4" class="weui-tab__bd-item">-->
-            <#--<h1>页面四</h1> </div>-->
+    <#--<div id="tab3" class="weui-tab__bd-item">-->
+    <#--<h1>页面三</h1> </div>-->
+    <#--<div id="tab4" class="weui-tab__bd-item">-->
+    <#--<h1>页面四</h1> </div>-->
     </div>
     <div class="weui-tabbar">
         <a href="#tab1" class="weui-tabbar__item weui-bar__item--on">
-            <div class="weui-tabbar__icon"> <img src="./images/icon_nav_button.png" alt=""> </div>
+            <div class="weui-tabbar__icon"><img src="/static/images/wx/upload.png" alt=""></div>
             <p class="weui-tabbar__label">每日上报</p>
         </a>
         <a href="#tab2" class="weui-tabbar__item">
-            <div class="weui-tabbar__icon"> <img src="./images/icon_nav_msg.png" alt=""> </div>
+            <div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>
             <p class="weui-tabbar__label">求助</p>
         </a>
-        <#--<a href="#tab3" class="weui-tabbar__item">-->
-            <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_article.png" alt=""> </div>-->
-            <#--<p class="weui-tabbar__label">发现</p>-->
-        <#--</a>-->
-        <#--<a href="#tab4" class="weui-tabbar__item">-->
-            <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_cell.png" alt=""> </div>-->
-            <#--<p class="weui-tabbar__label">我</p>-->
-        <#--</a>-->
+    <#--<a href="#tab3" class="weui-tabbar__item">-->
+    <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_article.png" alt=""> </div>-->
+    <#--<p class="weui-tabbar__label">发现</p>-->
+    <#--</a>-->
+    <#--<a href="#tab4" class="weui-tabbar__item">-->
+    <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_cell.png" alt=""> </div>-->
+    <#--<p class="weui-tabbar__label">我</p>-->
+    <#--</a>-->
     </div>
 </div>
 
@@ -43,22 +43,22 @@
     var taskList = ${taskList!'[]'};
 
     (function ($) {
-    $(function(){
-        $(function(){
-            $('.weui-navbar__item').on('click', function () {
-                $(this).addClass('weui-bar__item_on').siblings('.weui-bar__item_on').removeClass('weui-bar__item_on');
-                //内容切换
-                var moduleClass = jQuery(this).attr("module");
-                var ss = ".weui-tab__panel ." + moduleClass + "_weui_tab_bd_item_active";
-                $(ss).removeClass(moduleClass + '_weui_tab_bd_item_active');
-                var data_toggle =jQuery(this).attr("target");
-                $(data_toggle).addClass(moduleClass + "_weui_tab_bd_item_active");
+        $(function () {
+            $(function () {
+                $('.weui-navbar__item').on('click', function () {
+                    $(this).addClass('weui-bar__item_on').siblings('.weui-bar__item_on').removeClass('weui-bar__item_on');
+                    //内容切换
+                    var moduleClass = jQuery(this).attr("module");
+                    var ss = ".weui-tab__panel ." + moduleClass + "_weui_tab_bd_item_active";
+                    $(ss).removeClass(moduleClass + '_weui_tab_bd_item_active');
+                    var data_toggle = jQuery(this).attr("target");
+                    $(data_toggle).addClass(moduleClass + "_weui_tab_bd_item_active");
+                });
             });
-        });
 
-    });
+        });
 
-    ribao_init();
-    qiuzhu_init();
-})(jQuery);
+        ribao_init();
+        qiuzhu_init();
+    })(jQuery);
 </script>

whepi-web/src/main/resources/application-hudingbo.yml

@@ -0,0 +1,73 @@
+logging:
+  level:
+    root: INFO
+    jdbc.sqltiming: INFO
+  pattern:
+    console: '%d %-5level %logger{32} - %msg%n'
+
+debug: false
+ui-path: file:whepi-ui
+secret: 456 # jwt私钥
+salt: 123 #密码加盐
+token_time_minutes: 720 #12小时有效期
+token_time_minutes_mobile: 525600 #1年有效
+
+server:
+  port: 8086
+
+yvan:
+  debug: false
+  static_version: v20170728
+  static_domain: /static
+  upload_domain: /static
+  wechat:
+    #测试帐号
+    token: hudingbo
+    appID: wx39b9602905ed3b75
+    appsecret: 2ad7a715bed0cd8672a0d577492dd259
+
+#    token: yuliang
+#    appID: wx1b020f76b18f0294
+#    appsecret: 69f06d671d445dc14b04a097fe50f4cc
+
+    #token: slxtoken
+    #appID: wx79c1af613d5d22dd
+    #appsecret: 2de3b4abfe30ff7523f464ace8322b44
+    #EncodingAESKey: wb4IyoD7FZa0yB2BMU8HWQ0inWJuAfJSiRR6jlfivo2
+    ## 商户编号
+    #pay_mch_id: 1499356522
+    ## 回调地址
+    #notify_url: http://central.good5you.com/pay/wx/notify
+
+    ## 绑定客户的二维码有效时间
+    #qrcode_bind_expire_second: 10800
+    ## 找到用户的二维码有效时间
+    #qrcode_match_cust_expire_second: 10800
+
+    ##domain: http://wx.good5you.com/
+#    domain: http://bofeng.ng.good5you.com
+    domain: http://hudingbo.ng.yvanui.com
+#    domain: http://yyc21fmd42.hkhttp.cn
+#    tmpTicketExpireSeconds: 10800
+    templates:
+      预定信息: 'MLNz8YVi7zofQOBeLS0Ruhr-3fJpTnfsKjyPeDB879s'
+      修改预定信息: 'FsPj2Syigep3ctUd0aBmE4JMsuxjW-U0JgmoLAXjJtc'
+      结账信息: '5t4LSW4cb7j4mcHxoYyzTvLHnp2gehpxn1faf7G4ABs'
+      结算信息: 'GoZBKvyqAfP8uM3xrJk40YHhMoM_E44aPLEoKV_1-pQ'
+    #  round_out_template_id: 'xpQJsBwlhZ5r7P7Glur8hiNl1IgjQxtMGTVwdVOfGKg'
+    #  round_in_template_id: 'oobiXKFatguG1H7K-HPi2lipzF-Qv0pMY12e1JaQxdA'
+
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    #driverClassName: com.mysql.jdbc.Driver
+    #url: jdbc:mysql://localhost:3306/bofeng_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    driverClassName: net.sf.log4jdbc.DriverSpy
+    url: jdbc:log4jdbc:mysql://39.99.148.1:3306/whepi_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    username: whepi_test
+    password: 123456
+
+  redis:
+    database: 4
+    host: localhost
+    port: 6379