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

controllers/sysuser/sysuser.go

 	}
 	c.ResponseJSON("删除成功")
 }
+func (c *SysuserController) BindUser() {
+	userId := c.GetString(":userId")
+	orgId := c.GetString(":orgId")
+	err := c.dao.BindUser(userId, orgId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("綁定成功")
+}
+func (c *SysuserController) UnbindUser() {
+	userId := c.GetString(":userId")
+	orgId := ""
+	err := c.dao.BindUser(userId, orgId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("解绑成功")
+}
+
+func (c *SysuserController) ChangePassword() {
+	userId := c.GetString(":userId")
+	pwd := c.GetString(":pwd")
+	err := c.dao.ChangePassword(userId, pwd)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("修改成功")
+}
+func (c *SysuserController) GetCurrentUser() {
+	user := c.Context.Get("user").(*model.SysUser)
+	c.ResponseJSON(user)
+}

controllers/wechatimg/wechatimt.go

 	c.ResponseJSON("上传成功")
 
 }
+func (c *WechatImgController) DeleteImg() {
+	mediaId := c.GetString("mediaId")
+	err := c.dao.DeleteImg(mediaId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("删除成功")
+}

models/sysuser/sysuser.go

 	"wechat-conf/models/model"
 	"wechat-conf/utils"
 
-	"github.com/astaxie/beego"
-
 	"github.com/go-xorm/xorm"
 )
 
 	sql := `SELECT a.*,b.org_name from sys_user a left join sys_org b on a.org_id = b.org_id
 	 WHERE a.status >` + strconv.Itoa(models.STATUS_DEL) + `
 	order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
-	beego.Error(sql)
 	err := m.db.Sql(sql).Find(&user)
 	return user, err
 
 }
 func (m *SysuserDAO) AddUser(user model.SysUser) (*model.SysUser, error) {
 	user.CreateDate = time.Now()
+	user.UserId = utils.GetGUID()
 	user.Status = models.STATUS_NORMAL
 	_, err := m.db.Insert(user)
 	return &user, err
 	return err
 }
 
+func (m *SysuserDAO) ChangePassword(userId, pwd string) error {
+	var user = model.SysUser{
+		UserId: userId,
+		Pwd:    pwd,
+	}
+	var cols = []string{
+		"pwd",
+	}
+	_, err := m.db.Cols(cols...).Where("user_id=?", user.UserId).Update(user)
+	return err
+}
+
 func (m *SysuserDAO) GetAppIdByOrgId(orgId string) (string, error) {
 	var config []model.SysWechatConf
 	sql := `SELECT

routers/router.go

 	"wechat-conf/controllers/sysorg"
 	"wechat-conf/controllers/sysuser"
 	"wechat-conf/controllers/wechatimg"
+	"wechat-conf/controllers/wechatmenu"
 
 	"github.com/astaxie/beego"
 )
 			beego.NSRouter("/autoreply/:autoreplyId", &autoreply.AutoreplyController{}, "delete:DeleteAutoReply"),
 			// 图片资源
 			beego.NSRouter("/wechatimg", &wechatimg.WechatImgController{}, "get:GetWechatImgList"),
-			beego.NSRouter("/wechatimg/sync", &wechatimg.WechatImgController{}, "get:SyncWechatImg"),
+			beego.NSRouter("/wechatimg/sync", &wechatimg.WechatImgController{}, "put:SyncWechatImg"),
 			beego.NSRouter("/wechatimg", &wechatimg.WechatImgController{}, "post:AddNewImg"),
+			beego.NSRouter("/wechatimg/:mediaId", &wechatimg.WechatImgController{}, "delete:DeleteImg"),
 			// 用户管理
 			beego.NSRouter("/sysuser", &sysuser.SysuserController{}, "get:GetUserList"),
 			beego.NSRouter("/sysuser/:userId", &sysuser.SysuserController{}, "get:GetUserById"),
 			beego.NSRouter("/sysuser", &sysuser.SysuserController{}, "post:SaveUser"),
 			beego.NSRouter("/sysuser", &sysuser.SysuserController{}, "put:SaveUser"),
 			beego.NSRouter("/sysuser/:userId", &sysuser.SysuserController{}, "delete:DeleteUser"),
