Merge remote-tracking branch 'origin/master'

# Conflicts:
#	internal/controller/task/task_v1_ranking.go

internal/model/user.go

@@ -133,3 +133,38 @@ type GetPhoneCodeIn struct {
 type GetPhoneCodeOut struct {
 	Success bool
 }
+
+type UserGamelifeCache struct {
+	Aes   string `json:"aes"`
+	IV    string `json:"iv"`
+	Token string `json:"token"`
+}
+
+type UserBoundResult struct {
+	Result  bool     `json:"result"`
+	Nick    string   `json:"nick"`
+	Ctime   uint32   `json:"ctime"`
+	Utype   int8     `json:"utype"`
+	AppName []string `json:"app_name"`
+}
+type UserBoundUrlIn struct {
+	PopenId  string
+	BindType int
+	AppName  string
+	Nickname string
+	IsBound  bool
+}
+
+type UserBoundUrlOut struct {
+	Url string
+}
+type UserUnBoundUrlOut struct {
+	Url string
+}
+
+type UserBoundInfoIn struct {
+	PopenId string
+}
+type UserBoundInfoOut struct {
+	IsBound bool
+}