Merge branch 'flipped-aurora:main' into main

Author: tesun

server/config.yaml

@@ -87,7 +87,7 @@ system:
     router-prefix: ""
     #  严格角色模式 打开后权限将会存在上下级关系
     use-strict-auth: false
-    #  自动迁移数据库表结构，生产环境建议设为false，手动迁移
+    #  禁用自动迁移数据库表结构，生产环境建议设为true，手动迁移
     disable-auto-migrate: false
 
 # captcha configuration

server/service/system/auto_code_package.go

@@ -3,6 +3,12 @@ package system
 import (
 	"context"
 	"fmt"
+	"go/token"
+	"os"
+	"path/filepath"
+	"strings"
+	"text/template"
+
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	common "github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
 	model "github.com/flipped-aurora/gin-vue-admin/server/model/system"
@@ -11,12 +17,7 @@ import (
 	"github.com/flipped-aurora/gin-vue-admin/server/utils/ast"
 	"github.com/flipped-aurora/gin-vue-admin/server/utils/autocode"
 	"github.com/pkg/errors"
-	"go/token"
 	"gorm.io/gorm"
-	"os"
-	"path/filepath"
-	"strings"
-	"text/template"
 )
 
 var AutoCodePackage = new(autoCodePackage)
@@ -162,7 +163,6 @@ func (s *autoCodePackage) All(ctx context.Context) (entities []model.SysAutoCode
 				"api":        true,
 				"config":     true,
 				"initialize": true,
-				"model":      true,
 				"plugin":     true,
 				"router":     true,
 				"service":    true,
@@ -179,14 +179,25 @@ func (s *autoCodePackage) All(ctx context.Context) (entities []model.SysAutoCode
 					}
 				}
 			}
-			if len(dirNameMap) != 0 {
-				continue
+
+			var desc string
+			if len(dirNameMap) == 0 {
+				// 完全符合标准结构
+				desc = "系统自动读取" + pluginDir[i].Name() + "插件，使用前请确认是否为v2版本插件"
+			} else {
+				// 缺少某些结构，生成警告描述
+				var missingDirs []string
+				for dirName := range dirNameMap {
+					missingDirs = append(missingDirs, dirName)
+				}
+				desc = fmt.Sprintf("系统自动读取，但是缺少 %s 结构，不建议自动化和mcp使用", strings.Join(missingDirs, "、"))
 			}
+
 			pluginPackage := model.SysAutoCodePackage{
 				PackageName: pluginDir[i].Name(),
 				Template:    "plugin",
 				Label:       pluginDir[i].Name() + "插件",
-				Desc:        "系统自动读取" + pluginDir[i].Name() + "插件，使用前请确认是否为v2版本插件",
+				Desc:        desc,
 				Module:      global.GVA_CONFIG.AutoCode.Module,
 			}
 			plugin = append(plugin, pluginPackage)

web/src/view/login/index.vue

@@ -179,8 +179,7 @@
   // 获取验证码
   const loginVerify = async () => {
     const ele = await captcha()
-    const lengthFromServer = Number(ele.data?.captchaLength) || 0
-    captchaRequiredLength.value = Math.max(6, lengthFromServer)
+    captchaRequiredLength.value = Number(ele.data?.captchaLength) || 0
     picPath.value = ele.data?.picPath
     loginFormData.captchaId = ele.data?.captchaId
     loginFormData.openCaptcha = ele.data?.openCaptcha