+			beego.NSRouter("/sysuser/bind/:userId/:orgId", &sysuser.SysuserController{}, "put:BindUser"),
+			beego.NSRouter("/sysuser/unbind/:userId", &sysuser.SysuserController{}, "put:UnbindUser"),
+			beego.NSRouter("/sysuser/pwd/:userId/:pwd", &sysuser.SysuserController{}, "put:ChangePassword"),
+			beego.NSRouter("/sysuser/current", &sysuser.SysuserController{}, "get:GetCurrentUser"),
 			// 项目管理
 			beego.NSRouter("/sysorg", &sysorg.SysorgController{}, "get:GetOrgList"),
 			beego.NSRouter("/sysorg", &sysorg.SysorgController{}, "post:AddOrg"),
 			// 文件
 			beego.NSRouter("/file", &controllers.BaseController{}, "post:FileUpload"),
 			beego.NSRouter("/file/base64", &controllers.BaseController{}, "post:UploadBase64Image"),
+			// 微信菜单
+			beego.NSRouter("/wechatmenu", &wechatmenu.MenuController{}, "get:GetMenuList"),
+			beego.NSRouter("/wechatmenu", &wechatmenu.MenuController{}, "put:RefreshMenu"),
 		),
 
 		beego.NSRouter("/ticket", &controllers.WechatController{}, "post:ComponentPush"),

service/sysorg/sysorg.go

 	"errors"
 	"wechat-conf/models/model"
 	"wechat-conf/models/sysorg"
+	"wechat-conf/models/wechatmenu"
 	"wechat-conf/service"
 	"wechat-conf/utils"
 )
 
 // SysorgServ 用户
 type SysorgServ struct {
-	ctx *utils.Context
-	dao *sysorg.SysorgDAO
+	ctx  *utils.Context
+	dao  *sysorg.SysorgDAO
+	mdao *wechatmenu.WechatMenuDAO
 }
 
 // NewSysorgServ 初始化
 func NewSysorgServ(ctx *utils.Context) *SysorgServ {
 	return &SysorgServ{
-		ctx: ctx,
-		dao: sysorg.NewSysorgDAO(ctx),
+		ctx:  ctx,
+		dao:  sysorg.NewSysorgDAO(ctx),
+		mdao: wechatmenu.NewWechatMenuDAO(ctx),
 	}
 }
 func (s *SysorgServ) GetOrgList(page, pageSize int) (map[string]interface{}, error) {
 		utils.LogError("新增项目失败: " + err.Error())
 		return nil, errors.New("新增项目失败")
 	}
+	var wechatmenu = model.TaWechatMenu{
+		OrgId:            newOrg.OrgId,
+		WechatConfigJson: "",
+	}
+	_, err = s.mdao.AddWechatMenu(wechatmenu)
+	if err != nil {
+		utils.LogError("新增项目失败: " + err.Error())
+		return nil, errors.New("新增项目失败")
+	}
 	return newOrg, nil
 }
 func (s *SysorgServ) AuthOrg(org model.SysOrg) error {

service/sysuser/sysuser.go

 	}
 	return newUser, nil
 }
+func (s *SysuserServ) BindUser(userId, orgId string) error {
+	err := s.dao.BindUserToOrg(userId, orgId)
+	if err != nil {
+		utils.LogError("綁定用户失败: " + err.Error())
+		return errors.New("綁定用户失败")
+	}
+	return nil
+
+}
 func (s *SysuserServ) DeleteUser(userId string) error {
 	err := s.dao.DeleteUser(userId)
 	if err != nil {
 	}
 	return appId, nil
 }
+
+func (s *SysuserServ) ChangePassword(userId, pwd string) error {
+	err := s.dao.ChangePassword(userId, pwd)
+	if err != nil {
+		utils.LogError("修改密码失败: " + err.Error())
+		return errors.New("修改密码失败")
+	}
+	return nil
+
+}

service/wechatimg/wechatimg.go

 	}
 	return nil
 }
+func (s *WechatImgServ) DeleteImg(mediaId string) error {
+	err := s.dao.DeleteWechatImg(mediaId)
+	if err != nil {
+		utils.LogError("删除图片失败: " + err.Error())
+		return errors.New("删除图片失败")
+	}
+	return nil
+}