V2

V2/controllers/admin.go

@@ -0,0 +1,215 @@
+/**********************************************
+** @Des: 管理员
+** @Author: haodaquan
+** @Date:   2017-09-16 14:17:37
+** @Last Modified by:   haodaquan
+** @Last Modified time: 2017-09-17 11:14:07
+***********************************************/
+package controllers
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/astaxie/beego"
+	"github.com/george518/PPGo_Job2/libs"
+	"github.com/george518/PPGo_Job2/models"
+)
+
+type AdminController struct {
+	BaseController
+}
+
+func (self *AdminController) List() {
+	self.Data["pageTitle"] = "管理员管理"
+	self.display()
+	//self.TplName = "admin/list.html"
+}
+
+func (self *AdminController) Add() {
+	self.Data["pageTitle"] = "新增管理员"
+
+	// 角色
+	filters := make([]interface{}, 0)
+	filters = append(filters, "status", 1)
+	result, _ := models.RoleGetList(1, 1000, filters...)
+	list := make([]map[string]interface{}, len(result))
+	for k, v := range result {
+		row := make(map[string]interface{})
+		row["id"] = v.Id
+		row["role_name"] = v.RoleName
+		list[k] = row
+	}
+
+	self.Data["role"] = list
+
+	self.display()
+}
+
+func (self *AdminController) Edit() {
+	self.Data["pageTitle"] = "编辑管理员"
+
+	id, _ := self.GetInt("id", 0)
+	Admin, _ := models.AdminGetById(id)
+	row := make(map[string]interface{})
+	row["id"] = Admin.Id
+	row["login_name"] = Admin.LoginName
+	row["real_name"] = Admin.RealName
+	row["phone"] = Admin.Phone
+	row["email"] = Admin.Email
+	row["role_ids"] = Admin.RoleIds
+	self.Data["admin"] = row
+
+	role_ids := strings.Split(Admin.RoleIds, ",")
+
+	filters := make([]interface{}, 0)
+	filters = append(filters, "status", 1)
+	result, _ := models.RoleGetList(1, 1000, filters...)
+	list := make([]map[string]interface{}, len(result))
+	for k, v := range result {
+		row := make(map[string]interface{})
+		row["checked"] = 0
+		for i := 0; i < len(role_ids); i++ {
+			role_id, _ := strconv.Atoi(role_ids[i])
+			if role_id == v.Id {
+				row["checked"] = 1
+			}
+			fmt.Println(role_ids[i])
+		}
+		row["id"] = v.Id
+		row["role_name"] = v.RoleName
+		list[k] = row
+	}
+	self.Data["role"] = list
+	self.display()
+}
+
+func (self *AdminController) AjaxSave() {
+	Admin_id, _ := self.GetInt("id")
+	if Admin_id == 0 {
+		Admin := new(models.Admin)
+		Admin.LoginName = strings.TrimSpace(self.GetString("login_name"))
+		Admin.RealName = strings.TrimSpace(self.GetString("real_name"))
+		Admin.Phone = strings.TrimSpace(self.GetString("phone"))
+		Admin.Email = strings.TrimSpace(self.GetString("email"))
+		Admin.RoleIds = strings.TrimSpace(self.GetString("roleids"))
+		Admin.UpdateTime = time.Now().Unix()
+		Admin.UpdateId = self.userId
+		Admin.Status = 1
+
+		// 检查登录名是否已经存在
+		_, err := models.AdminGetByName(Admin.LoginName)
+
+		if err == nil {
+			self.ajaxMsg("登录名已经存在", MSG_ERR)
+		}
+		//新增
+		pwd, salt := libs.Password(4, "")
+		Admin.Password = pwd
+		Admin.Salt = salt
+		Admin.CreateTime = time.Now().Unix()
+		Admin.CreateId = self.userId
+		if _, err := models.AdminAdd(Admin); err != nil {
+			self.ajaxMsg(err.Error(), MSG_ERR)
+		}
+		self.ajaxMsg("", MSG_OK)
+	}
+
+	Admin, _ := models.AdminGetById(Admin_id)
+	//修改
+	Admin.Id = Admin_id
+	Admin.UpdateTime = time.Now().Unix()
+	Admin.UpdateId = self.userId
+	Admin.LoginName = strings.TrimSpace(self.GetString("login_name"))
+	Admin.RealName = strings.TrimSpace(self.GetString("real_name"))
+	Admin.Phone = strings.TrimSpace(self.GetString("phone"))
+	Admin.Email = strings.TrimSpace(self.GetString("email"))
+	Admin.RoleIds = strings.TrimSpace(self.GetString("roleids"))
+	Admin.UpdateTime = time.Now().Unix()
+	Admin.UpdateId = self.userId
+	Admin.Status = 1
+
+	resetPwd, _ := self.GetInt("reset_pwd")
+	if resetPwd == 1 {
+		pwd, salt := libs.Password(4, "")
+		Admin.Password = pwd
+		Admin.Salt = salt
+	}
+
+	//普通管理员不可修改超级管理员资料
+	if self.userId != 1 && Admin.Id == 1 {
+		self.ajaxMsg("不可修改超级管理员资料", MSG_ERR)
+	}
+	if err := Admin.Update(); err != nil {
+		self.ajaxMsg(err.Error(), MSG_ERR)
+	}
+	self.ajaxMsg(strconv.Itoa(resetPwd), MSG_OK)
+}
+
+func (self *AdminController) AjaxDel() {
+
+	Admin_id, _ := self.GetInt("id")
+	status := strings.TrimSpace(self.GetString("status"))
+	if Admin_id == 1 {
+		self.ajaxMsg("超级管理员不允许操作", MSG_ERR)
+	}
+
+	Admin_status := 0
+	if status == "enable" {
+		Admin_status = 1
+	}
+	Admin, _ := models.AdminGetById(Admin_id)
+	Admin.UpdateTime = time.Now().Unix()
+	Admin.Status = Admin_status
+	Admin.Id = Admin_id
+
+	if err := Admin.Update(); err != nil {
+		self.ajaxMsg(err.Error(), MSG_ERR)
+	}
+	self.ajaxMsg("操作成功", MSG_OK)
+}
+
+func (self *AdminController) Table() {
+	//列表
+	page, err := self.GetInt("page")
+	if err != nil {
+		page = 1
+	}
+	limit, err := self.GetInt("limit")
+	if err != nil {
+		limit = 30
+	}
+
+	realName := strings.TrimSpace(self.GetString("realName"))
+
+	StatusText := make(map[int]string)
+	StatusText[0] = "<font color='red'>禁用</font>"
+	StatusText[1] = "正常"
+
+	self.pageSize = limit
+	//查询条件
+	filters := make([]interface{}, 0)
+	//
+	if realName != "" {
+		filters = append(filters, "real_name__icontains", realName)
+	}
+	result, count := models.AdminGetList(page, self.pageSize, filters...)
+	list := make([]map[string]interface{}, len(result))
+	for k, v := range result {
+		row := make(map[string]interface{})
+		row["id"] = v.Id
+		row["login_name"] = v.LoginName
+		row["real_name"] = v.RealName
+		row["phone"] = v.Phone
+		row["email"] = v.Email
+		row["role_ids"] = v.RoleIds
+		row["create_time"] = beego.Date(time.Unix(v.CreateTime, 0), "Y-m-d H:i:s")
+		row["update_time"] = beego.Date(time.Unix(v.UpdateTime, 0), "Y-m-d H:i:s")
+		row["status"] = v.Status
+		row["status_text"] = StatusText[v.Status]
+		list[k] = row
+	}
+	self.ajaxList("成功", MSG_OK, count, list)
+}

