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

controllers/sysorg/sysorg.go

@@ -2,6 +2,7 @@ package sysorg
 
 import (
 	"wechat-conf/controllers"
+	"wechat-conf/models/model"
 	"wechat-conf/service/sysorg"
 )
 
@@ -27,6 +28,36 @@ func (c *SysorgController) GetOrgList() {
 	c.ResponseJSON(list)
 }
 
-// func (c *SysorgController)AddOrg(){
-// 	org:=model.
-// }
+func (c *SysorgController) AddOrg() {
+	org := model.SysOrg{}
+	if err := c.ParseForm(&org); err != nil {
+		c.ResponseError(err)
+	}
+	newOrg, err := c.dao.AddOrg(org)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(newOrg)
+}
+
+func (c *SysorgController) AuthOrg() {
+	org := model.SysOrg{}
+	if err := c.ParseForm(&org); err != nil {
+		c.ResponseError(err)
+	}
+	err := c.dao.AuthOrg(org)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("授权成功")
+}
+
+func (c *SysorgController) DeleteOrg() {
+	orgId := c.GetString(":orgId")
+	err := c.dao.DeleteOrg(orgId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("删除成功")
+
+}

models/model/sys_component_conf.go

@@ -0,0 +1,9 @@
+package model
+
+type SysComponentConf struct {
+	Wxid   string `xorm:"VARCHAR(20)"`
+	Appid  string `xorm:"VARCHAR(50)"`
+	Aeskey string `xorm:"VARCHAR(100)"`
+	Secret string `xorm:"VARCHAR(100)"`
+	Ticket string `xorm:"VARCHAR(100)"`
+}

models/sysuser/sysuser.go

@@ -7,6 +7,8 @@ import (
 	"wechat-conf/models/model"
 	"wechat-conf/utils"
 
+	"github.com/astaxie/beego"
+
 	"github.com/go-xorm/xorm"
 )
 
@@ -24,10 +26,17 @@ func NewSysuserDAO(ctx *utils.Context) *SysuserDAO {
 	}
 }
 
-func (m *SysuserDAO) GetSysuserList(page, pageSize int) ([]model.SysUser, error) {
-	var user []model.SysUser
-	sql := `SELECT * from sys_user WHERE status >` + strconv.Itoa(models.STATUS_DEL) + `
+type User struct {
+	model.SysUser `xorm:"extends"`
+	OrgName       string
+}
+
+func (m *SysuserDAO) GetSysuserList(page, pageSize int) ([]User, error) {
+	var user []User
+	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
 

routers/router.go

@@ -11,6 +11,7 @@ import (
 	"wechat-conf/controllers"
 	"wechat-conf/controllers/autoreply"
 	"wechat-conf/controllers/menu"
+	"wechat-conf/controllers/sysorg"
 	"wechat-conf/controllers/sysuser"
 	"wechat-conf/controllers/wechatimg"
 
@@ -32,7 +33,7 @@ func RouteInit() {
 			beego.NSRouter("/autoreply/:autoreplyId", &autoreply.AutoreplyController{}, "get:GetAutoReplyById"),
 			beego.NSRouter("/autoreply", &autoreply.AutoreplyController{}, "post:SaveAutoreply"),
 			beego.NSRouter("/autoreply", &autoreply.AutoreplyController{}, "put:SaveAutoreply"),
-			beego.NSRouter("/autoreply", &autoreply.AutoreplyController{}, "delete:DeleteAutoReply"),
+			beego.NSRouter("/autoreply/:autoreplyId", &autoreply.AutoreplyController{}, "delete:DeleteAutoReply"),
 			// 图片资源
 			beego.NSRouter("/wechatimg", &wechatimg.WechatImgController{}, "get:GetWechatImgList"),
 			beego.NSRouter("/wechatimg/sync", &wechatimg.WechatImgController{}, "get:SyncWechatImg"),
@@ -42,7 +43,15 @@ func RouteInit() {
 			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", &sysuser.SysuserController{}, "delete:DeleteUser"),
+			beego.NSRouter("/sysuser/:userId", &sysuser.SysuserController{}, "delete:DeleteUser"),
+			// 项目管理
+			beego.NSRouter("/sysorg", &sysorg.SysorgController{}, "get:GetOrgList"),
+			beego.NSRouter("/sysorg", &sysorg.SysorgController{}, "post:AddOrg"),
+			beego.NSRouter("/sysorg", &sysorg.SysorgController{}, "put:AuthOrg"),
+			beego.NSRouter("/sysorg/:orgId", &sysorg.SysorgController{}, "delete:DeleteOrg"),
+			// 文件
+			beego.NSRouter("/file", &controllers.BaseController{}, "post:FileUpload"),
+			beego.NSRouter("/file/base64", &controllers.BaseController{}, "post:UploadBase64Image"),
 		),
 
 		beego.NSRouter("/ticket", &controllers.WechatController{}, "post:ComponentPush"),