Ana Sayfa Keşfet Yardım
Giriş Yap
peiguo
/
hust-epi
1
0
Çatalla 0
Dosyalar Sorunlar 0 Değişiklik İstekleri 0 Wiki
Kaynağa Gözat

Merge remote-tracking branch 'origin/master'

guojing 5 yıl önce
ebeveyn
1d1ac3d658 75069586ae
işleme
536c2c1437
17 değiştirilmiş dosya ile 497 ekleme ve 64 silme
Görünümü Böl Farklılık Durumunu Göster
  1. 16 0
      whepi-ui/templates/home/frag.foot.ftl
  2. 29 0
      whepi-ui/templates/home/frag.head.ftl
  3. 56 0
      whepi-ui/templates/home/home.ftl
  4. 26 0
      whepi-ui/templates/home/qiuzhu.ftl
  5. 5 0
      whepi-ui/templates/home/qiuzhu.js
  6. 29 0
      whepi-ui/templates/home/ribao.ftl
  7. 7 0
      whepi-ui/templates/home/ribao.js
  8. 56 0
      whepi-ui/templates/yeweihui/home.ftl
  9. 32 0
      whepi-ui/templates/yeweihui/qiuzhu.ftl
  10. 5 0
      whepi-ui/templates/yeweihui/qiuzhu.js
  11. 35 0
      whepi-ui/templates/yeweihui/ribao.ftl
  12. 7 0
      whepi-ui/templates/yeweihui/ribao.js
  13. 63 63
      whepi-web/src/main/java/com/bofeng/wx/WxController.java
  14. 33 0
      whepi-web/src/main/java/com/bofeng/wx/controller/HomeController.java
  15. 24 0
      whepi-web/src/main/java/com/bofeng/wx/controller/YeWeiHuiController.java
  16. 1 1
      whepi-web/src/main/resources/application-dev.yml
  17. 73 0
      whepi-web/src/main/resources/application-peig.yml

+ 16 - 0
whepi-ui/templates/home/frag.foot.ftl
Dosyayı Görüntüle 

@@ -0,0 +1,16 @@
 
+<#--
 
+<div class="weui-footer">
 
+    <p class="weui-footer__links">
 
+        <a href="javascript:void(0);" class="weui-footer__link">博锋管家提供技术支持</a>
 
+    </p>
 
+    <p class="weui-footer__text">Copyright © 2008-2016</p>
 
+</div>
 
+-->
 
+
 
+</body>
 
+</html>
 
+<script src="https://cdn.bootcss.com/jquery/1.11.0/jquery.min.js"></script>
 
+<script src="https://cdn.bootcss.com/jquery-weui/1.2.1/js/jquery-weui.min.js"></script>
 
+<script src="https://cdn.bootcss.com/jquery-weui/1.2.1/js/swiper.min.js"></script>
 
+<script src="https://cdn.bootcss.com/jquery-weui/1.2.1/js/city-picker.min.js"></script>
 
+<script src="https://www.w3cways.com/demo/vconsole/vconsole.min.js?v=2.2.0"></script>

+ 29 - 0
whepi-ui/templates/home/frag.head.ftl
Dosyayı Görüntüle 

@@ -0,0 +1,29 @@
 
+<!DOCTYPE html>
 
+<html>
 
+<head>
 
+    <title>${title}</title>
 
+    <meta charset="utf-8">
 
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
 
+    <link rel="stylesheet" href="https://cdn.bootcss.com/weui/1.1.3/style/weui.min.css">
 
+    <link rel="stylesheet" href="https://cdn.bootcss.com/jquery-weui/1.2.1/css/jquery-weui.min.css">
 
+    <style>
 
+        .demos-header {
 
+            padding: 20px 0 10px 0;
 
+        }
 
+
 
+        .demos-title {
 
+            text-align: center;
 
+            font-size: 34px;
 
+            color: #3cc51f;
 
+            font-weight: 400;
 
+            margin: 0 15%;
 
+        }
 
+        html,body{height: 100%;}
 
+        .weui_tab_bd_item_active {
 
+            display: block !important;
 
+        }
 
+    </style>
 
+</head>
 
+
 
+<body style="height: 100%" ontouchstart>

+ 56 - 0
whepi-ui/templates/home/home.ftl
Dosyayı Görüntüle 

@@ -0,0 +1,56 @@
 
