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

修复版本号样式，fix #349

Browse Source
This commit is contained in:
hanhh 2021-06-16 21:06:47 +08:00
parent 8385280a64
commit c2ba6e7a7d
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/docker-entrypoint.sh
View File

@ -10,7 +10,7 @@ cp -fv $dir_root/docker/front.conf /etc/nginx/conf.d/front.conf
echo echo
echo -e "======================2. 更新源代码========================\n" echo -e "======================2. 更新源代码========================\n"
ql update ql update "no-restart"
echo echo
echo -e "======================3. 启动nginx========================\n" echo -e "======================3. 启动nginx========================\n"

8
shell/update.sh
View File

@ -251,10 +251,10 @@ usage() {
## 更新qinglong ## 更新qinglong
update_qinglong() { update_qinglong() {
local no_restart="$1"
echo -e "--------------------------------------------------------------\n" echo -e "--------------------------------------------------------------\n"
[ -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)
url=https://github.com/whyour/qinglong.git reset_romote_url ${dir_root} "${github_proxy_url}https://github.com/whyour/qinglong.git"
reset_romote_url ${dir_root} "${github_proxy_url}${url/https:\/\/ghproxy.com\//}"
git_pull_scripts $dir_root git_pull_scripts $dir_root
if [[ $exit_status -eq 0 ]]; then if [[ $exit_status -eq 0 ]]; then
@ -288,10 +288,12 @@ update_qinglong() {
cd $dir_root cd $dir_root
rm -rf $dir_root/build && rm -rf $dir_root/dist rm -rf $dir_root/build && rm -rf $dir_root/dist
cp -rf $ql_static_repo/* $dir_root cp -rf $ql_static_repo/* $dir_root
if [[ $no_restart != "no-restart" ]]; then
echo -e "重启面板中..." echo -e "重启面板中..."
nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
sleep 1 sleep 1
reload_pm2 reload_pm2
fi
else else
echo -e "\n更新$dir_root失败，请检查原因...\n" echo -e "\n更新$dir_root失败，请检查原因...\n"
fi fi
@ -401,7 +403,7 @@ main() {
log_path="$dir_log/update/${log_time}_$p1.log" log_path="$dir_log/update/${log_time}_$p1.log"
case $p1 in case $p1 in
update) update)
update_qinglong | tee $log_path update_qinglong "$2" | tee $log_path
;; ;;
extra) extra)
run_extra_shell | tee -a $log_path run_extra_shell | tee -a $log_path

4
src/layouts/index.tsx
View File

@ -68,7 +68,9 @@ export default function (props: any) {
<> <>
控制面板 控制面板
<a href={changeLog} target="_blank" rel="noopener noreferrer"> <a href={changeLog} target="_blank" rel="noopener noreferrer">
<span style={{ fontSize: 9, color: '#666', marginLeft: 5 }}> <span
style={{ fontSize: 12, color: '#666', marginLeft: 5, zoom: 0.8 }}
>
{version} {version}
</span> </span>
</a> </a>

1
src/pages/config/index.tsx
View File

@ -71,7 +71,6 @@ const Config = () => {
value={value} value={value}
options={{ options={{
lineNumbers: true, lineNumbers: true,
lineWrapping: true,
styleActiveLine: true, styleActiveLine: true,
matchBrackets: true, matchBrackets: true,
mode: 'shell', mode: 'shell',