From e1d01590460cd584b497bba5bc4cd7c4c5ef0028 Mon Sep 17 00:00:00 2001
From: tsf <460834639@qq.com>
Date: Thu, 26 Sep 2024 20:20:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88=E5=AE=8C=E7=BB=93?=
 =?UTF-8?q?=EF=BC=88=E5=85=AC=E5=85=B1=E5=8D=A1=E7=89=87=EF=BC=8C=E5=BE=85?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=8C=E6=89=80=E6=9C=89=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/route.php                         |   6 +
 application/testapp/controller/Card.php       |  54 ++++----
 application/testapp/controller/Cardpublic.php | 128 ++++++++++++++----
 application/testapp/controller/Device.php     |  30 ++--
 application/testapp/controller/Index.php      |  60 ++++----
 application/testapp/controller/Login.php      |  22 +--
 .../testapp/controller/Myinformation.php      |  36 ++---
 .../testapp/controller/Pagingcontrast.php     |  80 +++++------
 application/testapp/controller/Skip.php       |  54 ++++----
 .../testapp/controller/Sportstesting.php      | 127 ++++++-----------
 .../testapp/controller/Vitalcapacity.php      |  40 +++---
 11 files changed, 334 insertions(+), 303 deletions(-)

diff --git a/application/route.php b/application/route.php
index bd97155..f90f371 100644
--- a/application/route.php
+++ b/application/route.php
@@ -287,6 +287,12 @@ Route::any('/testedition/data_contrast_obtain_data', 'testapp/cardpublic/data_co
 // 数据对比-对比数据
 // Route::any('/data_contrast_contrast_data', 'app/cardpublic/data_contrast_contrast_data');
 Route::any('/testedition/data_contrast_contrast_data', 'testapp/cardpublic/data_contrast_contrast_data');
+// 获取历史数据
+// Route::any('/obtain_history_record', 'app/cardpublic/obtain_history_record');
+Route::any('/testedition/obtain_history_record', 'testapp/cardpublic/obtain_history_record');
+// 删除历史数据
+// Route::any('/history_record_del', 'app/cardpublic/history_record_del');
+Route::any('/testedition/history_record_del', 'testapp/cardpublic/history_record_del');
 
 
 
diff --git a/application/testapp/controller/Card.php b/application/testapp/controller/Card.php
index cc867e2..c0a3621 100644
--- a/application/testapp/controller/Card.php
+++ b/application/testapp/controller/Card.php
@@ -9,7 +9,18 @@ use app\testapp\controller\Cardparts;
 class Card extends Base{
     
     protected $color = ['#FF5656','#FFAB00','#5AD06D','#6492F6','#3967D6'];
-    
+    protected $card_use_db_name = [
+        '1'=>'test_app_card_body_data',
+        '2'=>'test_app_user_data',
+        '3'=>'test_pc_bmistand',
+        '4'=>'test_pc_heightstand',
+        '5'=>'test_pc_weightstand',
+        '6'=>'test_pc_childrenprescription',
+        '7'=>'test_pc_childprescriptionbyage',
+        '8'=>'test_pc_heightstand2',
+        '9'=>'test_pc_weightstand2',
+        '10'=>'test_pc_bmistand2',
+    ];
     protected $age_limit = 16;
     protected $unit_symbol = ['score'=>'分','height'=>'CM','weight'=>'公斤','bmi'=>'','fat_r'=>'%','fat_w'=>'kg','muscle'=>'%','muscleval'=>'kg','water'=>'kg','bone'=>'kg','protein'=>'%','proteinval'=>'kg','kcal'=>'kcal','visceral'=>'','sfr'=>'%',];
     protected $unit_name = ['score'=>'身体得分','height'=>'身高','weight'=>'体重','bmi'=>'BMI','fat_r'=>'脂肪率','fat_w'=>'脂肪量','muscle'=>'肌肉率','muscleval'=>'肌肉量','water'=>'水分','bone'=>'骨重','protein'=>'蛋白率','proteinval'=>'蛋白量','kcal'=>'基础代谢','visceral'=>'内脏指数','sfr'=>'皮下脂肪','body_level'=>'肥胖等级','body_type'=>'身体类型'];
@@ -66,23 +77,6 @@ class Card extends Base{
         'weight'=>['value'=>3,'list'=>['低'=>1,'偏低'=>1,'标准'=>2,'偏高'=>3,'高'=>3]],
         'bmi'=>['value'=>2,'list'=>['消瘦'=>1,'正常'=>2,'偏重'=>3,'肥胖'=>4]],
     ];
-
-
-    protected $card_use_db_name = [
-        '1'=>'test_app_card_body_data',
-        '2'=>'test_app_user_data',
-        '3'=>'test_pc_bmistand',
-        '4'=>'test_pc_heightstand',
-        '5'=>'test_pc_weightstand',
-        '6'=>'test_pc_childrenprescription',
-        '7'=>'test_pc_childprescriptionbyage',
-        '8'=>'test_pc_heightstand2',
-        '9'=>'test_pc_weightstand2',
-        '10'=>'test_pc_bmistand2',
-    ];
-
-    
-
     ################################################################接口################################################################
     ################################################################接口################################################################
     ################################################################接口################################################################
@@ -99,9 +93,9 @@ class Card extends Base{
             return $this->msg(10001);
         }
         
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         return $this->get_user_body_data($data);
     }
@@ -114,9 +108,9 @@ class Card extends Base{
         if(!array_key_exists('aud_id', $data) || !array_key_exists('s_time', $data) || !array_key_exists('e_time', $data) || !array_key_exists('token', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         // $data['s_time'] = $data['s_time'].' 00:00:00';
         // $data['e_time'] = $data['e_time'].' 23:59:59';
@@ -136,9 +130,9 @@ class Card extends Base{
         if(!array_key_exists('aud_id', $data) || !array_key_exists('time', $data) || !array_key_exists('height', $data) || !array_key_exists('weight', $data) || !array_key_exists('token', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         $data['acd_id'] = '2';
         return $this->set_user_body_data($data);
@@ -179,9 +173,9 @@ class Card extends Base{
         if(!array_key_exists('aud_id', $data) || !array_key_exists('weight', $data) || !array_key_exists('type', $data) || !array_key_exists('time', $data) || !array_key_exists('token', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         
         return $this->modify_weight_action($data);
diff --git a/application/testapp/controller/Cardpublic.php b/application/testapp/controller/Cardpublic.php
index b440fd7..57f8854 100644
--- a/application/testapp/controller/Cardpublic.php
+++ b/application/testapp/controller/Cardpublic.php
@@ -22,19 +22,19 @@ class Cardpublic extends Base{
         ['min_val'=>'90','max_val'=>'150','text'=>'优秀','color'=>'#6691EF'],
     ];
 
-    // 示意接口
-    public function card_curve_chart($data = ['aud_id'=>'83','s_time'=>'2024-04-01','e_time'=>'2024-07-25','token'=>'caadd1be045a65f30b92aa805f1de54a']){
-        if(count(input('post.')) > 0){
-            $data = input('post.');
-        }
-        if(!array_key_exists('aud_id', $data) || !array_key_exists('s_time', $data) || !array_key_exists('e_time', $data) || !array_key_exists('token', $data)){
-            return $this->msg(10001);
-        }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
-        unset($data['token']);
-    }
+    // // 示意接口
+    // public function card_curve_chart($data = ['aud_id'=>'83','s_time'=>'2024-04-01','e_time'=>'2024-07-25','token'=>'caadd1be045a65f30b92aa805f1de54a']){
+    //     if(count(input('post.')) > 0){
+    //         $data = input('post.');
+    //     }
+    //     if(!array_key_exists('aud_id', $data) || !array_key_exists('s_time', $data) || !array_key_exists('e_time', $data) || !array_key_exists('token', $data)){
+    //         return $this->msg(10001);
+    //     }
+    //     // if($this->token_time_validate($data['token']) === false){
+    //     //     return $this->msg(20001);
+    //     // }
+    //     unset($data['token']);
+    // }
     // 获取卡片数据
     public function get_card_content($data = ['aud_id'=>'83','acd_id'=>'10','token'=>'caadd1be045a65f30b92aa805f1de54a']){
         if(count(input('post.')) > 0){
@@ -43,9 +43,9 @@ class Cardpublic extends Base{
         if(!array_key_exists('aud_id', $data) || !array_key_exists('acd_id', $data) || !array_key_exists('token', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         // dump(111);
         // die;
         return $this->get_card_content_action($data);
@@ -59,9 +59,9 @@ class Cardpublic extends Base{
         if(!array_key_exists('aud_id', $data) || !array_key_exists('acd_id', $data) || !array_key_exists('name', $data) || !array_key_exists('data', $data) || !array_key_exists('record_time', $data) || !array_key_exists('token', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
 
         return $this->data_save_action($data);
     }
@@ -74,9 +74,9 @@ class Cardpublic extends Base{
         if(!array_key_exists('aud_id', $data) || !array_key_exists('token', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         return $this->get_label_list_action($data);
     }
 
@@ -88,9 +88,9 @@ class Cardpublic extends Base{
         if(!array_key_exists('aud_id', $data) || !array_key_exists('s_time', $data) || !array_key_exists('e_time', $data) || !array_key_exists('token', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         return $this->card_motion_curve_action($data);
     }
 
@@ -114,6 +114,26 @@ class Cardpublic extends Base{
         }
         return $this->data_contrast_contrast_data_action($data);
     }
+    // 历史记录
+    public function obtain_history_record($data = ['aud_id'=>'1','acd_id'=>'10','name'=>'1000米','page'=>'1']){
+        if(count(input('post.')) > 0){
+            $data = input('post.');
+        }
+        if(!array_key_exists('aud_id', $data) || !array_key_exists('acd_id', $data) || !array_key_exists('name', $data)){
+            return $this->msg(10001);
+        }
+        return $this->obtain_history_record_action($data);
+    }
+    // 历史记录
+    public function history_record_del($data = ['id'=>'10']){
+        if(count(input('post.')) > 0){
+            $data = input('post.');
+        }
+        if(!array_key_exists('id', $data)){
+            return $this->msg(10001);
+        }
+        return $this->history_record_del_action($data);
+    }
     // 获取手动记录内容
     public function obtain_manual_record_content($data = ['aud_id'=>1]){
         if(count(input('post.')) > 0){
@@ -165,6 +185,10 @@ class Cardpublic extends Base{
         }else if($user_data['gender'] == 2){
             unset($card_data[2]['list'][0]);//1000米
         }
+        foreach ($card_data as $key => $value) {
+            $card_data[$key]['list'] = array_values($card_data[$key]['list']);
+        }
+        
         return $this->msg($card_data);
     }
 
@@ -465,6 +489,60 @@ class Cardpublic extends Base{
         
         dump($card_data);
     }
+    ##################################################obtain_history_record##################################################
+    public function obtain_history_record_action($data){
+        $card_data = Db::table($this->cardpublic_use_db_name['2'])->where(['acd_id'=>$data['acd_id'],'name'=>$data['name']])->find();
+        $result_count = Db::table($this->cardpublic_use_db_name['3'])
+        ->where(['aud_id'=>$data['aud_id'],'acdsi_id'=>$card_data['id']])
+        ->count();
+        $result_data = Db::table($this->cardpublic_use_db_name['3'])
+        ->where(['aud_id'=>$data['aud_id'],'acdsi_id'=>$card_data['id']])
+        ->field('id,achievement,score,unit,record_time')
+        ->order('record_time desc')
+        ->page($data['page'].",10")
+        ->select();
+
+        $return_data = [
+            'totalrows'=>$result_count,
+            'rows'=>[],
+            'pagenow'=>$data['page'],
+            'pagesize'=>10,
+            'totalpage'=>ceil($result_count/10),
+        ];
+        foreach ($result_data as $key => $value) {
+            $temporary_arr = [];
+            if($value['unit'] == '分/秒'){
+                $temporary_arr_e1 = explode(':', $value['achievement']);
+                $temporary_arr_e2 = explode('/', $value['unit']);
+            }
+            $temporary_arr = [
+                "id"=> $value['id'],
+                // "v1"=> $value['achievement'].$value['unit'],
+                "v1"=> $value['unit'] == '分/秒'?$temporary_arr_e1[0].$temporary_arr_e2[0].$temporary_arr_e1[1].$temporary_arr_e2[1]:$value['achievement'].$value['unit'],
+                "v2"=> $value['score'].'分',
+                "v1_name"=> "成绩",
+                "v2_name"=> "得分",
+                "record_time"=> $value['record_time']
+            ];
+            array_push($return_data['rows'],$temporary_arr);
+        }
+        
+        return $this->msg($return_data);
+    }
+    ##################################################history_record_del##################################################
+    public function history_record_del_action($data){
+        $result_count = Db::table($this->cardpublic_use_db_name['3'])
+        ->where(['id'=>$data['id']])
+        ->update(['is_del'=>1]);
+        if($result_count){
+            return $this->msg([]);
+        }else{
+            return $this->msg(10002);
+        }
+    }
+
+    
+    
     
     
 
diff --git a/application/testapp/controller/Device.php b/application/testapp/controller/Device.php
index feca712..5360e62 100644
--- a/application/testapp/controller/Device.php
+++ b/application/testapp/controller/Device.php
@@ -28,9 +28,9 @@ class Device extends Base{
         if(!array_key_exists('token', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         return $this->device_data_list_action($data);
     }
@@ -43,9 +43,9 @@ class Device extends Base{
         if(!array_key_exists('token', $data) || !array_key_exists('device_id', $data) || !array_key_exists('device_mac', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         // unset($data['token']);
         return $this->device_binding_action($data);
     }
@@ -57,9 +57,9 @@ class Device extends Base{
         if(!array_key_exists('token', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         // unset($data['token']);
         return $this->device_user_data_list_action($data);
     }
@@ -71,9 +71,9 @@ class Device extends Base{
         if(!array_key_exists('token', $data) || !array_key_exists('id', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         // unset($data['token']);
         return $this->device_unbinding_action($data);
     }
@@ -87,9 +87,9 @@ class Device extends Base{
             return $this->msg(10001);
         }
         
-         if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         return $this->device_mac_get_content_action($data);
     }
     
diff --git a/application/testapp/controller/Index.php b/application/testapp/controller/Index.php
index 9fa312b..b2392a7 100644
--- a/application/testapp/controller/Index.php
+++ b/application/testapp/controller/Index.php
@@ -73,8 +73,6 @@ class Index extends Base{
             $version = '';
             $url = '';
         }
-        // dump(cache(null));
-        // die;
         if($this->token_time_validate($data['token']) === false){
             return $this->msg(-1,'未登录',['version'=>$version,'url'=>$url]);
         }else{
@@ -91,9 +89,9 @@ class Index extends Base{
         if(!array_key_exists('token', $data)){ 
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         $verify_result = $this->verify_parameters($data,'register');
         if(!is_array($verify_result)){
@@ -114,9 +112,9 @@ class Index extends Base{
         if(!array_key_exists('token', $data)){ 
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         $verify_result = $this->verify_parameters2($data,'update');
         if(!is_array($verify_result)){
@@ -140,9 +138,9 @@ class Index extends Base{
         if(!array_key_exists('id', $data) || !array_key_exists('token', $data)){ 
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         $result = Db::table($this->index_use_db_name['2'])->where(['id'=>$data['id']])->update(['is_del'=>1]);
         if($result){
@@ -163,9 +161,9 @@ class Index extends Base{
             return $this->msg(10001);
         }
         
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         $result = Db::table($this->index_use_db_name['2'])->where(['aan_id'=>$data['aan_id'],'is_del'=>0])->select();
         $temporary_data = [];
@@ -183,18 +181,18 @@ class Index extends Base{
     }
 
     // 获取指定用户详细信息
-    public function get_user_data_information($data = ['aud_id'=>1,'token'=>'57bd45e3a963b372ea2d873e4bd8d1f8']){
+    public function get_user_data_information($data = ['aud_id'=>3]){
         if(count(input('post.')) > 0){
             $data = input('post.');
         }
         
-        if(!array_key_exists('token', $data) || !array_key_exists('aud_id', $data)){ 
+        if(!array_key_exists('aud_id', $data)){ 
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
-        unset($data['token']);
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
+        // unset($data['token']);
         // 获取用户信息
         $result = Db::table($this->index_use_db_name['2'])->where(['id'=>$data['aud_id']])->field('id,aan_id,nickname,head_pic,birthday,gender,card_order,target_weight,initial_weight,initial_date,weight')->find();
         // 获取用户身体卡片信息
@@ -275,9 +273,9 @@ class Index extends Base{
         if(!array_key_exists('token', $data)){ 
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         $user_card_list = Db::table($this->index_use_db_name['2'])->where(['id'=>$data['aud_id'],'is_del'=>0])->field('id,card_order')->find();
         // dump($user_card_list);
@@ -310,9 +308,9 @@ class Index extends Base{
         if(!array_key_exists('aud_id', $data) || !array_key_exists('card_order', $data) || !array_key_exists('token', $data)){ 
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         if(!$this->is_num_array(explode(',',$data['card_order']))){
             return $this->msg(10001,'数据内参数格式或值错误');
@@ -332,9 +330,9 @@ class Index extends Base{
         if(!array_key_exists('token', $data)){ 
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
 
         return $this->msg($this->grade_list);
         
@@ -349,8 +347,10 @@ class Index extends Base{
         foreach ($data['card_order'] as $key => $value) {
             $db_arr[$value] =  Db::table($this->db_name[$value])->where(['aud_id'=>$aud_id,'is_del'=>'0'])->order('record_time desc')->limit(1)->select();
             
-            if($value >= 10){
+            if($value >= 10 && count($db_arr[$value]) > 0){
+                // dump($value);
                 // dump($db_arr[$value]);
+                // dump($db_arr);
                 $temporary_data = Db::table($this->index_use_db_name['8'])->where(['id'=>$db_arr[$value][0]['acdsi_id']])->field('id,name')->find();
                 $db_arr[$value][0]['acdsi_name'] = $temporary_data['name'];
             }
diff --git a/application/testapp/controller/Login.php b/application/testapp/controller/Login.php
index 1c9f948..39b1675 100644
--- a/application/testapp/controller/Login.php
+++ b/application/testapp/controller/Login.php
@@ -11,7 +11,9 @@ class Login extends Base{
     protected $code_time = 50;
     // protected $token_time = 2592000;//30天的秒数
     protected $default_head_pic = 'http://tc.pcxbc.com/tsf/head_pic.png';
-
+    protected $login_use_db_name = [
+        '1'=>'test_app_account_number',
+    ];
     
     ################################################################接口################################################################
     ################################################################接口################################################################
@@ -37,7 +39,7 @@ class Login extends Base{
             return $this->msg(10005);
         }
         // 查询账号是否已经注册
-        $inspect_repeat = Db::table('test_app_account_number')->where([$montage_data=>$data['data'],'is_del'=>0])->count();
+        $inspect_repeat = Db::table($this->login_use_db_name['1'])->where([$montage_data=>$data['data'],'is_del'=>0])->count();
         if($inspect_repeat >= 0){
             return $this->msg(10002,'注册失败，账号已存在');
         }
@@ -58,7 +60,7 @@ class Login extends Base{
         $set_data['nickname'] = '用户'.time();
         $set_data['create_time'] = date('Y-m-d H:i:s');
         $set_data['token'] = md5($data['data'].$this->create_random_string(12).time());
-        $result = Db::table('test_app_account_number')->insertGetId($set_data);
+        $result = Db::table($this->login_use_db_name['1'])->insertGetId($set_data);
         if($result){
             cache($set_data['token'],date('Y-m-d H:i:s'),$this->token_time);
             return $this->msg(['token'=>$set_data['token'],'aan_id'=>$result]);
@@ -93,11 +95,11 @@ class Login extends Base{
             return $this->msg(10003,'账号格式错误');
         }
         // 检查账号是否存在
-        $find_data = Db::table('test_app_account_number')->where([$t_y=>$data['data'],'is_del'=>0])->field('id,token')->find();
+        $find_data = Db::table($this->login_use_db_name['1'])->where([$t_y=>$data['data'],'is_del'=>0])->field('id,token')->find();
         if(!$find_data){
             return $this->msg(10003);
         }
-        $result = Db::table('test_app_account_number')->where([$t_y=>$data['data']])->update(['password'=>$data['password']]);
+        $result = Db::table($this->login_use_db_name['1'])->where([$t_y=>$data['data']])->update(['password'=>$data['password']]);
         if($result){
             
             cache($find_data['token'],date('Y-m-d H:i:s'),$this->token_time);
@@ -128,7 +130,7 @@ class Login extends Base{
         if($data['validate_type'] == 'code'){
             $code_name = $data['data'];
             if($this->check_code($code_name,$data['validate_data']) === true){
-                $result = Db::table('test_app_account_number')->where($verify_result)->field('id,token')->find();
+                $result = Db::table($this->login_use_db_name['1'])->where($verify_result)->field('id,token')->find();
                 if($result){
                     
                     cache($result['token'],date('Y-m-d H:i:s'),$this->token_time);
@@ -140,7 +142,7 @@ class Login extends Base{
                     $set_data['nickname'] = '用户'.$data['data'];
                     $set_data['create_time'] = date('Y-m-d H:i:s');
                     $set_data['token'] = md5($data['data'].$this->create_random_string(12).time());
-                    $result = Db::table('test_app_account_number')->insertGetId($set_data);
+                    $result = Db::table($this->login_use_db_name['1'])->insertGetId($set_data);
                     if($result){
                         
                         cache($set_data['token'],date('Y-m-d H:i:s'),$this->token_time);
@@ -154,7 +156,7 @@ class Login extends Base{
             }
         }else if($data['validate_type'] == 'password'){
             // $verify_result['password'] = $data['validate_data'];
-            $result = Db::table('test_app_account_number')->where($verify_result)->field('id,token,password')->find();
+            $result = Db::table($this->login_use_db_name['1'])->where($verify_result)->field('id,token,password')->find();
             if($result){
                 if($result['password'] == ''){
                     return $this->msg(10003,'该账户未设密码，请用验证码登录');
@@ -197,9 +199,9 @@ class Login extends Base{
         if(!array_key_exists('token', $data)){ 
             return $this->msg(10001);
         }
-        $result = Db::table('test_app_account_number')->where(['token'=>$data['token']])->update(['is_del'=>1]);
-        cache($data['token'], NULL);
+        $result = Db::table($this->login_use_db_name['1'])->where(['token'=>$data['token']])->update(['is_del'=>1]);
         if($result){
+            cache($data['token'], NULL);
             return $this->msg([]);
         }else{
             return $this->msg(10002);
diff --git a/application/testapp/controller/Myinformation.php b/application/testapp/controller/Myinformation.php
index ba31ea0..cb5806b 100644
--- a/application/testapp/controller/Myinformation.php
+++ b/application/testapp/controller/Myinformation.php
@@ -8,7 +8,9 @@ use app\testapp\controller\Login;
 
 class Myinformation extends Base{
     
-    
+    protected $myinformation_use_db_name = [
+        '1'=>'test_app_account_number',
+    ];
     // 加 bcadd(,,20)
     // 减 bcsub(,,20)
     // 乘 bcmul(,,20)
@@ -25,9 +27,9 @@ class Myinformation extends Base{
         if(!array_key_exists('token', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         // unset($data['token']);
         
         return $this->get_my_account_msg_action($data);
@@ -40,9 +42,9 @@ class Myinformation extends Base{
         if(!array_key_exists('nickname', $data) || !array_key_exists('token', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         // unset($data['token']);
         
         return $this->update_my_nickname_action($data);
@@ -55,9 +57,9 @@ class Myinformation extends Base{
         if(!array_key_exists('data', $data) || !array_key_exists('token', $data) || !array_key_exists('code', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         // unset($data['token']);
         
         return $this->update_my_account_msg_action($data);
@@ -71,9 +73,9 @@ class Myinformation extends Base{
         if(!array_key_exists('password', $data) || !array_key_exists('c_password', $data) || !array_key_exists('token', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         // unset($data['token']);
         return $this->update_my_password_action($data);
     }
@@ -81,7 +83,7 @@ class Myinformation extends Base{
     ################################################################业务################################################################
     ################################################################get_my_account_msg
     public function get_my_account_msg_action($data){
-        $result = Db::table('test_app_account_number')->where(['token'=>$data['token'],'is_del'=>0])->find();
+        $result = Db::table($this->myinformation_use_db_name['1'])->where(['token'=>$data['token'],'is_del'=>0])->find();
         if($result){
             return $this->msg([
                 'my_tel'=>$result['tel'],
@@ -98,7 +100,7 @@ class Myinformation extends Base{
     }
     ################################################################update_my_nickname
     public function update_my_nickname_action($data){
-        $result = Db::table('test_app_account_number')->where(['token'=>$data['token'],'is_del'=>0])->update([
+        $result = Db::table($this->myinformation_use_db_name['1'])->where(['token'=>$data['token'],'is_del'=>0])->update([
             'nickname'=>$data['nickname'],
             'update_time'=>date('Y-m-d H:i:s')
         ]);
@@ -121,7 +123,7 @@ class Myinformation extends Base{
         }
         // dump($data);
         // die;
-        $result = Db::table('test_app_account_number')->where(['token'=>$data['token'],'is_del'=>0])->update([
+        $result = Db::table($this->myinformation_use_db_name['1'])->where(['token'=>$data['token'],'is_del'=>0])->update([
             $montage_data=>$data['data'],
             'update_time'=>date('Y-m-d H:i:s')
         ]);
@@ -139,7 +141,7 @@ class Myinformation extends Base{
         if($data['password'] == ''){
             return $this->msg(10003,'密码不能为空');
         }
-        $result = Db::table('test_app_account_number')->where(['token'=>$data['token'],'is_del'=>0])->update([
+        $result = Db::table($this->myinformation_use_db_name['1'])->where(['token'=>$data['token'],'is_del'=>0])->update([
             'password'=>$data['password'],
             'update_time'=>date('Y-m-d H:i:s')
         ]);
diff --git a/application/testapp/controller/Pagingcontrast.php b/application/testapp/controller/Pagingcontrast.php
index 6b8a0b6..c8d5fb6 100644
--- a/application/testapp/controller/Pagingcontrast.php
+++ b/application/testapp/controller/Pagingcontrast.php
@@ -8,14 +8,18 @@ class Pagingcontrast extends Base{
     
     protected $color = ['#FF5656','#FFAB00','#5AD06D','#6492F6','#3967D6'];
     protected $db_name = ['2'=>'test_app_card_body_data','6'=>'test_app_card_skip_data','8'=>'test_app_card_vitalcapacity_data'];
+    protected $pagingcontrast_use_db_name = [
+        '1'=>'test_app_card_body_data',
+        '2'=>'test_app_card_skip_data',
+        '3'=>'test_app_card_vitalcapacity_data',
+        '4'=>'test_app_user_data',
+    ];
     protected $request_result = [
         '2'=>['height'=>['身高','cm'],'weight'=>['体重','kg'],'age'=>['年龄','岁'],'bmi'=>['BMI',''],'fat_w'=>['脂肪量','kg'],'fat_r'=>['脂肪率','%'],'muscleval'=>['肌肉量','kg'],'muscle'=>['肌肉率','%'],'proteinval'=>['蛋白量','kg'],'protein'=>['蛋白率','%'],'water'=>['水分',''],'bone'=>['骨重','kg'],'visceral'=>['内脏指数',''],'sfr'=>['皮下脂肪','%'],'kcal'=>['基础代谢','kcal'],'un_fat_w_weight'=>['去脂体重','kg'],'body_age'=>['体龄',''],'body_level'=>['肥胖等级',''],'body_type'=>['体型','']],
         '6'=>['jump_num'=>['个数',''],'jump_time'=>['时长',''],'jump_kcal'=>['卡路里','kcal']],
         '8'=>['one_val'=>['第一次','ml'],'two_val'=>['第二次','ml'],'three_val'=>['第三次','ml'],'average_val'=>['三次平均','ml'],'score'=>['最后成绩','分']]
     ];
-
     protected $pagesize = 10;
-
     ################################################请求接口################################################
     ################################################请求接口################################################
     ################################################请求接口################################################
@@ -27,9 +31,9 @@ class Pagingcontrast extends Base{
         if(!array_key_exists('aud_id', $data) || !array_key_exists('s_time', $data) || !array_key_exists('e_time', $data) || !array_key_exists('token', $data) || !array_key_exists('type', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         if(array_key_exists($data['type'],$this->db_name)){
             return $this->jump_transfer_interface_record($data,'group');
@@ -45,9 +49,9 @@ class Pagingcontrast extends Base{
         if(!array_key_exists('aud_id', $data) || !array_key_exists('page', $data) || !array_key_exists('token', $data) || !array_key_exists('type', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         if(array_key_exists($data['type'],$this->db_name)){
             return $this->jump_transfer_interface_record($data,'page');
@@ -63,9 +67,9 @@ class Pagingcontrast extends Base{
         if(!array_key_exists('id', $data) || !array_key_exists('type', $data) || !array_key_exists('token', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         
         return $this->jump_transfer_interface_detailed($data);
@@ -78,13 +82,10 @@ class Pagingcontrast extends Base{
         if(!array_key_exists('before_id', $data) || !array_key_exists('after_id', $data) || !array_key_exists('type', $data) || !array_key_exists('token', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
-        // $data = explode(',',$data['id_arr']);
-        // dump($data);
-        // die;
         return $this->jump_transfer_interface_data_contrast($data);
     }
     // 删除历史数据
@@ -95,9 +96,9 @@ class Pagingcontrast extends Base{
         if(!array_key_exists('id', $data) || !array_key_exists('type', $data) || !array_key_exists('token', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         $user_data = Db::table($this->db_name[$data['type']])->where(['id'=>$data['id']])->update(['is_del'=>1]);
         if($user_data){
@@ -121,15 +122,6 @@ class Pagingcontrast extends Base{
     }
     public function jump_transfer_interface_detailed($data){
         return $this->get_all_detaile_data_msg($data);
-        
-        // if($data['type'] == '2'){
-        //     return $this->get_body_detaile_data_msg($data);
-        // }else if($data['type'] == '6'){
-        //     return $this->get_skip_detaile_data_msg($data);
-        //     // return $this->msg(10005);
-        // }else if($data['type'] == '8'){
-        //     // return $this->get_body_record_data($data,$str);
-        // }
     }
     public function jump_transfer_interface_data_contrast($data){
         if($data['type'] == '2'){
@@ -160,7 +152,7 @@ class Pagingcontrast extends Base{
             height_val as v1,
             weight_val as v2,
             bmi_val as v3
-            from test_app_card_body_data 
+            from ".$this->pagingcontrast_use_db_name['1']." 
             where aud_id='".$data['aud_id']."'
             and record_time between '".$data['s_time']."' and '".$data['e_time']."' 
             and is_del = 0
@@ -179,8 +171,8 @@ class Pagingcontrast extends Base{
                 ]);
             }
         }else{
-            $result = Db::table('test_app_card_body_data')->where(['aud_id'=>$data['aud_id'],'is_del'=>0])->field("id,record_time,REPLACE(record_time, '-', '-') AS b_time,height_val,weight_val,bmi_val")->order('record_time desc')->page($data['page'],$this->pagesize)->select();
-            $return_result['totalrows'] = Db::table('test_app_card_body_data')->where(['aud_id'=>$data['aud_id']])->count();
+            $result = Db::table($this->pagingcontrast_use_db_name['1'])->where(['aud_id'=>$data['aud_id'],'is_del'=>0])->field("id,record_time,REPLACE(record_time, '-', '-') AS b_time,height_val,weight_val,bmi_val")->order('record_time desc')->page($data['page'],$this->pagesize)->select();
+            $return_result['totalrows'] = Db::table($this->pagingcontrast_use_db_name['1'])->where(['aud_id'=>$data['aud_id']])->count();
             $return_result['rows'] = [];
             $return_result['pageno'] = $data['page'];
             $return_result['pagesize'] = $this->pagesize;
@@ -216,7 +208,7 @@ class Pagingcontrast extends Base{
             jump_num as v1,
             jump_time as v2,
             jump_kcal as v3
-            from test_app_card_skip_data 
+            from ".$this->pagingcontrast_use_db_name['2']." 
             where aud_id='".$data['aud_id']."'
             and record_time between '".$data['s_time']."' and '".$data['e_time']."' 
             and is_del = 0
@@ -236,8 +228,8 @@ class Pagingcontrast extends Base{
                 ]);
             }
         }else{
-            $result = Db::table('test_app_card_skip_data')->where(['aud_id'=>$data['aud_id'],'is_del'=>0])->field("id,record_time,REPLACE(record_time, '-', '-') AS b_time,jump_num,jump_time,jump_kcal")->order('record_time desc')->page($data['page'],$this->pagesize)->select();
-            $return_result['totalrows'] = Db::table('test_app_card_skip_data')->where(['aud_id'=>$data['aud_id']])->count();
+            $result = Db::table($this->pagingcontrast_use_db_name['2'])->where(['aud_id'=>$data['aud_id'],'is_del'=>0])->field("id,record_time,REPLACE(record_time, '-', '-') AS b_time,jump_num,jump_time,jump_kcal")->order('record_time desc')->page($data['page'],$this->pagesize)->select();
+            $return_result['totalrows'] = Db::table($this->pagingcontrast_use_db_name['2'])->where(['aud_id'=>$data['aud_id']])->count();
             $return_result['rows'] = [];
             $return_result['pageno'] = $data['page'];
             $return_result['pagesize'] = $this->pagesize;
@@ -276,7 +268,7 @@ class Pagingcontrast extends Base{
             three_val as v3,
             average_val as v4,
             score as v5
-            from test_app_card_vitalcapacity_data 
+            from ".$this->pagingcontrast_use_db_name['3']." 
             where aud_id='".$data['aud_id']."'
             and record_time between '".$data['s_time']."' and '".$data['e_time']."' 
             and is_del = 0
@@ -300,8 +292,8 @@ class Pagingcontrast extends Base{
                 ]);
             }
         }else{
-            $result = Db::table('test_app_card_vitalcapacity_data')->where(['aud_id'=>$data['aud_id'],'is_del'=>0])->field("id,record_time,REPLACE(record_time, '-', '-') AS b_time,one_val,two_val,three_val,average_val,score")->order('record_time desc')->page($data['page'],$this->pagesize)->select();
-            $return_result['totalrows'] = Db::table('test_app_card_vitalcapacity_data')->where(['aud_id'=>$data['aud_id']])->count();
+            $result = Db::table($this->pagingcontrast_use_db_name['3'])->where(['aud_id'=>$data['aud_id'],'is_del'=>0])->field("id,record_time,REPLACE(record_time, '-', '-') AS b_time,one_val,two_val,three_val,average_val,score")->order('record_time desc')->page($data['page'],$this->pagesize)->select();
+            $return_result['totalrows'] = Db::table($this->pagingcontrast_use_db_name['3'])->where(['aud_id'=>$data['aud_id']])->count();
             $return_result['rows'] = [];
             $return_result['pageno'] = $data['page'];
             $return_result['pagesize'] = $this->pagesize;
@@ -385,8 +377,8 @@ class Pagingcontrast extends Base{
         aud.gender,
         aud.birthday,
         aud.head_pic
-        from test_app_card_body_data as acbd
-        left join test_app_user_data as aud on acbd.aud_id=aud.id  
+        from ".$this->pagingcontrast_use_db_name['1']." as acbd
+        left join ".$this->pagingcontrast_use_db_name['4']." as aud on acbd.aud_id=aud.id  
         where acbd.id in ($data3)
         and acbd.is_del = 0
         ");
@@ -459,8 +451,8 @@ class Pagingcontrast extends Base{
         aud.gender,
         aud.birthday,
         aud.head_pic
-        from test_app_card_skip_data as acsd
-        left join test_app_user_data as aud on acsd.aud_id=aud.id  
+        from ".$this->pagingcontrast_use_db_name['2']." as acsd
+        left join ".$this->pagingcontrast_use_db_name['4']." as aud on acsd.aud_id=aud.id  
         where acsd.id in ($data3)
         and acsd.is_del = 0
         ");
@@ -539,8 +531,8 @@ class Pagingcontrast extends Base{
         aud.gender,
         aud.birthday,
         aud.head_pic
-        from test_app_card_vitalcapacity_data as acsd
-        left join test_app_user_data as aud on acsd.aud_id=aud.id  
+        from ".$this->pagingcontrast_use_db_name['3']." as acsd
+        left join ".$this->pagingcontrast_use_db_name['4']." as aud on acsd.aud_id=aud.id  
         where acsd.id in ($data3)
         and acsd.is_del = 0
         ");
diff --git a/application/testapp/controller/Skip.php b/application/testapp/controller/Skip.php
index 1bfd9a3..15606ff 100644
--- a/application/testapp/controller/Skip.php
+++ b/application/testapp/controller/Skip.php
@@ -8,7 +8,11 @@ class Skip extends Base{
     
     protected $color = ['#FF5656','#FFAB00','#5AD06D','#6492F6','#3967D6'];
     protected $curve_data_format = ['jump_num'=>['跳绳个数','个数/个','#009DFF'],'jump_time'=>['跳绳时长','时长/分','#009DFF'],'jump_kcal'=>['消耗卡路里','卡路里/kcal','#009DFF']];
-    
+    protected $skip_use_db_name = [
+        '1'=>'test_app_card_skip_data',
+        '2'=>'test_app_user_data',
+        '3'=>'test_app_card_body_data',
+    ];
     protected $result_end_data_mould = [
         'name'=>'',
         'value'=>'',
@@ -47,9 +51,9 @@ class Skip extends Base{
         if(abs($data['time_s']) >= 60){
             return $this->msg(10005,'秒钟值不能大于60');
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         if($this->validate_user_identity($data['aud_id']) === false){
             return $this->msg(10003);
@@ -74,9 +78,9 @@ class Skip extends Base{
         if(abs($data['time_s']) >= 60){
             return $this->msg(10005,'秒钟值不能大于60');
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         if($this->validate_user_identity($data['aud_id']) === false){
             return $this->msg(10003);
@@ -91,9 +95,9 @@ class Skip extends Base{
         if(!array_key_exists('aud_id', $data) || !array_key_exists('token', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         // dump($data);
         // die;
@@ -107,9 +111,9 @@ class Skip extends Base{
         if(!array_key_exists('aud_id', $data) || !array_key_exists('time', $data) || !array_key_exists('token', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         return $this->skip_curve_chart_action($data);
     }
@@ -121,11 +125,11 @@ class Skip extends Base{
         if(!array_key_exists('id', $data) || !array_key_exists('token', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
-        $user_data = Db::table('test_app_card_skip_data')->where(['id'=>$data['id']])->update(['is_del'=>1]);
+        $user_data = Db::table($this->skip_use_db_name['1'])->where(['id'=>$data['id']])->update(['is_del'=>1]);
         if($user_data){
             return $this->msg([]);
         }else{
@@ -139,14 +143,14 @@ class Skip extends Base{
     public function skip_manual_recording_action($data){
         // 分秒转换为秒
         $data['time'] = abs($data['time_m'])*60+abs($data['time_s']);
-        $user_msg_content = Db::table('test_app_user_data')->where(['id'=>$data['aud_id']])->count();
+        $user_msg_content = Db::table($this->skip_use_db_name['2'])->where(['id'=>$data['aud_id']])->count();
         if($user_msg_content<=0){
             return $this->msg(10004);
         }
         if(!array_key_exists('kcal', $data)){
-            $last_data_body = Db::table('test_app_card_body_data')->where(['aud_id'=>$data['aud_id'],'is_del'=>0])->order('record_time desc,id desc')->field('id,weight_val,record_time')->find();
+            $last_data_body = Db::table($this->skip_use_db_name['3'])->where(['aud_id'=>$data['aud_id'],'is_del'=>0])->order('record_time desc,id desc')->field('id,weight_val,record_time')->find();
             if(!$last_data_body){
-                $last_data_body = Db::table('test_app_user_data')->where(['id'=>$data['aud_id']])->field('id,weight as weight_val')->find();
+                $last_data_body = Db::table($this->skip_use_db_name['2'])->where(['id'=>$data['aud_id']])->field('id,weight as weight_val')->find();
                 if(!$last_data_body){
                     return $this->msg(10004);
                 }
@@ -178,13 +182,13 @@ class Skip extends Base{
         if(strlen($data_set['record_time']) <= 12){
             $data_set['record_time'] = $this->addCurrentTimeToDateString($data_set['record_time']);
         }
-        $last_data_body = Db::table('test_app_card_skip_data')->insert($data_set);
+        $last_data_body = Db::table($this->skip_use_db_name['1'])->insert($data_set);
         $result = [
             'today_jump_num'=>0,
             'today_jump_time'=>0,
             'today_jump_kcal'=>0,
         ];
-        $all_data = Db::table('test_app_card_skip_data')->where(['aud_id'=>$data['aud_id']])->whereTime('record_time','today')->field('jump_num,jump_time,jump_kcal')->select();
+        $all_data = Db::table($this->skip_use_db_name['1'])->where(['aud_id'=>$data['aud_id']])->whereTime('record_time','today')->field('jump_num,jump_time,jump_kcal')->select();
         foreach ($all_data as $key => $value) {
             $result['today_jump_num'] = $result['today_jump_num']+$value['jump_num'];
             $result['today_jump_time'] = $result['today_jump_time']+$value['jump_time'];
@@ -203,8 +207,8 @@ class Skip extends Base{
     }
     ################################################################skip_today_data
     public function skip_today_data_action($data){
-        $all_data = Db::table('test_app_card_skip_data')->where(['aud_id'=>$data['aud_id']])->whereTime('record_time','today')->field('jump_num,jump_time,jump_kcal')->select();
-        $last_data = Db::table('test_app_card_skip_data')->where(['aud_id'=>$data['aud_id']])->order('record_time desc,id desc')->field('id,jump_num,jump_time,jump_kcal,record_time')->find();
+        $all_data = Db::table($this->skip_use_db_name['1'])->where(['aud_id'=>$data['aud_id']])->whereTime('record_time','today')->field('jump_num,jump_time,jump_kcal')->select();
+        $last_data = Db::table($this->skip_use_db_name['1'])->where(['aud_id'=>$data['aud_id']])->order('record_time desc,id desc')->field('id,jump_num,jump_time,jump_kcal,record_time')->find();
         $result = [
             'today_jump_num'=>0,
             'today_jump_time'=>0,
@@ -260,7 +264,7 @@ class Skip extends Base{
         }  
   
         // 使用查询构造器进行查询  
-        $result = Db::name('test_app_card_skip_data')->where($map)->field('jump_num,jump_time,jump_kcal,aud_id,record_time,jump_type,DATEPART(hour, record_time) AS hour,DATEPART(minute, record_time) AS minute,DATEPART(day, record_time) AS day,DATEPART(month, record_time) AS month')->order('record_time')->select();
+        $result = Db::name($this->skip_use_db_name['1'])->where($map)->field('jump_num,jump_time,jump_kcal,aud_id,record_time,jump_type,DATEPART(hour, record_time) AS hour,DATEPART(minute, record_time) AS minute,DATEPART(day, record_time) AS day,DATEPART(month, record_time) AS month')->order('record_time')->select();
         // dump($result);
         // die;
         $return_data = [];
diff --git a/application/testapp/controller/Sportstesting.php b/application/testapp/controller/Sportstesting.php
index c57616a..d1165c8 100644
--- a/application/testapp/controller/Sportstesting.php
+++ b/application/testapp/controller/Sportstesting.php
@@ -10,6 +10,11 @@ use Exception;
 class Sportstesting extends Base{
     
     protected $color = ['#FF5656','#FF5656','#5AD06D','#6492F6','#3967D6'];
+    protected $sportstesting_use_db_name = [
+        '1'=>'test_admin_estimate',
+        '2'=>'test_app_sportstesting_data',
+        '3'=>'test_app_user_data',
+    ];
     protected $page_num = 10;
     protected $default_address = '上海';
     protected $city_data_rule_name = [
@@ -48,9 +53,9 @@ class Sportstesting extends Base{
             return $this->msg(10001);
         }
         // cache($data['token'], time());
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         return $this->sportstesting_get_type_list_action($data);
     }
@@ -63,9 +68,9 @@ class Sportstesting extends Base{
             return $this->msg(10001);
         }
         // cache($data['token'], time());
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         return $this->sportstesting_get_region_list_action($data);
     }
@@ -77,20 +82,16 @@ class Sportstesting extends Base{
         if(!array_key_exists('aud_id', $data) || !array_key_exists('token', $data)){ 
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         // cache('sportstesting_get_last_data',json_encode($data));
         return $this->sportstesting_get_last_data_action($data);
     }
     // 计算并存储数据
     public function sportstesting_set_once_data($data = ['aud_id'=>'83','parameter_data'=>'辽宁,沈阳市','result_data'=>'','gender'=>'1','token'=>'caadd1be045a65f30b92aa805f1de54a']){
-        // $data = json_decode(cache('sportstesting_set_once_data'),true);
-        // dump($data);
         
-        // die;
-        // return $this->dayin_data('sportstesting_set_once_data');
         if(count(input('post.')) > 0){
             $data = input('post.');
         }
@@ -112,16 +113,12 @@ class Sportstesting extends Base{
             }
         }
         
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
-        cache('sportstesting_set_once_data',json_encode($data));
-        // return $this->msg($data);
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
+        // cache('sportstesting_set_once_data',json_encode($data));
         unset($data['token']);
-        // return $this->msg($data);
-
         return $this->sportstesting_set_once_data_action2($data);
-        // return $this->sportstesting_set_once_data_action($data);
     }
     // 获取估分历史列表
     public function sportstesting_get_all_list($data = ['aud_id'=>'25','page'=>'1','token'=>'0dafb98a10995c98b5a33b7d59d986ca']){
@@ -131,12 +128,10 @@ class Sportstesting extends Base{
         if(!array_key_exists('aud_id', $data) || !array_key_exists('token', $data) || !array_key_exists('page', $data)){ 
             return $this->msg(10001);
         }
-        // cache($data['token'], time());
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
-        // cache('sportstesting_get_all_list',json_encode($data));
         return $this->sportstesting_get_all_list_action($data);
     }
     // 获取估分历史详情
@@ -147,10 +142,9 @@ class Sportstesting extends Base{
         if(!array_key_exists('id', $data) || !array_key_exists('token', $data)){ 
             return $this->msg(10001);
         }
-        // cache($data['token'], time());
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         return $this->sportstesting_get_one_details_action($data);
     }
@@ -163,10 +157,9 @@ class Sportstesting extends Base{
         if(!array_key_exists('token', $data) || !array_key_exists('type', $data)){ 
             return $this->msg(10001);
         }
-        // cache($data['token'], time());
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         return $this->sportstesting_get_city_list_action($data);
     }
@@ -192,13 +185,9 @@ class Sportstesting extends Base{
         $db_condition = "province = '".$parameter_data[0]."'";
         // 全省地市一个规则end
 
-        $data = Db::table('test_admin_estimate')->where($db_condition)->find();
+        $data = Db::table($this->sportstesting_use_db_name['1'])->where($db_condition)->find();
         $data = json_decode($data['content'],true);
-
-        // dump($data);
-        // die;
         $result = $this->handle_default_rule_list_content($data,$gender);
-        // die;
         return $this->msg($result);
     }
     ################################################sportstesting_get_region_list
@@ -223,16 +212,12 @@ class Sportstesting extends Base{
 
         $result['list'] = [];
         $result['total_score'] = 0;
-        $data = Db::table('test_admin_estimate')->where($db_condition)->select();
-        // dump($data);
-        // die;
+        $data = Db::table($this->sportstesting_use_db_name['1'])->where($db_condition)->select();
         if(count($data) > 0){
             if(count($data) > 1){
                 // 查到不止一条规则
                 return $this->msg(10004,'查询地址不够详细，请重新选择省市地区');
             }
-            // dump(568);
-            // die;
             $data = json_decode($data[0]['content'],true);
             $result = $this->handle_default_rule_list($data,$gender);
             return $this->msg($result);
@@ -243,7 +228,7 @@ class Sportstesting extends Base{
     }
     ################################################sportstesting_get_last_data
     public function sportstesting_get_last_data_action($data){
-        $user_data = Db::table('test_app_sportstesting_data')->where(['aud_id'=>$data['aud_id']])->order('id desc')->find();
+        $user_data = Db::table($this->sportstesting_use_db_name['2'])->where(['aud_id'=>$data['aud_id']])->order('id desc')->find();
 
         if($user_data){
             $address = explode(',',$user_data['address']);
@@ -257,20 +242,13 @@ class Sportstesting extends Base{
             $result['area'] = count($address)>=3?$address[2]:'';
             return $this->msg($result);
         }else{
-            $user_msg_data = Db::table('test_app_user_data')->where(['id'=>$data['aud_id']])->field('id,gender')->find();
+            $user_msg_data = Db::table($this->sportstesting_use_db_name['3'])->where(['id'=>$data['aud_id']])->field('id,gender')->find();
             if(!$user_msg_data){
                 return $this->msg(10004);
             }
             $address = $this->default_address;
-            // dump($address);
-            // die;
-            
             $address_data = $this->sportstesting_get_region_list_action(['parameter_data'=>$address,'gender'=>$user_msg_data['gender']]);
-            // dump(json_decode($address_data->getContent(),true));
-            // dump(get_object_vars($address_data));
-            // die;
             $address_data = json_decode($address_data->getContent(),true);
-            // return $this->msg($address_data);
             if($address_data['code'] == 10004){
                 return $this->msg(10004);
             }
@@ -280,16 +258,13 @@ class Sportstesting extends Base{
             $result['province'] = count($address)>=1?$address[0]:'';
             $result['city'] = count($address)>=2?$address[1]:'';
             $result['area'] = count($address)>=3?$address[2]:'';
-            
             return $this->msg($result);
         }
     }
     ################################################sportstesting_get_all_list
     public function sportstesting_get_all_list_action($data){
-        $user_data_num = Db::table('test_app_sportstesting_data')->where(['aud_id'=>$data['aud_id']])->count();
-        $user_data = Db::table('test_app_sportstesting_data')->where(['aud_id'=>$data['aud_id']])->page($data['page'],$this->page_num)->order('id desc')->select();
-        // dump($user_data);
-        // die;
+        $user_data_num = Db::table($this->sportstesting_use_db_name['2'])->where(['aud_id'=>$data['aud_id']])->count();
+        $user_data = Db::table($this->sportstesting_use_db_name['2'])->where(['aud_id'=>$data['aud_id']])->page($data['page'],$this->page_num)->order('id desc')->select();
         if($user_data){
             $result = [];
             $result['totalrows'] = $user_data_num;
@@ -313,7 +288,7 @@ class Sportstesting extends Base{
     }
     ################################################sportstesting_get_one_details
     public function sportstesting_get_one_details_action($data){
-        $user_data = Db::table('test_app_sportstesting_data')->where(['id'=>$data['id']])->find();
+        $user_data = Db::table($this->sportstesting_use_db_name['2'])->where(['id'=>$data['id']])->find();
 
         if($user_data){
             
@@ -340,9 +315,6 @@ class Sportstesting extends Base{
     }
     ################################################sportstesting_set_once_data
     public function sportstesting_set_once_data_action2($data){
-        // $ceshi = [
-            
-        // ];
         $return_result['total_score'] = 0;
         $return_result['max_score'] = 0;
         
@@ -357,15 +329,9 @@ class Sportstesting extends Base{
         }else{
             return $this->msg(10005);
         }
-        $find_data = Db::table('test_admin_estimate')->where($db_condition)->find();
+        $find_data = Db::table($this->sportstesting_use_db_name['1'])->where($db_condition)->find();
         $find_data = json_decode($find_data['content'],true);
         $recognition_rule = $find_data[$gender];
-        // dump($recognition_rule);
-        // // 测试用删掉s
-        // $data['result_data'] = $this->handle_default_rule_list2($find_data,$gender);
-        // // 测试用删掉e
-        // dump($data);
-        // return $this->msg(10010);
         foreach ($data['result_data'] as $key => $value) {
             // 遍历一级（$value['key'] = 现场考试）
             // dump($value);
@@ -382,9 +348,8 @@ class Sportstesting extends Base{
                 }
             }
         }
-        // return $this->msg(999);
         $return_result['list'] = $data['result_data'];
-        $user_sportstesting_set = Db::table('test_app_sportstesting_data')->insert([
+        $user_sportstesting_set = Db::table($this->sportstesting_use_db_name['2'])->insert([
             'aud_id'=>$data['aud_id'],
             'content'=>json_encode($return_result['list']),
             'score'=>$return_result['total_score'],
@@ -414,7 +379,7 @@ class Sportstesting extends Base{
     public function sportstesting_get_city_list_action($type){
         if($type['type'] == '1'){
             // 已有地区列表
-            $data = Db::table('test_admin_estimate')->field('id,province,city,area')->select();
+            $data = Db::table($this->sportstesting_use_db_name['1'])->field('id,province,city,area')->select();
             $result = [];
             // 添加省份
             foreach ($data as $key => $value) {
@@ -459,7 +424,7 @@ class Sportstesting extends Base{
             }
             return $this->msg($result);
         }else if($type['type'] == '2'){
-            $data = Db::table('test_admin_estimate')->where(['type' => '2'])->field('id,content,city,area')->find();
+            $data = Db::table($this->sportstesting_use_db_name['1'])->where(['type' => '2'])->field('id,content,city,area')->find();
             $result = json_decode($data['content'],true);
             return $this->msg($result);
         }else{
@@ -483,9 +448,6 @@ class Sportstesting extends Base{
         $secondsA = $sjA[1];
         $minutesB = $sjB[0];
         $secondsB = $sjB[1];
-        // list($minutesA, $secondsA) = explode(':', $a);  
-        // list($minutesB, $secondsB) = explode(':', $b);  
-    
         // 转换为秒  
         $totalSecondsA = intval($minutesA) * 60 + intval($secondsA);  
         $totalSecondsB = intval($minutesB) * 60 + intval($secondsB);  
@@ -496,8 +458,6 @@ class Sportstesting extends Base{
         }else{
             return [false,$result];
         }
-        // 比较两个时间（秒）  
-        // return $totalSecondsB <= $totalSecondsA; 
     }
     
 
@@ -532,8 +492,6 @@ class Sportstesting extends Base{
                 }
             }
         }
-        // dump($result);
-        // die;
         return $result;
     }
     // 获取所有选择项内容
@@ -576,9 +534,6 @@ class Sportstesting extends Base{
         // 减 bcsub(,,20)
         // 乘 bcmul(,,20)
         // 除 bcdiv(,,20)
-        // dump($data);
-        // dump($rule);
-        // die;
         if($data['value'] != ''){
             if(count($rule) > 0){
                 foreach ($rule as $key => $value) {
@@ -626,7 +581,6 @@ class Sportstesting extends Base{
             }else{
                 $data['score'] = $data['value'] <= $data['total_score']?bcmul(bcdiv($data['value'],$data['total_score'],20),100,2):100;
                 // 计算比例后分值
-                // $proportional_post_score = bcmul($data['total_score'],$data['proportion'],2);
                 $data['proportion_value'] = $data['value'] <= $data['total_score']?$data['value']:$data['total_score'];
             }
             
@@ -644,8 +598,6 @@ class Sportstesting extends Base{
     public function handle_default_rule_list2($data,$gender){
         $temporary_arr = $data[$gender];
         $result = [];
-        // dump($temporary_arr);
-        // die;
         foreach ($temporary_arr as $key => $value) {
             $num = array_push($result,['name'=>$key,'key'=>$key,'list'=>[]]);
 
@@ -726,9 +678,6 @@ class Sportstesting extends Base{
                 }
             }
         }
-        // dump($result);
-        // die;
-        // $result = json_encode($result);
         return $result;
     }
 
diff --git a/application/testapp/controller/Vitalcapacity.php b/application/testapp/controller/Vitalcapacity.php
index 6ef0041..e666d67 100644
--- a/application/testapp/controller/Vitalcapacity.php
+++ b/application/testapp/controller/Vitalcapacity.php
@@ -16,7 +16,11 @@ class Vitalcapacity extends Base{
         ['min_val'=>'10','max_val'=>'59','text'=>'不及格','color'=>'#FF5656'],
         ['min_val'=>'0','max_val'=>'9','text'=>'无效','color'=>'#FF5656'],
     ];
-    
+    protected $vitalcapacity_use_db_name = [
+        '1'=>'test_app_user_data',
+        '2'=>'test_app_card_vitalcapacity_data',
+        '3'=>'test_pc_vitalcapacity_standard',
+    ];
     protected $result_end_data_mould = [
         'name'=>'',
         'value'=>'',
@@ -42,9 +46,9 @@ class Vitalcapacity extends Base{
         if(!array_key_exists('aud_id', $data) || !array_key_exists('time', $data) || !array_key_exists('token', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         $data['one'] = $this->isPositiveNumber($data['one']) === false?0:$data['one'];
         $data['two'] = $this->isPositiveNumber($data['one']) === false?0:$data['two'];
@@ -59,9 +63,9 @@ class Vitalcapacity extends Base{
         if(!array_key_exists('aud_id', $data) || !array_key_exists('flow', $data) || !array_key_exists('token', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         $data['one'] = $this->isPositiveNumber($data['one']) === false?0:$data['one'];
         $data['two'] = $this->isPositiveNumber($data['one']) === false?0:$data['two'];
@@ -77,9 +81,9 @@ class Vitalcapacity extends Base{
         if(!array_key_exists('aud_id', $data) || !array_key_exists('token', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         return $this->vitalcapacity_data_report_action($data);
     }
@@ -91,9 +95,9 @@ class Vitalcapacity extends Base{
         if(!array_key_exists('aud_id', $data) || !array_key_exists('time', $data) || !array_key_exists('token', $data)){
             return $this->msg(10001);
         }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
+        // if($this->token_time_validate($data['token']) === false){
+        //     return $this->msg(20001);
+        // }
         unset($data['token']);
         return $this->vitalcapacity_curve_chart_action($data);
     }
@@ -119,7 +123,7 @@ class Vitalcapacity extends Base{
             $temporary_arr['record_time'] = $this->addCurrentTimeToDateString($temporary_arr['record_time']);
         }
         
-        $user_msg = Db::name('test_app_user_data')->where(['id'=>$data['aud_id']])->field('grade,gender')->find();
+        $user_msg = Db::name($this->vitalcapacity_use_db_name['1'])->where(['id'=>$data['aud_id']])->field('grade,gender')->find();
         if($user_msg){
             // 根据性别&年级&年龄查规则
             if($user_msg['grade'] != 'nothing'){
@@ -148,7 +152,7 @@ class Vitalcapacity extends Base{
         $temporary_arr['standard_data'] = json_encode($standard_data);
         // dump($temporary_arr);
         // die;
-        $result = Db::table('test_app_card_vitalcapacity_data')->insert($temporary_arr);
+        $result = Db::table($this->vitalcapacity_use_db_name['2'])->insert($temporary_arr);
         
         if($result){
             $time = $result[0]['record_time'];
@@ -169,7 +173,7 @@ class Vitalcapacity extends Base{
     ################################################################vitalcapacity_data_report
     public function vitalcapacity_data_report_action($data){
         
-        $result = Db::table('test_app_card_vitalcapacity_data')->where(['aud_id'=>$data['aud_id']])->order('record_time desc')->field('record_time,score,average,flow_val,standard_data')->limit(1)->select();
+        $result = Db::table($this->vitalcapacity_use_db_name['2'])->where(['aud_id'=>$data['aud_id']])->order('record_time desc')->field('record_time,score,average,flow_val,standard_data')->limit(1)->select();
         
         if(count($result) <= 0){
             // return $this->msg(10004);
@@ -228,7 +232,7 @@ class Vitalcapacity extends Base{
         // die;
   
         // 使用查询构造器进行查询  
-        $result = Db::name('test_app_card_vitalcapacity_data')->where($map)->field('id,one_val,two_val,three_val,average_val,score_val,aud_id,record_time,DATEPART(hour, record_time) AS hour,DATEPART(day, record_time) AS day,DATEPART(month, record_time) AS month')->order('record_time')->select();
+        $result = Db::name($this->vitalcapacity_use_db_name['2'])->where($map)->field('id,one_val,two_val,three_val,average_val,score_val,aud_id,record_time,DATEPART(hour, record_time) AS hour,DATEPART(day, record_time) AS day,DATEPART(month, record_time) AS month')->order('record_time')->select();
         // dump($map);
         // dump($result);
         // die;
@@ -316,7 +320,7 @@ class Vitalcapacity extends Base{
     // 肺活量成绩判断
     public function vitalcapacity_achievement_judge($data){
         $str = "sex = ".$data['gender']." and ".$data['grade']." <= ".$data['average']; 
-        $user_achievement = Db::name('test_pc_vitalcapacity_standard')->where($str)->order($data['grade'] .' desc')->field('level,score,'.$data['grade'])->limit(1)->select();
+        $user_achievement = Db::name($this->vitalcapacity_use_db_name['3'])->where($str)->order($data['grade'] .' desc')->field('level,score,'.$data['grade'])->limit(1)->select();
         // dump($data);
         // dump($user_achievement);
         if(count($user_achievement)<=0){