V2/controllers/auth.go

@@ -0,0 +1,118 @@
+/**********************************************
+** @Des: 权限因子
+** @Author: haodaquan
+** @Date:   2017-09-09 16:14:31
+** @Last Modified by:   haodaquan
+** @Last Modified time: 2017-09-17 11:23:40
+***********************************************/
+
+package controllers
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/george518/PPGo_Job2/models"
+)
+
+type AuthController struct {
+	BaseController
+}
+
+func (self *AuthController) Index() {
+
+	self.Data["pageTitle"] = "权限因子"
+	self.display()
+}
+
+func (self *AuthController) List() {
+	self.Data["zTree"] = true //引入ztreecss
+	self.Data["pageTitle"] = "权限因子"
+	self.display()
+}
+
+//获取全部节点
+func (self *AuthController) GetNodes() {
+	filters := make([]interface{}, 0)
+	filters = append(filters, "status", 1)
+	result, count := models.AuthGetList(1, 1000, filters...)
+	list := make([]map[string]interface{}, len(result))
+	for k, v := range result {
+		row := make(map[string]interface{})
+		row["id"] = v.Id
+		row["pId"] = v.Pid
+		row["name"] = v.AuthName
+		row["open"] = true
+		list[k] = row
+	}
+
+	self.ajaxList("成功", MSG_OK, count, list)
+}
+
+//获取一个节点
+func (self *AuthController) GetNode() {
+	id, _ := self.GetInt("id")
+	result, _ := models.AuthGetById(id)
+	// if err == nil {
+	// 	self.ajaxMsg(err.Error(), MSG_ERR)
+	// }
+	row := make(map[string]interface{})
+	row["id"] = result.Id
+	row["pid"] = result.Pid
+	row["auth_name"] = result.AuthName
+	row["auth_url"] = result.AuthUrl
+	row["sort"] = result.Sort
+	row["is_show"] = result.IsShow
+	row["icon"] = result.Icon
+
+	fmt.Println(row)
+
+	self.ajaxList("成功", MSG_OK, 0, row)
+}
+
+//新增或修改
+func (self *AuthController) AjaxSave() {
+	auth := new(models.Auth)
+	auth.UserId = self.userId
+	auth.Pid, _ = self.GetInt("pid")
+	auth.AuthName = strings.TrimSpace(self.GetString("auth_name"))
+	auth.AuthUrl = strings.TrimSpace(self.GetString("auth_url"))
+	auth.Sort, _ = self.GetInt("sort")
+	auth.IsShow, _ = self.GetInt("is_show")
+	auth.Icon = strings.TrimSpace(self.GetString("icon"))
+	auth.UpdateTime = time.Now().Unix()
+
+	auth.Status = 1
+
+	id, _ := self.GetInt("id")
+	if id == 0 {
+		//新增
+		auth.CreateTime = time.Now().Unix()
+		auth.CreateId = self.userId
+		auth.UpdateId = self.userId
+		if _, err := models.AuthAdd(auth); err != nil {
+			self.ajaxMsg(err.Error(), MSG_ERR)
+		}
+	} else {
+		auth.Id = id
+		auth.UpdateId = self.userId
+		if err := auth.Update(); err != nil {
+			self.ajaxMsg(err.Error(), MSG_ERR)
+		}
+	}
+
+	self.ajaxMsg("", MSG_OK)
+}
+
+//删除
+func (self *AuthController) AjaxDel() {
+	id, _ := self.GetInt("id")
+	auth, _ := models.AuthGetById(id)
+	auth.Id = id
+	auth.Status = 0
+	if err := auth.Update(); err != nil {
+		self.ajaxMsg(err.Error(), MSG_ERR)
+	}
+	self.ajaxMsg("", MSG_OK)
+}

V2/controllers/ban.go

@@ -0,0 +1,126 @@
+/************************************************************
+** @Description: controllers
+** @Author: haodaquan
+** @Date:   2018-06-10 19:50
+** @Last Modified by:   haodaquan
+** @Last Modified time: 2018-06-10 19:50
+*************************************************************/
+package controllers
+
+import (
+	"strings"
+	"time"
+
+	"github.com/astaxie/beego"
+	"github.com/george518/PPGo_Job2/models"
+)
+
+type BanController struct {
+	BaseController
+}
+
+func (self *BanController) List() {
+	self.Data["pageTitle"] = "禁用命令管理"
+	self.display()
+}
+
+func (self *BanController) Add() {
+	self.Data["pageTitle"] = "新增禁用命令"
+
+	// 角色
+	filters := make([]interface{}, 0)
+	filters = append(filters, "status", 1)
+	result, _ := models.RoleGetList(1, 1000, filters...)
+	list := make([]map[string]interface{}, len(result))
+	for k, v := range result {
+		row := make(map[string]interface{})
+		row["id"] = v.Id
+		row["role_name"] = v.RoleName
+		list[k] = row
+	}
+
+	self.Data["role"] = list
+
+	self.display()
+}
+
+func (self *BanController) Edit() {
+	self.Data["pageTitle"] = "编辑禁用命令"
+
+	id, _ := self.GetInt("id", 0)
+	ban, _ := models.BanGetById(id)
+	row := make(map[string]interface{})
+	row["id"] = ban.Id
+	row["code"] = ban.Code
+	self.Data["ban"] = row
+	self.display()
+}
+
+func (self *BanController) AjaxSave() {
+	id, _ := self.GetInt("id")
+	if id == 0 {
+		ban := new(models.Ban)
+		ban.Code = strings.TrimSpace(self.GetString("code"))
+		ban.CreateTime = time.Now().Unix()
+
+		if _, err := models.BanAdd(ban); err != nil {
+			self.ajaxMsg(err.Error(), MSG_ERR)
+		}
+		self.ajaxMsg("", MSG_OK)
+	}
+
+	ban, _ := models.BanGetById(id)
+	//修改
+	ban.Id = id
+	ban.UpdateTime = time.Now().Unix()
+	ban.Code = strings.TrimSpace(self.GetString("code"))
+
+	if err := ban.Update(); err != nil {
+		self.ajaxMsg(err.Error(), MSG_ERR)
+	}
+	self.ajaxMsg("", MSG_OK)
+}
+
+func (self *BanController) AjaxDel() {
+	id, _ := self.GetInt("id")
+	ban, _ := models.BanGetById(id)
+	ban.UpdateTime = time.Now().Unix()
+	ban.Status = 1
+
+	if err := ban.Update(); err != nil {
+		self.ajaxMsg(err.Error(), MSG_ERR)
+	}
+	self.ajaxMsg("操作成功", MSG_OK)
+}
+
+func (self *BanController) Table() {
+	//列表
+	page, err := self.GetInt("page")
+	if err != nil {
+		page = 1
+	}
+	limit, err := self.GetInt("limit")
+	if err != nil {
+		limit = 30
+	}
+
+	code := strings.TrimSpace(self.GetString("code"))
+
+	self.pageSize = limit
+	//查询条件
+	filters := make([]interface{}, 0)
+	filters = append(filters, "status", 0)
+	if code != "" {
+		filters = append(filters, "code__icontains", code)
+	}
+	result, count := models.BanGetList(page, self.pageSize, filters...)
+	list := make([]map[string]interface{}, len(result))
+	for k, v := range result {
+		row := make(map[string]interface{})
+		row["id"] = v.Id
+		row["code"] = v.Code
+		row["create_time"] = beego.Date(time.Unix(v.CreateTime, 0), "Y-m-d H:i:s")
+		list[k] = row
+	}
+	self.ajaxList("成功", MSG_OK, count, list)
+}

