diff --git a/crmeb/public/install/auto.php b/crmeb/public/install/auto.php deleted file mode 100644 index da45d77e7..000000000 --- a/crmeb/public/install/auto.php +++ /dev/null @@ -1,18 +0,0 @@ - -// +---------------------------------------------------------------------- - -use think\facade\Env; - -return [ - // 默认使用的数据库连接配置 - 'default' => Env::get('database.driver', 'mysql'), - - // 数据库连接配置信息 - 'connections' => [ - 'mysql' => [ - // 数据库类型 - 'type' => Env::get('database.type', 'mysql'), - // 服务器地址 - 'hostname' => Env::get('database.hostname', '#DB_HOST#'), - // 数据库名 - 'database' => Env::get('database.database', '#DB_NAME#'), - // 用户名 - 'username' => Env::get('database.username', '#DB_USER#'), - // 密码 - 'password' => Env::get('database.password', '#DB_PWD#'), - // 端口 - 'hostport' => Env::get('database.hostport', '3306'), - // 连接dsn - 'dsn' => '', - // 数据库连接参数 - 'params' => [], - // 数据库编码默认采用utf8 - 'charset' => Env::get('database.charset', '#DB_CHARSET#'), - // 数据库表前缀 - 'prefix' => Env::get('database.prefix', '#DB_PREFIX#'), - // 数据库调试模式 - 'debug' => Env::get('database.debug', true), - // 数据库部署方式:0 集中式(单一服务器),1 分布式(主从服务器) - 'deploy' => 0, - // 数据库读写是否分离 主从式有效 - 'rw_separate' => false, - // 读写分离后 主服务器数量 - 'master_num' => 1, - // 指定从服务器序号 - 'slave_no' => '', - // 是否严格检查字段是否存在 - 'fields_strict' => true, - // 是否需要进行SQL性能分析 - 'sql_explain' => false, - // Builder类 - 'builder' => '', - // Query类 - 'query' => '', - // 是否需要断线重连 - 'break_reconnect' => false, - ], - - // 更多的数据库配置信息 - ], - - // 自定义时间查询规则 - 'time_query_rule' => [], - // 自动写入时间戳字段 - 'auto_timestamp' => 'timestamp', - // 时间字段取出后的默认时间格式 - 'datetime_format' => 'Y-m-d H:i:s', -]; diff --git a/crmeb/public/install/index.php b/crmeb/public/install/index.php index 1835315c2..e86ebb06a 100644 --- a/crmeb/public/install/index.php +++ b/crmeb/public/install/index.php @@ -1,41 +1,30 @@ - - - - - 你已经安装过该系统，如果想重新安装，请先删除install目录下的 install.lock 文件，然后再安装。 - - '; - exit; + showHtml('你已经安装过该系统，如果想重新安装，请先删除install目录下的 install.lock 文件，然后再安装。'); } @set_time_limit(1000); if (PHP_EDITION > phpversion()) { - header("Content-type:text/html;charset=utf-8"); - exit('您的php版本过低，不能安装本软件，请升级到' . PHP_EDITION . '或更高版本再安装，谢谢！'); + showHtml('您的php版本过低，不能安装本软件，请升级到' . PHP_EDITION . '或更高版本再安装，谢谢！'); } if (phpversion() > '8.0') { - header("Content-type:text/html;charset=utf-8"); - exit('您的php版本太高，不能安装本软件，兼容php版本7.1~7.4，谢谢！'); + showHtml('您的php版本太高，不能安装本软件，兼容php版本7.1~7.4，谢谢！'); } define("CRMEB_VERSION", '20180601'); date_default_timezone_set('PRC'); error_reporting(E_ALL & ~E_NOTICE); header('Content-Type: text/html; charset=UTF-8'); -//define('SITEDIR2', substr(SITEDIR,0,-7)); -//echo SITEDIR; -//exit;SITE_DIR + //数据库 $sqlFile = 'crmeb.sql'; $configFile = '.env'; @@ -99,7 +88,7 @@ switch ($step) { if (extension_loaded('redis')) { $redis = '√ 已安装'; } else { - $redis = '√ 点击查看帮助'; + $redis = '√ 点击查看帮助'; $err++; } @@ -143,7 +132,7 @@ switch ($step) { if (function_exists('finfo_open')) { $finfo_open = '√ 启用'; } else { - $finfo_open = '√点击查看帮助'; + $finfo_open = '√点击查看帮助'; $err++; } @@ -661,5 +650,17 @@ function delFile($dir, $file_type = '') if (file_exists($dir)) unlink($dir); } } - +//错误提示方法 +function showHtml($str) { + echo ' + + + + + + '.$str.' + + '; + exit; +} ?> diff --git a/crmeb/public/install/swoole-compiler-loader.php b/crmeb/public/install/swoole-compiler-loader.php deleted file mode 100644 index e40d9f05d..000000000 --- a/crmeb/public/install/swoole-compiler-loader.php +++ /dev/null @@ -1,325 +0,0 @@ - 'Swoole Compiler Loader 安装助手', -]; -$languages['en'] = [ - 'title' => 'Swoole Compiler Loader Wizard', -]; - -// Set env variable for current environment -$env = []; -// Check os type -$env['os'] = []; -if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { - $env['os']['name'] = "windows"; - $env['os']['raw_name'] = php_uname(); -} else { - $env['os']['name'] = "unix"; - $env['os']['raw_name'] = php_uname(); -} -// Check php -$env['php'] = []; -$env['php']['version'] = phpversion(); -// Check run mode -$sapi_type = php_sapi_name(); -if ("cli" == $sapi_type) { - $env['php']['run_mode'] = "cli"; -} else { - $env['php']['run_mode'] = "web"; -} -// Check php bit -if (PHP_INT_SIZE == 4) { - $env['php']['bit'] = 32; -} else { - $env['php']['bit'] = 64; -} -$env['php']['sapi'] = $sapi_type; -$env['php']['ini_loaded_file'] = php_ini_loaded_file(); -$env['php']['ini_scanned_files'] = php_ini_scanned_files(); -$env['php']['loaded_extensions'] = get_loaded_extensions(); -$env['php']['incompatible_extensions'] = ['xdebug', 'ionCube', 'zend_loader']; -$env['php']['loaded_incompatible_extensions'] = []; -$env['php']['extension_dir'] = ini_get('extension_dir'); -// Check incompatible extensions -if (is_array($env['php']['loaded_extensions'])) { - foreach ($env['php']['loaded_extensions'] as $loaded_extension) { - foreach ($env['php']['incompatible_extensions'] as $incompatible_extension) { - if (strpos(strtolower($loaded_extension), strtolower($incompatible_extension)) !== false) { - $env['php']['loaded_incompatible_extensions'][] = $loaded_extension; - } - } - } -} -$env['php']['loaded_incompatible_extensions'] = array_unique($env['php']['loaded_incompatible_extensions']); -// Parse System Environment Info -$sysInfo = w_getSysInfo(); -// Check php thread safety -$env['php']['raw_thread_safety'] = $sysInfo['thread_safety'] ?? false; -if (isset($sysInfo['thread_safety'])) { - $env['php']['thread_safety'] = $sysInfo['thread_safety'] ? '线程安全' : '非线程安全'; -} else { - $env['php']['thread_safety'] = '未知'; -} -// Check swoole loader installation -if (isset($sysInfo['swoole_loader']) and isset($sysInfo['swoole_loader_version'])) { - $env['php']['swoole_loader']['status'] = $sysInfo['swoole_loader'] ? "已安装" - : '未安装'; - if ($sysInfo['swoole_loader_version'] !== false) { - $env['php']['swoole_loader']['version'] = "" . $sysInfo['swoole_loader_version'] . ""; - } else { - $env['php']['swoole_loader']['version'] = '未知'; - } -} else { - $env['php']['swoole_loader']['status'] = '未安装'; - $env['php']['swoole_loader']['version'] = '未知'; -} -/** - * Web mode - */ -if ('web' == $env['php']['run_mode']) { - $language = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 4); - if (preg_match("/zh-c/i", $language)) { - $env['lang'] = "zh-cn"; - $wizard_lang = $env['lang']; - } else { - $env['lang'] = "en"; - $wizard_lang = $env['lang']; - } - $html = ''; - // Header - $html_header = ' - - - - - - - - %s - - - - '; - $html_header = sprintf($html_header, $languages[$wizard_lang]['title']); - $html_body = '
'; - $html_body_nav = '
'; - $html_body_nav .= '

