Merge remote-tracking branch 'yvan/main'

# Conflicts:
#	server/go.mod
#	server/go.sum

server/initialize/plugin_biz_v1.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/plugin/email"
-	"github.com/flipped-aurora/gin-vue-admin/server/plugin/volcengine"
 	"github.com/flipped-aurora/gin-vue-admin/server/utils/plugin"
 	"github.com/gin-gonic/gin"
 )
@@ -34,7 +33,6 @@ func bizPluginV1(group ...*gin.RouterGroup) {
 			global.GVA_CONFIG.Email.IsSSL,
 			global.GVA_CONFIG.Email.IsLoginAuth,
 		),
-		volcengine.CreateVolcenginePlug(),
 	)
 	holder(public, private)
 }

server/initialize/router.go

@@ -116,7 +116,7 @@ func Routers() *gin.Engine {
 	InstallPlugin(PrivateGroup, PublicGroup, Router)
 
 	// 注册业务路由
-	initBizRouter(PrivateGroup, PublicGroup)
+	initBizRouter(PrivateGroup, PublicGroup, UserGroup)
 
 	global.GVA_ROUTERS = Router.Routes()
 

server/initialize/router_biz.go

@@ -12,6 +12,7 @@ func holder(routers ...*gin.RouterGroup) {
 func initBizRouter(routers ...*gin.RouterGroup) {
 	privateGroup := routers[0]
 	publicGroup := routers[1]
+	userGroup := routers[2]
 	holder(publicGroup, privateGroup)
 	{
 		petRouter := router.RouterGroupApp.Pet
@@ -25,5 +26,10 @@ func initBizRouter(routers ...*gin.RouterGroup) {
 		petRouter.InitPetFamilyPetsRouter(privateGroup, publicGroup)
 		petRouter.InitPetPetsRouter(privateGroup, publicGroup) // 占位方法，保证文件可以正确加载，避免go空变量检测报错，请勿删除。
 		petRouter.InitPetRecordsRouter(privateGroup, publicGroup)
+
+		// 用户相关路由（需要UserJWTAuth认证）
+		if userGroup != nil {
+			petRouter.InitPetAssistantRouter(userGroup, publicGroup)
+		}
 	}
 }