V2/controllers/common.go

@@ -0,0 +1,240 @@
+/**********************************************
+** @Des: base controller
+** @Author: haodaquan
+** @Date:   2017-09-07 16:54:40
+** @Last Modified by:   haodaquan
+** @Last Modified time: 2017-09-18 10:28:01
+***********************************************/
+package controllers
+
+import (
+	"strconv"
+	"strings"
+
+	"github.com/astaxie/beego"
+	"github.com/george518/PPGo_Job2/libs"
+	"github.com/george518/PPGo_Job2/models"
+)
+
+const (
+	MSG_OK  = 0
+	MSG_ERR = -1
+)
+
+type BaseController struct {
+	beego.Controller
+	controllerName string
+	actionName     string
+	user           *models.Admin
+	userId         int
+	userName       string
+	loginName      string
+	pageSize       int
+	allowUrl       string
+}
+
+//前期准备
+func (self *BaseController) Prepare() {
+	self.pageSize = 20
+	controllerName, actionName := self.GetControllerAndAction()
+	self.controllerName = strings.ToLower(controllerName[0 : len(controllerName)-10])
+	self.actionName = strings.ToLower(actionName)
+	self.Data["version"] = beego.AppConfig.String("version")
+	self.Data["siteName"] = beego.AppConfig.String("site.name")
+	self.Data["curRoute"] = self.controllerName + "." + self.actionName
+	self.Data["curController"] = self.controllerName
+	self.Data["curAction"] = self.actionName
+	// noAuth := "ajaxsave/ajaxdel/table/loginin/loginout/getnodes/start"
+	// isNoAuth := strings.Contains(noAuth, self.actionName)
+	//fmt.Println(self.controllerName)
+	if (strings.Compare(self.controllerName, "apidoc")) != 0 {
+		self.auth()
+	}
+
+	self.Data["loginUserId"] = self.userId
+	self.Data["loginUserName"] = self.userName
+}
+
+//登录权限验证
+func (self *BaseController) auth() {
+	arr := strings.Split(self.Ctx.GetCookie("auth"), "|")
+	self.userId = 0
+	if len(arr) == 2 {
+		idstr, password := arr[0], arr[1]
+		userId, _ := strconv.Atoi(idstr)
+		if userId > 0 {
+			user, err := models.AdminGetById(userId)
+			if err == nil && password == libs.Md5([]byte(self.getClientIp()+"|"+user.Password+user.Salt)) {
+				self.userId = user.Id
+				self.loginName = user.LoginName
+				self.userName = user.RealName
+				self.user = user
+				self.AdminAuth()
+			}
+
+			isHasAuth := strings.Contains(self.allowUrl, self.controllerName+"/"+self.actionName)
+			noAuth := "ajaxsave/ajaxdel/table/loginin/loginout/getnodes/start/show/ajaxapisave/index/group/public/env/code/apidetail"
+			isNoAuth := strings.Contains(noAuth, self.actionName)
+			if isHasAuth == false && isNoAuth == false {
+				self.Ctx.WriteString("没有权限")
+				self.ajaxMsg("没有权限", MSG_ERR)
+				return
+			}
+		}
+	}
+
+	if self.userId == 0 && (self.controllerName != "login" && self.actionName != "loginin") {
+		self.redirect(beego.URLFor("LoginController.Login"))
+	}
+}
+
+func (self *BaseController) AdminAuth() {
+	// 左侧导航栏
+	filters := make([]interface{}, 0)
+	filters = append(filters, "status", 1)
+	if self.userId != 1 {
+		//普通管理员
+		adminAuthIds, _ := models.RoleAuthGetByIds(self.user.RoleIds)
+		adminAuthIdArr := strings.Split(adminAuthIds, ",")
+		filters = append(filters, "id__in", adminAuthIdArr)
+	}
+	result, _ := models.AuthGetList(1, 1000, filters...)
+	list := make([]map[string]interface{}, len(result))
+	list2 := make([]map[string]interface{}, len(result))
+	allow_url := ""
+	i, j := 0, 0
+	for _, v := range result {
+		if v.AuthUrl != " " || v.AuthUrl != "/" {
+			allow_url += v.AuthUrl
+		}
+		row := make(map[string]interface{})
+		if v.Pid == 1 && v.IsShow == 1 {
+			row["Id"] = int(v.Id)
+			row["Sort"] = v.Sort
+			row["AuthName"] = v.AuthName
+			row["AuthUrl"] = v.AuthUrl
+			row["Icon"] = v.Icon
+			row["Pid"] = int(v.Pid)
+			list[i] = row
+			i++
+		}
+		if v.Pid != 1 && v.IsShow == 1 {
+			row["Id"] = int(v.Id)
+			row["Sort"] = v.Sort
+			row["AuthName"] = v.AuthName
+			row["AuthUrl"] = v.AuthUrl
+			row["Icon"] = v.Icon
+			row["Pid"] = int(v.Pid)
+			list2[j] = row
+			j++
+		}
+	}
+
+	self.Data["SideMenu1"] = list[:i]  //一级菜单
+	self.Data["SideMenu2"] = list2[:j] //二级菜单
+
+	self.allowUrl = allow_url + "/home/index"
+}
+
+// 是否POST提交
+func (self *BaseController) isPost() bool {
+	return self.Ctx.Request.Method == "POST"
+}
+
+//获取用户IP地址
+func (self *BaseController) getClientIp() string {
+	s := strings.Split(self.Ctx.Request.RemoteAddr, ":")
+	return s[0]
+}
+
+// 重定向
+func (self *BaseController) redirect(url string) {
+	self.Redirect(url, 302)
+	self.StopRun()
+}
+
+//加载模板
+func (self *BaseController) display(tpl ...string) {
+	var tplname string
+	if len(tpl) > 0 {
+		tplname = strings.Join([]string{tpl[0], "html"}, ".")
+	} else {
+		tplname = self.controllerName + "/" + self.actionName + ".html"
+	}
+	self.Layout = "public/layout.html"
+	self.TplName = tplname
+}
+
+//ajax返回
+func (self *BaseController) ajaxMsg(msg interface{}, msgno int) {
+	out := make(map[string]interface{})
+	out["status"] = msgno
+	out["message"] = msg
+	self.Data["json"] = out
+	self.ServeJSON()
+	self.StopRun()
+}
+
+//ajax返回 列表
+func (self *BaseController) ajaxList(msg interface{}, msgno int, count int64, data interface{}) {
+	out := make(map[string]interface{})
+	out["code"] = msgno
+	out["msg"] = msg
+	out["count"] = count
+	out["data"] = data
+	self.Data["json"] = out
+	self.ServeJSON()
+	self.StopRun()
+}
+
+//资源分组信息
+func serverGroupLists() (sgl map[int]string) {
+	Filters := make([]interface{}, 0)
+	Filters = append(Filters, "status", 1)
+	groupResult, n := models.ServerGroupGetList(1, 1000, Filters...)
+	sgl = make(map[int]string, n)
+	for _, gv := range groupResult {
+		sgl[gv.Id] = gv.GroupName
+	}
+	//sgl[0] = "默认分组"
+	return sgl
+}
+
+func taskGroupLists() (gl map[int]string) {
+	groupFilters := make([]interface{}, 0)
+	groupFilters = append(groupFilters, "status", 1)
+	groupResult, n := models.GroupGetList(1, 1000, groupFilters...)
+	gl = make(map[int]string, n)
+	for _, gv := range groupResult {
+		gl[gv.Id] = gv.GroupName
+	}
+	return gl
+}
+
+type serverList struct {
+	GroupId   int
+	GroupName string
+	Servers   []string
+}
+
+func serverLists() (sls []serverList) {
+	serverGroup := serverGroupLists()
+	Filters := make([]interface{}, 0)
+	Filters = append(Filters, "status__in", 1)
+	Result, _ := models.TaskServerGetList(1, 1000, Filters...)
+
+	for k, v := range serverGroup {
+		sl := serverList{}
+		sl.GroupId = k
+		sl.GroupName = v
+		servers := make([]string, 0)
+		for _, sv := range Result {
+			if sv.GroupId == k {
+				servers = append(servers, strconv.Itoa(sv.Id), sv.ServerName)
+			}
+		}
+		sl.Servers = servers
+		sls = append(sls, sl)
+	}
+	return sls
+}

