111

conf/app.conf

@@ -1,10 +1,9 @@
 appname = 血透
-httpport = 9588
+httpport = 9788
 runmode = dev
 
 copyrequestbody = true
-sessionon = true
-sessiongcmaxlifetime = 64800
+
 
 tokencookiemaxlifetime = 7200
 
@@ -44,7 +43,8 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 [prod]
 httpdomain = http://api.szjkhd.com
 
-
+sessionon = true
+sessiongcmaxlifetime = 64800
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = syh

controllers/admin_api_controllers/admin_api_base_controller.go

@@ -4,6 +4,7 @@ import (
 	"XT_Admin_Api/controllers"
 	"XT_Admin_Api/enums"
 	"XT_Admin_Api/models/admin_models"
+	"XT_Admin_Api/service"
 	"fmt"
 )
 
@@ -31,15 +32,25 @@ func (this *AdminBaseAPIController) TraceLog(format string, a ...interface{}) {
 	//beego.Trace(fmt.Sprintf("[管理员后台] %v", fmt.Sprintf(format, a...)))
 }
 
-func (this *AdminBaseAPIController) GetAdminInfo() *AdminInfo {
-	userInfo := this.GetSession("admin_info")
-	fmt.Println(userInfo)
+func (this *AdminBaseAPIAuthController) GetAdminInfo() *admin_models.AdminAccount {
+	mobile := this.GetString("account")
+	password := this.GetString("password")
+	//adminInfo :=GetAdminInfo(mobile,password)
+	admin, getAdminErr := service.GetAdminAccount(mobile, password)
+	if getAdminErr != nil {
+		this.ErrorLog("获取管理员信息失败:%v", getAdminErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return nil
+	} else if admin == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
 
-	if userInfo == nil {
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAccountOrPasswordWrong)
 		return nil
-	} else {
-		return userInfo.(*AdminInfo)
 	}
+	var ads AdminInfo
+	ads.Admin = admin
+	return admin
+
 }
 
 type AdminInfo struct {
@@ -52,6 +63,7 @@ type AdminBaseAPIAuthController struct {
 
 func (this *AdminBaseAPIAuthController) Prepare() {
 	this.AdminBaseAPIController.Prepare()
+	//name := this.GetString("name")
 	adminInfo := this.GetAdminInfo()
 	fmt.Println(adminInfo)
 	if adminInfo == nil {

controllers/admin_api_controllers/custom_api_controller.go

@@ -8,7 +8,7 @@ import (
 )
 
 type CustomAPIController struct {
-	AdminBaseAPIController
+	AdminBaseAPIAuthController
 }
 
 func (this *CustomAPIController) CreateCustom() {
@@ -721,7 +721,7 @@ func (this *CustomAPIController) CreateFollowInfo() {
 	follow := models.KyyChargeFollow{
 		Ctime:    ctime,
 		Mtime:    mtime,
-		Creator:  this.GetAdminInfo().Admin.ID,
+		Creator:  this.GetAdminInfo().ID,
 		CustomId: customID,
 		Desc:     desc,
 		Status:   1,

controllers/admin_api_controllers/login_api_controller.go

@@ -3,7 +3,6 @@ package admin_api_controllers
 import (
 	"XT_Admin_Api/enums"
 	"XT_Admin_Api/service"
-	"fmt"
 )
 
 type LoginAPIController struct {
@@ -27,11 +26,6 @@ func (this *LoginAPIController) LoginByPwd() {
 		return
 	}
 
-	this.SetSession("admin_info", &AdminInfo{
-		Admin: admin,
-	})
-	//userInfo := this.GetSession("admin_info")
-	fmt.Println(this.GetSession("admin_info"))
 	this.ServeSuccessJSON(map[string]interface{}{
 		"admin": admin,
 	})

controllers/admin_api_controllers/org_api_controller.go

@@ -55,7 +55,7 @@ func (this *OrgAPIController) GetOrgList() {
 		endTime = theTime.Unix()
 	}
 
-	list, err, total := service.GetAllOrgList(active_status, depth_active_status, startTime, endTime, province, city, district, follow, keyword, page, limit, this.GetAdminInfo().Admin.IsAdmin)
+	list, err, total := service.GetAllOrgList(active_status, depth_active_status, startTime, endTime, province, city, district, follow, keyword, page, limit, this.GetAdminInfo().IsAdmin)
 	if err != nil {
 
 	} else {

controllers/admin_api_controllers/system_api_controller.go

@@ -4,7 +4,6 @@ import (
 	"XT_Admin_Api/enums"
 	"XT_Admin_Api/models/admin_models"
 	"XT_Admin_Api/service"
-	"fmt"
 	"time"
 )
 
@@ -28,7 +27,6 @@ func (this *SystemApiController) GetAdminUserInfo() {
 }
 
 func (this *SystemApiController) GetUserList() {
-	fmt.Println(this.GetAdminInfo().Admin)
 	list, _ := service.GetAllAdmin()
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": list,

controllers/function_api_controllers/function_api_router_register.go

@@ -1,97 +0,0 @@
-package function_api_controllers
-
-import (
-	"github.com/astaxie/beego"
-	"fmt"
-)
-
-func FunctionAPIControllersRegisterRouters() {
-	fmt.Println("开始吧")
-	beego.Router("/api/function/gettodayinfo",&FunctionBaseAPIController{},"Get:GetTodayInfo")
-	beego.Router("/api/function/getyestodayinfo",&FunctionBaseAPIController{},"Get:GetYestodayInfo")
-	beego.Router("/api/function/getweekinfo",&FunctionBaseAPIController{},"Get:GetWeekInfo")
-	beego.Router("/api/function/getmonthinfo",&FunctionBaseAPIController{},"Get:GetMonthInfo")
-	beego.Router("/api/function/getthreemonthinfo",&FunctionBaseAPIController{},"Get:GetThreeMonthInfo")
-	beego.Router("/admin/function/gethalfyearinfo",&FunctionBaseAPIController{},"Get:GetHalfYearInfo")
-	beego.Router("/admin/function/getyearinfo",&FunctionBaseAPIController{},"Get:GetYearInfo")
-	beego.Router("/admin/function/gettodaydialysisinfo",&FunctionBaseAPIController{},"Get:GetTodayDialysisInfo")
-	beego.Router("/api/function/getYesterdayDialysisinfo",&FunctionBaseAPIController{},"Get:GetYesterTodayDialysisInfo")
-	beego.Router("/api/function/getweekdialysisinfo",&FunctionBaseAPIController{},"Get:GetWeekDialysisinfo")
-	beego.Router("/api/function/getmonthdailysisinfo",&FunctionBaseAPIController{},"Get:GetMonthDailysisInfo")
-	beego.Router("/api/function/getthreedialysisinfo",&FunctionBaseAPIController{},"Get:GetThreeMonthDailysisInfo")
-	beego.Router("/api/function/gethalfyeardialysisinfo",&FunctionBaseAPIController{},"Get:GetHalfYearDailysisInfo")
-	beego.Router("/api/function/getyeardialysisinfo",&FunctionBaseAPIController{},"Get:GetYearDailysisInfo")
-	beego.Router("/api/function/gettodayreceiveinfo",&FunctionBaseAPIController{},"Get:GetReceiveinfo")
-	beego.Router("/api/function/getReceiveyesterdayinfo",&FunctionBaseAPIController{},"Get:GetYesTodayReceiveinfo")
-	beego.Router("/api/function/getweekreceiveinfo",&FunctionBaseAPIController{},"Get:GetWeekReceiveinfo")
-	beego.Router("/api/function/getMonthreceiveinfo",&FunctionBaseAPIController{},"Get:GetMonthReceiveinfo")
-	beego.Router("/api/function/getMonthreereceiveinfo",&FunctionBaseAPIController{},"Get:GetThreeMonthReceiveinfo")
-	beego.Router("/api/function/getMonhalfyearreceiveinfo",&FunctionBaseAPIController{},"Get:GetHalfYearReceiveinfo")
-	beego.Router("/api/function/getMonyearreceiveinfo",&FunctionBaseAPIController{},"Get:GetYearReceiveinfo")
-	beego.Router("/api/function/getBeforDislysis",&FunctionBaseAPIController{},"Get:GetTodayBeforDislysisInfo")
-	beego.Router("/api/function/getyesterdayBeforDislysis",&FunctionBaseAPIController{},"Get:GetYesterTodayBeforDislysisInfo")
-	beego.Router("/api/function/getmonthBeforDislysis",&FunctionBaseAPIController{},"Get:GetMonthBeforDislysisInfo")
-	beego.Router("/api/function/getweekBeforDislysis",&FunctionBaseAPIController{},"Get:GetWeekBeforDislysisInfo")
-	beego.Router("/api/function/getThreeMonthBeforDislysis",&FunctionBaseAPIController{},"Get:GetThreeMonthBeforDislysisInfo")
-	beego.Router("/api/function/getHalfYearBeforDislysis",&FunctionBaseAPIController{},"Get:GetHalfYearBeforDislysisInfo")
-	beego.Router("/api/function/getYearbefordialysisinfo",&FunctionBaseAPIController{},"Get:GetYearBeforDislysisInfo")
-	beego.Router("/api/function/gettodayDoctorsOrderInfo",&FunctionBaseAPIController{},"Get:GetTodayDoctorsOrderInfo")
-	beego.Router("/api/function/getyearstodayDoctorOrder",&FunctionBaseAPIController{},"Get:GetYesterDayDoctorsOrderInfo")
-	beego.Router("/api/function/getWeekDoctorOrder",&FunctionBaseAPIController{},"Get:GetWeekDoctorOrder")
-	beego.Router("/api/function/getMonthDoctorOrder",&FunctionBaseAPIController{},"Get:GetMonthDoctorOrder")
-	beego.Router("/api/function/getThreeMonthDoctorOrder",&FunctionBaseAPIController{},"Get:GetThreeMonthDoctorOrder")
-	beego.Router("/api/function/getHalfYearDoctorOrder",&FunctionBaseAPIController{},"Get:GetHalfYearDoctorOrder")
-	beego.Router("/api/function/getYearDoctorOrder",&FunctionBaseAPIController{},"Get:GetYearDoctorOrder")
-	beego.Router("/api/function/getTodayDoubleCheckInfo",&FunctionBaseAPIController{},"Get:GetTodayDoubleCheckInfo")
-	beego.Router("/api/function/getYesTodayDoubleCheckInfo",&FunctionBaseAPIController{},"Get:GetYesTodayDoubleCheckInfo")
-	beego.Router("/api/function/getweekDoubleCheckInfo",&FunctionBaseAPIController{},"Get:GetWeekDoubleCheckInfo")
-	beego.Router("/api/function/getMonthDoubleCheckInfo",&FunctionBaseAPIController{},"Get:GetMonthDoubleCheckInfo")
-	beego.Router("/api/function/getThreeMonthDoubleCheckInfo",&FunctionBaseAPIController{},"Get:GetThreeMonthDoubleCheckInfo")
-	beego.Router("/api/function/getHalfYearDoubleCheckInfo",&FunctionBaseAPIController{},"Get:GetHalfYearDoubleCheckInfo")
-	beego.Router("/api/function/getyeardoublecheck",&FunctionBaseAPIController{},"Get:GetYearDoubleCheckInfo")
-	beego.Router("/api/function/getDialysisMachine",&FunctionBaseAPIController{},"Get:GetTodayDialysisMachinek")
-	beego.Router("/api/function/getyesterdayDialysisMachine",&FunctionBaseAPIController{},"Get:GetYesterTodayDialysisMachinek")
-	beego.Router("/api/function/getweekdialysismachaine",&FunctionBaseAPIController{},"Get:GetWeekDialsysImachaine")
-	beego.Router("/api/function/getmonthDialysisMachine",&FunctionBaseAPIController{},"Get:GetMonthDialsysImachaine")
-	beego.Router("/api/function/getthreeMonthDialysismachine",&FunctionBaseAPIController{},"Get:GetThreeMonthDialsysImachaine")
-	beego.Router("/api/function/gethalfyeardialysismachine",&FunctionBaseAPIController{},"Get:GetHalfYearDialysisMachine")
-	beego.Router("/api/function/getyeardialysismachine",&FunctionBaseAPIController{},"Get:GetYearDialysisMachine")
-	beego.Router("/api/function/gettodaydialysisexamination",&FunctionBaseAPIController{},"Get:GetTodayDialysisExamination")
-	beego.Router("/api/function/getyesterdayDialysisexamination",&FunctionBaseAPIController{},"Get:GetYesTodayDialysisExamination")
-	beego.Router("/api/function/getweekdialysisexamination",&FunctionBaseAPIController{},"Get:GetWeekDialysisExamination")
-	beego.Router("/api/function/getmonthdialysisexamination",&FunctionBaseAPIController{},"Get:GetMonthDialysisExamination")
-	beego.Router("/api/function/getthreeMonthDialysisExamination",&FunctionBaseAPIController{},"Get:GetThreeMonthDialysisExamination")
-	beego.Router("/api/function/getHalfYearDialysisExamination",&FunctionBaseAPIController{},"Get:GethalfyearDialysisExamination")
-	beego.Router("/api/function/getyeardialysisexamination",&FunctionBaseAPIController{},"Get:GetYearDialysisExamination")
-	beego.Router("/api/function/gettodaybeforpenetration",&FunctionBaseAPIController{},"Get:GetTodayBeforOrpenetration")
-	beego.Router("/api/function/getyesterdaybeforpenetration",&FunctionBaseAPIController{},"Get:GetYesterDayBeforpinetration")
-	beego.Router("/api/function/getWeekBeforPenetration",&FunctionBaseAPIController{},"Get:GetWeekBeforPenetration")
-	beego.Router("/api/function/getMonthBeforPenetration",&FunctionBaseAPIController{},"Get:GetMonthBeforPenetration")
-	beego.Router("/api/function/getThreeBeforePenetrationMonthInfo",&FunctionBaseAPIController{},"Get:GetThreeMonthBeforPenetration")
-	beego.Router("/api/function/getHalfYearPenetration",&FunctionBaseAPIController{},"Get:GetHalfYearBeforPenetration")
-	beego.Router("/api/function/getYearBeforPenetration",&FunctionBaseAPIController{},"Get:GetYearBeforPenetration")
-	beego.Router("/api/function/getTodayPostAssessment",&FunctionBaseAPIController{},"Get:GetTodayPostAssessment")
-	beego.Router("/api/function/getYesterDayPostAssessment",&FunctionBaseAPIController{},"Get:GetYesterDayPostAssessment")
-	beego.Router("/api/function/getWeekPostAssessment",&FunctionBaseAPIController{},"Get:GetWeekPostAssessment")
-	beego.Router("/api/function/getMonthPostAssessment",&FunctionBaseAPIController{},"Get:GetMonthPostAssessment")
-	beego.Router("/api/function/getThreeMonthAssessment",&FunctionBaseAPIController{},"Get:GetThreeMonthAssessment")
-	beego.Router("/api/function/getHalfYearPostAssessment",&FunctionBaseAPIController{},"Get:GetHalfYearPostAssessment")
-	beego.Router("/api/function/getYearPostAssessment",&FunctionBaseAPIController{},"Get:GetYearPostAssessment")
-	beego.Router("/api/function/gettodayentrylist",&FunctionBaseAPIController{},"Get:GetTodayEntrylist")
-	beego.Router("/api/function/getyesterdayentrylist",&FunctionBaseAPIController{},"Get:GetYesterdayEntrylist")
-	beego.Router("/api/function/getweekentrylist",&FunctionBaseAPIController{},"Get:GetWeekEntrylist")
-	beego.Router("/api/function/getmonthentrylist",&FunctionBaseAPIController{},"Get:GetMonthEntrylist")
-	beego.Router("/api/function/getthreemonthlist",&FunctionBaseAPIController{},"Get:GetThreeMonthEntrylist")
-	beego.Router("/api/function/gethalfentrylsit",&FunctionBaseAPIController{},"Get:GetHalfYearEntrylist")
-	beego.Router("/api/function/getyearentrylist",&FunctionBaseAPIController{},"Get:GetYearEntrylist")
-	beego.Router("/api/function/gettodayexitlist",&FunctionBaseAPIController{},"Get:GetTodayExitlist")
-	beego.Router("/api/function/getyestrdayexitlist",&FunctionBaseAPIController{},"Get:GetYesterdayExitlist")
-	beego.Router("/api/function/getweekexitlist",&FunctionBaseAPIController{},"Get:GetWeekExitlist")
-	beego.Router("/api/function/getmonthexitlist",&FunctionBaseAPIController{},"Get:GetMonthExitlist")
-	beego.Router("/api/function/getthreemonthexitlist",&FunctionBaseAPIController{},"Get:GetThreeMonthExitlist")
-	beego.Router("/api/function/gethalfexitlist",&FunctionBaseAPIController{},"Get:GetHalfExitlist")
-	beego.Router("/api/function/getyearexitlist",&FunctionBaseAPIController{},"Get:GetYearExitlist")
-
-
-
-}

controllers/function_api_controllers/function_base_controller.go

@@ -1,57 +0,0 @@
-package function_api_controllers
-
-import (
-	"XT_Admin_Api/controllers"
-	"XT_Admin_Api/enums"
-	"XT_Admin_Api/models/admin_models"
-)
-
-type FuntionBaseController struct {
-	controllers.BaseAPIController
-}
-
-func (this *FuntionBaseController) ErrorLog(format string, a ...interface{}) {
-	//beego.Error(fmt.Sprintf("[管理员后台] %v", fmt.Sprintf(format, a...)))
-}
-
-func (this *FuntionBaseController) WarnLog(format string, a ...interface{}) {
-	//beego.Warn(fmt.Sprintf("[管理员后台] %v", fmt.Sprintf(format, a...)))
-}
-
-func (this *FuntionBaseController) InfoLog(format string, a ...interface{}) {
-	//beego.Info(fmt.Sprintf("[管理员后台] %v", fmt.Sprintf(format, a...)))
-}
-
-func (this *FuntionBaseController) DebugLog(format string, a ...interface{}) {
-	//beego.Debug(fmt.Sprintf("[管理员后台] %v", fmt.Sprintf(format, a...)))
-}
-
-func (this *FuntionBaseController) TraceLog(format string, a ...interface{}) {
-	//beego.Trace(fmt.Sprintf("[管理员后台] %v", fmt.Sprintf(format, a...)))
-}
-
-func (this *FuntionBaseController) GetAdminInfo() *AdminInfo {
-	userInfo := this.GetSession("admin_info")
-	if userInfo == nil {
-		return nil
-	} else {
-		return userInfo.(*AdminInfo)
-	}
-}
-
-type AdminInfo struct {
-	Admin *admin_models.AdminAccount
-}
-
-type FunctionBaseAPIAuthController struct {
-	FuntionBaseController
-}
-
-func (this *FunctionBaseAPIAuthController) Prepare() {
-	this.FuntionBaseController.Prepare()
-	adminInfo := this.GetAdminInfo()
-	if adminInfo == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
-	}
-}

main.go

@@ -3,17 +3,13 @@ package main
 import (
 	_ "XT_Admin_Api/routers"
 	"XT_Admin_Api/service"
-	"net/http"
-
 	"github.com/astaxie/beego"
 	_ "net/http/pprof"
 )
 
 func init() {
 	service.ConnectDB()
-	go func() {
-		http.ListenAndServe("localhost:6060", nil)
-	}()
+
 }
 
 func main() {

routers/router.go

@@ -2,7 +2,6 @@ package routers
 
 import (
 	admin_api "XT_Admin_Api/controllers/admin_api_controllers"
-	function_api "XT_Admin_Api/controllers/function_api_controllers"
 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/plugins/cors"
 )
@@ -20,5 +19,4 @@ func init() {
 	// beego.Router("/", &controllers.MainController{})
 
 	admin_api.AdminAPIControllersRegisterRouters()
-	function_api.FunctionAPIControllersRegisterRouters()
 }