合并冲突

a.php

 <?php
-echo 1;exit;
+phpinfo();exit;
 header("Content-type: text/html; charset=utf-8");
 //利用PHP目录和文件函数遍历用户给出目录的所有的文件和文件夹，修改文件名称
 function fRename($dirname)

application/controllers/Store.php

@@ -73,7 +73,9 @@ class StoreController extends \Our\Controller_AbstractIndex {
             $currentAddress['gcId'] = $data['gcId'];
         }
         $memberId = $this->sess->get('member_id');
-        $storeService = \Business\Store\StoreServiceModel::getInstance();
+        /*$storeService = \Business\Store\StoreServiceModel::getInstance();
+        $return = $storeService->getRecommendStores($currentAddress, $memberId);*/
+        $storeService = \Business\Store\ClassStoreServiceModel::getInstance();
         $return = $storeService->getRecommendStores($currentAddress, $memberId);
         if ($return) {
             $this->success($return);

application/library/Order/OrderConfirmUtil.php

@@ -752,8 +752,8 @@ class OrderConfirmUtil {
     public function pushMessage(){
         if($this->pushMessageOrders){
             foreach($this->pushMessageOrders as $tempOrder){
-                //\Business\Order\OrderServiceModel::getInstance(DbNameConst::masterDBConnectName)->pushRecieveOrder($tempOrder);
-                \Our\Common::redisPublish('\Business\Order\OrderServiceModel','pushRecieveOrder',array($tempOrder));
+                \Business\Order\OrderServiceModel::getInstance(DbNameConst::masterDBConnectName)->pushRecieveOrder($tempOrder);
+                //\Our\Common::redisPublish('\Business\Order\OrderServiceModel','pushRecieveOrder',array($tempOrder));
             }
         }
     }
@@ -921,8 +921,8 @@ class OrderConfirmUtil {
                 \Our\RedisHelper::delCachedFunction(\Redis\Db4\PBundlingRedisModel::getInstance(),array(&$pbundlingInstance, 'getList'),array(),array($storeId));
             }
         }
-        //$this->updateGoodsStorageToDBAndCache($goodsCommonIds,$goodsIds,$blIds,$goodsNewList,$op,$updateSaleNumFlag);
-        $this->updateGoodsStorageToCache($goodsCommonIds,$goodsIds,$blIds,$goodsNewList,$op,$updateSaleNumFlag);
+        $this->updateGoodsStorageToDBAndCache($goodsCommonIds,$goodsIds,$blIds,$goodsNewList,$op,$updateSaleNumFlag);
+        //$this->updateGoodsStorageToCache($goodsCommonIds,$goodsIds,$blIds,$goodsNewList,$op,$updateSaleNumFlag);
         return true;
     }
 

application/library/Our/ApiConst.php

@@ -11,7 +11,7 @@ class ApiConst
     const randLengh = 8;
 
     //10天数秒
-    const tenDaySecond = 864000;
+    const tenDaySecond = 2592000;
     //const tenDaySecond = 300;
     //一天
     const threeDaySecond =259200;

application/library/Our/ImageConst.php

