Merge branch 'dev' of 47.111.118.107:/srv/git/sdk into dev

Application/Sdk/Controller/BaseController.class.php

@@ -18,7 +18,7 @@ class BaseController extends RestController{
     protected $noToken = [
         'user_login', 'send_sms', 'verify_sms', 'forget_password',
         'init_sdk', 'device_record', 'force_update', 'thirdparty', 'get_customer_question',
-        'get_down_time'
+        'get_down_time', 'customer_contact'
     ];
 	// 不需要验证TOKEN的接口
 	protected $noNeedToken = [

Application/Sdk/Controller/UserController.class.php

@@ -2136,7 +2136,7 @@ class UserController extends BaseController
                 $data['age_status'] = 3;  // 未成年
             }
         } else {
-            $model = M('idcard', 'tab_')->where(['name' => $data['real_name'],'id_card' => $data['idcard']])->find();
+            $model = M('idcard_log', 'tab_')->where(['name' => $data['real_name'],'id_card' => $data['idcard']])->find();
             if(!empty($model)) {
                 if($model['status'] == 1) {
                     $data['age_status'] = is_adult($data['idcard']) ? 2 : 3;
@@ -2151,7 +2151,7 @@ class UserController extends BaseController
                 $arr['status'] = ($re == 1 || $re == 2 ) ? 1 : 0;
                 $arr['ip'] = get_client_ip();
                 $arr['create_time'] = time();
-                M('idcard', 'tab_')->data($arr)->add();
+                M('idcard_log', 'tab_')->data($arr)->add();
                 switch ($re) {
 
                     case - 1:

Data/update.sql

@@ -170,7 +170,7 @@ alter table `tab_giftbag` modify COLUMN `giftbag_version` tinyint(2) COMMENT '
 -- ----------------------------
 -- 2019-11-20 zyx
 -- ----------------------------
-CREATE TABLE `tab_idcard` (
+CREATE TABLE `tab_idcard_log` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(80) NOT NULL COMMENT '姓名',
   `id_card` varchar(20) NOT NULL COMMENT '身份证号码',