Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
taobao-mini-template
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2
Issues
2
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
qinhaitao
taobao-mini-template
Commits
f9ebd5c8
Commit
f9ebd5c8
authored
Jun 08, 2021
by
qinhaitao
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'c_server_issues_solve' into 'c_server_ts_perf'
增加getStats的xlsxData返回值 See merge request
!31
parents
93141e04
d54aa2b1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
0 deletions
+3
-0
server.js
v2.0/mockServer/server.js
+2
-0
stat.controller.ts
v2.0/src/controller/common/stat.controller.ts
+1
-0
No files found.
v2.0/mockServer/server.js
View file @
f9ebd5c8
/** @format */
/** @format */
// var path = require('path');
var
express
=
require
(
'express'
)
var
express
=
require
(
'express'
)
var
bodyParser
=
require
(
'body-parser'
)
var
bodyParser
=
require
(
'body-parser'
)
var
cookieParser
=
require
(
'cookie-parser'
)
var
cookieParser
=
require
(
'cookie-parser'
)
var
{
createProxyMiddleware
}
=
require
(
'http-proxy-middleware'
)
var
{
createProxyMiddleware
}
=
require
(
'http-proxy-middleware'
)
const
routers
=
require
(
'../index'
)
const
routers
=
require
(
'../index'
)
// const routers = require(process.cwd() + '/index')
const
{
port
,
serverProxy
}
=
require
(
'./package.json'
)
const
{
port
,
serverProxy
}
=
require
(
'./package.json'
)
var
app
=
express
()
var
app
=
express
()
...
...
v2.0/src/controller/common/stat.controller.ts
View file @
f9ebd5c8
...
@@ -41,6 +41,7 @@ export default class StatController {
...
@@ -41,6 +41,7 @@ export default class StatController {
commonStatGetStatsResult1
commonStatGetStatsResult1
)
)
return
resultsModel
.
success
({
return
resultsModel
.
success
({
xlsxData
:
commonStatGetStatsResult1
,
...
commonStatBuildExcelResult2
...
commonStatBuildExcelResult2
})
})
}
}
...
...
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