diff --git a/go.mod b/go.mod
index d9c12ea3a..8c1844cb4 100755
--- a/go.mod
+++ b/go.mod
@@ -87,6 +87,7 @@ require (
github.com/niklasfasching/go-org v0.1.9
github.com/oliamb/cutter v0.2.2
github.com/olivere/elastic/v7 v7.0.9
+ github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pkg/errors v0.9.1
github.com/pquerna/otp v1.2.0
github.com/prometheus/client_golang v1.1.0
diff --git a/go.sum b/go.sum
index 9bae7932d..1d5ce94c7 100755
--- a/go.sum
+++ b/go.sum
@@ -39,11 +39,9 @@ gitea.com/macaron/inject v0.0.0-20190803172902-8375ba841591/go.mod h1:h6E4kLao1Y
gitea.com/macaron/inject v0.0.0-20190805023432-d4c86e31027a h1:aOKEXkDTnh4euoH0so/THLXeHtQuqHmDPb1xEk6Ehok=
gitea.com/macaron/inject v0.0.0-20190805023432-d4c86e31027a/go.mod h1:h6E4kLao1Yko6DOU6QDnQPcuoNzvbZqzj2mtPcEn1aM=
gitea.com/macaron/macaron v1.3.3-0.20190803174002-53e005ff4827/go.mod h1:/rvxMjIkOq4BM8uPUb+VHuU02ZfAO6R4+wD//tiCiRw=
-gitea.com/macaron/macaron v1.3.3-0.20190821202302-9646c0587edb h1:amL0md6orTj1tXY16ANzVU9FmzQB+W7aJwp8pVDbrmA=
gitea.com/macaron/macaron v1.3.3-0.20190821202302-9646c0587edb/go.mod h1:0coI+mSPSwbsyAbOuFllVS38awuk9mevhLD52l50Gjs=
gitea.com/macaron/macaron v1.4.0 h1:FY1QDGqyuUzs21K6ChkbYbRUfwL7v2aUrhNEJ0IgsAw=
gitea.com/macaron/macaron v1.4.0/go.mod h1:P7hfDbQjcW22lkYkXlxdRIfWOXxH2+K4EogN4Q0UlLY=
-gitea.com/macaron/session v0.0.0-20190821211443-122c47c5f705 h1:mvkQGAlON1Z6Y8pqa/+FpYIskk54mazuECUfZK5oTg0=
gitea.com/macaron/session v0.0.0-20190821211443-122c47c5f705/go.mod h1:1ujH0jD6Ca4iK9NL0Q2a7fG2chvXx5hVa7hBfABwpkA=
gitea.com/macaron/session v0.0.0-20191207215012-613cebf0674d h1:XLww3CvnFZkXVwauN67fniDaIpIqsE+9KVcxlZKlvLU=
gitea.com/macaron/session v0.0.0-20191207215012-613cebf0674d/go.mod h1:FanKy3WjWb5iw/iZBPk4ggoQT9FcM6bkBPvmDmsH6tY=
@@ -70,7 +68,6 @@ github.com/RichardKnop/machinery v1.6.9 h1:dQu1c7ENgPFrN9qWweEe7xDDvNYGSqEyprK0G
github.com/RichardKnop/machinery v1.6.9/go.mod h1:BO7MG/5tvdpgMVkOT8V94SEf8x8H8aceRzTt8Tx1IMc=
github.com/RichardKnop/redsync v1.2.0 h1:gK35hR3zZkQigHKm8wOGb9MpJ9BsrW6MzxezwjTcHP0=
github.com/RichardKnop/redsync v1.2.0/go.mod h1:9b8nBGAX3bE2uCfJGSnsDvF23mKyHTZzmvmj5FH3Tp0=
-github.com/RoaringBitmap/roaring v0.4.21 h1:WJ/zIlNX4wQZ9x8Ey33O1UaD9TCTakYsdLFSBcTwH+8=
github.com/RoaringBitmap/roaring v0.4.21/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo=
github.com/RoaringBitmap/roaring v0.4.23 h1:gpyfd12QohbqhFO4NVDUdoPOCXsyahYRQhINmlHxKeo=
github.com/RoaringBitmap/roaring v0.4.23/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo=
@@ -140,11 +137,9 @@ github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
github.com/couchbase/ghistogram v0.1.0/go.mod h1:s1Jhy76zqfEecpNWJfWUiKZookAFaiGOEoyzgHt9i7k=
-github.com/couchbase/gomemcached v0.0.0-20190515232915-c4b4ca0eb21d h1:XMf4E1U+b9E3ElF0mjvfXZdflBRZz4gLp16nQ/QSHQM=
github.com/couchbase/gomemcached v0.0.0-20190515232915-c4b4ca0eb21d/go.mod h1:srVSlQLB8iXBVXHgnqemxUXqN6FCvClgCMPCsjBDR7c=
github.com/couchbase/gomemcached v0.0.0-20191004160342-7b5da2ec40b2 h1:vZryARwW4PSFXd9arwegEywvMTvPuXL3/oa+4L5NTe8=
github.com/couchbase/gomemcached v0.0.0-20191004160342-7b5da2ec40b2/go.mod h1:srVSlQLB8iXBVXHgnqemxUXqN6FCvClgCMPCsjBDR7c=
-github.com/couchbase/goutils v0.0.0-20190315194238-f9d42b11473b h1:bZ9rKU2/V8sY+NulSfxDOnXTWcs1rySqdF1sVepihvo=
github.com/couchbase/goutils v0.0.0-20190315194238-f9d42b11473b/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs=
github.com/couchbase/goutils v0.0.0-20191018232750-b49639060d85 h1:0WMIDtuXCKEm4wtAJgAAXa/qtM5O9MariLwgHaRlYmk=
github.com/couchbase/goutils v0.0.0-20191018232750-b49639060d85/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs=
@@ -169,7 +164,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM=
-github.com/denisenkom/go-mssqldb v0.0.0-20190924004331-208c0a498538 h1:bpWCJ5MddHsv4Xtl3azkK89mZzd/vvut32mvAnKbyUA=
github.com/denisenkom/go-mssqldb v0.0.0-20190924004331-208c0a498538/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzqk8QCaRC4os14xoKDdbHqqlJtJA0oc1ZAjg=
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
@@ -185,7 +179,6 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
github.com/editorconfig/editorconfig-core-go/v2 v2.1.1 h1:mhPg/0hGebcpiiQLqJD2PWWyoHRLEdZ3sXKaEvT1EQU=
github.com/editorconfig/editorconfig-core-go/v2 v2.1.1/go.mod h1:/LuhWJiQ9Gvo1DhVpa4ssm5qeg8rrztdtI7j/iCie2k=
-github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw=
github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
@@ -306,7 +299,6 @@ github.com/go-swagger/go-swagger v0.21.0 h1:AX9mdfzp6eJtUe92nFrWmbK7ocRgkCDPJs0F
github.com/go-swagger/go-swagger v0.21.0/go.mod h1:tDb8PdDVFcaE8EPXkMOsuxpL3UEPiwu1UDZar9Z/1RY=
github.com/go-swagger/scan-repo-boundary v0.0.0-20180623220736-973b3573c013 h1:l9rI6sNaZgNC0LnF3MiE+qTmyBA/tZAg1rtyrGbUMK0=
github.com/go-swagger/scan-repo-boundary v0.0.0-20180623220736-973b3573c013/go.mod h1:b65mBPzqzZWxOZGxSWrqs4GInLIn+u99Q9q7p+GKni0=
-github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y=
github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
@@ -330,13 +322,11 @@ github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb
github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0 h1:oOuy+ugB+P/kBdUnG5QaMXSIyJ1q38wWSojYCb3z5VQ=
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
github.com/golang/protobuf v1.4.1 h1:ZFgWrT+bLgsYPirOnRfKLYJLvssAegOj/hgyMFdJZe0=
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
@@ -349,7 +339,6 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -375,7 +364,6 @@ github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c h1:7lF+Vz0LqiRidnzC1Oq86fpX1q/iEv2KJdrCtttYjT4=
github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99 h1:twflg0XRTjwKpxb/jFExr4HGq6on2dEOmnL6FV+fgPw=
github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
@@ -406,7 +394,6 @@ github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVo
github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI=
github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
-github.com/hashicorp/go-retryablehttp v0.6.4 h1:BbgctKO892xEyOXnGiaAwIoSq1QZ/SS4AhjoAh9DnfY=
github.com/hashicorp/go-retryablehttp v0.6.4/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
github.com/hashicorp/go-retryablehttp v0.6.6 h1:HJunrbHTDDbBb/ay4kxa1n+dLmttUlnP3V9oNE4hmsM=
github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
@@ -458,7 +445,6 @@ github.com/keybase/go-crypto v0.0.0-20200123153347-de78d2cb44f4 h1:cTxwSmnaqLoo+
github.com/keybase/go-crypto v0.0.0-20200123153347-de78d2cb44f4/go.mod h1:ghbZscTyKdM07+Fw3KSi0hcJm+AlEUWj8QLlPtijN/M=
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.9.2 h1:LfVyl+ZlLlLDeQ/d2AqfGIIH4qEDu0Ed2S5GyhCWIWY=
github.com/klauspost/compress v1.9.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
github.com/klauspost/compress v1.10.2 h1:Znfn6hXZAHaLPNnlqUYRrBSReFHYybslgv4PTiyz6P0=
github.com/klauspost/compress v1.10.2/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
@@ -472,7 +458,6 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
@@ -545,7 +530,6 @@ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
github.com/mrjones/oauth v0.0.0-20180629183705-f4e24b6d100c h1:3wkDRdxK92dF+c1ke2dtj7ZzemFWBHB9plnJOtlwdFA=
github.com/mrjones/oauth v0.0.0-20180629183705-f4e24b6d100c/go.mod h1:skjdDftzkFALcuGzYSklqYd8gvat6F1gZJ4YPVbkZpM=
-github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae h1:VeRdUYdCw49yizlSbMEn2SZ+gT+3IUKx8BqxyQdz+BY=
github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg=
github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM=
github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw=
@@ -580,6 +564,8 @@ github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFSt
github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
github.com/openzipkin/zipkin-go v0.1.3/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
+github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
github.com/pelletier/go-toml v1.4.0 h1:u3Z1r+oOXJIkxqw34zVhyPgjBsm6X2wn21NWs/HfSeg=
@@ -588,7 +574,6 @@ github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ=
github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -715,7 +700,6 @@ github.com/streadway/amqp v0.0.0-20190214183023-884228600bc9 h1:wR6aLKdbJ5E8m+NZ
github.com/streadway/amqp v0.0.0-20190214183023-884228600bc9/go.mod h1:1WNBiOZtZQLpVAyu0iTduoJL9hEsMloAK5XWrtW0xdY=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@@ -731,7 +715,6 @@ github.com/tecbot/gorocksdb v0.0.0-20181010114359-8752a9433481/go.mod h1:ahpPrc7
github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tinylib/msgp v1.1.0 h1:9fQd+ICuRIu/ue4vxJZu6/LzxN0HwMds2nq/0cFvxHU=
github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
github.com/tinylib/msgp v1.1.2 h1:gWmO7n0Ys2RBEb7GPYB9Ujq8Mk5p2U08lRnmMcGy6BQ=
github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
@@ -746,7 +729,6 @@ github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGr
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
github.com/unknwon/cae v1.0.0 h1:i39lOFaBXZxhGjQOy/RNbi8uzettCs6OQxpR0xXohGU=
github.com/unknwon/cae v1.0.0/go.mod h1:QaSeRctcea9fK6piJpAMCCPKxzJ01+xFcr2k1m3WRPU=
-github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e h1:GSGeB9EAKY2spCABz6xOX5DbxZEXolK+nBSvmsQwRjM=
github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM=
github.com/unknwon/com v1.0.1 h1:3d1LTxD+Lnf3soQiD4Cp/0BRB+Rsa/+RTvz8GMMzIXs=
github.com/unknwon/com v1.0.1/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM=
@@ -772,7 +754,6 @@ github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:
github.com/yohcop/openid-go v1.0.0 h1:EciJ7ZLETHR3wOtxBvKXx9RV6eyHZpCaSZ1inbBaUXE=
github.com/yohcop/openid-go v1.0.0/go.mod h1:/408xiwkeItSPJZSTPF7+VtZxPkPrRRpRNK2vjGh6yI=
github.com/yuin/goldmark v1.1.7/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.25 h1:isv+Q6HQAmmL2Ofcmg8QauBmDPlUUnSoNhEcC940Rds=
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.27 h1:nqDD4MMMQA0lmWq03Z2/myGPYLQoXtmi0rGVs95ntbo=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -813,16 +794,15 @@ golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190907121410-71b5226ff739/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad h1:5E5raQxcv+6CZ11RrBYQe5WRbUIWpScjh0kvHZkZIrQ=
golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM=
golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 h1:IaQbIIB2X/Mp/DKctl6ROxz1KyMlKp4uyvL6+kQ7C88=
golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a h1:gHevYm0pO4QUbwy8Dmdr01R5r1BuKtfYqRqF0h/Cbh0=
golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -832,9 +812,7 @@ golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTk
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee h1:WG0RUwxtNT4qqaXX3DPA8zHFNm/D9xaBpxzHt1WcA/E=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -865,7 +843,6 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0=
golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200513185701-a91f0712d120 h1:EZ3cVSzKOlJxAd8e8YAJ7no8nNypTxexh/YE/xW3ZEY=
golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
@@ -876,7 +853,6 @@ golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAG
golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190220154721-9b3c75971fc9/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw=
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -915,13 +891,10 @@ golang.org/x/sys v0.0.0-20190730183949-1393eb018365/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190907184412-d223b2b6db03/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191010194322-b09406accb47 h1:/XfQ9z7ib8eEJX2hdgFTZJ/ntt0swNk5oYBziWeTCvY=
golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0RIXVLwsHlnvJ+cT1So=
golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200509044756-6aff5f38e54f h1:mOhmO9WsBaJCNmaZHPtHs9wOcdqdKCjF6OPJlmDM3KI=
golang.org/x/sys v0.0.0-20200509044756-6aff5f38e54f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -932,7 +905,6 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 h1:NusfzzA6yGQ+ua51ck7E3omNUX/JuqbFSaRGqU8CcLI=
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -955,14 +927,11 @@ golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgw
golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200225230052-807dcd883420 h1:4RJNOV+2rLxMEfr6QIpC7GEv9MjD6ApGXTCLrNF9+eA=
golang.org/x/tools v0.0.0-20200225230052-807dcd883420/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200325010219-a49f79bcc224 h1:azwY/v0y0K4mFHVsg5+UrTgchqALYWpqVo6vL5OmkmI=
golang.org/x/tools v0.0.0-20200325010219-a49f79bcc224/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
golang.org/x/tools v0.0.0-20200515220128-d3bf790afa53 h1:vmsb6v0zUdmUlXfwKaYrHPPRCV0lHq/IwNIf0ASGjyQ=
golang.org/x/tools v0.0.0-20200515220128-d3bf790afa53/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -984,7 +953,6 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.4 h1:WiKh4+/eMB2HaY7QhCfW/R7MuRAoA8QMCSJA6jP5/fo=
google.golang.org/appengine v1.6.4/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
@@ -1016,7 +984,6 @@ google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLY
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0 h1:qdOKuR/EIArgaWNjetjgTzgVTAZ+S/WXVrq9HW9zimw=
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
google.golang.org/protobuf v1.22.0 h1:cJv5/xdbk1NnMPR1VP9+HU6gupuG9MLBoH1r6RHZ2MY=
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
@@ -1027,7 +994,6 @@ gopkg.in/asn1-ber.v1 v1.0.0-20150924051756-4e86f4367175 h1:nn6Zav2sOQHCFJHEspya8
gopkg.in/asn1-ber.v1 v1.0.0-20150924051756-4e86f4367175/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -1058,9 +1024,7 @@ gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -1078,13 +1042,11 @@ sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2
sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=
strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251 h1:mUcz5b3FJbP5Cvdq7Khzn6J9OCUQJaBwgBkCR+MOwSs=
strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1:FJGmPh3vz9jSos1L/F91iAgnC/aejc0wIIrF2ZwJxdY=
-xorm.io/builder v0.3.6 h1:ha28mQ2M+TFx96Hxo+iq6tQgnkC9IZkM6D8w9sKHHF8=
xorm.io/builder v0.3.6/go.mod h1:LEFAPISnRzG+zxaxj2vPicRwz67BdhFreKg8yv8/TgU=
xorm.io/builder v0.3.7 h1:2pETdKRK+2QG4mLX4oODHEhn5Z8j1m8sXa7jfu+/SZI=
xorm.io/builder v0.3.7/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
xorm.io/core v0.7.2 h1:mEO22A2Z7a3fPaZMk6gKL/jMD80iiyNwRrX5HOv3XLw=
xorm.io/core v0.7.2/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM=
-xorm.io/xorm v0.8.0 h1:iALxgJrX8O00f8Jk22GbZwPmxJNgssV5Mv4uc2HL9PM=
xorm.io/xorm v0.8.0/go.mod h1:ZkJLEYLoVyg7amJK/5r779bHyzs2AU8f8VMiP6BM7uY=
xorm.io/xorm v1.0.1 h1:/lITxpJtkZauNpdzj+L9CN/3OQxZaABrbergMcJu+Cw=
xorm.io/xorm v1.0.1/go.mod h1:o4vnEsQ5V2F1/WK6w4XTwmiWJeGj82tqjAnHe44wVHY=
diff --git a/models/models.go b/models/models.go
index a72ebe5db..11f445830 100755
--- a/models/models.go
+++ b/models/models.go
@@ -143,6 +143,12 @@ func init() {
new(SummaryStatistic),
new(UserBusinessAnalysis),
new(UserBusinessAnalysisAll),
+ new(UserBusinessAnalysisCurrentYear),
+ new(UserBusinessAnalysisLast30Day),
+ new(UserBusinessAnalysisLastMonth),
+ new(UserBusinessAnalysisCurrentMonth),
+ new(UserBusinessAnalysisCurrentWeek),
+ new(UserBusinessAnalysisYesterday),
new(UserLoginLog),
)
diff --git a/models/repo.go b/models/repo.go
index 8070d7442..f393b51b2 100755
--- a/models/repo.go
+++ b/models/repo.go
@@ -6,6 +6,7 @@
package models
import (
+ "code.gitea.io/gitea/modules/git"
"context"
"crypto/md5"
"errors"
@@ -2519,3 +2520,53 @@ func UpdateRepositoryCommitNum(repo *Repository) error {
return nil
}
+
+type RepoFile struct {
+ CommitId string
+ Content []byte
+}
+
+// ReadLatestFileInRepo read latest version of file in repository
+// return a RepoFile
+func ReadLatestFileInRepo(userName, repoName, refName, treePath string) (*RepoFile, error) {
+ var err error
+ repoPath := RepoPath(userName, repoName)
+ gitRepo, err := git.OpenRepository(repoPath)
+ if err != nil {
+ log.Error("ReadLatestFileInRepo error when OpenRepository,error=%v", err)
+ return nil, err
+ }
+ commitID, err := gitRepo.GetBranchCommitID(refName)
+ if err != nil {
+ log.Error("ReadLatestFileInRepo error when GetBranchCommitID,error=%v", err)
+ return nil, err
+ }
+ commit, err := gitRepo.GetBranchCommit(refName)
+ if err != nil {
+ log.Error("ReadLatestFileInRepo error when GetBranchCommit,error=%v", err)
+ return nil, err
+ }
+
+ blob, err := commit.GetBlobByPath(treePath)
+ if err != nil {
+ log.Error("ReadLatestFileInRepo error when GetBlobByPath,error=%v", err)
+ return nil, err
+ }
+
+ reader, err := blob.DataAsync()
+ if err != nil {
+ return nil, err
+ }
+ defer func() {
+ if err = reader.Close(); err != nil {
+ log.Error("ReadLatestFileInRepo: Close: %v", err)
+ }
+ }()
+
+ buf := make([]byte, 1024)
+ n, _ := reader.Read(buf)
+ if n >= 0 {
+ buf = buf[:n]
+ }
+ return &RepoFile{CommitId: commitID, Content: buf}, nil
+}
diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go
index a15b9db5f..d04e350c2 100644
--- a/models/user_business_analysis.go
+++ b/models/user_business_analysis.go
@@ -10,10 +10,12 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/timeutil"
"xorm.io/builder"
+ "xorm.io/xorm"
)
const (
- Page_SIZE = 2000
+ PAGE_SIZE = 2000
+ BATCH_INSERT_SIZE = 50
)
type UserBusinessAnalysisAll struct {
@@ -163,14 +165,6 @@ func (ulist UserBusinessAnalysisList) Less(i, j int) bool {
return ulist[i].ID > ulist[j].ID
}
-type UserBusinessAnalysisAllList []*UserBusinessAnalysisAll
-
-func (ulist UserBusinessAnalysisAllList) Swap(i, j int) { ulist[i], ulist[j] = ulist[j], ulist[i] }
-func (ulist UserBusinessAnalysisAllList) Len() int { return len(ulist) }
-func (ulist UserBusinessAnalysisAllList) Less(i, j int) bool {
- return ulist[i].ID > ulist[j].ID
-}
-
func getLastCountDate() int64 {
statictisSess := xStatistic.NewSession()
defer statictisSess.Close()
@@ -189,6 +183,29 @@ func getLastCountDate() int64 {
return pageStartTime.Unix()
}
+func QueryUserStaticDataByTableName(start int, pageSize int, tableName string, queryObj interface{}, userName string) ([]*UserBusinessAnalysisAll, int64) {
+ statictisSess := xStatistic.NewSession()
+ defer statictisSess.Close()
+ var cond = builder.NewCond()
+ if len(userName) > 0 {
+ cond = cond.And(
+ builder.Like{"name", userName},
+ )
+ }
+ allCount, err := statictisSess.Where(cond).Count(queryObj)
+ if err != nil {
+ log.Info("query error." + err.Error())
+ return nil, 0
+ }
+ log.Info("query return total:" + fmt.Sprint(allCount))
+ userBusinessAnalysisAllList := make([]*UserBusinessAnalysisAll, 0)
+ if err := statictisSess.Table(tableName).Where(cond).OrderBy("commit_count desc,id desc").Limit(pageSize, start).
+ Find(&userBusinessAnalysisAllList); err != nil {
+ return nil, 0
+ }
+ return userBusinessAnalysisAllList, allCount
+}
+
func QueryUserStaticDataAll(opts *UserBusinessAnalysisQueryOptions) ([]*UserBusinessAnalysisAll, int64) {
log.Info("query startTime =" + fmt.Sprint(opts.StartTime) + " endTime=" + fmt.Sprint(opts.EndTime) + " isAll=" + fmt.Sprint(opts.IsAll))
@@ -202,9 +219,9 @@ func QueryUserStaticDataAll(opts *UserBusinessAnalysisQueryOptions) ([]*UserBusi
}
log.Info("query return total:" + fmt.Sprint(allCount))
- pageSize := 1000
+ pageSize := PAGE_SIZE
totalPage := int(allCount) / pageSize
- userBusinessAnalysisReturnList := UserBusinessAnalysisAllList{}
+ userBusinessAnalysisReturnList := make([]*UserBusinessAnalysisAll, 0)
for i := 0; i <= int(totalPage); i++ {
userBusinessAnalysisAllList := make([]*UserBusinessAnalysisAll, 0)
if err := statictisSess.Table("user_business_analysis_all").OrderBy("id desc").Limit(pageSize, i*pageSize).
@@ -217,7 +234,6 @@ func QueryUserStaticDataAll(opts *UserBusinessAnalysisQueryOptions) ([]*UserBusi
}
}
- sort.Sort(userBusinessAnalysisReturnList)
log.Info("return size=" + fmt.Sprint(len(userBusinessAnalysisReturnList)))
return userBusinessAnalysisReturnList, allCount
}
@@ -337,28 +353,24 @@ func QueryUserStaticDataPage(opts *UserBusinessAnalysisQueryOptions) ([]*UserBus
return userBusinessAnalysisReturnList, count
}
-func RefreshUserStaticAllTabel(wikiCountMap map[string]int, CommitCodeSizeMap map[string]*git.UserKPIStats) {
-
+func refreshUserStaticTable(wikiCountMap map[string]int, CommitCodeSizeMap map[string]*git.UserKPIStats, tableName string, pageStartTime time.Time, pageEndTime time.Time) {
sess := x.NewSession()
defer sess.Close()
statictisSess := xStatistic.NewSession()
defer statictisSess.Close()
- log.Info("truncate all data from table: user_business_analysis_all")
- statictisSess.Exec("TRUNCATE TABLE user_business_analysis_all")
+ log.Info("truncate all data from table: " + tableName)
+ statictisSess.Exec("TRUNCATE TABLE " + tableName)
- currentTimeNow := time.Now()
-
- startTime := currentTimeNow.AddDate(0, 0, -1)
-
- pageStartTime := time.Date(2021, 11, 5, 0, 0, 0, 0, currentTimeNow.Location())
log.Info("pageStartTime:" + pageStartTime.Format("2006-01-02 15:04:05"))
- pageEndTime := time.Date(currentTimeNow.Year(), currentTimeNow.Month(), currentTimeNow.Day(), 23, 59, 59, 0, currentTimeNow.Location())
log.Info("pageEndTime time:" + pageEndTime.Format("2006-01-02 15:04:05"))
start_unix := pageStartTime.Unix()
end_unix := pageEndTime.Unix()
+ currentTimeNow := time.Now()
+ startTime := currentTimeNow.AddDate(0, 0, -1)
+
CodeMergeCountMap := queryPullRequest(start_unix, end_unix)
CommitCountMap := queryCommitAction(start_unix, end_unix, 5)
IssueCountMap := queryCreateIssue(start_unix, end_unix)
@@ -385,12 +397,14 @@ func RefreshUserStaticAllTabel(wikiCountMap map[string]int, CommitCodeSizeMap ma
}
var indexTotal int64
indexTotal = 0
+ insertCount := 0
+ dateRecordBatch := make([]UserBusinessAnalysisAll, 0)
for {
- sess.Select("`user`.*").Table("user").Where(cond).OrderBy("id asc").Limit(Page_SIZE, int(indexTotal))
+ sess.Select("`user`.*").Table("user").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
userList := make([]*User, 0)
sess.Find(&userList)
- for i, userRecord := range userList {
- log.Info("insert all static, i=" + fmt.Sprint(i) + " userName=" + userRecord.Name)
+
+ for _, userRecord := range userList {
var dateRecordAll UserBusinessAnalysisAll
dateRecordAll.ID = userRecord.ID
dateRecordAll.Email = userRecord.Email
@@ -484,18 +498,85 @@ func RefreshUserStaticAllTabel(wikiCountMap map[string]int, CommitCodeSizeMap ma
}
dateRecordAll.CommitModelCount = 0
- _, err = statictisSess.Insert(&dateRecordAll)
- if err != nil {
- log.Info("insert all data failed." + err.Error())
+
+ dateRecordBatch = append(dateRecordBatch, dateRecordAll)
+ if len(dateRecordBatch) >= BATCH_INSERT_SIZE {
+ insertTable(dateRecordBatch, tableName, statictisSess)
+ insertCount += BATCH_INSERT_SIZE
+ if err != nil {
+ log.Info("insert all data failed." + err.Error())
+ }
+ dateRecordBatch = make([]UserBusinessAnalysisAll, 0)
}
}
- indexTotal += Page_SIZE
+ indexTotal += PAGE_SIZE
if indexTotal >= count {
break
}
}
+ if len(dateRecordBatch) > 0 {
+ insertTable(dateRecordBatch, tableName, statictisSess)
+ insertCount += len(dateRecordBatch)
+ if err != nil {
+ log.Info("insert all data failed." + err.Error())
+ }
+ }
+
+ log.Info("refresh data finished.tableName=" + tableName + " total record:" + fmt.Sprint(insertCount))
+}
+
+func insertTable(dateRecords []UserBusinessAnalysisAll, tableName string, statictisSess *xorm.Session) {
+
+ insertBatchSql := "INSERT INTO public." + tableName +
+ "(id, count_date, code_merge_count, commit_count, issue_count, comment_count, focus_repo_count, star_repo_count, watched_count, gitea_age_month, commit_code_size, commit_dataset_size, " +
+ "commit_model_count, solve_issue_count, encyclopedias_count, regist_date, create_repo_count, login_count, open_i_index, email, name, data_date) " +
+ "VALUES"
+
+ for i, record := range dateRecords {
+ insertBatchSql += "(" + fmt.Sprint(record.ID) + ", " + fmt.Sprint(record.CountDate) + ", " + fmt.Sprint(record.CodeMergeCount) + ", " + fmt.Sprint(record.CommitCount) +
+ ", " + fmt.Sprint(record.IssueCount) + ", " + fmt.Sprint(record.CommentCount) + ", " + fmt.Sprint(record.FocusRepoCount) + ", " + fmt.Sprint(record.StarRepoCount) +
+ ", " + fmt.Sprint(record.WatchedCount) + ", " + fmt.Sprint(record.GiteaAgeMonth) + ", " + fmt.Sprint(record.CommitCodeSize) + ", " + fmt.Sprint(record.CommitDatasetSize) +
+ ", " + fmt.Sprint(record.CommitModelCount) + ", " + fmt.Sprint(record.SolveIssueCount) + ", " + fmt.Sprint(record.EncyclopediasCount) + ", " + fmt.Sprint(record.RegistDate) +
+ ", " + fmt.Sprint(record.CreateRepoCount) + ", " + fmt.Sprint(record.LoginCount) + ", " + fmt.Sprint(record.OpenIIndex) + ", '" + record.Email + "', '" + record.Name + "', '" + record.DataDate + "')"
+ if i < (len(dateRecords) - 1) {
+ insertBatchSql += ","
+ }
+ }
+ statictisSess.Exec(insertBatchSql)
+}
+
+func RefreshUserStaticAllTabel(wikiCountMap map[string]int, CommitCodeSizeMap map[string]*git.UserKPIStats) {
+ currentTimeNow := time.Now()
+ pageStartTime := time.Date(2021, 11, 5, 0, 0, 0, 0, currentTimeNow.Location())
+ pageEndTime := time.Date(currentTimeNow.Year(), currentTimeNow.Month(), currentTimeNow.Day(), 23, 59, 59, 0, currentTimeNow.Location())
+ refreshUserStaticTable(wikiCountMap, CommitCodeSizeMap, "user_business_analysis_all", pageStartTime, pageEndTime)
log.Info("refresh all data finished.")
+
+ pageStartTime = time.Date(currentTimeNow.Year(), 1, 1, 0, 0, 0, 0, currentTimeNow.Location())
+ refreshUserStaticTable(wikiCountMap, CommitCodeSizeMap, "user_business_analysis_current_year", pageStartTime, pageEndTime)
+
+ thisMonth := time.Date(currentTimeNow.Year(), currentTimeNow.Month(), 1, 0, 0, 0, 0, currentTimeNow.Location())
+ refreshUserStaticTable(wikiCountMap, CommitCodeSizeMap, "user_business_analysis_current_month", thisMonth, pageEndTime)
+
+ offset := int(time.Monday - currentTimeNow.Weekday())
+ if offset > 0 {
+ offset = -6
+ }
+ pageStartTime = time.Date(currentTimeNow.Year(), currentTimeNow.Month(), currentTimeNow.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset)
+ refreshUserStaticTable(wikiCountMap, CommitCodeSizeMap, "user_business_analysis_current_week", pageStartTime, pageEndTime)
+
+ pageStartTime = time.Date(currentTimeNow.Year(), currentTimeNow.Month(), currentTimeNow.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, -30)
+ refreshUserStaticTable(wikiCountMap, CommitCodeSizeMap, "user_business_analysis_last30_day", pageStartTime, pageEndTime)
+
+ pageStartTime = time.Date(currentTimeNow.Year(), currentTimeNow.Month(), currentTimeNow.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, -1)
+ pageEndTime = time.Date(currentTimeNow.Year(), currentTimeNow.Month(), currentTimeNow.Day(), 23, 59, 59, 0, currentTimeNow.Location()).AddDate(0, 0, -1)
+ refreshUserStaticTable(wikiCountMap, CommitCodeSizeMap, "user_business_analysis_yesterday", pageStartTime, pageEndTime)
+
+ pageStartTime = thisMonth.AddDate(0, -1, 0)
+ pageEndTime = time.Date(currentTimeNow.Year(), currentTimeNow.Month(), 1, 23, 59, 59, 0, currentTimeNow.Location()).AddDate(0, 0, -1)
+ refreshUserStaticTable(wikiCountMap, CommitCodeSizeMap, "user_business_analysis_last_month", pageStartTime, pageEndTime)
+
}
func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time, endTime time.Time, isReCount bool) error {
@@ -550,7 +631,7 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time,
var indexTotal int64
indexTotal = 0
for {
- sess.Select("`user`.*").Table("user").Where(cond).OrderBy("id asc").Limit(Page_SIZE, int(indexTotal))
+ sess.Select("`user`.*").Table("user").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
userList := make([]*User, 0)
sess.Find(&userList)
@@ -660,7 +741,7 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time,
}
}
- indexTotal += Page_SIZE
+ indexTotal += PAGE_SIZE
if indexTotal >= count {
break
}
@@ -700,7 +781,7 @@ func querySolveIssue(start_unix int64, end_unix int64) map[int64]int {
issueAssigneesList := make([]*IssueAssignees, 0)
sess.Select("issue_assignees.*").Table("issue_assignees").
Join("inner", "issue", "issue.id=issue_assignees.issue_id").
- Where(cond).OrderBy("issue_assignees.id asc").Limit(Page_SIZE, int(indexTotal))
+ Where(cond).OrderBy("issue_assignees.id asc").Limit(PAGE_SIZE, int(indexTotal))
sess.Find(&issueAssigneesList)
@@ -712,7 +793,7 @@ func querySolveIssue(start_unix int64, end_unix int64) map[int64]int {
resultMap[issueAssigneesRecord.AssigneeID] += 1
}
}
- indexTotal += Page_SIZE
+ indexTotal += PAGE_SIZE
if indexTotal >= count {
break
}
@@ -735,7 +816,7 @@ func queryPullRequest(start_unix int64, end_unix int64) map[int64]int {
indexTotal = 0
for {
issueList := make([]*Issue, 0)
- sess.Select("issue.*").Table("issue").Join("inner", "pull_request", "issue.id=pull_request.issue_id").Where(cond).OrderBy("issue.id asc").Limit(Page_SIZE, int(indexTotal))
+ sess.Select("issue.*").Table("issue").Join("inner", "pull_request", "issue.id=pull_request.issue_id").Where(cond).OrderBy("issue.id asc").Limit(PAGE_SIZE, int(indexTotal))
sess.Find(&issueList)
log.Info("query issue(PR) size=" + fmt.Sprint(len(issueList)))
for _, issueRecord := range issueList {
@@ -745,7 +826,7 @@ func queryPullRequest(start_unix int64, end_unix int64) map[int64]int {
resultMap[issueRecord.PosterID] += 1
}
}
- indexTotal += Page_SIZE
+ indexTotal += PAGE_SIZE
if indexTotal >= count {
break
}
@@ -768,7 +849,7 @@ func queryCommitAction(start_unix int64, end_unix int64, actionType int64) map[i
var indexTotal int64
indexTotal = 0
for {
- sess.Select("id,user_id,op_type,act_user_id").Table("action").Where(cond).OrderBy("id asc").Limit(Page_SIZE, int(indexTotal))
+ sess.Select("id,user_id,op_type,act_user_id").Table("action").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
actionList := make([]*Action, 0)
sess.Find(&actionList)
@@ -781,7 +862,7 @@ func queryCommitAction(start_unix int64, end_unix int64, actionType int64) map[i
}
}
- indexTotal += Page_SIZE
+ indexTotal += PAGE_SIZE
if indexTotal >= count {
break
}
@@ -805,7 +886,7 @@ func queryCreateIssue(start_unix int64, end_unix int64) map[int64]int {
var indexTotal int64
indexTotal = 0
for {
- sess.Select("id,poster_id").Table("issue").Where(cond).OrderBy("id asc").Limit(Page_SIZE, int(indexTotal))
+ sess.Select("id,poster_id").Table("issue").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
issueList := make([]*Issue, 0)
sess.Find(&issueList)
log.Info("query issue size=" + fmt.Sprint(len(issueList)))
@@ -816,7 +897,7 @@ func queryCreateIssue(start_unix int64, end_unix int64) map[int64]int {
resultMap[issueRecord.PosterID] += 1
}
}
- indexTotal += Page_SIZE
+ indexTotal += PAGE_SIZE
if indexTotal >= count {
break
}
@@ -839,7 +920,7 @@ func queryComment(start_unix int64, end_unix int64) map[int64]int {
var indexTotal int64
indexTotal = 0
for {
- sess.Select("id,type,poster_id").Table("comment").Where(cond).OrderBy("id asc").Limit(Page_SIZE, int(indexTotal))
+ sess.Select("id,type,poster_id").Table("comment").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
commentList := make([]*Comment, 0)
sess.Find(&commentList)
log.Info("query Comment size=" + fmt.Sprint(len(commentList)))
@@ -850,7 +931,7 @@ func queryComment(start_unix int64, end_unix int64) map[int64]int {
resultMap[commentRecord.PosterID] += 1
}
}
- indexTotal += Page_SIZE
+ indexTotal += PAGE_SIZE
if indexTotal >= count {
break
}
@@ -875,7 +956,7 @@ func queryWatch(start_unix int64, end_unix int64) map[int64]int {
indexTotal = 0
for {
watchList := make([]*Watch, 0)
- sess.Select("id,user_id,repo_id").Table("watch").Where(cond).OrderBy("id asc").Limit(Page_SIZE, int(indexTotal))
+ sess.Select("id,user_id,repo_id").Table("watch").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
sess.Find(&watchList)
log.Info("query Watch size=" + fmt.Sprint(len(watchList)))
@@ -887,7 +968,7 @@ func queryWatch(start_unix int64, end_unix int64) map[int64]int {
}
}
- indexTotal += Page_SIZE
+ indexTotal += PAGE_SIZE
if indexTotal >= count {
break
}
@@ -913,7 +994,7 @@ func queryStar(start_unix int64, end_unix int64) map[int64]int {
var indexTotal int64
indexTotal = 0
for {
- sess.Select("id,uid,repo_id").Table("star").Where(cond).OrderBy("id asc").Limit(Page_SIZE, int(indexTotal))
+ sess.Select("id,uid,repo_id").Table("star").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
starList := make([]*Star, 0)
sess.Find(&starList)
@@ -926,7 +1007,7 @@ func queryStar(start_unix int64, end_unix int64) map[int64]int {
}
}
- indexTotal += Page_SIZE
+ indexTotal += PAGE_SIZE
if indexTotal >= count {
break
}
@@ -949,7 +1030,7 @@ func queryFollow(start_unix int64, end_unix int64) map[int64]int {
var indexTotal int64
indexTotal = 0
for {
- sess.Select("id,user_id,follow_id").Table("follow").Where(cond).OrderBy("id asc").Limit(Page_SIZE, int(indexTotal))
+ sess.Select("id,user_id,follow_id").Table("follow").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
followList := make([]*Follow, 0)
sess.Find(&followList)
@@ -962,7 +1043,7 @@ func queryFollow(start_unix int64, end_unix int64) map[int64]int {
}
}
- indexTotal += Page_SIZE
+ indexTotal += PAGE_SIZE
if indexTotal >= count {
break
}
@@ -985,7 +1066,7 @@ func queryDatasetSize(start_unix int64, end_unix int64) map[int64]int {
var indexTotal int64
indexTotal = 0
for {
- sess.Select("id,uploader_id,size").Table("attachment").Where(cond).OrderBy("id asc").Limit(Page_SIZE, int(indexTotal))
+ sess.Select("id,uploader_id,size").Table("attachment").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
attachmentList := make([]*Attachment, 0)
sess.Find(&attachmentList)
@@ -998,7 +1079,7 @@ func queryDatasetSize(start_unix int64, end_unix int64) map[int64]int {
}
}
- indexTotal += Page_SIZE
+ indexTotal += PAGE_SIZE
if indexTotal >= count {
break
}
@@ -1021,7 +1102,7 @@ func queryUserCreateRepo(start_unix int64, end_unix int64) map[int64]int {
var indexTotal int64
indexTotal = 0
for {
- sess.Select("id,owner_id,name").Table("repository").Where(cond).OrderBy("id asc").Limit(Page_SIZE, int(indexTotal))
+ sess.Select("id,owner_id,name").Table("repository").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
repoList := make([]*Repository, 0)
sess.Find(&repoList)
log.Info("query Repository size=" + fmt.Sprint(len(repoList)))
@@ -1032,7 +1113,7 @@ func queryUserCreateRepo(start_unix int64, end_unix int64) map[int64]int {
resultMap[repoRecord.OwnerID] += 1
}
}
- indexTotal += Page_SIZE
+ indexTotal += PAGE_SIZE
if indexTotal >= count {
break
}
@@ -1111,7 +1192,7 @@ func queryLoginCount(start_unix int64, end_unix int64) map[int64]int {
var indexTotal int64
indexTotal = 0
for {
- statictisSess.Select("id,u_id").Table("user_login_log").Where(cond).OrderBy("id asc").Limit(Page_SIZE, int(indexTotal))
+ statictisSess.Select("id,u_id").Table("user_login_log").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
userLoginLogList := make([]*UserLoginLog, 0)
statictisSess.Find(&userLoginLogList)
log.Info("query user login size=" + fmt.Sprint(len(userLoginLogList)))
@@ -1122,7 +1203,7 @@ func queryLoginCount(start_unix int64, end_unix int64) map[int64]int {
resultMap[loginRecord.UId] += 1
}
}
- indexTotal += Page_SIZE
+ indexTotal += PAGE_SIZE
if indexTotal >= count {
break
}
diff --git a/models/user_business_struct.go b/models/user_business_struct.go
new file mode 100644
index 000000000..c435c0b07
--- /dev/null
+++ b/models/user_business_struct.go
@@ -0,0 +1,267 @@
+package models
+
+import "code.gitea.io/gitea/modules/timeutil"
+
+type UserBusinessAnalysisCurrentYear struct {
+ ID int64 `xorm:"pk"`
+ CountDate int64 `xorm:"pk"`
+ //action :ActionMergePullRequest // 11
+ CodeMergeCount int `xorm:"NOT NULL DEFAULT 0"`
+ //action :ActionCommitRepo
+ CommitCount int `xorm:"NOT NULL DEFAULT 0"`
+ //issue // 10
+ IssueCount int `xorm:"NOT NULL DEFAULT 0"`
+ //comment table current date
+ CommentCount int `xorm:"NOT NULL DEFAULT 0"`
+ //watch table current date
+ FocusRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+ //star table current date
+ StarRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+ //follow table
+ WatchedCount int `xorm:"NOT NULL DEFAULT 0"`
+ // user table
+ GiteaAgeMonth int `xorm:"NOT NULL DEFAULT 0"`
+ //
+ CommitCodeSize int `xorm:"NOT NULL DEFAULT 0"`
+ //attachement table
+ CommitDatasetSize int `xorm:"NOT NULL DEFAULT 0"`
+ //0
+ CommitModelCount int `xorm:"NOT NULL DEFAULT 0"`
+ //issue, issueassignees
+ SolveIssueCount int `xorm:"NOT NULL DEFAULT 0"`
+ //baike
+ EncyclopediasCount int `xorm:"NOT NULL DEFAULT 0"`
+ //user
+ RegistDate timeutil.TimeStamp `xorm:"NOT NULL"`
+ //repo
+ CreateRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+ //login count, from elk
+ LoginCount int `xorm:"NOT NULL DEFAULT 0"`
+ //openi index
+ OpenIIndex float64 `xorm:"NOT NULL DEFAULT 0"`
+ //user
+ Email string `xorm:"NOT NULL"`
+ //user
+ Name string `xorm:"NOT NULL"`
+ DataDate string `xorm:"NULL"`
+}
+
+type UserBusinessAnalysisLast30Day struct {
+ ID int64 `xorm:"pk"`
+ CountDate int64 `xorm:"pk"`
+ //action :ActionMergePullRequest // 11
+ CodeMergeCount int `xorm:"NOT NULL DEFAULT 0"`
+ //action :ActionCommitRepo
+ CommitCount int `xorm:"NOT NULL DEFAULT 0"`
+ //issue // 10
+ IssueCount int `xorm:"NOT NULL DEFAULT 0"`
+ //comment table current date
+ CommentCount int `xorm:"NOT NULL DEFAULT 0"`
+ //watch table current date
+ FocusRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+ //star table current date
+ StarRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+ //follow table
+ WatchedCount int `xorm:"NOT NULL DEFAULT 0"`
+ // user table
+ GiteaAgeMonth int `xorm:"NOT NULL DEFAULT 0"`
+ //
+ CommitCodeSize int `xorm:"NOT NULL DEFAULT 0"`
+ //attachement table
+ CommitDatasetSize int `xorm:"NOT NULL DEFAULT 0"`
+ //0
+ CommitModelCount int `xorm:"NOT NULL DEFAULT 0"`
+ //issue, issueassignees
+ SolveIssueCount int `xorm:"NOT NULL DEFAULT 0"`
+ //baike
+ EncyclopediasCount int `xorm:"NOT NULL DEFAULT 0"`
+ //user
+ RegistDate timeutil.TimeStamp `xorm:"NOT NULL"`
+ //repo
+ CreateRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+ //login count, from elk
+ LoginCount int `xorm:"NOT NULL DEFAULT 0"`
+ //openi index
+ OpenIIndex float64 `xorm:"NOT NULL DEFAULT 0"`
+ //user
+ Email string `xorm:"NOT NULL"`
+ //user
+ Name string `xorm:"NOT NULL"`
+ DataDate string `xorm:"NULL"`
+}
+
+type UserBusinessAnalysisLastMonth struct {
+ ID int64 `xorm:"pk"`
+ CountDate int64 `xorm:"pk"`
+ //action :ActionMergePullRequest // 11
+ CodeMergeCount int `xorm:"NOT NULL DEFAULT 0"`
+ //action :ActionCommitRepo
+ CommitCount int `xorm:"NOT NULL DEFAULT 0"`
+ //issue // 10
+ IssueCount int `xorm:"NOT NULL DEFAULT 0"`
+ //comment table current date
+ CommentCount int `xorm:"NOT NULL DEFAULT 0"`
+ //watch table current date
+ FocusRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+ //star table current date
+ StarRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+ //follow table
+ WatchedCount int `xorm:"NOT NULL DEFAULT 0"`
+ // user table
+ GiteaAgeMonth int `xorm:"NOT NULL DEFAULT 0"`
+ //
+ CommitCodeSize int `xorm:"NOT NULL DEFAULT 0"`
+ //attachement table
+ CommitDatasetSize int `xorm:"NOT NULL DEFAULT 0"`
+ //0
+ CommitModelCount int `xorm:"NOT NULL DEFAULT 0"`
+ //issue, issueassignees
+ SolveIssueCount int `xorm:"NOT NULL DEFAULT 0"`
+ //baike
+ EncyclopediasCount int `xorm:"NOT NULL DEFAULT 0"`
+ //user
+ RegistDate timeutil.TimeStamp `xorm:"NOT NULL"`
+ //repo
+ CreateRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+ //login count, from elk
+ LoginCount int `xorm:"NOT NULL DEFAULT 0"`
+ //openi index
+ OpenIIndex float64 `xorm:"NOT NULL DEFAULT 0"`
+ //user
+ Email string `xorm:"NOT NULL"`
+ //user
+ Name string `xorm:"NOT NULL"`
+ DataDate string `xorm:"NULL"`
+}
+
+type UserBusinessAnalysisCurrentMonth struct {
+ ID int64 `xorm:"pk"`
+ CountDate int64 `xorm:"pk"`
+ //action :ActionMergePullRequest // 11
+ CodeMergeCount int `xorm:"NOT NULL DEFAULT 0"`
+ //action :ActionCommitRepo
+ CommitCount int `xorm:"NOT NULL DEFAULT 0"`
+ //issue // 10
+ IssueCount int `xorm:"NOT NULL DEFAULT 0"`
+ //comment table current date
+ CommentCount int `xorm:"NOT NULL DEFAULT 0"`
+ //watch table current date
+ FocusRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+ //star table current date
+ StarRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+ //follow table
+ WatchedCount int `xorm:"NOT NULL DEFAULT 0"`
+ // user table
+ GiteaAgeMonth int `xorm:"NOT NULL DEFAULT 0"`
+ //
+ CommitCodeSize int `xorm:"NOT NULL DEFAULT 0"`
+ //attachement table
+ CommitDatasetSize int `xorm:"NOT NULL DEFAULT 0"`
+ //0
+ CommitModelCount int `xorm:"NOT NULL DEFAULT 0"`
+ //issue, issueassignees
+ SolveIssueCount int `xorm:"NOT NULL DEFAULT 0"`
+ //baike
+ EncyclopediasCount int `xorm:"NOT NULL DEFAULT 0"`
+ //user
+ RegistDate timeutil.TimeStamp `xorm:"NOT NULL"`
+ //repo
+ CreateRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+ //login count, from elk
+ LoginCount int `xorm:"NOT NULL DEFAULT 0"`
+ //openi index
+ OpenIIndex float64 `xorm:"NOT NULL DEFAULT 0"`
+ //user
+ Email string `xorm:"NOT NULL"`
+ //user
+ Name string `xorm:"NOT NULL"`
+ DataDate string `xorm:"NULL"`
+}
+
+type UserBusinessAnalysisCurrentWeek struct {
+ ID int64 `xorm:"pk"`
+ CountDate int64 `xorm:"pk"`
+ //action :ActionMergePullRequest // 11
+ CodeMergeCount int `xorm:"NOT NULL DEFAULT 0"`
+ //action :ActionCommitRepo
+ CommitCount int `xorm:"NOT NULL DEFAULT 0"`
+ //issue // 10
+ IssueCount int `xorm:"NOT NULL DEFAULT 0"`
+ //comment table current date
+ CommentCount int `xorm:"NOT NULL DEFAULT 0"`
+ //watch table current date
+ FocusRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+ //star table current date
+ StarRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+ //follow table
+ WatchedCount int `xorm:"NOT NULL DEFAULT 0"`
+ // user table
+ GiteaAgeMonth int `xorm:"NOT NULL DEFAULT 0"`
+ //
+ CommitCodeSize int `xorm:"NOT NULL DEFAULT 0"`
+ //attachement table
+ CommitDatasetSize int `xorm:"NOT NULL DEFAULT 0"`
+ //0
+ CommitModelCount int `xorm:"NOT NULL DEFAULT 0"`
+ //issue, issueassignees
+ SolveIssueCount int `xorm:"NOT NULL DEFAULT 0"`
+ //baike
+ EncyclopediasCount int `xorm:"NOT NULL DEFAULT 0"`
+ //user
+ RegistDate timeutil.TimeStamp `xorm:"NOT NULL"`
+ //repo
+ CreateRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+ //login count, from elk
+ LoginCount int `xorm:"NOT NULL DEFAULT 0"`
+ //openi index
+ OpenIIndex float64 `xorm:"NOT NULL DEFAULT 0"`
+ //user
+ Email string `xorm:"NOT NULL"`
+ //user
+ Name string `xorm:"NOT NULL"`
+ DataDate string `xorm:"NULL"`
+}
+
+type UserBusinessAnalysisYesterday struct {
+ ID int64 `xorm:"pk"`
+ CountDate int64 `xorm:"pk"`
+ //action :ActionMergePullRequest // 11
+ CodeMergeCount int `xorm:"NOT NULL DEFAULT 0"`
+ //action :ActionCommitRepo
+ CommitCount int `xorm:"NOT NULL DEFAULT 0"`
+ //issue // 10
+ IssueCount int `xorm:"NOT NULL DEFAULT 0"`
+ //comment table current date
+ CommentCount int `xorm:"NOT NULL DEFAULT 0"`
+ //watch table current date
+ FocusRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+ //star table current date
+ StarRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+ //follow table
+ WatchedCount int `xorm:"NOT NULL DEFAULT 0"`
+ // user table
+ GiteaAgeMonth int `xorm:"NOT NULL DEFAULT 0"`
+ //
+ CommitCodeSize int `xorm:"NOT NULL DEFAULT 0"`
+ //attachement table
+ CommitDatasetSize int `xorm:"NOT NULL DEFAULT 0"`
+ //0
+ CommitModelCount int `xorm:"NOT NULL DEFAULT 0"`
+ //issue, issueassignees
+ SolveIssueCount int `xorm:"NOT NULL DEFAULT 0"`
+ //baike
+ EncyclopediasCount int `xorm:"NOT NULL DEFAULT 0"`
+ //user
+ RegistDate timeutil.TimeStamp `xorm:"NOT NULL"`
+ //repo
+ CreateRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+ //login count, from elk
+ LoginCount int `xorm:"NOT NULL DEFAULT 0"`
+ //openi index
+ OpenIIndex float64 `xorm:"NOT NULL DEFAULT 0"`
+ //user
+ Email string `xorm:"NOT NULL"`
+ //user
+ Name string `xorm:"NOT NULL"`
+ DataDate string `xorm:"NULL"`
+}
diff --git a/modules/context/context.go b/modules/context/context.go
index 5f09e190d..b690af94e 100755
--- a/modules/context/context.go
+++ b/modules/context/context.go
@@ -6,6 +6,7 @@
package context
import (
+ "code.gitea.io/gitea/routers/notice"
"html"
"html/template"
"io"
@@ -345,6 +346,10 @@ func Contexter() macaron.Handler {
ctx.Data["EnableSwagger"] = setting.API.EnableSwagger
ctx.Data["EnableOpenIDSignIn"] = setting.Service.EnableOpenIDSignIn
+ notice, _ := notice.GetNewestNotice()
+ if notice != nil {
+ ctx.Data["notice"] = *notice
+ }
c.Map(ctx)
}
}
diff --git a/modules/context/repo.go b/modules/context/repo.go
index de494c1bc..4da6e9a16 100755
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -11,6 +11,7 @@ import (
"net/url"
"path"
"strings"
+ "time"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/cache"
@@ -517,6 +518,7 @@ func RepoAssignment() macaron.Handler {
return
}
+ startTime := time.Now()
tags, err := ctx.Repo.GitRepo.GetTags()
if err != nil {
ctx.ServerError("GetTags", err)
@@ -524,11 +526,17 @@ func RepoAssignment() macaron.Handler {
}
ctx.Data["Tags"] = tags
+ duration := time.Since(startTime)
+ log.Info("GetTags cost: %v seconds", duration.Seconds())
brs, _, err := ctx.Repo.GitRepo.GetBranches(0, 0)
if err != nil {
ctx.ServerError("GetBranches", err)
return
}
+
+ duration = time.Since(startTime)
+ log.Info("GetBranches cost: %v seconds", duration.Seconds())
+
ctx.Data["Branches"] = brs
ctx.Data["BranchesCount"] = len(brs)
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 2d70e47b1..cf6d9dbf5 100755
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -436,6 +436,14 @@ var (
//home page
RecommentRepoAddr string
+ //notice config
+ UserNameOfNoticeRepo string
+ RepoNameOfNoticeRepo string
+ RefNameOfNoticeRepo string
+ TreePathOfNoticeRepo string
+ CacheTimeOutSecond int
+ CacheOn bool
+
//labelsystem config
LabelTaskName string
LabelDatasetDeleteQueue string
@@ -1235,6 +1243,14 @@ func NewContext() {
sec = Cfg.Section("homepage")
RecommentRepoAddr = sec.Key("Address").MustString("https://git.openi.org.cn/OpenIOSSG/promote/raw/branch/master/")
+ sec = Cfg.Section("notice")
+ UserNameOfNoticeRepo = sec.Key("USER_NAME").MustString("OpenIOSSG")
+ RepoNameOfNoticeRepo = sec.Key("REPO_NAME").MustString("promote")
+ RefNameOfNoticeRepo = sec.Key("REF_NAME").MustString("master")
+ TreePathOfNoticeRepo = sec.Key("TREE_PATH").MustString("notice.json")
+ CacheTimeOutSecond = sec.Key("CACHE_TIME_OUT_SECOND").MustInt(60)
+ CacheOn = sec.Key("CACHE_ON").MustBool(true)
+
sec = Cfg.Section("cloudbrain")
CBAuthUser = sec.Key("USER").MustString("")
CBAuthPassword = sec.Key("PWD").MustString("")
diff --git a/modules/storage/minio.go b/modules/storage/minio.go
index c6f704df5..7b914817d 100755
--- a/modules/storage/minio.go
+++ b/modules/storage/minio.go
@@ -95,9 +95,7 @@ func (m *MinioStorage) DeleteDir(dir string) error {
}
}()
- for rErr := range m.client.RemoveObjects(m.bucket, objectsCh) {
- log.Error("Error detected during deletion: ", rErr)
- }
+ m.client.RemoveObjects(m.bucket, objectsCh)
return nil
}
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 1dceb5c4a..8704bc507 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -424,7 +424,13 @@ static.openiindex=OpenI Index
static.registdate=Regist Date
static.countdate=Count Date
static.all=All
-
+static.public.user_business_analysis_current_month=Current_Month
+static.public.user_business_analysis_current_week=Current_Week
+static.public.user_business_analysis_current_year=Current_Year
+static.public.user_business_analysis_last30_day=Last_30_day
+static.public.user_business_analysis_last_month=Last_Month
+static.public.user_business_analysis_yesterday=Yesterday
+static.public.user_business_analysis_all=All
[settings]
profile = Profile
account = Account
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 2e7f4d73c..b83099f78 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -428,6 +428,13 @@ static.openiindex=OpenI指数
static.registdate=用户注册时间
static.countdate=系统统计时间
static.all=所有
+static.public.user_business_analysis_current_month=本月
+static.public.user_business_analysis_current_week=本周
+static.public.user_business_analysis_current_year=今年
+static.public.user_business_analysis_last30_day=近30天
+static.public.user_business_analysis_last_month=上月
+static.public.user_business_analysis_yesterday=昨天
+static.public.user_business_analysis_all=所有
[settings]
profile=个人信息
account=账号
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 518c63e4f..dcea46ed6 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -524,7 +524,7 @@ func RegisterRoutes(m *macaron.Macaron) {
Get(notify.GetThread).
Patch(notify.ReadThread)
}, reqToken())
-
+
operationReq := context.Toggle(&context.ToggleOptions{SignInRequired: true, OperationRequired: true})
//Project board
m.Group("/projectboard", func() {
@@ -544,7 +544,13 @@ func RegisterRoutes(m *macaron.Macaron) {
}, operationReq)
m.Get("/query_user_static_page", operationReq, repo_ext.QueryUserStaticDataPage)
-
+ m.Get("/query_user_current_month", operationReq, repo_ext.QueryUserStaticCurrentMonth)
+ m.Get("/query_user_current_week", operationReq, repo_ext.QueryUserStaticCurrentWeek)
+ m.Get("/query_user_current_year", operationReq, repo_ext.QueryUserStaticCurrentYear)
+ m.Get("/query_user_last30_day", operationReq, repo_ext.QueryUserStaticLast30Day)
+ m.Get("/query_user_last_month", operationReq, repo_ext.QueryUserStaticLastMonth)
+ m.Get("/query_user_yesterday", operationReq, repo_ext.QueryUserStaticYesterday)
+ m.Get("/query_user_all", operationReq, repo_ext.QueryUserStaticAll)
// Users
m.Group("/users", func() {
m.Get("/search", user.Search)
diff --git a/routers/notice/notice.go b/routers/notice/notice.go
new file mode 100644
index 000000000..f1e996e2d
--- /dev/null
+++ b/routers/notice/notice.go
@@ -0,0 +1,87 @@
+package notice
+
+import (
+ "code.gitea.io/gitea/models"
+ "code.gitea.io/gitea/modules/log"
+ "code.gitea.io/gitea/modules/setting"
+ "encoding/json"
+ "github.com/patrickmn/go-cache"
+ "time"
+)
+
+var noticeCache = cache.New(2*time.Minute, 1*time.Minute)
+
+const (
+ NOTICE_CACHE_KEY = "notice"
+)
+
+type Notice struct {
+ Title string
+ Link string
+ Visible int //0 invisible, 1 visible
+ CommitId string
+}
+
+var lock int32 = 0
+
+func GetNewestNotice() (*Notice, error) {
+ defer func() {
+ if err := recover(); err != nil {
+ log.Error("recover error", err)
+ }
+ }()
+
+ var notice *Notice
+ var err error
+ if setting.CacheOn {
+ notice, err = getNewestNoticeFromCacheAndDisk()
+ } else {
+ notice, err = getNewestNoticeFromDisk()
+ }
+
+ if err != nil {
+ return nil, err
+ }
+ return notice, nil
+}
+
+func getNoticeTimeout() time.Duration {
+ return time.Duration(setting.CacheTimeOutSecond) * time.Second
+}
+
+func getNewestNoticeFromDisk() (*Notice, error) {
+ log.Debug("Get notice from disk")
+ repoFile, err := models.ReadLatestFileInRepo(setting.UserNameOfNoticeRepo, setting.RepoNameOfNoticeRepo, setting.RefNameOfNoticeRepo, setting.TreePathOfNoticeRepo)
+ if err != nil {
+ log.Error("GetNewestNotice failed, error=%v", err)
+ return nil, err
+ }
+ notice := &Notice{}
+ json.Unmarshal(repoFile.Content, notice)
+ if notice.Title == "" {
+ return nil, err
+ }
+ notice.CommitId = repoFile.CommitId
+ return notice, nil
+}
+
+func getNewestNoticeFromCacheAndDisk() (*Notice, error) {
+ v, success := noticeCache.Get(NOTICE_CACHE_KEY)
+ if success {
+ log.Debug("Get notice from cache,value = %v", v)
+ if v == nil {
+ return nil, nil
+ }
+ n := v.(*Notice)
+ return n, nil
+ }
+
+ notice, err := getNewestNoticeFromDisk()
+ if err != nil {
+ log.Error("GetNewestNotice failed, error=%v", err)
+ noticeCache.Set(NOTICE_CACHE_KEY, nil, 30*time.Second)
+ return nil, err
+ }
+ noticeCache.Set(NOTICE_CACHE_KEY, notice, getNoticeTimeout())
+ return notice, nil
+}
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index 7ab5eb283..42a6b9609 100755
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -13,6 +13,7 @@ import (
"net/http"
"strconv"
"strings"
+ "time"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/auth"
@@ -336,6 +337,7 @@ func issues(ctx *context.Context, milestoneID int64, isPullOption util.OptionalB
// Issues render issues page
func Issues(ctx *context.Context) {
+ startTime := time.Now()
isPullList := ctx.Params(":type") == "pulls"
if isPullList {
MustAllowPulls(ctx)
@@ -366,6 +368,9 @@ func Issues(ctx *context.Context) {
ctx.Data["CanWriteIssuesOrPulls"] = ctx.Repo.CanWriteIssuesOrPulls(isPullList)
+ duration := time.Since(startTime)
+ log.Info("Issues cost: %v seconds", duration.Seconds())
+
ctx.HTML(200, tplIssues)
}
diff --git a/routers/repo/user_data_analysis.go b/routers/repo/user_data_analysis.go
index 42189c57f..7df384cc4 100755
--- a/routers/repo/user_data_analysis.go
+++ b/routers/repo/user_data_analysis.go
@@ -15,6 +15,132 @@ import (
"github.com/360EntSecGroup-Skylar/excelize/v2"
)
+const (
+ PAGE_SIZE = 2000
+)
+
+func queryUserDataPage(ctx *context.Context, tableName string, queryObj interface{}) {
+ page := ctx.QueryInt("page")
+ if page <= 0 {
+ page = 1
+ }
+ pageSize := ctx.QueryInt("pageSize")
+ if pageSize <= 0 {
+ pageSize = setting.UI.IssuePagingNum
+ }
+ userName := ctx.Query("userName")
+ IsReturnFile := ctx.QueryBool("IsReturnFile")
+
+ if IsReturnFile {
+ //writer exec file.
+ xlsx := excelize.NewFile()
+ sheetName := ctx.Tr("user.static.sheetname")
+ index := xlsx.NewSheet(sheetName)
+ xlsx.DeleteSheet("Sheet1")
+ dataHeader := map[string]string{
+ "A1": ctx.Tr("user.static.id"),
+ "B1": ctx.Tr("user.static.name"),
+ "C1": ctx.Tr("user.static.codemergecount"),
+ "D1": ctx.Tr("user.static.commitcount"),
+ "E1": ctx.Tr("user.static.issuecount"),
+ "F1": ctx.Tr("user.static.commentcount"),
+ "G1": ctx.Tr("user.static.focusrepocount"),
+ "H1": ctx.Tr("user.static.starrepocount"),
+ "I1": ctx.Tr("user.static.logincount"),
+ "J1": ctx.Tr("user.static.watchedcount"),
+ "K1": ctx.Tr("user.static.commitcodesize"),
+ "L1": ctx.Tr("user.static.solveissuecount"),
+ "M1": ctx.Tr("user.static.encyclopediascount"),
+ "N1": ctx.Tr("user.static.createrepocount"),
+ "O1": ctx.Tr("user.static.openiindex"),
+ "P1": ctx.Tr("user.static.registdate"),
+ "Q1": ctx.Tr("user.static.countdate"),
+ }
+ for k, v := range dataHeader {
+ //设置单元格的值
+ xlsx.SetCellValue(sheetName, k, v)
+ }
+ _, count := models.QueryUserStaticDataByTableName(1, 1, tableName, queryObj, userName)
+ var indexTotal int64
+ indexTotal = 0
+ for {
+ re, _ := models.QueryUserStaticDataByTableName(int(indexTotal), PAGE_SIZE, tableName, queryObj, "")
+ log.Info("return count=" + fmt.Sprint(count))
+ for i, userRecord := range re {
+ rows := fmt.Sprint(i + 2)
+ xlsx.SetCellValue(sheetName, "A"+rows, userRecord.ID)
+ xlsx.SetCellValue(sheetName, "B"+rows, userRecord.Name)
+ xlsx.SetCellValue(sheetName, "C"+rows, userRecord.CodeMergeCount)
+ xlsx.SetCellValue(sheetName, "D"+rows, userRecord.CommitCount)
+ xlsx.SetCellValue(sheetName, "E"+rows, userRecord.IssueCount)
+ xlsx.SetCellValue(sheetName, "F"+rows, userRecord.CommentCount)
+ xlsx.SetCellValue(sheetName, "G"+rows, userRecord.FocusRepoCount)
+ xlsx.SetCellValue(sheetName, "H"+rows, userRecord.StarRepoCount)
+ xlsx.SetCellValue(sheetName, "I"+rows, userRecord.LoginCount)
+ xlsx.SetCellValue(sheetName, "J"+rows, userRecord.WatchedCount)
+ xlsx.SetCellValue(sheetName, "K"+rows, userRecord.CommitCodeSize)
+ xlsx.SetCellValue(sheetName, "L"+rows, userRecord.SolveIssueCount)
+ xlsx.SetCellValue(sheetName, "M"+rows, userRecord.EncyclopediasCount)
+ xlsx.SetCellValue(sheetName, "N"+rows, userRecord.CreateRepoCount)
+ xlsx.SetCellValue(sheetName, "O"+rows, fmt.Sprintf("%.2f", userRecord.OpenIIndex))
+
+ formatTime := userRecord.RegistDate.Format("2006-01-02 15:04:05")
+ xlsx.SetCellValue(sheetName, "P"+rows, formatTime[0:len(formatTime)-3])
+
+ formatTime = userRecord.DataDate
+ xlsx.SetCellValue(sheetName, "Q"+rows, formatTime+" 00:01")
+ }
+
+ //设置默认打开的表单
+ xlsx.SetActiveSheet(index)
+ filename := sheetName + "_" + ctx.Tr("user.static."+tableName) + ".xlsx"
+ ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+url.QueryEscape(filename))
+ ctx.Resp.Header().Set("Content-Type", "application/octet-stream")
+ if _, err := xlsx.WriteTo(ctx.Resp); err != nil {
+ log.Info("writer exel error." + err.Error())
+ }
+ indexTotal += PAGE_SIZE
+ if indexTotal >= count {
+ break
+ }
+ }
+ } else {
+ re, count := models.QueryUserStaticDataByTableName((page-1)*pageSize, pageSize, tableName, queryObj, userName)
+ mapInterface := make(map[string]interface{})
+ mapInterface["data"] = re
+ mapInterface["count"] = count
+ ctx.JSON(http.StatusOK, mapInterface)
+ }
+}
+
+func QueryUserStaticCurrentMonth(ctx *context.Context) {
+ queryUserDataPage(ctx, "public.user_business_analysis_current_month", new(models.UserBusinessAnalysisCurrentMonth))
+}
+
+func QueryUserStaticCurrentWeek(ctx *context.Context) {
+ queryUserDataPage(ctx, "public.user_business_analysis_current_week", new(models.UserBusinessAnalysisCurrentWeek))
+}
+
+func QueryUserStaticCurrentYear(ctx *context.Context) {
+ queryUserDataPage(ctx, "public.user_business_analysis_current_year", new(models.UserBusinessAnalysisCurrentYear))
+}
+
+func QueryUserStaticLast30Day(ctx *context.Context) {
+ queryUserDataPage(ctx, "public.user_business_analysis_last30_day", new(models.UserBusinessAnalysisLast30Day))
+}
+
+func QueryUserStaticLastMonth(ctx *context.Context) {
+ queryUserDataPage(ctx, "public.user_business_analysis_last_month", new(models.UserBusinessAnalysisLastMonth))
+}
+
+func QueryUserStaticYesterday(ctx *context.Context) {
+ queryUserDataPage(ctx, "public.user_business_analysis_yesterday", new(models.UserBusinessAnalysisYesterday))
+}
+
+func QueryUserStaticAll(ctx *context.Context) {
+ queryUserDataPage(ctx, "public.user_business_analysis_all", new(models.UserBusinessAnalysisAll))
+}
+
func QueryUserStaticDataPage(ctx *context.Context) {
startDate := ctx.Query("startDate")
endDate := ctx.Query("endDate")
diff --git a/services/repository/repository.go b/services/repository/repository.go
index f50b98b64..eafad988e 100644
--- a/services/repository/repository.go
+++ b/services/repository/repository.go
@@ -5,13 +5,12 @@
package repository
import (
- "fmt"
-
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/notification"
repo_module "code.gitea.io/gitea/modules/repository"
pull_service "code.gitea.io/gitea/services/pull"
+ "fmt"
)
// CreateRepository creates a repository for the user/organization.
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index 110200894..1239292ce 100755
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -195,14 +195,57 @@ var _hmt = _hmt || [];
{{template "custom/body_inner_pre" .}}
-
+
{{if not .PageIsInstall}}
{{template "base/head_navbar" .}}
+
+
+
+
+
{{svg "octicon-x" 16}}
+