@@ -20,6 +20,9 @@ class ImageConst{
     //分类图标前缀
     const categoryPicPrefix = 'category-pic-';
 
+
+    const categoryHeadPicPrefix = 'category-headpic-';
+
     const topClassAdvImagePrefis = 'category-hdpic-'; //一级分类对应广告图前缀
 
     //商家举报图片存放路径
@@ -53,6 +56,8 @@ class ImageConst{
 
     const defaultStoreBannerName = 'default_store_banner.jpg';
 
+    const defaultCategoryImgName = 'category-headpic-default.jpg';
+
     //图片指向的域名
     const imageDomain="ossHost";
 

application/library/Our/ImageUtil.php

@@ -159,6 +159,17 @@ class ImageUtil {
         return $gcImageUrl;
     }
 
+    public static function getCategoryHeadPic($gcId){
+        $basePath=\Bootstrap::getUrlIniConfig('source');
+        $commonPath=ImageConst::defaultPath;
+        $fileName= ImageConst::categoryHeadPicPrefix.$gcId.\Our\NameConst::jpgSuffix;
+        $file=$basePath.$commonPath.$fileName;
+        if(file_exists($file)){
+            return \Our\Common::getStaticFile($fileName,$commonPath);
+        }else{
+            return \Our\Common::getStaticFile(ImageConst::defaultCategoryImgName,$commonPath);
+        }
+    }
 
     /**
      * 设置文件名称 不包括 文件路径

application/models/Business/Goods/GoodsClassService.php

@@ -55,6 +55,7 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
             return array('totalCount'=>\Our\ApiConst::zero);
         }
     }
+
     /**
      * 获取平台全部一级分类
      * @param $where
@@ -65,8 +66,7 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
 
         //验证参数
 
-
-        $addressDao = \DAO\AddressModel::getInstance();
+        /*$addressDao = \DAO\AddressModel::getInstance();
         $validFlag = $addressDao->getValidAddress($where);
         if(!$validFlag){
             \Error\ErrorModel::throwException($addressDao->errorCode);
@@ -87,7 +87,7 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
         $serviceParentClassIds = $this->getServiceStoreClasses($serviceStoreIds);
         if($serviceParentClassIds){
             $classIds = array_merge($serviceParentClassIds,$classIds);
-        }
+        }*/
 
         /*
         //获取可快递店铺对应分类
@@ -96,12 +96,12 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
             $classIds = array_merge($expressClassIds,$classIds);
         }
         */
-        /*$classIds = array();
+        $classIds = array();
         $platformFirstClassDao = \DAO\GoodsClass\PlatformFirstClassModel::getInstance();
         $firstClassList = \Our\RedisHelper::cachedFunction(\Redis\Db3\PlatformFirstClassRedisModel::getInstance(),array(&$platformFirstClassDao, 'getList'),array(),\Our\ApiConst::oneHour,array());
         if($firstClassList){
-            $classIds = array_column($firstClassList,'gc_id');
-        }*/
+            $classIds = array_column($firstClassList,'gc_parent_id');
+        }
         $classIdKeys = array_flip($classIds);
         $goodsClassDao = \DAO\GoodsClassModel::getInstance();
         $parentClasses = $goodsClassDao->getParentClasses();
@@ -196,7 +196,6 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
         $cityCode = $where['cityCode'];
         $storeDao = \DAO\StoreModel::getInstance();
         $signStoreClasses = $this->getSignClassesByCityCode($cityCode);
-        //var_dump($signStoreClasses);
         if($signStoreClasses){
             $storeIds = array_unique(array_column($signStoreClasses,'store_id'));
             $tempStoreList = $storeDao->getNearbyStores($cityCode,$storeIds);
@@ -220,7 +219,6 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
                     if(!($newStoreIds&&in_array($signClass['store_id'],$newStoreIds))){
                         $newStoreIds[] = $signClass['store_id'];
                     }
-
                 }
             }
             foreach($returnClass as $key => $class){

application/models/Business/Goods/GoodsCommonService.php

@@ -1368,6 +1368,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
                 break;
             }
         }
+        return true;
     }
 
     /**

application/models/Business/Store/ClassStoreService.php

 <?php
+namespace Business\Store;
 /**
  * User: liuyuzhen
  * Date: 2019/1/9
  * Time: 17:09
  * Description:
  */
-namespace Business\Store;
-use Our\ApiConst;
-use Our\DbNameConst;
 
