server code 4/27

server/internal/controller/admin/admin.go

@@ -0,0 +1,6 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package admin

server/internal/controller/admin/admin_new.go

@@ -0,0 +1,20 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package admin
+
+import (
+	"stackChan/api/admin"
+)
+
+type ControllerV1 struct{}
+
+func NewV1() admin.IAdminV1 {
+	return &ControllerV1{}
+}

server/internal/controller/admin/admin_v1_add_app.go

@@ -0,0 +1,37 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package admin
+
+import (
+	"context"
+	"stackChan/api/admin/v1"
+	"stackChan/internal/dao"
+	"stackChan/internal/model"
+	"stackChan/internal/model/do"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+)
+
+func (c *ControllerV1) AddApp(ctx context.Context, req *v1.AddAppReq) (res *v1.AddAppRes, err error) {
+	app := do.AppStore{
+		AppName:     req.AppName,
+		AppIconUrl:  req.AppIconUrl,
+		Description: req.Description,
+		FirmwareUrl: req.FirmwareUrl,
+	}
+	id, err := dao.AppStore.Ctx(ctx).Data(&app).InsertAndGetId()
+	if err != nil {
+		return nil, gerror.WrapCode(gcode.CodeInternalError, err, "Failed to insert app")
+	}
+	var appInfo model.AppInfo
+	err = dao.AppStore.Ctx(ctx).Where("id", id).Scan(&appInfo)
+	if err != nil {
+		return nil, gerror.WrapCode(gcode.CodeInternalError, err, "Failed to fetch inserted app")
+	}
+	res = (*v1.AddAppRes)(&appInfo)
+	return res, nil
+}

server/internal/controller/admin/admin_v1_admin_login.go

@@ -0,0 +1,17 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package admin
+
+import (
+	"context"
+	"stackChan/internal/service"
+
+	"stackChan/api/admin/v1"
+)
+
+func (c *ControllerV1) AdminLogin(ctx context.Context, req *v1.AdminLoginReq) (res *v1.AdminLoginRes, err error) {
+	return service.AdminLogin(ctx, req)
+}

server/internal/controller/admin/admin_v1_delete_app.go

@@ -0,0 +1,28 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package admin
+
+import (
+	"context"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+
+	"stackChan/api/admin/v1"
+	"stackChan/internal/dao"
+
+	"github.com/gogf/gf/v2/frame/g"
+)
+
+func (c *ControllerV1) DeleteApp(ctx context.Context, req *v1.DeleteAppReq) (res *v1.DeleteAppRes, err error) {
+	_, err = dao.AppStore.Ctx(ctx).Where("id", req.Id).Data(g.Map{"is_deleted": 1}).Update()
+	if err != nil {
+		return nil, gerror.WrapCode(gcode.CodeInternalError, err, "Failed to delete app")
+	}
+
+	res = &v1.DeleteAppRes{}
+	return res, nil
+}

server/internal/controller/admin/admin_v1_get_app_list.go

@@ -0,0 +1,22 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package admin
+
+import (
+	"context"
+	"stackChan/internal/service"
+
+	"stackChan/api/admin/v1"
+)
+
+func (c *ControllerV1) GetAppList(ctx context.Context, req *v1.GetAppListReq) (res *v1.GetAppListRes, err error) {
+	apps, err := service.GetAppList(ctx)
+	if err != nil {
+		return nil, err
+	}
+	response := v1.GetAppListRes(apps)
+	return &response, nil
+}

server/internal/controller/admin/admin_v1_update_app.go

@@ -0,0 +1,50 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package admin
+
+import (
+	"context"
+	"stackChan/internal/model"
+
+	"stackChan/api/admin/v1"
+	"stackChan/internal/dao"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+)
+
+func (c *ControllerV1) UpdateApp(ctx context.Context, req *v1.UpdateAppReq) (res *v1.UpdateAppRes, err error) {
+	updateData := g.Map{}
+	if req.AppName != "" {
+		updateData["app_name"] = req.AppName
+	}
+	if req.AppIconUrl != "" {
+		updateData["app_icon_url"] = req.AppIconUrl
+	}
+	if req.Description != "" {
+		updateData["description"] = req.Description
+	}
+	if req.FirmwareUrl != "" {
+		updateData["firmware_url"] = req.FirmwareUrl
+	}
+
+	if len(updateData) > 0 {
+		_, err = dao.AppStore.Ctx(ctx).WherePri(req.Id).Data(updateData).Update()
+		if err != nil {
+			return nil, gerror.WrapCode(gcode.CodeInternalError, err, "Failed to update app")
+		}
+	}
+
+	var appInfo model.AppInfo
+	err = dao.AppStore.Ctx(ctx).WherePri(req.Id).Scan(&appInfo)
+	if err != nil {
+		return nil, gerror.WrapCode(gcode.CodeInternalError, err, "Failed to fetch updated app")
+	}
+
+	res = (*v1.UpdateAppRes)(&appInfo)
+	return res, nil
+}

server/internal/controller/appstore/appstore.go

@@ -0,0 +1,10 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package appstore

server/internal/controller/appstore/appstore_new.go

@@ -0,0 +1,20 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package appstore
+
+import (
+	"stackChan/api/appstore"
+)
+
+type ControllerV1 struct{}
+
+func NewV1() appstore.IAppstoreV1 {
+	return &ControllerV1{}
+}

server/internal/controller/appstore/appstore_v1_get_app_list.go

@@ -0,0 +1,22 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package appstore
+
+import (
+	"context"
+	"stackChan/internal/service"
+
+	"stackChan/api/appstore/v1"
+)
+
+func (c *ControllerV1) GetAppList(ctx context.Context, req *v1.GetAppListReq) (res *v1.GetAppListRes, err error) {
+	apps, err := service.GetAppList(ctx)
+	if err != nil {
+		return nil, err
+	}
+	response := v1.GetAppListRes(apps)
+	return &response, nil
+}

server/internal/controller/dance/dance_new.go

@@ -17,3 +17,9 @@ type ControllerV1 struct{}
 func NewV1() dance.IDanceV1 {
 	return &ControllerV1{}
 }
+
+type ControllerV2 struct{}
+
+func NewV2() dance.IDanceV2 {
+	return &ControllerV2{}
+}

server/internal/controller/dance/dance_v1_create.go

