diff --git a/src/api/Makefile b/cmd/open_im_api/Makefile similarity index 100% rename from src/api/Makefile rename to cmd/open_im_api/Makefile diff --git a/src/api/open_im_api.go b/cmd/open_im_api/main.go similarity index 93% rename from src/api/open_im_api.go rename to cmd/open_im_api/main.go index eac0a1fa5..b22ff0210 100644 --- a/src/api/open_im_api.go +++ b/cmd/open_im_api/main.go @@ -1,13 +1,13 @@ package main import ( - apiAuth "Open_IM/src/api/auth" - apiChat "Open_IM/src/api/chat" - "Open_IM/src/api/friend" - "Open_IM/src/api/group" - "Open_IM/src/api/manage" - apiThird "Open_IM/src/api/third" - "Open_IM/src/api/user" + apiAuth "Open_IM/internal/api/auth" + apiChat "Open_IM/internal/api/chat" + "Open_IM/internal/api/friend" + "Open_IM/internal/api/group" + "Open_IM/internal/api/manage" + apiThird "Open_IM/internal/api/third" + "Open_IM/internal/api/user" "Open_IM/src/utils" "flag" "github.com/gin-gonic/gin" diff --git a/config/config.yaml b/config/config.yaml index 032087cba..1aaf3c932 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -5,12 +5,12 @@ #---------------Infrastructure configuration---------------------# etcd: etcdSchema: openIM - etcdAddr: [ 127.0.0.1:2379 ] + etcdAddr: [ 81.68.126.69:2379 ] mysql: - dbMysqlAddress: [ 127.0.0.1:3306 ] - dbMysqlUserName: root - dbMysqlPassword: openIM + dbMysqlAddress: [ 81.68.126.69:13306 ] + dbMysqlUserName: openIM + dbMysqlPassword: 12345 dbMysqlDatabaseName: openIM dbTableName: eMsg dbMsgTableNum: 1 @@ -19,18 +19,18 @@ mysql: dbMaxLifeTime: 120 mongo: - dbAddress: [ 127.0.0.1:27017 ] + dbAddress: [ 81.68.126.69:27017 ] dbDirect: false dbTimeout: 10 dbDatabase: openIM - dbSource: admin - dbUserName: - dbPassword: + dbSource: openIM + dbUserName: openIM + dbPassword: 12345 dbMaxPoolSize: 20 dbRetainChatRecords: 7 redis: - dbAddress: 127.0.0.1:6379 + dbAddress: 81.68.126.69:16379 dbMaxIdle: 128 dbMaxActive: 0 dbIdleTimeout: 120 @@ -38,10 +38,10 @@ redis: kafka: ws2mschat: - addr: [ 127.0.0.1:9092 ] + addr: [ 81.68.126.69:9092 ] topic: "ws2ms_chat" ms2pschat: - addr: [ 127.0.0.1:9092 ] + addr: [ 81.68.126.69:9092 ] topic: "ms2ps_chat" consumergroupid: msgToMongo: mongo diff --git a/src/api/auth/user_register.go b/internal/api/auth/user_register.go similarity index 100% rename from src/api/auth/user_register.go rename to internal/api/auth/user_register.go diff --git a/src/api/auth/user_token.go b/internal/api/auth/user_token.go similarity index 100% rename from src/api/auth/user_token.go rename to internal/api/auth/user_token.go diff --git a/src/api/chat/newest_seq.go b/internal/api/chat/newest_seq.go similarity index 100% rename from src/api/chat/newest_seq.go rename to internal/api/chat/newest_seq.go diff --git a/src/api/chat/pull_msg.go b/internal/api/chat/pull_msg.go similarity index 100% rename from src/api/chat/pull_msg.go rename to internal/api/chat/pull_msg.go diff --git a/src/api/chat/send_msg.go b/internal/api/chat/send_msg.go similarity index 100% rename from src/api/chat/send_msg.go rename to internal/api/chat/send_msg.go diff --git a/src/api/friend/add_blacklist.go b/internal/api/friend/add_blacklist.go similarity index 100% rename from src/api/friend/add_blacklist.go rename to internal/api/friend/add_blacklist.go diff --git a/src/api/friend/add_friend.go b/internal/api/friend/add_friend.go similarity index 100% rename from src/api/friend/add_friend.go rename to internal/api/friend/add_friend.go diff --git a/src/api/friend/add_friend_response.go b/internal/api/friend/add_friend_response.go similarity index 100% rename from src/api/friend/add_friend_response.go rename to internal/api/friend/add_friend_response.go diff --git a/src/api/friend/delete_friend.go b/internal/api/friend/delete_friend.go similarity index 100% rename from src/api/friend/delete_friend.go rename to internal/api/friend/delete_friend.go diff --git a/src/api/friend/get_blcaklist.go b/internal/api/friend/get_blcaklist.go similarity index 100% rename from src/api/friend/get_blcaklist.go rename to internal/api/friend/get_blcaklist.go diff --git a/src/api/friend/get_friend_apply_list.go b/internal/api/friend/get_friend_apply_list.go similarity index 100% rename from src/api/friend/get_friend_apply_list.go rename to internal/api/friend/get_friend_apply_list.go diff --git a/src/api/friend/get_friend_list.go b/internal/api/friend/get_friend_list.go similarity index 100% rename from src/api/friend/get_friend_list.go rename to internal/api/friend/get_friend_list.go diff --git a/src/api/friend/get_friends_info.go b/internal/api/friend/get_friends_info.go similarity index 100% rename from src/api/friend/get_friends_info.go rename to internal/api/friend/get_friends_info.go diff --git a/src/api/friend/is_friend.go b/internal/api/friend/is_friend.go similarity index 100% rename from src/api/friend/is_friend.go rename to internal/api/friend/is_friend.go diff --git a/src/api/friend/remove_blacklist.go b/internal/api/friend/remove_blacklist.go similarity index 100% rename from src/api/friend/remove_blacklist.go rename to internal/api/friend/remove_blacklist.go diff --git a/src/api/friend/set_friend_comment.go b/internal/api/friend/set_friend_comment.go similarity index 100% rename from src/api/friend/set_friend_comment.go rename to internal/api/friend/set_friend_comment.go diff --git a/src/api/group/create_group.go b/internal/api/group/create_group.go similarity index 100% rename from src/api/group/create_group.go rename to internal/api/group/create_group.go diff --git a/src/api/group/get_group_applicationList.go b/internal/api/group/get_group_applicationList.go similarity index 100% rename from src/api/group/get_group_applicationList.go rename to internal/api/group/get_group_applicationList.go diff --git a/src/api/group/get_groups_info.go b/internal/api/group/get_groups_info.go similarity index 100% rename from src/api/group/get_groups_info.go rename to internal/api/group/get_groups_info.go diff --git a/src/api/group/group.go b/internal/api/group/group.go similarity index 100% rename from src/api/group/group.go rename to internal/api/group/group.go diff --git a/src/api/group/group_application_response.go b/internal/api/group/group_application_response.go similarity index 100% rename from src/api/group/group_application_response.go rename to internal/api/group/group_application_response.go diff --git a/src/api/group/join_group.go b/internal/api/group/join_group.go similarity index 100% rename from src/api/group/join_group.go rename to internal/api/group/join_group.go diff --git a/src/api/group/quit_group.go b/internal/api/group/quit_group.go similarity index 100% rename from src/api/group/quit_group.go rename to internal/api/group/quit_group.go diff --git a/src/api/group/set_group_info.go b/internal/api/group/set_group_info.go similarity index 100% rename from src/api/group/set_group_info.go rename to internal/api/group/set_group_info.go diff --git a/src/api/group/transfer_group_owner.go b/internal/api/group/transfer_group_owner.go similarity index 100% rename from src/api/group/transfer_group_owner.go rename to internal/api/group/transfer_group_owner.go diff --git a/src/api/manage/management_chat.go b/internal/api/manage/management_chat.go similarity index 100% rename from src/api/manage/management_chat.go rename to internal/api/manage/management_chat.go diff --git a/src/api/manage/management_user.go b/internal/api/manage/management_user.go similarity index 100% rename from src/api/manage/management_user.go rename to internal/api/manage/management_user.go diff --git a/src/api/third/tencent_cloud_storage_credential.go b/internal/api/third/tencent_cloud_storage_credential.go similarity index 100% rename from src/api/third/tencent_cloud_storage_credential.go rename to internal/api/third/tencent_cloud_storage_credential.go diff --git a/src/api/user/get_user_info.go b/internal/api/user/get_user_info.go similarity index 100% rename from src/api/user/get_user_info.go rename to internal/api/user/get_user_info.go diff --git a/src/api/user/update_user_info.go b/internal/api/user/update_user_info.go similarity index 100% rename from src/api/user/update_user_info.go rename to internal/api/user/update_user_info.go diff --git a/src/common/config/config.go b/src/common/config/config.go index 939cdae2b..3ee3fe823 100644 --- a/src/common/config/config.go +++ b/src/common/config/config.go @@ -146,7 +146,7 @@ type config struct { } func init() { - bytes, err := ioutil.ReadFile("../config/config.yaml") + bytes, err := ioutil.ReadFile("config/config.yaml") if err != nil { panic(err) return diff --git a/src/rpc/chat/chat/send_msg.go b/src/rpc/chat/chat/send_msg.go index 21a1a7be8..8a7366a7c 100644 --- a/src/rpc/chat/chat/send_msg.go +++ b/src/rpc/chat/chat/send_msg.go @@ -1,7 +1,7 @@ package rpcChat import ( - "Open_IM/src/api/group" + "Open_IM/internal/api/group" "Open_IM/src/common/config" "Open_IM/src/common/constant" http2 "Open_IM/src/common/http"