+<#assign title="我的家"/>
 
+<#include "/home/frag.head.ftl" />
 
+
 
+<div class="weui-tab">
 
+    <div class="weui-tab__bd">
 
+        <div id="tab1" class="weui-tab__bd-item weui-tab__bd-item--active">
 
+            <#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>
 
+    <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>
 
+            <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>
 
+            <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>
 
+
 
+
 
+</body>
 
+
 
+<#include "/home/frag.foot.ftl" />
 
+<script>
 
+    <#include "/home/ribao.js" />
 
+    <#include "/home/qiuzhu.js" />
 
+(function ($) {
 
+    $(function(){
 
+        $('.weui-navbar__item').on('click', function () {
 
+            $(this).addClass('weui-bar__item_on').siblings('.weui-bar__item_on').removeClass('weui-bar__item_on');
 
+            //内容切换
 
+            $(".weui-tab__panel .weui_tab_bd_item_active").removeClass('weui_tab_bd_item_active');
 
+            var data_toggle =jQuery(this).attr("target");
 
+            $(data_toggle).addClass("weui_tab_bd_item_active");
 
+        });
 
+    });
 
+
 
+    ribao_init();
 
+    qiuzhu_init();
 
+})(jQuery);
 
+</script>

+ 26 - 0
whepi-ui/templates/home/qiuzhu.ftl
Dosyayı Görüntüle 

@@ -0,0 +1,26 @@
 
+<div class="page__bd">
 
+    <header class="demos-header">
 
+        <h1 class="demos-title">求助</h1>
 
+    </header>
 
+    <div class="weui-tab">
 
+        <div class="weui-navbar">
 
+            <a class="weui-navbar__item weui-bar__item_on" target="#qz_nav1">
 
+                小区求助
 
+            </a>
 
+            <a class="weui-navbar__item" target="#qz_nav2">
 
+                我的求助
 
+            </a>
 
+        </div>
 
+        <div class="weui-tab__panel">
 
+            <div id="qz_nav1" class="weui-tab__bd-item weui_tab_bd_item_active">
 
+                内容一
 
+            </div>
 
+            <div id="qz_nav2" class="weui-tab__bd-item">
 
+                内容二
 
+            </div>
 
+        </div>
 
+    </div>
 
+    <div class="weui-btn-area">
 
+        <a id="btnQZ" class="weui-btn weui-btn_primary" href="javascript:">求助</a>
 
+    </div>
 
+</div>

+ 5 - 0
whepi-ui/templates/home/qiuzhu.js
Dosyayı Görüntüle 

@@ -0,0 +1,5 @@
 
+function qiuzhu_init() {
 
+  $('#btnQZ').on('click', function () {
 
+    alert("求助");
 
+  });
 
+}

+ 29 - 0
whepi-ui/templates/home/ribao.ftl
Dosyayı Görüntüle 

@@ -0,0 +1,29 @@
 
+
 
+
 
+<div class="page__bd">
 
+    <header class="demos-header">
 
+        <h1 class="demos-title">日报</h1>
 
+    </header>
 
+    <div class="weui-tab">
 
+        <div class="weui-navbar">
 
+            <a class="weui-navbar__item weui-bar__item_on" target="#rb_nav1">
 
+                今日报告
 
+            </a>
 
+            <a class="weui-navbar__item" target="#rb_nav2">
 
+                健康日历
 
+            </a>
 
+        </div>
 
+        <div class="weui-tab__panel">
 
+            <div id="rb_nav1" class="weui-tab__bd-item weui_tab_bd_item_active">
 
+                内容一
 
+            </div>
 
+            <div id="rb_nav2" class="weui-tab__bd-item">
 
+                内容二
 
+            </div>
 
+        </div>
 
+    </div>
 
+    <div class="weui-btn-area">
 
+        <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:">日报</a>
 
+    </div>
 
+</div>
 
+

+ 7 - 0
whepi-ui/templates/home/ribao.js
Dosyayı Görüntüle 

@@ -0,0 +1,7 @@
 
+function ribao_init() {
 
+  $('#btnRB').on('click', function () {
 
+    alert("日报");
 
+  });
 
+
 
+
 
+}

+ 56 - 0
whepi-ui/templates/yeweihui/home.ftl
Dosyayı Görüntüle 

@@ -0,0 +1,56 @@
 