@@ -7,60 +7,75 @@ package dance
 
 import (
 	"context"
-	"encoding/json"
 	"stackChan/internal/dao"
+	"stackChan/internal/model"
 	"stackChan/internal/model/do"
 
 	"stackChan/api/dance/v1"
 
+	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func (c *ControllerV1) Create(ctx context.Context, req *v1.CreateReq) (res *v1.CreateRes, err error) {
-	if req.Index < 0 {
-		return nil, gerror.NewCode(gcode.CodeInvalidParameter, "Index cannot be negative")
+	// 1. Get and validate MAC address (business required parameter)
+	mac := g.RequestFromCtx(ctx).GetCtxVar(model.Mac).String()
+	if mac == "" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter, "MAC address cannot be empty")
 	}
-
-	device, err := dao.Device.Ctx(ctx).Where("mac=", req.Mac).One()
-
-	if err != nil {
-		return nil, err
+	// 2. Auto validate using struct v tag (DanceName required), manual secondary validation as fallback
+	if req.DanceName == "" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter, "Dance name cannot be empty")
 	}
-
-	if device.IsEmpty() {
-		_, err = dao.Device.Ctx(ctx).Data(dao.Device.Columns().Mac, req.Mac).Insert()
-		if err != nil {
-			return nil, err
+	// 3. Validate dance data not empty (RawMessage need to check if empty/only null)
+	if len(req.DanceData) == 0 || string(req.DanceData) == "null" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter, "Dance data cannot be empty or null")
+	}
+	// 4. Use transaction to ensure data consistency
+	err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
+		// 4.1 Query device, create if not exists
+		device, err := dao.Device.Ctx(ctx).TX(tx).Where("mac=?", mac).One()
+		if err != nil && !gerror.HasCode(err, gcode.CodeNotFound) {
+			return gerror.NewCode(gcode.CodeInternalError, "Failed to query device: %v", err.Error())
 		}
-	}
 
-	dance, err := dao.DeviceDance.Ctx(ctx).Where("mac=?", req.Mac).Where("dance_index=?", req.Index).One()
-	if err != nil {
-		return nil, err
-	}
+		// Create device if not exists
+		if device.IsEmpty() {
+			_, err = dao.Device.Ctx(ctx).TX(tx).Data(dao.Device.Columns().Mac, mac).Insert()
+			if err != nil {
+				return gerror.NewCode(gcode.CodeInternalError, "Failed to create device: %v", err.Error())
+			}
+		}
 
-	danceListJSON, err := json.Marshal(req.List)
-	if err != nil {
-		return nil, err
-	}
+		// 4.2 Check if dance data with same MAC+DanceName exists (avoid duplicates)
+		exist, err := dao.DeviceDance.Ctx(ctx).TX(tx).
+			Where("mac=?", mac).
+			Where("dance_name=?", req.DanceName).
+			Exist()
+		if err != nil {
+			return gerror.NewCode(gcode.CodeInternalError, "Failed to check duplicate dance data: %v", err.Error())
+		}
+		if exist {
+			return gerror.NewCode(gcode.CodeBusinessValidationFailed, "Dance data with MAC %s and name '%s' already exists", mac, req.DanceName)
+		}
 
-	if dance.IsEmpty() {
-		_, err = dao.DeviceDance.Ctx(ctx).Data(do.DeviceDance{
-			Mac:        req.Mac,
-			DanceIndex: req.Index,
-			DanceData:  danceListJSON,
+		// 4.3 Insert dance data (use RawMessage directly, no need for secondary serialization)
+		_, err = dao.DeviceDance.Ctx(ctx).TX(tx).Data(do.DeviceDance{
+			Mac:       mac,
+			DanceData: req.DanceData, // Use RawMessage directly, avoid duplicate marshal
+			DanceName: req.DanceName,
+			MusicUrl:  req.MusicUrl, // Add background music URL field
 		}).Insert()
 		if err != nil {
-			return nil, err
-		}
-	} else {
-		_, err = dao.DeviceDance.Ctx(ctx).Where("mac=?", req.Mac).Where("dance_index=?", req.Index).Data(do.DeviceDance{
-			DanceData: danceListJSON,
-		}).Update()
-		if err != nil {
-			return nil, err
+			return gerror.NewCode(gcode.CodeInternalError, "Failed to insert dance data: %v", err.Error())
 		}
+
+		return nil
+	})
+	if err != nil {
+		return nil, err
 	}
 	response := v1.CreateRes("Dance data saved successfully")
 	return &response, nil

server/internal/controller/dance/dance_v1_delete.go

@@ -8,11 +8,20 @@ package dance
 import (
 	"context"
 	"stackChan/internal/dao"
+	"stackChan/internal/model"
 
 	"stackChan/api/dance/v1"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func (c *ControllerV1) Delete(ctx context.Context, req *v1.DeleteReq) (res *v1.DeleteRes, err error) {
-	_, err = dao.DeviceDance.Ctx(ctx).Where("mac=", req.Mac).Where("dance_index=", req.Index).Delete()
+	mac := g.RequestFromCtx(ctx).GetCtxVar(model.Mac).String()
+	if mac == "" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter)
+	}
+	_, err = dao.DeviceDance.Ctx(ctx).Where("id=", req.Id).Delete()
 	return
 }

server/internal/controller/dance/dance_v1_get_dance.go

@@ -0,0 +1,34 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package dance
+
+import (
+	"context"
+	"stackChan/internal/dao"
+	"stackChan/internal/model"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+
+	"stackChan/api/dance/v1"
+)
+
+func (c *ControllerV1) GetDanceInfo(ctx context.Context, req *v1.GetDanceInfoReq) (res *v1.GetDanceInfoRes, err error) {
+	mac := g.RequestFromCtx(ctx).GetCtxVar(model.Mac).String()
+	if mac == "" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter)
+	}
+	if req.Id == 0 {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter, "The dance ID cannot be left blank.")
+	}
+	var dance model.Dance
+	err = dao.DeviceDance.Ctx(ctx).Where("mac=?", mac).Where("id=?", req.Id).Scan(&dance)
+	if err != nil {
+		return nil, gerror.NewCode(gcode.CodeInternalError)
+	}
+	return new(v1.GetDanceInfoRes(dance)), nil
+}

server/internal/controller/dance/dance_v1_get_list.go

@@ -7,38 +7,52 @@ package dance
 
 import (
 	"context"
-	"encoding/json"
 	"stackChan/internal/dao"
 	"stackChan/internal/model"
 	"stackChan/internal/model/do"
-	"stackChan/internal/model/entity"
-	"strconv"
 
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
 
 	"stackChan/api/dance/v1"
 )
 
 func (c *ControllerV1) GetList(ctx context.Context, req *v1.GetListReq) (res *v1.GetListRes, err error) {
-	danceMap := make(map[string][]model.DanceData)
-	var list []entity.DeviceDance
+	mac := g.RequestFromCtx(ctx).GetCtxVar(model.Mac).String()
+	if mac == "" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter)
+	}
+
+	var danceList []model.Dance
 	err = dao.DeviceDance.Ctx(ctx).Where(do.DeviceDance{
-		Mac: req.Mac,
-	}).Scan(&list)
+		Mac: mac,
+	}).Scan(&danceList)
 	if err != nil {
 		return nil, err
 	}
-	if len(list) > 0 {
-		deviceDance := list[0]
-		var danceList []model.DanceData
-		err = json.Unmarshal([]byte(deviceDance.DanceData), &danceList)
-		if err != nil {
-			return nil, gerror.WrapCode(gcode.CodeInvalidParameter, err)
+
+	// Core modification: insert default data only when query result is empty
+	if len(danceList) == 0 {
+		// Insert single default dance data
+		defaultDance := do.DeviceDance{
+			Mac:       mac,
+			MusicUrl:  "file/music/stackchan_music.mp3",
+			DanceData: model.DefaultDanceData,
+		}
+		_, err = dao.DeviceDance.Ctx(ctx).Data(defaultDance).Insert()
+		if err != nil {
+			return nil, err
+		}
+
+		// Re-query list (one data exists now)
+		err = dao.DeviceDance.Ctx(ctx).Where(do.DeviceDance{
+			Mac: mac,
+		}).Scan(&danceList)
+		if err != nil {
+			return nil, err
 		}
-		key := strconv.Itoa(deviceDance.DanceIndex)
-		danceMap[key] = danceList
 	}
-	response := v1.GetListRes(danceMap)
-	return &response, nil
+
+	return new(v1.GetListRes(danceList)), nil
 }

server/internal/controller/dance/dance_v1_get_music_list.go

@@ -0,0 +1,17 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package dance
+
+import (
+	"context"
+	"stackChan/api/dance/v1"
+)
+
+func (c *ControllerV1) GetMusicList(ctx context.Context, req *v1.GetMusicListReq) (res *v1.GetMusicListRes, err error) {
+	var list = make([]string, 1)
+	list = append(list, "file/music/stackchan_music.mp3")
+	return new(v1.GetMusicListRes(list)), nil
+}

server/internal/controller/dance/dance_v1_update.go

@@ -9,23 +9,42 @@ import (
 	"context"
 	"encoding/json"
 	"stackChan/internal/dao"
+	"stackChan/internal/model"
 	"stackChan/internal/model/do"
 
 	"stackChan/api/dance/v1"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func (c *ControllerV1) Update(ctx context.Context, req *v1.UpdateReq) (res *v1.UpdateRes, err error) {
-	response := v1.UpdateRes("")
-	danceJSON, err := json.Marshal(req.Data)
+	mac := g.RequestFromCtx(ctx).GetCtxVar(model.Mac).String()
+	if mac == "" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter, "MAC address cannot be empty")
+	}
+	if req.Id == 0 { // Adjust based on actual type of req.Id (int/string)
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter, "Dance ID cannot be empty")
+	}
+	updateData := do.DeviceDance{}
+	if req.MusicUrl != "" {
+		updateData.MusicUrl = req.MusicUrl
+	}
+	if req.DanceName != "" {
+		updateData.DanceName = req.DanceName
+	}
+	if req.DanceData != nil {
+		danceJSON, err := json.Marshal(req.DanceData)
+		if err != nil {
+			// Wrap serialization error, add business prompt
+			return nil, gerror.NewCode(gcode.CodeInvalidParameter, "Dance data serialization failed: %v")
+		}
+		updateData.DanceData = danceJSON
+	}
+	_, err = dao.DeviceDance.Ctx(ctx).Where("mac=?", mac).Where("id=?", req.Id).Data(updateData).Update()
 	if err != nil {
 		return nil, err
 	}
-	_, err = dao.DeviceDance.Ctx(ctx).Where("mac=?", req.Mac).Where("dance_index=?", req.Index).Data(do.DeviceDance{
-		DanceData: danceJSON,
-	}).Update()
-	if err != nil {
-		return nil, err
-	}
-	response = "Update successful"
-	return &response, nil
+	return new(v1.UpdateRes("Update successful")), nil
 }

server/internal/controller/dance/dance_v2_create.go

@@ -0,0 +1,66 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package dance
+
+import (
+	"context"
+	"stackChan/internal/dao"
+	"stackChan/internal/model/do"
+
+	"github.com/gogf/gf/v2/database/gdb"
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+
+	"stackChan/api/dance/v2"
+)
+
+func (c *ControllerV2) Create(ctx context.Context, req *v2.CreateReq) (res *v2.CreateRes, err error) {
+	mac := req.Mac
+	if req.DanceName == "" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter, "Dance name cannot be empty")
+	}
+	if len(req.DanceData) == 0 || string(req.DanceData) == "null" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter, "Dance data cannot be empty or null")
+	}
+	err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
+		device, err := dao.Device.Ctx(ctx).TX(tx).Where("mac=?", mac).One()
+		if err != nil && !gerror.HasCode(err, gcode.CodeNotFound) {
+			return gerror.NewCode(gcode.CodeInternalError, "Failed to query device: %v", err.Error())
+		}
+		if device.IsEmpty() {
+			_, err = dao.Device.Ctx(ctx).TX(tx).Data(dao.Device.Columns().Mac, mac).Insert()
+			if err != nil {
+				return gerror.NewCode(gcode.CodeInternalError, "Failed to create device: %v", err.Error())
+			}
+		}
+		exist, err := dao.DeviceDance.Ctx(ctx).TX(tx).
+			Where("mac=?", mac).
+			Where("dance_name=?", req.DanceName).
+			Exist()
+		if err != nil {
+			return gerror.NewCode(gcode.CodeInternalError, "Failed to check duplicate dance data: %v", err.Error())
+		}
+		if exist {
+			return gerror.NewCode(gcode.CodeBusinessValidationFailed, "Dance data with MAC %s and name '%s' already exists", mac, req.DanceName)
+		}
+		_, err = dao.DeviceDance.Ctx(ctx).TX(tx).Data(do.DeviceDance{
+			Mac:       mac,
+			DanceData: req.DanceData,
+			DanceName: req.DanceName,
+			MusicUrl:  req.MusicUrl,
+		}).Insert()
+		if err != nil {
+			return gerror.NewCode(gcode.CodeInternalError, "Failed to insert dance data: %v", err.Error())
+		}
+
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+	return new(v2.CreateRes("Dance data saved successfully")), nil
+}

server/internal/controller/dance/dance_v2_delete.go

@@ -0,0 +1,18 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package dance
+
+import (
+	"context"
+	"stackChan/internal/dao"
+
+	"stackChan/api/dance/v2"
+)
+
+func (c *ControllerV2) Delete(ctx context.Context, req *v2.DeleteReq) (res *v2.DeleteRes, err error) {
+	_, err = dao.DeviceDance.Ctx(ctx).Where("id=", req.Id).Delete()
+	return
+}

server/internal/controller/dance/dance_v2_get_dance_info.go

@@ -0,0 +1,29 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package dance
+
+import (
+	"context"
+	"stackChan/internal/dao"
+	"stackChan/internal/model"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+
+	"stackChan/api/dance/v2"
+)
+
+func (c *ControllerV2) GetDanceInfo(ctx context.Context, req *v2.GetDanceInfoReq) (res *v2.GetDanceInfoRes, err error) {
+	if req.Id == 0 {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter, "The dance ID cannot be left blank.")
+	}
+	var dance model.Dance
+	err = dao.DeviceDance.Ctx(ctx).Where("id=?", req.Id).Scan(&dance)
+	if err != nil {
+		return nil, gerror.NewCode(gcode.CodeInternalError)
+	}
+	return new(v2.GetDanceInfoRes(dance)), nil
+}

server/internal/controller/dance/dance_v2_get_list.go

@@ -0,0 +1,50 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package dance
+
+import (
+	"context"
+	"stackChan/api/dance/v2"
+	"stackChan/internal/dao"
+	"stackChan/internal/model"
+	"stackChan/internal/model/do"
+)
+
+func (c *ControllerV2) GetList(ctx context.Context, req *v2.GetListReq) (res *v2.GetListRes, err error) {
+	mac := req.Mac
+	var danceList []model.Dance
+	err = dao.DeviceDance.Ctx(ctx).Where(do.DeviceDance{
+		Mac: mac,
+	}).Scan(&danceList)
+	if err != nil {
+		return nil, err
+	}
+
+	// Core modification: insert default data only when query result is empty
+	if len(danceList) == 0 {
+		// Insert single default dance data
+		defaultDance := do.DeviceDance{
+			DanceName: "StackChan Dance",
+			Mac:       mac,
+			MusicUrl:  "http://47.113.125.164:12800/file/music/stackchan_music.mp3",
+			DanceData: model.DefaultDanceData,
+		}
+		_, err = dao.DeviceDance.Ctx(ctx).Data(defaultDance).Insert()
+		if err != nil {
+			return nil, err
+		}
+
+		// Re-query list (one data exists now)
+		err = dao.DeviceDance.Ctx(ctx).Where(do.DeviceDance{
+			Mac: mac,
+		}).Scan(&danceList)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return new(v2.GetListRes(danceList)), nil
+}

server/internal/controller/dance/dance_v2_update.go

@@ -0,0 +1,44 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package dance
+
+import (
+	"context"
+	"encoding/json"
+	"stackChan/internal/dao"
+	"stackChan/internal/model/do"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+
+	"stackChan/api/dance/v2"
+)
+
+func (c *ControllerV2) Update(ctx context.Context, req *v2.UpdateReq) (res *v2.UpdateRes, err error) {
+	if req.Id == 0 { // Adjust based on actual type of req.Id (int/string)
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter, "Dance ID cannot be empty")
+	}
+	updateData := do.DeviceDance{}
+	if req.MusicUrl != "" {
+		updateData.MusicUrl = req.MusicUrl
+	}
+	if req.DanceName != "" {
+		updateData.DanceName = req.DanceName
+	}
+	if req.DanceData != nil {
+		danceJSON, err := json.Marshal(req.DanceData)
+		if err != nil {
+			// Wrap serialization error, add business prompt
+			return nil, gerror.NewCode(gcode.CodeInvalidParameter, "Dance data serialization failed: %v")
+		}
+		updateData.DanceData = danceJSON
+	}
+	_, err = dao.DeviceDance.Ctx(ctx).Where("id=?", req.Id).Data(updateData).Update()
+	if err != nil {
+		return nil, err
+	}
+	return new(v2.UpdateRes("Update successful")), nil
+}

server/internal/controller/device/device_new.go

@@ -18,3 +18,9 @@ type ControllerV1 struct{}
 func NewV1() device.IDeviceV1 {
 	return &ControllerV1{}
 }
+
+type ControllerV2 struct{}
+
+func NewV2() device.IDeviceV2 {
+	return &ControllerV2{}
+}

server/internal/controller/device/device_v1_create.go

@@ -9,12 +9,21 @@ import (
 	"context"
 	"stackChan/api/device/v1"
 	"stackChan/internal/dao"
+	"stackChan/internal/model"
 	"stackChan/internal/model/do"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func (c *ControllerV1) Create(ctx context.Context, req *v1.CreateReq) (res *v1.CreateRes, err error) {
+	mac := g.RequestFromCtx(ctx).GetCtxVar(model.Mac).String()
+	if mac == "" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter)
+	}
 	insertId, err := dao.Device.Ctx(ctx).Data(do.Device{
-		Mac:  req.Mac,
+		Mac:  mac,
 		Name: req.Name,
 	}).InsertAndGetId()
 	if err != nil {

server/internal/controller/device/device_v1_get_device_info.go

@@ -11,11 +11,19 @@ import (
 	"stackChan/internal/model"
 
 	"stackChan/api/device/v1"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func (c *ControllerV1) GetDeviceInfo(ctx context.Context, req *v1.GetDeviceInfoReq) (res *v1.GetDeviceInfoRes, err error) {
+	mac := g.RequestFromCtx(ctx).GetCtxVar(model.Mac).String()
+	if mac == "" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter)
+	}
 	var info model.DeviceInfo
-	err = dao.Device.Ctx(ctx).WherePri(req.Mac).Scan(&info)
+	err = dao.Device.Ctx(ctx).WherePri(mac).Scan(&info)
 	if err != nil {
 		return nil, err
 	}

server/internal/controller/device/device_v1_get_random_device.go

@@ -9,14 +9,28 @@ import (
 	"context"
 	"stackChan/api/device/v1"
 	"stackChan/internal/dao"
+	"stackChan/internal/model"
 	"stackChan/internal/model/entity"
 	"stackChan/internal/web_socket"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func (c *ControllerV1) GetRandomDevice(ctx context.Context, req *v1.GetRandomDeviceReq) (res *v1.GetRandomDeviceRes, err error) {
+	mac := g.RequestFromCtx(ctx).GetCtxVar(model.Mac).String()
+	if mac == "" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter)
+	}
+
+	pageSize := req.PageSize
+	if pageSize <= 0 {
+		pageSize = 6
+	}
 
 	// Obtain the list of online StackChan mac addresses (excluding the current user) from the websocket layer.
-	macList := web_socket.GetRandomStackChanDevice(req.Mac, 6)
+	macList := web_socket.GetRandomStackChanDevice(mac, pageSize)
 
 	if len(macList) == 0 {
 		res = (*v1.GetRandomDeviceRes)(&[]entity.Device{})

server/internal/controller/device/device_v1_update.go

@@ -8,14 +8,23 @@ package device
 import (
 	"context"
 	"stackChan/internal/dao"
+	"stackChan/internal/model"
 	"stackChan/internal/model/do"
 
 	"stackChan/api/device/v1"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func (c *ControllerV1) Update(ctx context.Context, req *v1.UpdateReq) (res *v1.UpdateRes, err error) {
+	mac := g.RequestFromCtx(ctx).GetCtxVar(model.Mac).String()
+	if mac == "" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter)
+	}
 	_, err = dao.Device.Ctx(ctx).Data(do.Device{
 		Name: req.Name,
-	}).WherePri(req.Mac).Update()
+	}).WherePri(mac).Update()
 	return
 }

server/internal/controller/device/device_v1_update_device_info.go

@@ -8,17 +8,26 @@ package device
 import (
 	"context"
 	"stackChan/internal/dao"
+	"stackChan/internal/model"
 	"stackChan/internal/model/do"
 
 	"stackChan/api/device/v1"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func (c *ControllerV1) UpdateDeviceInfo(ctx context.Context, req *v1.UpdateDeviceInfoReq) (res *v1.UpdateDeviceInfoRes, err error) {
+	mac := g.RequestFromCtx(ctx).GetCtxVar(model.Mac).String()
+	if mac == "" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter)
+	}
 	doDevice := do.Device{}
 	if req.Name != "" {
 		doDevice.Name = req.Name
 	}
-	_, err = dao.Device.Ctx(ctx).Data(doDevice).WherePri(req.Mac).Update()
+	_, err = dao.Device.Ctx(ctx).Data(doDevice).WherePri(mac).Update()
 	if err != nil {
 		return nil, err
 	}

server/internal/controller/device/device_v2_agent_restore_default.go

@@ -0,0 +1,26 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package device
+
+import (
+	"context"
+	"stackChan/api/device/v2"
+)
+
+func (c *ControllerV2) AgentRestoreDefault(ctx context.Context, req *v2.AgentRestoreDefaultReq) (res *v2.AgentRestoreDefaultRes, err error) {
+	return new(v2.AgentRestoreDefaultRes(true)), err
+	//if req.Mac == "" {
+	//	return nil, gerror.NewCode(gcode.CodeMissingParameter, "Device MAC address cannot be empty")
+	//}
+	//restoreResponse, err := service.RestoreDefaultAgent(req.Mac)
+	//if err != nil {
+	//	return nil, err
+	//}
+	//if !restoreResponse {
+	//	return nil, gerror.NewCode(gcode.CodeInternalError, "Failed to restore default configuration")
+	//}
+	//return new(v2.AgentRestoreDefaultRes(true)), nil
+}

server/internal/controller/device/device_v2_bind_device.go

@@ -0,0 +1,41 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package device
+
+import (
+	"context"
+	"stackChan/internal/dao"
+	"stackChan/internal/model"
+	"stackChan/internal/service"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gtime"
+
+	"stackChan/api/device/v2"
+)
+
+// BindDevice Device binding interface
+func (c *ControllerV2) BindDevice(ctx context.Context, req *v2.BindDeviceReq) (res *v2.BindDeviceRes, err error) {
+	// 1. Get current logged-in user UID (from context)
+	_, err = service.CreateMacIfNotExists(ctx, req.Mac)
+	uid := g.RequestFromCtx(ctx).GetCtxVar(model.Uid).Int64()
+	if uid == 0 {
+		return nil, gerror.NewCode(gcode.CodeMissingParameter, "User UID cannot be empty")
+	}
+	if req.Mac == "" {
+		return nil, gerror.NewCode(gcode.CodeMissingParameter, "Device MAC address cannot be empty")
+	}
+	_, err = dao.Device.Ctx(ctx).
+		Where("mac = ?", req.Mac).
+		Data("uid", uid, "bind_time", gtime.Now().Format("Y-m-d H:i:s")).
+		Update()
+	if err != nil {
+		return nil, gerror.WrapCode(gcode.CodeDbOperationError, err, "Device binding failed")
+	}
+	return new(v2.BindDeviceRes(true)), nil
+}

server/internal/controller/device/device_v2_get_devices.go

@@ -0,0 +1,31 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package device
+
+import (
+	"context"
+	"stackChan/internal/dao"
+	"stackChan/internal/model"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+
+	"stackChan/api/device/v2"
+)
+
+func (c *ControllerV2) GetDevices(ctx context.Context, req *v2.GetDevicesReq) (res *v2.GetDevicesRes, err error) {
+	uid := g.RequestFromCtx(ctx).GetCtxVar(model.Uid).Int64()
+	if uid == 0 {
+		return nil, gerror.NewCode(gcode.CodeMissingParameter, "user UID is required")
+	}
+	devices := make([]model.DeviceInfo, 0)
+	err = dao.Device.Ctx(ctx).Where("uid=?", uid).Scan(&devices)
+	if err != nil {
+		return nil, err
+	}
+	return new(v2.GetDevicesRes(devices)), nil
+}

server/internal/controller/device/device_v2_unbind_device.go

@@ -0,0 +1,69 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package device
+
+import (
+	"context"
+	"stackChan/internal/dao"
+	"stackChan/internal/model"
+	"stackChan/internal/service"
+	"stackChan/internal/xiaozhi"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+
+	"stackChan/api/device/v2"
+)
+
+// UnbindDevice Device unbinding interface
+func (c *ControllerV2) UnbindDevice(ctx context.Context, req *v2.UnbindDeviceReq) (res *v2.UnbindDeviceRes, err error) {
+	_, err = service.CreateMacIfNotExists(ctx, req.Mac)
+	if err != nil {
+		return nil, gerror.WrapCode(gcode.CodeDbOperationError, err, "Failed to initialize device information")
+	}
+	uid := g.RequestFromCtx(ctx).GetCtxVar(model.Uid).Int64()
+	if uid == 0 {
+		return nil, gerror.NewCode(gcode.CodeMissingParameter, "User UID cannot be empty")
+	}
+
+	// 3. Validate MAC address parameter
+	if req.Mac == "" {
+		return nil, gerror.NewCode(gcode.CodeMissingParameter, "Device MAC address cannot be empty")
+	}
+
+	restoreResponse, err := service.RestoreDefaultAgent(req.Mac)
+
+	if err != nil {
+		return nil, err
+	}
+
+	if !restoreResponse {
+		return nil, gerror.NewCode(gcode.CodeInternalError, "Failed to restore default configuration")
+	}
+
+	// xiaozhi Unbind Device
+	unbindResponse, err := xiaozhi.UnbindDevice(&req.Mac)
+	if err != nil {
+		return nil, gerror.NewCode(gcode.CodeInternalError)
+	}
+	if !unbindResponse {
+		g.Log().Error(ctx, "xiaozhi Unbind Device failed:")
+		return nil, gerror.NewCode(gcode.CodeInternalError)
+	}
+
+	// 4. Perform unbind: set uid to 0/NULL (only the current user's own device can be unbound)
+	_, err = dao.Device.Ctx(ctx).
+		Where("mac = ?", req.Mac).
+		Where("uid = ?", uid).
+		Data("uid", nil, "bind_time", nil).
+		Update()
+	if err != nil {
+		return nil, gerror.WrapCode(gcode.CodeDbOperationError, err, "Device unbinding failed")
+	}
+	// 5. Return success response (consistent with bind interface format)
+	return new(v2.UnbindDeviceRes(true)), nil
+}

server/internal/controller/device/device_v2_update_device.go

@@ -0,0 +1,67 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package device
+
+import (
+	"context"
+	"stackChan/internal/dao"
+	"stackChan/internal/model"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+
+	"stackChan/api/device/v2"
+)
+
+func (c *ControllerV2) UpdateDevice(ctx context.Context, req *v2.UpdateDeviceReq) (res *v2.UpdateDeviceRes, err error) {
+	// Get current logged-in user UID
+	uid := g.RequestFromCtx(ctx).GetCtxVar(model.Uid).Int64()
+	if uid == 0 {
+		return nil, gerror.NewCode(gcode.CodeMissingParameter, "User UID cannot be empty")
+	}
+
+	// check device exists and belongs to current user
+	count, err := dao.Device.Ctx(ctx).
+		Where("mac = ?", req.Mac).
+		Where("uid = ?", uid).
+		Count()
+	if err != nil {
+		return nil, gerror.WrapCode(gcode.CodeDbOperationError, err, "Failed to query device information")
+	}
+	if count == 0 {
+		return nil, gerror.NewCode(gcode.CodeNotFound, "device not found or not belong to current user")
+	}
+
+	// build update data
+	updateData := g.Map{}
+	if req.Name != "" {
+		updateData["name"] = req.Name
+	}
+	if req.Longitude != 0 {
+		updateData["longitude"] = req.Longitude
+	}
+	if req.Latitude != 0 {
+		updateData["latitude"] = req.Latitude
+	}
+
+	// no need to update
+	if len(updateData) == 0 {
+		return new(v2.UpdateDeviceRes(true)), nil
+	}
+
+	// update device information
+	_, err = dao.Device.Ctx(ctx).
+		Where("mac = ?", req.Mac).
+		Where("uid = ?", uid).
+		Data(updateData).
+		Update()
+	if err != nil {
+		return nil, gerror.WrapCode(gcode.CodeDbOperationError, err, "update device failed")
+	}
+
+	return new(v2.UpdateDeviceRes(true)), nil
+}

server/internal/controller/friend/friend_v1_add.go

@@ -8,18 +8,25 @@ package friend
 import (
 	"context"
 	"stackChan/internal/dao"
+	"stackChan/internal/model"
 	"stackChan/internal/model/entity"
 
+	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
 
 	"stackChan/api/friend/v1"
 )
 
 func (c *ControllerV1) Add(ctx context.Context, req *v1.AddReq) (res *v1.AddRes, err error) {
-	if req.Mac == req.FriendMac {
+	mac := g.RequestFromCtx(ctx).GetCtxVar(model.Mac).String()
+	if mac == "" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter)
+	}
+	if mac == req.FriendMac {
 		return nil, gerror.New("You cannot add yourself as a friend")
 	}
-	macA := req.Mac
+	macA := mac
 	macB := req.FriendMac
 	var friend entity.DeviceFriend
 	err = dao.DeviceFriend.Ctx(ctx).

server/internal/controller/pano/pano.go

@@ -0,0 +1,10 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package pano

server/internal/controller/pano/pano_new.go

@@ -0,0 +1,20 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package pano
+
+import (
+	"stackChan/api/pano"
+)
+
+type ControllerV1 struct{}
+
+func NewV1() pano.IPanoV1 {
+	return &ControllerV1{}
+}

server/internal/controller/pano/pano_v1_add_pano.go

@@ -0,0 +1,45 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package pano
+
+import (
+	"context"
+	"stackChan/internal/dao"
+	"stackChan/internal/model"
+	"stackChan/internal/model/entity"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+
+	"stackChan/api/pano/v1"
+)
+
+func (c *ControllerV1) AddPano(ctx context.Context, req *v1.AddPanoReq) (res *v1.AddPanoRes, err error) {
+	mac := g.RequestFromCtx(ctx).GetCtxVar(model.Mac).String()
+	if mac == "" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter)
+	}
+
+	if req.Url == "" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter)
+	}
+
+	Id, err := dao.DevicePano.Ctx(ctx).Data(entity.DevicePano{
+		Mac:     mac,
+		PanoUrl: req.Url,
+	}).InsertAndGetId()
+
+	if err != nil {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter)
+	}
+
+	res = &v1.AddPanoRes{
+		Id: Id,
+	}
+
+	return res, nil
+}

server/internal/controller/pano/pano_v1_get_pano_list.go

@@ -0,0 +1,41 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package pano
+
+import (
+	"context"
+	"stackChan/internal/dao"
+	"stackChan/internal/model"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+
+	"stackChan/api/pano/v1"
+)
+
+func (c *ControllerV1) GetPanoList(ctx context.Context, req *v1.GetPanoListReq) (res *v1.GetPanoListRes, err error) {
+	mac := g.RequestFromCtx(ctx).GetCtxVar(model.Mac).String()
+	if mac == "" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter)
+	}
+
+	var list []model.Pano
+
+	err = dao.DevicePano.Ctx(ctx).Where("mac = ?", mac).Scan(&list)
+
+	if err != nil {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter)
+	}
+
+	if list == nil {
+		list = make([]model.Pano, 0)
+	}
+
+	response := v1.GetPanoListRes(list)
+
+	return &response, nil
+}

server/internal/controller/post/post_v1_create_post.go

@@ -8,16 +8,22 @@ package post
 import (
 	"context"
 	"stackChan/internal/dao"
+	"stackChan/internal/model"
 	"stackChan/internal/model/do"
 
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
 
 	"stackChan/api/post/v1"
 )
 
 func (c *ControllerV1) CreatePost(ctx context.Context, req *v1.CreatePostReq) (res *v1.CreatePostRes, err error) {
-	device, err := dao.Device.Ctx(ctx).Where("mac", req.Mac).One()
+	mac := g.RequestFromCtx(ctx).GetCtxVar(model.Mac).String()
+	if mac == "" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter)
+	}
+	device, err := dao.Device.Ctx(ctx).Where("mac", mac).One()
 	if err != nil {
 		return nil, err
 	}
