Merge branch 'feature/cp-new' into feature/3.9.0

cv/cp_cv/cp.go

@@ -4,12 +4,7 @@ import "hilo-user/cv/user_cv"
 
 // cp信息
 type CvCp struct {
-	CpInfo          CvCpInfoAll   `json:"cpInfo"`          // cp信息
-	CpLevel         CvCpLevel     `json:"cpLevel"`         // cp等级
-	MyPrivilegeList []CvPrivilege `json:"myPrivilegeList"` // 等级特权
-}
-
-type CvCpInfoAll struct {
-	UserInfo   *user_cv.CvUserBase `json:"userInfo,omitempty"`   // 用户信息
-	CpUserInfo *user_cv.CvUserBase `json:"cpUserInfo,omitempty"` // cp用户信息
+	CpUserInfo      *user_cv.CvUserBase `json:"cpUserInfo"`      // cp用户信息
+	CpLevel         CvCpLevel           `json:"cpLevel"`         // cp等级
+	MyPrivilegeList []CvPrivilege       `json:"myPrivilegeList"` // 等级特权
 }

route/user_r/inner.go

@@ -151,10 +151,7 @@ func GetUserCp(c *gin.Context) (*mycontext.MyContext, error) {
 	}
 	// 返回值
 	response = cp_cv.CvCp{
-		CpInfo: cp_cv.CvCpInfoAll{
-			//UserInfo:   userBases[userId],
-			CpUserInfo: userBases[cpUserId],
-		},
+		CpUserInfo: userBases[cpUserId],
 		CpLevel: cp_cv.CvCpLevel{
 			Level: cpLevel,
 		},