From b5c44e47ffa2ad830142fd9d385e28f3d809ed9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?pixelMax=28=E5=A5=87=E6=B7=BC?= Date: Thu, 1 Aug 2024 18:24:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feature:=20=E8=B0=83=E6=95=B4baseUrl?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/utils/format.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/utils/format.js b/web/src/utils/format.js index af35ff28c..9e3860d67 100644 --- a/web/src/utils/format.js +++ b/web/src/utils/format.js @@ -121,5 +121,5 @@ export const setBodyPrimaryColor = ( primaryColor, darkMode ) =>{ const baseUrl = ref(import.meta.env.VITE_BASE_API) export const getBaseUrl = () => { - return baseUrl.value === "/" ? "" : baseUrl.value + "/" + return baseUrl.value === "/" ? "" : baseUrl.value } \ No newline at end of file From e25cafe2b4978325ec37ca1a818b60301e70db64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?pixelMax=28=E5=A5=87=E6=B7=BC?= Date: Fri, 2 Aug 2024 14:35:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fixed:=20=E8=B0=83=E6=95=B4=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E5=88=9B=E5=BB=BA=E4=BB=A3=E7=A0=81=E7=9A=84=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/api/v1/system/auto_code_template.go | 2 +- web/src/api/autoCode.js | 3 +-- web/src/view/systemTools/autoCode/index.vue | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/server/api/v1/system/auto_code_template.go b/server/api/v1/system/auto_code_template.go index 3fb49f766..18a5b9b5e 100644 --- a/server/api/v1/system/auto_code_template.go +++ b/server/api/v1/system/auto_code_template.go @@ -76,7 +76,7 @@ func (a *AutoCodeTemplateApi) Create(c *gin.Context) { err = autoCodeTemplateService.Create(c.Request.Context(), info) if err != nil { global.GVA_LOG.Error("创建失败!", zap.Error(err)) - response.FailWithMessage("创建失败", c) + response.FailWithMessage(err.Error(), c) } else { response.OkWithMessage("创建成功", c) } diff --git a/web/src/api/autoCode.js b/web/src/api/autoCode.js index 048f1192e..099ee656b 100644 --- a/web/src/api/autoCode.js +++ b/web/src/api/autoCode.js @@ -12,8 +12,7 @@ export const createTemp = (data) => { return service({ url: '/autoCode/createTemp', method: 'post', - data, - responseType: 'blob' + data }) } diff --git a/web/src/view/systemTools/autoCode/index.vue b/web/src/view/systemTools/autoCode/index.vue index 91c7240ef..e80e5447b 100644 --- a/web/src/view/systemTools/autoCode/index.vue +++ b/web/src/view/systemTools/autoCode/index.vue @@ -1121,8 +1121,8 @@ const enterForm = async(isPreview) => { preViewCode.value = data.data.autoCode previewFlag.value = true } else { - const data = await createTemp(form.value) - if (data.headers?.success === 'false') { + const res = await createTemp(form.value) + if (res.code !== 0) { return } ElMessage({ From 15b5083d174212fe1fd42fc8dd2ce95222508512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PiexlMax=28=E5=A5=87=E6=B7=BC?= <165128580+pixelmaxQm@users.noreply.github.com> Date: Sat, 3 Aug 2024 14:55:11 +0800 Subject: [PATCH 3/4] Update README.md --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d19ee21ab..d98c3b98e 100644 --- a/README.md +++ b/README.md @@ -94,11 +94,9 @@ cd server # 使用 go mod 并安装go依赖包 go generate -# 编译 -go build -o server main.go (windows编译命令为go build -o server.exe main.go ) +# 运行 +go run . -# 运行二进制 -./server (windows运行命令为 server.exe) ``` ### 2.2 web项目 From 3c3d9487d0c0dff862820d794f8cbc824d7f8c59 Mon Sep 17 00:00:00 2001 From: pixelmaxQM Date: Sat, 3 Aug 2024 15:08:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fixed:=E4=BF=AE=E5=A4=8D=E5=A4=8D=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=97=A0=E6=B3=95=E6=94=B9=E5=8F=98=E4=B8=BB?= =?UTF-8?q?=E9=94=AE=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/view/systemTools/autoCode/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/web/src/view/systemTools/autoCode/index.vue b/web/src/view/systemTools/autoCode/index.vue index e80e5447b..57e1a1869 100644 --- a/web/src/view/systemTools/autoCode/index.vue +++ b/web/src/view/systemTools/autoCode/index.vue @@ -1116,6 +1116,7 @@ const enterForm = async(isPreview) => { return false } form.value.humpPackageName = toSQLLine(form.value.packageName) + delete form.value.primaryField if (isPreview) { const data = await preview(form.value) preViewCode.value = data.data.autoCode