Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mian #1

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

mian #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f694f43
更新版本号
nuanxinqing123 Jan 10, 2023
8eb673b
新增演示版
nuanxinqing123 Jan 10, 2023
b2a81f8
更新版本
nuanxinqing123 Jan 10, 2023
a6cd070
修复 少数情况下程序启动速度过慢问题
nuanxinqing123 Jan 13, 2023
43bef25
更新 静态资源更新
nuanxinqing123 Apr 25, 2023
0c7ef66
更新 删除授权部分代码
nuanxinqing123 Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .idea/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 12 additions & 22 deletions Update.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,20 @@
<ul>
<li>优化 更新重启逻辑</li>
<li>优化 用户管理-会员到期时间展示优化</li>
<li>优化 用户提交变量成功后积分无变化（实际已扣除积分）</li>
<li>优化 管理员后台充值日志记录</li>
<li>修复 总览-今日消费积分数量接口数据异常</li>
<li>修复 总览-上传数据记录接口数据异常</li>
<li>修复 总览-网站会员用户数量接口数据异常</li>
<li>修复 用户变量管理-面板查询提示接口异常</li>
<li>修复 管理员后台充值（会员）无法到账</li>
<li>修复 会员卡密生成时间错误</li>
<li>修复 会员卡密充值错误</li>
<li>新增 环境变量定时备份</li>
<li>新增 支持变量合并提交</li>
<li>新增 变量提交增加换行合并提交</li>
<li>新增 环境变量提示内容</li>
<li>修改 暂时关闭系统重启功能</li>
<li>优化 日志性能优化</li>
</ul>

<li>直接部署用户将支持自带的守护，推荐不要使用其他进程守护工具。守护教程：<a href='https://www.yuque.com/sevesum/qk1dd7/ve8ce7#cYsNT'>点击查看</a></li>


<ul>
<li>优化 更新重启逻辑</li>
<li>优化 用户管理-会员到期时间展示优化</li>
<li>优化 用户提交变量成功后积分无变化（实际已扣除积分）</li>
<li>优化 管理员后台充值日志记录</li>
<li>修复 总览-今日消费积分数量接口数据异常</li>
<li>修复 总览-上传数据记录接口数据异常</li>
<li>修复 总览-网站会员用户数量接口数据异常</li>
<li>修复 用户变量管理-面板查询提示接口异常</li>
<li>修复 管理员后台充值（会员）无法到账</li>
<li>修复 会员卡密生成时间错误</li>
<li>修复 会员卡密充值错误</li>
<li>新增 环境变量定时备份</li>
<li>新增 支持变量合并提交</li>
<li>新增 变量提交增加换行合并提交</li>
<li>新增 环境变量提示内容</li>
<li>修改 暂时关闭系统重启功能</li>
<li>优化 日志性能优化</li>
</ul>
49 changes: 19 additions & 30 deletions config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,19 @@
# 网站配置
app:
# 运行模式：生产环境留空
mode: "debug"
# 运行端口
port: 6600

# ======================================= 授权设置区域 ===========================================
# 授权购买地址：https://pay.6b7.org
# 授权激活地址：https://licence.pro.6b7.org
# 填写注册的账户信息 [username: 用户名、password：密码、aqCode：安全码]
# 安全码可以自定义设置，主要目的是在授权中心做验证
licence:
username: "nuanxinqing"
password: "136729880"
aqCode: "136729880"

# =============== 以下内容修改无需重启程序 ===================
# ======================================= WxPusher 通知设置区域 ===========================================
# 此处填你申请的 appToken. 官方文档：https://wxpusher.zjiecode.com/docs
# WP_APP_TOKEN 可在管理台查看: https://wxpusher.zjiecode.com/admin/main/app/appToken
wxpusher:
wp_app_token: "AT_6c8etY8HAOqJEQVrpYkmneet4gxFXdN5"

# ======================================= 微信小程序设置区域 ===========================================
wechat_applet:
# 小程序 appid
appid: "wx75c058d38a81a2fd"
# 小程序 appSecret
secret: "4fce7ded4778265f1a5a0a1f9edca366"
# 网站配置
app:
# 运行模式：生产环境留空
mode: ""
# 运行端口
port: 6600

