diff --git a/README.md b/README.md index 0bd7a746..a8626b89 100644 --- a/README.md +++ b/README.md @@ -184,7 +184,7 @@ docker-compose up -d ### 2. 修改配置文档 -先拷贝项目中的 `api/go/config.sample.toml` 配置文档,修改代理地址和管理员密码: +先拷贝项目中的 `api/config.sample.toml` 配置文档,修改代理地址和管理员密码: 如何修改请参考[修改配置文档](#2-修改配置文档) @@ -287,7 +287,7 @@ server { 3. 运行后端程序: ```shell - cd api/go + cd api # 1. 先下载依赖 go mod tidy # 2. 运行程序 @@ -340,7 +340,7 @@ npm run build 你可以根据个人需求将项目打包成 windows/linux/darwin 平台项目。 ```shell -cd api/go +cd api # for all platforms make all # for linux only diff --git a/api/go/.gitignore b/api/.gitignore similarity index 100% rename from api/go/.gitignore rename to api/.gitignore diff --git a/api/go/Makefile b/api/Makefile similarity index 100% rename from api/go/Makefile rename to api/Makefile diff --git a/api/go/README.md b/api/README.md similarity index 100% rename from api/go/README.md rename to api/README.md diff --git a/api/go/config.sample.toml b/api/config.sample.toml similarity index 100% rename from api/go/config.sample.toml rename to api/config.sample.toml diff --git a/api/go/core/app_server.go b/api/core/app_server.go similarity index 100% rename from api/go/core/app_server.go rename to api/core/app_server.go diff --git a/api/go/core/config.go b/api/core/config.go similarity index 100% rename from api/go/core/config.go rename to api/core/config.go diff --git a/api/go/core/types/chat.go b/api/core/types/chat.go similarity index 100% rename from api/go/core/types/chat.go rename to api/core/types/chat.go diff --git a/api/go/core/types/client.go b/api/core/types/client.go similarity index 100% rename from api/go/core/types/client.go rename to api/core/types/client.go diff --git a/api/go/core/types/config.go b/api/core/types/config.go similarity index 100% rename from api/go/core/types/config.go rename to api/core/types/config.go diff --git a/api/go/core/types/locked_map.go b/api/core/types/locked_map.go similarity index 100% rename from api/go/core/types/locked_map.go rename to api/core/types/locked_map.go diff --git a/api/go/core/types/session.go b/api/core/types/session.go similarity index 100% rename from api/go/core/types/session.go rename to api/core/types/session.go diff --git a/api/go/core/types/web.go b/api/core/types/web.go similarity index 100% rename from api/go/core/types/web.go rename to api/core/types/web.go diff --git a/api/go/fresh.conf b/api/fresh.conf similarity index 100% rename from api/go/fresh.conf rename to api/fresh.conf diff --git a/api/go/go.mod b/api/go.mod similarity index 100% rename from api/go/go.mod rename to api/go.mod diff --git a/api/go/go.sum b/api/go.sum similarity index 100% rename from api/go/go.sum rename to api/go.sum diff --git a/api/go/handler/admin/admin_handler.go b/api/handler/admin/admin_handler.go similarity index 100% rename from api/go/handler/admin/admin_handler.go rename to api/handler/admin/admin_handler.go diff --git a/api/go/handler/admin/api_key_handler.go b/api/handler/admin/api_key_handler.go similarity index 100% rename from api/go/handler/admin/api_key_handler.go rename to api/handler/admin/api_key_handler.go diff --git a/api/go/handler/admin/chat_role_handler.go b/api/handler/admin/chat_role_handler.go similarity index 100% rename from api/go/handler/admin/chat_role_handler.go rename to api/handler/admin/chat_role_handler.go diff --git a/api/go/handler/admin/config_handler.go b/api/handler/admin/config_handler.go similarity index 100% rename from api/go/handler/admin/config_handler.go rename to api/handler/admin/config_handler.go diff --git a/api/go/handler/admin/user_handler.go b/api/handler/admin/user_handler.go similarity index 100% rename from api/go/handler/admin/user_handler.go rename to api/handler/admin/user_handler.go diff --git a/api/go/handler/base_handler.go b/api/handler/base_handler.go similarity index 100% rename from api/go/handler/base_handler.go rename to api/handler/base_handler.go diff --git a/api/go/handler/chat_handler.go b/api/handler/chat_handler.go similarity index 100% rename from api/go/handler/chat_handler.go rename to api/handler/chat_handler.go diff --git a/api/go/handler/chat_history_handler.go b/api/handler/chat_history_handler.go similarity index 100% rename from api/go/handler/chat_history_handler.go rename to api/handler/chat_history_handler.go diff --git a/api/go/handler/chat_role_handler.go b/api/handler/chat_role_handler.go similarity index 100% rename from api/go/handler/chat_role_handler.go rename to api/handler/chat_role_handler.go diff --git a/api/go/handler/upload_handler.go b/api/handler/upload_handler.go similarity index 100% rename from api/go/handler/upload_handler.go rename to api/handler/upload_handler.go diff --git a/api/go/handler/user_handler.go b/api/handler/user_handler.go similarity index 96% rename from api/go/handler/user_handler.go rename to api/handler/user_handler.go index 4f3603fe..afc35321 100644 --- a/api/go/handler/user_handler.go +++ b/api/handler/user_handler.go @@ -68,11 +68,18 @@ func (h *UserHandler) Register(c *gin.Context) { // check if the username is exists var item model.User - tx := h.db.Where("username = ?", data.Username).First(&item) - if tx.RowsAffected > 0 { + res := h.db.Where("username = ?", data.Username).First(&item) + if res.RowsAffected > 0 { resp.ERROR(c, "用户名已存在") return } + + res = h.db.Where("mobile = ?", data.Mobile).First(&item) + if res.RowsAffected > 0 { + resp.ERROR(c, "该手机号码以及被注册,请更换其他手机号") + return + } + // 默认订阅所有角色 var chatRoles []model.ChatRole h.db.Find(&chatRoles) @@ -110,7 +117,7 @@ func (h *UserHandler) Register(c *gin.Context) { } else { user.Calls = config.UserInitCalls } - res := h.db.Create(&user) + res = h.db.Create(&user) if res.Error != nil { resp.ERROR(c, "保存数据失败") logger.Error(res.Error) diff --git a/api/go/handler/verify_handler.go b/api/handler/verify_handler.go similarity index 100% rename from api/go/handler/verify_handler.go rename to api/handler/verify_handler.go diff --git a/api/java/README.md b/api/java/README.md deleted file mode 100644 index 49be68cb..00000000 --- a/api/java/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# chatgpt-plus-java - -chatgpt-plus 后端 API Java 语言实现,待开发。 - - diff --git a/api/go/logger/logger.go b/api/logger/logger.go similarity index 100% rename from api/go/logger/logger.go rename to api/logger/logger.go diff --git a/api/go/main.go b/api/main.go similarity index 100% rename from api/go/main.go rename to api/main.go diff --git a/api/php/README.md b/api/php/README.md deleted file mode 100644 index 6d2f9ec0..00000000 --- a/api/php/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# chatgpt-plus-php - -chatgpt-plus 后端 API PHP 语言实现,待开发。 - - diff --git a/api/python/README.md b/api/python/README.md deleted file mode 100644 index c682e1c6..00000000 --- a/api/python/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# chatgpt-plus-python - -chatgpt-plus 后端 API Python 语言实现,待开发。 - - diff --git a/api/go/res/ip2region.xdb b/api/res/ip2region.xdb similarity index 100% rename from api/go/res/ip2region.xdb rename to api/res/ip2region.xdb diff --git a/api/go/service/aliyun_sms_service.go b/api/service/aliyun_sms_service.go similarity index 100% rename from api/go/service/aliyun_sms_service.go rename to api/service/aliyun_sms_service.go diff --git a/api/go/service/sms_service.go b/api/service/sms_service.go similarity index 100% rename from api/go/service/sms_service.go rename to api/service/sms_service.go diff --git a/api/go/static/hello.txt b/api/static/hello.txt similarity index 100% rename from api/go/static/hello.txt rename to api/static/hello.txt diff --git a/api/go/store/leveldb.go b/api/store/leveldb.go similarity index 100% rename from api/go/store/leveldb.go rename to api/store/leveldb.go diff --git a/api/go/store/model/api_key.go b/api/store/model/api_key.go similarity index 100% rename from api/go/store/model/api_key.go rename to api/store/model/api_key.go diff --git a/api/go/store/model/base.go b/api/store/model/base.go similarity index 100% rename from api/go/store/model/base.go rename to api/store/model/base.go diff --git a/api/go/store/model/chat_history.go b/api/store/model/chat_history.go similarity index 100% rename from api/go/store/model/chat_history.go rename to api/store/model/chat_history.go diff --git a/api/go/store/model/chat_item.go b/api/store/model/chat_item.go similarity index 100% rename from api/go/store/model/chat_item.go rename to api/store/model/chat_item.go diff --git a/api/go/store/model/chat_role.go b/api/store/model/chat_role.go similarity index 100% rename from api/go/store/model/chat_role.go rename to api/store/model/chat_role.go diff --git a/api/go/store/model/config.go b/api/store/model/config.go similarity index 100% rename from api/go/store/model/config.go rename to api/store/model/config.go diff --git a/api/go/store/model/user.go b/api/store/model/user.go similarity index 100% rename from api/go/store/model/user.go rename to api/store/model/user.go diff --git a/api/go/store/model/user_login_log.go b/api/store/model/user_login_log.go similarity index 100% rename from api/go/store/model/user_login_log.go rename to api/store/model/user_login_log.go diff --git a/api/go/store/mysql.go b/api/store/mysql.go similarity index 100% rename from api/go/store/mysql.go rename to api/store/mysql.go diff --git a/api/go/store/vo/api_key.go b/api/store/vo/api_key.go similarity index 100% rename from api/go/store/vo/api_key.go rename to api/store/vo/api_key.go diff --git a/api/go/store/vo/base.go b/api/store/vo/base.go similarity index 100% rename from api/go/store/vo/base.go rename to api/store/vo/base.go diff --git a/api/go/store/vo/chat_history.go b/api/store/vo/chat_history.go similarity index 100% rename from api/go/store/vo/chat_history.go rename to api/store/vo/chat_history.go diff --git a/api/go/store/vo/chat_item.go b/api/store/vo/chat_item.go similarity index 100% rename from api/go/store/vo/chat_item.go rename to api/store/vo/chat_item.go diff --git a/api/go/store/vo/chat_role.go b/api/store/vo/chat_role.go similarity index 100% rename from api/go/store/vo/chat_role.go rename to api/store/vo/chat_role.go diff --git a/api/go/store/vo/config.go b/api/store/vo/config.go similarity index 100% rename from api/go/store/vo/config.go rename to api/store/vo/config.go diff --git a/api/go/store/vo/page.go b/api/store/vo/page.go similarity index 100% rename from api/go/store/vo/page.go rename to api/store/vo/page.go diff --git a/api/go/store/vo/user.go b/api/store/vo/user.go similarity index 100% rename from api/go/store/vo/user.go rename to api/store/vo/user.go diff --git a/api/go/store/vo/user_login_log.go b/api/store/vo/user_login_log.go similarity index 100% rename from api/go/store/vo/user_login_log.go rename to api/store/vo/user_login_log.go diff --git a/api/go/test/data.txt b/api/test/data.txt similarity index 100% rename from api/go/test/data.txt rename to api/test/data.txt diff --git a/api/go/test/test.go b/api/test/test.go similarity index 100% rename from api/go/test/test.go rename to api/test/test.go diff --git a/api/go/utils/common.go b/api/utils/common.go similarity index 100% rename from api/go/utils/common.go rename to api/utils/common.go diff --git a/api/go/utils/crypto.go b/api/utils/crypto.go similarity index 100% rename from api/go/utils/crypto.go rename to api/utils/crypto.go diff --git a/api/go/utils/openai.go b/api/utils/openai.go similarity index 100% rename from api/go/utils/openai.go rename to api/utils/openai.go diff --git a/api/go/utils/resp/response.go b/api/utils/resp/response.go similarity index 100% rename from api/go/utils/resp/response.go rename to api/utils/resp/response.go diff --git a/api/go/utils/strings.go b/api/utils/strings.go similarity index 97% rename from api/go/utils/strings.go rename to api/utils/strings.go index ad400d61..7bdd1da1 100644 --- a/api/go/utils/strings.go +++ b/api/utils/strings.go @@ -25,6 +25,7 @@ func RandomNumber(bit int) int { min := intPow(10, bit-1) max := intPow(10, bit) - 1 + rand.Seed(time.Now().UnixNano()) return rand.Intn(max-min+1) + min } diff --git a/api/go/utils/user.go b/api/utils/user.go similarity index 100% rename from api/go/utils/user.go rename to api/utils/user.go