add car finder

admin/index.php

@@ -7,7 +7,7 @@
 
 define('BASE_PATH',str_replace('\\','/',dirname(__FILE__)));
 if (!@include(dirname(dirname(__FILE__)).'/global.php')) exit('global.php isn\'t exists!');
-if (!@include(BASE_CORE_PATH.'/33hao.php')) exit('33hao.php isn\'t exists!');
+if (!@include(BASE_CORE_PATH.'/lrlz.php')) exit('lrlz.php isn\'t exists!');
 define('TPL_NAME',TPL_ADMIN_NAME);
 define('ADMIN_TEMPLATES_URL',ADMIN_SITE_URL.'/templates/'.TPL_NAME);
 define('BASE_TPL_PATH',BASE_PATH.'/templates/'.TPL_NAME);

chat/index.php

@@ -8,7 +8,7 @@
 define('APP_ID','chat');
 define('BASE_PATH',str_replace('\\','/',dirname(__FILE__)));
 if (!@include(dirname(dirname(__FILE__)).'/global.php')) exit('global.php isn\'t exists!');
-if (!@include(BASE_CORE_PATH.'/33hao.php')) exit('33hao.php isn\'t exists!');
+if (!@include(BASE_CORE_PATH.'/lrlz.php')) exit('lrlz.php isn\'t exists!');
 
 if (!@include(BASE_PATH.'/control/control.php')) exit('control.php isn\'t exists!');
 

circle/index.php

@@ -10,7 +10,7 @@
 define('APP_ID','circle');
 define('BASE_PATH',str_replace('\\','/',dirname(__FILE__)));
 if (!@include(dirname(dirname(__FILE__)).'/global.php')) exit('global.php isn\'t exists!');