+<#assign title="我的家"/>
 
+<#include "/home/frag.head.ftl" />
 
+
 
+<div class="weui-tab">
 
+    <div class="weui-tab__bd">
 
+        <div id="tab1" class="weui-tab__bd-item weui-tab__bd-item--active">
 
+            <#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>
 
+    <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>
 
+            <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>
 
+            <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>
 
+
 
+
 
+</body>
 
+
 
+<#include "/home/frag.foot.ftl" />
 
+<script>
 
+    <#include "/yeweihui/ribao.js" />
 
+    <#include "/yeweihui/qiuzhu.js" />
 
+(function ($) {
 
+    $(function(){
 
+        $('.weui-navbar__item').on('click', function () {
 
+            $(this).addClass('weui-bar__item_on').siblings('.weui-bar__item_on').removeClass('weui-bar__item_on');
 
+            //内容切换
 
+            $(".weui-tab__panel .weui_tab_bd_item_active").removeClass('weui_tab_bd_item_active');
 
+            var data_toggle =jQuery(this).attr("target");
 
+            $(data_toggle).addClass("weui_tab_bd_item_active");
 
+        });
 
+    });
 
+
 
+    ribao_init();
 
+    qiuzhu_init();
 
+})(jQuery);
 
+</script>

+ 32 - 0
whepi-ui/templates/yeweihui/qiuzhu.ftl
Dosyayı Görüntüle 

@@ -0,0 +1,32 @@
 
+<div class="page__bd">
 
+    <header class="demos-header">
 
+        <h1 class="demos-title">求助</h1>
 
+    </header>
 
+    <div class="weui-tab">
 
+        <div class="weui-navbar">
 
+            <a class="weui-navbar__item weui-bar__item_on" target="#qz_nav1">
 
+                未处理
 
+            </a>
 
+            <a class="weui-navbar__item" target="#qz_nav2">
 
+                已处理
 
+            </a>
 
+            <a class="weui-navbar__item" target="#qz_nav3">
 
+                处理中
 
+            </a>
 
+        </div>
 
+        <div class="weui-tab__panel">
 
+            <div id="qz_nav1" class="weui-tab__bd-item weui_tab_bd_item_active">
 
+                内容一
 
+            </div>
 
+            <div id="qz_nav2" class="weui-tab__bd-item">
 
+                内容二
 
+            </div>
 
+            <div id="qz_nav3" class="weui-tab__bd-item">
 
+                内容三
 
+            </div>
 
+        </div>
 
+    </div>
 
+    <div class="weui-btn-area">
 
+        <a id="btnQZ" class="weui-btn weui-btn_primary" href="javascript:">求助</a>
 
+    </div>
 
+</div>

+ 5 - 0
whepi-ui/templates/yeweihui/qiuzhu.js
Dosyayı Görüntüle 

@@ -0,0 +1,5 @@
 
+function qiuzhu_init() {
 
+  $('#btnQZ').on('click', function () {
 
+    alert("求助");
 
+  });
 
+}

+ 35 - 0
whepi-ui/templates/yeweihui/ribao.ftl
Dosyayı Görüntüle 

@@ -0,0 +1,35 @@
 
+
 
+
 
+<div class="page__bd">
 
+    <header class="demos-header">
 
+        <h1 class="demos-title">每日上报</h1>
 
+    </header>
 
+    <div class="weui-tab">
 
+        <div class="weui-navbar">
 
+            <a class="weui-navbar__item weui-bar__item_on" target="#rb_nav1">
 
+                待报
 
+            </a>
 
+            <a class="weui-navbar__item" target="#rb_nav2">
 
+                异常
 
+            </a>
 
+            <a class="weui-navbar__item" target="#rb_nav3">
 
+                已报
 
+            </a>
 
+        </div>
 
+        <div class="weui-tab__panel">
 
+            <div id="rb_nav1" class="weui-tab__bd-item weui_tab_bd_item_active">
 
+                内容一
 
+            </div>
 
+            <div id="rb_nav2" class="weui-tab__bd-item">
 
+                内容二
 
+            </div>
 
+            <div id="rb_nav3" class="weui-tab__bd-item">
 
+                内容二
 
+            </div>
 
+        </div>
 
+    </div>
 
+    <div class="weui-btn-area">
 
+        <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:">每日上报</a>
 
+    </div>
 
+</div>
 
