Merge remote-tracking branch 'origin/release/1.7.0'

Author: LinkinStars

Makefile

@@ -1,6 +1,6 @@
 .PHONY: build clean ui
 
-VERSION=1.6.0
+VERSION=1.7.0
 BIN=answer
 DIR_SRC=./cmd/answer
 DOCKER_CMD=docker

README.md

@@ -23,7 +23,7 @@ To learn more about the project, visit [answer.apache.org](https://answer.apache
 ### Running with docker
 
 ```bash
-docker run -d -p 9080:80 -v answer-data:/data --name answer apache/answer:1.6.0
+docker run -d -p 9080:80 -v answer-data:/data --name answer apache/answer:1.7.0
 ```
 
 For more information, see [Installation](https://answer.apache.org/docs/installation).

cmd/command.go

@@ -20,11 +20,13 @@
 package answercmd
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"strings"
 
 	"github.com/apache/answer/internal/base/conf"
+	"github.com/apache/answer/internal/base/path"
 	"github.com/apache/answer/internal/cli"
 	"github.com/apache/answer/internal/install"
 	"github.com/apache/answer/internal/migrations"
@@ -53,6 +55,10 @@ var (
 	i18nSourcePath string
 	// i18nTargetPath i18n to path
 	i18nTargetPath string
+	// resetPasswordEmail user email for password reset
+	resetPasswordEmail string
+	// resetPasswordPassword new password for password reset
+	resetPasswordPassword string
 )
 
 func init() {
@@ -76,7 +82,10 @@ func init() {
 
 	i18nCmd.Flags().StringVarP(&i18nTargetPath, "target", "t", "", "i18n target path, eg: -t ./i18n/target")
 
-	for _, cmd := range []*cobra.Command{initCmd, checkCmd, runCmd, dumpCmd, upgradeCmd, buildCmd, pluginCmd, configCmd, i18nCmd} {
+	resetPasswordCmd.Flags().StringVarP(&resetPasswordEmail, "email", "e", "", "user email address")
+	resetPasswordCmd.Flags().StringVarP(&resetPasswordPassword, "password", "p", "", "new password (not recommended, will be recorded in shell history)")
+
+	for _, cmd := range []*cobra.Command{initCmd, checkCmd, runCmd, dumpCmd, upgradeCmd, buildCmd, pluginCmd, configCmd, i18nCmd, resetPasswordCmd} {
 		rootCmd.AddCommand(cmd)
 	}
 }
@@ -96,8 +105,8 @@ To run answer, use:
 		Short: "Run Answer",
 		Long:  `Start running Answer`,
 		Run: func(_ *cobra.Command, _ []string) {
-			cli.FormatAllPath(dataDirPath)
-			fmt.Println("config file path: ", cli.GetConfigFilePath())
+			path.FormatAllPath(dataDirPath)
+			fmt.Println("config file path: ", path.GetConfigFilePath())
 			fmt.Println("Answer is starting..........................")
 			runApp()
 		},
@@ -111,10 +120,10 @@ To run answer, use:
 			// check config file and database. if config file exists and database is already created, init done
 			cli.InstallAllInitialEnvironment(dataDirPath)
 
-			configFileExist := cli.CheckConfigFile(cli.GetConfigFilePath())
+			configFileExist := cli.CheckConfigFile(path.GetConfigFilePath())
 			if configFileExist {
 				fmt.Println("config file exists, try to read the config...")
-				c, err := conf.ReadConfig(cli.GetConfigFilePath())
+				c, err := conf.ReadConfig(path.GetConfigFilePath())
 				if err != nil {
 					fmt.Println("read config failed: ", err.Error())
 					return
@@ -128,7 +137,7 @@ To run answer, use:
 			}
 
 			// start installation server to install
-			install.Run(cli.GetConfigFilePath())
+			install.Run(path.GetConfigFilePath())
 		},
 	}
 
@@ -138,9 +147,9 @@ To run answer, use:
 		Long:  `Upgrade Answer to the latest version`,
 		Run: func(_ *cobra.Command, _ []string) {
 			log.SetLogger(log.NewStdLogger(os.Stdout))
-			cli.FormatAllPath(dataDirPath)
+			path.FormatAllPath(dataDirPath)
 			cli.InstallI18nBundle(true)
-			c, err := conf.ReadConfig(cli.GetConfigFilePath())
+			c, err := conf.ReadConfig(path.GetConfigFilePath())
 			if err != nil {
 				fmt.Println("read config failed: ", err.Error())
 				return
@@ -159,8 +168,8 @@ To run answer, use:
 		Long:  `Back up database into an SQL file`,
 		Run: func(_ *cobra.Command, _ []string) {
 			fmt.Println("Answer is backing up data")
-			cli.FormatAllPath(dataDirPath)
-			c, err := conf.ReadConfig(cli.GetConfigFilePath())
+			path.FormatAllPath(dataDirPath)
+			c, err := conf.ReadConfig(path.GetConfigFilePath())
 			if err != nil {
 				fmt.Println("read config failed: ", err.Error())
 				return
@@ -179,9 +188,9 @@ To run answer, use:
 		Short: "Check the required environment",
 		Long:  `Check if the current environment meets the startup requirements`,
 		Run: func(_ *cobra.Command, _ []string) {
-			cli.FormatAllPath(dataDirPath)
+			path.FormatAllPath(dataDirPath)
 			fmt.Println("Start checking the required environment...")
-			if cli.CheckConfigFile(cli.GetConfigFilePath()) {
+			if cli.CheckConfigFile(path.GetConfigFilePath()) {
 				fmt.Println("config file exists [✔]")
 			} else {
 				fmt.Println("config file not exists [x]")
@@ -193,7 +202,7 @@ To run answer, use:
 				fmt.Println("upload directory not exists [x]")
 			}
 
-			c, err := conf.ReadConfig(cli.GetConfigFilePath())
+			c, err := conf.ReadConfig(path.GetConfigFilePath())
 			if err != nil {
 				fmt.Println("read config failed: ", err.Error())
 				return
@@ -246,9 +255,9 @@ To run answer, use:
 		Short: "Set some config to default value",
 		Long:  `Set some config to default value`,
 		Run: func(_ *cobra.Command, _ []string) {
-			cli.FormatAllPath(dataDirPath)
+			path.FormatAllPath(dataDirPath)
 
-			c, err := conf.ReadConfig(cli.GetConfigFilePath())
+			c, err := conf.ReadConfig(path.GetConfigFilePath())
 			if err != nil {
 				fmt.Println("read config failed: ", err.Error())
 				return
@@ -297,6 +306,32 @@ To run answer, use:
 			}
 		},
 	}
+
+	resetPasswordCmd = &cobra.Command{
+		Use:     "passwd",
+		Aliases: []string{"password", "reset-password"},
+		Short:   "Reset user password",
+		Long:    "Reset user password by email address.",
+		Example: `  # Interactive mode (recommended, safest)
+  answer passwd -C ./answer-data
+
+  # Specify email only (will prompt for password securely)
+  answer passwd -C ./answer-data --email user@example.com
+  answer passwd -C ./answer-data -e user@example.com
+
+  # Specify email and password (NOT recommended, will be recorded in shell history)
+  answer passwd -C ./answer-data -e user@example.com -p newpassword123`,
+		Run: func(cmd *cobra.Command, args []string) {
+			opts := &cli.ResetPasswordOptions{
+				Email:    resetPasswordEmail,
+				Password: resetPasswordPassword,
+			}
+			if err := cli.ResetPassword(context.Background(), dataDirPath, opts); err != nil {
+				fmt.Fprintf(os.Stderr, "Error: %v\n", err)
+				os.Exit(1)
+			}
+		},
+	}
 )
 
 // Execute adds all child commands to the root command and sets flags appropriately.

cmd/main.go

@@ -28,7 +28,7 @@ import (
 	"github.com/apache/answer/internal/base/conf"
 	"github.com/apache/answer/internal/base/constant"
 	"github.com/apache/answer/internal/base/cron"
-	"github.com/apache/answer/internal/cli"
+	"github.com/apache/answer/internal/base/path"
 	"github.com/apache/answer/internal/schema"
 	"github.com/gin-gonic/gin"
 	"github.com/segmentfault/pacman"
@@ -67,7 +67,7 @@ func Main() {
 }
 
 func runApp() {
-	c, err := conf.ReadConfig(cli.GetConfigFilePath())
+	c, err := conf.ReadConfig(path.GetConfigFilePath())
 	if err != nil {
 		panic(err)
 	}

cmd/wire_gen.go

@@ -1,22 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
 // Package docs Code generated by swaggo/swag. DO NOT EDIT
 package docs
 

docs/docs.go

@@ -1,20 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
 basePath: /
 definitions:
   constant.NotificationChannelKey:

docs/swagger.yaml

@@ -60,6 +60,7 @@ require (
 	golang.org/x/crypto v0.36.0
 	golang.org/x/image v0.20.0
 	golang.org/x/net v0.38.0
+	golang.org/x/term v0.30.0
 	golang.org/x/text v0.23.0
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 	gopkg.in/yaml.v3 v3.0.1

go.mod

@@ -785,6 +785,8 @@ golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXR
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
+golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

go.sum

@@ -684,7 +684,7 @@ ui:
         caption: People can mention you as "@username".
         msg: Username cannot be empty.
         msg_range: Username must be 2-30 characters in length.
-        character: 'Must use the character set "a-z", "0-9", " - . _"'
+        character: 'Must use the character set "a-z", "0-9", "- . _"'
       avatar:
         label: Profile Image
         gravatar: Gravatar