modified action.js and qor_default.hs

route.go

@@ -10,9 +10,12 @@ import (
 	"strings"
 	"time"
 
+	"fmt"
+
 	"github.com/qor/qor"
 	"github.com/qor/qor/utils"
 	"github.com/qor/roles"
+	"net"
 )
 
 // Middleware is a way to filter a request and response coming into your application
@@ -31,6 +34,20 @@ type Middleware struct {
 	next    *Middleware
 }
 
+type AdminResponseWriter struct {
+	http.ResponseWriter
+	statusCode int
+}
+
+func NewLoggingResponseWrite(w http.ResponseWriter) *AdminResponseWriter {
+	return &AdminResponseWriter{w, http.StatusOK}
+}
+
+func (lrw *AdminResponseWriter) WriteHeader(code int) {
+	lrw.statusCode = code
+	lrw.ResponseWriter.WriteHeader(code)
+}
+
 // Next will call the next middleware
 func (middleware Middleware) Next(context *Context) {
 	if next := middleware.next; next != nil {
@@ -162,7 +179,6 @@ func (admin *Admin) NewServeMux(prefix string) http.Handler {
 					return
 				}
 			}
-
 			middleware.Next(context)
 		},
 	})
@@ -179,7 +195,6 @@ func (admin *Admin) NewServeMux(prefix string) http.Handler {
 			http.NotFound(context.Writer, context.Request)
 		},
 	})
-
 	return &serveMux{admin: admin}
 }
 
@@ -193,8 +208,10 @@ func (serveMux *serveMux) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 		admin        = serveMux.admin
 		RelativePath = "/" + strings.Trim(strings.TrimPrefix(req.URL.Path, admin.router.Prefix), "/")
 		context      = admin.NewContext(w, req)
+		params       string
 	)
 
+
 	// Parse Request Form
 	req.ParseMultipartForm(2 * 1024 * 1024)
 	defer func() {
@@ -216,7 +233,41 @@ func (serveMux *serveMux) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	defer func() func() {
 		begin := time.Now()
 		return func() {
-			log.Printf("Finish [%s] %s Took %.2fms\n", req.Method, req.RequestURI, time.Now().Sub(begin).Seconds()*1000)
+			realIP := ""
+			log.Printf("%v",req,"Request Real IP")
+			ips := strings.Split(req.Header.Get("HTTP_X_FORWARDED_FOR"), ",")
+			if len(ips) == 0 {
+				ips = strings.Split(req.Header.Get("REMOTE_ADDR"), ",")
+			}
+			log.Printf("headers ips:%v",ips)
+			if len(ips)==1{
+				addrs, _ := net.InterfaceAddrs()
+				log.Printf("net interfaceAddrs:%v",addrs)
+				for _, address := range addrs {
+					if ipnet, ok := address.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
+						if ipnet.IP.To4() != nil {
+							realIP=ipnet.IP.String()
+						}
+
+					}
+				}
+			}else{
+				for _, ip := range ips {
+					r := regexp.MustCompile(`10\.|172\.1[6-9]\.|172\.3[0-1]\.|192\.168\.|172\.2[0-9]\.`)
+					if r.Match([]byte(ip)) {
+						continue
+					}
+					realIP = ip
+					break
+				}
+			}
+			code := context.Writer.(*AdminResponseWriter).statusCode
+			log.SetFlags(0)
+			userID:=context.CurrentUser.GetId()
+			if userID==""{
+				userID=""
+			}
+			log.Printf("ip=%v user=%v date=%v path=%v method=%v status=%v duration=%v params={%v}", realIP, userID, time.Now().Format("2006-01-02 15:03:04"), req.URL.Path, req.Method, code, time.Now().Sub(begin).Seconds()*1000, params)
 		}
 	}()()
 
@@ -236,12 +287,16 @@ func (serveMux *serveMux) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	switch req.Method {
 	case "GET":
 		permissionMode = roles.Read
+		params = getParameters(req)
 	case "PUT":
 		permissionMode = roles.Update
+		params = getParameters(req)
 	case "POST":
 		permissionMode = roles.Create
+		params = getParameters(req)
 	case "DELETE":
 		permissionMode = roles.Delete
+		params = getParameters(req)
 	}
 
 	handlers := admin.router.routers[strings.ToUpper(req.Method)]
@@ -262,6 +317,8 @@ func (serveMux *serveMux) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 		}
 	}
 
+	context.Writer = NewLoggingResponseWrite(context.Writer)
+
 	// Call first middleware
 	for _, middleware := range admin.router.middlewares {
 		middleware.Handler(context, middleware)
@@ -362,3 +419,19 @@ func (res *Resource) RegisterRoute(method string, relativePath string, handler r
 		router.Delete(path.Join(prefix, relativePath), handler, config)
 	}
 }
+
+// get body parameters
+func getParameters(req *http.Request) (params string) {
+	values, _ := url.ParseQuery(req.URL.RawQuery)
+	if values != nil {
+		for key, value := range values {
+			params += fmt.Sprintf(`"%s":"%s"`, key, value)
+		}
+	}
+	if req.PostForm != nil {
+		for key, value := range req.PostForm {
+			params += fmt.Sprintf(`"%s":"%s"`, key, value)
+		}
+	}
+	return
+}

views/assets/javascripts/qor/qor-action.js

@@ -228,10 +228,13 @@
                 isUndo = $actionButton.hasClass(CLASS_IS_UNDO),
                 isInSlideout = $actionButton.closest(CLASS_SLIDEOUT).length,
                 needDisableButtons = $element.length && !isInSlideout;
-
             if (isUndo) {
                 url = undoUrl; // notification has undo url
             }
+            if (isInSlideout==0){
+                isInSlideout = $element.length;
+                needDisableButtons = $element.length && !isInSlideout;
+            }
 
             $.ajax(url, {
                 method: properties.method,