Merge branch 'master' of http://git.shengws.com/csx/XT_New

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 

controllers/device_api_controller.go

@@ -1109,7 +1109,6 @@ func (this *DeviceAPIController) GetAllMachineInfo() {
 	adminUserInfo := this.GetAdminUserInfo()
 	orgid := adminUserInfo.CurrentOrgId
 	addmahcer, total, err := service.GetAllMachineInfo(page, limit, searchKey, zoneid, equipmentid, statusid, orgid)
-	fmt.Println("addmacher", addmahcer)
 	//fmt.Println("err------------------------------------------------------", err)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "查询设备失败")

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -8,7 +8,6 @@ import (
 	"crypto/md5"
 	"encoding/json"
 	"fmt"
-	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
 	"strconv"
 	"strings"
@@ -1992,7 +1991,6 @@ func (this *NewDialysisApiController) LoginOut() {
 	this.Ctx.SetCookie("logout_cookie", "1")
 	this.Ctx.SetCookie("token_cookie", "")
 	id, _ := this.GetInt64("id")
-	fmt.Println("id------------------------------------------", id)
 	loginLog := models.SgjUserAdminLoginLog{
 		AdminUserId: id,
 		OrgId:       0,
@@ -2361,18 +2359,16 @@ func (this *NewDialysisApiController) GetCurrentOrg() {
 	nowTime := time.Now().Unix()
 	adminInfo := this.GetMobileAdminUserInfo()
 	orgId := adminInfo.Org.Id
-	fxKey := beego.AppConfig.String("fxtokenkey")
-	stringA := fmt.Sprintf("org_id=%d&time=%d", orgId, nowTime)
 
+	var key = "kN*5&AHqLP7&IGRKvHoElJm*2YY6Nw*QSScJ4ff&DH&ofGnbfQIks1A1NT9AbIDB"
+	stringA := fmt.Sprintf("org_id=%d&time=%d", orgId, nowTime)
 	data := []byte(stringA)
 	has := md5.Sum(data)
 	md5str := fmt.Sprintf("%x", has)
-	stringB := fmt.Sprintf("string=%s&key=%s", md5str, fxKey)
-
+	stringB := fmt.Sprintf("string=%s&key=%s", md5str, key)
 	data = []byte(stringB)
 	has = md5.Sum(data)
 	signToken := fmt.Sprintf("%x", has)
-
 	name, err := service.GetOrgName(orgId)
 	//var fxlink = signToken + fmt.Sprintf("&fxtoken=%s&fxorgid=%d&timestamp=%d&fxadmin=%d", signToken, orgId, nowTime, name.Creator)
 	//fmt.Println(fxlink)