V2/controllers/home.go

@@ -0,0 +1,23 @@
+/**********************************************
+** @Des: This file ...
+** @Author: haodaquan
+** @Date:   2017-09-08 10:21:13
+** @Last Modified by:   haodaquan
+** @Last Modified time: 2017-09-09 18:04:41
+***********************************************/
+package controllers
+
+type HomeController struct {
+	BaseController
+}
+
+func (self *HomeController) Index() {
+	self.Data["pageTitle"] = "系统首页"
+	//self.display()
+	self.TplName = "public/main.html"
+}
+
+func (self *HomeController) Start() {
+	self.Data["pageTitle"] = "控制面板"
+	self.display()
+}

V2/controllers/login.go

@@ -0,0 +1,73 @@
+/**********************************************
+** @Des: login
+** @Author: haodaquan
+** @Date:   2017-09-07 16:30:10
+** @Last Modified by:   haodaquan
+** @Last Modified time: 2017-09-17 11:55:21
+***********************************************/
+package controllers
+
+import (
+	"fmt"
+	"strconv"
+	"time"
+
+	"strings"
+
+	"github.com/astaxie/beego"
+	"github.com/george518/PPGo_Job2/libs"
+	"github.com/george518/PPGo_Job2/models"
+)
+
+type LoginController struct {
+	BaseController
+}
+
+func (self *LoginController) Login() {
+	//if self.userId > 0 {
+	//	self.redirect(beego.URLFor("HomeController.Index"))
+	//}
+	self.TplName = "login/login.html"
+}
+
+//登录 TODO:XSRF过滤
+func (self *LoginController) LoginIn() {
+
+	//self.ajaxMsg("登录成功", MSG_OK)
+	if self.userId > 0 {
+		self.ajaxMsg("登录成功", MSG_OK)
+	}
+
+	if self.isPost() {
+		username := strings.TrimSpace(self.GetString("username"))
+		password := strings.TrimSpace(self.GetString("password"))
+		if username != "" && password != "" {
+			user, err := models.AdminGetByName(username)
+			fmt.Println(user)
+			if err != nil || user.Password != libs.Md5([]byte(password+user.Salt)) {
+				self.ajaxMsg("帐号或密码错误", MSG_ERR)
+			} else if user.Status == -1 {
+				self.ajaxMsg("该帐号已禁用", MSG_ERR)
+			} else {
+				user.LastIp = self.getClientIp()
+				user.LastLogin = time.Now().Unix()
+				user.Update()
+				authkey := libs.Md5([]byte(self.getClientIp() + "|" + user.Password + user.Salt))
+				self.Ctx.SetCookie("auth", strconv.Itoa(user.Id)+"|"+authkey, 7*86400)
+
+				self.ajaxMsg("登录成功", MSG_OK)
+			}
+		}
+	}
+	self.ajaxMsg("请求方式错误", MSG_ERR)
+}
+
+//登出
+func (self *LoginController) LoginOut() {
+	self.Ctx.SetCookie("auth", "")
+	self.redirect(beego.URLFor("LoginController.Login"))
+}
+
+func (self *LoginController) NoAuth() {
+	self.Ctx.WriteString("没有权限")
+}

V2/controllers/role.go

