Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

This commit is contained in:
From-wh 2023-04-28 12:13:48 +08:00
commit 2084423eae
3 changed files with 14873 additions and 1518 deletions

View File

@ -95,6 +95,7 @@ class SystemFile extends AuthController
['full_path', ''],
['mark', ''],
], true);
$full_path = $this->request->param('full_path');
if ($full_path == '') return app('json')->fail(100100);
$this->services->fileMarkSave($full_path, $mark);
return app('json')->success(100000);

File diff suppressed because it is too large Load Diff

View File

@ -406,7 +406,16 @@ switch ($step) {
$res = mysqli_query($conn, $addadminsql);
$res2 = true;
if (isset($_SERVER['SERVER_NAME'])) {
$site_url = '\'"http://' . $_SERVER['SERVER_NAME'] . '"\'';
if (isset($_SERVER['REQUEST_SCHEME'])) {
$request_scheme = $_SERVER['REQUEST_SCHEME'];
} else {
if ($_SERVER['HTTPS'] == 'on') {
$request_scheme = 'https';
} else {
$request_scheme = 'http';
}
}
$site_url = '\'"' . $request_scheme . '://' . $_SERVER['SERVER_NAME'] . '"\'';
$res2 = mysqli_query($conn, 'UPDATE `' . $dbPrefix . 'system_config` SET `value`=' . $site_url . ' WHERE `menu_name`="site_url"');
}
$arr = array('n' => 999999, 'count' => $counts, 'msg' => '安装完成', 'time' => date('Y-m-d H:i:s'));