+

+ 7 - 0
whepi-ui/templates/yeweihui/ribao.js
Dosyayı Görüntüle 

@@ -0,0 +1,7 @@
 
+function ribao_init() {
 
+  $('#btnRB').on('click', function () {
 
+    alert("日报");
 
+  });
 
+
 
+
 
+}

+ 63 - 63
whepi-web/src/main/java/com/bofeng/wx/WxController.java
Dosyayı Görüntüle 

@@ -114,77 +114,77 @@ public class WxController {
 
 
         //推介客户
 
         val btn1 = new WxMenuButton();
 
-        btn1.setName("推介客户");
 
+        btn1.setName("进入");
 
         btn1.setType(WxConsts.MenuButtonType.VIEW);
 
         btn1.setUrl(
 
                 wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
 
-                                "/cust/market.html",
 
+                                "home.html",
 
                         WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
 
         );
 
 
-        val btn2 = new WxMenuButton();
 
-        btn2.setName("佣金");
 
-
 
-        val btn21 = new WxMenuButton();
 
-        btn21.setName("我的佣金");
 
-        btn21.setType(WxConsts.MenuButtonType.VIEW);
 
-        btn21.setUrl(
 
-                wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
 
-                                "/cust/commission.html",
 
-                        WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
 
-        );
 
-
 
-        val btn22 = new WxMenuButton();
 
-        btn22.setName("历史订单");
 
-        btn22.setType(WxConsts.MenuButtonType.VIEW);
 
-        btn22.setUrl(
 
-                wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
 
-                                "/cust/history.html",
 
-                        WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
 
-        );
 
-
 
-        btn2.getSubButtons().add(btn21);
 
-        btn2.getSubButtons().add(btn22);
 
-
 
-
 
-        //我的
 
-        val btn3 = new WxMenuButton();
 
-        btn3.setName("我的");
 
-
 
-        val btn31 = new WxMenuButton();
 
-        btn31.setName("我的账号");
 
-        btn31.setType(WxConsts.MenuButtonType.VIEW);
 
-        btn31.setUrl(
 
-                wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
 
-                                "/cust/account.html",
 
-                        WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
 
-        );
 
-
 
-        val btn32 = new WxMenuButton();
 
-        btn32.setName("二级分销");
 
-        btn32.setType(WxConsts.MenuButtonType.VIEW);
 
-        btn32.setUrl(
 
-                wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
 
-                                "/cust/sub.html",
 
-                        WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
 
-        );
 
-
 
-        val btn33 = new WxMenuButton();
 
-        btn33.setName("我的二维码");
 
-        btn33.setType(WxConsts.MenuButtonType.VIEW);
 
-        btn33.setUrl(
 
-                wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
 
-                                "/cust/user_place_list.html",
 
-                        WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
 
-        );
 
-
 
-        btn3.getSubButtons().add(btn31);
 
-        btn3.getSubButtons().add(btn32);
 
-        btn3.getSubButtons().add(btn33);
 
+//        val btn2 = new WxMenuButton();
 
+//        btn2.setName("业委会");
 
+//
 
+//        val btn21 = new WxMenuButton();
 
+//        btn21.setName("每日上报");
 
+//        btn21.setType(WxConsts.MenuButtonType.VIEW);
 
+//        btn21.setUrl(
 
+//                wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
 
+//                                "/cust/commission.html",
 
+//                        WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
 
+//        );
 
+//
 
+//        val btn22 = new WxMenuButton();
 
+//        btn22.setName("求助");
 
+//        btn22.setType(WxConsts.MenuButtonType.VIEW);
 
+//        btn22.setUrl(
 
+//                wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
 
+//                                "/cust/history.html",
 
+//                        WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
 
+//        );
 
+//
 
+//        btn2.getSubButtons().add(btn21);
 
+//        btn2.getSubButtons().add(btn22);
 
+//
 
+//
 
+//        //我的
 
+//        val btn3 = new WxMenuButton();
 
+//        btn3.setName("我的家");
 
+//
 
+//        val btn31 = new WxMenuButton();
 
+//        btn31.setName("健康日报");
 
+//        btn31.setType(WxConsts.MenuButtonType.VIEW);
 
+//        btn31.setUrl(
 
+//                wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
 
+//                                "/cust/account.html",
 
+//                        WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
 
+//        );
 
+//
 
+//        val btn32 = new WxMenuButton();
 
+//        btn32.setName("家庭求助");
 
+//        btn32.setType(WxConsts.MenuButtonType.VIEW);
 
+//        btn32.setUrl(
 
+//                wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
 
+//                                "/cust/sub.html",
 
+//                        WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
 
+//        );
 
+//
 
+//        val btn33 = new WxMenuButton();
 
+//        btn33.setName("我的二维码");
 
+//        btn33.setType(WxConsts.MenuButtonType.VIEW);
 
+//        btn33.setUrl(
 
+//                wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
 
+//                                "/cust/user_place_list.html",
 
+//                        WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
 
+//        );
 
+//
 
+//        btn3.getSubButtons().add(btn31);
 
+//        btn3.getSubButtons().add(btn32);
 
+//        btn3.getSubButtons().add(btn33);
 
 
         menu.getButtons().add(btn1);
 
-        menu.getButtons().add(btn2);
 
-        menu.getButtons().add(btn3);
 
+//        menu.getButtons().add(btn2);
 
+//        menu.getButtons().add(btn3);
 
         wxService.getMenuService().menuCreate(menu);
 
         return ModelOps.newSuccess();
 
     }

