test

src/front/front.go

@@ -1,13 +1,13 @@
 package front
 
 import (
+	"github.com/go-xweb/xweb"
+	"gopkg.in/mgo.v2/bson"
+	mongoutil "qfw/mongodb"
 	qu "qfw/util"
 	"strconv"
 	"time"
 	. "util"
-
-	"github.com/go-xweb/xweb"
-	"gopkg.in/mgo.v2/bson"
 )
 
 var UserMenu map[string][]map[string]interface{} //存储菜单
@@ -35,7 +35,7 @@ type Front struct {
 	personalMenu   xweb.Mapper `xweb:"/front/personalMenu"`
 	//role
 	roleManager    xweb.Mapper `xweb:"/front/role"`             //角色权限管理
-	roleNew		   xweb.Mapper `xweb:"/front/role/save"`		   //新增角色
+	roleNew        xweb.Mapper `xweb:"/front/role/save"`        //新增角色
 	roleEdit       xweb.Mapper `xweb:"/front/role/edit/(.*)"`   //角色权限查看
 	roleFirst      xweb.Mapper `xweb:"/front/role/first"`       //一级权限的查看
 	roleSecond     xweb.Mapper `xweb:"/front/role/second"`      //二级权限的查看
@@ -65,7 +65,7 @@ func (f *Front) Login() {
 				"role":  (*user)["s_role"],
 				"pwd":   password,
 				"email": email,
-				"id":    qu.BsonIdToSId((*user)["_id"]),
+				"id":    mongoutil.BsonIdToSId((*user)["_id"]),
 			})
 			UserMenu[email] = GetUserMenu(qu.ObjToString((*user)["s_role"]))
 		}
