adminym/daohangye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新v1.3.0-beta24-01-25

Browse Source 
Squashed commit of the following:

commit 66d0e5e94c
Author: Sun <95302870@qq.com>
Date:   Thu Jan 25 13:20:34 2024 +0800

    更新1.3.0-beta24-01-25

commit 52a81e5f55
Author: Sun <95302870@qq.com>
Date:   Thu Jan 25 13:13:08 2024 +0800

    Squashed commit of the following:

    commit 908d87357c4e22868eff85f377bb8cd22f3785d7
    Author: Sun <95302870@qq.com>
    Date:   Thu Jan 25 13:12:14 2024 +0800

        增加前端版本号

    commit 8ed2b636476c7a14ae4e1761f7712949b7ce60fc
    Author: Sun <95302870@qq.com>
    Date:   Thu Jan 25 12:29:49 2024 +0800

        增加自动获取前端版本号的git tag

commit ba7d70f9ca
Author: Sun <95302870@qq.com>
Date:   Thu Jan 25 10:58:15 2024 +0800

    优化代码

commit 104543b96f
Author: Sun <95302870@qq.com>
Date:   Wed Jan 24 21:28:31 2024 +0800

    增加系统状态组件的部分样式

commit 70c87c94c6
Author: Sun <95302870@qq.com>
Date:   Wed Jan 24 20:55:05 2024 +0800

    时间组件和搜索栏组件增加样式类型

commit 6bab5a264f
Author: Sun <95302870@qq.com>
Date:   Wed Jan 24 20:41:33 2024 +0800

    将项目列表增加样式并优化减少dom嵌套

commit 99d18df7f0
Author: Sun <95302870@qq.com>
Date:   Wed Jan 24 20:11:07 2024 +0800

    增加系统状态、logo等类名并简化部分组件dom

commit bf1cc0cc00
Author: Sun <95302870@qq.com>
Date:   Wed Jan 24 17:17:41 2024 +0800

    更新关于页面

commit fceacf58b8
Author: Sun <95302870@qq.com>
Date:   Wed Jan 24 14:54:37 2024 +0800

    增加隐藏网络模式切换开关

commit e0dcc49f5b
Author: Sun <95302870@qq.com>
Date:   Wed Jan 24 13:55:28 2024 +0800

    优化部分错误码

commit 863cdf0fc1
Author: Sun <95302870@qq.com>
Date:   Wed Jan 24 12:54:55 2024 +0800

    声明暴露端口

commit 5b25ef9c19
Author: Sun <95302870@qq.com>
Date:   Wed Jan 24 12:38:48 2024 +0800

    修改命令行所有的输出内容为英文
This commit is contained in:
Sun
2024-01-25 13:21:47 +08:00
parent d11e7b24e0
commit 956e645144
37 changed files with 281 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
service/api/api_v1/common/apiReturn/ErrorCode.go
+4 -1
View File
@@ -1,12 +1,15 @@
package apiReturn
var ErrorCodeMap = map[int]string{
// -1:操作失败
// -1:操作失败(前端会自动弹窗)
// 100: "operation failed",
1000: "Not logged in yet", // 还未登录
1003: "Incorrect username or password", // 用户名或密码错误
1004: "Account disabled or not activated", // 账号已停用或未激活
1005: "No current permission for operation", // 当前无权限操作
1006: "Account does not exist", // 账号不存在
1007: "Old password error", // 旧密码不正确
// 数据类
1200: "Database error", // 数据库错误
service/api/api_v1/panel/itemIcon.go
+2 -1
View File
@@ -28,7 +28,8 @@ func (a *ItemIcon) Edit(c *gin.Context) {
}
if req.ItemIconGroupId == 0 {
apiReturn.Error(c, "Group is mandatory")
// apiReturn.Error(c, "Group is mandatory")
apiReturn.ErrorParamFomat(c, "Group is mandatory")
return
}
service/api/api_v1/system/user.go
+1 -1
View File
@@ -97,7 +97,7 @@ func (a *UserApi) UpdatePasssword(c *gin.Context) {
} else {
if v.Password != cmn.PasswordEncryption(params.OldPassword) {
// 旧密码不正确
apiReturn.Error(c, global.Lang.Get("user.api_old_pass_error"))
apiReturn.ErrorByCode(c, 1007)
return
}
}
service/assets/version
+1 -1
View File
@@ -1 +1 @@
9|1.3.0-beta24-01-17-19
9|1.3.0-beta24-01-25
service/initialize/A_ENTER.go
+11 -11
View File
@@ -35,7 +35,7 @@ func InitApp() error {
// 日志
if logger, err := runlog.InitRunlog(global.RUNCODE, "running.log"); err != nil {
log.Panicln("日志初始化错误", err)
log.Panicln("Log initialization error", err)
panic(err)
} else {
global.Logger = logger
@@ -47,7 +47,7 @@ func InitApp() error {
// 配置初始化
{
if config, err := config.ConfigInit(); err != nil {
global.Logger.Errorln("配置初始化错误", err)
global.Logger.Errorln("Configuration initialization error", err)
return err
} else {
global.Config = config
@@ -74,7 +74,7 @@ func InitApp() error {
})
if err != nil {
log.Panicln("Redis初始化错误", err)
log.Panicln("Redis initialization error", err)
panic(err)
// return err
}
@@ -114,7 +114,7 @@ func DatabaseConnect() {
}
if db, err := database.DbInit(dbClientInfo); err != nil {
log.Panicln("数据库初始化错误", err)
log.Panicln("Database initialization error", err)
panic(err)
} else {
global.Db = db
@@ -133,17 +133,17 @@ func CommandRun() {
pwd bool
)
flag.BoolVar(&cfg, "config", false, "生成配置文件")
flag.BoolVar(&pwd, "password-reset", false, "重置第一个用户的密码")
flag.BoolVar(&cfg, "config", false, "Generate configuration file")
flag.BoolVar(&pwd, "password-reset", false, "Reset the password of the first user")
flag.Parse()
if cfg {
// 生成配置文件
fmt.Println("正在生成配置文件")
fmt.Println("Generating configuration file")
cmn.AssetsTakeFileToPath("conf.example.ini", "conf/conf.example.ini")
cmn.AssetsTakeFileToPath("conf.example.ini", "conf/conf.ini")
fmt.Println("配置文件已经创建 conf/conf.ini ", "请按照自己的需求修改")
fmt.Println("The configuration file has been created conf/conf.ini ", "Please modify according to your own needs")
os.Exit(0) // 务必退出
} else if pwd {
// 重置密码
@@ -171,9 +171,9 @@ func CommandRun() {
os.Exit(0) // 务必退出
}
fmt.Println("密码已经重置成功，以下是账号信息")
fmt.Println("用户名 ", userInfo.Username)
fmt.Println("密码 ", newPassword)
fmt.Println("The password has been successfully reset. Here is the account information")
fmt.Println("Username ", userInfo.Username)
fmt.Println("Password ", newPassword)
os.Exit(0) // 务必退出
} else {
return