Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
beego
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
beego
Commits
81f69f12
Commit
81f69f12
authored
Jul 20, 2018
by
astaxie
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
https://github.com/astaxie/beego
into develop
parents
0711c328
c9b6e4f8
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
12 deletions
+36
-12
admin.go
admin.go
+12
-0
file.go
logs/file.go
+5
-0
models_fields.go
orm/models_fields.go
+18
-11
router.go
router.go
+1
-1
No files found.
admin.go
View file @
81f69f12
...
...
@@ -76,6 +76,18 @@ func adminIndex(rw http.ResponseWriter, r *http.Request) {
func
qpsIndex
(
rw
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
data
:=
make
(
map
[
interface
{}]
interface
{})
data
[
"Content"
]
=
toolbox
.
StatisticsMap
.
GetMap
()
// do html escape before display path, avoid xss
if
content
,
ok
:=
(
data
[
"Content"
])
.
(
map
[
string
]
interface
{});
ok
{
if
resultLists
,
ok
:=
(
content
[
"Data"
])
.
([][]
string
);
ok
{
for
i
:=
range
resultLists
{
if
len
(
resultLists
[
i
])
>
0
{
resultLists
[
i
][
0
]
=
template
.
HTMLEscapeString
(
resultLists
[
i
][
0
])
}
}
}
}
execTpl
(
rw
,
data
,
qpsTpl
,
defaultScriptsTpl
)
}
...
...
logs/file.go
View file @
81f69f12
...
...
@@ -21,6 +21,7 @@ import (
"fmt"
"io"
"os"
"path"
"path/filepath"
"strconv"
"strings"
...
...
@@ -167,6 +168,10 @@ func (w *fileLogWriter) createLogFile() (*os.File, error) {
if
err
!=
nil
{
return
nil
,
err
}
filepath
:=
path
.
Dir
(
w
.
Filename
)
os
.
MkdirAll
(
filepath
,
os
.
FileMode
(
perm
))
fd
,
err
:=
os
.
OpenFile
(
w
.
Filename
,
os
.
O_WRONLY
|
os
.
O_APPEND
|
os
.
O_CREATE
,
os
.
FileMode
(
perm
))
if
err
==
nil
{
// Make sure file perm is user set perm cause of `os.OpenFile` will obey umask
...
...
orm/models_fields.go
View file @
81f69f12
...
...
@@ -86,7 +86,7 @@ func (e *BooleanField) SetRaw(value interface{}) error {
e
.
Set
(
d
)
case
string
:
v
,
err
:=
StrTo
(
d
)
.
Bool
()
if
err
!
=
nil
{
if
err
=
=
nil
{
e
.
Set
(
v
)
}
return
err
...
...
@@ -191,7 +191,7 @@ func (e *TimeField) SetRaw(value interface{}) error {
e
.
Set
(
d
)
case
string
:
v
,
err
:=
timeParse
(
d
,
formatTime
)
if
err
!
=
nil
{
if
err
=
=
nil
{
e
.
Set
(
v
)
}
return
err
...
...
@@ -250,7 +250,7 @@ func (e *DateField) SetRaw(value interface{}) error {
e
.
Set
(
d
)
case
string
:
v
,
err
:=
timeParse
(
d
,
formatDate
)
if
err
!
=
nil
{
if
err
=
=
nil
{
e
.
Set
(
v
)
}
return
err
...
...
@@ -300,7 +300,7 @@ func (e *DateTimeField) SetRaw(value interface{}) error {
e
.
Set
(
d
)
case
string
:
v
,
err
:=
timeParse
(
d
,
formatDateTime
)
if
err
!
=
nil
{
if
err
=
=
nil
{
e
.
Set
(
v
)
}
return
err
...
...
@@ -350,9 +350,10 @@ func (e *FloatField) SetRaw(value interface{}) error {
e
.
Set
(
d
)
case
string
:
v
,
err
:=
StrTo
(
d
)
.
Float64
()
if
err
!
=
nil
{
if
err
=
=
nil
{
e
.
Set
(
v
)
}
return
err
default
:
return
fmt
.
Errorf
(
"<FloatField.SetRaw> unknown value `%s`"
,
value
)
}
...
...
@@ -397,9 +398,10 @@ func (e *SmallIntegerField) SetRaw(value interface{}) error {
e
.
Set
(
d
)
case
string
:
v
,
err
:=
StrTo
(
d
)
.
Int16
()
if
err
!
=
nil
{
if
err
=
=
nil
{
e
.
Set
(
v
)
}
return
err
default
:
return
fmt
.
Errorf
(
"<SmallIntegerField.SetRaw> unknown value `%s`"
,
value
)
}
...
...
@@ -444,9 +446,10 @@ func (e *IntegerField) SetRaw(value interface{}) error {
e
.
Set
(
d
)
case
string
:
v
,
err
:=
StrTo
(
d
)
.
Int32
()
if
err
!
=
nil
{
if
err
=
=
nil
{
e
.
Set
(
v
)
}
return
err
default
:
return
fmt
.
Errorf
(
"<IntegerField.SetRaw> unknown value `%s`"
,
value
)
}
...
...
@@ -491,9 +494,10 @@ func (e *BigIntegerField) SetRaw(value interface{}) error {
e
.
Set
(
d
)
case
string
:
v
,
err
:=
StrTo
(
d
)
.
Int64
()
if
err
!
=
nil
{
if
err
=
=
nil
{
e
.
Set
(
v
)
}
return
err
default
:
return
fmt
.
Errorf
(
"<BigIntegerField.SetRaw> unknown value `%s`"
,
value
)
}
...
...
@@ -538,9 +542,10 @@ func (e *PositiveSmallIntegerField) SetRaw(value interface{}) error {
e
.
Set
(
d
)
case
string
:
v
,
err
:=
StrTo
(
d
)
.
Uint16
()
if
err
!
=
nil
{
if
err
=
=
nil
{
e
.
Set
(
v
)
}
return
err
default
:
return
fmt
.
Errorf
(
"<PositiveSmallIntegerField.SetRaw> unknown value `%s`"
,
value
)
}
...
...
@@ -585,9 +590,10 @@ func (e *PositiveIntegerField) SetRaw(value interface{}) error {
e
.
Set
(
d
)
case
string
:
v
,
err
:=
StrTo
(
d
)
.
Uint32
()
if
err
!
=
nil
{
if
err
=
=
nil
{
e
.
Set
(
v
)
}
return
err
default
:
return
fmt
.
Errorf
(
"<PositiveIntegerField.SetRaw> unknown value `%s`"
,
value
)
}
...
...
@@ -632,9 +638,10 @@ func (e *PositiveBigIntegerField) SetRaw(value interface{}) error {
e
.
Set
(
d
)
case
string
:
v
,
err
:=
StrTo
(
d
)
.
Uint64
()
if
err
!
=
nil
{
if
err
=
=
nil
{
e
.
Set
(
v
)
}
return
err
default
:
return
fmt
.
Errorf
(
"<PositiveBigIntegerField.SetRaw> unknown value `%s`"
,
value
)
}
...
...
router.go
View file @
81f69f12
...
...
@@ -943,7 +943,7 @@ func (p *ControllerRegister) handleParamResponse(context *beecontext.Context, ex
context
.
RenderMethodResult
(
resultValue
)
}
}
if
!
context
.
ResponseWriter
.
Started
&&
context
.
Output
.
Status
==
0
{
if
!
context
.
ResponseWriter
.
Started
&&
len
(
results
)
>
0
&&
context
.
Output
.
Status
==
0
{
context
.
Output
.
SetStatus
(
200
)
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment