open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2025-05-23 23:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复ql update中reset操作

Browse Source
This commit is contained in:
hanhh 2021-08-03 11:07:05 +08:00
parent e260dcb985
commit c51306ef27
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
shell/update.sh
View File

@ -238,8 +238,8 @@ update_qinglong() {
local no_restart="$1" local no_restart="$1"
[ -f $dir_root/package.json ] && ql_depend_old=$(cat $dir_root/package.json) [ -f $dir_root/package.json ] && ql_depend_old=$(cat $dir_root/package.json)
reset_romote_url ${dir_root} "${github_proxy_url}https://github.com/whyour/qinglong.git" reset_romote_url ${dir_root} "${github_proxy_url}https://github.com/whyour/qinglong.git" "master"
git_pull_scripts $dir_root git_pull_scripts $dir_root "master"
if [[ $exit_status -eq 0 ]]; then if [[ $exit_status -eq 0 ]]; then
echo -e "\n更新$dir_root成功...\n" echo -e "\n更新$dir_root成功...\n"
@ -255,12 +255,8 @@ update_qinglong() {
local url="${github_proxy_url}https://github.com/whyour/qinglong-static.git" local url="${github_proxy_url}https://github.com/whyour/qinglong-static.git"
if [ -d ${ql_static_repo}/.git ]; then if [ -d ${ql_static_repo}/.git ]; then
reset_romote_url ${ql_static_repo} ${url} reset_romote_url ${ql_static_repo} ${url} "master"
cd ${ql_static_repo} git_pull_scripts ${ql_static_repo} "master"
git fetch --all
exit_status=$?
git reset --hard origin/master
cd $dir_root
else else
git_clone_scripts ${url} ${ql_static_repo} git_clone_scripts ${url} ${ql_static_repo}
fi fi

4
src/layouts/index.tsx
View File

@ -29,6 +29,9 @@ export default function (props: any) {
history.push('/login'); history.push('/login');
} }
vhCheck(); vhCheck();
// patch custome layout title as react node [object, object]
document.title = '控制面板';
}, []); }, []);
useEffect(() => { useEffect(() => {
@ -109,7 +112,6 @@ export default function (props: any) {
}, },
]; ];
}} }}
pageTitleRender={() => '控制面板'}
{...defaultProps} {...defaultProps}
> >
{props.children} {props.children}