+ 33 - 0
whepi-web/src/main/java/com/bofeng/wx/controller/HomeController.java
Dosyayı Görüntüle 

@@ -0,0 +1,33 @@
 
+package com.bofeng.wx.controller;
 
+
 
+import com.bofeng.Consts;
 
+import com.bofeng.entity.ParseCurrentOpenId;
 
+import com.bofeng.entity.StatisticsOrder;
 
+import com.bofeng.entity.SubUser;
 
+import com.bofeng.entity.User;
 
+import com.google.common.collect.Maps;
 
+import com.yvan.platform.JsonWapper;
 
+import com.yvan.platform.YvanUtil;
 
+import lombok.val;
 
+import org.springframework.ui.ModelMap;
 
+import org.springframework.web.bind.annotation.GetMapping;
 
+import org.springframework.web.bind.annotation.RestController;
 
+import org.springframework.web.servlet.ModelAndView;
 
+
 
+import java.util.List;
 
+import java.util.Map;
 
+
 
+@RestController
 
+public class HomeController {
 
+
 
+    @GetMapping("/home/home.html")
 
+    public ModelAndView home(ModelMap model) {
 
+
 
+        Map<String, Object> queryParam = Maps.newLinkedHashMap();
 
+        queryParam.put("userId", "12345677");
 
+        queryParam.put("statistics", "M");
 
+
 
+        model.put("user", "{}");
 
+        return new ModelAndView("/home/home.ftl", model);
 
+    }
 
+}

+ 24 - 0
whepi-web/src/main/java/com/bofeng/wx/controller/YeWeiHuiController.java
Dosyayı Görüntüle 

@@ -0,0 +1,24 @@
 
+package com.bofeng.wx.controller;
 
+
 
+import com.google.common.collect.Maps;
 
+import org.springframework.ui.ModelMap;
 
+import org.springframework.web.bind.annotation.GetMapping;
 
+import org.springframework.web.bind.annotation.RestController;
 
+import org.springframework.web.servlet.ModelAndView;
 
+
 
+import java.util.Map;
 
+
 
+@RestController
 
+public class YeWeiHuiController {
 
+
 
+    @GetMapping("/yeweihui/home.html")
 
+    public ModelAndView yeweihui(ModelMap model) {
 
+
 
+        Map<String, Object> queryParam = Maps.newLinkedHashMap();
 
+        queryParam.put("userId", "12345677");
 
+        queryParam.put("statistics", "M");
 
+
 
+        model.put("user", "{}");
 
+        return new ModelAndView("/yeweihui/home.ftl", model);
 
+    }
 
+}

+ 1 - 1
whepi-web/src/main/resources/application-dev.yml
Dosyayı Görüntüle 

@@ -63,7 +63,7 @@ spring:
 
     #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.100.158.26:3306/whepi_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
 
+    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

+ 73 - 0
whepi-web/src/main/resources/application-peig.yml
Dosyayı Görüntüle 

@@ -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: peiguo
 
+    appID: wx02a4ee296708dfd4
 
+    appsecret: 560fd382afd521826d26f5cc3eeb362f
 
+
 
+#    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://peiguo.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