Commit 08670a36 authored by tufengqi's avatar tufengqi

fix

parent a38b04a8
......@@ -11,6 +11,7 @@ if (defined('IS_FORCE_ONLINE') && true === IS_FORCE_ONLINE) {
}
$cookie_flag = false;
$file_version = '';
$header_arr = [];
if ($is_real_outer_access || (!$is_real_outer_access && 'ga' === $cookie_version)) {
// 外部用户或者内部设置cookie为ga,只允许访问文件定义的ga版本
$file_tag = 'ga';
......@@ -35,7 +36,7 @@ if ($is_real_outer_access || (!$is_real_outer_access && 'ga' === $cookie_version
$base_path = $base_path . $cookie_version . '/';
$version_val = 'cookie-' . $cookie_version;
$version_val_no_prefix = $cookie_version;
header("fpf-version: " . $version_val);
$header_arr['fpf-version'] = $version_val;
$cookie_flag = true;
}
}
......@@ -46,7 +47,7 @@ if (false === $cookie_flag) {
$base_path = $base_path . $file_version . '/';
$version_val = $file_tag . '-' . $file_version;
$version_val_no_prefix = $file_version;
header("fpf-version: " . $version_val);
$header_arr['fpf-version'] = $version_val;
}
}
$location_default_version = false;
......@@ -61,7 +62,7 @@ if ($origin_base_path === $base_path) {
$location_default_version = true;
} else {
// 本地开发环境
header("fpf-version: local");
$header_arr['fpf-version'] = 'local';
}
}
}
......@@ -74,7 +75,7 @@ if (true === $location_default_version) {
$base_path = $base_path . $file_version . '/';
$version_val = $file_tag . '-' . $file_version;
$version_val_no_prefix = $file_version;
header("fpf-version: " . $version_val);
$header_arr['fpf-version'] = $version_val;
} else {
throw new Exception('服务器代码定位错误');
}
......
<?php
require __DIR__ . '/market-basic.php';
require dirname(dirname(__DIR__)) . '/VersionApp.php';
require $base_path . 'vendor/autoload.php';
$GLOBALS['GLOBAL_YII_SYSTEM_AUTOLOAD'] = $GLOBALS['GLOBAL_YII_SYSTEM_APP'] . 'vendor/autoload.php';
$GLOBALS['GLOBAL_YII_AUTOLOAD'] = $GLOBALS['GLOBAL_YII_SYSTEM_APP'] . 'vendor/yiisoft/yii2/Yii.php';
$GLOBALS['GLOBAL_YII_WEB_CONFIG'] = require $app_package_path . 'app_config/' . MAIN_WEB_CONFIG_FILE;
\ No newline at end of file
<?php
require __DIR__ . '/market-basic.php';
require dirname(dirname(__DIR__)) . '/VersionApp.php';
require_once $GLOBALS['GLOBAL_YII_SYSTEM_APP'] . 'vendor/autoload.php';
require_once $base_path . 'vendor/autoload.php';
require_once $GLOBALS['GLOBAL_YII_SYSTEM_APP'] . 'vendor/yiisoft/yii2/Yii.php';
$config = require $app_package_path . 'app_config/' . MAIN_WEB_CONFIG_FILE;
\ No newline at end of file
require $GLOBALS['GLOBAL_YII_SYSTEM_APP'].'vendor/autoload.php';
require $base_path . 'vendor/autoload.php';
require $GLOBALS['GLOBAL_YII_SYSTEM_APP'] . 'vendor/yiisoft/yii2/Yii.php';
$GLOBALS['GLOBAL_YII_WEB_CONFIG'] = require $app_package_path . 'app_config/' . MAIN_WEB_CONFIG_FILE;
\ No newline at end of file
<?php
require __DIR__ . '/zhaobi-basic.php';
var_dump($app_package_path);exit;
require dirname(dirname(__DIR__)) . '/VersionApp.php';
require_once $GLOBALS['GLOBAL_YII_SYSTEM_APP'] . 'vendor/autoload.php';
require_once $base_path . 'vendor/autoload.php';
require_once $GLOBALS['GLOBAL_YII_SYSTEM_APP'] . 'vendor/yiisoft/yii2/Yii.php';
$config = require $app_package_path . 'app_config/' . MAIN_WEB_CONFIG_FILE;
\ No newline at end of file
$GLOBALS['GLOBAL_YII_WEB_CONFIG'] = require $app_package_path . 'app_config/' . MAIN_WEB_CONFIG_FILE;
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment