merge: resolve conflict in api/server.go (dev → openclaw)

Keep s.route() wrapper style from openclaw, add reset-password route from dev.
This commit is contained in:
tinkle-community
2026-03-10 17:04:46 +08:00
13 changed files with 1379 additions and 46 deletions

View File

@@ -144,6 +144,7 @@ func (s *Server) setupRoutes() {
// Authentication related routes (no authentication required)
s.route(api, "POST", "/register", "Register new user", s.handleRegister)
s.route(api, "POST", "/login", "User login, returns JWT token", s.handleLogin)
s.route(api, "POST", "/reset-password", "Reset password", s.handleResetPassword)
// Routes requiring authentication
protected := api.Group("/", s.authMiddleware())
@@ -3447,6 +3448,8 @@ func (s *Server) handleGetSupportedModels(c *gin.Context) {
{"id": "grok", "name": "Grok (xAI)", "provider": "grok", "defaultModel": "grok-3-latest"},
{"id": "kimi", "name": "Kimi (Moonshot)", "provider": "kimi", "defaultModel": "moonshot-v1-auto"},
{"id": "minimax", "name": "MiniMax", "provider": "minimax", "defaultModel": "MiniMax-M2.5"},
{"id": "blockrun-base", "name": "BlockRun (Base Wallet)", "provider": "blockrun-base", "defaultModel": "auto"},
{"id": "blockrun-sol", "name": "BlockRun (Solana Wallet)", "provider": "blockrun-sol", "defaultModel": "auto"},
}
c.JSON(http.StatusOK, supportedModels)