diff --git a/Dockerfile b/Dockerfile index 5e63063..4e6ea91 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,6 +55,8 @@ COPY --from=server_image /build/sun-panel /app/sun-panel # 中国国内源 # RUN sed -i "s@dl-cdn.alpinelinux.org@mirrors.aliyun.com@g" /etc/apk/repositories +EXPOSE 3002 + RUN apk add --no-cache bash ca-certificates su-exec tzdata \ && chmod +x ./sun-panel \ && ./sun-panel -config diff --git a/add-frontend-version.js b/add-frontend-version.js new file mode 100644 index 0000000..d55b9a5 --- /dev/null +++ b/add-frontend-version.js @@ -0,0 +1,28 @@ +const fs = require('fs') +// const { execSync } = require('child_process') +const moment = require('moment') + +// git 最新标签 +// const latestTag = execSync('git describe --tags --abbrev=0').toString().trim() +const packDate = moment().format('YYYYMMDD-HH') + +// 要追加的内容 +const contentToAppend = `\nVITE_APP_VERSION=${packDate}` +// 读取文件原始内容 +const envFilePath = '.env' +let envContent = fs.readFileSync(envFilePath, 'utf-8') + +const versionRegex = /^VITE_APP_VERSION=.*$/m +if (versionRegex.test(envContent)) { + // 使用正则表达式查找并替换 VITE_APP_VERSION=* 这一行 + envContent = envContent.replace(versionRegex, contentToAppend) +} +else { + // 追加内容 + envContent = envContent + contentToAppend +} + +// 将新内容写回 .env 文件 +fs.writeFileSync(envFilePath, envContent) + +console.log('update to .env file.', contentToAppend) diff --git a/package.json b/package.json index e5f247e..47f5658 100644 --- a/package.json +++ b/package.json @@ -1,18 +1,17 @@ { "name": "sun-panel", - "version": "2.10.9", + "version": "0.0.0", "private": false, - "description": "ChatGPT Web", - "author": "ChenZhaoYu ", + "description": "Sun-Panel Web", + "author": "BraisedHunter <95302870@qq.com>", "keywords": [ "Sun-Panel", - "chatgpt", - "chatbot", "vue" ], "scripts": { "dev": "vite", - "build": "run-p type-check build-only", + "build": "run-p add-version type-check build-only", + "add-version": "node ./add-frontend-version.js", "preview": "vite preview", "build-only": "vite build", "type-check": "vue-tsc --noEmit", diff --git a/service/api/api_v1/common/apiReturn/ErrorCode.go b/service/api/api_v1/common/apiReturn/ErrorCode.go index fb61e08..185fb34 100644 --- a/service/api/api_v1/common/apiReturn/ErrorCode.go +++ b/service/api/api_v1/common/apiReturn/ErrorCode.go @@ -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", // 数据库错误 diff --git a/service/api/api_v1/panel/itemIcon.go b/service/api/api_v1/panel/itemIcon.go index b00c92a..4b7bf07 100644 --- a/service/api/api_v1/panel/itemIcon.go +++ b/service/api/api_v1/panel/itemIcon.go @@ -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 } diff --git a/service/api/api_v1/system/user.go b/service/api/api_v1/system/user.go index 9594929..bafe228 100644 --- a/service/api/api_v1/system/user.go +++ b/service/api/api_v1/system/user.go @@ -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 } } diff --git a/service/assets/version b/service/assets/version index 24cff30..aff4283 100644 --- a/service/assets/version +++ b/service/assets/version @@ -1 +1 @@ -9|1.3.0-beta24-01-17-19 \ No newline at end of file +9|1.3.0-beta24-01-25 \ No newline at end of file diff --git a/service/initialize/A_ENTER.go b/service/initialize/A_ENTER.go index 78abfd7..02f9d63 100644 --- a/service/initialize/A_ENTER.go +++ b/service/initialize/A_ENTER.go @@ -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 diff --git a/src/assets/about_image/bilibili.png b/src/assets/about_image/bilibili.png new file mode 100644 index 0000000..649a22b Binary files /dev/null and b/src/assets/about_image/bilibili.png differ diff --git a/src/assets/about_image/github.png b/src/assets/about_image/github.png index 68cae8d..2658da6 100644 Binary files a/src/assets/about_image/github.png and b/src/assets/about_image/github.png differ diff --git a/src/assets/about_image/qq_group_qr2.png b/src/assets/about_image/qq_group_qr2.png new file mode 100644 index 0000000..a956f7f Binary files /dev/null and b/src/assets/about_image/qq_group_qr2.png differ diff --git a/src/assets/about_image/youtube.png b/src/assets/about_image/youtube.png new file mode 100644 index 0000000..1614918 Binary files /dev/null and b/src/assets/about_image/youtube.png differ diff --git a/src/components/apps/About/index.vue b/src/components/apps/About/index.vue index 381dce9..ff9b800 100644 --- a/src/components/apps/About/index.vue +++ b/src/components/apps/About/index.vue @@ -1,12 +1,15 @@