@@ -25,7 +31,7 @@ func (c *ControllerV1) CreatePost(ctx context.Context, req *v1.CreatePostReq) (r
 		return nil, gerror.NewCode(gcode.CodeInvalidRequest, "The device does not exist or the Mac address is incorrect")
 	}
 	insertId, err := dao.DevicePost.Ctx(ctx).Data(do.DevicePost{
-		Mac:          req.Mac,
+		Mac:          mac,
 		ContentText:  req.ContentText,
 		ContentImage: req.ContentImage,
 	}).InsertAndGetId()

server/internal/controller/post/post_v1_create_post_comment.go

@@ -8,15 +8,24 @@ package post
 import (
 	"context"
 	"stackChan/internal/dao"
+	"stackChan/internal/model"
 	"stackChan/internal/model/do"
 
 	"stackChan/api/post/v1"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func (c *ControllerV1) CreatePostComment(ctx context.Context, req *v1.CreatePostCommentReq) (res *v1.CreatePostCommentRes, err error) {
+	mac := g.RequestFromCtx(ctx).GetCtxVar(model.Mac).String()
+	if mac == "" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter)
+	}
 	id, err := dao.DevicePostComment.Ctx(ctx).Data(do.DevicePostComment{
 		PostId:  req.PostId,
-		Mac:     req.Mac,
+		Mac:     mac,
 		Content: req.Content,
 	}).InsertAndGetId()
 	if err != nil {

server/internal/controller/post/post_v1_delete_post_comment.go

@@ -12,11 +12,19 @@ import (
 	"stackChan/internal/model"
 
 	"stackChan/api/post/v1"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func (c *ControllerV1) DeletePostComment(ctx context.Context, req *v1.DeletePostCommentReq) (res *v1.DeletePostCommentRes, err error) {
+	mac := g.RequestFromCtx(ctx).GetCtxVar(model.Mac).String()
+	if mac == "" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter)
+	}
 	var postComment model.PostComment
-	err = dao.DevicePostComment.Ctx(ctx).Where("id=?", req.Id).Scan(&postComment)
+	err = dao.DevicePostComment.Ctx(ctx).Where("id=? AND post_id=? AND mac=?", req.CommentId, req.PostId, mac).Scan(&postComment)
 
 	if err != nil {
 		return nil, err
@@ -26,13 +34,13 @@ func (c *ControllerV1) DeletePostComment(ctx context.Context, req *v1.DeletePost
 		return nil, errors.New("post not found")
 	}
 
-	if postComment.Mac != req.Mac {
+	if postComment.Mac != mac {
 		return nil, errors.New("no authority to delete")
 	}
 
 	_, err = dao.DevicePostComment.
 		Ctx(ctx).
-		Where("id = ? AND mac = ?", req.Id, req.Mac).
+		Where("id=? AND post_id=?", req.CommentId, req.PostId).
 		Delete()
 	if err != nil {
 		return nil, err

server/internal/controller/post/post_v1_get_post_comment.go

@@ -26,7 +26,7 @@ func (c *ControllerV1) GetPostComment(ctx context.Context, req *v1.GetPostCommen
 
 	var list []*model.PostComment
 
-	db := dao.DevicePostComment.Ctx(ctx).As("dp").Where("mac = ? AND post_id = ?", req.Mac, req.PostId)
+	db := dao.DevicePostComment.Ctx(ctx).As("dp").Where("post_id = ?", req.PostId)
 
 	total, err := db.Count()
 	if err != nil {

server/internal/controller/stackchandevice/stackchandevice.go

@@ -0,0 +1,10 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package stackchandevice

server/internal/controller/stackchandevice/stackchandevice_new.go

@@ -0,0 +1,20 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package stackchandevice
+
+import (
+	"stackChan/api/stackchandevice"
+)
+
+type ControllerV2 struct{}
+
+func NewV2() stackchandevice.IStackchandeviceV2 {
+	return &ControllerV2{}
+}

server/internal/controller/stackchandevice/stackchandevice_v2_get_device_user_info.go

@@ -0,0 +1,62 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package stackchandevice
+
+import (
+	"context"
+	"stackChan/internal/dao"
+	"stackChan/internal/model"
+	"stackChan/internal/model/entity"
+	"stackChan/internal/service"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+
+	"stackChan/api/stackchandevice/v2"
+)
+
+// GetDeviceUserInfo Get user information corresponding to the device
+func (c *ControllerV2) GetDeviceUserInfo(ctx context.Context, req *v2.GetDeviceUserInfoReq) (res *v2.GetDeviceUserInfoRes, err error) {
+	// 1. Get MAC address from context
+	mac := g.RequestFromCtx(ctx).GetCtxVar(model.Mac).String()
+	if mac == "" {
+		return nil, gerror.NewCodef(gcode.CodeInvalidParameter, "Device MAC address is empty")
+	}
+
+	// 2. Ensure MAC record exists
+	_, err = service.CreateMacIfNotExists(ctx, mac)
+	if err != nil {
+		return nil, gerror.WrapCode(gcode.CodeInternalError, err, "create mac record failed")
+	}
+
+	// 3. Query device information based on MAC
+	var device entity.Device
+	err = dao.Device.Ctx(ctx).Where("mac", mac).Scan(&device)
+	if err != nil {
+		return nil, gerror.WrapCodef(gcode.CodeInternalError, err, "Failed to query device information")
+	}
+
+	// 4. Device not bound to user -> return null
+	if device.Uid == 0 {
+		return new(v2.GetDeviceUserInfoRes(nil)), nil
+	}
+
+	// 5. Query user information based on UID
+	var user model.User
+	err = dao.User.Ctx(ctx).Where("uid", device.Uid).Scan(&user)
+	if err != nil {
+		return nil, gerror.WrapCode(gcode.CodeInternalError, err, "query user info failed")
+	}
+
+	// 6. User does not exist -> return null
+	if user.Uid == 0 {
+		return new(v2.GetDeviceUserInfoRes(nil)), nil
+	}
+
+	// 7. Return username normally
+	return new(v2.GetDeviceUserInfoRes(&user)), nil
+}

server/internal/controller/stackchandevice/stackchandevice_v2_unbind_device.go

@@ -0,0 +1,60 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package stackchandevice
+
+import (
+	"context"
+	"stackChan/internal/dao"
+	"stackChan/internal/model"
+	"stackChan/internal/service"
+	"stackChan/internal/xiaozhi"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+
+	"stackChan/api/stackchandevice/v2"
+)
+
+// UnbindDevice Unbind device from StackChan side
+func (c *ControllerV2) UnbindDevice(ctx context.Context, req *v2.UnbindDeviceReq) (res *v2.UnbindDeviceRes, err error) {
+	mac := g.RequestFromCtx(ctx).GetCtxVar(model.Mac).String()
+	if mac == "" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter)
+	}
+	_, err = service.CreateMacIfNotExists(ctx, mac)
+	if err != nil {
+		return nil, gerror.NewCode(gcode.CodeInternalError)
+	}
+	restoreResponse, err := service.RestoreDefaultAgent(mac)
+	if err != nil {
+		return nil, err
+	}
+	if !restoreResponse {
+		return nil, gerror.NewCode(gcode.CodeInternalError, "restore default agent failed")
+	}
+
+	/// xiaozhi Unbind Device
+	unbindResponse, err := xiaozhi.UnbindDevice(&mac)
+	if err != nil {
+		return nil, gerror.NewCode(gcode.CodeInternalError)
+	}
+	if !unbindResponse {
+		g.Log().Error(ctx, "xiaozhi Unbind Device failed")
+		return nil, gerror.NewCode(gcode.CodeInternalError)
+	}
+
+	/// update device table
+	_, err = dao.Device.Ctx(ctx).
+		Where("mac", mac).
+		Data("uid", nil, "bind_time", nil).
+		Update()
+	if err != nil {
+		return nil, gerror.NewCodef(gcode.CodeInternalError, "device unbind failed: %v", err)
+	}
+
+	return new(v2.UnbindDeviceRes(true)), nil
+}

server/internal/controller/user/user.go

@@ -0,0 +1,10 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package user

server/internal/controller/user/user_new.go

@@ -0,0 +1,20 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package user
+
+import (
+	"stackChan/api/user"
+)
+
+type ControllerV2 struct{}
+
+func NewV2() user.IUserV2 {
+	return &ControllerV2{}
+}

server/internal/controller/user/user_v2_get_user_info.go

@@ -0,0 +1,34 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package user
+
+import (
+	"context"
+	"stackChan/internal/dao"
+	"stackChan/internal/model"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+
+	"stackChan/api/user/v2"
+)
+
+func (c *ControllerV2) GetUserInfo(ctx context.Context, req *v2.GetUserInfoReq) (res *v2.GetUserInfoRes, err error) {
+	uid := g.RequestFromCtx(ctx).GetCtxVar(model.Uid).Int64()
+	if uid == 0 {
+		return nil, gerror.NewCode(gcode.CodeMissingParameter, "user UID is required")
+	}
+	var userInfo model.User
+	err = dao.User.Ctx(ctx).Where("uid=?", uid).Scan(&userInfo)
+	if err != nil {
+		return nil, gerror.WrapCode(gcode.CodeDbOperationError, err, "failed to query user information")
+	}
+	if userInfo.Uid == 0 {
+		return nil, gerror.NewCode(gcode.CodeNotFound, "user does not exist")
+	}
+	return new(v2.GetUserInfoRes(userInfo)), nil
+}

server/internal/controller/user/user_v2_login.go

@@ -0,0 +1,17 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package user
+
+import (
+	"context"
+	"stackChan/internal/service"
+
+	"stackChan/api/user/v2"
+)
+
+func (c *ControllerV2) Login(ctx context.Context, req *v2.LoginReq) (res *v2.LoginRes, err error) {
+	return service.Login(ctx, req)
+}

server/internal/controller/user/user_v2_registration.go

@@ -0,0 +1,17 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package user
+
+import (
+	"context"
+	"stackChan/internal/service"
+
+	"stackChan/api/user/v2"
+)
+
+func (c *ControllerV2) Registration(ctx context.Context, req *v2.RegistrationReq) (res *v2.RegistrationRes, err error) {
+	return service.Registration(ctx, req)
+}

server/internal/controller/xiaozhi/xiaozhi.go

@@ -0,0 +1,10 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package xiaozhi

server/internal/controller/xiaozhi/xiaozhi_new.go

@@ -0,0 +1,20 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package xiaozhi
+
+import (
+	"stackChan/api/xiaozhi"
+)
+
+type ControllerV1 struct{}
+
+func NewV1() xiaozhi.IXiaozhiV1 {
+	return &ControllerV1{}
+}

server/internal/controller/xiaozhi/xiaozhi_v1_get_xiao_zhi_generate_license_token.go

@@ -0,0 +1,19 @@
+package xiaozhi
+
+import (
+	"context"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+
+	"stackChan/api/xiaozhi/v1"
+)
+
+func (c *ControllerV1) GetXiaoZhiGenerateLicenseToken(ctx context.Context, req *v1.GetXiaoZhiGenerateLicenseTokenReq) (res *v1.GetXiaoZhiGenerateLicenseTokenRes, err error) {
+	generateLicenseToken := g.Cfg().MustGet(ctx, "xiaozhi.generate_license_token").String()
+	if generateLicenseToken == "" {
+		return nil, gerror.NewCode(gcode.CodeInvalidParameter, "generate_license_token is empty")
+	}
+	return new(v1.GetXiaoZhiGenerateLicenseTokenRes(generateLicenseToken)), nil
+}

server/internal/controller/xiaozhi/xiaozhi_v1_get_xiao_zhi_token.go

@@ -0,0 +1,21 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package xiaozhi
+
+import (
+	"context"
+	"stackChan/internal/xiaozhi"
+
+	"stackChan/api/xiaozhi/v1"
+)
+
+func (c *ControllerV1) GetXiaoZhiToken(ctx context.Context, req *v1.GetXiaoZhiTokenReq) (res *v1.GetXiaoZhiTokenRes, err error) {
+	token, err := xiaozhi.GetToken()
+	if err != nil {
+		return nil, err
+	}
+	return new(v1.GetXiaoZhiTokenRes(token)), nil
+}

server/internal/controller/xiaozhi/xiaozhi_v1_refresh_token.go

@@ -0,0 +1,21 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package xiaozhi
+
+import (
+	"context"
+	"stackChan/internal/xiaozhi"
+
+	"stackChan/api/xiaozhi/v1"
+)
+
+func (c *ControllerV1) RefreshToken(ctx context.Context, req *v1.RefreshTokenReq) (res *v1.RefreshTokenRes, err error) {
+	token, err := xiaozhi.GetNewToken()
+	if err != nil {
+		return nil, err
+	}
+	return new(v1.RefreshTokenRes(token)), nil
+}