@@ -0,0 +1,155 @@
+/**********************************************
+** @Des: This file ...
+** @Author: haodaquan
+** @Date:   2017-09-14 14:23:32
+** @Last Modified by:   haodaquan
+** @Last Modified time: 2017-09-17 11:31:13
+***********************************************/
+package controllers
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/astaxie/beego"
+	"github.com/george518/PPGo_Job2/models"
+)
+
+type RoleController struct {
+	BaseController
+}
+
+func (self *RoleController) List() {
+	self.Data["pageTitle"] = "角色管理"
+	self.display()
+}
+
+func (self *RoleController) Add() {
+	self.Data["zTree"] = true //引入ztreecss
+	self.Data["pageTitle"] = "新增角色"
+	self.display()
+}
+func (self *RoleController) Edit() {
+	self.Data["zTree"] = true //引入ztreecss
+	self.Data["pageTitle"] = "编辑角色"
+
+	id, _ := self.GetInt("id", 0)
+	role, _ := models.RoleGetById(id)
+	row := make(map[string]interface{})
+	row["id"] = role.Id
+	row["role_name"] = role.RoleName
+	row["detail"] = role.Detail
+	self.Data["role"] = row
+
+	//获取选择的树节点
+	roleAuth, _ := models.RoleAuthGetById(id)
+	authId := make([]int, 0)
+	for _, v := range roleAuth {
+		authId = append(authId, v.AuthId)
+	}
+	self.Data["auth"] = authId
+	fmt.Println(authId)
+	self.display()
+}
+
+func (self *RoleController) AjaxSave() {
+	role := new(models.Role)
+	role.RoleName = strings.TrimSpace(self.GetString("role_name"))
+	role.Detail = strings.TrimSpace(self.GetString("detail"))
+	role.CreateTime = time.Now().Unix()
+	role.UpdateTime = time.Now().Unix()
+	role.Status = 1
+	auths := strings.TrimSpace(self.GetString("nodes_data"))
+	role_id, _ := self.GetInt("id")
+	if role_id == 0 {
+		//新增
+		role.CreateTime = time.Now().Unix()
+		role.UpdateTime = time.Now().Unix()
+		role.CreateId = self.userId
+		role.UpdateId = self.userId
+		if id, err := models.RoleAdd(role); err != nil {
+			self.ajaxMsg(err.Error(), MSG_ERR)
+		} else {
+			ra := new(models.RoleAuth)
+			authsSlice := strings.Split(auths, ",")
+			for _, v := range authsSlice {
+				aid, _ := strconv.Atoi(v)
+				ra.AuthId = aid
+				ra.RoleId = id
+				models.RoleAuthAdd(ra)
+			}
+		}
+		self.ajaxMsg("", MSG_OK)
+	}
+	//修改
+	role.Id = role_id
+	role.UpdateTime = time.Now().Unix()
+	role.UpdateId = self.userId
+	if err := role.Update(); err != nil {
+		self.ajaxMsg(err.Error(), MSG_ERR)
+	} else {
+		// 删除该角色权限
+		models.RoleAuthDelete(role_id)
+		ra := new(models.RoleAuth)
+		authsSlice := strings.Split(auths, ",")
+		for _, v := range authsSlice {
+			aid, _ := strconv.Atoi(v)
+			ra.AuthId = aid
+			ra.RoleId = int64(role_id)
+			models.RoleAuthAdd(ra)
+		}
+
+	}
+	self.ajaxMsg("", MSG_OK)
+}
+
+func (self *RoleController) AjaxDel() {
+
+	role_id, _ := self.GetInt("id")
+	role, _ := models.RoleGetById(role_id)
+	role.Status = 0
+	role.Id = role_id
+	role.UpdateTime = time.Now().Unix()
+
+	if err := role.Update(); err != nil {
+		self.ajaxMsg(err.Error(), MSG_ERR)
+	}
+	// 删除该角色权限
+	//models.RoleAuthDelete(role_id)
+	self.ajaxMsg("", MSG_OK)
+}
+
+func (self *RoleController) Table() {
+	//列表
+	page, err := self.GetInt("page")
+	if err != nil {
+		page = 1
+	}
+	limit, err := self.GetInt("limit")
+	if err != nil {
+		limit = 30
+	}
+
+	roleName := strings.TrimSpace(self.GetString("roleName"))
+	self.pageSize = limit
+	//查询条件
+	filters := make([]interface{}, 0)
+	filters = append(filters, "status", 1)
+	if roleName != "" {
+		filters = append(filters, "role_name__icontains", roleName)
+	}
+	result, count := models.RoleGetList(page, self.pageSize, filters...)
+	list := make([]map[string]interface{}, len(result))
+	for k, v := range result {
+		row := make(map[string]interface{})
+		row["id"] = v.Id
+		row["role_name"] = v.RoleName
+		row["detail"] = v.Detail
+		row["create_time"] = beego.Date(time.Unix(v.CreateTime, 0), "Y-m-d H:i:s")
+		row["update_time"] = beego.Date(time.Unix(v.UpdateTime, 0), "Y-m-d H:i:s")
+		list[k] = row
+	}
+	self.ajaxList("成功", MSG_OK, count, list)
+}

V2/controllers/server.go

@@ -0,0 +1,223 @@
+/************************************************************
+** @Description: controllers
+** @Author: haodaquan
+** @Date:   2018-06-09 16:11
+** @Last Modified by:   haodaquan
+** @Last Modified time: 2018-06-09 16:11
+*************************************************************/
+package controllers
+
+import (
+	"strings"
+	"time"
+
+	"github.com/george518/PPGo_Job2/models"
+)
+
+type ServerController struct {
+	BaseController
+}
+
+func (self *ServerController) List() {
+	self.Data["pageTitle"] = "资源管理"
+	self.display()
+}
+
+func (self *ServerController) Add() {
+	self.Data["pageTitle"] = "新增服务器资源"
+	self.Data["serverGroup"] = serverGroupLists()
+	self.display()
+}
+
+func (self *ServerController) GetServerByGroupId() {
+	gid, _ := self.GetInt("gid", 0)
+	if gid == 0 {
+		self.ajaxMsg("groupId is not exist", MSG_ERR)
+	}
+
+	//列表
+	page, err := self.GetInt("page")
+	if err != nil {
+		page = 1
+	}
+	limit, err := self.GetInt("limit")
+	if err != nil {
+		limit = 30
+	}
+	serverName := strings.TrimSpace(self.GetString("serverName"))
+	StatusText := []string{
+		"正常",
+		"<font color='red'>禁用</font>",
+	}
+
+	loginType := [2]string{
+		"密码",
+		"密钥",
+	}
+
+	serverGroup := serverGroupLists()
+
+	self.pageSize = limit
+	//查询条件
+	filters := make([]interface{}, 0)
+	filters = append(filters, "status", 0)
+	filters = append(filters, "group_id", gid)
+
+	result, count := models.TaskServerGetList(page, self.pageSize, filters...)
+	list := make([]map[string]interface{}, len(result))
+	for k, v := range result {
+		row := make(map[string]interface{})
+		row["id"] = v.Id
+		row["server_name"] = v.ServerName
+		row["detail"] = v.Detail
+		if serverGroup[v.GroupId] == "" {
+			v.GroupId = 0
+		}
+		row["group_name"] = serverGroup[v.GroupId]
+		row["type"] = loginType[v.Type]
+		row["status"] = v.Status
+		row["status_text"] = StatusText[v.Status]
+		list[k] = row
+	}
+
+	self.ajaxList("成功", MSG_OK, count, list)
+}
+
+func (self *ServerController) Edit() {
+	self.Data["pageTitle"] = "编辑服务器资源"
+
+	id, _ := self.GetInt("id", 0)
+	server, _ := models.TaskServerGetById(id)
+	row := make(map[string]interface{})
+	row["id"] = server.Id
+	row["server_name"] = server.ServerName
+	row["group_id"] = server.GroupId
+	row["server_ip"] = server.ServerIp
+	row["server_account"] = server.ServerAccount
+	row["server_outer_ip"] = server.ServerOuterIp
+	row["port"] = server.Port
+	row["type"] = server.Type
+	row["password"] = server.Password
+	row["public_key_src"] = server.PublicKeySrc
+	row["private_key_src"] = server.PrivateKeySrc
+	row["detail"] = server.Detail
+	self.Data["server"] = row
+	self.Data["serverGroup"] = serverGroupLists()
+	self.display()
+}
+
+func (self *ServerController) AjaxSave() {
+	server_id, _ := self.GetInt("id")
+	if server_id == 0 {
+		server := new(models.TaskServer)
+		server.ServerName = strings.TrimSpace(self.GetString("server_name"))
+		server.ServerAccount = strings.TrimSpace(self.GetString("server_account"))
+		server.ServerOuterIp = strings.TrimSpace(self.GetString("server_outer_ip"))
+		server.ServerIp = strings.TrimSpace(self.GetString("server_ip"))
+		server.PrivateKeySrc = strings.TrimSpace(self.GetString("private_key_src"))
+		server.PublicKeySrc = strings.TrimSpace(self.GetString("public_key_src"))
+		server.Password = strings.TrimSpace(self.GetString("password"))
+
+		server.Detail = strings.TrimSpace(self.GetString("detail"))
+		server.Type, _ = self.GetInt("type")
+		server.Port, _ = self.GetInt("port")
+		server.GroupId, _ = self.GetInt("group_id")
+
+		server.CreateTime = time.Now().Unix()
+		server.UpdateTime = time.Now().Unix()
+		server.Status = 0
+
+		if _, err := models.TaskServerAdd(server); err != nil {
+			self.ajaxMsg(err.Error(), MSG_ERR)
+		}
+		self.ajaxMsg("", MSG_OK)
+	}
+
+	server, _ := models.TaskServerGetById(server_id)
+	//修改
+	server.Id = server_id
+	server.UpdateTime = time.Now().Unix()
+
+	server.ServerName = strings.TrimSpace(self.GetString("server_name"))
+	server.ServerAccount = strings.TrimSpace(self.GetString("server_account"))
+	server.ServerOuterIp = strings.TrimSpace(self.GetString("server_outer_ip"))
+	server.ServerIp = strings.TrimSpace(self.GetString("server_ip"))
+	server.PrivateKeySrc = strings.TrimSpace(self.GetString("private_key_src"))
+	server.PublicKeySrc = strings.TrimSpace(self.GetString("public_key_src"))
+	server.Detail = strings.TrimSpace(self.GetString("detail"))
+	server.Password = strings.TrimSpace(self.GetString("password"))
+
+	server.Type, _ = self.GetInt("type")
+	server.Port, _ = self.GetInt("port")
+	server.GroupId, _ = self.GetInt("group_id")
+
+	if err := server.Update(); err != nil {
+		self.ajaxMsg(err.Error(), MSG_ERR)
+	}
+	self.ajaxMsg("", MSG_OK)
+}
+
+func (self *ServerController) AjaxDel() {
+	id, _ := self.GetInt("id")
+	server, _ := models.TaskServerGetById(id)
+	server.UpdateTime = time.Now().Unix()
+	server.Status = 1
+	server.Id = id
+
+	//TODO 查询服务器是否用于定时任务
+	if err := server.Update(); err != nil {
+		self.ajaxMsg(err.Error(), MSG_ERR)
+	}
+	self.ajaxMsg("操作成功", MSG_OK)
+}
+
+func (self *ServerController) Table() {
+	//列表
+	page, err := self.GetInt("page")
+	if err != nil {
+		page = 1
+	}
+	limit, err := self.GetInt("limit")
+	if err != nil {
+		limit = 30
+	}
+	serverName := strings.TrimSpace(self.GetString("serverName"))
+	StatusText := []string{
+		"正常",
+		"<font color='red'>禁用</font>",
+	}
+
+	loginType := [2]string{
+		"密码",
+		"密钥",
+	}
+
+	serverGroup := serverGroupLists()
+
+	self.pageSize = limit
+	//查询条件
+	filters := make([]interface{}, 0)
+	filters = append(filters, "status", 0)
+	//
+	if serverName != "" {
+		filters = append(filters, "server_name__icontains", serverName)
+	}
+	result, count := models.TaskServerGetList(page, self.pageSize, filters...)
+	list := make([]map[string]interface{}, len(result))
+	for k, v := range result {
+		row := make(map[string]interface{})
+		row["id"] = v.Id
+		row["server_name"] = v.ServerName
+		row["detail"] = v.Detail
+		if serverGroup[v.GroupId] == "" {
+			v.GroupId = 0
+		}
+		row["group_name"] = serverGroup[v.GroupId]
+		row["type"] = loginType[v.Type]
+		row["status"] = v.Status
+		row["status_text"] = StatusText[v.Status]
+		list[k] = row
+	}
+
+	self.ajaxList("成功", MSG_OK, count, list)
+}

