Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivWeb
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ReactWeb5
CivWeb
Commits
d1083a71
Commit
d1083a71
authored
3 years ago
by
崔佳豪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
perf: websiteconfig接口替换
parent
6af6df30
Pipeline
#48775
passed with stages
in 2 minutes 29 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
21 deletions
+3
-21
base.js
src/api/service/base.js
+3
-12
login.js
src/pages/user/login/login.js
+0
-9
No files found.
src/api/service/base.js
View file @
d1083a71
...
...
@@ -18,8 +18,7 @@ export const API = {
GENERATE_IOT_TOKEN
:
'cityinterface/rest/services.svc/generateGCKToken'
,
GENERATE_QRCODE
:
'cityinterface/rest/services.svc/generatetokenByqrcode'
,
GENERATE_TOKEN_CHANGE
:
'/cityinterface/rest/services.svc/generatetokenquick'
,
GET_WEB_SITE_CONFIG
:
'/CityInterface/rest/services.svc/GetWebSiteConfig'
,
GET_WEB_SITE_CONFIG_GEWAY
:
'/PandaCore/GCK/Basis/GetWebSiteConfig'
,
GET_WEB_SITE_CONFIG
:
'/PandaOMS/OMS/WebSite/GetWebSiteConfig'
,
GET_USER_INFO
:
'/CityInterface/rest/services.svc/getUserInfo'
,
GET_GATEWAY_USER_INFO
:
'/PandaCore/GCK/Basis/GetUserInfo'
,
GET_OA
:
'/CityInterface/rest/services/OA.svc/getLoginInfo'
,
...
...
@@ -78,12 +77,7 @@ const services = {
},
getWebSiteConfig
:
{
url
:
()
=>
window
.
globalConfig
&&
window
.
globalConfig
&&
window
.
globalConfig
.
hasGateWay
?
API
.
GET_WEB_SITE_CONFIG_GEWAY
:
API
.
GET_WEB_SITE_CONFIG
,
url
:
API
.
GET_WEB_SITE_CONFIG
,
method
:
constants
.
REQUEST_METHOD_GET
,
type
:
constants
.
REQUEST_HTTP
,
},
...
...
@@ -235,10 +229,7 @@ export const getUserInfo = params => {
};
export
const
getWebSiteConfig
=
params
=>
{
const
url
=
window
.
globalConfig
&&
window
.
globalConfig
&&
window
.
globalConfig
.
hasGateWay
?
API
.
GET_WEB_SITE_CONFIG_GEWAY
:
API
.
GET_WEB_SITE_CONFIG
;
const
url
=
API
.
GET_WEB_SITE_CONFIG
;
return
request
({
url
,
method
:
constants
.
REQUEST_METHOD_GET
,
...
...
This diff is collapsed.
Click to expand it.
src/pages/user/login/login.js
View file @
d1083a71
...
...
@@ -321,15 +321,6 @@ class Login {
// mapsettings: config.mapsettings
});
// eslint-disable-next-line no-prototype-builtins
if
(
self
.
globalConfig
.
hasOwnProperty
(
'webConfig'
))
{
self
.
globalConfig
=
Object
.
assign
(
self
.
globalConfig
,
{
// ...self.globalConfig,
...
self
.
globalConfig
.
webConfig
.
basicConfig
,
...
self
.
globalConfig
.
webConfig
.
optionalConfig
,
});
}
self
.
updateConfig
&&
self
.
updateConfig
(
self
.
globalConfig
);
self
.
getProjectItems
().
then
(
res
=>
{
window
.
subSysCfg
=
{};
...
...
This diff is collapsed.
Click to expand it.
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