diff --git a/api/handler/admin/api_key_handler.go b/api/handler/admin/api_key_handler.go index 2a09c24c..0d3873b9 100644 --- a/api/handler/admin/api_key_handler.go +++ b/api/handler/admin/api_key_handler.go @@ -8,6 +8,7 @@ import ( "chatplus/store/vo" "chatplus/utils" "chatplus/utils/resp" + "github.com/gin-gonic/gin" "gorm.io/gorm" ) @@ -111,19 +112,16 @@ func (h *ApiKeyHandler) Set(c *gin.Context) { } func (h *ApiKeyHandler) Remove(c *gin.Context) { - var data struct { - Id uint - } - if err := c.ShouldBindJSON(&data); err != nil { + id := h.GetInt(c, "id", 0) + if id <= 0 { resp.ERROR(c, types.InvalidArgs) return } - if data.Id > 0 { - res := h.DB.Where("id = ?", data.Id).Delete(&model.ApiKey{}) - if res.Error != nil { - resp.ERROR(c, "更新数据库失败!") - return - } + + res := h.DB.Where("id", id).Delete(&model.ApiKey{}) + if res.Error != nil { + resp.ERROR(c, "更新数据库失败!") + return } resp.SUCCESS(c) } diff --git a/api/main.go b/api/main.go index 24efc68e..e5b8f3cf 100644 --- a/api/main.go +++ b/api/main.go @@ -297,7 +297,7 @@ func main() { group.POST("save", h.Save) group.GET("list", h.List) group.POST("set", h.Set) - group.POST("remove", h.Remove) + group.GET("remove", h.Remove) }), fx.Invoke(func(s *core.AppServer, h *admin.UserHandler) { group := s.Engine.Group("/api/admin/user/") diff --git a/api/service/mj/service.go b/api/service/mj/service.go index 3c870a17..30f8f265 100644 --- a/api/service/mj/service.go +++ b/api/service/mj/service.go @@ -130,6 +130,7 @@ func (s *Service) Run() { atomic.AddInt32(&s.HandledTaskNum, 1) // 更新任务 ID/频道 job.TaskId = res.Result + job.MessageId = res.Result job.ChannelId = s.Name s.db.Updates(&job) } @@ -198,7 +199,6 @@ func (s *Service) Notify(job model.MidJourneyJob) error { if task.ImageUrl != "" { job.OrgURL = task.ImageUrl } - job.MessageId = task.Id tx := s.db.Updates(&job) if tx.Error != nil { return fmt.Errorf("error with update database: %v", tx.Error) diff --git a/build/dockerfile-api-go b/build/dockerfile-api-go index ef557dbb..5f79db49 100644 --- a/build/dockerfile-api-go +++ b/build/dockerfile-api-go @@ -1,5 +1,5 @@ # GO api docker 镜像创建 -FROM alpine:3.18.2 +FROM --platform=linux/amd64 alpine:3.18.2 MAINTAINER yangjian diff --git a/build/dockerfile-vue b/build/dockerfile-vue index 086c7331..cc27dc34 100644 --- a/build/dockerfile-vue +++ b/build/dockerfile-vue @@ -1,5 +1,5 @@ # 前端 Vue 项目构建 -FROM nginx:1.20.2 +FROM --platform=linux/amd64 nginx:1.20.2 MAINTAINER yangjian diff --git a/web/src/components/LoginDialog.vue b/web/src/components/LoginDialog.vue index 8f22d466..d2f639b7 100644 --- a/web/src/components/LoginDialog.vue +++ b/web/src/components/LoginDialog.vue @@ -226,10 +226,9 @@ import {httpGet, httpPost} from "@/utils/http"; import {ElMessage} from "element-plus"; import {setUserToken} from "@/store/session"; import {validateEmail, validateMobile} from "@/utils/validate"; -import {Checked, Close, Iphone, Lock, Message, Position, User} from "@element-plus/icons-vue"; +import {Checked, Close, Iphone, Lock, Message} from "@element-plus/icons-vue"; import SendMsg from "@/components/SendMsg.vue"; import {arrayContains} from "@/utils/libs"; -import {useRouter} from "vue-router"; // eslint-disable-next-line no-undef const props = defineProps({ @@ -359,7 +358,7 @@ const close = function () { .close-icon { cursor pointer position absolute - right -10px + right 0 top 0 font-weight normal font-size 20px diff --git a/web/src/views/Home.vue b/web/src/views/Home.vue index c960ec76..e842ae90 100644 --- a/web/src/views/Home.vue +++ b/web/src/views/Home.vue @@ -89,7 +89,7 @@ onMounted(() => { } .nav-items { - margin-top: 20px; + margin-top: 10px; padding 0 5px li { diff --git a/web/src/views/ImageMj.vue b/web/src/views/ImageMj.vue index 0ec0c0a5..d55c874b 100644 --- a/web/src/views/ImageMj.vue +++ b/web/src/views/ImageMj.vue @@ -994,7 +994,7 @@ const generate = () => { httpPost("/api/mj/image", params.value).then(() => { ElMessage.success("绘画任务推送成功,请耐心等待任务执行...") power.value -= mjPower.value - params.value = copyObj(initParams) + //params.value = copyObj(initParams) imgList.value = [] }).catch(e => { ElMessage.error("任务推送失败:" + e.message) diff --git a/web/src/views/admin/ApiKey.vue b/web/src/views/admin/ApiKey.vue index 06b0c995..6264503d 100644 --- a/web/src/views/admin/ApiKey.vue +++ b/web/src/views/admin/ApiKey.vue @@ -125,8 +125,8 @@ import {onMounted, onUnmounted, reactive, ref} from "vue"; import {httpGet, httpPost} from "@/utils/http"; import {ElMessage} from "element-plus"; -import {dateFormat, disabledDate, removeArrayItem, substr} from "@/utils/libs"; -import {DocumentCopy, InfoFilled, Plus, ShoppingCart} from "@element-plus/icons-vue"; +import {dateFormat, removeArrayItem, substr} from "@/utils/libs"; +import {DocumentCopy, Plus, ShoppingCart} from "@element-plus/icons-vue"; import ClipboardJS from "clipboard"; // 变量定义 @@ -215,7 +215,7 @@ httpGet('/api/admin/apikey/list').then((res) => { const add = function () { showDialog.value = true title.value = "新增 API KEY" - item.value = {} + item.value = {enabled: true} } const edit = function (row) {