-/**
- * 店铺service
- *
- * @date 2018-5-15
- * @author zhz
- */
 class ClassStoreServiceModel extends \Business\AbstractModel{
-
-    $classStoreField = 'store_id as storeId,store_name as storeName,store_label as storeLabel,store_intro as storeIntro,store_longitude,store_latitude,gc_id as gcId,gc_name as gcName';
+    private $classStoreField = 'store_id as storeId,store_name as storeName,store_label as storeLabel,store_intro as storeIntro,store_longitude,store_latitude,gc_id as gcId,gc_name as gcName';
 
     public function init() {
     }
 
 
-    public function getRecommondStores($where,$memberId){
+    public function getRecommendStores($where,$memberId){
 
         $addressDao = \DAO\AddressModel::getInstance();
         $validFlag = $addressDao->getValidAddress($where);
@@ -39,25 +30,97 @@ class ClassStoreServiceModel extends \Business\AbstractModel{
         if(!$gcId){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyGcId);
         }
-       /* \Our\RedisHelper::cachedFunction(\Redis\Db6\ClassStoreRedisModel::getInstance(), array(&$classStoreModel, 'getList'), array(array('gc_id'=>$gcId),'store_id,fav_time'), \Our\ApiConst::oneHour,array($memberId));*/
-
+        /*\Our\RedisHelper::cachedFunction(\Redis\Db6\ClassStoreRedisModel::getInstance(), array(&$classStoreModel, 'getList'), array(array('gc_id'=>$gcId),'store_id,fav_time'), \Our\ApiConst::oneHour,array($memberId));*/
+        $storeList = $this->getStoreListByGcId($gcId,$condition,$memberId);
+        return $storeList;
     }
 
-    public function getStoreListByGcId($gcId,$position){
+    public function getStoreListByGcId($parentGcId,$position,$memberId){
         $lat = $position['lat'];
         $lng = $position['lng'];
         $classStoreModel = \DAO\Store\ClassStoreModel::getInstance();
-        $storeList = \Our\RedisHelper::cachedFunction(\Redis\Db6\ClassStoreRedisModel::getInstance(), array(&$classStoreModel, 'getList'), array(array('gc_id'=>$gcId),$this->classStoreField), \Our\ApiConst::oneHour,array());
-        $newStoreList = array();
+        $storeList = \Our\RedisHelper::cachedFunction(\Redis\Db6\ClassStoreRedisModel::getInstance(), array(&$classStoreModel, 'getList'), array(array('gc_parent_id'=>$parentGcId),$this->classStoreField), \Our\ApiConst::oneHour,array($parentGcId));
+        $newGcStoreList = array();
         if($storeList){
-
+            $newStoreList = array();
+            foreach($storeList as $store){
+                $gcId = $store['gcId'];
+                $store_lat = $store['store_latitude'];
+                $store_lnt = $store['store_longitude'];
+                unset($store['store_latitude']);
+                unset($store['store_longitude']);
+                $store['storeLabel'] =\Our\ImageUtil::getStoreLabel($store['storeLabel'], \Our\ImageConst::storeLabel,213);
+                $store['storeDistance'] = \Our\CommonExtension::getDistance($lat,$lng,$store_lat,$store_lnt);
+                $newStoreList[$store['storeId']] = $store;
+                if(isset($newGcStoreList[$gcId]['inAreaFlag'])){
+                    continue;
                 }
+                $inAreaFlag = false;
+                if(isset($store['sign_scope'])&&$store['sign_scope']){
+                    $inAreaFlag = \Our\CommonExtension::locationInArea($lat,$lng,$store['sign_scope']);
                 }
+                if(!isset($newGcStoreList[$gcId])){
+                    $newGcStoreList[$gcId]['gcName'] = htmlspecialchars_decode($store['gcName']);
+                    $newGcStoreList[$gcId]['gcImg'] = \Our\ImageUtil::getCategoryHeadPic($gcId);// \Our\Common::getStaticFile(\Our\ImageConst::categoryHeadPicPrefix.$gcId.\Our\NameConst::jpgSuffix,\Our\ImageConst::defaultPath);
+                }
+                unset($store['gcName']);
+                unset($store['gcId']);
+                if($inAreaFlag){
+                    $newGcStoreList[$gcId]['inAreaFlag'] = $inAreaFlag;
+                    $newGcStoreList[$gcId]['stores']= $store;
+                }else{
+                    if(isset($newGcStoreList[$gcId]['storeDistance'])){
+                        if($store['storeDistance']<$newGcStoreList[$gcId]['storeDistance']){
+                            $newGcStoreList[$gcId]['storeDistance'] = $store['storeDistance'];
+                            $newGcStoreList[$gcId]['stores']= $store;
+                        }
+                    }else{
+                        $newGcStoreList[$gcId]['storeDistance'] = $store['storeDistance'];
+                        $newGcStoreList[$gcId]['stores']= $store;
+                    }
+                }
+            }
+            $memberStores = \Business\Store\StoreServiceModel::getInstance()->getPurchasedStoreClass($memberId,$parentGcId);
+            if($memberStores){
+                foreach($memberStores as $key => $storeId){
+                    $returnData[$key] = array();
+                    $purchasedStore = $newStoreList[$storeId];
+                    $returnData[$key]['gcName'] = htmlspecialchars_decode($purchasedStore['gcName']);
+                    $returnData[$key]['gcImg'] = \Our\ImageUtil::getCategoryHeadPic($purchasedStore['gcId']);//\Our\Common::getStaticFile(\Our\ImageConst::categoryHeadPicPrefix.$purchasedStore['gcId'].\Our\NameConst::jpgSuffix,\Our\ImageConst::defaultPath);
+                    unset($purchasedStore['gcName']);
+                    unset($purchasedStore['gcId']);
+                    $purchasedStore['isPurchased'] = \Our\ApiConst::one;
+                    $returnData[$key]['stores'][$storeId] = $purchasedStore;
+                }
+            }
+            foreach($newGcStoreList as $gcIdKey=>$storeInfo){
+                $tempStore = $storeInfo['stores'];
+                if(isset($returnData[$gcIdKey])){
+                    if(isset($returnData[$gcIdKey]['stores'][$tempStore['storeId']])){
+                        continue;
+                    }
+                    $tempStore['isPurchased'] = \Our\ApiConst::zero;
+                    $returnData[$gcIdKey]['stores'][$tempStore['storeId']] = $tempStore;
+                }else{
+                    unset($storeInfo['storeDistance']);
+                    $storeInfo['stores'] = array();
+                    $tempStore['isPurchased'] = \Our\ApiConst::zero;
+                    $storeInfo['stores'][$tempStore['storeId']] = $tempStore;
+                    $returnData[$gcIdKey] = $storeInfo;
+                }
+            }
+            $return = array_values($returnData);
+            foreach($return as &$temp){
+                $temp['stores'] = array_values($temp['stores']);
+            }
+            return $return;
+        }
+        return $newGcStoreList;
 
-
-
+    }
 
     /**
+     * git
      */
     private static $_instance = null;
 

application/models/Business/Store/StoreService.php

@@ -717,7 +717,10 @@ class StoreServiceModel extends \Business\AbstractModel{
         $storeRedis = \Redis\Db6\StoreRedisModel::getInstance();
         $signStoreKey = \Our\NameConst::signStoreIdsPrefix . $readisSuffix;
         $signStoreIds =$storeRedis->find($signStoreKey, \Our\ApiConst::oneHour);
-
+        if(!$signStoreIds){
+            $signStoreInfo = \Business\Goods\GoodsClassServiceModel::getInstance()->getSignStoreInfo($position);
+            $signStoreIds = $signStoreInfo['signStoreIds'];//当前位置签约店铺ID
+        }
         //$serviceStoreKey = \Our\NameConst::serviceStoreIdsPrefix . $readisSuffix;
         //$serviceStoreIds = $storeRedis->find($serviceStoreKey, \Our\ApiConst::oneHour);
         /*if(is_array($signStoreIds)&&is_array($serviceStoreIds)){
@@ -807,15 +810,8 @@ class StoreServiceModel extends \Business\AbstractModel{
         foreach($allStores as &$store){
             $store['isPurchased'] = \Our\ApiConst::zero;
         }
-        $memberStores = null;
-        if($memberId){
-            $favoritesStoreDao = \DAO\FavoritesStoreModel::getInstance();
-            $memberStoreList = \Our\RedisHelper::cachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(), array(&$favoritesStoreDao, 'selectList'), array(array('member_id'=>$memberId,'fav_from'=>\Our\ApiConst::scanFavor),'store_id,fav_time'), \Our\ApiConst::oneHour,array($memberId));
-            //$storeMemberDao->getList(array('member_id'=>$memberId,'type'=>\Our\ApiConst::storeQrcodeMember),'distinct(store_id) as store_id')
-            if($memberStoreList){
-                $memberStores = $this->getPurchasedStoreClass($memberStoreList,$gcId);
-            }
-        }
+        $memberStores = $this->getPurchasedStoreClass($memberId,$gcId);
+
 
         $goodsClassDao = \DAO\GoodsClassModel::getInstance();
         //获取当前分类对应所有店铺信息
@@ -829,11 +825,12 @@ class StoreServiceModel extends \Business\AbstractModel{
         //$expressStores = $this->getExpressStores($gcId,$condition);
 
         $goodsClassList = $goodsClassDao->getOnlineSecondClassList($gcId);
-
         if($goodsClassList){
             foreach($goodsClassList as $goodsClass){
                 $returnStores = array();
                 $returnStores['gcName'] = htmlspecialchars_decode($goodsClass['gcName']);
+                //$returnStores['gcImg'] = \Our\Common::getStaticFile(\Our\ImageConst::categoryHeadPicPrefix.$goodsClass['gcId'].\Our\NameConst::jpgSuffix,\Our\ImageConst::defaultPath);
+                $returnStores['gcImg'] = \Our\Common::getStaticFile('category-headpic-default.jpg',\Our\ImageConst::defaultPath);
                 $existStoreIds = null;
                 $returnStores['stores'] = null;
                 $exitStore = array();
@@ -866,7 +863,6 @@ class StoreServiceModel extends \Business\AbstractModel{
                         $returnStores['stores'][] =$purchasedStore;
                     }
                 }
-
                 if($returnStores['stores']){
                     foreach($returnStores['stores'] as $key => $tempStore){
                         $tempDistance[$key] = $tempStore['storeDistance'];
@@ -876,13 +872,14 @@ class StoreServiceModel extends \Business\AbstractModel{
                 }
             }
             if($return){
+                /*var_dump(json_encode($return));
                 $tempReturn = array();
                 foreach($return as $tempVal){
                     $distance = min(array_column($tempVal['stores'],'storeDistance'));
                     $tempReturn[$distance] = $tempVal;
                 }
                 ksort($tempReturn);
-                $return = array_values($tempReturn);
+                $return = array_values($tempReturn);*/
                 return $return;
             }
         }
@@ -890,12 +887,21 @@ class StoreServiceModel extends \Business\AbstractModel{
 
     }
 
-    public function getPurchasedStoreClass($memberStoreList,$gcId){
+    public function getPurchasedStoreClass($memberId,$gcId){
+        if(!$memberId){
+            return array();
+        }
+        $favoritesStoreDao = \DAO\FavoritesStoreModel::getInstance();
+        $memberStoreList = \Our\RedisHelper::cachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(), array(&$favoritesStoreDao, 'selectList'), array(array('member_id'=>$memberId,'fav_from'=>\Our\ApiConst::scanFavor),'store_id,fav_time'), \Our\ApiConst::oneHour,array($memberId));
+        if(!$memberStoreList){
+            return array();
+        }
         $memberStoreIds = array_column($memberStoreList,'store_id');
         $signStoreClassSql = ' store_id in ('.implode(',',$memberStoreIds).') and is_charged=1 and gc_parent_id ='.$gcId;
         $qmStoreClassDao = \DAO\QmStoreClassModel::getInstance();
-        $signClassStores = $qmStoreClassDao->selectByWhere($signStoreClassSql,'store_id,gc_id');
 
+        $signClassStores = \Our\RedisHelper::cachedFunction(\Redis\Db6\QmStoreClassRedisModel::getInstance(), array(&$qmStoreClassDao, 'selectByWhere'), array($signStoreClassSql,'store_id,gc_id'), \Our\ApiConst::oneHour,array('gcId_'.$gcId.'member_'.$memberId));
+        //$signClassStores = $qmStoreClassDao->selectByWhere($signStoreClassSql,'store_id,gc_id');
         if($signClassStores){
             $return = array();
             foreach($memberStoreList as $tempStore){

application/models/DAO/FavoritesStore.php

@@ -222,6 +222,9 @@ class FavoritesStoreModel extends \DAO\AbstractModel {
             $favoritesRedis->tableDelAll($favoritesRedis->tableKeys('myFavoritesStore'.$favoritesRedis::DELIMITER.$memberId.'_'));
         }
 
+        \Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(),array(&$this, 'getFavoritesStores'),array(),array($memberId));
+        \Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(), array(&$this, 'selectList'), array(),array($memberId));
+        \Our\RedisHelper::delCachedFunction(\Redis\Db6\QmStoreClassRedisModel::getInstance(), array(\DAO\QmStoreClassModel::getInstance(), 'selectByWhere'), array(), array('*member_'.$memberId.'*'));
         //更新个人中心首页数量
         \DAO\MemberModel::getInstance()->_changeNum(\Our\NameConst::storeCollection,$memberId,$type == 1 ? -(count($storeIds)) : count($storeIds));
         return true;

application/models/DAO/QmStoreClass.php

@@ -125,6 +125,7 @@ class QmStoreClassModel extends \DAO\AbstractModel{
         }
         $platformFirstClassDao = \DAO\GoodsClass\PlatformFirstClassModel::getInstance();
         \Our\RedisHelper::delCachedFunction(\Redis\Db3\PlatformFirstClassRedisModel::getInstance(),array(&$platformFirstClassDao, 'getList'),array(),array());
+        return true;
     }
 
     /**

conf/url.ini

@@ -186,6 +186,7 @@ config.url.pushHost="127.0.0.1:9503";
 config.url.convert="/usr/local/bin/wkhtmltoimage";
 config.url.indexUrl="/www/local.qm.com/application/library/React"
 config.url.libary="/www/local.qm.com/application/library"
+config.url.source="/data/upload/"
 
 
 [linqing : common]

public/test.php

+<?php
+phpinfo();exit;
+echo json_encode($_SERVER);exit;
+$res=file_exists('/www/web/testadmin_shenbd_com/public_html/data/upload/mall/avatar/member_avatar_26.jpg');
+var_dump($res);
+exit;
+$www_file = '/home/wwwroot/mysite/';
+
+//打开网站目录下的hooks.log文件 需要在服务器上创建 并给写权限
+
+$fs = fopen($www_file . 'hooks.log', 'a');
+
+fwrite($fs, '================ Update Start ===============' . PHP_EOL . PHP_EOL);
+
+//自定义字串掩码 用于验证
+
+$access_token = 's7kjjhh8767laq29KLJK9089883hjjkgfdrrpipoinmw';
+
+//接受的ip数组,也就是允许哪些IP访问这个文件 这里是gitlab服务器IP
+$access_ip = array('8.8.8.8');
+
+//获取请求端的ip和token
+
+$client_token = $_GET['token'];
+$client_ip = $_SERVER['REMOTE_ADDR'];
+
+//把请求的IP和时间写进log
+
+fwrite($fs, 'Request on [' . date("Y-m-d H:i:s") . '] from [' . $client_ip . ']' . PHP_EOL);
+
+//验证token 有错就写进日志并退出
+if ($client_token !== $access_token) {
+    echo "error 403";
+    fwrite($fs, "Invalid token [{$client_token}]" . PHP_EOL);
+    exit(0);
+}
+
+//验证ip
+if (!in_array($client_ip, $access_ip)) {
+    echo "error 503";
+    fwrite($fs, "Invalid ip [{$client_ip}]" . PHP_EOL);
+    exit(0);
+}
+
+//获取请求端发送来的信息,具体格式参见gitlab的文档
+
+$json = file_get_contents('php://input');
+$data = json_decode($json, true);
+
+//如果有需要 可以打开下面,把传送过来的信息写进log
+//fwrite($fs, 'Data: '.print_r($data, true).PHP_EOL);
+
+//执行shell命令并把返回信息写进日志
+
+$output = shell_exec("cd $www_file &;&; git checkout master &;&; git pull origin master 2>&;1");
+fwrite($fs, 'Info:' . $output . PHP_EOL);
+
+fwrite($fs, PHP_EOL . '================ Update End ===============' . PHP_EOL . PHP_EOL);
+
+$fs and fclose($fs);
+
+
+
+//网站目录$www_file='/home/wwwroot/mysite/';//打开网站目录下的hooks.log文件 需要在服务器上创建 并给写权限$fs = fopen($www_file.'hooks.log', 'a');fwrite($fs, '================ Update Start ==============='.PHP_EOL.PHP_EOL);//自定义字串掩码 用于验证$access_token = 's7kjjhh8767laq29KLJK9089883hjjkgfdrrpipoinmw';//接受的ip数组,也就是允许哪些IP访问这个文件 这里是gitlab服务器IP$access_ip = array('8.8.8.8');//获取请求端的ip和token$client_token = $_GET['token'];$client_ip = $_SERVER['REMOTE_ADDR'];//把请求的IP和时间写进logfwrite($fs, 'Request on ['.date("Y-m-d H:i:s").'] from ['.$client_ip.']'.PHP_EOL);//验证token 有错就写进日志并退出if ($client_token !== $access_token){echo "error 403";fwrite($fs, "Invalid token [{$client_token}]".PHP_EOL);exit(0);}//验证ipif ( !in_array($client_ip, $access_ip)){echo "error 503";fwrite($fs, "Invalid ip [{$client_ip}]".PHP_EOL);exit(0);}//获取请求端发送来的信息,具体格式参见gitlab的文档$json = file_get_contents('php://input');$data = json_decode($json, true);//如果有需要 可以打开下面,把传送过来的信息写进log//fwrite($fs, 'Data: '.print_r($data, true).PHP_EOL);//执行shell命令并把返回信息写进日志$output=shell_exec("cd $www_file &;&; git checkout master &;&; git pull origin master 2>&;1");fwrite($fs, 'Info:'. $output.PHP_EOL);fwrite($fs,PHP_EOL. '================ Update End ==============='.PHP_EOL.PHP_EOL);$fs and fclose($fs);
+
+