@@ -108,7 +108,7 @@ func (f *Front) User() {
 	defer qu.Catch()
 	role, _ := Mgo.Find("role", nil, nil, nil, false, -1, -1)
 	roleMap := make(map[string]string)
-	for _, v := range *role{
+	for _, v := range *role {
 		level := qu.ObjToString(v["level"])
 		if level != "" {
 			roleMap[level] = qu.ObjToString(v["name"])
@@ -138,7 +138,7 @@ func (f *Front) UserDel() {
 	defer qu.Catch()
 	_id := f.GetString("_id")
 	query := bson.M{
-		"_id": qu.StringTOBsonId(_id),
+		"_id": mongoutil.StringTOBsonId(_id),
 	}
 	b := Mgo.Del("user", query)
 	f.ServeJson(map[string]interface{}{
@@ -162,7 +162,7 @@ func (f *Front) UserSave() {
 		},
 	}
 	query := bson.M{
-		"_id": qu.StringTOBsonId(_id),
+		"_id": mongoutil.StringTOBsonId(_id),
 	}
 	if _id == "" {
 		query = bson.M{
@@ -198,7 +198,7 @@ func GetUserMenu(role string) []map[string]interface{} {
 		_id := d["_id"]
 		maps = map[string]interface{}{
 			"delete": false,
-			"s_pid":  qu.BsonIdToSId(_id),
+			"s_pid":  mongoutil.BsonIdToSId(_id),
 		}
 		if role != "0" {
 			maps["role."+role] = true

src/front/menu.go

@@ -1,6 +1,7 @@
 package front
 
 import (
+	mongoutil "qfw/mongodb"
 	qu "qfw/util"
 	"time"
 
@@ -28,7 +29,7 @@ func (f *Front) MenuSave() {
 	css := f.GetString("css")
 	id := f.GetString("id")
 	query := bson.M{
-		"_id":    qu.StringTOBsonId(id),
+		"_id":    mongoutil.StringTOBsonId(id),
 		"delete": false,
 	}
 	if id == "" {
@@ -58,7 +59,7 @@ func (f *Front) MenuDel() {
 	defer qu.Catch()
 	_id := f.GetString("_id")
 	query := bson.M{
-		"_id": qu.StringTOBsonId(_id),
+		"_id": mongoutil.StringTOBsonId(_id),
 	}
 	set := bson.M{
 		"$set": bson.M{
@@ -96,7 +97,7 @@ func (f *Front) MenuSecondSave() {
 	id := f.GetString("id")
 	pid := f.GetString("pid")
 	query := bson.M{
-		"_id":    qu.StringTOBsonId(id),
+		"_id":    mongoutil.StringTOBsonId(id),
 		"delete": false,
 	}
 	if id == "" {
@@ -127,7 +128,7 @@ func (f *Front) MenuSecondDel() {
 	defer qu.Catch()
 	_id := f.GetString("_id")
 	query := bson.M{
-		"_id": qu.StringTOBsonId(_id),
+		"_id": mongoutil.StringTOBsonId(_id),
 	}
 	set := bson.M{
 		"$set": bson.M{

src/front/role.go

@@ -2,6 +2,7 @@ package front
 
 import (
 	"encoding/json"
+	mongoutil "qfw/mongodb"
 	qu "qfw/util"
 
 	. "util"
@@ -34,7 +35,7 @@ func (f *Front) RoleNew() {
 					"level": level,
 				},
 			}
-			bol := Mgo.UpdateById("role", qu.StringTOBsonId(_id), set)
+			bol := Mgo.UpdateById("role", mongoutil.StringTOBsonId(_id), set)
 			if bol {
 				f.ServeJson(map[string]interface{}{
 					"rep": true,

src/history/historytask.go

@@ -1,12 +1,12 @@
 package history
 
 import (
+	"github.com/go-xweb/xweb"
 	"log"
+	mongoutil "qfw/mongodb"
 	qu "qfw/util"
 	"strings"
 	. "util"
-
-	"github.com/go-xweb/xweb"
 )
 
 type HistoryData struct {
@@ -20,11 +20,11 @@ func (this *HistoryData) HistoryTask(history_id string) {
 	go UpdateHistoryState(1, history_id, 0)
 	//加载一个客户
 	log.Println("history_id", history_id)
-	customer, _ := Mgo.Find("historylog", map[string]interface{}{"_id": qu.StringTOBsonId(history_id)}, nil, nil, false, -1, -1)
+	customer, _ := Mgo.Find("historylog", map[string]interface{}{"_id": mongoutil.StringTOBsonId(history_id)}, nil, nil, false, -1, -1)
 	log.Println("data", customer)
 	if len(*customer) == 1 {
 		c := (*customer)[0]
-		customerId := qu.BsonIdToSId(c["_id"])
+		customerId := mongoutil.BsonIdToSId(c["_id"])
 		customer_name := qu.ObjToString(c["s_name"]) //客户名称
 		appId := qu.ObjToString(c["s_appid"])        //appid
 		extends := qu.ObjToString(c["s_extends"])    //扩展信息
@@ -84,7 +84,7 @@ func (this *HistoryData) HistoryList() {
 
 func UpdateHistoryState(state int, history_id string, count int) {
 	if state == 2 {
-		Mgo.Update("historylog", map[string]interface{}{"_id": qu.StringTOBsonId(history_id)}, map[string]interface{}{
+		Mgo.Update("historylog", map[string]interface{}{"_id": mongoutil.StringTOBsonId(history_id)}, map[string]interface{}{
 			"$set": map[string]interface{}{
 				"state":        state,
 				"result_count": count,
@@ -92,7 +92,7 @@ func UpdateHistoryState(state int, history_id string, count int) {
 		}, false, false)
 		return
 	}
-	Mgo.Update("historylog", map[string]interface{}{"_id": qu.StringTOBsonId(history_id)}, map[string]interface{}{
+	Mgo.Update("historylog", map[string]interface{}{"_id": mongoutil.StringTOBsonId(history_id)}, map[string]interface{}{
 		"$set": map[string]interface{}{
 			"state": state,
 		},

src/history/task.go

@@ -3,6 +3,7 @@ package history
 import (
 	"encoding/json"
 	"log"
+	mongoutil "qfw/mongodb"
 	qu "qfw/util"
 	"regexp"
 	. "sqlmodel"
@@ -27,7 +28,7 @@ func (c *Customer) GetTagRules(tagRules []map[string]interface{}) {
 			TR := &TagRule{}
 			TR.Fields = make(map[string]interface{})
 			TR.DepartRuleIds = make(map[string]bool)
-			id := qu.BsonIdToSId(tr["_id"])
+			id := mongoutil.BsonIdToSId(tr["_id"])
 			name := qu.ObjToString(tr["s_name"])
 			TR.ID = id
 			TR.Name = name
@@ -431,7 +432,7 @@ func (d *Department) GetSearchRules(cid, stype string, idRange bson.M, searchRul
 			SR := &SearchRule{}
 			SR.Fields = make(map[string]interface{})
 
-			id := qu.BsonIdToSId(sr["_id"])
+			id := mongoutil.BsonIdToSId(sr["_id"])
 			name := qu.ObjToString(sr["s_name"])
 			SR.ID = id
 			SR.Name = name

src/service/customer_service.go

@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"log"
 	"net/http"
+	mongoutil "qfw/mongodb"
 	qu "qfw/util"
 	"strings"
 	"time"
@@ -107,10 +108,10 @@ func (c *Customer) CustomerEdit() {
 	defer qu.Catch()
 	id := c.GetString("id")
 	query := bson.M{}
-	query["_id"] = qu.StringTOBsonId(id)
+	query["_id"] = mongoutil.StringTOBsonId(id)
 	data, _ := Mgo.FindOneByField("cuser", query, `{}`)
 	depart, _ := Mgo.Find("cuserdepart", bson.M{"s_userid": id, "b_delete": false}, nil, nil, false, -1, -1)
-	(*data)["_id"] = qu.BsonIdToSId((*data)["_id"])
+	(*data)["_id"] = mongoutil.BsonIdToSId((*data)["_id"])
 	if (*data)["i_state"] == 1 {
 		tagRule, _ := Mgo.Find("eusertagrule", bson.M{"s_userid": id, "b_delete": false}, nil, nil, false, -1, -1)
 		c.T["tagrule"] = *tagRule
@@ -124,10 +125,10 @@ func (c *Customer) CustomerEuser() {
 	defer qu.Catch()
 	id := c.GetString("id")
 	query := bson.M{}
-	query["_id"] = qu.StringTOBsonId(id)
+	query["_id"] = mongoutil.StringTOBsonId(id)
 	data, _ := Mgo.FindOneByField("euser", query, `{}`)
 	depart, _ := Mgo.Find("euserdepart", bson.M{"s_userid": id, "b_delete": false}, nil, nil, false, -1, -1)
-	(*data)["_id"] = qu.BsonIdToSId((*data)["_id"])
+	(*data)["_id"] = mongoutil.BsonIdToSId((*data)["_id"])
 	if (*data)["i_state"] == 1 {
 		tagRule, _ := Mgo.Find("eusertagrule", bson.M{"s_userid": id, "b_delete": false}, nil, nil, false, -1, -1)
 		c.T["tagrule"] = *tagRule
@@ -173,7 +174,7 @@ func (c *Customer) CustomerSave() {
 			}
 		} else {
 			query := bson.M{
-				"_id": qu.StringTOBsonId(id),
+				"_id": mongoutil.StringTOBsonId(id),
 			}
 			rep = Mgo.Update("cuser", query, bson.M{"$set": data}, false, false)
 		}
@@ -296,7 +297,7 @@ func (c *Customer) CuserToEuser() {
 			"i_state":         1,
 		},
 	}
-	b := Mgo.Update("cuser", bson.M{"_id": qu.StringTOBsonId(_id)}, set, false, false)
+	b := Mgo.Update("cuser", bson.M{"_id": mongoutil.StringTOBsonId(_id)}, set, false, false)
 	if !b {
 		c.ServeJson(map[string]interface{}{
 			"rep": b,
@@ -304,7 +305,7 @@ func (c *Customer) CuserToEuser() {
 		return
 	}
 	//2、复制信息（部门、规则）
-	b = Mgo.Update("euser", bson.M{"_id": qu.StringTOBsonId(_id)}, cuser, true, false)
+	b = Mgo.Update("euser", bson.M{"_id": mongoutil.StringTOBsonId(_id)}, cuser, true, false)
 	if !b {
 		c.ServeJson(map[string]interface{}{
 			"rep": b,
@@ -374,14 +375,14 @@ func (c *Customer) SynEuser() {
 			"i_lastsynctime": nowTime,
 		},
 	}
-	b := Mgo.Update("cuser", bson.M{"_id": qu.StringTOBsonId(_id)}, set, false, false)
+	b := Mgo.Update("cuser", bson.M{"_id": mongoutil.StringTOBsonId(_id)}, set, false, false)
 	if !b {
 		c.ServeJson(map[string]interface{}{
 			"rep": b,
 		})
 		return
 	}
-	b = Mgo.Update("euser", bson.M{"_id": qu.StringTOBsonId(_id)}, cuser, true, false)
+	b = Mgo.Update("euser", bson.M{"_id": mongoutil.StringTOBsonId(_id)}, cuser, true, false)
 	if !b {
 		c.ServeJson(map[string]interface{}{
 			"rep": b,
@@ -552,7 +553,7 @@ func (c *Customer) CuserRuleCreate() {
 			}
 		} else {
 			query := bson.M{
-				"_id": qu.StringTOBsonId(id),
+				"_id": mongoutil.StringTOBsonId(id),
 			}
 			rep = Mgo.Update("cuserdepartrule", query, bson.M{"$set": data}, false, false)
 		}
@@ -584,9 +585,9 @@ func (c *Customer) CuserRuleCreate() {
 func (c *Customer) CuserRuleEdit() {
 	defer qu.Catch()
 	id := c.GetString("id")
-	query := bson.M{"_id": qu.StringTOBsonId(id)}
+	query := bson.M{"_id": mongoutil.StringTOBsonId(id)}
 	data, _ := Mgo.FindOneByField("cuserdepartrule", query, `{}`)
-	(*data)["id"] = qu.BsonIdToSId((*data)["_id"])
+	(*data)["id"] = mongoutil.BsonIdToSId((*data)["_id"])
 	c.T["cid"] = (*data)["s_userid"]
 	c.T["ids"] = qu.ObjToString((*data)["s_departid"]) + "," + qu.ObjToString((*data)["s_userid"])
 	c.T["data"] = *data
@@ -606,9 +607,9 @@ func (c *Customer) CuserRuleEdit() {
 func (c *Customer) EuserRule1() {
 	defer qu.Catch()
 	id := c.GetString("id")
-	query := bson.M{"_id": qu.StringTOBsonId(id)}
+	query := bson.M{"_id": mongoutil.StringTOBsonId(id)}
 	data, _ := Mgo.FindOneByField("euserdepartrule", query, `{}`)
-	(*data)["id"] = qu.BsonIdToSId((*data)["_id"])
+	(*data)["id"] = mongoutil.BsonIdToSId((*data)["_id"])
 	c.T["cid"] = (*data)["s_userid"]
 	c.T["ids"] = qu.ObjToString((*data)["s_departid"]) + "," + qu.ObjToString((*data)["s_userid"])
 	c.T["data"] = *data
@@ -692,7 +693,7 @@ func (c *Customer) EuserTagEdit() {
 			_id = Mgo.Save("eusertagrule", data)
 		} else {
 			query := bson.M{
-				"_id": qu.StringTOBsonId(_id),
+				"_id": mongoutil.StringTOBsonId(_id),
 			}
 			rep = Mgo.Update("eusertagrule", query, bson.M{"$set": data}, false, false)
 		}
@@ -732,7 +733,7 @@ func (c *Customer) EuserTag() {
 			_id = Mgo.Save("eusertagrule", data)
 		} else {
 			query := bson.M{
-				"_id": qu.StringTOBsonId(_id),
+				"_id": mongoutil.StringTOBsonId(_id),
 			}
 			rep = Mgo.Update("eusertagrule", query, bson.M{"$set": data}, false, false)
 		}
@@ -861,10 +862,10 @@ func (c *Customer) CustomerHistory() {
 	id := c.GetString("id")
 	user := c.GetSession("user").(map[string]interface{})
 	query := bson.M{}
-	query["_id"] = qu.StringTOBsonId(id)
+	query["_id"] = mongoutil.StringTOBsonId(id)
 	data, _ := Mgo.FindOneByField("euser", query, `{}`)
 	depart, _ := Mgo.Find("euserdepart", bson.M{"s_userid": id, "b_delete": false}, nil, nil, false, -1, -1)
-	(*data)["_id"] = qu.BsonIdToSId((*data)["_id"])
+	(*data)["_id"] = mongoutil.BsonIdToSId((*data)["_id"])
 	if (*data)["i_state"] == 1 {
 		tagRule, _ := Mgo.Find("eusertagrule", bson.M{"s_userid": id, "b_delete": false}, nil, nil, false, -1, -1)
 		c.T["tagrule"] = *tagRule
@@ -873,7 +874,7 @@ func (c *Customer) CustomerHistory() {
 	history_id := ""
 	if hid != "" {
 		history_id = hid
-		hData, ok := Mgo.FindOne("historylog", bson.M{"_id": qu.StringTOBsonId(history_id)})
+		hData, ok := Mgo.FindOne("historylog", bson.M{"_id": mongoutil.StringTOBsonId(history_id)})
 		if ok && hData != nil && len(*hData) > 0 {
 			// (*hData)["dep_rules"]
 		}
@@ -903,7 +904,7 @@ func (c *Customer) CustomerAllRule() {
 	}
 	inc_query := bson.M{
 		"user_id": customerId,
-		"_id":     qu.StringTOBsonId(history_id),
+		"_id":     mongoutil.StringTOBsonId(history_id),
 	}
 	//获取新增历史规则
 	inc_rules := []map[string]interface{}{}
@@ -965,7 +966,7 @@ func (c *Customer) SaveHistoryRule() {
 	if userid != "" {
 		//user_rules := make(map[string]interface{})
 		user_history, _ := Mgo.FindOne("historylog", map[string]interface{}{
-			"_id": qu.StringTOBsonId(history_id),
+			"_id": mongoutil.StringTOBsonId(history_id),
 		})
 		if *user_history != nil && len(*user_history) != 0 {
 			//获取私有标签
@@ -1004,7 +1005,7 @@ func (c *Customer) SaveHistoryRule() {
 					}
 					isupdata := Mgo.Update("historylog", map[string]interface{}{
 						"user_id": userid,
-						"_id":     qu.StringTOBsonId(history_id),
+						"_id":     mongoutil.StringTOBsonId(history_id),
 					}, set, false, false)
 					if isupdata {
 						c.ServeJson(map[string]interface{}{
@@ -1046,7 +1047,7 @@ func (c *Customer) SaveHistoryRule() {
 				}
 				isupdata := Mgo.Update("historylog", map[string]interface{}{
 					"user_id": userid,
-					"_id":     qu.StringTOBsonId(history_id),
+					"_id":     mongoutil.StringTOBsonId(history_id),
 				}, set, false, false)
 				if isupdata {
 					c.ServeJson(map[string]interface{}{
@@ -1104,7 +1105,7 @@ func (c *Customer) HistoryRuleCreate() {
 				}
 				s_id = Mgo.Save("euserdepart", d_data)
 			} else {
-				s_id = qu.BsonIdToSId((*dData)["_id"])
+				s_id = mongoutil.BsonIdToSId((*dData)["_id"])
 			}
 			data["s_userid"] = user_id
 			data["s_departid"] = s_id
@@ -1123,7 +1124,7 @@ func (c *Customer) HistoryRuleCreate() {
 			}
 		} else {
 			query := bson.M{
-				"_id": qu.StringTOBsonId(id),
+				"_id": mongoutil.StringTOBsonId(id),
 			}
 			reps := Mgo.Update("euserdepartrule", query, bson.M{"$set": data}, false, false)
 			if reps {
@@ -1202,7 +1203,7 @@ func getTserTag(userid string) *[]map[string]interface{} {
 }
 
 func AddHistoryLog(ruleData map[string]interface{}, isUpdate bool, id string) bool {
-	history_id := qu.StringTOBsonId(ruleData["history_id"].(string))
+	history_id := mongoutil.StringTOBsonId(ruleData["history_id"].(string))
 	hData, ok := Mgo.FindOne("historylog", bson.M{"_id": history_id})
 	if ok && hData != nil && *hData != nil && len(*hData) > 0 {
 		dep_rules := []map[string]interface{}{}
@@ -1212,7 +1213,7 @@ func AddHistoryLog(ruleData map[string]interface{}, isUpdate bool, id string) bo
 		ruleData["is_new"] = true
 		if isUpdate {
 			for _, v := range dep_rules {
-				if qu.BsonIdToSId(v["_id"]) == id {
+				if mongoutil.BsonIdToSId(v["_id"]) == id {
 					v = ruleData
 				}
 			}

src/service/feedback_service.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	mongoutil "qfw/mongodb"
 	qu "qfw/util"
 	"strings"
 
@@ -81,7 +82,7 @@ func (f *Feedback) FeedbackDetail() {
 	} else {
 		id := f.GetString("_id")
 		query := bson.M{
-			"_id": qu.StringTOBsonId(id),
+			"_id": mongoutil.StringTOBsonId(id),
 		}
 		data, _ := Mgo.FindOne("feedback", query)
 		f.T["id"] = id

src/service/private_rule.go

@@ -7,6 +7,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"os"
+	mongoutil "qfw/mongodb"
 	qu "qfw/util"
 	"strconv"
 	"strings"
@@ -63,7 +64,7 @@ func (r *Rule) Archive() {
 		rep := false
 		_id := r.GetString("_id")
 		query := bson.M{
-			"_id": qu.StringTOBsonId(_id),
+			"_id": mongoutil.StringTOBsonId(_id),
 		}
 		tag, _ := Mgo.FindOne("tags", query)
 		if len(*tag) > 0 {