修改路由

api/responses/userDoctorResponse/userDoctor.go

@@ -51,9 +51,6 @@ type getUserDoctor struct {
 	DoctorID                    string                                 `json:"doctor_id"`                      // 主键id
 	UserID                      string                                 `json:"user_id"`                        // 用户id
 	UserName                    string                                 `json:"user_name"`                      // 用户名称
-	OpenID                      string                                 `json:"open_id"`                        // 微信open_id
-	UnionID                     string                                 `json:"union_id"`                       // 微信开放平台唯一标识
-	WxSessionKey                string                                 `json:"wx_session_key"`                 // 微信会话密钥
 	Status                      int                                    `json:"status"`                         // 状态（0:禁用 1:正常 2:删除）
 	IDCardStatus                int                                    `json:"idcard_status"`                  // 实名认证状态（0:未认证 1:认证通过 2:认证失败）
 	IdenAuthStatus              int                                    `json:"iden_auth_status"`               // 身份认证状态（0:未认证 1:认证通过 2:审核中 3:认证失败）
@@ -182,7 +179,7 @@ func GetUserDoctorResponse(userDoctor *model.UserDoctor) *getUserDoctor {
 		MultiPointFailReason:      userDoctor.MultiPointFailReason,
 		IsBindBank:                userDoctor.IsBindBank,
 		IsRecommend:               userDoctor.IsRecommend,
-		Avatar:                    config.C.Oss.OssCustomDomainName + "/" + userDoctor.Avatar,
+		Avatar:                    config.C.Oss.OssCustomDomainName + userDoctor.Avatar,
 		DoctorTitle:               userDoctor.DoctorTitle,
 		DepartmentCustomID:        strconv.Itoa(int(userDoctor.DepartmentCustomId)),
 		DepartmentCustomName:      userDoctor.DepartmentCustomName,
@@ -196,6 +193,9 @@ func GetUserDoctorResponse(userDoctor *model.UserDoctor) *getUserDoctor {
 		IsImgWelfareReception:     userDoctor.IsImgWelfareReception,
 		IsImgQuickReception:       userDoctor.IsImgQuickReception,
 		IsPlatformDeepCooperation: userDoctor.IsPlatformDeepCooperation,
+		QrCode:                    config.C.Oss.OssCustomDomainName + userDoctor.QrCode,
+		BeGoodAt:                  userDoctor.BeGoodAt,
+		BriefIntroduction:         userDoctor.BriefIntroduction,
 		CreatedAt:                 userDoctor.CreatedAt,
 		UpdatedAt:                 userDoctor.UpdatedAt,
 		User:                      user,

api/router/router.go

@@ -55,15 +55,11 @@ func Init() *gin.Engine {
 // publicRouter 公开路由-不验证权限
 func publicRouter(r *gin.Engine, api controller.Api) {
 	adminGroup := r.Group("/admin")
-	basicGroup := adminGroup.Group("/basic")
+	// 验证码
-	{
+	adminGroup.GET("/captcha", api.Basic.GetCaptcha)
-		// 验证码
-		basicGroup.GET("captcha", api.Basic.GetCaptcha)
 
-		// 登陆
+	// 登陆
-		basicGroup.POST("login", api.Basic.Login)
+	adminGroup.POST("/login", api.Basic.Login)
-
-	}
 }
 
 // privateRouter 私有路由

api/service/menu.go

@@ -146,6 +146,17 @@ func (r *MenuService) PutMenu(requestMenuId int64, PutMenuRequest requests.PutMe
 	AdminMenuApiDao := dao.AdminMenuApiDao{}
 	AdminApiDao := dao.AdminApiDao{}
 
+	// 获取当前菜单数据
+	adminMenu, _ := AdminMenuDao.GetAdminMenuById(requestMenuId)
+	if adminMenu == nil {
+		return false, errors.New("菜单数据错误")
+	}
+
+	// 判断是否更改菜单类型
+	if adminMenu.MenuType != PutMenuRequest.MenuType {
+		return false, errors.New("如需更改类型，请删除后新增")
+	}
+
 	ParentId, err := strconv.ParseInt(PutMenuRequest.ParentId, 10, 64)
 	if err != nil {
 		return false, errors.New("新增失败")
@@ -159,12 +170,6 @@ func (r *MenuService) PutMenu(requestMenuId int64, PutMenuRequest requests.PutMe
 		}
 	}
 
-	// 获取当前菜单数据
-	adminMenu, _ := AdminMenuDao.GetAdminMenuById(requestMenuId)
-	if adminMenu == nil {
-		return false, errors.New("菜单数据错误")
-	}
-
 	// 开始事务
 	tx := global.Db.Begin()
 	defer func() {