Merge branch 'master' of http://git.ycjcjy.com/default/wechat-conf

controllers/file.go

@@ -22,6 +22,16 @@ func (c *BaseController) FileUpload() {
 	})
 }
 
+func (c *BaseController) FileUploadMatrial() (string, error) {
+	file, err := c.uploadFileToOSS("media")
+	if err != nil {
+		utils.LogError("上传图片失败: " + err.Error())
+		return "", errors.New("上传图片失败")
+	}
+
+	return file, nil
+}
+
 func (c *BaseController) uploadFileToOSS(field string) (string, error) {
 	aliConf, ok := c.Configer[AliYunConf]
 	if !ok {

controllers/wechatimg/wechatimt.go

@@ -158,6 +158,12 @@ func (c *WechatImgController) AddNewImg() {
 	if err != nil {
 		c.ResponseError(err)
 	}
+	url, err := c.BaseController.FileUploadMatrial()
+	if err != nil {
+		c.ResponseError(err)
+	}
+	utils.LogInfo("↓↓↓↓_________________________↓↓↓↓ali OSS img url(upload)↓↓↓↓___________________↓↓↓↓")
+	utils.LogInfo(url)
 	user := c.Context.Get("user").(*model.SysUser)
 
 	appId, err := c.sdao.GetAppIdByOrgId(user.OrgId)
@@ -177,13 +183,14 @@ func (c *WechatImgController) AddNewImg() {
 		UpdateTime: time.Now(),
 		OrgId:      user.OrgId,
 	}
+	img.Url = url
 	err = c.dao.AddWechatImg(img)
 	if err != nil {
 		c.ResponseError(err)
 	}
 	c.ResponseJSON(map[string]interface{}{
 		"media_id": img.MediaId,
-		"url":      img.Url,
+		"url":      url,
 	})
 
 }

controllers/wechatmenu/wechatmenu.go

@@ -127,6 +127,12 @@ func (c *MenuController) GetMenuList() {
 			c.ResponseError(err)
 		}
 	}
+	utils.LogInfo("↓↓↓↓_________________________↓↓↓↓get menu(upload)↓↓↓↓___________________↓↓↓↓")
+	utils.LogInfo(menu)
+	utils.LogInfo("↓↓↓↓_________________________↓↓↓↓get keyList(upload)↓↓↓↓___________________↓↓↓↓")
+	utils.LogInfo(keyList)
+	utils.LogInfo("↓↓↓↓_________________________↓↓↓↓get imgList(upload)↓↓↓↓___________________↓↓↓↓")
+	utils.LogInfo(imgList)
 	c.ResponseJSON(map[string]interface{}{
 		"menu":    menu,
 		"keyList": keyList,
@@ -153,6 +159,8 @@ func (c *MenuController) RefreshMenu() {
 	}
 	wechatmenu := menu.Menu.Button
 	beego.Error(wechatmenu)
+	utils.LogInfo("↓↓↓↓_________________________↓↓↓↓wechamenu from front(upload)↓↓↓↓___________________↓↓↓↓")
+	utils.LogInfo(wechatmenu)
 	for i := 0; i < len(wechatmenu); i++ {
 		if wechatmenu[i].Type == "text" {
 			wechatmenu[i].Type = "click"
@@ -186,6 +194,8 @@ func (c *MenuController) RefreshMenu() {
 		}
 	}
 	beego.Error(wechatmenu)
+	utils.LogInfo("↓↓↓↓_________________________↓↓↓↓wechamenu after process(upload)↓↓↓↓___________________↓↓↓↓")
+	utils.LogInfo(wechatmenu)
 	var upwechat WechatMenu
 	upwechat.Button = wechatmenu
 	menuData, err := json.Marshal(upwechat)
@@ -193,6 +203,8 @@ func (c *MenuController) RefreshMenu() {
 		c.ResponseError(err)
 	}
 	beego.Error(string(menuData))
+	utils.LogInfo("↓↓↓↓_________________________↓↓↓↓wechamenu when upload(upload)↓↓↓↓___________________↓↓↓↓")
+	utils.LogInfo(string(menuData))
 	err = c.dao.UpdateWechatMenu(string(menuData), user.OrgId)
 	if err != nil {
 		c.ResponseError(err)

models/sysorg/sysorg.go

@@ -79,3 +79,13 @@ func (m *SysorgDAO) UnAutoOrg(confid string) error {
 	_, err := m.db.Cols(cols...).Where("wechat_id = ?", confid).Update(org)
 	return err
 }
+
+func (m *SysorgDAO) IsOrgBinded(orgId string) (bool, error) {
+	var user []model.SysUser
+	sql := `select * from sys_user WHERE org_id = '` + orgId + `'`
+	err := m.db.Sql(sql).Find(&user)
+	if len(user) > 0 {
+		return false, err
+	}
+	return true, err
+}

models/wechatimg/wechatimg.go

@@ -68,3 +68,8 @@ func (m *WechatImgDAO) DeleteBatchByOrgId(orgId string) error {
 	_, err := m.db.Delete(&model.TaWechatImg{OrgId: orgId})
 	return err
 }
+func (m *WechatImgDAO) IsExist(mediaId string) (bool, error) {
+	flag, err := m.db.Exist(model.TaWechatImg{MediaId: mediaId})
+	return flag, err
+
+}

service/sysuser/sysuser.go

@@ -3,6 +3,7 @@ package sysuser
 import (
 	"errors"
 	"wechat-conf/models/model"
+	"wechat-conf/models/sysorg"
 	"wechat-conf/models/sysuser"
 	"wechat-conf/service"
 	"wechat-conf/utils"
@@ -12,15 +13,17 @@ import (
 
 // SysuserServ 用户
 type SysuserServ struct {
-	ctx *utils.Context
-	dao *sysuser.SysuserDAO
+	ctx    *utils.Context
+	dao    *sysuser.SysuserDAO
+	orgdao *sysorg.SysorgDAO
 }
 
 // NewSysuserServ 初始化
 func NewSysuserServ(ctx *utils.Context) *SysuserServ {
 	return &SysuserServ{
-		ctx: ctx,
-		dao: sysuser.NewSysuserDAO(ctx),
+		ctx:    ctx,
+		dao:    sysuser.NewSysuserDAO(ctx),
+		orgdao: sysorg.NewSysorgDAO(ctx),
 	}
 }
 
@@ -80,11 +83,21 @@ func (s *SysuserServ) SaveUser(user model.SysUser) (*model.SysUser, error) {
 	return newUser, nil
 }
 func (s *SysuserServ) BindUser(userId, orgId string) error {
-	err := s.dao.BindUserToOrg(userId, orgId)
+	flag, err := s.orgdao.IsOrgBinded(orgId)
 	if err != nil {
 		utils.LogError("綁定用户失败: " + err.Error())
 		return errors.New("綁定用户失败")
 	}
+	if flag {
+		err := s.dao.BindUserToOrg(userId, orgId)
+		if err != nil {
+			utils.LogError("綁定用户失败: " + err.Error())
+			return errors.New("綁定用户失败")
+		}
+	} else {
+		return errors.New("该项目已绑定用户")
+	}
+
 	return nil
 
 }

service/wechatimg/wechatimg.go

@@ -36,11 +36,11 @@ func (s *WechatImgServ) AddWechatImg(img model.TaWechatImg) error {
 }
 
 func (s *WechatImgServ) SyncWechatImg(data interface{}, orgId string) error {
-	err := s.dao.DeleteBatchByOrgId(orgId)
-	if err != nil {
-		utils.LogError("同步图片失败: " + err.Error())
-		return errors.New("同步图片失败")
-	}
+	// err := s.dao.DeleteBatchByOrgId(orgId)
+	// if err != nil {
+	// 	utils.LogError("同步图片失败: " + err.Error())
+	// 	return errors.New("同步图片失败")
+	// }
 
 	imgs := data.([]interface{})
 	var wechatimgs []model.TaWechatImg
@@ -55,10 +55,17 @@ func (s *WechatImgServ) SyncWechatImg(data interface{}, orgId string) error {
 		// wechat.UpdateTime = val["update_time"]
 		wechat.Status = models.STATUS_NORMAL
 		wechat.CreateDate = time.Now()
-		wechatimgs = append(wechatimgs, wechat)
+		flag, err := s.dao.IsExist(wechat.MediaId)
+		if err != nil {
+			utils.LogError("同步图片失败: " + err.Error())
+			return errors.New("同步图片失败")
+		}
+		if !flag {
+			wechatimgs = append(wechatimgs, wechat)
+		}
 	}
 
-	err = s.dao.AddWechatImgs(wechatimgs)
+	err := s.dao.AddWechatImgs(wechatimgs)
 	if err != nil {
 		utils.LogError("同步图片失败: " + err.Error())
 		return errors.New("同步图片失败")