Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pisns-forum-api
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
scrmGroup
pisns-forum-api
Commits
b3f59255
Commit
b3f59255
authored
Jul 21, 2016
by
陈志良
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bugfix_0721_sharev3' into SANDBOX
parents
ad88adef
319e122e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
forumShare.js
app/controllers/mobile/forumShare.js
+2
-2
express.js
config/express.js
+4
-0
No files found.
app/controllers/mobile/forumShare.js
View file @
b3f59255
...
...
@@ -556,7 +556,7 @@ router.get('/sharev3.js', function(req, res, next) {
}
catch
(
err
){
console
.
log
(
err
);
}
getWXV2
(
res
,
title
,
desc
,
link
,
imgUrl
,
mid
,
ent_code
,
id
,
type
,
null
,
true
);
getWXV2
(
res
,
title
,
desc
,
link
,
imgUrl
,
mid
,
ent_code
,
id
,
type
,
null
);
}
else
{
then
.
parallel
([
function
(
cont
){
...
...
@@ -592,7 +592,7 @@ router.get('/sharev3.js', function(req, res, next) {
}
else
{
link
=
link
+
'&uId='
+
uId
;
}
getWXV2
(
res
,
title
,
desc
,
link
,
imgUrl
,
mid
,
ent_code
,
id
,
type
,
null
,
true
);
getWXV2
(
res
,
title
,
desc
,
link
,
imgUrl
,
mid
,
ent_code
,
id
,
type
,
null
);
}).
fail
(
function
(
cont
,
err
)
{
res
.
json
(
_
.
assign
({
result
:
false
},
returnCode
.
WRONG_PARAM
));
});
...
...
config/express.js
View file @
b3f59255
...
...
@@ -108,6 +108,10 @@ app.use('/v1/forum/*',forumUser.identifyUser());
require
(
controller
)(
app
);
});
app
.
use
(
'/aliveCheck'
,
function
(
req
,
res
,
next
)
{
res
.
status
(
200
).
end
();
});
app
.
use
(
function
(
req
,
res
,
next
)
{
var
err
=
new
Error
(
'Not Found'
);
err
.
status
=
404
;
...
...
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