修改预上线配置问题

html/application/cache/building_rsync_begin_time

-a:3:{s:4:"time";i:1497607075;s:3:"ttl";i:86400;s:4:"data";i:1497607073;}
+a:3:{s:4:"time";i:1497927487;s:3:"ttl";i:86400;s:4:"data";i:1497927485;}
\ No newline at end of file

html/application/config/config.php

@@ -15,7 +15,7 @@
 |
 */
 //$config['base_url']	= 'http://eas.sunac.com.cn:1918/';
-$config['base_url']	= '/www/html/index.php';
+$config['base_url']	= '/test/html/index.php';
 
 /*
 |--------------------------------------------------------------------------

html/application/config/constants.php

@@ -35,7 +35,7 @@ define('FOPEN_WRITE_CREATE',					'ab');
 define('FOPEN_READ_WRITE_CREATE',				'a+b');
 define('FOPEN_WRITE_CREATE_STRICT',				'xb');
 define('FOPEN_READ_WRITE_CREATE_STRICT',		'x+b');
-define('APPLICATION_PATH',                      '/www/html');//项目同一路径定义
+define('APPLICATION_PATH',                      '/test/html');//项目同一路径定义
 define('SQL_DEBUG', 							0);//是否开启sql日志 sql.txt
 /* End of file constants.php */
 /* Location: ./application/config/constants.php */

html/application/config/database.php

@@ -48,12 +48,12 @@
 $active_group = 'default';
 $active_record = TRUE;
 
- $db['default']['hostname'] = '192.168.2.173';
+ $db['default']['hostname'] = '192.168.2.107';
 //$db['default']['hostname'] = 'localhost';
-$db['default']['username'] = 'root';
-$db['default']['password'] = '123456';
+$db['default']['username'] = 'fenxiao';
+$db['default']['password'] = 'sunac2010!';
 //$db['default']['password'] = '';
-$db['default']['database'] = 'db_rongchuang_test';
+$db['default']['database'] = 'db_rongchuang';
 $db['default']['dbdriver'] = 'mysql';
 $db['default']['dbprefix'] = '';
 $db['default']['pconnect'] = FALSE;

html/application/config/rpc_api_config.php

@@ -6,15 +6,15 @@
 */
 $config ['rpc'] = array(
 	'api' => array(
-		'accounts' => 'http://eas.sunac.com.cn:8191/propertymobile/getAccounts.action',
-		'buildings' => 'http://eas.sunac.com.cn:8191/propertymobile/getProjects.action',
-		'get_staff_by_mobile' => 'http://eas.sunac.com.cn:8191/propertymobile/getAccountByPhone.action',
-		'get_owner_by_phone' => 'http://eas.sunac.com.cn:8191/propertymobile/getMuserByPhone.action',
-		'check_staff_account' => 'http://eas.sunac.com.cn:8191/propertymobile/checkAccount.action',
-		'is_customer' => 'http://eas.sunac.com.cn:8191/propertymobile/isCustomer.action',
-		'get_customer_room' => 'http://eas.sunac.com.cn:8191/propertymobile/getCustomerRoom.action',
-		'get_customer_status' => 'http://eas.sunac.com.cn:8191/propertymobile/getCustomerStatus.action',
-		'send_sms' => 'http://eas.sunac.com.cn:8191/propertymobile/sendMsg.action'
+		'accounts' => 'http://60.29.36.2:8191/propertymobile/getAccounts.action',
+		'buildings' => 'http://60.29.36.2:8191/propertymobile/getProjects.action',
+		'get_staff_by_mobile' => 'http://60.29.36.2:8191/propertymobile/getAccountByPhone.action',
+		'get_owner_by_phone' => 'http://60.29.36.2:8191/propertymobile/getMuserByPhone.action',
+		'check_staff_account' => 'http://60.29.36.2:8191/propertymobile/checkAccount.action',
+		'is_customer' => 'http://60.29.36.2:8191/propertymobile/isCustomer.action',
+		'get_customer_room' => 'http://60.29.36.2:8191/propertymobile/getCustomerRoom.action',
+		'get_customer_status' => 'http://60.29.36.2:8191/propertymobile/getCustomerStatus.action',
+		'send_sms' => 'http://60.29.36.2:8191/propertymobile/sendMsg.action'
 	),
 	'param' => array(
 		'head' => array(

html/application/controllers/distributor/building.php

@@ -31,6 +31,7 @@ class Building extends CI_Controller {
 		$distributor_ins=$this->distributor->get(array('uniqid_id'=>$this->uniqid_id));
 		$buildings=$this->bdrelation->get_all_building(array('D.id'=>$distributor_ins['id'],'R.is_deleted'=>0),1,10);
 		$this->data['buildings']=$buildings;
+               
 		$datestring="%Y-%m-%d";
 		$dataformat="%Y-%m-%d %h:%i";
 		$this->data['datestring']=$datestring;

html/application/controllers/distributor/sign.php

@@ -224,6 +224,8 @@ class Sign extends CI_Controller{
 
 		//校验职员
 		$staff_data = rpc('get_staff_by_mobile', $param);
+                
+                  
 		$is_staff_point = 0;
 		if(!empty($staff_data) || $staff_data['head']['rspCode'] == 0)
 		{
@@ -242,12 +244,13 @@ class Sign extends CI_Controller{
 
 		//校验业主
 		$owner_data = rpc('get_owner_by_phone', $param);
+                
 		if(!empty($owner_data) || $owner_data['head']['rspCode'] == 0)
 		{
 			$owner_data['body'] = isset($owner_data['body'][0]) ? $owner_data['body'][0] : array();
 			if(isset($owner_data['body']['id']) && !empty($owner_data['body']['id']))
 			{
-				$baisc_data['true_name'] = $staff_data['body']['owner_name'];
+				$baisc_data['true_name'] = $owner_data['body']['name'];
 				$extra_data['copartner_type'] = 3;
 				$is_staff_point = 1;
 			}

html/application/models/building_distributor_model.php

@@ -116,9 +116,12 @@ class Building_distributor_model extends MY_Model{
         $this->db->order_by('R.id','desc');
 
         $query = $this->db->get(null, $page_size, ($page-1) * $page_size);
+        
         if($query->num_rows() > 0)
         {
             $return = $query->result_array();
+
+
             return $return;
         }
 	}

html/application/views/admin/report/index_info.php

@@ -291,6 +291,7 @@
 										</td>
 									<!--<td></td>-->
 									<td>
+                                                                              <?php if($customer['expired']==0){ ?>
 										<?php if ($customer['recommend_status'] == 0) { ?>
 										 <?php if ($customer['is_valid'] != 0) { ?>
 											 <?php if ($customer['manager_name'] || $customer['sale_name'] || $customer['assign_time']) { ?>
@@ -300,6 +301,7 @@
 											 <?php } ?>
 										 <?php } ?>
 									        <?php } ?>
+                                                                            <?php } ?>
 										<div class="userList">
 											<?php
 											if (isset($customer['userList']) && !empty($customer['userList'])) {

html/application/views/distributor/building/index.php

@@ -17,7 +17,7 @@
         <ul>
         <?php foreach($buildings as $val): ?>
           <li>
-            <!--<div class="lou-img left">
+           <!-- <div class="lou-img left">
               <img src="<?php echo APPLICATION_PATH ?><?php echo (isset($val['building_img']) && $val['building_img']!='')? $val['building_img']:'/assets/css/images/lou-img.png'?>">
             </div>-->
             <div class="lou-detail right" data-key="<?php echo $val['bid']?>">

html/index.php

 <?php
-
+date_default_timezone_set('PRC');
 ob_start();
 /*
  *---------------------------------------------------------------

html/system/database/DB_driver.php

@@ -271,7 +271,7 @@ class CI_DB_driver {
 		{
 			$sql = $this->compile_binds($sql, $binds);
 		}
-		//echo $sql;
+	        //	echo $sql;
 		// Is query caching enabled?  If the query is a "read type"
 		// we will load the caching class and return the previously
 		// cached query if it exists

html/system/helpers/captcha_helper.php

@@ -231,7 +231,7 @@ if ( ! function_exists('create_captcha'))
 
 		$img_name = $now.'.jpg';
 
-		ImageJPEG($im, $img_path.$img_name);
+		imagepng($im, $img_path.$img_name);
 
 		$img = "<img src=\"$img_url$img_name\" width=\"$img_width\" height=\"$img_height\" style=\"border:0;\" alt=\" \" />";