Skip to content

Commit

Permalink
- 2020-08-16: v1.1.2
Browse files Browse the repository at this point in the history
  - 优化重启路由后,页面为空的问题
  • Loading branch information
cdwangtao committed Aug 16, 2021
1 parent 5186296 commit 8f5b581
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 27 deletions.
20 changes: 10 additions & 10 deletions Changelog.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Koolshare Nps Changelog
===========================================
2020-08-13: v1.0.1 (nps版本:v0.26.10)
- 第一个beta版本
2020-08-13: v1.0.2
- 2020-08-13: v1.0.1 (nps版本:v0.26.10)
- 第一个beta版本
- 2020-08-13: v1.0.2
- 添加端口防火墙设置
2020-08-13: v1.0.3
- 2020-08-13: v1.0.3
- 添加自定义端口范围以及自定端口的自动添加防火墙放行、允许多用户登录、允许用户注册的配置
2020-08-14: v1.0.4
- 2020-08-14: v1.0.4
- 添加配置文件自动备份任务(同步时间可自定义),解决路由器重启后,配置丢失的问题
2020-08-14: v1.0.5
- 添加配置文件自动备份任务(同步时间可自定义),解决路由器重启后,配置丢失的问题(优化)
2020-08-16: v1.1.1
- 2020-08-16: v1.1.1
- 完美解决/etc/nps/在重启路由器丢失的问题
1.软件停止时,检测配置文件是否变化,如果有变化实时备份配置文件。在软件启动时,还原配置文件到/etc/nps/。
2.建议开启[定时备份配置]功能,开启后,会定时检查配置文件是否变化,如果有变化实时备份配置文件。
- 1.软件停止时,检测配置文件是否变化,如果有变化实时备份配置文件。在软件启动时,还原配置文件到/etc/nps/。
- 2.建议开启[定时备份配置]功能,开启后,会定时检查配置文件是否变化,如果有变化实时备份配置文件。
- 2020-08-16: v1.1.2
- 优化重启路由后,页面为空的问题
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ Koolshare Nps Changelog
- 添加配置文件自动备份任务(同步时间可自定义),解决路由器重启后,配置丢失的问题(优化)
- 2020-08-16: v1.1.1
- 完美解决/etc/nps/在重启路由器丢失的问题
1.软件停止时,检测配置文件是否变化,如果有变化实时备份配置文件。在软件启动时,还原配置文件到/etc/nps/。
2.建议开启[定时备份配置]功能,开启后,会定时检查配置文件是否变化,如果有变化实时备份配置文件。

- 1.软件停止时,检测配置文件是否变化,如果有变化实时备份配置文件。在软件启动时,还原配置文件到/etc/nps/。
- 2.建议开启[定时备份配置]功能,开启后,会定时检查配置文件是否变化,如果有变化实时备份配置文件。
- 2020-08-16: v1.1.2
- 优化重启路由后,页面为空的问题


## 运行图:
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

MODULE="nps"
VERSION="v1.1.1"
VERSION="v1.1.2"
TITLE="nps"
DESCRIPTION="一款轻量级、高性能、功能强大的内网穿透代理服务器。"
HOME_URL="Module_nps.asp"
Expand Down
2 changes: 1 addition & 1 deletion config.json.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version":"v1.1.1",
"version":"v1.1.2",
"md5":"a50806415e3d615822b91518a56c26d5",
"home_url":"Module_nps.asp",
"title":"nps",
Expand Down
Binary file removed nps.tar.gz
Binary file not shown.
7 changes: 1 addition & 6 deletions nps/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -263,14 +263,9 @@ install_now(){
}

install(){
# if [ ! -d "/tmp/${module}/" ];then
# echo_date "文件夹[/tmp/${module}/]不存在, 即将开始拷贝[/tmp/home/root/${module}/]到[/tmp/]"
# # mkdir -p /tmp/nps/
# # cp -rf /tmp/home/root/${module}/* /tmp/nps/
# cp -rf /tmp/home/root/${module}/ /tmp/
# fi
# 1.获取路由器机型名称: 如:RT-AX86U
get_model

# 2.获取固件类型 如: FW_TYPE_CODE="1" FW_TYPE_NAME="华硕官方固件"
get_fw_type

Expand Down
14 changes: 9 additions & 5 deletions nps/scripts/nps_config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -166,17 +166,21 @@ disconnect_timeout=60
# 拷贝1.配置文件(conf)
if [ ! -d "${CONF_REAL_DIR}/" ];then
echo_date "nps固定的配置目录(conf)[${CONF_REAL_DIR}/]不存在, 开始创建[${CONF_REAL_DIR}/]目录,并拷贝[${CONF_BAKALL_DIR}/*]到[${CONF_REAL_DIR}/]"
mkdir -p "${CONF_REAL_DIR}"
cp -rf "${CONF_BAKALL_DIR}/*" "${CONF_REAL_DIR}/"
mkdir -p ${CONF_REAL_DIR}/
cp -rf ${CONF_BAKALL_DIR}/* ${CONF_REAL_DIR}/
# cp -rf /koolshare/res/nps/conf/ /etc/nps/
fi
# 拷贝2.资源文件(web)
if [ ! -d "${WEB_REAL_DIR}/" ];then
echo_date "nps固定的配置目录(web)[${WEB_REAL_DIR}/]不存在, 开始创建[${WEB_REAL_DIR}/]目录,并拷贝[${WEB_BAK_DIR}/*]到[${WEB_REAL_DIR}/]"
mkdir -p "${WEB_REAL_DIR}/"
cp -rf "${WEB_BAK_DIR}/*" "${WEB_REAL_DIR}/"
echo_data "nps固定的配置目录(web)[${WEB_REAL_DIR}/]不存在, 开始创建[${WEB_REAL_DIR}/]目录,并拷贝[${WEB_BAK_DIR}/*]到[${WEB_REAL_DIR}/]"
mkdir -p ${WEB_REAL_DIR}/
cp -rf ${WEB_BAK_DIR}/* ${WEB_REAL_DIR}/
# cp -rf /koolshare/res/nps/web/ /etc/nps/
fi
if [ ! -f "${WEB_REAL_DIR}/views/index/index.html" ];then
echo_data "nps固定的配置文件(web)[${WEB_BAK_DIR}/views/index/index.html]不存在,拷贝[${WEB_BAK_DIR}/*]到[${WEB_REAL_DIR}/]"
cp -rf ${WEB_BAK_DIR}/* ${WEB_REAL_DIR}/
fi
# wt增强1.还原配置文件 参数1(是否比较时间拷贝文件 1:比较时间 0:不比较)
on_restore_conf 0

Expand Down
2 changes: 1 addition & 1 deletion nps/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.1.1
v1.1.2

0 comments on commit 8f5b581

Please sign in to comment.