CRMEB Swoole Compiler 安装向导

'; - $html_body_nav .= '

Version:2.0.2 Date:2019-01-09

'; - $html_body_nav .= '
'; - - // Environment information - $html_body_environment = ' -
-
检查当前环境
-
'; - - // Error infomation - $html_error = ""; - if (!empty($env['php']['loaded_incompatible_extensions'])) { - $html_error = '
-
-
错误信息
-

%s

-
- '; - $err_msg = "当前PHP包含与swoole_compiler_loader扩展不兼容的扩展" . implode(',', $env['php']['loaded_incompatible_extensions']) . "，请移除不兼容的扩展。"; - $html_error = sprintf($html_error, $err_msg); - } - - // Check Loader Status - $html_body_loader = '
'; - if (empty($html_error)) { - $html_body_loader .= '
'; - $html_body_loader .= '
安装和配置Swoole Loader
'; - $phpversion = substr($env['php']['version'], 0, 3); - $phpversion = str_replace('.', '', $phpversion); - $loaderFileName = ''; - if ($env['os']['name'] == "windows") { - $loaderFileName = 'php_swoole_loader_php' . $phpversion; - if ($env['php']['thread_safety'] == '非线程安全') { - $loaderFileName .= '_nzts_x64.dll'; - } else { - $loaderFileName .= '_zts_x64.dll'; - } - } else { - if ($env['php']['thread_safety'] != '非线程安全') { - $loaderFileName = 'swoole_loader' . $phpversion . '_zts.so'; - } else { - - $loaderFileName = 'swoole_loader' . $phpversion . '.so'; - } - } - $html_body_loader .= '

