Merge remote-tracking branch 'origin/master'

whepi-doc/mrsb.sql

@@ -4,7 +4,7 @@
 DROP TABLE IF EXISTS ms_report;
 CREATE TABLE ms_report  (
   report_id         bigint(20) NOT NULL DEFAULT 0                           COMMENT '上报ID',
-  resident_id       bigint(20) NOT NULL DEFAULT 0                           COMMENT '居民ID',
+  house_id          bigint(20) NOT NULL DEFAULT 0                           COMMENT '门牌ID',
   safety_num        int(11) NOT NULL DEFAULT 0                              COMMENT '平安人数',
   suspected_num     int(11) NOT NULL DEFAULT 0                              COMMENT '疑似人数',
   remarks           varchar(100)  NOT NULL DEFAULT ''                       COMMENT '异常备注',
@@ -23,7 +23,7 @@ CREATE TABLE ms_report  (
 DROP TABLE IF EXISTS ms_suspected;
 CREATE TABLE ms_suspected  (
   suspected_id      bigint(20) NOT NULL DEFAULT 0                           COMMENT '疑似ID',
-  resident_id       bigint(20) NOT NULL DEFAULT 0                           COMMENT '居民ID',
+  report_id         bigint(20) NOT NULL DEFAULT 0                           COMMENT '上报ID',
   family_relative   int(11)    NOT NULL DEFAULT 1                           COMMENT '是否家庭成员:1是,2暂住亲友',
   medical           int(11)    NOT NULL DEFAULT 1                           COMMENT '是否就医:1否,1是',
   condition_status  int(11)    NOT NULL DEFAULT 0                           COMMENT '疑似情况:1咳嗽,2发烧,3腹泻,4胸痛,5咽痛,6其他 ',

whepi-ui/templates/yeweihui/ribao.ftl

@@ -7,13 +7,13 @@
     <div class="weui-tab">
         <div class="weui-navbar">
             <a class="weui-navbar__item weui-bar__item_on" target="#rb_nav1">
-                待报
+                待报<br/>
             </a>
             <a class="weui-navbar__item" target="#rb_nav2">
-                异常
+                异常<br/>
             </a>
             <a class="weui-navbar__item" target="#rb_nav3">
-                已报
+                已报<br/>
             </a>
         </div>
         <div class="weui-tab__panel">

whepi-web/src/main/resources/application-maoyunfeng.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: maoyunfeng
+    appID: wxbea97e58637cbdfb
+    appsecret: 0ad7671a4e60c1669ec16ddd0445dce3
+
+#    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://maoyunfeng.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