Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
traffic-front
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangxiaoming
traffic-front
Commits
f165629c
Commit
f165629c
authored
Jun 05, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DEV] from key word is not allowded ,so close but should be open future
parent
d9dd5d31
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
webservice.js
atms-web/src/main/webapp/app/framework/utils/webservice.js
+5
-5
framework.js
atms-web/src/main/webapp/bundles/framework.js
+5
-5
No files found.
atms-web/src/main/webapp/app/framework/utils/webservice.js
View file @
f165629c
...
...
@@ -168,12 +168,12 @@ webservices.factory('apiConfig', ['$log', 'vatSessionService',
}
cfg
.
isWebApiRequest
=
true
;
if
(
config
&&
config
.
dbName
)
{
cfg
.
headers
=
{
'from'
:
config
.
dbName
+
'@cn.pwc.com'
};
if
(
config
&&
config
.
dbName
)
{
//TODO:from is not allowed ,future should open (neo)
//
cfg.headers = { 'from': config.dbName + '@cn.pwc.com' };
}
else
{
if
(
vatSessionService
.
project
&&
vatSessionService
.
project
.
dbName
)
{
cfg
.
headers
=
{
'from'
:
vatSessionService
.
project
.
dbName
+
'@cn.pwc.com'
};
//
cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' };
}
}
return
cfg
;
...
...
@@ -189,10 +189,10 @@ webservices.factory('apiConfig', ['$log', 'vatSessionService',
cfg
.
isWebApiRequest
=
true
;
if
(
config
&&
config
.
dbName
)
{
cfg
.
headers
=
{
'from'
:
config
.
dbName
+
'@cn.pwc.com'
};
//
cfg.headers = { 'from': config.dbName + '@cn.pwc.com' };
}
else
{
cfg
.
headers
=
{
'from'
:
vatSessionService
.
project
.
dbName
+
'@cn.pwc.com'
};
//
cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' };
}
//$httpProvider.defaults.headers.common['from'] = vatSessionService.project.dbName + '@cn.pwc.com';
//cfg.headers.from = vatSessionService.project.dbName+'@cn.pwc.com';
...
...
atms-web/src/main/webapp/bundles/framework.js
View file @
f165629c
...
...
@@ -4600,12 +4600,12 @@ webservices.factory('apiConfig', ['$log', 'vatSessionService',
}
cfg
.
isWebApiRequest
=
true
;
if
(
config
&&
config
.
dbName
)
{
cfg
.
headers
=
{
'from'
:
config
.
dbName
+
'@cn.pwc.com'
};
if
(
config
&&
config
.
dbName
)
{
//TODO:from is not allowed ,future should open (neo)
//
cfg.headers = { 'from': config.dbName + '@cn.pwc.com' };
}
else
{
if
(
vatSessionService
.
project
&&
vatSessionService
.
project
.
dbName
)
{
cfg
.
headers
=
{
'from'
:
vatSessionService
.
project
.
dbName
+
'@cn.pwc.com'
};
//
cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' };
}
}
return
cfg
;
...
...
@@ -4621,10 +4621,10 @@ webservices.factory('apiConfig', ['$log', 'vatSessionService',
cfg
.
isWebApiRequest
=
true
;
if
(
config
&&
config
.
dbName
)
{
cfg
.
headers
=
{
'from'
:
config
.
dbName
+
'@cn.pwc.com'
};
//
cfg.headers = { 'from': config.dbName + '@cn.pwc.com' };
}
else
{
cfg
.
headers
=
{
'from'
:
vatSessionService
.
project
.
dbName
+
'@cn.pwc.com'
};
//
cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' };
}
//$httpProvider.defaults.headers.common['from'] = vatSessionService.project.dbName + '@cn.pwc.com';
//cfg.headers.from = vatSessionService.project.dbName+'@cn.pwc.com';
...
...
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