1 - 安装Swoole Loader

前往根目录 /help/swoole-loader/' . $loaderFileName . '扩展文件上传到当前PHP的扩展安装目录中：

' . $env['php']['extension_dir'] . '

'; - $html_body_loader .= '

2 - 修改php.ini配置（如已修改配置，请忽略此步骤，不必重复添加）

'; - $html_body_loader .= '编辑此PHP配置文件：' . $env['php']['ini_loaded_file'] . '，在此文件底部结尾处加入如下配置
'; - if ($env['os']['name'] == "windows") { - $html_body_loader .= '

extension=' . $env['php']['extension_dir'] . DIRECTORY_SEPARATOR . $loaderFileName . '
注意：需要名称和刚才上传到当前PHP的扩展安装目录中的文件名一致'; - } else { - $html_body_loader .= '
extension=' . $env['php']['extension_dir'] . DIRECTORY_SEPARATOR . $loaderFileName . '
注意：需要名称和刚才上传到当前PHP的扩展安装目录中的文件名一致'; - } - $html_body_loader .= '

'; - $html_body_loader .= '

3 - 重启服务

重启或重载PHP配置

'; - $html_body_loader .= '
'; - } - - // Body footer - $html_body_footer = ''; - $html_body .= $html_body_nav . '
' . $html_body_environment . $html_error . $html_body_loader . '
' . $html_body_footer; - $html_body .= '
'; - // Footer - $html_footer = ' - - - - - '; - // Make full html - $html = $html_header . $html_body . $html_footer; - // Output html content - //ob_start(); - echo $html; - //ob_end_clean(); - //die(); -} - -/** - * Cli mode - */ -if ("cli" == $env['php']['run_mode']) { - -} -//TODO -/** - * Useful functions - */ -// Dump detail of variable -function w_dump($var) -{ - if (is_object($var) and $var instanceof Closure) { - $str = 'function ('; - $r = new ReflectionFunction($var); - $params = array(); - foreach ($r->getParameters() as $p) { - $s = ''; - if ($p->isArray()) { - $s .= 'array '; - } else if ($p->getClass()) { - $s .= $p->getClass()->name . ' '; - } - if ($p->isPassedByReference()) { - $s .= '&'; - } - $s .= '$' . $p->name; - if ($p->isOptional()) { - $s .= ' = ' . var_export($p->getDefaultValue(), TRUE); - } - $params [] = $s; - } - $str .= implode(', ', $params); - $str .= '){' . PHP_EOL; - $lines = file($r->getFileName()); - for ($l = $r->getStartLine(); $l < $r->getEndLine(); $l++) { - $str .= $lines[$l]; - } - echo $str; - } else if (is_array($var)) { - echo ""; - print_r($var); - echo ""; - } else { - var_dump($var); - } -} - -// Parse verion of php -function w_parse_version($version) -{ - $versionList = []; - if (is_string($version)) { - $rawVersionList = explode('.', $version); - if (isset($rawVersionList[0])) { - $versionList[] = $rawVersionList[0]; - } - if (isset($rawVersionList[1])) { - $versionList[] = $rawVersionList[1]; - } - } - return $versionList; -} - -function w_getSysInfo() -{ - global $env; - $sysEnv = []; - // Get content of phpinfo - ob_start(); - phpinfo(); - $sysInfo = ob_get_contents(); - ob_end_clean(); - // Explode phpinfo content - if ($env['php']['run_mode'] == 'cli') { - $sysInfoList = explode('\n', $sysInfo); - } else { - $sysInfoList = explode('', $sysInfo); - } - foreach ($sysInfoList as $sysInfoItem) { - if (preg_match('/thread safety/i', $sysInfoItem)) { - $sysEnv['thread_safety'] = (preg_match('/(enabled|yes)/i', $sysInfoItem) != 0); - } - if (preg_match('/swoole_loader support/i', $sysInfoItem)) { - $sysEnv['swoole_loader'] = (preg_match('/(enabled|yes)/i', $sysInfoItem) != 0); - } - if (preg_match('/swoole_loader version/i', $sysInfoItem)) { - preg_match('/\d+.\d+.\d+/s', $sysInfoItem, $match); - $sysEnv['swoole_loader_version'] = $match[0] ?? false; - } - } - //var_dump($sysEnv);die(); - return $sysEnv; -} diff --git a/crmeb/public/install/templates/step5.php b/crmeb/public/install/templates/step5.php index 8f2262faf..1eaee5352 100644 --- a/crmeb/public/install/templates/step5.php +++ b/crmeb/public/install/templates/step5.php @@ -5,11 +5,10 @@ <?php echo $Title; ?> - <?php echo $Powered; ?> - @@ -20,9 +19,9 @@ $host = $_SERVER['HTTP_HOST'];
安装完成，进入后台管理

为了您站点的安全，安装完成后即可将网站根目录下的“install”文件夹下的所有文件删除，除install.lock文件外防止重复安装。

-
+
进入前台 - 进入后台 + 进入后台
@@ -51,4 +50,4 @@ $(function(){ }); - \ No newline at end of file +