-if (!@include(BASE_CORE_PATH.'/33hao.php')) exit('33hao.php isn\'t exists!');
+if (!@include(BASE_CORE_PATH.'/lrlz.php')) exit('lrlz.php isn\'t exists!');
 
 if (!@include(BASE_PATH.'/config/config.ini.php')){
 	@header("Location: install/index.php");die;

cms/index.php

@@ -9,7 +9,7 @@
 define('APP_ID','cms');
 define('BASE_PATH',str_replace('\\','/',dirname(__FILE__)));
 if (!@include(dirname(dirname(__FILE__)).'/global.php')) exit('global.php isn\'t exists!');
-if (!@include(BASE_CORE_PATH.'/33hao.php')) exit('33hao.php isn\'t exists!');
+if (!@include(BASE_CORE_PATH.'/lrlz.php')) exit('lrlz.php isn\'t exists!');
 
 if (!@include(BASE_PATH.'/config/config.ini.php')){
 	@header("Location: install/index.php");die;

core/33hao.php

@@ -1,104 +0,0 @@
-<?php
-/**
- * 运行框架
- *
- *
- *
- *
- */
-
-defined('InShopNC') or exit('Access Invalid!');
-if (!@include(BASE_DATA_PATH.'/config/config.ini.php')) exit('config.ini.php isn\'t exists!');
-
-if (file_exists(BASE_PATH.'/config/config.ini.php')){
-	include(BASE_PATH.'/config/config.ini.php');
-}
-
-@date_default_timezone_set('Asia/Shanghai');
-
-//global $config;
-//默认平台店铺id
-define('DEFAULT_PLATFORM_STORE_ID', $config['default_store_id']);
-
-define('URL_MODEL',$config['url_model']);
-//$auto_site_url = strtolower('http://'.$_SERVER['HTTP_HOST'].implode('/',$tmp_array));
-define(SUBDOMAIN_SUFFIX, $config['subdomain_suffix']);
-define('BASE_SITE_URL', $config['base_site_url']);
-define('SHOP_SITE_URL', $config['shop_site_url']);
-define('CMS_SITE_URL', $config['cms_site_url']);
-define('CIRCLE_SITE_URL', $config['circle_site_url']);
-define('MICROSHOP_SITE_URL', $config['microshop_site_url']);
-define('ADMIN_SITE_URL', $config['admin_site_url']);
-define('MOBILE_SITE_URL', $config['mobile_site_url']);
-define('WAP_SITE_URL', $config['wap_site_url']);
-define('UPLOAD_SITE_URL',$config['upload_site_url']);
-define('RESOURCE_SITE_URL',$config['resource_site_url']);
-define('DELIVERY_SITE_URL',$config['delivery_site_url']);
-
-define('BASE_DATA_PATH',BASE_ROOT_PATH.'/data');
-define('BASE_UPLOAD_PATH',BASE_DATA_PATH.'/upload');
-define('BASE_RESOURCE_PATH',BASE_DATA_PATH.'/resource');
-
-define('CHARSET',$config['db'][1]['dbcharset']);
-define('DBDRIVER',$config['dbdriver']);
-define('SESSION_EXPIRE',$config['session_expire']);
-define('LANG_TYPE',$config['lang_type']);
-define('COOKIE_PRE',$config['cookie_pre']);
-
-define('DBPRE',$config['tablepre']);
-define('DBNAME',$config['db'][1]['dbname']);
-
-$_GET['act'] = $_GET['act'] ? strtolower($_GET['act']) : ($_POST['act'] ? strtolower($_POST['act']) : null);
-$_GET['op']  = $_GET['op'] ? strtolower($_GET['op']) : ($_POST['op'] ? strtolower($_POST['op']) : null);
-
-if (empty($_GET['act'])){
-    require_once(BASE_CORE_PATH.'/framework/core/route.php');
-    new Route($config);
-}
-//统一ACTION
-$_GET['act'] = preg_match('/^[\w]+$/i',$_GET['act']) ? $_GET['act'] : 'index';
-$_GET['op']  = preg_match('/^[\w]+$/i',$_GET['op']) ? $_GET['op'] : 'index';
-
-//对GET POST接收内容进行过滤,$ignore内的下标不被过滤
-$ignore = array('article_content','pgoods_body','doc_content','content','sn_content','g_body','store_description','p_content','groupbuy_intro','remind_content','note_content','ref_url','adv_pic_url','adv_word_url','adv_slide_url','appcode','mail_content');
-if (!class_exists('Security')) require(BASE_CORE_PATH.'/framework/libraries/security.php');
-$_GET = !empty($_GET) ? Security::getAddslashesForInput($_GET,$ignore) : array();
-$_POST = !empty($_POST) ? Security::getAddslashesForInput($_POST,$ignore) : array();
-$_REQUEST = !empty($_REQUEST) ? Security::getAddslashesForInput($_REQUEST,$ignore) : array();
-$_SERVER = !empty($_SERVER) ? Security::getAddSlashes($_SERVER) : array();
-
-//启用ZIP压缩
-if ($config['gzip'] == 1 && function_exists('ob_gzhandler') && $_GET['inajax'] != 1){
-	ob_start('ob_gzhandler');
-}else {
-	ob_start();
-}
-require_once(BASE_CORE_PATH.'/framework/libraries/queue.php');
-require_once(BASE_CORE_PATH.'/framework/function/core.php');
-require_once(BASE_CORE_PATH.'/framework/core/base.php');
-require_once(BASE_CORE_PATH.'/framework/function/goods.php');
-
-if(function_exists('spl_autoload_register')) {
-	spl_autoload_register(array('Base', 'autoload'));
-} else {
-	function __autoload($class) {
-		if(defined('MOBILE_SERVER') && MOBILE_SERVER == true) {
-			return Base::mobile_autoload($class);
-		} else {
-			return Base::autoload($class);
-		}
-	}
-}
-
-function is_mobile()
-{
-	return (defined('MOBILE_SERVER') && MOBILE_SERVER == true);
-}
-
-//是否考虑红包有效期
-function isBonusExpiryDate()
-{
-	return (defined('BONUS_EXPIRY_DATE') && BONUS_EXPIRY_DATE == true);
-}
-
-?>

core/lrlz.php

@@ -7,17 +7,24 @@
  *
  */
 
-@date_default_timezone_set('Asia/Shanghai');
+defined('InShopNC') or exit('Access Invalid!');
+if (!@include(BASE_DATA_PATH . '/config/config.ini.php')) exit('config.ini.php isn\'t exists!');
+
+if (file_exists(BASE_PATH . '/config/config.ini.php')) {
+    include(BASE_PATH . '/config/config.ini.php');
+}
 
-global $config;
+@date_default_timezone_set('Asia/Shanghai');
 
+//global $config;
 //默认平台店铺id
 define('DEFAULT_PLATFORM_STORE_ID', $config['default_store_id']);
 
-define('URL_MODEL',$config['url_model']);
-$auto_site_url = strtolower('http://'.$_SERVER['HTTP_HOST'].implode('/',$tmp_array));
-define(SUBDOMAIN_SUFFIX, $config['subdomain_suffix']);
-define('BASE_SITE_URL', $config['base_site_url']);
+define('URL_MODEL', $config['url_model']);
+define(SUBDOMAIN_SUFFIX,  $config['subdomain_suffix']);
+define('BASE_SITE_URL',   $config['base_site_url']);
+define('CLIENT_SITE_URL', $config['client_site_url']);
+
 define('SHOP_SITE_URL', $config['shop_site_url']);
 define('CMS_SITE_URL', $config['cms_site_url']);
 define('CIRCLE_SITE_URL', $config['circle_site_url']);
@@ -25,72 +32,84 @@ define('MICROSHOP_SITE_URL', $config['microshop_site_url']);
 define('ADMIN_SITE_URL', $config['admin_site_url']);
 define('MOBILE_SITE_URL', $config['mobile_site_url']);
 define('WAP_SITE_URL', $config['wap_site_url']);
-define('UPLOAD_SITE_URL',$config['upload_site_url']);
-define('RESOURCE_SITE_URL',$config['resource_site_url']);
-define('DELIVERY_SITE_URL',$config['delivery_site_url']);
+define('UPLOAD_SITE_URL', $config['upload_site_url']);
+define('RESOURCE_SITE_URL', $config['resource_site_url']);
+define('DELIVERY_SITE_URL', $config['delivery_site_url']);
 
-define('BASE_DATA_PATH',BASE_ROOT_PATH.'/data');
-define('BASE_UPLOAD_PATH',BASE_DATA_PATH.'/upload');
-define('BASE_RESOURCE_PATH',BASE_DATA_PATH.'/resource');
+define('BASE_DATA_PATH', BASE_ROOT_PATH . '/data');
+define('BASE_UPLOAD_PATH', BASE_DATA_PATH . '/upload');
+define('BASE_RESOURCE_PATH', BASE_DATA_PATH . '/resource');
 
-define('CHARSET',$config['db'][1]['dbcharset']);
-define('DBDRIVER',$config['dbdriver']);
-define('SESSION_EXPIRE',$config['session_expire']);
-define('LANG_TYPE',$config['lang_type']);
-define('COOKIE_PRE',$config['cookie_pre']);
+define('CHARSET', $config['db'][1]['dbcharset']);
+define('DBDRIVER', $config['dbdriver']);
+define('SESSION_EXPIRE', $config['session_expire']);
+define('LANG_TYPE', $config['lang_type']);
+define('COOKIE_PRE', $config['cookie_pre']);
 
-define('DBPRE','33hao_');//$config['tablepre']);
-define('DBNAME',$config['db'][1]['dbname']);
+define('DBPRE', $config['tablepre']);
+define('DBNAME', $config['db'][1]['dbname']);
 
 $_GET['act'] = $_GET['act'] ? strtolower($_GET['act']) : ($_POST['act'] ? strtolower($_POST['act']) : null);
-$_GET['op']  = $_GET['op'] ? strtolower($_GET['op']) : ($_POST['op'] ? strtolower($_POST['op']) : null);
+$_GET['op'] = $_GET['op'] ? strtolower($_GET['op']) : ($_POST['op'] ? strtolower($_POST['op']) : null);
 
-if (empty($_GET['act'])){
-    require_once(BASE_CORE_PATH.'/framework/core/route.php');
+if (empty($_GET['act'])) {
+    require_once(BASE_CORE_PATH . '/framework/core/route.php');
     new Route($config);
 }
 //统一ACTION
-$_GET['act'] = preg_match('/^[\w]+$/i',$_GET['act']) ? $_GET['act'] : 'index';
-$_GET['op']  = preg_match('/^[\w]+$/i',$_GET['op']) ? $_GET['op'] : 'index';
+$_GET['act'] = preg_match('/^[\w]+$/i', $_GET['act']) ? $_GET['act'] : 'index';
+$_GET['op'] = preg_match('/^[\w]+$/i', $_GET['op']) ? $_GET['op'] : 'index';
 
 //对GET POST接收内容进行过滤,$ignore内的下标不被过滤
-$ignore = array('article_content',
-    'pgoods_body',
-    'doc_content',
-    'content',
-    'sn_content',
-    'g_body',
-    'store_description',
-    'p_content',
-    'groupbuy_intro',
-    'remind_content',
-    'note_content',
-    'ref_url',
-    'adv_pic_url',
-    'adv_word_url',
-    'adv_slide_url',
-    'appcode',
-    'mail_content');
-
-if (!class_exists('Security')) require(BASE_CORE_PATH.'/framework/libraries/security.php');
-$_GET = !empty($_GET) ? Security::getAddslashesForInput($_GET,$ignore) : array();
-$_POST = !empty($_POST) ? Security::getAddslashesForInput($_POST,$ignore) : array();
-$_REQUEST = !empty($_REQUEST) ? Security::getAddslashesForInput($_REQUEST,$ignore) : array();
+$ignore = array('article_content', 'pgoods_body',
+    'doc_content', 'content', 'sn_content', 'g_body', 'store_description', 'p_content',
+    'groupbuy_intro', 'remind_content', 'note_content', 'ref_url', 'adv_pic_url', 'adv_word_url', 'adv_slide_url',
+    'appcode', 'mail_content');
+
+if (!class_exists('Security')) {
+    require(BASE_CORE_PATH . '/framework/libraries/security.php');
+}
+
+$_GET = !empty($_GET) ? Security::getAddslashesForInput($_GET, $ignore) : array();
+$_POST = !empty($_POST) ? Security::getAddslashesForInput($_POST, $ignore) : array();
+$_REQUEST = !empty($_REQUEST) ? Security::getAddslashesForInput($_REQUEST, $ignore) : array();
 $_SERVER = !empty($_SERVER) ? Security::getAddSlashes($_SERVER) : array();
 
 //启用ZIP压缩
-if ($config['gzip'] == 1 && function_exists('ob_gzhandler') && $_GET['inajax'] != 1){
-	ob_start('ob_gzhandler');
-}else {
-	ob_start();
+if ($config['gzip'] == 1 && function_exists('ob_gzhandler') && $_GET['inajax'] != 1) {
+    ob_start('ob_gzhandler');
+} else {
+    ob_start();
 }
+require_once(BASE_CORE_PATH . '/framework/libraries/queue.php');
+require_once(BASE_CORE_PATH . '/framework/function/core.php');
+require_once(BASE_CORE_PATH . '/framework/core/base.php');
+require_once(BASE_CORE_PATH . '/framework/function/goods.php');
 
-if(function_exists('spl_autoload_register')) {
-	spl_autoload_register(array('Base', 'autoload'));
-} else {
-	function __autoload($class) {
-		return Base::autoload($class);
-	}
+if (function_exists('spl_autoload_register')) {
+    spl_autoload_register(array('Base', 'autoload'));
+}
+else
+{
+    function __autoload($class)
+    {
+        if (defined('MOBILE_SERVER') && MOBILE_SERVER == true) {
+            return Base::mobile_autoload($class);
+        } else {
+            return Base::autoload($class);
+        }
+    }
+}
+
+function is_mobile()
+{
+    return (defined('MOBILE_SERVER') && MOBILE_SERVER == true);
+}
+
+//是否考虑红包有效期
+function isBonusExpiryDate()
+{
+    return (defined('BONUS_EXPIRY_DATE') && BONUS_EXPIRY_DATE == true);
 }
 
 ?>

crontab/cj_index.php

@@ -16,7 +16,7 @@ define('APP_ID','crontab');
 define('BASE_PATH',str_replace('\\','/',dirname(__FILE__)));
 define('TRANS_MASTER',true);
 if (!@include(dirname(dirname(__FILE__)).'/global.php')) exit('global.php isn\'t exists!');
-if (!@include(BASE_CORE_PATH.'/33hao.php')) exit('33hao.php isn\'t exists!');
+if (!@include(BASE_CORE_PATH.'/lrlz.php')) exit('lrlz.php isn\'t exists!');
 
 if (PHP_SAPI == 'cli') {
     $_GET['act'] = $_SERVER['argv'][1];

crontab/control/command.php

@@ -255,7 +255,7 @@ class commandControl extends BaseCronControl
 
     public function init_carOp()
     {
-        $import = new car_convert\importer("all", ";");
+        $import = new car\importer("all", ";");
         $import->run(BASE_ROOT_PATH . '/data/car/data_all.csv');
     }
 

crontab/crawl/body_filter.php

@@ -23,9 +23,6 @@ class body_filder
 
     private function filter_gif($val)
     {
-//        $style = '/\s+style\s*=\s*\"{1}[^\"]*\"{1}/i';
-//        $val = preg_replace($style,'',$val);
-
         $gif = '/<img\s+[^>]*spaceball.gif\"[^>]*>/i';
         $val = preg_replace($gif,'',$val);
 

crontab/crawl/fetch_goods.php

@@ -3,29 +3,28 @@
 define('InShopNC',true);
 defined('InShopNC') or exit('Access Invalid!');
 
-require_once (BASE_DATA_PATH . '/api/taobao/TopSdk.php');
-require_once (BASE_DATA_PATH . '/api/taobao/top/TopClient.php');
-require_once (BASE_DATA_PATH . '/api/taobao/top/ResultSet.php');
-require_once (BASE_DATA_PATH . '/api/taobao/top/RequestCheckUtil.php');
-require_once (BASE_DATA_PATH . '/api/taobao/top/TopLogger.php');
-require_once (BASE_DATA_PATH . '/api/taobao/top/SpiUtils.php');
-require_once (BASE_DATA_PATH . '/api/taobao/top/ApplicationVar.php');
-require_once (BASE_DATA_PATH . '/api/taobao/top/HttpdnsGetRequest.php');
-require_once (BASE_DATA_PATH . '/api/taobao/top/request/ItemSellerGetRequest.php');
-require_once (BASE_DATA_PATH . '/api/taobao/top/request/ItemsOnsaleGetRequest.php');
-
-require_once (BASE_CRONTAB_PATH . '/crawl/fetch_config.php');
-require_once (BASE_CRONTAB_PATH . '/crawl/product_importer.php');
-require_once (BASE_CRONTAB_PATH . '/crawl/category.php');
-require_once (BASE_CRONTAB_PATH . '/crawl/tmrequest.php');
-require_once (BASE_CRONTAB_PATH . '/crawl/page_request.php');
-require_once (BASE_CRONTAB_PATH . '/crawl/class_tree.php');
-require_once (BASE_CRONTAB_PATH . '/crawl/pretreat_tmdata.php');
-require_once (BASE_CRONTAB_PATH . '/crawl/spec_attr.php');
-require_once (BASE_CRONTAB_PATH . '/crawl/spec_attr_parser.php');
-require_once (BASE_CRONTAB_PATH . '/crawl/upload_file.php');
-require_once (BASE_CRONTAB_PATH . '/crawl/upload_control.php');
-require_once (BASE_CRONTAB_PATH . '/crawl/tm_pagereq.php');
+require_once(BASE_DATA_PATH . '/api/taobao/TopSdk.php');
+require_once(BASE_DATA_PATH . '/api/taobao/top/TopClient.php');
+require_once(BASE_DATA_PATH . '/api/taobao/top/ResultSet.php');
+require_once(BASE_DATA_PATH . '/api/taobao/top/RequestCheckUtil.php');
+require_once(BASE_DATA_PATH . '/api/taobao/top/TopLogger.php');
+require_once(BASE_DATA_PATH . '/api/taobao/top/SpiUtils.php');
+require_once(BASE_DATA_PATH . '/api/taobao/top/ApplicationVar.php');
+require_once(BASE_DATA_PATH . '/api/taobao/top/HttpdnsGetRequest.php');
+require_once(BASE_DATA_PATH . '/api/taobao/top/request/ItemSellerGetRequest.php');
+require_once(BASE_DATA_PATH . '/api/taobao/top/request/ItemsOnsaleGetRequest.php');
+require_once(BASE_CRONTAB_PATH . '/crawl/fetch_config.php');
+require_once(BASE_CRONTAB_PATH . '/crawl/product_importer.php');
+require_once(BASE_CRONTAB_PATH . '/crawl/category.php');
+require_once(BASE_CRONTAB_PATH . '/crawl/tmrequest.php');
+require_once(BASE_CRONTAB_PATH . '/crawl/page_request.php');
+require_once(BASE_CRONTAB_PATH . '/crawl/class_tree.php');
+require_once(BASE_CRONTAB_PATH . '/crawl/pretreat_tmdata.php');
+require_once(BASE_CRONTAB_PATH . '/crawl/spec_attr.php');
+require_once(BASE_CRONTAB_PATH . '/crawl/spec_attr_parser.php');
+require_once(BASE_CRONTAB_PATH . '/crawl/upload_file.php');
+require_once(BASE_CRONTAB_PATH . '/crawl/upload_control.php');
+require_once(BASE_CRONTAB_PATH . '/crawl/tm_pagereq.php');
 require_once(BASE_CRONTAB_PATH . '/crawl/brand_operator.php');
 require_once(BASE_CRONTAB_PATH . '/crawl/importer_check.php');
 require_once(BASE_CRONTAB_PATH . '/crawl/body_filter.php');

crontab/crawl/product_importer.php

@@ -479,8 +479,8 @@ class product_importer
                     if(empty($pupname)) continue;
 
                     $file_sig = '';
-                    if(isset($img['file'])) {
-                        $file_sig = md5_file($img['file']);
+                    if(isset($pimg['file'])) {
+                        $file_sig = md5_file($pimg['file']);
                     }
 
                     $color_id = $this->goods_colorid($cid,$pimg['properties']);

data/crontab/index.php

@@ -18,7 +18,7 @@ $_SERVER['argv'][2] = 'create_bill';
 if (empty($_SERVER['argv'][1]) || empty($_SERVER['argv'][2])) exit('parameter error');
 
 require(dirname(__FILE__).'/../../global.php');
-if (!@include(BASE_CORE_PATH.'/33hao.php')) exit('33hao.php isn\'t exists!');
+if (!@include(BASE_CORE_PATH.'/lrlz.php')) exit('lrlz.php isn\'t exists!');
 
 Base::init();
 

data/model/car_base.model.php

@@ -36,4 +36,8 @@ class car_baseModel extends Model
     {
         return $this->find([ 'car_name'=> trim($car_name) ]);
     }
+    public function editCar($cond,$datas)
+    {
+        return $this->where($cond)->update($datas);
+    }
 }

data/resource/kindeditor/php/upload_json.php

@@ -9,7 +9,7 @@
 
 define('BASE_PATH',str_replace('\\','/',dirname(__FILE__)));
 if (!@include('../../../../global.php')) exit('global.php isn\'t exists!');
-if (!@include(BASE_CORE_PATH.'/33hao.php')) exit('33hao.php isn\'t exists!');
+if (!@include(BASE_CORE_PATH.'/lrlz.php')) exit('lrlz.php isn\'t exists!');
 //文件保存目录路径
 $save_path = '../../../upload/shop/editor/';
 //文件保存目录URL

delivery/index.php

@@ -8,7 +8,7 @@ define('APP_ID','delivery');
 define('BASE_PATH',str_replace('\\','/',dirname(__FILE__)));
 
 if (!@include(dirname(dirname(__FILE__)).'/global.php')) exit('global.php isn\'t exists!');
-if (!@include(BASE_CORE_PATH.'/33hao.php')) exit('33hao.php isn\'t exists!');
+if (!@include(BASE_CORE_PATH.'/lrlz.php')) exit('lrlz.php isn\'t exists!');
 
 define('APP_SITE_URL',DELIVERY_SITE_URL);
 define('TPL_NAME',TPL_SHOP_NAME);

fooder.php

@@ -12,7 +12,7 @@ define('BASE_AVATAR_PATH',BASE_UPLOAD_PATH.'/shop/avatar');
 
 require_once(BASE_ROOT_PATH . '/global.php');
 require_once(BASE_DATA_PATH . '/config/config.ini.php');
-require_once(BASE_CORE_PATH . '/33hao.php');
+require_once(BASE_CORE_PATH . '/lrlz.php');
 
 require_once(BASE_MOBILE_PATH . '/config/config.ini.php');
 require_once(BASE_MOBILE_PATH . '/framework/function/function.php');

helper/async/register.php

@@ -57,10 +57,16 @@ class register extends IAsync
     {
         if($this->cur_info->rewared_inviter()) return false;
 
-        if($this->tag_rewarded($this->cur_user)) {
-            $this->reward_user();
-            $inviters = $this->inviters();
-            $this->notify_inviter($inviters);
+        if($this->tag_rewarded($this->cur_user))
+        {
+            $unionid = $this->cur_info->unionid();
+            $mod_member = Model('member');
+            $count = $mod_member->getMemberCount(['member_wxunionid' => $unionid]);
+            if($count <= 1) {
+                $this->reward_user();
+                $inviters = $this->inviters();
+                $this->notify_inviter($inviters);
+            }
             $this->add_invitee($this->last_inviter);
         }
         return true;

helper/bonus/open_sharer.php

@@ -6,6 +6,7 @@
  * Date: 2016/11/17
  * Time: 上午11:44
  */
+
 namespace bonus;
 
 class open_sharer

helper/brand_helper.php

@@ -17,6 +17,7 @@ class brand_helper
 
     private $mBrandPageResult;
     private $mBaseInfo;
+    private $mNameID;
 
     private function __construct()
     {
@@ -36,6 +37,16 @@ class brand_helper
 
         return self::$stInstance;
     }
+    public function findByname($name)
+    {
+        $name = trim($name);
+        if(array_key_exists($name,$this->mNameID)) {
+            $brand_id = $this->mNameID[$name];
+            return $this->mBaseInfo[$brand_id];
+        } else {
+            return false;
+        }
+    }
     public function name($brand_id)
     {
         $brand_id = intval($brand_id);
@@ -80,6 +91,14 @@ class brand_helper
 
         $this->mBrandPageResult = $data;
         $this->mBaseInfo = $data['base_info'];
+
+        foreach ($this->mBaseInfo as $item)
+        {
+            $name = trim($item['brand_name']);
+            if(!empty($name)) {
+                $this->mNameID[$name] = intval($item['brand_id']);
+            }
+        }
     }
 
     private function read_cache()
@@ -97,7 +116,12 @@ class brand_helper
         $base_info = [];
 
         $model = Model('brand');
-        $items = $model->field('brand_id,brand_logo,brand_name,brand_country,brand_country_logo,author_desc')->where(array('brand_apply' => '1'))->order('brand_sort asc')->limit(false)->select();
+        $items = $model->field('brand_id,brand_logo,brand_name,brand_country,brand_country_logo,author_desc')
+                       ->where(array('brand_apply' => '1'))
+                       ->order('brand_sort asc')
+                       ->limit(false)
+                       ->select();
+
         foreach ($items as $item)
         {
             $image = UPLOAD_SITE_URL . $item['brand_logo'];
@@ -109,7 +133,6 @@ class brand_helper
                 continue;
             }
 
-
             if(empty($item['brand_country_logo'])) {
                 $conuntry_logo = '';
                 Log::record("cant get {$item['brand_name']} brand_country_logo." ,Log::ERR);

helper/car_convert/all.alias.php

@@ -1,286 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: lionared
- */
-
-return [
-    [ 'origin'=>'车系ID', 'alias'=>'series_id', 'table'=>'car_base'],
-    [ 'origin'=>'品牌',   'alias'=>'brand_str', 'table'=>'car_base'],
-    [ 'origin'=>'品牌图标', 'alias'=>'brand_logo', 'table'=>'car_base'],
-    [ 'origin'=>'国家',               'alias'=>'country_str', 'table'=>'car_base'],
-    [ 'origin'=>'车系',               'alias'=>'series', 'table'=>'car_base'],
-    [ 'origin'=>'生产方式',            'alias'=>'produce_type', 'table'=>'car_base'],
-    [ 'origin'=>'车系首页',            'alias'=>'series_home', 'table'=>'car_base'],
-    [ 'origin'=>'车型ID',              'alias'=>'type_id', 'table'=>'car_base'],
-    [ 'origin'=>'基本参数-车型名称',        'alias'=>'car_name', 'table'=>'car_base'],
-    [ 'origin'=>'基本参数-厂商指导价(元)',    'alias'=>'market_price', 'table'=>'car_base', 'formater'=>'price_formater'],
-    [ 'origin'=>'基本参数-厂商',          'alias'=>'manufacturer', 'table'=>'car_base'],
-    [ 'origin'=>'基本参数-级别',          'alias'=>'car_level', 'table'=>'car_base'],
-    [ 'origin'=>'基本参数-上市时间',          'alias'=>'market_time', 'table'=>'car_base'],
-    [ 'origin'=>'基本参数-发动机',         'alias'=>'engine', 'table'=>'car_base'],
-    [ 'origin'=>'基本参数-变速箱',         'alias'=>'gearbox', 'table'=>'car_base'],
-    [ 'origin'=>'基本参数-长*宽*高(mm)',    'alias'=>'car_size', 'table'=>'car_base'],
-    [ 'origin'=>'基本参数-车身结构',         'alias'=>'car_struct', 'table'=>'car_base'],
-    [ 'origin'=>'基本参数-最高车速(km/h)',             'alias'=>'max_speed', 'table'=>'car_base'],
-    [ 'origin'=>'基本参数-官方0-100km/h加速(s)',        'alias'=>'official_speedup', 'table'=>'car_base'],
-    [ 'origin'=>'基本参数-实测0-100km/h加速(s)',        'alias'=>'actual_speedup', 'table'=>'car_base'],
-    [ 'origin'=>'基本参数-实测100-0km/h制动(m)',        'alias'=>'actual_brake', 'table'=>'car_base'],
-    [ 'origin'=>'基本参数-实测油耗(L/100km)',           'alias'=>'actual_fueluse', 'table'=>'car_base'],
-    [ 'origin'=>'基本参数-工信部综合油耗(L/100km)',      'alias'=>'gerenal_fueluse', 'table'=>'car_base'],
-    [ 'origin'=>'基本参数-实测离地间隙(mm)',            'alias'=>'actual_ground', 'table'=>'car_base'],
-    [ 'origin'=>'基本参数-整车质保',        'alias'=>'quality_guarantee', 'table'=>'car_base'],
-    [ 'origin'=>'基本参数-能源类型',        'alias'=>'energy_type', 'table'=>'car_base'],
-    [ 'origin'=>'基本参数-最大功率(kW)',    'alias'=>'max_power', 'table'=>'car_base'],
-    [ 'origin'=>'基本参数-最大扭矩(N・m)',   'alias'=>'max_torque', 'table'=>'car_base'],
-    //[ 'origin'=>'基本参数-纯电续航里程',      'alias'=>'electric_cruise', 'table'=>'car_base'],
-    //[ 'origin'=>'基本参数-电池充电时间',      'alias'=>'electric_power', 'table'=>'car_base'],
-    //[ 'origin'=>'基本参数-快充电量百分比',     'alias'=>'fast_charge', 'table'=>'car_base'],
-
-    [ 'origin'=>'车身-长度(mm)',               'alias'=>'length', 'table'=>'car_body'],
-    [ 'origin'=>'车身-宽度(mm)',               'alias'=>'width', 'table'=>'car_body'],
-    [ 'origin'=>'车身-高度(mm)',               'alias'=>'height', 'table'=>'car_body'],
-    [ 'origin'=>'车身-轴距(mm)',               'alias'=>'shaft_distance', 'table'=>'car_body'],
-    [ 'origin'=>'车身-前轮距(mm)',               'alias'=>'front_wheels_gap', 'table'=>'car_body'],
-    [ 'origin'=>'车身-后轮距(mm)',               'alias'=>'back_wheels_gap', 'table'=>'car_body'],
-    [ 'origin'=>'车身-最小离地间隙(mm)',               'alias'=>'min_ground', 'table'=>'car_body'],
-    [ 'origin'=>'车身-整备质量(kg)',               'alias'=>'total_weight', 'table'=>'car_body'],
-    [ 'origin'=>'车身-车身结构',               'alias'=>'body_struct', 'table'=>'car_body'],
-    [ 'origin'=>'车身-车门数(个)',               'alias'=>'doors', 'table'=>'car_body'],
-    [ 'origin'=>'车身-座位数(个)',               'alias'=>'seats', 'table'=>'car_body'],
-    [ 'origin'=>'车身-油箱容积(L)',               'alias'=>'fuel_vol', 'table'=>'car_body'],
-    [ 'origin'=>'车身-行李厢容积(L)',               'alias'=>'cargo_vol', 'table'=>'car_body'],
-    [ 'origin'=>'车身-后排车门开启方式',               'alias'=>'open_type', 'table'=>'car_body'],
-    [ 'origin'=>'车身-货箱尺寸(mm)',               'alias'=>'cargo_size', 'table'=>'car_body'],
-    [ 'origin'=>'车身-最大载重质量(kg)',               'alias'=>'carry_cap', 'table'=>'car_body'],
-
-    [ 'origin'=>'发动机-发动机型号', 'alias'=>'engine_type', 'table'=>'car_engine'],
-    [ 'origin'=>'发动机-排量(mL)', 'alias'=>'cc', 'table'=>'car_engine'],
-    [ 'origin'=>'发动机-进气形式', 'alias'=>'air_intake', 'table'=>'car_engine'],
-    [ 'origin'=>'发动机-气缸排列形式', 'alias'=>'cylinder_arrange', 'table'=>'car_engine'],
-    [ 'origin'=>'发动机-气缸数(个)', 'alias'=>'cylinders', 'table'=>'car_engine'],
-    [ 'origin'=>'发动机-每缸气门数(个)', 'alias'=>'valves', 'table'=>'car_engine'],
-    [ 'origin'=>'发动机-压缩比', 'alias'=>'compress_rate', 'table'=>'car_engine'],
-    [ 'origin'=>'发动机-配气机构', 'alias'=>'valve_machanism', 'table'=>'car_engine'],
-    [ 'origin'=>'发动机-缸径(mm)', 'alias'=>'cylinder_radius', 'table'=>'car_engine'],
-    [ 'origin'=>'发动机-行程(mm)', 'alias'=>'stroke', 'table'=>'car_engine'],
-    [ 'origin'=>'发动机-最大马力(Ps)', 'alias'=>'engine_hp', 'table'=>'car_engine'],
-    [ 'origin'=>'发动机-最大功率(kW)', 'alias'=>'engine_power', 'table'=>'car_engine'],
-    [ 'origin'=>'发动机-最大功率转速(rpm)', 'alias'=>'engine_rpm', 'table'=>'car_engine'],
-    [ 'origin'=>'发动机-最大扭矩(N・m)', 'alias'=>'engine_torque', 'table'=>'car_engine'],
-    [ 'origin'=>'发动机-最大扭矩转速(rpm)', 'alias'=>'torque_rpm', 'table'=>'car_engine'],
-    [ 'origin'=>'发动机-发动机特有技术', 'alias'=>'tech_spec', 'table'=>'car_engine'],
-    [ 'origin'=>'发动机-燃料形式', 'alias'=>'engine_energy', 'table'=>'car_engine'],
-    [ 'origin'=>'发动机-燃油标号', 'alias'=>'roz', 'table'=>'car_engine'],
-    [ 'origin'=>'发动机-供油方式', 'alias'=>'oil_drive', 'table'=>'car_engine'],
-    [ 'origin'=>'发动机-缸盖材料', 'alias'=>'cylinder_cover', 'table'=>'car_engine'],
-    [ 'origin'=>'发动机-缸体材料', 'alias'=>'cylinder_body', 'table'=>'car_engine'],
-    [ 'origin'=>'发动机-环保标准', 'alias'=>'environmental_standard', 'table'=>'car_engine'],
-
-    [ 'origin'=>'电动机-电机类型', 'alias'=>'motor_type', 'table'=>'car_motor'],
-    [ 'origin'=>'电动机-电动机总功率(kW)', 'alias'=>'motor_power', 'table'=>'car_motor'],
-    [ 'origin'=>'电动机-电动机总扭矩(N・m)', 'alias'=>'motor_torque', 'table'=>'car_motor'],
-    [ 'origin'=>'电动机-前电动机最大功率(kW)', 'alias'=>'motor_front_power', 'table'=>'car_motor'],
-    [ 'origin'=>'电动机-前电动机最大扭矩(N・m)', 'alias'=>'motor_front_torque', 'table'=>'car_motor'],
-    [ 'origin'=>'电动机-后电动机最大功率(kW)', 'alias'=>'motor_back_power', 'table'=>'car_motor'],
-    [ 'origin'=>'电动机-后电动机最大扭矩(N・m)', 'alias'=>'motor_back_torque', 'table'=>'car_motor'],
-    [ 'origin'=>'电动机-系统综合功率(kW)', 'alias'=>'sys_power', 'table'=>'car_motor'],
-    [ 'origin'=>'电动机-系统综合扭矩(N・m)', 'alias'=>'sys_torque', 'table'=>'car_motor'],
-    [ 'origin'=>'电动机-驱动电机数', 'alias'=>'motor_num', 'table'=>'car_motor'],
-    [ 'origin'=>'电动机-电机布局', 'alias'=>'motor_arrange', 'table'=>'car_motor'],
-    [ 'origin'=>'电动机-电池类型', 'alias'=>'bat_type', 'table'=>'car_motor'],
-    [ 'origin'=>'电动机-工信部续航里程(km)', 'alias'=>'mileage', 'table'=>'car_motor'],
-    [ 'origin'=>'电动机-电池容量(kWh)', 'alias'=>'bat_cap', 'table'=>'car_motor'],
-    [ 'origin'=>'电动机-百公里耗电量(kWh/100km)', 'alias'=>'bat_use', 'table'=>'car_motor'],
-    [ 'origin'=>'电动机-电池组质保', 'alias'=>'bat_guarantee', 'table'=>'car_motor'],
-    [ 'origin'=>'电动机-电池充电时间', 'alias'=>'bat_charge', 'table'=>'car_motor'],
-    [ 'origin'=>'电动机-快充电量(%)', 'alias'=>'fast_charge', 'table'=>'car_motor'],
-    [ 'origin'=>'电动机-充电桩价格', 'alias'=>'charge_pile_price', 'table'=>'car_motor'],
-
-    [ 'origin'=>'变速箱-简称', 'alias'=>'gearbox_name', 'table'=>'car_gearbox'],
-    [ 'origin'=>'变速箱-挡位个数', 'alias'=>'gears_num', 'table'=>'car_gearbox'],
-    [ 'origin'=>'变速箱-变速箱类型', 'alias'=>'gears_type', 'table'=>'car_gearbox'],
-
-    [ 'origin'=>'底盘转向-驱动方式', 'alias'=>'drive_method', 'table'=>'car_underpan'],
-    [ 'origin'=>'底盘转向-前悬架类型', 'alias'=>'susp_front_type', 'table'=>'car_underpan'],
-    [ 'origin'=>'底盘转向-后悬架类型', 'alias'=>'susp_back_type', 'table'=>'car_underpan'],
-    [ 'origin'=>'底盘转向-助力类型', 'alias'=>'assist_type', 'table'=>'car_underpan'],
-    [ 'origin'=>'底盘转向-车体结构', 'alias'=>'structure', 'table'=>'car_underpan'],
-    [ 'origin'=>'底盘转向-四驱形式', 'alias'=>'four_wheel_drive', 'table'=>'car_underpan'],
-    [ 'origin'=>'底盘转向-中央差速器结构', 'alias'=>'central_diff', 'table'=>'car_underpan'],
-
-    [ 'origin'=>'车轮制动-前制动器类型', 'alias'=>'front_brake', 'table'=>'car_brake'],
-    [ 'origin'=>'车轮制动-后制动器类型', 'alias'=>'back_brake', 'table'=>'car_brake'],
-    [ 'origin'=>'车轮制动-驻车制动类型', 'alias'=>'park_brake', 'table'=>'car_brake'],
-    [ 'origin'=>'车轮制动-前轮胎规格', 'alias'=>'front_wheel_size', 'table'=>'car_brake'],
-    [ 'origin'=>'车轮制动-后轮胎规格', 'alias'=>'back_wheel_size', 'table'=>'car_brake'],
-    [ 'origin'=>'车轮制动-备胎规格', 'alias'=>'backup_wheel', 'table'=>'car_brake'],
-
-    [ 'origin'=>'主/被动安全装备-主驾驶座安全气囊', 'alias'=>'prim_srs', 'table'=>'car_secure'],
-    [ 'origin'=>'主/被动安全装备-副驾驶座安全气囊', 'alias'=>'vice_srs', 'table'=>'car_secure'],
-    //[ 'origin'=>'主/被动安全装备-前/后排侧气囊', 'alias'=>'secure2', 'table'=>'car_secure'],
-    //[ 'origin'=>'主/被动安全装备-前/后排头部气囊(气帘)', 'alias'=>'secure3', 'table'=>'car_secure'],
-    [ 'origin'=>'主/被动安全装备-膝部气囊', 'alias'=>'knee_srs', 'table'=>'car_secure'],
-    [ 'origin'=>'主/被动安全装备-胎压监测装置', 'alias'=>'tire_pres_monitor', 'table'=>'car_secure'],
-    [ 'origin'=>'主/被动安全装备-零胎压继续行驶', 'alias'=>'zero_tire_pres', 'table'=>'car_secure'],
-    [ 'origin'=>'主/被动安全装备-安全带未系提示', 'alias'=>'unbelt_notice', 'table'=>'car_secure'],
-    [ 'origin'=>'主/被动安全装备-ISOFIX儿童座椅接口', 'alias'=>'isofix', 'table'=>'car_secure'],
-    [ 'origin'=>'主/被动安全装备-ABS防抱死', 'alias'=>'anti_lock', 'table'=>'car_secure'],
-    [ 'origin'=>'主/被动安全装备-制动力分配(EBD/CBC等)', 'alias'=>'bfd', 'table'=>'car_secure'],
-    [ 'origin'=>'主/被动安全装备-刹车辅助(EBA/BAS/BA等)', 'alias'=>'bas', 'table'=>'car_secure'],
-    [ 'origin'=>'主/被动安全装备-牵引力控制(ASR/TCS/TRC等)', 'alias'=>'tcs', 'table'=>'car_secure'],
-    [ 'origin'=>'主/被动安全装备-车身稳定控制(ESC/ESP/DSC等)', 'alias'=>'stable_control', 'table'=>'car_secure'],
-    [ 'origin'=>'主/被动安全装备-并线辅助', 'alias'=>'bsa', 'table'=>'car_secure'],
-    [ 'origin'=>'主/被动安全装备-车道偏离预警系统', 'alias'=>'ldw', 'table'=>'car_secure'],
-    [ 'origin'=>'主/被动安全装备-主动刹车/主动安全系统', 'alias'=>'abs', 'table'=>'car_secure'],
-    [ 'origin'=>'主/被动安全装备-夜视系统', 'alias'=>'nvs', 'table'=>'car_secure'],
-    [ 'origin'=>'主/被动安全装备-疲劳驾驶提示', 'alias'=>'tired_drive', 'table'=>'car_secure'],
-    //[ 'origin'=>'主/被动安全装备-主/副驾驶座安全气囊', 'alias'=>'secure19', 'table'=>'car_secure'],
-    [ 'origin'=>'主/被动安全装备-前排侧气囊', 'alias'=>'front_side_airbag', 'table'=>'car_secure'],
-    [ 'origin'=>'主/被动安全装备-后排侧气囊', 'alias'=>'back_side_airbag', 'table'=>'car_secure'],
-    [ 'origin'=>'主/被动安全装备-前排头部气囊(气帘)', 'alias'=>'front_head_airbag', 'table'=>'car_secure'],
-    [ 'origin'=>'主/被动安全装备-后排头部气囊(气帘)', 'alias'=>'back_head_airbag', 'table'=>'car_secure'],
-
-    [ 'origin'=>'辅助/操控配置-前驻车雷达', 'alias'=>'frontp_radar', 'table'=>'car_oper'],
-    [ 'origin'=>'辅助/操控配置-后驻车雷达', 'alias'=>'backp_radar', 'table'=>'car_oper'],
-    [ 'origin'=>'辅助/操控配置-倒车视频影像', 'alias'=>'reverse_video', 'table'=>'car_oper'],
-    [ 'origin'=>'辅助/操控配置-全景摄像头', 'alias'=>'panorama', 'table'=>'car_oper'],
-    [ 'origin'=>'辅助/操控配置-定速巡航', 'alias'=>'cruise_ctrl', 'table'=>'car_oper'],
-    [ 'origin'=>'辅助/操控配置-自适应巡航', 'alias'=>'self_adpt_cruise', 'table'=>'car_oper'],
-    [ 'origin'=>'辅助/操控配置-自动泊车入位', 'alias'=>'auto_park_in', 'table'=>'car_oper'],
-    [ 'origin'=>'辅助/操控配置-发动机启停技术', 'alias'=>'engine_start_stop', 'table'=>'car_oper'],
-    [ 'origin'=>'辅助/操控配置-自动驾驶技术', 'alias'=>'auto_drive', 'table'=>'car_oper'],
-    [ 'origin'=>'辅助/操控配置-上坡辅助', 'alias'=>'hac', 'table'=>'car_oper'],
-    [ 'origin'=>'辅助/操控配置-自动驻车', 'alias'=>'auto_park', 'table'=>'car_oper'],
-    [ 'origin'=>'辅助/操控配置-陡坡缓降', 'alias'=>'hdc', 'table'=>'car_oper'],
-    [ 'origin'=>'辅助/操控配置-可变悬架', 'alias'=>'variable_susp', 'table'=>'car_oper'],
-    [ 'origin'=>'辅助/操控配置-空气悬架', 'alias'=>'air_susp', 'table'=>'car_oper'],
-    [ 'origin'=>'辅助/操控配置-电磁感应悬架', 'alias'=>'e_susp', 'table'=>'car_oper'],
-    [ 'origin'=>'辅助/操控配置-可变转向比', 'alias'=>'vgrs', 'table'=>'car_oper'],
-    [ 'origin'=>'辅助/操控配置-前桥限滑差速器/差速锁', 'alias'=>'front_diff_lock', 'table'=>'car_oper'],
-    [ 'origin'=>'辅助/操控配置-中央差速器锁止功能', 'alias'=>'central_diff_lock', 'table'=>'car_oper'],
-    [ 'origin'=>'辅助/操控配置-后桥限滑差速器/差速锁', 'alias'=>'back_diff_lock', 'table'=>'car_oper'],
-    [ 'origin'=>'辅助/操控配置-整体主动转向系统', 'alias'=>'ads', 'table'=>'car_oper'],
-    //[ 'origin'=>'辅助/操控配置-前/后驻车雷达', 'alias'=>'oper20', 'table'=>'car_oper'],
-
-    [ 'origin'=>'外部/防盗配置-电动天窗', 'alias'=>'e_sunroof', 'table'=>'car_guard'],
-    [ 'origin'=>'外部/防盗配置-全景天窗', 'alias'=>'pano_sunroof', 'table'=>'car_guard'],
-    [ 'origin'=>'外部/防盗配置-多天窗', 'alias'=>'sunroofs', 'table'=>'car_guard'],
-    [ 'origin'=>'外部/防盗配置-运动外观套件', 'alias'=>'sport_package', 'table'=>'car_guard'],
-    [ 'origin'=>'外部/防盗配置-铝合金轮圈', 'alias'=>'alloy_wheel', 'table'=>'car_guard'],
-    [ 'origin'=>'外部/防盗配置-电动吸合门', 'alias'=>'e_suction_door', 'table'=>'car_guard'],
-    [ 'origin'=>'外部/防盗配置-侧滑门', 'alias'=>'slide_door', 'table'=>'car_guard'],
-    [ 'origin'=>'外部/防盗配置-电动后备厢', 'alias'=>'e_cargo', 'table'=>'car_guard'],
-    [ 'origin'=>'外部/防盗配置-感应后备厢', 'alias'=>'react_cargo', 'table'=>'car_guard'],
-    [ 'origin'=>'外部/防盗配置-车顶行李架', 'alias'=>'roof_rack', 'table'=>'car_guard'],
-    [ 'origin'=>'外部/防盗配置-发动机电子防盗', 'alias'=>'engine_e_guard', 'table'=>'car_guard'],
-    [ 'origin'=>'外部/防盗配置-车内中控锁', 'alias'=>'e_ctrl_lock', 'table'=>'car_guard'],
-    [ 'origin'=>'外部/防盗配置-遥控钥匙', 'alias'=>'remote_key', 'table'=>'car_guard'],
-    [ 'origin'=>'外部/防盗配置-无钥匙启动系统', 'alias'=>'keyless_start', 'table'=>'car_guard'],
-    [ 'origin'=>'外部/防盗配置-无钥匙进入系统', 'alias'=>'keyless_enter', 'table'=>'car_guard'],
-    [ 'origin'=>'外部/防盗配置-远程启动', 'alias'=>'remote_start', 'table'=>'car_guard'],
-
-    [ 'origin'=>'内部配置-皮质方向盘', 'alias'=>'leather_steering', 'table'=>'car_inside'],
-    [ 'origin'=>'内部配置-方向盘调节', 'alias'=>'steer_adjt', 'table'=>'car_inside'],
-    [ 'origin'=>'内部配置-方向盘电动调节', 'alias'=>'steer_e_adjt', 'table'=>'car_inside'],
-    [ 'origin'=>'内部配置-多功能方向盘', 'alias'=>'functional_steer', 'table'=>'car_inside'],
-    [ 'origin'=>'内部配置-方向盘换挡', 'alias'=>'steer_shift', 'table'=>'car_inside'],
-    [ 'origin'=>'内部配置-方向盘加热', 'alias'=>'steer_heat', 'table'=>'car_inside'],
-    [ 'origin'=>'内部配置-方向盘记忆', 'alias'=>'steer_mem', 'table'=>'car_inside'],
-    [ 'origin'=>'内部配置-行车电脑显示屏', 'alias'=>'computer_scr', 'table'=>'car_inside'],
-    [ 'origin'=>'内部配置-全液晶仪表盘', 'alias'=>'lcd_panel', 'table'=>'car_inside'],
-    [ 'origin'=>'内部配置-HUD抬头数字显示', 'alias'=>'hud', 'table'=>'car_inside'],
-    [ 'origin'=>'内部配置-内置行车记录仪', 'alias'=>'car_dvr', 'table'=>'car_inside'],
-    [ 'origin'=>'内部配置-主动降噪', 'alias'=>'anc', 'table'=>'car_inside'],
-    [ 'origin'=>'内部配置-手机无线充电', 'alias'=>'wireless_charge', 'table'=>'car_inside'],
-
-    [ 'origin'=>'座椅配置-座椅材质', 'alias'=>'seat_mat', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-运动风格座椅', 'alias'=>'sport_seat', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-座椅高低调节', 'alias'=>'height_adjt', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-腰部支撑调节', 'alias'=>'lumbar_support', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-肩部支撑调节', 'alias'=>'shoulder_support', 'table'=>'car_seat'],
-    //[ 'origin'=>'座椅配置-主/副驾驶座电动调节', 'alias'=>'seat5', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-第二排靠背角度调节', 'alias'=>'snd_backrest_adjt', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-第二排座椅移动', 'alias'=>'snd_seat_mv', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-后排座椅电动调节', 'alias'=>'back_seat_adjt', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-副驾驶位后排可调节按钮', 'alias'=>'vice_adjt_btn', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-电动座椅记忆', 'alias'=>'e_seat_mem', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-前排座椅加热', 'alias'=>'front_seat_heat', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-后排座椅加热', 'alias'=>'back_seat_heat', 'table'=>'car_seat'],
-    //[ 'origin'=>'座椅配置-前/后排座椅通风', 'alias'=>'seat13', 'table'=>'car_seat'],
-    //[ 'origin'=>'座椅配置-前/后排座椅按摩', 'alias'=>'seat14', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-第二排独立座椅', 'alias'=>'snd_row_seat', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-第三排座椅', 'alias'=>'third_row_seat', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-后排座椅放倒方式', 'alias'=>'back_seat_down', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-前中央扶手', 'alias'=>'front_handrail', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-后中央扶手', 'alias'=>'back_handrail', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-后排杯架', 'alias'=>'back_cup_hold', 'table'=>'car_seat'],
-    //[ 'origin'=>'座椅配置-可加热/制冷杯架', 'alias'=>'seat21', 'table'=>'car_seat'],
-    //[ 'origin'=>'座椅配置-前/后排座椅加热', 'alias'=>'seat22', 'table'=>'car_seat'],
-    //[ 'origin'=>'座椅配置-前/后中央扶手', 'alias'=>'seat23', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-主驾驶座电动调节', 'alias'=>'prim_e_adjt', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-副驾驶座电动调节', 'alias'=>'vice_e_adjt', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-前排座椅通风', 'alias'=>'front_vent', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-后排座椅通风', 'alias'=>'back_vent', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-前排座椅按摩', 'alias'=>'front_masg', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-后排座椅按摩', 'alias'=>'back_masg', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-可加热冷杯架', 'alias'=>'can_heat_cup', 'table'=>'car_seat'],
-    [ 'origin'=>'座椅配置-可加制冷杯架', 'alias'=>'can_cold_cup', 'table'=>'car_seat'],
-
-    [ 'origin'=>'多媒体配置-GPS导航系统', 'alias'=>'gps', 'table'=>'car_media'],
-    [ 'origin'=>'多媒体配置-定位互动服务', 'alias'=>'gps_interact', 'table'=>'car_media'],
-    [ 'origin'=>'多媒体配置-中控台彩色大屏', 'alias'=>'colorful_scr', 'table'=>'car_media'],
-    [ 'origin'=>'多媒体配置-中控台彩色大屏尺寸', 'alias'=>'colorful_scr_size', 'table'=>'car_media'],
-    [ 'origin'=>'多媒体配置-中控液晶屏分屏显示', 'alias'=>'lcd_sep', 'table'=>'car_media'],
-    [ 'origin'=>'多媒体配置-蓝牙/车载电话', 'alias'=>'blueteeth', 'table'=>'car_media'],
-    [ 'origin'=>'多媒体配置-手机互联/映射', 'alias'=>'mobile_map', 'table'=>'car_media'],
-    [ 'origin'=>'多媒体配置-车联网', 'alias'=>'network', 'table'=>'car_media'],
-    [ 'origin'=>'多媒体配置-车载电视', 'alias'=>'television', 'table'=>'car_media'],
-    [ 'origin'=>'多媒体配置-后排液晶屏', 'alias'=>'back_lcd', 'table'=>'car_media'],
-    [ 'origin'=>'多媒体配置-220V/230V电源', 'alias'=>'back_power_supply', 'table'=>'car_media'],
-    [ 'origin'=>'多媒体配置-外接音源接口', 'alias'=>'external_audio', 'table'=>'car_media'],
-    [ 'origin'=>'多媒体配置-CD/DVD', 'alias'=>'cddvd', 'table'=>'car_media'],
-    [ 'origin'=>'多媒体配置-扬声器品牌', 'alias'=>'speaker_brand', 'table'=>'car_media'],
-    [ 'origin'=>'多媒体配置-扬声器数量', 'alias'=>'speaker_num', 'table'=>'car_media'],
-
-    [ 'origin'=>'灯光配置-近光灯', 'alias'=>'low_beam', 'table'=>'car_light'],
-    [ 'origin'=>'灯光配置-远光灯', 'alias'=>'high_beam', 'table'=>'car_light'],
-    [ 'origin'=>'灯光配置-LED日间行车灯', 'alias'=>'led_beam', 'table'=>'car_light'],
-    [ 'origin'=>'灯光配置-自适应远近光', 'alias'=>'adaptive_beam', 'table'=>'car_light'],
-    [ 'origin'=>'灯光配置-自动头灯', 'alias'=>'head_light', 'table'=>'car_light'],
-    [ 'origin'=>'灯光配置-转向辅助灯', 'alias'=>'turn_light', 'table'=>'car_light'],
-    [ 'origin'=>'灯光配置-转向头灯', 'alias'=>'turn_head_light', 'table'=>'car_light'],
-    [ 'origin'=>'灯光配置-前雾灯', 'alias'=>'front_fog_lamp', 'table'=>'car_light'],
-    [ 'origin'=>'灯光配置-大灯高度可调', 'alias'=>'light_height_adjt', 'table'=>'car_light'],
-    [ 'origin'=>'灯光配置-大灯清洗装置', 'alias'=>'light_clean_dev', 'table'=>'car_light'],
-    [ 'origin'=>'灯光配置-车内氛围灯', 'alias'=>'mood_light', 'table'=>'car_light'],
-
-    [ 'origin'=>'玻璃/后视镜-前电动车窗', 'alias'=>'front_power_window', 'table'=>'car_glass'],
-    [ 'origin'=>'玻璃/后视镜-后电动车窗', 'alias'=>'back_power_window', 'table'=>'car_glass'],
-    [ 'origin'=>'玻璃/后视镜-车窗一键升降', 'alias'=>'e_lift_window', 'table'=>'car_glass'],
-    [ 'origin'=>'玻璃/后视镜-车窗防夹手功能', 'alias'=>'anti_pinch_hand', 'table'=>'car_glass'],
-    [ 'origin'=>'玻璃/后视镜-防紫外线/隔热玻璃', 'alias'=>'insulating_glass', 'table'=>'car_glass'],
-    [ 'origin'=>'玻璃/后视镜-后视镜电动调节', 'alias'=>'e_adjt_rearview', 'table'=>'car_glass'],
-    [ 'origin'=>'玻璃/后视镜-后视镜加热', 'alias'=>'heat_rearview', 'table'=>'car_glass'],
-    //[ 'origin'=>'玻璃/后视镜-内/外后视镜自动防眩目', 'alias'=>'glass7', 'table'=>'car_glass'],
-    [ 'origin'=>'玻璃/后视镜-流媒体车内后视镜', 'alias'=>'stream_media_rearview', 'table'=>'car_glass'],
-    [ 'origin'=>'玻璃/后视镜-后视镜电动折叠', 'alias'=>'power_mirror', 'table'=>'car_glass'],
-    [ 'origin'=>'玻璃/后视镜-后视镜记忆', 'alias'=>'mirror_mem', 'table'=>'car_glass'],
-    [ 'origin'=>'玻璃/后视镜-后风挡遮阳帘', 'alias'=>'abat_vent', 'table'=>'car_glass'],
-    [ 'origin'=>'玻璃/后视镜-后排侧遮阳帘', 'alias'=>'side_abat_vent', 'table'=>'car_glass'],
-    [ 'origin'=>'玻璃/后视镜-后排侧隐私玻璃', 'alias'=>'side_priv_glass', 'table'=>'car_glass'],
-    [ 'origin'=>'玻璃/后视镜-遮阳板化妆镜', 'alias'=>'sun_shield', 'table'=>'car_glass'],
-    [ 'origin'=>'玻璃/后视镜-后雨刷', 'alias'=>'back_wiper', 'table'=>'car_glass'],
-    [ 'origin'=>'玻璃/后视镜-感应雨刷', 'alias'=>'react_wiper', 'table'=>'car_glass'],
-    [ 'origin'=>'玻璃/后视镜-内后视镜自动防眩目', 'alias'=>'dimming_mirror_in', 'table'=>'car_glass'],
-    [ 'origin'=>'玻璃/后视镜-外后视镜自动防眩目', 'alias'=>'dimming_mirror_out', 'table'=>'car_glass'],
-    //[ 'origin'=>'玻璃/后视镜-前/后电动车窗', 'alias'=>'glass19', 'table'=>'car_glass'],
-
-    [ 'origin'=>'空调/冰箱-空调控制方式', 'alias'=>'air_type', 'table'=>'car_air'],
-    [ 'origin'=>'空调/冰箱-后排独立空调', 'alias'=>'back_air', 'table'=>'car_air'],
-    [ 'origin'=>'空调/冰箱-后座出风口', 'alias'=>'back_outlet', 'table'=>'car_air'],
-    [ 'origin'=>'空调/冰箱-温度分区控制', 'alias'=>'temper_zone_ctrl', 'table'=>'car_air'],
-    [ 'origin'=>'空调/冰箱-车内空气调节/花粉过滤', 'alias'=>'air_adjt', 'table'=>'car_air'],
-    [ 'origin'=>'空调/冰箱-车载空气净化器', 'alias'=>'air_cleaner', 'table'=>'car_air'],
-    [ 'origin'=>'空调/冰箱-车载冰箱', 'alias'=>'car_fridge', 'table'=>'car_air'],
-];

helper/car_convert/formater.php

@@ -1,391 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: lionared
- * Date: 2018/1/11
- * Time: 上午12:57
- */
-
-namespace car_convert;
-
-class car_formater
-{
-    public function format($data)
-    {
-        foreach ($data as $key => $val)
-        {
-            if($key == 'market_price_str') {
-                if(!isset($data['market_price']) || intval($data['market_price']) <= 0) {
-                    $data['market_price'] = $this->price($val);
-                }
-            }
-            elseif($key == 'car_level_str') {
-                $data['car_level'] = $this->car_level($val);
-            }
-            elseif($key == 'country_str') {
-                $data['country_id'] = $this->country_format($val);
-            }
-            elseif($key == 'produce_type_str') {
-                $data['produce_type'] = $this->produce_type($val);
-            }
-            elseif($key == 'market_time') {
-                $data['market_time'] = $this->market_time($val);
-            }
-            elseif ($key == 'energy_type_str') {
-                $data['energy_type'] = $this->energy_type($val);
-            }
-            else {
-
-            }
-        }
-        return $data;
-    }
-
-    private function price($value)
-    {
-        if(strpos('~',$value)) {
-            $price = explode('~',$value)[0];
-        }
-        else {
-            $price = $value;
-        }
-
-        preg_match_all('/\d+.\d+/', $price, $arr);
-
-        if(isset($arr[0][0])) {
-            $price_float = floatval($arr[0][0]) * 10000;
-            return $price_float;
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    private function car_level($val) {
-        $car_levels = ['MPV','中型SUV','中型车','中大型SUV','中大型车','大型SUV','大型车','小型SUV',
-            '小型车','微卡','微型车','微面','皮卡','紧凑型SUV','紧凑型车','跑车','轻客'];
-        if(in_array($val, $car_levels)) {
-            $ret = array_search($val, $car_levels) + 1;
-        } else {
-            $ret = 0;
-        }
-
-        return $ret;
-    }
-
-    private function country_format($val)
-    {
-        $countries = ['中国','德国','意大利','捷克','日本','法国','瑞典','美国','英国','韩国'];
-        if(in_array($val, $countries)) {
-            $ret = array_search($val, $countries) + 1;
-        } else {
-            $ret = 0;
-        }
-
-        return $ret;
-    }
-
-    private function produce_type($val)
-    {
-        if($val == "国产")
-        {
-            $ret = 1;
-        }
-        elseif ($val == "进口")
-        {
-            $ret = 2;
-        }
-        else {
-            $ret = 0;
-        }
-        return $ret;
-    }
-
-    private function energy_type($val)
-    {
-        $energy_types = ['增程式','插电式混合动力','柴油','汽油','油电混合','纯电动'];
-        if(in_array($val, $energy_types)) {
-            $ret = array_search($val, $energy_types) + 1;
-        } else {
-            $ret = 0;
-        }
-
-        return $ret;
-    }
-
-    private function market_time($val)
-    {
-        if(preg_match_all('/\./', $val)) {
-            $date = preg_replace("/\./", "-", $val);
-            $date = date("Y-m", strtotime($date));
-            return $date;
-        } else {
-            return 0;
-        }
-    }
-}
-
-class update_formater
-{
-    public function format($data)
-    {
-        foreach ($data as $key => $val)
-        {
-            if($key == 'market_time') {
-                $data['market_time'] = $this->market_time($val);
-            }
-            elseif ($key == 'type_id') {
-                $data['type_id'] = intval($val);
-            }
-            elseif($key == 'official_speedup') {
-                $data['official_speedup'] = floatval($val);
-            }
-            elseif ($key == 'actual_speedup') {
-                $data['actual_speedup'] = floatval($val);
-            }
-            elseif ($key == 'actual_brake') {
-                $data['actual_brake'] = floatval($val);
-            }
-            elseif ($key == 'actual_fueluse') {
-                $data['actual_fueluse'] = floatval($val);
-            }
-            elseif ($key == 'gerenal_fueluse') {
-                $data['gerenal_fueluse'] = floatval($val);
-            }
-            elseif ($key == 'actual_ground') {
-                $data['actual_ground'] = intval($val);
-            }
-            elseif ($key == 'quality_guarantee') {
-                $data['quality_guarantee'] = $this->quality_guarantee($val);
-            }
-            elseif ($key == 'max_power') {
-                $data['max_power'] = floatval($val);
-            }
-            elseif ($key == 'max_torque') {
-                $data['max_torque'] = intval($val);
-            }
-            //body info
-            elseif ($key == 'cargo_vol') {
-                $data['cargo_vol'] = intval($val);
-            }
-            elseif ($key == 'open_type') {
-                $data['open_type'] = $this->open_type($val);
-            }
-            elseif ($key == 'cargo_size') {
-                $data['cargo_size'] = trim($val);
-            }
-            elseif ($key =='carry_cap') {
-                $data['carry_cap'] = intval($val);
-            }
-            elseif ($key == 'engine') {
-                $data['engine'] = trim($val);
-            }
-            //engine info
-            elseif ($key == 'cc') {
-                $data['cc'] = intval($val);
-            }
-            elseif ($key == 'air_intake') {
-                $data['air_intake'] = $this->air_intake($val);
-            }
-            elseif ($key == 'cylinder_arrange') {
-                $data['cylinder_arrange'] = $this->cylinder_arrange($val);
-            }
-            elseif ($key == 'cylinders') {
-                $data['cylinders'] = $this->cylinders($val);
-            }
-            elseif ($key == 'cylinder_radius') {
-                $data['cylinder_radius'] = $this->cylinder_radius($val);
-            }
-            elseif ($key == 'stroke') {
-                $data['stroke'] = $this->stroke($val);
-            }
-            elseif ($key == 'engine_hp') {
-                $data['engine_hp'] = $this->engine_hp($val);
-            }
-            elseif ($key == 'engine_power') {
-                $data['engine_power'] = $this->engine_power($val);
-            }
-            elseif ($key == 'engine_rpm') {
-                $data['engine_rpm'] = $this->engine_rpm($val);
-            }
-            elseif ($key == 'engine_torque') {
-                $data['engine_torque'] = $this->engine_torque($val);
-            }
-            elseif ($key == 'roz') {
-                $data['roz'] = $this->roz($val);
-            }
-            elseif ($key == 'oil_drive') {
-                $data['oil_drive'] = $this->oil_drive($val);
-            }
-            elseif ($key == 'cylinder_cover') {
-                $data['cylinder_cover'] = $this->cylinder_cover($val);
-            }
-            elseif ($key == 'cylinder_body') {
-                $data['cylinder_body'] = $this->cylinder_body($val);
-            }
-            elseif ($key == 'environmental_standard') {
-                $data['environmental_standard'] = $this->environmental_standard($val);
-            }
-            //变速箱
-            /*elseif ($key == 'gearbox_name') {
-                $data['drive_type'] = ;
-            }*/
-            else {
-
-            }
-        }
-        return $data;
-    }
-
-    private function drive_type($val)
-    {
-        if(strpos($val,"手动") !== false) {
-            $ret = "手动";
-        }
-        elseif (strpos($val,"自动") !== false || strpos($val,"AMT") !== false) {
-            $ret = "自动";
-        }
-        else {
-            $ret = "";
-        }
-        return $ret;
-    }
-
-    private function environmental_standard($val)
-    {
-        $ret = trim($val);
-        if($ret == '0') {
-            $ret = "";
-        }
-        return $ret;
-    }
-
-    private function cylinder_body($val)
-    {
-        $ret = trim($val);
-        if($ret == '0') {
-            $ret = "";
-        }
-        return $ret;
-    }
-
-    private function cylinder_cover($val)
-    {
-        $ret = trim($val);
-        if($ret == '0') {
-            $ret = "";
-        }
-        return $ret;
-    }
-
-    private function oil_drive($val)
-    {
-        $ret = trim($val);
-        if($ret == '0') {
-            $ret = "";
-        }
-        return $ret;
-    }
-
-    private function roz($val)
-    {
-        $ret = trim($val);
-        if($ret == '0') {
-            $ret = "";
-        }
-        return $ret;
-    }
-
-    private function engine_torque($val)
-    {
-        $ret = floatval($val);
-        return $ret;
-    }
-
-    private function engine_rpm($val)
-    {
-        $ret = intval($val);
-        return $ret;
-    }
-
-    private function engine_power($val)
-    {
-        $ret = floatval($val);
-        return $ret;
-    }
-
-    private function engine_hp($val)
-    {
-        $ret = intval($val);
-        return $ret;
-    }
-
-    private function stroke($val)
-    {
-        $ret = floatval($val);
-        return $ret;
-    }
-
-    private function cylinder_radius($val)
-    {
-        $ret = floatval($val);
-        return $ret;
-    }
-
-    private function cylinders($val)
-    {
-        $ret = intval($val);
-        return $ret;
-    }
-
-    private function cylinder_arrange($val)
-    {
-        $ret = trim($val);
-        if($ret == '0' || $ret == '') {
-            $ret = "其他";
-        }
-        return $ret;
-    }
-
-    private function air_intake($val)
-    {
-        $ret = trim($val);
-        if($ret == '0') {
-            $ret = '';
-        }
-        return $ret;
-    }
-
-    private function open_type($val)
-    {
-        $ret = trim($val);
-        return $ret;
-    }
-
-    private function quality_guarantee($val)
-    {
-        $ret = strval($val);
-        if($ret == '0' || $ret == "" || $ret == "待查") {
-            $ret = "无";
-        }
-        return $ret;
-    }
-
-    private function official_speedup($val)
-    {
-        $val = floatval($val);
-        return $val;
-    }
-
-    private function market_time($val)
-    {
-        if(preg_match_all('/\./', $val)) {
-            $date = preg_replace("/\./", "-", $val);
-            $date = date("Y-m", strtotime($date));
-            return $date;
-        } else {
-            return 0;
-        }
-    }
-}

helper/car_convert/importer.php

@@ -1,171 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: lionared
- * Date: 2018/1/10
- * Time: 下午6:38
- */
-namespace car_convert;
-
-use Log;
-
-ini_set('auto_detect_line_endings', 1);
-require_once (BASE_ROOT_PATH . '/helper/car_convert/formater.php');
-
-class importer
-{
-    protected $_header;
-    protected $_delimiter = ';';
-    private $_alias = [];
-    private $_table_fileds;
-    private $_tables;
-
-    public function __construct($delimiter, $car_scope='all')
-    {
-        $this->_tables = ['car_base','car_body','car_engine','car_motor','car_gearbox','car_underpan','car_brake',
-            'car_secure','car_oper','car_guard','car_inside','car_seat','car_media','car_light','car_glass','car_air'];
-
-        $this->_delimiter = $delimiter;
-        $this->init($car_scope);
-    }
-
-    private function init($car_scope)
-    {
-        if(empty($this->_alias)) {
-            $this->_alias = require_once "$car_scope.alias.php";
-        }
-        $this->_table_fileds = [];
-        foreach ($this->_tables as $table) {
-            array_map(function($item) use ($table) {
-                if($item['table'] == $table) {
-                    $this->_table_fileds[$table][] = $item;
-                }
-            }, $this->_alias);
-        }
-
-        if(empty($this->_table_fileds)) return false;
-        return true;
-    }
-
-    public function run($filepath)
-    {
-        if(!is_file($filepath)) return false;
-
-        $encoding = $this->encoding($filepath);
-        if($encoding == false) return false;
-
-        $file = @fopen($filepath, 'r');
-        $i = 0;
-        $mod_car = Model();
-
-        while(!@feof($file))
-        {
-            if($line = @fgets($file))
-            {
-                Log::start_sql_log();
-                if($i == 0) {
-                    if(empty($this->_header)) {
-                        $this->_header = explode($this->_delimiter, trim(iconv($encoding, 'UTF-8', $line)));
-                    }
-                }
-                else {
-                    $data = explode($this->_delimiter, trim(iconv($encoding, 'UTF-8', $line)));
-                    $all = $this->retrieve_pos($this->_alias,$data);
-                    $table_data = $this->splice_table($this->_alias,$all);
-                    //Log::record(json_encode($table_data));
-
-                    $car_id = $mod_car->table('car_base')->insert($table_data['car_base']);
-
-                    foreach ($this->_tables as $tbname)
-                    {
-                        if($tbname != 'car_base' && $car_id != false) {
-                            $data = $table_data[$tbname];
-                            //$formater = new $tbname . "formater";
-                            $data['car_id'] = $car_id;
-                            $ret_id = $mod_car->table($tbname)->insert($data);
-                        }
-                    }
-                }
-                $i++;
-            }
-        }
-        @fclose($file);
-    }
-
-    public function update_db($filepath, $table_name, $field)
-    {
-        if(!is_file($filepath)) return false;
-
-        if(empty($table_name) || empty($field)) return false;
-
-        $encoding = $this->encoding($filepath);
-        if($encoding == false) return false;
-
-        $file = @fopen($filepath, 'r');
-        $i = 0;
-        $mod_car = Model();
-
-        while(!@feof($file))
-        {
-            if($line = @fgets($file))
-            {
-                Log::start_sql_log();
-                if($i == 0) {
-                    if(empty($this->_header)) {
-                        $this->_header = explode($this->_delimiter, trim(iconv($encoding, 'UTF-8', $line)));
-                    }
-                }
-                else {
-                    $data = explode($this->_delimiter, trim(iconv($encoding, 'UTF-8', $line)));
-                    $all = $this->retrieve_pos($this->_alias,$data);
-                    $table_data = $this->splice_table($this->_alias,$all);
-                    //Log::record(json_encode($table_data));
-
-                    $formater = new update_formater();
-                    $car_info = $formater->format($table_data[$table_name]);
-                    $update_car = $mod_car->table($table_name)
-                        ->where([ 'car_id'=>$i ])
-                        ->update([
-                            $field => $car_info[$field],
-                        ]);
-                }
-                $i++;
-            }
-        }
-        @fclose($file);
-    }
-
-    public function get_header()
-    {
-        return $this->_header;
-    }
-
-    private function retrieve_pos(array $alias, $data)
-    {
-        $arr = [];
-        foreach ($alias as $item) {
-            if(in_array($item['origin'], $this->_header)) {
-                $index = array_search($item['origin'], $this->_header);
-                $arr[$item['alias']] = $data[$index];
-            }
-        }
-        return $arr;
-    }
-
-    private function splice_table(array $alias, $data)
-    {
-        $arr = [];
-        foreach ($alias as $item) {
-            $key = $item['alias'];
-            $arr[$item['table']][$item['alias']] = $data[$key];
-        }
-        return $arr;
-    }
-
-    private function encoding($filepath)
-    {
-        $content = file_get_contents($filepath);
-        $encoding = mb_detect_encoding($content, ['GB2312','GBK','UTF-16','UCS-2','UTF-8','BIG5','ASCII']);
-        return $encoding;
-    }
-}

helper/login/ilogin.php

@@ -56,6 +56,7 @@ abstract class ILogin
         if(!empty($user_info)) {
             $info['member_nickname']  = $user_info['nickname'];
             $info['member_wxunionid'] = $user_info['unionid'];
+            $info['member_wxopenid']  = $user_info['openid'];
             $info['member_avatar']   = $user_info['headimgurl'];
             $info['member_sex']      = intval($user_info['sex']);
             $info['member_wechat_bind'] = 1;
@@ -118,7 +119,7 @@ abstract class ILogin
         if(!empty($user_info)) {
             $update['member_nickname']  = $user_info['nickname'];
             $update['member_wxunionid'] = $user_info['unionid'];
-            $update['member_wxopenid'] = '';
+            $update['member_wxopenid']  = $user_info['openid'];
             $update['member_avatar'] = $user_info['headimgurl'];
             $update['member_sex'] = intval($user_info['sex']);
             $update['member_wechat_bind'] = 1;
@@ -148,7 +149,6 @@ abstract class ILogin
             return false;
         }
     }
-
     public function unbind_mobile()
     {
         if($this->mMemberId <= 0) return false;

helper/login/open_userinfo_log.php

@@ -36,6 +36,12 @@ class open_userinfo_log extends ILogin
         {
             $this->mMemberId = intval($minfo['member_id']);
             $this->mMemberInfo = $minfo;
+
+            if($this->mMemberInfo['member_wxopenid'] != $openid || $this->mMemberInfo['member_wxunionid'] != $unionid) {
+                $mod_member = Model('member');
+                $mod_member->editMember(array('member_id' => $this->mMemberId),['member_wxopenid' => $openid]);
+            }
+
             return true;
         }
     }

helper/session_helper.php

@@ -314,6 +314,8 @@ class session_helper
             }
             else
             {
+                return true;
+
                 if (session_helper::binded_wechat())
                 {
                     $author_time = $_SESSION['wxauthor_time'];

helper/third_author/wxauthor.php

@@ -36,7 +36,7 @@ class wxauthor
 
     public function enter($origin_url)
     {
-        $back_url = 'http://p.lrlz.com/mobile/wxauthor.php';
+        $back_url = 'https://passport.lrlz.com/mobile/wxauthor.php';
         $params = [ 'appid' => self::appid,
                     'redirect_uri' => $back_url,
                     'response_type' => 'code',

mac_start.sh

@@ -5,5 +5,6 @@ sudo nginx
 sudo pkill php-fpm
 php-fpm
 sudo redis-server /etc/redis/6379.conf
+sudo redis-server /etc/redis/6380.conf
 sudo pkill -9 $(pidof python)
 ./qwatch.py

microshop/index.php

@@ -10,7 +10,7 @@
 define('APP_ID','microshop');
 define('BASE_PATH',str_replace('\\','/',dirname(__FILE__)));
 if (!@include(dirname(dirname(__FILE__)).'/global.php')) exit('global.php isn\'t exists!');
-if (!@include(BASE_CORE_PATH.'/33hao.php')) exit('33hao.php isn\'t exists!');
+if (!@include(BASE_CORE_PATH.'/lrlz.php')) exit('lrlz.php isn\'t exists!');
 
 if (!@include(BASE_PATH.'/config/config.ini.php')){
 	@header("Location: install/index.php");die;

queue/index.php

@@ -11,7 +11,7 @@ define('APP_ID','queue');
 define('BASE_PATH',str_replace('\\','/',dirname(__FILE__)));
 
 if (!@include(dirname(dirname(__FILE__)).'/global.php')) exit('global.php isn\'t exists!');
-if (!@include(BASE_CORE_PATH.'/33hao.php')) exit('33hao.php isn\'t exists!');
+if (!@include(BASE_CORE_PATH.'/lrlz.php')) exit('lrlz.php isn\'t exists!');
 
 if (empty($_SERVER['argv'][1]) || empty($_SERVER['argv'][2])) exit('parameter error');
 

restart.py

@@ -95,6 +95,7 @@ def main():
         elif option == 'factory':
             cmds.append({'file_name': 'room_factory.php', 'cmd': 'php room_factory.php', 'tip': ''})
         elif option == 'master':
+            cmds.append({'file_name': 'fcgi_run.php', 'cmd': 'spawn-fcgi -a 127.0.0.1 -p 9100 -F 1 -f "php fcgi_run.php"','tip': ''})
             cmds.append({'file_name': 'crontab.php',    'cmd': '','tip':''})
             cmds.append({'file_name': 'mac_ugcman',     'cmd': './mac_ugcman','tip':''})
             cmds.append({'file_name': 'ugc_srv.php',    'cmd': 'php ugc_srv.php','tip':''})
@@ -135,6 +136,7 @@ def main():
         elif option == 'factory':
             cmds.append({'file_name': 'room_factory.php', 'cmd': 'php room_factory.php', 'tip': ''})
         elif option == 'master':
+            cmds.append({'file_name': 'fcgi_run.php', 'cmd': 'spawn-fcgi -a 127.0.0.1 -p 9100 -F 10 -f "php fcgi_run.php"','tip': ''})
             cmds.append({'file_name': 'crontab.php',    'cmd': '','tip':''})
             cmds.append({'file_name': 'ugcman',         'cmd': './ugcman','tip':''})
             cmds.append({'file_name': 'ugc_srv.php',    'cmd': 'php ugc_srv.php','tip':''})

shop/index.php

@@ -9,7 +9,7 @@ define('BASE_PATH',str_replace('\\','/',dirname(__FILE__)));
 
 if (!@include(dirname(dirname(__FILE__)).'/global.php')) exit('global.php isn\'t exists!');
 if (!@include(BASE_PATH.'/control/control.php')) exit('control.php isn\'t exists!');
-if (!@include(BASE_CORE_PATH.'/33hao.php')) exit('33hao.php isn\'t exists!');
+if (!@include(BASE_CORE_PATH.'/lrlz.php')) exit('lrlz.php isn\'t exists!');
 define('APP_SITE_URL',SHOP_SITE_URL);
 define('TPL_NAME',TPL_SHOP_NAME);
 define('SHOP_RESOURCE_SITE_URL',SHOP_SITE_URL.DS.'resource');

test/TestCar.php

@@ -1,46 +1,148 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: lionared
- * Date: 2018/1/10
- * Time: 下午6:40
- */
+
 define('BASE_ROOT_PATH',str_replace('/test','',dirname(__FILE__)));
+
 require_once(BASE_ROOT_PATH . '/fooder.php');
-require_once '../helper/car_convert/importer.php';
-require_once '../helper/car_convert/formater.php';
 
-use car_convert\importer;
+require_once '../helper/car/importer.php';
+require_once '../helper/car/formater.php';
+require_once '../helper/car/finder.php';
+require_once '../helper/brand_helper.php';
 
 class TestCar extends PHPUnit_Framework_TestCase
 {
     private $mFormater;
+    const DOWNLOAD_PATH = BASE_ROOT_PATH . "/data/download";
 
     public static function setUpBeforeClass()
     {
         Base::run_util();
     }
 
+    public function testDownPic()
+    {
+        $brands = [];
+        $mod = Model('car_base');
+        $i = 0;
+        while (true)
+        {
+            $start = $i * 1000;
+            $items = $mod->field('brand_str,brand_logo')->order('car_id asc')->limit("{$start},1000")->select();
+            if(empty($items)) {
+                break;
+            }
+            $i++;
+
+            foreach ($items as $item)
+            {
+                $name = trim($item['brand_str']);
+                $url = trim($item['brand_logo']);
+
+                if(!array_key_exists($name,$brands)) {
+                    $brands[$name] = $url;
+                }
+            }
+        }
+
+        foreach ($brands as $name => $url)
+        {
+            $sname = Pinyin::getShortPinyin($name);
+            $sname = str_replace([' ','・'],['',''],$sname);
+
+            echo "{$name}:{$sname}\r\n";
+            $url = "http:" . $url;
+
+            $path = self::DOWNLOAD_PATH . "/car/brand/";
+            $this->download($url,$path,$sname);
+            $this->update($name,['brand_logo' => "/shop/brand/logo/{$sname}"]);
+        }
+    }
+
+    public function update($brand_name,$datas)
+    {
+        $ret = Model('brand')->where(['brand_name' => $brand_name])->update($datas);
+    }
+
+    private function download($url,$path,&$name)
+    {
+        $info = pathinfo($url);
+        $name = "{$name}.{$info['extension']}";
+
+        if(file_exists($path)) {
+            $path = addslashes($path);
+            $path = "{$path}{$name}";
+            exec("wget -O $path $url");
+        }
+
+        if(file_exists($path))
+        {
+            if(filesize($path) > 0) {
+                return true;
+            } else {
+                unlink($path);
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
+
+    public function testInitCarbrand()
+    {
+        $mod_car = Model('car_base');
+        $i = 0;
+        while (true)
+        {
+            $start = $i * 1000;
+            $items = $mod_car->field('car_id,brand_str')->order('brand_str asc')->limit("{$start},1000")->select();
+            if(empty($items)) {
+                return;
+            }
+            $i++;
+
+            foreach ($items as $item)
+            {
+                $car_id = intval($item['car_id']);
+                $brand_name = $item['brand_str'];
+                if(empty($brand_name)) continue;
+
+                $brand = brand_helper::instance()->findByname($brand_name);
+                if(empty($brand)) {
+                    Log::record("{$brand_name} cannot find",Log::DEBUG);
+                }
+                $brand_id = intval($brand['brand_id']);
+                $ret = $mod_car->editCar(['car_id' =>$car_id],['brand_id' => $brand_id]);
+                if($ret == false) {
+                    Log::record("car_id={$car_id} cannot find",Log::DEBUG);
+                }
+            }
+        }
+    }
+
+    public function testFinder()
+    {
+        $series = car\finder::instance()->getSeries(97);
+        $cars = car\finder::instance()->getCars(97,877);
+
+    }
+
     public function testRun()
     {
-        //run for new insert
-        $import = new importer(";");
+        $import = new car\importer(";");
         $import->run('../data/car/data_all.csv');
     }
 
     public function testUpdateDb()
     {
-        //run for update some field
         $table_name = 'car_body';
         $filed = 'seats';
-        $import = new importer(";");
+        $import = new car\importer(";");
         $import->update_db('../data/car/0126_data_all.csv', $table_name, $filed);
     }
 
     public function testFormat()
     {
-        // run for new fields
-        $this->mFormater = new car_convert\car_formater();
+        $this->mFormater = new car\formater();
         $mod_car = Model('car')->table('car_base');
         $results = [];
 
@@ -51,8 +153,6 @@ class TestCar extends PHPUnit_Framework_TestCase
             $results[] = $mod_car->update($data);
             $i++;
         }
-
-        //var_dump($results);
     }
 
     public function testInsert()