V2/controllers/server_group.go

@@ -0,0 +1,128 @@
+/************************************************************
+** @Description: controllers
+** @Author: haodaquan
+** @Date:   2018-06-08 21:57
+** @Last Modified by:   haodaquan
+** @Last Modified time: 2018-06-08 21:57
+*************************************************************/
+package controllers
+
+import (
+	"strings"
+	"time"
+
+	"fmt"
+
+	"github.com/astaxie/beego"
+	"github.com/george518/PPGo_Job2/models"
+)
+
+type ServerGroupController struct {
+	BaseController
+}
+
+func (self *ServerGroupController) List() {
+	self.Data["pageTitle"] = "资源分组管理"
+	self.display()
+}
+
+func (self *ServerGroupController) Add() {
+	self.Data["pageTitle"] = "新增分组"
+	self.display()
+}
+func (self *ServerGroupController) Edit() {
+	self.Data["pageTitle"] = "编辑分组"
+
+	id, _ := self.GetInt("id", 0)
+	group, _ := models.TaskGroupGetById(id)
+	row := make(map[string]interface{})
+	row["id"] = group.Id
+	row["group_name"] = group.GroupName
+	row["description"] = group.Description
+	self.Data["group"] = row
+	self.display()
+}
+
+func (self *ServerGroupController) AjaxSave() {
+	servergroup := new(models.ServerGroup)
+	servergroup.GroupName = strings.TrimSpace(self.GetString("group_name"))
+	servergroup.Description = strings.TrimSpace(self.GetString("description"))
+	servergroup.Status = 1
+
+	servergroup_id, _ := self.GetInt("id")
+
+	fmt.Println(servergroup_id)
+	if servergroup_id == 0 {
+		//新增
+		servergroup.CreateTime = time.Now().Unix()
+		servergroup.UpdateTime = time.Now().Unix()
+		servergroup.CreateId = self.userId
+		servergroup.UpdateId = self.userId
+		if _, err := models.ServerGroupAdd(servergroup); err != nil {
+			self.ajaxMsg(err.Error(), MSG_ERR)
+		}
+		self.ajaxMsg("", MSG_OK)
+	}
+	//修改
+	servergroup.Id = servergroup_id
+	servergroup.UpdateTime = time.Now().Unix()
+	servergroup.UpdateId = self.userId
+	if err := servergroup.Update(); err != nil {
+		self.ajaxMsg(err.Error(), MSG_ERR)
+	}
+	self.ajaxMsg("", MSG_OK)
+}
+
+func (self *ServerGroupController) AjaxDel() {
+
+	group_id, _ := self.GetInt("id")
+	group, _ := models.TaskGroupGetById(group_id)
+	group.Status = 0
+	group.Id = group_id
+	group.UpdateTime = time.Now().Unix()
+	//TODO 如果分组下有服务器 需要处理
+	filters := make([]interface{}, 0)
+	filters = append(filters, "group_id", group_id)
+	filters = append(filters, "status", 0)
+	_, n := models.TaskServerGetList(1, 1, filters...)
+	if n > 0 {
+		self.ajaxMsg("分组下有服务器资源，请先处理", MSG_ERR)
+	}
+	if err := group.Update(); err != nil {
+		self.ajaxMsg(err.Error(), MSG_ERR)
+	}
+	self.ajaxMsg("", MSG_OK)
+}
+
+func (self *ServerGroupController) Table() {
+	//列表
+	page, err := self.GetInt("page")
+	if err != nil {
+		page = 1
+	}
+	limit, err := self.GetInt("limit")
+	if err != nil {
+		limit = 30
+	}
+
+	groupName := strings.TrimSpace(self.GetString("groupName"))
+	self.pageSize = limit
+	//查询条件
+	filters := make([]interface{}, 0)
+	filters = append(filters, "status", 1)
+	if groupName != "" {
+		filters = append(filters, "group_name__contains", groupName)
+	}
+	result, count := models.ServerGroupGetList(page, self.pageSize, filters...)
+	list := make([]map[string]interface{}, len(result))
+	for k, v := range result {
+		row := make(map[string]interface{})
+		row["id"] = v.Id
+		row["group_name"] = v.GroupName
+		row["description"] = v.Description
+		row["create_time"] = beego.Date(time.Unix(v.CreateTime, 0), "Y-m-d H:i:s")
+		row["update_time"] = beego.Date(time.Unix(v.UpdateTime, 0), "Y-m-d H:i:s")
+		list[k] = row
+	}
+	self.ajaxList("成功", MSG_OK, count, list)
+}

