update

README.md

@@ -53,6 +53,18 @@
 
 #### 默认密码 root
 
+#### 固件内置的快捷访问入口(部分服务需要先自行在软件包中安装并启用):
+
++ op/ 可打开 OpenWRT后台 即 lan ip
++ ql/ 可打开 青龙后台 即 lan ip:5700
++ adg/ 可打开 AdGuardHome管理后台 即 lan ip:3000
++ pve/ 可打开 Proxmox VE虚拟机管理 默认为 10.0.0.10:8006
++ by/ 可打开 Bypass插件页面 即 ip/luci/admin/services/bypass
++ pk/ 可打开 Packages插件管理页面 即 ip/luci/admin/system/opkg
++ ug/ 可打开 固件在线更新页面 即 ip/luci/admin/services/gpsysupgrade
++ dl/ 可打开 固件和插件ipk仓库
+##### 可自行在 /etc/nginx/conf.d/shortcuts.conf 中调整和添加更多快捷访问
+
 第一次使用请采用全新安装,避免出现升级失败以及其他一些可能的Bug.
 
 云编译需要 [在此](https://github.com/settings/tokens) 创建个token,然后在此仓库Settings->Secrets中添加个名字为REPO_TOKEN的Secret,填入token值,否者无法触发编译
@@ -92,13 +104,13 @@ diy云编译教程: [Read the details in my blog (in Chinese) | 中文教程](ht
  首次编译:
 ```
 screen -S openwrt
-wget -O compile.sh https://raw.githubusercontent.com/kiddin9/OpenWrt_x86-r2s-r4s/master/onekey/compile.sh && bash compile.sh
+bash -c "$(curl -fsSL https://git.io/opbuild.sh)"
 ```
 
  二次编译:
 ```
 screen -S openwrt
-wget -O recompile.sh https://raw.githubusercontent.com/kiddin9/OpenWrt_x86-r2s-r4s/master/onekey/recompile.sh && bash recompile.sh
+bash -c "$(curl -fsSL https://git.io/rebuild.sh)"
 ```
 
 Build OpenWrt using GitHub Actions

devices/common/default-settings

@@ -42,6 +42,9 @@ echo "$sec 4 * * * sh /etc/rc.d/S99opkg >/dev/null 2>&1" >> /etc/crontabs/root
 grep -q op.supes.top /etc/bypass/white.list ||
 		echo "op.supes.top" >> /etc/bypass/white.list
 
+processor=`cat /proc/cpuinfo | grep 'processor' | wc -l`
+test -n "$processor" || processor=3
+sed -i "s/^threads =.*/threads = $processor/" /etc/uwsgi/vassals/luci-webui.ini
 test $version -lt 1 && {
 	uci -q set luci.main.lang='auto'
 	uci -q set luci.main.mediaurlbase=/luci-static/edge

devices/common/files/etc/nginx/conf.d/shortcuts.conf

@@ -16,6 +16,8 @@ server {
 		listen 80;
 		listen [::]:80;
 		server_name pve;
+		ssl_certificate /etc/nginx/conf.d/_lan.crt;
+		ssl_certificate_key /etc/nginx/conf.d/_lan.key;
 		location /{
 			proxy_pass $scheme://10.0.0.10:8006;
 			proxy_set_header Upgrade $http_upgrade;

onekey/compile.sh → onekey/build.sh

@@ -83,7 +83,7 @@ esac
 done
 
 REPO_BRANCH="$(git ls-remote --tags git://github.com/openwrt/openwrt | cut -d/ -f3- | sort -t. -nk1,2 | awk '/^[^{]*$/{version=$1}END{print version}'| sed -e 's/v//')"
-
+REPO_BRANCH="21.02.0"
 git clone -b v$REPO_BRANCH --depth 1 https://github.com/openwrt/openwrt
 svn export https://github.com/kiddin9/OpenWrt_x86-r2s-r4s/trunk/devices openwrt/devices
 

onekey/recompile.sh → onekey/rebuild.sh

@@ -114,6 +114,7 @@ sed -i 's,$(STAGING_DIR_HOST)/bin/upx,upx,' package/feeds/custom/*/Makefile
 
 make -j$(($(nproc)+1)) download v=s ; make -j$(($(nproc)+1)) || make -j1 V=s
 
+if [ "$?" == "0" ]; then
 echo "
 
 编译完成~~~
@@ -122,3 +123,5 @@ echo "
 初始用户名密码: root  root
 
 "
+fi
+