# ======================================= WxPusher 通知设置区域 ===========================================
# 此处填你申请的 appToken. 官方文档：https://wxpusher.zjiecode.com/docs
# WP_APP_TOKEN 可在管理台查看: https://wxpusher.zjiecode.com/admin/main/app/appToken
wxpusher:
wp_app_token: ""

# ======================================= 微信小程序设置区域 ===========================================
wechat_applet:
# 小程序 appid
appid: ""
# 小程序 appSecret
secret: ""
40 changes: 2 additions & 38 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@ import (
"QLToolsPro/server/dao"
"QLToolsPro/server/gcache"
"QLToolsPro/server/logger"
"QLToolsPro/server/middlewares"
"QLToolsPro/server/settings"
_ "QLToolsPro/utils/daemon"
"QLToolsPro/utils/license"
"QLToolsPro/utils/snowflake"
"QLToolsPro/utils/validator"
"context"
"errors"
"fmt"
"github.com/gin-gonic/gin"
"github.com/spf13/viper"
Expand Down Expand Up @@ -113,9 +112,6 @@ func main() {
// 注册路由
r := server.Setup()

// 检查小程序授权
middlewares.CheckAppLicence()

fmt.Println(" ")
fmt.Println(" ____ _ _______ _ _____ \n / __ \\| | |__ __| | | | __ \\ \n| | | | | | | ___ ___ | |___| |__) | __ ___ \n| | | | | | |/ _ \\ / _ \\| / __| ___/ '__/ _ \\ \n| |__| | |____| | (_) | (_) | \\__ \\ | | | | (_) |\n \\___\\_\\______|_|\\___/ \\___/|_|___/_| |_| \\___/ ")
fmt.Println("")
Expand All @@ -125,22 +121,9 @@ func main() {
fmt.Println("运行模式：Release模式")
}
fmt.Println("监听端口：" + strconv.Itoa(viper.GetInt("app.port")))
/* 检查授权 */
b, m := license.LoginLicense()
if !b {
fmt.Println("您的许可状态：" + m)
return
} else {
fmt.Println("您的许可状态：正常, 到期时间：" + m)
}
fmt.Println(" ")
zap.L().Info("监听端口：" + strconv.Itoa(viper.GetInt("app.port")))

//if err := endless.ListenAndServe(fmt.Sprintf(":%d", viper.GetInt("app.port")), r); err != nil {
// log.Fatalf("listen: %s\n", err)
//}
//log.Println("Server exiting")

// 启动服务
srv := &http.Server{
Addr: fmt.Sprintf(":%d", viper.GetInt("app.port")),
Expand All @@ -149,7 +132,7 @@ func main() {

// 启动
go func() {
if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
log.Fatalf("Listten: %s\n", err)
}
}()
Expand All @@ -170,25 +153,6 @@ func main() {
}

zap.L().Info("Service has been shut down")

// Linux
//zap.L().Debug("进程PID：" + strconv.Itoa(syscall.Getpid()))
//flag.Parse()
//
//listener, err := reload.GetListener(srv.Addr)
//if err != nil {
// log.Println(err)
//}
//
//var s = reload.NewService(listener)
//go func() {
// err = srv.Serve(listener)
// if err != nil {
// log.Println(err)
// }
//}()
//
//s.Start()
}

// IFPlugin 判断并自动创建插件文件夹
Expand Down
2 changes: 1 addition & 1 deletion server/const/const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ var (
)

// LocVersion 本地版本
const LocVersion = "1.6"
const LocVersion = "1.8"
7 changes: 7 additions & 0 deletions server/controllers/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"fmt"
"github.com/gin-gonic/gin"
"github.com/go-playground/validator/v10"
"github.com/spf13/viper"
"go.uber.org/zap"
)

Expand Down Expand Up @@ -212,6 +213,12 @@ func ContainerCronBackup(c *gin.Context) {
return
}

// 演示版标签
if viper.GetString("app.mode") == "demoPro" {
res.ResErrorWithMsg(c, res.CodeServerBusy, "演示版禁止操作")
return
}

// 处理业务
resCode, msg := logic.ContainerCronBackup(p)
switch resCode {
Expand Down
13 changes: 13 additions & 0 deletions server/controllers/message.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
val "QLToolsPro/utils/validator"
"github.com/gin-gonic/gin"
"github.com/go-playground/validator/v10"
"github.com/spf13/viper"
"go.uber.org/zap"
)

Expand Down Expand Up @@ -51,6 +52,12 @@ func MessageSend(c *gin.Context) {
return
}

// 演示版标签
if viper.GetString("app.mode") == "demoPro" {
res.ResErrorWithMsg(c, res.CodeServerBusy, "演示版禁止操作")
return
}

// 处理业务
resCode, msg := logic.MessageSend(p)
switch resCode {
Expand Down Expand Up @@ -82,6 +89,12 @@ func MessageSendAll(c *gin.Context) {
return
}

// 演示版标签
if viper.GetString("app.mode") == "demoPro" {
res.ResErrorWithMsg(c, res.CodeServerBusy, "演示版禁止操作")
return
}

// 处理业务
resCode, msg := logic.MessageSendAll(p)
switch resCode {
Expand Down
7 changes: 7 additions & 0 deletions server/controllers/setting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
val "QLToolsPro/utils/validator"
"github.com/gin-gonic/gin"
"github.com/go-playground/validator/v10"
"github.com/spf13/viper"
"go.uber.org/zap"
)

Expand Down Expand Up @@ -47,6 +48,12 @@ func SaveSettings(c *gin.Context) {
return
}

// 演示版标签
if viper.GetString("app.mode") == "demoPro" {
res.ResErrorWithMsg(c, res.CodeServerBusy, "演示版禁止操作")
return
}

// 处理业务
resCode := logic.SaveSettings(p)
switch resCode {
Expand Down
13 changes: 13 additions & 0 deletions server/controllers/system.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
val "QLToolsPro/utils/validator"
"github.com/gin-gonic/gin"
"github.com/go-playground/validator/v10"
"github.com/spf13/viper"
"go.uber.org/zap"
"os/exec"
"strconv"
Expand Down Expand Up @@ -46,6 +47,12 @@ func SystemSoftwareUpdate(c *gin.Context) {
return
}

// 演示版标签
if viper.GetString("app.mode") == "demoPro" {
res.ResErrorWithMsg(c, res.CodeServerBusy, "演示版禁止操作")
return
}

resCode, msg := logic.SystemSoftwareUpdate(p)
switch resCode {
case res.CodeSystemError:
Expand All @@ -58,6 +65,12 @@ func SystemSoftwareUpdate(c *gin.Context) {

// SystemState 关闭/重启系统
func SystemState(c *gin.Context) {
// 演示版标签
if viper.GetString("app.mode") == "demoPro" {
res.ResErrorWithMsg(c, res.CodeServerBusy, "演示版禁止操作")
return
}

// shutdown：关闭、restart：重启
t := c.Query("type")
if t == "shutdown" {
Expand Down
13 changes: 13 additions & 0 deletions server/controllers/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"QLToolsPro/utils/wxpusher"
"github.com/gin-gonic/gin"
"github.com/go-playground/validator/v10"
"github.com/spf13/viper"
"go.uber.org/zap"
)

Expand Down Expand Up @@ -276,6 +277,12 @@ func UserInformationUpdate(c *gin.Context) {
return
}

// 演示版标签
if viper.GetString("app.mode") == "demoPro" {
res.ResErrorWithMsg(c, res.CodeServerBusy, "演示版禁止操作")
return
}

// 处理业务
resCode := logic.UserInformationUpdate(p)
switch resCode {
Expand Down Expand Up @@ -305,6 +312,12 @@ func UserInformationDelete(c *gin.Context) {
return
}

// 演示版标签
if viper.GetString("app.mode") == "demoPro" {
res.ResErrorWithMsg(c, res.CodeServerBusy, "演示版禁止操作")
return
}

// 处理业务
resCode := logic.UserInformationDelete(p)
switch resCode {
Expand Down
3 changes: 1 addition & 2 deletions server/logic/online.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@ import (
"QLToolsPro/utils/requests"
res "QLToolsPro/utils/response"
"fmt"
"go.uber.org/zap"
"regexp"
"strconv"
"strings"
time2 "time"

"go.uber.org/zap"
)

// OnlineServer 获取在线服务
Expand Down
Loading