V2/controllers/task.go

@@ -0,0 +1,172 @@
+/************************************************************
+** @Description: controllers
+** @Author: haodaquan
+** @Date:   2018-06-11 21:11
+** @Last Modified by:   haodaquan
+** @Last Modified time: 2018-06-11 21:11
+*************************************************************/
+package controllers
+
+import (
+	"strings"
+	"time"
+
+	"github.com/astaxie/beego"
+	"github.com/george518/PPGo_Job2/models"
+)
+
+type TaskController struct {
+	BaseController
+}
+
+func (self *TaskController) List() {
+	self.Data["pageTitle"] = "任务管理"
+	self.display()
+}
+
+func (self *TaskController) Add() {
+	self.Data["pageTitle"] = "新增任务"
+	//self.Data["serverGroup"] = serverGroupLists()
+	self.Data["serverGroup"] = serverGroupLists()
+
+	//fmt.Println(self.Data["serverGroup"])
+	self.Data["taskGroup"] = taskGroupLists()
+	self.display()
+}
+
+func (self *TaskController) Edit() {
+	self.Data["pageTitle"] = "编辑任务"
+
+	id, _ := self.GetInt("id", 0)
+	server, _ := models.TaskServerGetById(id)
+	row := make(map[string]interface{})
+	row["id"] = server.Id
+	row["server_name"] = server.ServerName
+	row["group_id"] = server.GroupId
+	row["server_ip"] = server.ServerIp
+	row["server_account"] = server.ServerAccount
+	row["server_outer_ip"] = server.ServerOuterIp
+	row["port"] = server.Port
+	row["type"] = server.Type
+	row["password"] = server.Password
+	row["public_key_src"] = server.PublicKeySrc
+	row["private_key_src"] = server.PrivateKeySrc
+	row["detail"] = server.Detail
+	self.Data["server"] = row
+	self.Data["serverGroup"] = serverGroupLists()
+	self.display()
+}
+
+func (self *TaskController) AjaxSave() {
+	server_id, _ := self.GetInt("id")
+	if server_id == 0 {
+		server := new(models.TaskServer)
+		server.ServerName = strings.TrimSpace(self.GetString("server_name"))
+		server.ServerAccount = strings.TrimSpace(self.GetString("server_account"))
+		server.ServerOuterIp = strings.TrimSpace(self.GetString("server_outer_ip"))
+		server.ServerIp = strings.TrimSpace(self.GetString("server_ip"))
+		server.PrivateKeySrc = strings.TrimSpace(self.GetString("private_key_src"))
+		server.PublicKeySrc = strings.TrimSpace(self.GetString("public_key_src"))
+		server.Password = strings.TrimSpace(self.GetString("password"))
+
+		server.Detail = strings.TrimSpace(self.GetString("detail"))
+		server.Type, _ = self.GetInt("type")
+		server.Port, _ = self.GetInt("port")
+		server.GroupId, _ = self.GetInt("group_id")
+
+		server.CreateTime = time.Now().Unix()
+		server.UpdateTime = time.Now().Unix()
+		server.Status = 0
+
+		if _, err := models.TaskServerAdd(server); err != nil {
+			self.ajaxMsg(err.Error(), MSG_ERR)
+		}
+		self.ajaxMsg("", MSG_OK)
+	}
+
+	server, _ := models.TaskServerGetById(server_id)
+	//修改
+	server.Id = server_id
+	server.UpdateTime = time.Now().Unix()
+
+	server.ServerName = strings.TrimSpace(self.GetString("server_name"))
+	server.ServerAccount = strings.TrimSpace(self.GetString("server_account"))
+	server.ServerOuterIp = strings.TrimSpace(self.GetString("server_outer_ip"))
+	server.ServerIp = strings.TrimSpace(self.GetString("server_ip"))
+	server.PrivateKeySrc = strings.TrimSpace(self.GetString("private_key_src"))
+	server.PublicKeySrc = strings.TrimSpace(self.GetString("public_key_src"))
+	server.Detail = strings.TrimSpace(self.GetString("detail"))
+	server.Password = strings.TrimSpace(self.GetString("password"))
+
+	server.Type, _ = self.GetInt("type")
+	server.Port, _ = self.GetInt("port")
+	server.GroupId, _ = self.GetInt("group_id")
+
+	if err := server.Update(); err != nil {
+		self.ajaxMsg(err.Error(), MSG_ERR)
+	}
+	self.ajaxMsg("", MSG_OK)
+}
+
+func (self *TaskController) AjaxDel() {
+	id, _ := self.GetInt("id")
+	server, _ := models.TaskServerGetById(id)
+	server.UpdateTime = time.Now().Unix()
+	server.Status = 1
+	server.Id = id
+
+	//TODO 查询服务器是否用于定时任务
+	if err := server.Update(); err != nil {
+		self.ajaxMsg(err.Error(), MSG_ERR)
+	}
+	self.ajaxMsg("操作成功", MSG_OK)
+}
+
+func (self *TaskController) Table() {
+	//列表
+	page, err := self.GetInt("page")
+	if err != nil {
+		page = 1
+	}
+	limit, err := self.GetInt("limit")
+	if err != nil {
+		limit = 30
+	}
+	taskName := strings.TrimSpace(self.GetString("taskName"))
+	StatusText := []string{
+		"<font color='red'><i class='fa fa-minus-square'></i></font>",
+		"<font color='green'><i class='fa fa-check-square'></i></font>",
+	}
+
+	taskGroup := taskGroupLists()
+	self.pageSize = limit
+	//查询条件
+	filters := make([]interface{}, 0)
+	filters = append(filters, "status", 0)
+	//
+	if taskName != "" {
+		filters = append(filters, "task_name__icontains", taskName)
+	}
+	result, count := models.TaskGetList(page, self.pageSize, filters...)
+	list := make([]map[string]interface{}, len(result))
+	for k, v := range result {
+		row := make(map[string]interface{})
+		row["id"] = v.Id
+		row["task_name"] = StatusText[v.Status] + "&nbsp;" + v.TaskName
+		row["description"] = v.Description
+		if name, ok := taskGroup[v.GroupId]; ok {
+			row["group_name"] = name
+		} else {
+			row["group_name"] = "默认分组"
+		}
+
+		//row["status_text"] = StatusText[v.Status]
+		row["status"] = v.Status
+		row["pre_time"] = beego.Date(time.Unix(v.PrevTime, 0), "Y-m-d H:i:s")
+		row["execute_times"] = v.ExecuteTimes
+
+		list[k] = row
+	}
+
+	self.ajaxList("成功", MSG_OK, count, list)
+}

