From 59f2039b9616fe15ee25eafacf47bf6e177f1db5 Mon Sep 17 00:00:00 2001 From: gotoeasy Date: Tue, 24 Oct 2023 21:00:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=90=AF=E6=B5=8B=E8=AF=95=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E6=97=B6=EF=BC=8C=E6=98=BE=E7=A4=BA=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=94=9F=E6=88=90=E6=B5=8B=E8=AF=95=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BF=AB=E9=80=9F=E4=BD=93=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- glc/onstart/onstart.go | 1 + glc/www/controller/log_add_testdata_controller.go | 4 ++-- glc/www/controller/storage_mnt_controller.go | 7 ++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/glc/onstart/onstart.go b/glc/onstart/onstart.go index 8715556..7270c2c 100644 --- a/glc/onstart/onstart.go +++ b/glc/onstart/onstart.go @@ -41,6 +41,7 @@ func Run() { gweb.RegisterController(method.POST, contextPath+"/v1/store/names", controller.StorageNamesController) // 查询日志仓名称列表 gweb.RegisterController(method.POST, contextPath+"/v1/store/list", controller.StorageListController) // 查询日志仓信息列表 gweb.RegisterController(method.POST, contextPath+"/v1/store/delete", controller.StorageDeleteController) // 删除日志仓 + gweb.RegisterController(method.POST, contextPath+"/v1/store/mode", controller.TestModeController) // 查询是否测试模式 gweb.RegisterController(method.POST, contextPath+"/v1/user/enableLogin", controller.IsEnableLoginController) // 查询是否开启用户密码登录功能 gweb.RegisterController(method.POST, contextPath+"/v1/user/login", controller.LoginController) // Login gweb.RegisterController(method.POST, contextPath+"/v1/version/info", controller.VersionController) // 查询版本信息 diff --git a/glc/www/controller/log_add_testdata_controller.go b/glc/www/controller/log_add_testdata_controller.go index 6af8923..fe5dc8a 100644 --- a/glc/www/controller/log_add_testdata_controller.go +++ b/glc/www/controller/log_add_testdata_controller.go @@ -12,7 +12,7 @@ import ( func JsonLogAddTestDataController(req *gweb.HttpRequest) *gweb.HttpResult { if !conf.IsTestMode() { - return gweb.Ok() // 非测试模式时忽略 + return gweb.Error500("当前不是测试模式，不支持生成测试数据") // 非测试模式时忽略 } cnt := 0 @@ -36,7 +36,7 @@ func JsonLogAddTestDataController(req *gweb.HttpRequest) *gweb.HttpResult { } md2 := &logdata.LogDataModel{ - Text: "几个随机字符串供查询试验：" + cmn.RandomString(1) + "," + cmn.RandomString(2) + "," + cmn.RandomString(3) + "," + cmn.RandomString(4) + "," + cmn.RandomString(5), + Text: "几个随机字符串供查询试验：" + cmn.RandomString(1) + "，" + cmn.Right(cmn.ULID(), 2) + "，" + cmn.RandomString(3) + "，" + cmn.Right(cmn.ULID(), 4) + "，" + cmn.Right(cmn.ULID(), 5), Date: cmn.Now(), System: "demo", ServerName: "default", diff --git a/glc/www/controller/storage_mnt_controller.go b/glc/www/controller/storage_mnt_controller.go index c17bfbc..52eb06c 100644 --- a/glc/www/controller/storage_mnt_controller.go +++ b/glc/www/controller/storage_mnt_controller.go @@ -13,6 +13,11 @@ import ( "github.com/gotoeasy/glang/cmn" ) +// 查询是否测试模式 +func TestModeController(req *gweb.HttpRequest) *gweb.HttpResult { + return gweb.Result(conf.IsTestMode()) +} + // 查询版本信息 func VersionController(req *gweb.HttpRequest) *gweb.HttpResult { rs := cmn.OfMap("version", ver.VERSION, "latest", getLatestVersion()) // version当前版本号，latest最新版本号 @@ -75,7 +80,7 @@ func StorageDeleteController(req *gweb.HttpRequest) *gweb.HttpResult { // 尝试查询最新版本号（注：这里不能保证服务一定可用），查不到返回空串 func getLatestVersion() string { // {"version":"v0.12.0"} - bts, err := cmn.HttpGetJson("https://glc.gotoeasy.top/glogcenter/current/version.json?v=" + ver.VERSION) // 取最新版本号 + bts, err := cmn.HttpGetJson("https://glc.gotoeasy.top/glogcenter/current/version.json?v="+ver.VERSION, "Auth:glc") // 取最新版本号 if err != nil { return "" }