|
|
@@ -107,8 +107,8 @@ func (la *LightAuth) Login(c *entitys.CtrlContext) {
|
|
|
//登录日志
|
|
|
if session != nil {
|
|
|
ip := RemoteIp(c.Ctx.Request)
|
|
|
- sql := "insert into log_sys_login (user_id,account,ip_addr,login_time,del_flag,login_type,user_name) values (?, ?,?,?,?,?,?)"
|
|
|
- _, err = session.Exec(sql, user.Id, user.LoginId, ip, sysmodel.NowLocal().Value(), 0, 0, user.Name)
|
|
|
+ sql := "insert into log_sys_login (user_id,account,ip_addr,login_time,del_flag,login_type,user_name,resource_type) values (?, ?,?,?,?,?,?,?)"
|
|
|
+ _, err = session.Exec(sql, user.Id, user.LoginId, ip, sysmodel.NowLocal().Value(), 0, 0, user.Name,"E-school账号")
|
|
|
if err != nil {
|
|
|
c.Ctx.JSON(200, sysmodel.SysReturn{400, err.Error(), nil})
|
|
|
return
|
|
|
@@ -138,8 +138,19 @@ func (la *LightAuth) Logout(c *entitys.CtrlContext) {
|
|
|
return
|
|
|
}
|
|
|
ip := RemoteIp(c.Ctx.Request)
|
|
|
- sql := "insert into log_sys_login (user_id,account,ip_addr,login_time,del_flag,login_type,user_name) values (?, ?,?,?,?,?,?)"
|
|
|
- _, err = session.Exec(sql, user.Id, user.LoginId, ip, sysmodel.NowLocal().Value(), 0, 1, user.Name)
|
|
|
+ var resource_type string
|
|
|
+ res,err:=session.Where("login_id = ?", user.LoginId).Query().List()
|
|
|
+ if err!=nil{
|
|
|
+ c.Ctx.JSON(200, sysmodel.SysReturn{400, err.Error(), nil})
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if len(res)>0{
|
|
|
+ resource_type = res[0]["resource_type"]
|
|
|
+ }
|
|
|
+
|
|
|
+ sql := "insert into log_sys_login (user_id,account,ip_addr,login_time,del_flag,login_type,user_name,resource_type) values (?, ?,?,?,?,?,?,?)"
|
|
|
+ if
|
|
|
+ _, err = session.Exec(sql, user.Id, user.LoginId, ip, sysmodel.NowLocal().Value(), 0, 1, user.Name,resource_type)
|
|
|
if err != nil {
|
|
|
c.Ctx.JSON(200, sysmodel.SysReturn{400, err.Error(), nil})
|
|
|
return
|
|
|
@@ -156,16 +167,6 @@ const (
|
|
|
|
|
|
// RemoteIp 返回远程客户端的 IP,如 192.168.1.1
|
|
|
func RemoteIp(req *http.Request) string {
|
|
|
- fmt.Printf("Header+++++++++++++++%v\n", req.Header)
|
|
|
- fmt.Printf("XForwardedFor+++++++++++++++%v\n", req.Header.Get(XForwardedFor))
|
|
|
- fmt.Printf("XRealIP+++++++++++++++%v\n", req.Header.Get(XRealIP))
|
|
|
- fmt.Printf("x-original-forwarded-for+++++++++++++++%v\n", req.Header.Get("x-original-forwarded-for"))
|
|
|
- fmt.Printf("RemoteAddr+++++++++++++++%v\n", req.RemoteAddr)
|
|
|
- fmt.Printf("WL-Proxy-Client-IP++++++++++%v\n", req.Header.Get("WL-Proxy-Client-IP"))
|
|
|
- fmt.Printf("HTTP_CLIENT_IP++++++++++%v\n", req.Header.Get("HTTP_CLIENT_IP"))
|
|
|
- fmt.Printf("HTTP_X_FORWARDED_FOR++++++++++%v\n", req.Header.Get("HTTP_X_FORWARDED_FOR"))
|
|
|
- fmt.Printf("Proxy-Client-IP++++++++++%v\n", req.Header.Get("Proxy-Client-IP"))
|
|
|
-
|
|
|
remoteAddr := req.RemoteAddr
|
|
|
if ip := req.Header.Get(XRealIP); ip != "" {
|
|
|
remoteAddr = ip
|