V2/controllers/task_group.go

@@ -0,0 +1,128 @@
+/************************************************************
+** @Description: controllers
+** @Author: haodaquan
+** @Date:   2018-06-10 22:24
+** @Last Modified by:   haodaquan
+** @Last Modified time: 2018-06-10 22:24
+*************************************************************/
+package controllers
+
+import (
+	"strings"
+	"time"
+
+	"fmt"
+
+	"github.com/astaxie/beego"
+	"github.com/george518/PPGo_Job2/models"
+)
+
+type GroupController struct {
+	BaseController
+}
+
+func (self *GroupController) List() {
+	self.Data["pageTitle"] = "任务分组管理"
+	self.display()
+}
+
+func (self *GroupController) Add() {
+	self.Data["pageTitle"] = "新增分组"
+	self.display()
+}
+func (self *GroupController) Edit() {
+	self.Data["pageTitle"] = "编辑分组"
+
+	id, _ := self.GetInt("id", 0)
+	group, _ := models.GroupGetById(id)
+	row := make(map[string]interface{})
+	row["id"] = group.Id
+	row["group_name"] = group.GroupName
+	row["description"] = group.Description
+	self.Data["group"] = row
+	self.display()
+}
+
+func (self *GroupController) AjaxSave() {
+	group := new(models.Group)
+	group.GroupName = strings.TrimSpace(self.GetString("group_name"))
+	group.Description = strings.TrimSpace(self.GetString("description"))
+	group.Status = 1
+
+	group_id, _ := self.GetInt("id")
+
+	fmt.Println(group_id)
+	if group_id == 0 {
+		//新增
+		group.CreateTime = time.Now().Unix()
+		group.UpdateTime = time.Now().Unix()
+		group.CreateId = self.userId
+		group.UpdateId = self.userId
+		if _, err := models.GroupAdd(group); err != nil {
+			self.ajaxMsg(err.Error(), MSG_ERR)
+		}
+		self.ajaxMsg("", MSG_OK)
+	}
+	//修改
+	group.Id = group_id
+	group.UpdateTime = time.Now().Unix()
+	group.UpdateId = self.userId
+	if err := group.Update(); err != nil {
+		self.ajaxMsg(err.Error(), MSG_ERR)
+	}
+	self.ajaxMsg("", MSG_OK)
+}
+
+func (self *GroupController) AjaxDel() {
+
+	group_id, _ := self.GetInt("id")
+	group, _ := models.GroupGetById(group_id)
+	group.Status = 0
+	group.Id = group_id
+	group.UpdateTime = time.Now().Unix()
+	//TODO 如果分组下有任务 不处理
+	//filters := make([]interface{}, 0)
+	//filters = append(filters, "group_id", group_id)
+	//filters = append(filters, "status", 0)
+	//_, n := models.TaskServerGetList(1, 1, filters...)
+	//if n > 0 {
+	//	self.ajaxMsg("分组下有服务器资源，请先处理", MSG_ERR)
+	//}
+	if err := group.Update(); err != nil {
+		self.ajaxMsg(err.Error(), MSG_ERR)
+	}
+	self.ajaxMsg("", MSG_OK)
+}
+
+func (self *GroupController) Table() {
+	//列表
+	page, err := self.GetInt("page")
+	if err != nil {
+		page = 1
+	}
+	limit, err := self.GetInt("limit")
+	if err != nil {
+		limit = 30
+	}
+
+	groupName := strings.TrimSpace(self.GetString("groupName"))
+	self.pageSize = limit
+	//查询条件
+	filters := make([]interface{}, 0)
+	filters = append(filters, "status", 1)
+	if groupName != "" {
+		filters = append(filters, "group_name__contains", groupName)
+	}
+	result, count := models.GroupGetList(page, self.pageSize, filters...)
+	list := make([]map[string]interface{}, len(result))
+	for k, v := range result {
+		row := make(map[string]interface{})
+		row["id"] = v.Id
+		row["group_name"] = v.GroupName
+		row["description"] = v.Description
+		row["create_time"] = beego.Date(time.Unix(v.CreateTime, 0), "Y-m-d H:i:s")
+		row["update_time"] = beego.Date(time.Unix(v.UpdateTime, 0), "Y-m-d H:i:s")
+		list[k] = row
+	}
+	self.ajaxList("成功", MSG_OK, count, list)
+}

V2/controllers/user.go

@@ -0,0 +1,78 @@
+/**********************************************
+** @Des: 用户
+** @Author: haodaquan
+** @Date:   2017-09-16 14:17:37
+** @Last Modified by:   haodaquan
+** @Last Modified time: 2017-09-17 11:14:07
+***********************************************/
+package controllers
+
+import (
+	"strings"
+	"time"
+
+	"github.com/george518/PPGo_Job2/libs"
+	"github.com/george518/PPGo_Job2/models"
+)
+
+type UserController struct {
+	BaseController
+}
+
+func (self *UserController) Edit() {
+	self.Data["pageTitle"] = "资料修改"
+	id := self.userId
+	Admin, _ := models.AdminGetById(id)
+	row := make(map[string]interface{})
+	row["id"] = Admin.Id
+	row["login_name"] = Admin.LoginName
+	row["real_name"] = Admin.RealName
+	row["phone"] = Admin.Phone
+	row["email"] = Admin.Email
+	self.Data["admin"] = row
+	self.display()
+}
+
+func (self *UserController) AjaxSave() {
+	Admin_id, _ := self.GetInt("id")
+	Admin, _ := models.AdminGetById(Admin_id)
+	//修改
+	Admin.Id = Admin_id
+	Admin.UpdateTime = time.Now().Unix()
+	Admin.UpdateId = self.userId
+	Admin.LoginName = strings.TrimSpace(self.GetString("login_name"))
+	Admin.RealName = strings.TrimSpace(self.GetString("real_name"))
+	Admin.Phone = strings.TrimSpace(self.GetString("phone"))
+	Admin.Email = strings.TrimSpace(self.GetString("email"))
+
+	resetPwd := self.GetString("reset_pwd")
+	if resetPwd == "1" {
+		pwdOld := strings.TrimSpace(self.GetString("password_old"))
+		pwdOldMd5 := libs.Md5([]byte(pwdOld + Admin.Salt))
+		if Admin.Password != pwdOldMd5 {
+			self.ajaxMsg("旧密码错误", MSG_ERR)
+		}
+
+		pwdNew1 := strings.TrimSpace(self.GetString("password_new1"))
+		pwdNew2 := strings.TrimSpace(self.GetString("password_new2"))
+
+		if len(pwdNew1) < 6 {
+			self.ajaxMsg("密码长度需要六位以上", MSG_ERR)
+		}
+		if pwdNew1 != pwdNew2 {
+			self.ajaxMsg("两次密码不一致", MSG_ERR)
+		}
+
+		pwd, salt := libs.Password(4, pwdNew1)
+		Admin.Password = pwd
+		Admin.Salt = salt
+	}
+	Admin.UpdateTime = time.Now().Unix()
+	Admin.UpdateId = self.userId
+	Admin.Status = 1
+
+	if err := Admin.Update(); err != nil {
+		self.ajaxMsg(err.Error(), MSG_ERR)
+	}
+	self.ajaxMsg("", MSG_OK)
+}