Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/frag.foot.ftl

@@ -9,8 +9,8 @@
 
 </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="${s3('/jquery/1.11.0/jquery.min.js')}"></script>
+<script src="${s3('/jquery-weui/1.2.1/js/jquery-weui.min.js')}"></script>
+<script src="${s3('/jquery-weui/1.2.1/js/swiper.min.js')}"></script>
+<script src="${s3('/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>

whepi-ui/templates/home/frag.head.ftl

@@ -5,8 +5,8 @@
     <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">
+    <link rel="stylesheet" href="${s3('/weui/1.1.3/style/weui.min.css')}" type="text/css">
+    <link rel="stylesheet" href="${s3('/jquery-weui/1.2.1/css/jquery-weui.min.css')}" type="text/css">
     <style>
         .demos-header {
             padding: 20px 0 10px 0;

whepi-web/src/main/java/com/bofeng/entity/UserOpen.java

@@ -9,7 +9,7 @@ import lombok.Setter;
 
 @Getter
 @Setter
-@TableName("tb_user_open")
+@TableName("sys_user_open")
 public class UserOpen {
 
     @TableId("open_id")

whepi-web/src/main/java/com/bofeng/wx/WxController.java

@@ -118,7 +118,7 @@ public class WxController {
         btn1.setType(WxConsts.MenuButtonType.VIEW);
         btn1.setUrl(
                 wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
-                                "home.html",
+                                "/home/home.html",
                         WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
         );
 

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

@@ -46,7 +46,7 @@ yvan:
 
     ##domain: http://wx.good5you.com/
 #    domain: http://bofeng.ng.good5you.com
-    domain: http://yuliang.ng.yvanui.com/
+    domain: http://yuliang.ng.yvanui.com
 #    domain: http://yyc21fmd42.hkhttp.cn
 #    tmpTicketExpireSeconds: 10800
     templates:

whepi-web/src/main/resources/mapper/SubUser.xml

@@ -15,7 +15,7 @@
         from
           tb_user_place up
           left join tb_user u on(up.user_id=u.user_id)
-          left join tb_user_open uo on(up.user_id=uo.user_id)
+          left join sys_user_open uo on(up.user_id=uo.user_id)
           left join tb_place p on (up.place_id=p.place_id)
         where
           up.higher_id=#{userId}

whepi-web/src/main/resources/mapper/UserOpen.xml

@@ -2,12 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bofeng.dao.UserOpenMapper">
     <delete id="deleteByUserId">
-        delete from tb_user_open
+        delete from sys_user_open
         where user_id=#{userId}
     </delete>
 
     <select id="selectByUserId" resultType="com.bofeng.entity.UserOpen">
-        select * from tb_user_open
+        select * from sys_user_open
         where user_id=#{userId}
     </select>
 </mapper>