胡轶钦 пре 6 година
родитељ
комит
d8dbf8c72c
6 измењених фајлова са 70 додато и 7 уклоњено
  1. 2
    2
      controllers/base.go
  2. 0
    0
      controllers/org/org.go
  3. 32
    0
      controllers/sysorg/sysorg.go
  4. 17
    4
      routers/router.go
  5. 16
    1
      service/sysorg/sysorg.go
  6. 3
    0
      service/user/user.go

+ 2
- 2
controllers/base.go Прегледај датотеку

@@ -86,8 +86,8 @@ func (c *BaseController) ResponseData(data interface{}, msg interface{}, code in
86 86
 		// 生成新 token
87 87
 		// c.CreateNewToken()
88 88
 
89
-		token := c.Context.Get("token").(string)
90
-		c.Ctx.Output.Header(utils.TokenHeader, utils.TokenSchema+" "+token)
89
+		//token := c.Context.Get("token").(string)
90
+		//c.Ctx.Output.Header(utils.TokenHeader, utils.TokenSchema+" "+token)
91 91
 	}
92 92
 
93 93
 	c.destroyContext(status < http.StatusMultipleChoices)

+ 0
- 0
controllers/org/org.go Прегледај датотеку


+ 32
- 0
controllers/sysorg/sysorg.go Прегледај датотеку

@@ -0,0 +1,32 @@
1
+package sysorg
2
+
3
+import (
4
+	"wechat-conf/controllers"
5
+	"wechat-conf/service/sysorg"
6
+)
7
+
8
+// SysorgController 信息
9
+type SysorgController struct {
10
+	dao *sysorg.SysorgServ
11
+	controllers.BaseController
12
+}
13
+
14
+// Constructor 初始化 Controller
15
+// @Title Constructor
16
+// @Description 初始化 Controller, 系统自动调用
17
+func (c *SysorgController) Constructor() {
18
+	c.dao = sysorg.NewSysorgServ(c.Context)
19
+}
20
+func (c *SysorgController) GetOrgList() {
21
+	page, _ := c.GetInt("page")
22
+	pageSize, _ := c.GetInt("pagesize")
23
+	list, err := c.dao.GetOrgList(page, pageSize)
24
+	if err != nil {
25
+		c.ResponseError(err)
26
+	}
27
+	c.ResponseJSON(list)
28
+}
29
+
30
+// func (c *SysorgController)AddOrg(){
31
+// 	org:=model.
32
+// }

+ 17
- 4
routers/router.go Прегледај датотеку

@@ -11,6 +11,8 @@ import (
11 11
 	"wechat-conf/controllers"
12 12
 	"wechat-conf/controllers/autoreply"
13 13
 	"wechat-conf/controllers/menu"
14
+	"wechat-conf/controllers/sysuser"
15
+	"wechat-conf/controllers/wechatimg"
14 16
 
15 17
 	"github.com/astaxie/beego"
16 18
 )
@@ -20,15 +22,26 @@ func RouteInit() {
20 22
 	ns := beego.NewNamespace("/api",
21 23
 		// 解决跨域时 先发送 options 问题
22 24
 		beego.NSRouter("*", &controllers.BaseController{}, "options:Options"),
25
+		// 登陆
26
+		beego.NSRouter("/user/login", &controllers.UserController{}, "post:Login"),
23 27
 		// 菜单
24 28
 		beego.NSRouter("/menu", &menu.MenuController{}, "get:GetMenuList"),
25 29
 		// 自动回复
26 30
 		beego.NSRouter("/autoreply", &autoreply.AutoreplyController{}, "get:GetAutoReplyList"),
27 31
 		beego.NSRouter("/autoreply/:autoreplyId", &autoreply.AutoreplyController{}, "get:GetAutoReplyById"),
28
-		beego.NSRouter("/autoreply/", &autoreply.AutoreplyController{}, "post:SaveAutoreply"),
29
-		beego.NSRouter("/autoreply/", &autoreply.AutoreplyController{}, "put:SaveAutoreply"),
30
-		beego.NSRouter("/autoreply/", &autoreply.AutoreplyController{}, "delete:DeleteAutoReply"),
31
-		//图片资源
32
+		beego.NSRouter("/autoreply", &autoreply.AutoreplyController{}, "post:SaveAutoreply"),
33
+		beego.NSRouter("/autoreply", &autoreply.AutoreplyController{}, "put:SaveAutoreply"),
34
+		beego.NSRouter("/autoreply", &autoreply.AutoreplyController{}, "delete:DeleteAutoReply"),
35
+		// 图片资源
36
+		beego.NSRouter("/wechatimg", &wechatimg.WechatImgController{}, "get:GetWechatImgList"),
37
+		beego.NSRouter("/wechatimg/sync", &wechatimg.WechatImgController{}, "get:SyncWechatImg"),
38
+		beego.NSRouter("/wechatimg", &wechatimg.WechatImgController{}, "post:AddNewImg"),
39
+		// 用户管理
40
+		beego.NSRouter("/sysuser", &sysuser.SysuserController{}, "get:GetUserList"),
41
+		beego.NSRouter("/sysuser/:userId", &sysuser.SysuserController{}, "get:GetUserById"),
42
+		beego.NSRouter("/sysuser", &sysuser.SysuserController{}, "post:SaveUser"),
43
+		beego.NSRouter("/sysuser", &sysuser.SysuserController{}, "put:SaveUser"),
44
+		beego.NSRouter("/sysuser", &sysuser.SysuserController{}, "delete:DeleteUser"),
32 45
 
33 46
 		beego.NSRouter("/ticket", &controllers.WechatController{}, "post:ComponentPush"),
34 47
 		beego.NSRouter("/ticket", &controllers.WechatController{}, "get:ComponentPush"),

+ 16
- 1
service/sysorg/sysorg.go Прегледај датотеку

@@ -50,4 +50,19 @@ func (s *SysorgServ) AddOrg(org model.SysOrg) (*model.SysOrg, error) {
50 50
 	}
51 51
 	return newOrg, nil
52 52
 }
53
-func (s *SysorgServ)AuthOrg()
53
+func (s *SysorgServ) AuthOrg(org model.SysOrg) error {
54
+	err := s.dao.AuthOrg(org)
55
+	if err != nil {
56
+		utils.LogError("授权项目失败: " + err.Error())
57
+		return errors.New("授权项目失败")
58
+	}
59
+	return nil
60
+}
61
+func (s *SysorgServ) DeleteOrg(orgId string) error {
62
+	err := s.dao.DeleteOrg(orgId)
63
+	if err != nil {
64
+		utils.LogError("删除项目失败: " + err.Error())
65
+		return errors.New("删除项目失败")
66
+	}
67
+	return nil
68
+}

+ 3
- 0
service/user/user.go Прегледај датотеку

@@ -7,6 +7,8 @@ import (
7 7
 	"wechat-conf/models/user"
8 8
 	"wechat-conf/utils"
9 9
 
10
+	"github.com/astaxie/beego"
11
+
10 12
 	"github.com/yl10/kit/encrypt"
11 13
 )
12 14
 
@@ -60,6 +62,7 @@ func (s *UserServ) UpdatePassword(userID, newPass string) error {
60 62
 
61 63
 // ValidatePassword 验证密码是否正确
62 64
 func (s *UserServ) ValidatePassword(user *model.SysUser, password string) bool {
65
+	beego.Error(encrypt.Md5(password, user.UserId))
63 66
 	return user.Pwd == encrypt.Md5(password, user.UserId)
64 67
 }
65 68