Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
Overview
Overview
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
e841660c
Commit
e841660c
authored
Nov 25, 2020
by
Sxy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 代码规范
parent
ef46e093
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
18 deletions
+18
-18
center-manage/app/base/db/models/product/xproduct.js
+3
-3
center-manage/app/base/db/models/product/xproductprice.js
+3
-3
center-manage/app/base/service/impl/msg/msgSve.js
+4
-4
center-manage/app/base/utils/logClient.js
+8
-8
No files found.
center-manage/app/base/db/models/product/xproduct.js
View file @
e841660c
...
@@ -33,9 +33,9 @@ module.exports = (db, DataTypes) =>
...
@@ -33,9 +33,9 @@ module.exports = (db, DataTypes) =>
// define the table's name
// define the table's name
tableName
:
'x_product'
,
tableName
:
'x_product'
,
getterMethods
:
{
getterMethods
:
{
spName
()
{
//
spName() {
return
servicer_name
;
//
return servicer_name;
},
//
},
},
},
validate
:
{
validate
:
{
...
...
center-manage/app/base/db/models/product/xproductprice.js
View file @
e841660c
...
@@ -25,9 +25,9 @@ module.exports = (db, DataTypes) =>
...
@@ -25,9 +25,9 @@ module.exports = (db, DataTypes) =>
// define the table's name
// define the table's name
tableName
:
'tx_product_price'
,
tableName
:
'tx_product_price'
,
getterMethods
:
{
getterMethods
:
{
spName
()
{
//
spName() {
return
servicer_name
;
//
return servicer_name;
},
//
},
},
},
validate
:
{
validate
:
{
...
...
center-manage/app/base/service/impl/msg/msgSve.js
View file @
e841660c
...
@@ -110,13 +110,13 @@ class MsgService extends ServiceBase {
...
@@ -110,13 +110,13 @@ class MsgService extends ServiceBase {
}
}
async
findSystemMsgCount
(
pobj
,
qobj
,
req
)
{
async
findSystemMsgCount
(
pobj
,
qobj
,
req
)
{
const
{
type
,
company_id
}
=
pobj
;
const
{
type
,
company_id
:
companyId
}
=
pobj
;
const
where
=
{
const
where
=
{
msgType
:
system
.
Msg
.
SYS
,
msgType
:
system
.
Msg
.
SYS
,
is_undo
:
false
,
is_undo
:
false
,
company_id
:
{
company_id
:
{
$in
:
[
1
,
company
_i
d
],
$in
:
[
1
,
company
I
d
],
},
},
};
};
if
(
type
===
'recently'
)
{
if
(
type
===
'recently'
)
{
...
@@ -150,7 +150,7 @@ class MsgService extends ServiceBase {
...
@@ -150,7 +150,7 @@ class MsgService extends ServiceBase {
}
}
async
list
(
pobj
,
qobj
,
req
)
{
async
list
(
pobj
,
qobj
,
req
)
{
const
{
userid
,
msgType
,
pageSize
=
10
,
pageNo
=
1
,
company_id
}
=
pobj
;
const
{
userid
,
msgType
,
pageSize
=
10
,
pageNo
=
1
,
company_id
:
companyId
}
=
pobj
;
let
msgData
=
[];
let
msgData
=
[];
const
other
=
{
const
other
=
{
limit
:
pageSize
,
limit
:
pageSize
,
...
@@ -175,7 +175,7 @@ class MsgService extends ServiceBase {
...
@@ -175,7 +175,7 @@ class MsgService extends ServiceBase {
msgType
:
system
.
Msg
.
SYS
,
msgType
:
system
.
Msg
.
SYS
,
is_undo
:
false
,
is_undo
:
false
,
company_id
:
{
company_id
:
{
$in
:
[
1
,
company
_i
d
],
$in
:
[
1
,
company
I
d
],
},
},
},
[],
other
);
},
[],
other
);
msgData
=
msgData
.
map
(
item
=>
({
msgData
=
msgData
.
map
(
item
=>
({
...
...
center-manage/app/base/utils/logClient.js
View file @
e841660c
...
@@ -32,15 +32,15 @@ class LogClient {
...
@@ -32,15 +32,15 @@ class LogClient {
}
}
async
logList
(
pobj
)
{
async
logList
(
pobj
)
{
const
{
search
,
pageInfo
,
company_id
}
=
pobj
;
const
{
search
,
pageInfo
,
company_id
:
companyId
}
=
pobj
;
const
{
userName
,
errorInfo
,
messageBody
,
resultInfo
,
created_at
,
opTitle
,
requestId
}
=
search
;
const
{
userName
,
errorInfo
,
messageBody
,
resultInfo
,
created_at
:
createdAt
,
opTitle
,
requestId
}
=
search
;
const
query
=
{
const
query
=
{
indexName
:
`logs-sytxpublic-msgq-
${
settings
.
logindex
}
`
,
indexName
:
`logs-sytxpublic-msgq-
${
settings
.
logindex
}
`
,
pageSize
:
pageInfo
.
pageSize
,
pageSize
:
pageInfo
.
pageSize
,
currentPage
:
pageInfo
.
pageNo
,
currentPage
:
pageInfo
.
pageNo
,
};
};
if
(
company
_id
&&
company_i
d
!=
1
)
{
if
(
company
Id
&&
companyI
d
!=
1
)
{
query
.
identifyCode
=
`_
${
company
_i
d
}
_`
;
query
.
identifyCode
=
`_
${
company
I
d
}
_`
;
}
}
if
(
opTitle
)
{
if
(
opTitle
)
{
query
.
opTitle
=
opTitle
;
query
.
opTitle
=
opTitle
;
...
@@ -60,9 +60,9 @@ class LogClient {
...
@@ -60,9 +60,9 @@ class LogClient {
if
(
resultInfo
)
{
if
(
resultInfo
)
{
query
.
resultInfo
=
resultInfo
;
query
.
resultInfo
=
resultInfo
;
}
}
if
(
created
_at
&&
created_at
[
0
]
&&
created_a
t
[
1
])
{
if
(
created
At
&&
createdAt
[
0
]
&&
createdA
t
[
1
])
{
query
.
startTime
=
new
Date
(
created
_a
t
[
0
]).
getTime
();
query
.
startTime
=
new
Date
(
created
A
t
[
0
]).
getTime
();
query
.
entTime
=
new
Date
(
created
_a
t
[
1
]).
getTime
();
query
.
entTime
=
new
Date
(
created
A
t
[
1
]).
getTime
();
}
}
console
.
log
(
'请求--------日志'
);
console
.
log
(
'请求--------日志'
);
console
.
log
(
settings
.
logUrl
());
console
.
log
(
settings
.
logUrl
());
...
@@ -77,7 +77,7 @@ class LogClient {
...
@@ -77,7 +77,7 @@ class LogClient {
if
(
rtn
&&
rtn
.
status
===
1
)
{
if
(
rtn
&&
rtn
.
status
===
1
)
{
return
rtn
.
data
;
return
rtn
.
data
;
}
}
throw
new
Error
(
rtn
&&
rtn
.
message
||
'请联系管理员'
);
throw
new
Error
(
(
rtn
&&
rtn
.
message
)
||
'请联系管理员'
);
}
else
{
}
else
{
throw
new
Error
(
rtn
);
throw
new
Error
(
rtn
);
}
}
...
...
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